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

This updates upstream dependency OTel Java Agent to v2.18.1 and upgrades upstream OTel Contrib to v1.48.0.

It removes the Remote Sampling patch file, as that code has been migrated to upstream OTel Contrib v1.48.0.

Tests:
- Unit tests pass: ./gradlew build test
- Smoke/Contract tests pass: ./gradlew appsignals-tests:contract-tests:contractTests
- X-Ray remote sampling service end-to-end manual tests pass
- EC2 end-to-end tests with SpringBoot Java app pass
- Lambda end-to-end tests with SpringBoot Java app pass

Author: lukeina2z

.github/patches/opentelemetry-java-contrib.patch

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

.github/patches/versions

@@ -4,6 +4,8 @@ build/
 
 .DS_Store
 
+.vscode
+
 # Ignore Gradle GUI config
 gradle-app.setting
 

.gitignore

@@ -108,6 +108,7 @@ allprojects {
       testImplementation("org.junit.jupiter:junit-jupiter-api")
       testImplementation("org.junit.jupiter:junit-jupiter-params")
       testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
+      testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     }
 
     spotless {

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",

dependencyManagement/build.gradle.kts

@@ -31,22 +31,6 @@ patch -p1 < "$SOURCEDIR"/patches/StreamHandlerInstrumentation.patch
 popd
 rm -rf opentelemetry-java-instrumentation
 
-contrib_version=$(awk -F'=v' '/OTEL_JAVA_CONTRIB_VERSION/ {print $2}' "$file")
-if [[ -n "$contrib_version" ]]; then
-  echo "Found OTEL Contrib Version: ${contrib_version}"
-  ## Clone and Patch the OpenTelemetry Java contrib Repository
-  echo "Info: Cloning and Patching OpenTelemetry Java contrib Repository"
-  git clone https://github.com/open-telemetry/opentelemetry-java-contrib.git
-  pushd opentelemetry-java-contrib
-  git checkout v${contrib_version} -b tag-v${contrib_version}
-
-  # There is another patch in the .github/patches directory for other changes. We should apply them too for consistency.
-  patch -p1 < "$SOURCEDIR"/../.github/patches/opentelemetry-java-contrib.patch
-
-  ./gradlew publishToMavenLocal
-  popd
-  rm -rf opentelemetry-java-contrib
-fi
 
 ## Build the ADOT Java from current source
 echo "Info: Building ADOT Java from current source"