Merge branch 'main' into zhaez/changelog

ezhang6811 · web-flow · commit 85a7cfe18ac7 · 2025-09-15T10:45:03.000-07:00
diff --git a/.github/workflows/e2e-tests-with-operator.yml b/.github/workflows/e2e-tests-with-operator.yml
@@ -97,7 +97,7 @@ jobs:
           path: aws-otel-java-instrumentation
 
       - name: Set up Go 1.x
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '~1.18.9'
 
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
`@@ -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`	`}`