Upgrade smoke tests to use JDK version 21.

Author: zzhlogin

.github/workflows/main-build.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - main
       - "release/v*"
+      - version-upgrade-v1
 env:
   AWS_DEFAULT_REGION: us-east-1
   STAGING_ECR_REGISTRY: 611364707713.dkr.ecr.us-west-2.amazonaws.com

instrumentation/logback-1.0/src/main/java/software/amazon/opentelemetry/javaagent/instrumentation/logback_1_0/AwsXrayLoggingEventInstrumentation.java

@@ -79,14 +79,19 @@ public static void onExit(
 
       SpanContext spanContext = Java8BytecodeBridge.spanFromContext(context).getSpanContext();
 
+      // Using StringBuilder instead of + for string concatenation avoids generating invokedynamic
+      // instructions introduced in Java 9+, ensuring compatibility with Java 6 class files.
+      // This approach explicitly constructs the string, producing bytecode compatible with older
+      // versions.
       if (spanContext.isValid()) {
-        String value =
-            "1-"
-                + spanContext.getTraceId().substring(0, 8)
-                + "-"
-                + spanContext.getTraceId().substring(8)
-                + "@"
-                + spanContext.getSpanId();
+        StringBuilder valueBuilder = new StringBuilder("1-");
+        valueBuilder
+            .append(spanContext.getTraceId().substring(0, 8))
+            .append("-")
+            .append(spanContext.getTraceId().substring(8))
+            .append("@")
+            .append(spanContext.getSpanId());
+        String value = valueBuilder.toString();
         spanContextData.put(TRACE_ID_KEY, value);
       }
 

otelagent/build.gradle.kts

@@ -136,8 +136,8 @@ tasks {
 
 jib {
   configureImages(
-    "gcr.io/distroless/java17-debian11:debug",
-    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "gcr.io/distroless/java21-debian12:debug",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
     localDocker = false,
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
   )

sample-apps/spark-awssdkv1/build.gradle.kts

@@ -22,8 +22,8 @@ application {
 
 jib {
   configureImages(
-    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/aws-otel-test/aws-otel-java-spark-awssdkv1",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark-awssdkv1",
     localDocker = rootProject.property("localDocker")!!.equals("true"),
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

sample-apps/spark/build.gradle.kts

@@ -28,8 +28,8 @@ application {
 jib {
 
   configureImages(
-    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/aws-otel-test/aws-otel-java-spark",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark",
     localDocker = rootProject.property("localDocker")!!.equals("true"),
     multiPlatform = !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

sample-apps/springboot/build.gradle.kts

@@ -17,8 +17,8 @@ dependencies {
 
 jib {
   configureImages(
-    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/aws-otel-test/aws-otel-java-springboot",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-springboot",
     rootProject.property("localDocker")!!.equals("true"),
     !rootProject.property("localDocker")!!.equals("true"),
     tags = setOf("latest", "${System.getenv("COMMIT_HASH")}"),

smoke-tests/fakebackend/build.gradle.kts

@@ -33,7 +33,7 @@ dependencies {
 
 jib {
   to {
-    image = "public.ecr.aws/u0d6r4y4/aws-otel-java-test-fakebackend:alpha"
+    image = "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-test-fakebackend:alpha"
   }
   from {
     image = "gcr.io/distroless/java17-debian11:debug"

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/LogInjectionTest.java

@@ -40,7 +40,7 @@ class LogInjectionTest {
 
   @Container
   private static final GenericContainer<?> log4jApp =
-      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-spark:latest")
+      new GenericContainer<>("public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-spark:latest")
           .withExposedPorts(4567)
           .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("log4j")))
           .withLogConsumer(log4jString)
@@ -54,7 +54,8 @@ class LogInjectionTest {
 
   @Container
   private static final GenericContainer<?> logbackApp =
-      new GenericContainer<>("public.ecr.aws/aws-otel-test/aws-otel-java-springboot:latest")
+      new GenericContainer<>(
+              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-springboot:latest")
           .withExposedPorts(8080)
           .withLogConsumer(new Slf4jLogConsumer(LoggerFactory.getLogger("logback")))
           .withLogConsumer(logbackString)

smoke-tests/runner/src/test/java/io/awsobservability/instrumentation/smoketests/runner/SpringBootSmokeTest.java

@@ -108,7 +108,7 @@ public ExportTraceServiceRequest deserialize(
   @Container
   private static final GenericContainer<?> application =
       new GenericContainer<>(
-              "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
+              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
           .dependsOn(backend)
           .withExposedPorts(8080)
           .withNetwork(network)
@@ -124,7 +124,7 @@ public ExportTraceServiceRequest deserialize(
   @Container
   private static final GenericContainer<?> applicationXraySampler =
       new GenericContainer<>(
-              "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
+              "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot:latest")
           .dependsOn(backend)
           .withExposedPorts(8080)
           .withNetwork(network)

smoke-tests/spring-boot/build.gradle.kts

@@ -47,9 +47,9 @@ dependencies {
 
 jib {
   configureImages(
-    "public.ecr.aws/aws-otel-test/aws-opentelemetry-java-base:alpha",
-    "public.ecr.aws/aws-otel-test/aws-otel-java-smoketests-springboot",
-    localDocker = rootProject.property("localDocker")!!.equals("true"),
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-opentelemetry-java-base:alpha",
+    "public.ecr.aws/u8q5x3l1/aws-otel-test/aws-otel-java-smoketests-springboot",
+    localDocker = false,
     multiPlatform = false,
   )
 }