Revert 2.x changes to java

Author: vasireddy99

java/build.gradle.kts

@@ -28,12 +28,12 @@ val javaagentDependency by configurations.creating {
 }
 
 dependencies {
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.42.0"))
-    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.42.0-alpha"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom:1.32.0"))
+    compileOnly(platform("io.opentelemetry:opentelemetry-bom-alpha:1.32.0-alpha"))
     // Already included in wrapper so compileOnly
     compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
-    compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws:1.19.0")
-    javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:2.10.0")
+    compileOnly("io.opentelemetry:opentelemetry-sdk-extension-aws")
+    javaagentDependency("software.amazon.opentelemetry:aws-opentelemetry-agent:1.32.0-adot-lambda1")
 }
 
 tasks.register<Copy>("download") {

java/build.sh

@@ -2,6 +2,36 @@
 
 SOURCEDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 
+
+## revert https://github.com/open-telemetry/opentelemetry-java-instrumentation/pull/7970
+OTEL_VERSION="1.32.0"
+ADOT_VERSION="1.32.0"
+
+git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
+pushd opentelemetry-java-instrumentation
+git checkout v${OTEL_VERSION} -b tag-v${OTEL_VERSION}
+patch -p1 < "$SOURCEDIR"/../patches/opentelemetry-java-instrumentation.patch
+git add -A
+git commit -m "Create patch version"
+./gradlew publishToMavenLocal
+popd
+
+rm -rf opentelemetry-java-instrumentation
+
+
+git clone https://github.com/aws-observability/aws-otel-java-instrumentation.git
+
+pushd aws-otel-java-instrumentation
+
+git checkout v${ADOT_VERSION} -b tag-v${ADOT_VERSION}
+patch -p1 < "${SOURCEDIR}"/../patches/aws-otel-java-instrumentation.patch
+git add -A
+git commit -a -m "Create patch version"
+CI=false ./gradlew publishToMavenLocal -Prelease.version=${ADOT_VERSION}-adot-lambda1
+popd
+
+rm -rf aws-otel-java-instrumentation
+
 # Build collector
 
 pushd ../opentelemetry-lambda/collector || exit

java/scripts/otel-handler

@@ -2,7 +2,7 @@
 
 export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
 
-export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
+export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
 
 # Temporarily set OTEL_SERVICE_NAME variable to work around but in javaagent not handling
 # OTEL_RESOURCE_ATTRIBUTES as set in otel-handler-upstream. It doesn't hurt to apply this

java/scripts/otel-proxy-handler

@@ -2,6 +2,6 @@
 
 export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
 
-export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
+export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
 
 source /opt/otel-proxy-handler-upstream

java/scripts/otel-stream-handler

@@ -2,6 +2,6 @@
 
 export OTEL_INSTRUMENTATION_AWS_SDK_EXPERIMENTAL_SPAN_ATTRIBUTES=true
 
-export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:xray-lambda,tracecontext,b3,b3multi}"
+export OTEL_PROPAGATORS="${OTEL_PROPAGATORS:-xray,tracecontext,b3,b3multi}"
 
 source /opt/otel-stream-handler-upstream

patches/aws-otel-java-instrumentation.patch

@@ -0,0 +1,13 @@
+diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
+index 9493189..6090207 100644
+--- a/dependencyManagement/build.gradle.kts
++++ b/dependencyManagement/build.gradle.kts
+@@ -27,7 +27,7 @@ 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.0-adot1"
++val otelVersion = "1.32.0-adot-lambda1"
+ 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"