Skip to content

Commit bdd590d

Browse files
authored
Update to Otel 1.11 and other dependencies (#228)
* Update to OTel 1.11 * Update more
1 parent d55d9e4 commit bdd590d

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/XraySamplerClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ final class XraySamplerClient {
6464

6565
private final String getSamplingRulesEndpoint;
6666
private final String getSamplingTargetsEndpoint;
67-
private final Call.Factory httpClient;
67+
private final OkHttpClient httpClient;
6868

6969
XraySamplerClient(String host) {
7070
this.getSamplingRulesEndpoint = host + "/GetSamplingRules";
@@ -94,7 +94,7 @@ private <T> T executeJsonRequest(String endpoint, Object request, Class<T> respo
9494
httpClient.newCall(
9595
new Request.Builder()
9696
.url(endpoint)
97-
.post(RequestBody.create(JSON_CONTENT_TYPE, requestBody))
97+
.post(RequestBody.create(requestBody, JSON_CONTENT_TYPE))
9898
.build());
9999

100100
String response;

dependencyManagement/build.gradle.kts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ val dependencyVersions = hashMapOf<String, String>()
1212
rootProject.extra["versions"] = dependencyVersions
1313

1414
val DEPENDENCY_BOMS = listOf(
15-
"com.fasterxml.jackson:jackson-bom:2.13.0",
15+
"com.fasterxml.jackson:jackson-bom:2.13.1",
1616
"com.google.guava:guava-bom:31.0.1-jre",
17-
"com.linecorp.armeria:armeria-bom:1.13.3",
17+
"com.linecorp.armeria:armeria-bom:1.14.0",
1818
"org.junit:junit-bom:5.8.2",
1919
"com.linecorp.armeria:armeria-bom:1.9.1",
2020
"io.grpc:grpc-bom:1.42.1",
21-
"io.opentelemetry:opentelemetry-bom:1.10.0",
22-
"io.opentelemetry:opentelemetry-bom-alpha:1.10.0-alpha",
23-
"org.testcontainers:testcontainers-bom:1.16.2"
21+
"io.opentelemetry:opentelemetry-bom:1.11.0",
22+
"io.opentelemetry:opentelemetry-bom-alpha:1.11.0-alpha",
23+
"org.testcontainers:testcontainers-bom:1.16.3"
2424
)
2525

2626
val DEPENDENCY_SETS = listOf(
@@ -31,7 +31,7 @@ val DEPENDENCY_SETS = listOf(
3131
),
3232
DependencySet(
3333
"com.google.auto.value",
34-
"1.8.2",
34+
"1.9",
3535
listOf("auto-value", "auto-value-annotations")
3636
),
3737
DependencySet(
@@ -46,22 +46,22 @@ val DEPENDENCY_SETS = listOf(
4646
),
4747
DependencySet(
4848
"org.mockito",
49-
"4.1.0",
49+
"4.3.1",
5050
listOf("mockito-core", "mockito-junit-jupiter")
5151
),
5252
DependencySet(
5353
"org.slf4j",
54-
"1.7.32",
54+
"1.7.36",
5555
listOf("slf4j-api", "slf4j-simple", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j")
5656
)
5757
)
5858

5959
val DEPENDENCIES = listOf(
6060
"com.google.code.findbugs:annotations:3.0.1u2",
6161
"com.google.code.findbugs:jsr305:3.0.2",
62-
"com.squareup.okhttp3:okhttp:3.14.9",
63-
"com.uber.nullaway:nullaway:0.9.2",
64-
"org.assertj:assertj-core:3.21.0",
62+
"com.squareup.okhttp3:okhttp:4.9.3",
63+
"com.uber.nullaway:nullaway:0.9.5",
64+
"org.assertj:assertj-core:3.22.0",
6565
"org.awaitility:awaitility:4.1.1",
6666
"org.junit-pioneer:junit-pioneer:1.5.0",
6767
"org.skyscreamer:jsonassert:1.5.0"

0 commit comments

Comments
 (0)