Merge branch 'main' into update_semantic

zzhlogin · web-flow · commit 2f62485df9fc · 2024-12-11T09:44:54.000-08:00
diff --git a/.github/patches/opentelemetry-java-instrumentation.patch b/.github/patches/opentelemetry-java-instrumentation.patch
diff --git a/.github/patches/versions b/.github/patches/versions
@@ -1 +1 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1
+OTEL_JAVA_INSTRUMENTATION_VERSION=v1.33.6
diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
@@ -194,7 +194,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: gradle/wrapper-validation-action@v1
 
@@ -219,7 +219,7 @@ jobs:
           key: ${{ runner.os }}-maven-local-${{ hashFiles('.github/patches/opentelemetry-java*.patch') }}
 
       - name: Pull base image of Contract Tests Sample Apps
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Build snapshot with Gradle
         uses: gradle/gradle-build-action@v3
diff --git a/.github/workflows/nightly-upstream-snapshot-build.yml b/.github/workflows/nightly-upstream-snapshot-build.yml
@@ -120,7 +120,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-java@v4
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - uses: gradle/wrapper-validation-action@v1
 
@@ -136,7 +136,7 @@ jobs:
           registry: public.ecr.aws
 
       - name: Pull base image of Contract Tests Sample Apps
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Build snapshot with Gradle
         uses: gradle/gradle-build-action@v3
diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -81,16 +81,28 @@ jobs:
         with:
           arguments: build integrationTests --stacktrace -PenableCoverage=true -PlocalDocker=true
 
+      - name: Set up Java version for tests
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: temurin
+
       - name: Pull base image of Contract Tests Sample Apps
         if: ${{ matrix.os == 'ubuntu-latest' }}
-        run: docker pull public.ecr.aws/docker/library/amazoncorretto:17-alpine
+        run: docker pull public.ecr.aws/docker/library/amazoncorretto:21-alpine
 
       - name: Run contract tests
         uses: gradle/gradle-build-action@v3
         if: ${{ matrix.os == 'ubuntu-latest' }}
         with:
           arguments: contractTests -PlocalDocker=true -i
 
+      - name: Set up Java version for image build
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
       - name: Get current version
         if: ${{ matrix.os == 'ubuntu-latest' }}
         shell: bash
diff --git a/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts b/appsignals-tests/images/aws-sdk/aws-sdk-v1/build.gradle.kts
@@ -57,7 +57,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-aws-sdk-v1",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts b/appsignals-tests/images/aws-sdk/aws-sdk-v2/build.gradle.kts
@@ -57,7 +57,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-aws-sdk-v2",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/grpc/grpc-client/build.gradle.kts b/appsignals-tests/images/grpc/grpc-client/build.gradle.kts
@@ -41,7 +41,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "grpc-client",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/grpc/grpc-server/build.gradle.kts b/appsignals-tests/images/grpc/grpc-server/build.gradle.kts
@@ -46,7 +46,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "grpc-server",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-clients/apache-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/apache-http-client/build.gradle.kts
@@ -43,7 +43,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-apache-http-client-app",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-clients/native-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/native-http-client/build.gradle.kts
@@ -42,7 +42,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-native-http-client-app",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-clients/netty-http-client/build.gradle.kts b/appsignals-tests/images/http-clients/netty-http-client/build.gradle.kts
@@ -43,7 +43,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-netty-http-client-app",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-clients/spring-mvc-client/build.gradle.kts b/appsignals-tests/images/http-clients/spring-mvc-client/build.gradle.kts
@@ -39,7 +39,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-spring-mvc-client-app",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-servers/netty-server/build.gradle.kts b/appsignals-tests/images/http-servers/netty-server/build.gradle.kts
@@ -42,7 +42,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-http-server-netty-server",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-servers/spring-mvc/build.gradle.kts b/appsignals-tests/images/http-servers/spring-mvc/build.gradle.kts
@@ -41,7 +41,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-http-server-spring-mvc",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/http-servers/tomcat/build.gradle.kts b/appsignals-tests/images/http-servers/tomcat/build.gradle.kts
@@ -44,7 +44,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-http-server-tomcat",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/jdbc/build.gradle.kts b/appsignals-tests/images/jdbc/build.gradle.kts
@@ -45,7 +45,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-jdbc-app",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/kafka/kafka-consumers/build.gradle.kts b/appsignals-tests/images/kafka/kafka-consumers/build.gradle.kts
@@ -47,7 +47,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-kafka-kafka-consumers",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/kafka/kafka-producers/build.gradle.kts b/appsignals-tests/images/kafka/kafka-producers/build.gradle.kts
@@ -47,7 +47,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-tests-kafka-kafka-producers",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/appsignals-tests/images/mock-collector/build.gradle.kts b/appsignals-tests/images/mock-collector/build.gradle.kts
@@ -42,7 +42,7 @@ tasks {
 }
 jib {
   configureImages(
-    "public.ecr.aws/docker/library/amazoncorretto:17-alpine",
+    "public.ecr.aws/docker/library/amazoncorretto:21-alpine",
     "aws-appsignals-mock-collector",
     localDocker = rootProject.property("localDocker")!! == "true",
     multiPlatform = false,
diff --git a/awsagentprovider/build.gradle.kts b/awsagentprovider/build.gradle.kts
@@ -51,8 +51,8 @@ dependencies {
   testRuntimeOnly("io.opentelemetry:opentelemetry-exporter-otlp-common")
 
   compileOnly("com.google.code.findbugs:jsr305:3.0.2")
-  testImplementation("org.mockito:mockito-core:5.3.1")
-  testImplementation("org.mockito:mockito-junit-jupiter:5.8.0")
+  testImplementation("org.mockito:mockito-core:5.14.2")
+  testImplementation("org.mockito:mockito-junit-jupiter:5.14.2")
 }
 
 tasks {
diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java
@@ -129,7 +129,9 @@ private SpanData buildSpanDataMock() {
     when(mockSpanData.getParentSpanContext()).thenReturn(parentSpanContextMock);
 
     SpanContext spanContextMock = mock(SpanContext.class);
+    TraceFlags spanContextTraceFlagsMock = mock(TraceFlags.class);
     when(spanContextMock.isValid()).thenReturn(true);
+    when(spanContextMock.getTraceFlags()).thenReturn(spanContextTraceFlagsMock);
     when(mockSpanData.getSpanContext()).thenReturn(spanContextMock);
 
     TraceState traceState = TraceState.builder().build();
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -27,8 +27,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "1.32.1-adot2"
-val otelSnapshotVersion = "1.33.0"
+val otelVersion = "1.33.6-adot1"
+val otelSnapshotVersion = "1.33.6"
 val otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
 val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // All versions below are only used in testing and do not affect the released artifact.
@@ -73,10 +73,11 @@ val DEPENDENCIES = listOf(
   "commons-logging:commons-logging:1.2",
   "com.sparkjava:spark-core:2.9.4",
   "com.squareup.okhttp3:okhttp:4.12.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.32.0",
-  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.32.0-alpha",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.39.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha",
   "io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha",
   "io.opentelemetry.javaagent:opentelemetry-javaagent:$otelJavaAgentVersion",
+  "io.opentelemetry:opentelemetry-extension-aws:1.20.1",
   "net.bytebuddy:byte-buddy:1.14.10",
 )
 
diff --git a/scripts/docker/corretto-slim/Dockerfile b/scripts/docker/corretto-slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM public.ecr.aws/docker/library/amazoncorretto:17-alpine-jdk
+FROM public.ecr.aws/docker/library/amazoncorretto:21-alpine-jdk
 
 # Copied from https://github.com/corretto/corretto-docker/blob/master/11/jre/alpine/Dockerfile
 RUN apk update && apk add binutils && jlink --endian little --release-info $JAVA_HOME/release \

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OTEL_JAVA_INSTRUMENTATION_VERSION=v1.32.1`
	`1`	`+OTEL_JAVA_INSTRUMENTATION_VERSION=v1.33.6`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ tasks {`
`57`	`57`	`}`
`58`	`58`	`jib {`
`59`	`59`	`configureImages(`
`60`		`- "public.ecr.aws/docker/library/amazoncorretto:17-alpine",`
	`60`	`+ "public.ecr.aws/docker/library/amazoncorretto:21-alpine",`
`61`	`61`	`"aws-appsignals-tests-aws-sdk-v1",`
`62`	`62`	`localDocker = rootProject.property("localDocker")!! == "true",`
`63`	`63`	`multiPlatform = false,`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ tasks {`
`41`	`41`	`}`
`42`	`42`	`jib {`
`43`	`43`	`configureImages(`
`44`		`- "public.ecr.aws/docker/library/amazoncorretto:17-alpine",`
	`44`	`+ "public.ecr.aws/docker/library/amazoncorretto:21-alpine",`
`45`	`45`	`"grpc-client",`
`46`	`46`	`localDocker = rootProject.property("localDocker")!! == "true",`
`47`	`47`	`multiPlatform = false,`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ tasks {`
`46`	`46`	`}`
`47`	`47`	`jib {`
`48`	`48`	`configureImages(`
`49`		`- "public.ecr.aws/docker/library/amazoncorretto:17-alpine",`
	`49`	`+ "public.ecr.aws/docker/library/amazoncorretto:21-alpine",`
`50`	`50`	`"grpc-server",`
`51`	`51`	`localDocker = rootProject.property("localDocker")!! == "true",`
`52`	`52`	`multiPlatform = false,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ tasks {`
`43`	`43`	`}`
`44`	`44`	`jib {`
`45`	`45`	`configureImages(`
`46`		`- "public.ecr.aws/docker/library/amazoncorretto:17-alpine",`
	`46`	`+ "public.ecr.aws/docker/library/amazoncorretto:21-alpine",`
`47`	`47`	`"aws-appsignals-tests-apache-http-client-app",`
`48`	`48`	`localDocker = rootProject.property("localDocker")!! == "true",`
`49`	`49`	`multiPlatform = false,`