Support ADOT V1.x to latest otel versions.

Author: zzhlogin

appsignals-tests/images/grpc/grpc-base/build.gradle.kts

@@ -18,6 +18,11 @@ plugins {
   id("com.google.protobuf") version "0.9.4"
 }
 
+java {
+  sourceCompatibility = JavaVersion.VERSION_11
+  targetCompatibility = JavaVersion.VERSION_11
+}
+
 group = "software.amazon.opentelemetry"
 
 dependencies {

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 {

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();

build.gradle.kts

@@ -21,6 +21,8 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 plugins {
   java
 
+//  kotlin("jvm") version "2.1.0-RC2"
+//  id("com.diffplug.spotless") version "6.25.0"
   id("com.diffplug.spotless")
   id("com.github.jk1.dependency-license-report")
   id("io.github.gradle-nexus.publish-plugin")
@@ -68,7 +70,7 @@ allprojects {
 
   spotless {
     kotlinGradle {
-      ktlint("0.48.0").userData(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
+      ktlint("1.4.0").editorConfigOverride(mapOf("indent_size" to "2", "continuation_indent_size" to "2"))
 
       // Doesn't support pluginManagement block
       targetExclude("settings.gradle.kts")
@@ -81,8 +83,8 @@ allprojects {
 
   plugins.withId("java") {
     java {
-      sourceCompatibility = JavaVersion.VERSION_1_8
-      targetCompatibility = JavaVersion.VERSION_1_8
+      sourceCompatibility = JavaVersion.VERSION_21
+      targetCompatibility = JavaVersion.VERSION_21
 
       withJavadocJar()
       withSourcesJar()

dependencyManagement/build.gradle.kts

@@ -24,16 +24,16 @@ plugins {
 
 data class DependencySet(val group: String, val version: String, val modules: List<String>)
 
-val TEST_SNAPSHOTS = rootProject.findProperty("testUpstreamSnapshots") == "true"
+val testSnapshots = 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 otelAlphaVersion = if (!TEST_SNAPSHOTS) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
-val otelJavaAgentVersion = if (!TEST_SNAPSHOTS) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
+val otelVersion = "1.33.6"
+val otelSnapshotVersion = "1.33.6"
+val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
+val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
 // All versions below are only used in testing and do not affect the released artifact.
 
-val DEPENDENCY_BOMS = listOf(
+val dependencyBoms = listOf(
   "com.amazonaws:aws-java-sdk-bom:1.12.599",
   "com.fasterxml.jackson:jackson-bom:2.16.0",
   "com.google.guava:guava-bom:33.0.0-jre",
@@ -48,7 +48,7 @@ val DEPENDENCY_BOMS = listOf(
   "software.amazon.awssdk:bom:2.21.33",
 )
 
-val DEPENDENCY_SETS = listOf(
+val dependencySets = listOf(
   DependencySet(
     "org.assertj",
     "3.24.2",
@@ -69,14 +69,15 @@ val DEPENDENCY_SETS = listOf(
   ),
 )
 
-val DEPENDENCIES = listOf(
+val dependencyLists = 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",
 )
 
@@ -85,17 +86,17 @@ javaPlatform {
 }
 
 dependencies {
-  for (bom in DEPENDENCY_BOMS) {
+  for (bom in dependencyBoms) {
     api(platform(bom))
   }
   constraints {
-    for (set in DEPENDENCY_SETS) {
+    for (set in dependencySets) {
       for (module in set.modules) {
         api("${set.group}:$module:${set.version}")
       }
     }
 
-    for (dependency in DEPENDENCIES) {
+    for (dependency in dependencyLists) {
       api(dependency)
     }
   }
@@ -104,7 +105,7 @@ dependencies {
 rootProject.allprojects {
   plugins.withId("com.github.jk1.dependency-license-report") {
     configure<LicenseReportExtension> {
-      val bomExcludes = DEPENDENCY_BOMS.stream()
+      val bomExcludes = dependencyBoms.stream()
         .map { it.substring(0, it.lastIndexOf(':')) }
         .toArray { length -> arrayOfNulls<String>(length) }
       excludes = bomExcludes

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

gradlew.bat

@@ -21,8 +21,8 @@ plugins {
 base.archivesBaseName = "aws-instrumentation-log4j-2.13.2"
 
 dependencies {
-  compileOnly("io.opentelemetry:opentelemetry-api")
-  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
+  compileOnly("io.opentelemetry:opentelemetry-api:1.44.1")
+  compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api:2.10.0-alpha")
   compileOnly("net.bytebuddy:byte-buddy")
 
   compileOnly("org.apache.logging.log4j:log4j-core:2.22.1")