Merge branch 'main' into feature/telemetryapireceiver-configuration

Author: jerrytfleung

.github/dependabot.yml

@@ -78,7 +78,7 @@ updates:
 
   - package-ecosystem: "bundler"
     directories:
-      - "/ruby/src/layer"
+      - "/ruby/src/otel/layer"
       - "/ruby/sample-apps/function"
     schedule:
       interval: "weekly"

.github/release.yml

@@ -19,6 +19,10 @@ changelog:
       labels:
         - java
 
+    - title: Ruby
+      labels:
+        - ruby
+
     - title: Other Dependencies
       labels:
         - dependencies

.github/workflows/ci-java.yml

@@ -29,9 +29,8 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
-          validate-wrappers: true
           add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
 
       - name: Execute Gradle build

.github/workflows/ci-nodejs.yml

@@ -30,3 +30,7 @@ jobs:
             ${{ runner.os }}-node-
       - run: npm install
         working-directory: nodejs
+      - run: npm run lint
+        working-directory: nodejs
+      - run: npm test
+        working-directory: nodejs

.github/workflows/layer-publish.yml

@@ -4,7 +4,7 @@ on:
   workflow_call:
     inputs:
       artifact-name:
-        description: 'This should correspond to a actions/upload-artifact name earlier in the build.'
+        description: 'This should correspond to a actions/upload-artifact name earlier in the build. The file name and the name of the artifact containing it must be equal.'
         required: true
         type: string
       layer-name:

.github/workflows/release-layer-java.yml

@@ -15,6 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       JAVAAGENT_VERSION: ${{ steps.save-javaagent-version.outputs.JAVAAGENT_VERSION }}
+      JAVAWRAPPER_VERSION: ${{ steps.save-javawrapper-version.outputs.JAVAWRAPPER_VERSION }}
     steps:
       - uses: actions/checkout@v4
 
@@ -24,9 +25,7 @@ jobs:
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          validate-wrappers: true
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Execute Gradle build
         run: |
@@ -43,7 +42,7 @@ jobs:
         name: Save javawrapper layer to build
         with:
           name: opentelemetry-javawrapper-layer.zip
-          path: java/layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip
+          path: java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip
 
       - name: Save Javaagent Version
         id: save-javaagent-version
@@ -53,6 +52,14 @@ jobs:
           JAVAAGENT_VERSION=$(java -jar ./opentelemetry-javaagent.jar)
           echo "JAVAAGENT_VERSION=$JAVAAGENT_VERSION" >> $GITHUB_OUTPUT
 
+      - name: Save Java Wrapper Version
+        id: save-javawrapper-version
+        shell: bash
+        run: |
+          cd java
+          JAVAWRAPPER_VERSION=$(./gradlew layer-wrapper:printOtelJavaInstrumentationVersion -q)
+          echo "JAVAWRAPPER_VERSION=$JAVAWRAPPER_VERSION" >> $GITHUB_OUTPUT
+
   publish-javaagent-layer:
     uses: ./.github/workflows/layer-publish.yml
     needs: build-layer
@@ -80,7 +87,7 @@ jobs:
       layer-name: opentelemetry-javaagent
       component-version: ${{needs.build-layer.outputs.JAVAAGENT_VERSION}}
       # architecture:
-      runtimes: java8 java8.al2 java11 java17
+      runtimes: java8.al2 java11 java17
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit
@@ -110,9 +117,9 @@ jobs:
     with:
       artifact-name: opentelemetry-javawrapper-layer.zip
       layer-name: opentelemetry-javawrapper
-      component-version: "--"
+      component-version: ${{needs.build-layer.outputs.JAVAWRAPPER_VERSION}}
       # architecture:
-      runtimes: java8 java8.al2 java11 java17
+      runtimes: java8.al2 java11 java17
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit

.github/workflows/release-layer-nodejs.yml

@@ -25,6 +25,7 @@ jobs:
       - name: Build
         run: |
           npm install
+          npm run compile
         working-directory: nodejs
 
       - name: Save Node SDK Version
@@ -49,7 +50,7 @@ jobs:
     needs: build-layer
     strategy:
       matrix:
-        aws_region: 
+        aws_region:
           - ap-northeast-1
           - ap-northeast-2
           - ap-south-1

.github/workflows/release-layer-ruby.yml

@@ -19,12 +19,20 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build
-        id: save-ruby-sdk-version
         run: |
           ./build.sh
         shell: bash
         working-directory: ruby/src
 
+      - name: Save Ruby SDK Version
+        id: save-ruby-sdk-version
+        run: |
+          unzip -q build/opentelemetry-ruby-layer.zip
+          export GEM_PATH=$PWD/ruby/gems/3.2.0/
+          RUBY_SDK_VERSION=$(ruby -e 'require "opentelemetry-sdk"; puts OpenTelemetry::SDK::VERSION')
+          echo "RUBY_SDK_VERSION=$RUBY_SDK_VERSION" >> $GITHUB_OUTPUT
+        working-directory: ruby/src
+
       - name: Show directory contents
         run: |
           ls -al