Release/v1.32.x

.github/actions/cpUtility-testing/action.yml

@@ -0,0 +1,67 @@
+name: Build and Push Java-Agent Image after CPUtility Test
+description: |
+  cpUtility Testing
+  This action assumes that Repo was checked out and Java was set correctly
+
+inputs:
+  aws-region:
+    required: true
+    description: "AWS Region"
+  image_uri_with_tag:
+    required: true
+    description: "Image URI with Tag"
+  image_registry:
+    required: true
+    description: "Image Registry"
+  adot-java-version:
+    required: true
+    description: "ADOT Java Version"
+  snapshot-ecr-role:
+    require: true
+    description: "IAM Role used for pushing to snapshot ecr"
+
+
+runs:
+  using: "composite"
+  steps:
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Configure AWS Credentials
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        role-to-assume: ${{ inputs.snapshot-ecr-role }}
+        aws-region: ${{ inputs.aws-region }}
+
+    - name: Login to private staging ecr
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ inputs.image_registry }}
+      env:
+        AWS_REGION: ${{ inputs.aws-region }}
+
+    - name: Build image for testing
+      uses: docker/build-push-action@v5
+      with:
+        push: false
+        build-args: "ADOT_JAVA_VERSION=${{ inputs.adot-java-version }}"
+        context: .
+        platforms: linux/amd64
+        tags: ${{ inputs.image_uri_with_tag }}
+        load: true
+
+    - name: Test docker image
+      shell: bash
+      run: .github/scripts/test-adot-javaagent-image.sh "${{ inputs.image_uri_with_tag }}" "${{ inputs.adot-java-version }}"
+
+    - name: Build and push image
+      uses: docker/build-push-action@v5
+      with:
+        push: true
+        build-args: "ADOT_JAVA_VERSION=${{ inputs.adot-java-version }}"
+        context: .
+        platforms: linux/amd64,linux/arm64
+        tags: ${{ inputs.image_uri_with_tag }}

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

@@ -13,33 +13,52 @@ inputs:
     default: "false"
     required: false
     description: "If the workflow should run tests of the dependencies. Anything different than false will evaluate to true"
-  branch:
-    required: true
-    description: "The branch where this patches are being applied e.g.: release/v1.21.x"
   gpg_private_key:
     description: "The gpg key used to sign the artifacts"
-    required: true
+    required: false
   gpg_password:
     description: "The gpg key password"
-    required: true
+    required: false
 runs:
   using: "composite"
   steps:
+    - name: set environment variables
+      env:
+        INPUT_KEY: ${{ inputs.gpg_private_key }}
+        INPUT_PASSWORD: ${{ inputs.gpg_password }}
+      shell: bash
+      run: |
+        EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
+        if [[ ! -z "$INPUT_KEY" ]]; then
+          {
+            echo "GPG_PRIVATE_KEY<<$EOF"
+            echo "$INPUT_KEY"
+            echo "$EOF"
+          } >> "$GITHUB_ENV"
+        fi
+        if [[ ! -z "$INPUT_PASSWORD" ]]; then
+          {
+            echo "GPG_PASSWORD<<$EOF"
+            echo "$INPUT_PASSWORD"
+            echo "$EOF"
+          } >> "$GITHUB_ENV"
+        fi
+
     - name: check patches
       run: |
-        if [[ -f .github/patches/${{ inputs.branch }}/opentelemetry-java.patch ]]; then
+        if [[ -f .github/patches/opentelemetry-java.patch ]]; then
           echo 'patch_otel_java=true' >> $GITHUB_ENV
         fi
-        if [[ -f .github/patches/${{ inputs.branch }}/opentelemetry-java-instrumentation.patch ]]; then
+        if [[ -f .github/patches/opentelemetry-java-instrumentation.patch ]]; then
             echo 'patch_otel_java_instrumentation=true' >> $GITHUB_ENV
         fi
-        if [[ -f .github/patches/${{ inputs.branch }}/opentelemetry-java-contrib.patch ]]; then
+        if [[ -f .github/patches/opentelemetry-java-contrib.patch ]]; then
             echo 'patch_otel_java_contrib=true' >> $GITHUB_ENV
         fi
       shell: bash
 
     - name: Clone and patch repositories
-      run: .github/scripts/patch.sh "${{ inputs.branch }}"
+      run: .github/scripts/patch.sh
       if: ${{ env.patch_otel_java == 'true' ||
               env.patch_otel_java_instrumentation == 'true' ||
               env.patch_otel_java_contrib == 'true' }}
@@ -51,19 +70,13 @@ runs:
       with:
         arguments: build publishToMavenLocal
         build-root-directory: opentelemetry-java
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - name: Build opentelemetry-java
       uses: gradle/gradle-build-action@v2
       if: ${{ env.patch_otel_java == 'true' && inputs.run_tests == 'false' }}
       with:
         arguments: publishToMavenLocal
         build-root-directory: opentelemetry-java
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - name: cleanup opentelemetry-java
       run: rm -rf opentelemetry-java
@@ -76,19 +89,13 @@ runs:
       with:
         arguments: build publishToMavenLocal
         build-root-directory: opentelemetry-java-contrib
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - name: Build opentelemetry-java-contrib
       uses: gradle/gradle-build-action@v2
       if: ${{ env.patch_otel_java_contrib == 'true' && inputs.run_tests == 'false' }}
       with:
         arguments: publishToMavenLocal
         build-root-directory: opentelemetry-java-contrib
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - name: cleanup opentelemetry-java-contrib
       run: rm -rf opentelemetry-java-contrib
@@ -101,19 +108,13 @@ runs:
       with:
         arguments: check -x spotlessCheck publishToMavenLocal
         build-root-directory: opentelemetry-java-instrumentation
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - 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
-      env:
-        GPG_PRIVATE_KEY: ${{ inputs.gpg_private_key }}
-        GPG_PASSWORD: ${{ inputs.gpg_password }}
 
     - name: cleanup opentelmetry-java-instrumentation
       run: rm -rf opentelemetry-java-instrumentation