Skip to content

Commit e126e1b

Browse files
j-bakerdansanduleac
j-baker
authored and
dansanduleac
committed
Merge remoting into develop (#809)
* Expose HostMetricsRegistry record methods (#780) This is so that we can separately implement a HostMetricsSink for it (see #779) such that we can share host metrics when constructing both conjure and remoting3 clients * publish BOM for jaxrs-client (#789) * Excavator: Render CircleCI file using template specified in .circleci/template.sh (#791) * Upgrade OkHttp to 3.11.0. (#794) * AssertionErrors are converted into service exceptions with type internal (#727) * No more ThreadLocals, delegate everything to 'palantir/tracing-java' (#799) * Use BINTRAY_*_REMOTING envs (#802) The project's default bintray creds are currently set up to publish to `conjure-java-runtime`. Use these custom env vars to maintain ability to publish http-remoting. * Better behaviour in the presence of 429s (#786)
1 parent 987f293 commit e126e1b

File tree

20 files changed

+1052
-39
lines changed

20 files changed

+1052
-39
lines changed

‎client-config/src/main/java/com/palantir/conjure/java/client/config/ClientConfigurations.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public final class ClientConfigurations {
4444
private static final Duration DEFAULT_FAILED_URL_COOLDOWN = Duration.ZERO;
4545
private static final boolean DEFAULT_ENABLE_GCM_CIPHERS = false;
4646
private static final NodeSelectionStrategy DEFAULT_NODE_SELECTION_STRATEGY = NodeSelectionStrategy.PIN_UNTIL_ERROR;
47-
private static final int DEFAULT_MAX_NUM_RETRIES = 3;
47+
private static final int DEFAULT_MAX_NUM_RETRIES = 4;
4848

4949
private ClientConfigurations() {}
5050

@@ -87,7 +87,7 @@ public static ClientConfiguration of(
8787
.enableGcmCipherSuites(DEFAULT_ENABLE_GCM_CIPHERS)
8888
.proxy(ProxySelector.getDefault())
8989
.proxyCredentials(Optional.empty())
90-
.maxNumRetries(uris.size())
90+
.maxNumRetries(DEFAULT_MAX_NUM_RETRIES)
9191
.backoffSlotSize(DEFAULT_BACKOFF_SLOT_SIZE)
9292
.nodeSelectionStrategy(DEFAULT_NODE_SELECTION_STRATEGY)
9393
.failedUrlCooldown(DEFAULT_FAILED_URL_COOLDOWN)

‎conjure-java-jaxrs-client/versions.lock‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@
9292
"com.palantir.tracing:tracing"
9393
]
9494
},
95+
"com.netflix.concurrency-limits:concurrency-limits-core": {
96+
"locked": "0.1.1",
97+
"transitive": [
98+
"com.palantir.conjure.java.runtime:okhttp-clients"
99+
]
100+
},
95101
"com.netflix.feign:feign-core": {
96102
"locked": "8.17.0",
97103
"transitive": [
@@ -181,19 +187,19 @@
181187
]
182188
},
183189
"com.palantir.tracing:tracing": {
184-
"locked": "1.1.0",
190+
"locked": "1.2.0",
185191
"transitive": [
186192
"com.palantir.tracing:tracing-okhttp3"
187193
]
188194
},
189195
"com.palantir.tracing:tracing-api": {
190-
"locked": "1.1.0",
196+
"locked": "1.2.0",
191197
"transitive": [
192198
"com.palantir.tracing:tracing"
193199
]
194200
},
195201
"com.palantir.tracing:tracing-okhttp3": {
196-
"locked": "1.1.0",
202+
"locked": "1.2.0",
197203
"transitive": [
198204
"com.palantir.conjure.java.runtime:okhttp-clients"
199205
]
@@ -247,6 +253,7 @@
247253
"org.slf4j:slf4j-api": {
248254
"locked": "1.7.12",
249255
"transitive": [
256+
"com.netflix.concurrency-limits:concurrency-limits-core",
250257
"com.netflix.feign:feign-slf4j",
251258
"com.palantir.conjure.java.runtime:okhttp-clients",
252259
"com.palantir.tokens:auth-tokens",
@@ -348,6 +355,12 @@
348355
"com.palantir.tracing:tracing"
349356
]
350357
},
358+
"com.netflix.concurrency-limits:concurrency-limits-core": {
359+
"locked": "0.1.1",
360+
"transitive": [
361+
"com.palantir.conjure.java.runtime:okhttp-clients"
362+
]
363+
},
351364
"com.netflix.feign:feign-core": {
352365
"locked": "8.17.0",
353366
"transitive": [
@@ -437,19 +450,19 @@
437450
]
438451
},
439452
"com.palantir.tracing:tracing": {
440-
"locked": "1.1.0",
453+
"locked": "1.2.0",
441454
"transitive": [
442455
"com.palantir.tracing:tracing-okhttp3"
443456
]
444457
},
445458
"com.palantir.tracing:tracing-api": {
446-
"locked": "1.1.0",
459+
"locked": "1.2.0",
447460
"transitive": [
448461
"com.palantir.tracing:tracing"
449462
]
450463
},
451464
"com.palantir.tracing:tracing-okhttp3": {
452-
"locked": "1.1.0",
465+
"locked": "1.2.0",
453466
"transitive": [
454467
"com.palantir.conjure.java.runtime:okhttp-clients"
455468
]
@@ -503,6 +516,7 @@
503516
"org.slf4j:slf4j-api": {
504517
"locked": "1.7.12",
505518
"transitive": [
519+
"com.netflix.concurrency-limits:concurrency-limits-core",
506520
"com.netflix.feign:feign-slf4j",
507521
"com.palantir.conjure.java.runtime:okhttp-clients",
508522
"com.palantir.tokens:auth-tokens",

‎conjure-java-jersey-server/versions.lock‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,19 +115,19 @@
115115
]
116116
},
117117
"com.palantir.tracing:tracing": {
118-
"locked": "1.1.0",
118+
"locked": "1.2.0",
119119
"transitive": [
120120
"com.palantir.tracing:tracing-jersey"
121121
]
122122
},
123123
"com.palantir.tracing:tracing-api": {
124-
"locked": "1.1.0",
124+
"locked": "1.2.0",
125125
"transitive": [
126126
"com.palantir.tracing:tracing"
127127
]
128128
},
129129
"com.palantir.tracing:tracing-jersey": {
130-
"locked": "1.1.0"
130+
"locked": "1.2.0"
131131
},
132132
"javax.annotation:javax.annotation-api": {
133133
"locked": "1.2",
@@ -369,19 +369,19 @@
369369
]
370370
},
371371
"com.palantir.tracing:tracing": {
372-
"locked": "1.1.0",
372+
"locked": "1.2.0",
373373
"transitive": [
374374
"com.palantir.tracing:tracing-jersey"
375375
]
376376
},
377377
"com.palantir.tracing:tracing-api": {
378-
"locked": "1.1.0",
378+
"locked": "1.2.0",
379379
"transitive": [
380380
"com.palantir.tracing:tracing"
381381
]
382382
},
383383
"com.palantir.tracing:tracing-jersey": {
384-
"locked": "1.1.0"
384+
"locked": "1.2.0"
385385
},
386386
"javax.annotation:javax.annotation-api": {
387387
"locked": "1.2",

‎conjure-java-retrofit2-client/versions.lock‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@
9292
"com.palantir.tracing:tracing"
9393
]
9494
},
95+
"com.netflix.concurrency-limits:concurrency-limits-core": {
96+
"locked": "0.1.1",
97+
"transitive": [
98+
"com.palantir.conjure.java.runtime:okhttp-clients"
99+
]
100+
},
95101
"com.palantir.conjure.java.api:errors": {
96102
"locked": "2.0.0-rc6",
97103
"transitive": [
@@ -160,19 +166,19 @@
160166
]
161167
},
162168
"com.palantir.tracing:tracing": {
163-
"locked": "1.1.0",
169+
"locked": "1.2.0",
164170
"transitive": [
165171
"com.palantir.tracing:tracing-okhttp3"
166172
]
167173
},
168174
"com.palantir.tracing:tracing-api": {
169-
"locked": "1.1.0",
175+
"locked": "1.2.0",
170176
"transitive": [
171177
"com.palantir.tracing:tracing"
172178
]
173179
},
174180
"com.palantir.tracing:tracing-okhttp3": {
175-
"locked": "1.1.0",
181+
"locked": "1.2.0",
176182
"transitive": [
177183
"com.palantir.conjure.java.runtime:okhttp-clients"
178184
]
@@ -229,6 +235,7 @@
229235
"org.slf4j:slf4j-api": {
230236
"locked": "1.7.12",
231237
"transitive": [
238+
"com.netflix.concurrency-limits:concurrency-limits-core",
232239
"com.palantir.conjure.java.runtime:okhttp-clients",
233240
"com.palantir.tokens:auth-tokens",
234241
"com.palantir.tracing:tracing",
@@ -329,6 +336,12 @@
329336
"com.palantir.tracing:tracing"
330337
]
331338
},
339+
"com.netflix.concurrency-limits:concurrency-limits-core": {
340+
"locked": "0.1.1",
341+
"transitive": [
342+
"com.palantir.conjure.java.runtime:okhttp-clients"
343+
]
344+
},
332345
"com.palantir.conjure.java.api:errors": {
333346
"locked": "2.0.0-rc6",
334347
"transitive": [
@@ -397,19 +410,19 @@
397410
]
398411
},
399412
"com.palantir.tracing:tracing": {
400-
"locked": "1.1.0",
413+
"locked": "1.2.0",
401414
"transitive": [
402415
"com.palantir.tracing:tracing-okhttp3"
403416
]
404417
},
405418
"com.palantir.tracing:tracing-api": {
406-
"locked": "1.1.0",
419+
"locked": "1.2.0",
407420
"transitive": [
408421
"com.palantir.tracing:tracing"
409422
]
410423
},
411424
"com.palantir.tracing:tracing-okhttp3": {
412-
"locked": "1.1.0",
425+
"locked": "1.2.0",
413426
"transitive": [
414427
"com.palantir.conjure.java.runtime:okhttp-clients"
415428
]
@@ -466,6 +479,7 @@
466479
"org.slf4j:slf4j-api": {
467480
"locked": "1.7.12",
468481
"transitive": [
482+
"com.netflix.concurrency-limits:concurrency-limits-core",
469483
"com.palantir.conjure.java.runtime:okhttp-clients",
470484
"com.palantir.tokens:auth-tokens",
471485
"com.palantir.tracing:tracing",

‎conjure-scala-jaxrs-client/versions.lock‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,12 @@
107107
"com.palantir.tracing:tracing"
108108
]
109109
},
110+
"com.netflix.concurrency-limits:concurrency-limits-core": {
111+
"locked": "0.1.1",
112+
"transitive": [
113+
"com.palantir.conjure.java.runtime:okhttp-clients"
114+
]
115+
},
110116
"com.netflix.feign:feign-core": {
111117
"locked": "8.17.0",
112118
"transitive": [
@@ -220,19 +226,19 @@
220226
]
221227
},
222228
"com.palantir.tracing:tracing": {
223-
"locked": "1.1.0",
229+
"locked": "1.2.0",
224230
"transitive": [
225231
"com.palantir.tracing:tracing-okhttp3"
226232
]
227233
},
228234
"com.palantir.tracing:tracing-api": {
229-
"locked": "1.1.0",
235+
"locked": "1.2.0",
230236
"transitive": [
231237
"com.palantir.tracing:tracing"
232238
]
233239
},
234240
"com.palantir.tracing:tracing-okhttp3": {
235-
"locked": "1.1.0",
241+
"locked": "1.2.0",
236242
"transitive": [
237243
"com.palantir.conjure.java.runtime:conjure-java-jaxrs-client",
238244
"com.palantir.conjure.java.runtime:okhttp-clients"
@@ -307,6 +313,7 @@
307313
"org.slf4j:slf4j-api": {
308314
"locked": "1.7.12",
309315
"transitive": [
316+
"com.netflix.concurrency-limits:concurrency-limits-core",
310317
"com.netflix.feign:feign-slf4j",
311318
"com.palantir.conjure.java.runtime:conjure-java-jaxrs-client",
312319
"com.palantir.conjure.java.runtime:okhttp-clients",
@@ -424,6 +431,12 @@
424431
"com.palantir.tracing:tracing"
425432
]
426433
},
434+
"com.netflix.concurrency-limits:concurrency-limits-core": {
435+
"locked": "0.1.1",
436+
"transitive": [
437+
"com.palantir.conjure.java.runtime:okhttp-clients"
438+
]
439+
},
427440
"com.netflix.feign:feign-core": {
428441
"locked": "8.17.0",
429442
"transitive": [
@@ -537,19 +550,19 @@
537550
]
538551
},
539552
"com.palantir.tracing:tracing": {
540-
"locked": "1.1.0",
553+
"locked": "1.2.0",
541554
"transitive": [
542555
"com.palantir.tracing:tracing-okhttp3"
543556
]
544557
},
545558
"com.palantir.tracing:tracing-api": {
546-
"locked": "1.1.0",
559+
"locked": "1.2.0",
547560
"transitive": [
548561
"com.palantir.tracing:tracing"
549562
]
550563
},
551564
"com.palantir.tracing:tracing-okhttp3": {
552-
"locked": "1.1.0",
565+
"locked": "1.2.0",
553566
"transitive": [
554567
"com.palantir.conjure.java.runtime:conjure-java-jaxrs-client",
555568
"com.palantir.conjure.java.runtime:okhttp-clients"
@@ -624,6 +637,7 @@
624637
"org.slf4j:slf4j-api": {
625638
"locked": "1.7.12",
626639
"transitive": [
640+
"com.netflix.concurrency-limits:concurrency-limits-core",
627641
"com.netflix.feign:feign-slf4j",
628642
"com.palantir.conjure.java.runtime:conjure-java-jaxrs-client",
629643
"com.palantir.conjure.java.runtime:okhttp-clients",

‎okhttp-clients/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ dependencies {
77
compile project(':client-config')
88
compile "com.palantir.tracing:tracing-okhttp3"
99
compile 'com.google.guava:guava'
10+
compile 'com.netflix.concurrency-limits:concurrency-limits-core'
1011
compile "com.palantir.conjure.java.api:errors"
1112
compile 'com.palantir.safe-logging:preconditions'
1213
compile 'com.palantir.tritium:tritium-registry'

0 commit comments

Comments
 (0)