Skip to content

Commit 61bdb6b

Browse files
authored
Update dependencies and Otel to v1.28.0 (#469)
* Update dependencies and Otel to v1.28.0 Signed-off-by: Raphael Silva <[email protected]> * Fix: fix changes in API Signed-off-by: Raphael Silva <[email protected]> --------- Signed-off-by: Raphael Silva <[email protected]>
1 parent 2a61c77 commit 61bdb6b

File tree

96 files changed

+1510
-1552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1510
-1552
lines changed

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsTracerConfigurerTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ private AutoConfiguredOpenTelemetrySdkBuilder createSdkBuilder() {
4141
})
4242
.addPropertiesSupplier(() -> singletonMap("otel.metrics.exporter", "none"))
4343
.addPropertiesSupplier(() -> singletonMap("otel.traces.exporter", "none"))
44-
.addPropertiesSupplier(() -> singletonMap("otel.logs.exporter", "none"))
45-
.setResultAsGlobal(false);
44+
.addPropertiesSupplier(() -> singletonMap("otel.logs.exporter", "none"));
4645
}
4746
// The probability of this passing once without correct IDs is low, 20 times is inconceivable.
4847
@RepeatedTest(20)

dependencyManagement/build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "1.27.0"
31-
val otelSnapshotVersion = "1.28.0"
30+
val otelVersion = "1.28.0"
31+
val otelSnapshotVersion = "1.29.0"
3232

3333
// All versions below are only used in testing and do not affect the released artifact.
3434

3535
val DEPENDENCY_BOMS = listOf(
36-
"com.amazonaws:aws-java-sdk-bom:1.12.496",
36+
"com.amazonaws:aws-java-sdk-bom:1.12.505",
3737
"com.fasterxml.jackson:jackson-bom:2.15.2",
38-
"com.google.guava:guava-bom:32.0.1-jre",
39-
"com.google.protobuf:protobuf-bom:3.23.3",
40-
"com.linecorp.armeria:armeria-bom:1.24.1",
41-
"io.grpc:grpc-bom:1.56.0",
38+
"com.google.guava:guava-bom:32.1.1-jre",
39+
"com.google.protobuf:protobuf-bom:3.23.4",
40+
"com.linecorp.armeria:armeria-bom:1.24.2",
41+
"io.grpc:grpc-bom:1.56.1",
4242
"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"}",
4343
"org.apache.logging.log4j:log4j-bom:2.20.0",
4444
"org.junit:junit-bom:5.9.3",
4545
"org.springframework.boot:spring-boot-dependencies:2.7.13",
4646
"org.testcontainers:testcontainers-bom:1.18.3",
47-
"software.amazon.awssdk:bom:2.20.93"
47+
"software.amazon.awssdk:bom:2.20.102"
4848
)
4949

5050
val DEPENDENCY_SETS = listOf(

0 commit comments

Comments
 (0)