updated scripts to remove instrumentation patch

Author: anahatAWS

.github/actions/patch-dependencies/action.yml

@@ -2,7 +2,7 @@ name: "Patch dependencies"
 description: |
   Patches direct dependencies of this project leveraging maven local to publish the results.
 
-  This workflow supports patching opentelemetry-java and opentelemetry-java-instrumentation repositories by executing
+  This workflow supports patching opentelemetry-java and opentelemetry-java-contrib repositories by executing
   the `patch.sh` script that will try to patch those repositories and after that will optionally test and then publish
   the artifacts to maven local.
   To add a patch you have to add a file in the `.github/patches/` directory with the name of the repository that must
@@ -49,9 +49,6 @@ runs:
         if [[ -f .github/patches/opentelemetry-java.patch ]]; then
           echo 'patch_otel_java=true' >> $GITHUB_ENV
         fi
-        if [[ -f .github/patches/opentelemetry-java-instrumentation.patch ]]; then
-            echo 'patch_otel_java_instrumentation=true' >> $GITHUB_ENV
-        fi
         if [[ -f .github/patches/opentelemetry-java-contrib.patch ]]; then
             echo 'patch_otel_java_contrib=true' >> $GITHUB_ENV
         fi
@@ -60,7 +57,6 @@ runs:
     - name: Clone and patch repositories
       run: .github/scripts/patch.sh
       if: ${{ env.patch_otel_java == 'true' ||
-              env.patch_otel_java_instrumentation == 'true' ||
               env.patch_otel_java_contrib == 'true' }}
       shell: bash
 
@@ -101,22 +97,3 @@ runs:
       run: rm -rf opentelemetry-java-contrib
       if: ${{ env.patch_otel_java_contrib == 'true' }}
       shell: bash
-
-    - name: Build opentelemetry-java-instrumentation with tests
-      uses: gradle/gradle-build-action@v2
-      if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'false' }}
-      with:
-        arguments: check -x spotlessCheck publishToMavenLocal
-        build-root-directory: opentelemetry-java-instrumentation
-
-    - name: Build opentelemetry java instrumentation
-      uses: gradle/gradle-build-action@v2
-      if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests == 'false' }}
-      with:
-        arguments: publishToMavenLocal
-        build-root-directory: opentelemetry-java-instrumentation
-
-    - name: cleanup opentelmetry-java-instrumentation
-      run: rm -rf opentelemetry-java-instrumentation
-      if: ${{ env.patch_otel_java_instrumentation == 'true' }}
-      shell: bash

.github/patches/versions

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

.github/scripts/patch.sh

@@ -6,7 +6,6 @@ set -x -e -u
 # This is used so that we can properly clone the upstream repositories.
 # This file should define the following variables:
 # OTEL_JAVA_VERSION. Tag of the opentelemetry-java repository to use. E.g.: JAVA_OTEL_JAVA_VERSION=v1.21.0
-# OTEL_JAVA_INSTRUMENTATION_VERSION. Tag of the opentelemetry-java-instrumentation repository to use, e.g.: OTEL_JAVA_INSTRUMENTATION_VERSION=v1.21.0
 # OTEL_JAVA_CONTRIB_VERSION. Tag of the opentelemetry-java-contrib repository. E.g.: OTEL_JAVA_CONTRIB_VERSION=v1.21.0
 # This script will fail if a variable that is supposed to exist is referenced.
 
@@ -45,16 +44,3 @@ if [[ -f "$OTEL_JAVA_CONTRIB_PATCH" ]]; then
 else
   echo "Skipping patching opentelemetry-java-contrib"
 fi
-
-
-OTEL_JAVA_INSTRUMENTATION_PATCH=".github/patches/opentelemetry-java-instrumentation.patch"
-if [[ -f "$OTEL_JAVA_INSTRUMENTATION_PATCH" ]]; then
-  git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
-  cd opentelemetry-java-instrumentation
-  git checkout ${OTEL_JAVA_INSTRUMENTATION_VERSION} -b tag-${OTEL_JAVA_INSTRUMENTATION_VERSION}
-  patch -p1 < "../${OTEL_JAVA_INSTRUMENTATION_PATCH}"
-  git commit -a -m "ADOT Patch release"
-  cd -
-else
-  echo "Skipping patching opentelemetry-java-instrumentation"
-fi

lambda-layer/build-layer.sh

@@ -22,9 +22,6 @@ git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.g
 pushd opentelemetry-java-instrumentation
 git checkout v${version} -b tag-v${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-instrumentation.patch
-
 # This patch is for Lambda related context propagation
 patch -p1 < "$SOURCEDIR"/patches/opentelemetry-java-instrumentation.patch
 

scripts/local_patch.sh

@@ -56,28 +56,4 @@ if [[ -f "$OTEL_JAVA_CONTRIB_PATCH" ]]; then
   rm -rf opentelemetry-java-contrib
 else
   echo "Skipping patching opentelemetry-java-contrib"
-fi
-
-
-# Patching opentelemetry-java-instrumentation
-OTEL_JAVA_INSTRUMENTATION_PATCH=".github/patches/opentelemetry-java-instrumentation.patch"
-if [[ -f "$OTEL_JAVA_INSTRUMENTATION_PATCH" ]]; then
-  echo "Patching opentelemetry-java-instrumentation"
-  git clone https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
-  cd opentelemetry-java-instrumentation
-
-  echo "Checking out tag ${OTEL_JAVA_INSTRUMENTATION_VERSION}"
-  git checkout ${OTEL_JAVA_INSTRUMENTATION_VERSION} -b tag-${OTEL_JAVA_INSTRUMENTATION_VERSION}
-  patch -p1 < "../${OTEL_JAVA_INSTRUMENTATION_PATCH}"
-  git commit -a -m "ADOT Patch release"
-
-  echo "Building patched opentelemetry-java-instrumentation"
-  ./gradlew clean assemble
-  ./gradlew publishToMavenLocal
-  cd -
-
-  echo "Cleaning up opentelemetry-java-instrumentation"
-  rm -rf opentelemetry-java-instrumentation
-else
-  echo "Skipping patching opentelemetry-java-instrumentation"
 fi