Merge branch 'main' into dependabot/gradle/com.diffplug.spotless-7.0.3

thpierce · web-flow · commit 11f63553d9c6 · 2025-09-10T08:13:02.000-07:00
diff --git a/instrumentation/log4j-2.13.2/build.gradle.kts b/instrumentation/log4j-2.13.2/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("net.bytebuddy:byte-buddy")
 
-  compileOnly("org.apache.logging.log4j:log4j-core:2.22.1")
+  compileOnly("org.apache.logging.log4j:log4j-core:2.25.1")
 }
diff --git 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}}
 
diff --git a/sample-apps/udp-exporter-test-app/build.gradle.kts b/sample-apps/udp-exporter-test-app/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
   id("java")
-  kotlin("jvm") version "1.9.0"
+  kotlin("jvm") version "2.1.0-RC2"
   id("io.spring.dependency-management") version "1.1.0"
   id("org.springframework.boot") version "2.7.17"
 }

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ dependencies {`
`25`	`25`	`compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")`
`26`	`26`	`compileOnly("net.bytebuddy:byte-buddy")`
`27`	`27`
`28`		`- compileOnly("org.apache.logging.log4j:log4j-core:2.22.1")`
	`28`	`+ compileOnly("org.apache.logging.log4j:log4j-core:2.25.1")`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("java")`
`3`		`- kotlin("jvm") version "1.9.0"`
	`3`	`+ kotlin("jvm") version "2.1.0-RC2"`
`4`	`4`	`id("io.spring.dependency-management") version "1.1.0"`
`5`	`5`	`id("org.springframework.boot") version "2.7.17"`
`6`	`6`	`}`