diff --git a/CHANGELOG.md b/CHANGELOG.md index d1a1691bca..fc426a2eca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,4 +18,6 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t - Support X-Ray Trace Id extraction from Lambda Context object, and respect user-configured OTEL_PROPAGATORS in AWS Lamdba instrumentation ([#1191](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1191)) ([#1218](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1218)) - Adaptive Sampling improvements: Ensure propagation of sampling rule across services and AWS accounts. Remove unnecessary B3 propagator. - ([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201)) \ No newline at end of file + ([#1201](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1201)) +- fix: Remove Netty as an agent dependency + ([#1206](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1206)) diff --git a/appsignals-tests/contract-tests/build.gradle.kts b/appsignals-tests/contract-tests/build.gradle.kts index 0a90f08fb3..11179de989 100644 --- a/appsignals-tests/contract-tests/build.gradle.kts +++ b/appsignals-tests/contract-tests/build.gradle.kts @@ -52,8 +52,8 @@ dependencies { testImplementation("org.testcontainers:junit-jupiter") testImplementation("io.opentelemetry.contrib:opentelemetry-aws-xray") testImplementation("org.testcontainers:localstack") - testImplementation("software.amazon.awssdk:s3") - testImplementation("software.amazon.awssdk:sts") + testImplementation("software.amazon.awssdk:s3:2.33.11") + testImplementation("software.amazon.awssdk:sts:2.33.11") testImplementation(kotlin("test")) implementation(project(":appsignals-tests:images:grpc:grpc-base")) testImplementation("org.testcontainers:kafka:1.21.3") diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts index 5cc97b14fc..cc31042d26 100644 --- a/awsagentprovider/build.gradle.kts +++ b/awsagentprovider/build.gradle.kts @@ -50,7 +50,6 @@ dependencies { compileOnly("io.opentelemetry:opentelemetry-exporter-otlp-common") // For OtlpAwsExporter SigV4 Authentication - runtimeOnly("software.amazon.awssdk:sts") implementation("software.amazon.awssdk:auth") implementation("software.amazon.awssdk:http-auth-aws") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index cf5f3c2f26..9bab770351 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -40,16 +40,11 @@ val dependencyBoms = listOf( "com.google.protobuf:protobuf-bom:3.25.1", "com.linecorp.armeria:armeria-bom:1.26.4", "io.grpc:grpc-bom:1.59.1", - // netty-bom is a fix for CVE-2025-58056 (https://github.com/advisories/GHSA-fghv-69vj-qj49). - // Remove once https://github.com/aws/aws-sdk-java-v2/pull/6398 and https://github.com/aws/aws-sdk-java/pull/3192 - // are both merged and released, and we update the corresponding dependencies. - "io.netty:netty-bom:4.1.126.Final", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:$otelAlphaVersion", "org.apache.logging.log4j:log4j-bom:2.21.1", "org.junit:junit-bom:5.10.1", "org.springframework.boot:spring-boot-dependencies:2.7.17", "org.testcontainers:testcontainers-bom:1.19.3", - "software.amazon.awssdk:bom:2.30.17", ) val dependencySets = listOf( @@ -103,6 +98,9 @@ dependencies { for (dependency in dependencyLists) { api(dependency) } + + api("software.amazon.awssdk:auth:2.33.11") + api("software.amazon.awssdk:aws-core:2.33.11") } } diff --git a/sample-apps/spark/build.gradle.kts b/sample-apps/spark/build.gradle.kts index 1dc88e3192..2e3bdecfea 100644 --- a/sample-apps/spark/build.gradle.kts +++ b/sample-apps/spark/build.gradle.kts @@ -15,8 +15,8 @@ dependencies { implementation("com.squareup.okhttp3:okhttp") implementation("io.opentelemetry:opentelemetry-api") implementation("org.apache.logging.log4j:log4j-core") - implementation("software.amazon.awssdk:s3") - implementation("software.amazon.awssdk:sts") + implementation("software.amazon.awssdk:s3:2.33.11") + implementation("software.amazon.awssdk:sts:2.33.11") runtimeOnly("org.apache.logging.log4j:log4j-slf4j-impl") } diff --git a/sample-apps/springboot/build.gradle.kts b/sample-apps/springboot/build.gradle.kts index 2d4844fcc4..ed10ac1be0 100644 --- a/sample-apps/springboot/build.gradle.kts +++ b/sample-apps/springboot/build.gradle.kts @@ -10,8 +10,8 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter") implementation("com.squareup.okhttp3:okhttp") - implementation("software.amazon.awssdk:s3") - implementation("software.amazon.awssdk:sts") + implementation("software.amazon.awssdk:s3:2.33.11") + implementation("software.amazon.awssdk:sts:2.33.11") implementation("io.opentelemetry:opentelemetry-api") }