diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 11a6441070..596e09e939 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -40,9 +40,10 @@ 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-55163 (https://github.com/advisories/GHSA-prj3-ccx8-p6x4). - // Remove once https://github.com/aws/aws-sdk-java-v2/pull/6344 is released. - "io.netty:netty-bom:4.1.124.Final", + // 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", diff --git a/lambda-layer/otel-instrument b/lambda-layer/otel-instrument index 07815ea51b..662520d8b4 100644 --- a/lambda-layer/otel-instrument +++ b/lambda-layer/otel-instrument @@ -2,7 +2,7 @@ export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true -export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-baggage,xray,tracecontext,b3,b3multi}" +export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-baggage,xray,tracecontext}" export OTEL_SERVICE_NAME=${OTEL_SERVICE_NAME:-${AWS_LAMBDA_FUNCTION_NAME}}