fix(deps): update OTel Java Agent to v2.18.1 and OTel Contrib to v1.48.0

.github/patches/versions

@@ -1,2 +1 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v2.11.0
-OTEL_JAVA_CONTRIB_VERSION=v1.39.0
+OTEL_JAVA_INSTRUMENTATION_VERSION=v2.18.1

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/UdpExporterTest.java

@@ -17,6 +17,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.*;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -36,8 +37,10 @@ public class UdpExporterTest {
   public void testUdpExporterWithDefaults() {
     OtlpUdpSpanExporter exporter = new OtlpUdpSpanExporterBuilder().build();
     UdpSender sender = exporter.getSender();
-    assertThat(sender.getEndpoint().getHostName())
-        .isEqualTo("localhost"); // getHostName implicitly converts 127.0.0.1 to localhost
+    String senderEndpointHostName = sender.getEndpoint().getHostName();
+    // getHostName may or may not convert 127.0.0.1 to localhost
+    assertTrue(
+        senderEndpointHostName.equals("localhost") || senderEndpointHostName.equals("127.0.0.1"));
     assertThat(sender.getEndpoint().getPort()).isEqualTo(2000);
     assertThat(exporter.getPayloadPrefix()).endsWith("T1S");
   }

dependencyManagement/build.gradle.kts

@@ -27,8 +27,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
 
 // This is the version of the upstream instrumentation BOM
-val otelVersion = "2.11.0"
-val otelSnapshotVersion = "2.12.0"
+val otelVersion = "2.18.1"
+val otelSnapshotVersion = "2.19.0"
 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.
@@ -76,8 +76,8 @@ 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.39.0-adot1",
-  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.39.0-alpha",
+  "io.opentelemetry.contrib:opentelemetry-aws-xray:1.48.0",
+  "io.opentelemetry.contrib:opentelemetry-aws-resources:1.48.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",

instrumentation/aws-sdk/build.gradle.kts

@@ -41,4 +41,6 @@ dependencies {
   testImplementation("com.amazonaws:aws-java-sdk-sns:1.11.106")
   testImplementation("com.amazonaws:aws-java-sdk-stepfunctions:1.11.230")
   testImplementation("com.amazonaws:aws-java-sdk-secretsmanager:1.11.309")
+
+  testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }

lambda-layer/build-layer.sh

@@ -25,8 +25,6 @@ git checkout v${version} -b tag-v${version}
 # This patch is for Lambda related context propagation
 patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.patch
 
-patch -p1 < "$SOURCEDIR"/patches/StreamHandlerInstrumentation.patch
-
 ./gradlew publishToMavenLocal
 popd
 rm -rf opentelemetry-java-instrumentation