Two minor changes:

Move the JUnit dependency to the SPI project.

Retain the Contrib patch script.

Author: lukeina2z

build.gradle.kts

@@ -108,7 +108,6 @@ 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 {

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

@@ -29,6 +29,22 @@ patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.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"