Merge branch 'main' into zhaez/version-file

Author: ezhang6811

.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