Merge tag 'layer-nodejs/0.10.0' into merge

# Conflicts: # .gitignore # nodejs/.gitignore # nodejs/package-lock.json # nodejs/packages/layer/package-lock.json # nodejs/packages/layer/package.json # nodejs/packages/layer/scripts/otel-handler # nodejs/packages/layer/src/wrapper.ts # nodejs/sample-apps/aws-sdk/deploy/wrapper/main.tf # nodejs/sample-apps/aws-sdk/package-lock.json
coralogix · Oct 28, 2024 · 436f3d0 · 436f3d0
2 parents fddc4e0 + c9e67c4
commit 436f3d0
Show file tree

Hide file tree

Showing 158 changed files with 5,458 additions and 32,038 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -3,80 +3,89 @@
 version: 2
 updates:
   - package-ecosystem: "github-actions"
-    directory: "/"
+    directories:
+      - "/"
     schedule:
       interval: "weekly"
     groups:
       actions:
         patterns:
           - "*"
+
   - package-ecosystem: "gomod"
-    directory: "/collector"
+    directories:
+      - "/collector"
+      - "/collector/internal/tools"
+      - "/collector/lambdacomponents"
+      - "/collector/lambdalifecycle"
+      - "/collector/processor/coldstartprocessor"
+      - "/collector/processor/decoupleprocessor"
+      - "/collector/receiver/telemetryapireceiver"
+      - "/go/sample-apps/function"
     schedule:
       interval: "weekly"
     groups:
       opentelemetry-deps-collector:
         patterns:
           - "*opentelemetry*"
-      other:
-        patterns:
-          - "*"
-  - package-ecosystem: "gomod"
-    directory: "/collector/lambdacomponents"
-    schedule:
-      interval: "weekly"
-    groups:
-      opentelemetry-deps-lambdacomponents:
-        patterns:
-          - "*opentelemetry*"
-      other:
+      collector-other:
         patterns:
           - "*"
+
   - package-ecosystem: "gradle"
-    directory: "/java"
+    directories:
+      - "/java"
     schedule:
       interval: "weekly"
     groups:
       opentelemetry-deps-java:
         patterns:
           - "io.opentelemetry.*"
-      amazon-deps:
-        patterns:
-          - "*amazon*"
-      other:
+      java-other:
         patterns:
           - "*"
+
   - package-ecosystem: "npm"
-    directory: "/nodejs"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "npm"
-    directory: "/nodejs/packages/layer"
+    directories:
+      - "/nodejs"
+      - "/nodejs/packages/layer"
+      - "/nodejs/sample-apps/aws-sdk"
     schedule:
       interval: "weekly"
     groups:
       opentelemetry-deps-nodejs:
         patterns:
           - "@opentelemetry/*"
-      other:
+      nodejs-other:
         patterns:
           - "*"
+
   - package-ecosystem: "pip"
-    directory: "/python/src/otel"
+    directories:
+      - "/python/src/otel"
+      - "/python/sample-apps/function"
+      - "/python/src/otel/otel_sdk"
+      - "/python/src/otel/tests"
     schedule:
       interval: "weekly"
     groups:
       opentelemetry-deps-python:
         patterns:
           - "opentelemetry-*"
+      python-other:
+        patterns:
+          - "*"
+
   - package-ecosystem: "bundler"
-    directory: "/ruby/src/layer"
+    directories:
+      - "/ruby/src/otel/layer"
+      - "/ruby/sample-apps/function"
     schedule:
       interval: "weekly"
     groups:
       opentelemetry-deps-ruby:
         patterns:
           - "opentelemetry-*"
-      other:
+      ruby-other:
         patterns:
           - "*"
diff --git a/.github/release.yml b/.github/release.yml
@@ -19,6 +19,10 @@ changelog:
       labels:
         - java
 
+    - title: Ruby
+      labels:
+        - ruby
+
     - title: Other Dependencies
       labels:
         - dependencies

diff --git a/.github/workflows/ci-collector.yml b/.github/workflows/ci-collector.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.20.8'
+          go-version: '~1.21.9'
       - uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod
@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.20.8'
+          go-version: '~1.21.9'
       - uses: actions/cache@v4
         with:
           path: ~/go/pkg/mod

diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
@@ -4,25 +4,36 @@ on:
   push:
     paths:
       - 'java/**'
+      - '.github/workflows/ci-java.yml'
     branches:
       - main
   pull_request:
     paths:
       - 'java/**'
+      - '.github/workflows/ci-java.yml'
     branches:
       - main
 
+permissions:
+  pull-requests: write
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: '11'
-      - uses: burrunan/[email protected]
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
         with:
-          remote-build-cache-proxy-enabled: false
-          arguments: build --stacktrace
-          build-root-directory: java
+          add-job-summary-as-pr-comment: on-failure # Valid values are 'never' (default), 'always', and 'on-failure'
+
+      - name: Execute Gradle build
+        run: |
+          cd java
+          ./gradlew build --scan --stacktrace
diff --git a/.github/workflows/ci-nodejs.yml b/.github/workflows/ci-nodejs.yml
@@ -4,11 +4,13 @@ on:
   push:
     paths:
       - 'nodejs/**'
+      - '.github/workflows/ci-nodejs.yml'
     branches:
       - main
   pull_request:
     paths:
       - 'nodejs/**'
+      - '.github/workflows/ci-nodejs.yml'
     branches:
       - main
 
@@ -19,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - uses: actions/cache@v4
         with:
           path: ~/.npm
@@ -28,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
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -4,11 +4,13 @@ on:
   push:
     paths:
       - 'python/**'
+      - '.github/workflows/ci-python.yml'
     branches:
       - main
   pull_request:
     paths:
       - 'python/**'
+      - '.github/workflows/ci-python.yml'
     branches:
       - main
 

diff --git a/.github/workflows/close-stale.yaml b/.github/workflows/close-stale.yaml
@@ -0,0 +1,26 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: "40 3 * * *" # Run daily at 3:40 AM
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: 'This issue was marked stale. It will be closed in 30 days without additional activity.'
+          close-issue-message: 'Closed as inactive. Feel free to reopen if this issue is still relevant.'
+
+          stale-pr-message: 'This PR was marked stale. It will be closed in 30 days without additional activity.'
+          close-pr-message: 'Closed as inactive. Feel free to reopen if this PR is still being worked on.'
+
+          days-before-stale: 365
+          days-before-close: 30
+
+          operations-per-run: 500
diff --git a/.github/workflows/layer-publish.yml b/.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:

diff --git a/.github/workflows/release-layer-collector.yml b/.github/workflows/release-layer-collector.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.20.8'
+          go-version: '^1.23.1'
       - name: build
         run: make -C collector package GOARCH=${{ matrix.architecture }}
       - uses: actions/upload-artifact@v4

diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml
@@ -15,27 +15,35 @@ 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
 
-      - name: Set up JDK for running Gradle
-        uses: actions/setup-java@v4
+      - uses: actions/setup-java@v4
         with:
-          distribution: temurin
+          distribution: corretto
           java-version: 17
 
-      - uses: gradle/gradle-build-action@v3
-        name: Build Javaagent Layer
-        with:
-          arguments: :layer-javaagent:assemble
-          build-root-directory: java
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Execute Gradle build
+        run: |
+          cd java
+          ./gradlew :layer-javaagent:assemble :layer-wrapper:assemble --scan --stacktrace
 
       - uses: actions/upload-artifact@v4
-        name: Save assembled layer to build
+        name: Save javaagent layer to build
         with:
           name: opentelemetry-javaagent-layer.zip
           path: java/layer-javaagent/build/distributions/opentelemetry-javaagent-layer.zip
 
+      - uses: actions/upload-artifact@v4
+        name: Save javawrapper layer to build
+        with:
+          name: opentelemetry-javawrapper-layer.zip
+          path: java/layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip
+
       - name: Save Javaagent Version
         id: save-javaagent-version
         shell: bash
@@ -44,7 +52,15 @@ jobs:
           JAVAAGENT_VERSION=$(java -jar ./opentelemetry-javaagent.jar)
           echo "JAVAAGENT_VERSION=$JAVAAGENT_VERSION" >> $GITHUB_OUTPUT
 
-  publish-layer:
+      - 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
     strategy:
@@ -71,7 +87,39 @@ 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
+
+  publish-javawrapper-layer:
+    uses: ./.github/workflows/layer-publish.yml
+    needs: build-layer
+    strategy:
+      matrix:
+        aws_region:
+          - ap-northeast-1
+          - ap-northeast-2
+          - ap-south-1
+          - ap-southeast-1
+          - ap-southeast-2
+          - ca-central-1
+          - eu-central-1
+          - eu-north-1
+          - eu-west-1
+          - eu-west-2
+          - eu-west-3
+          - sa-east-1
+          - us-east-1
+          - us-east-2
+          - us-west-1
+          - us-west-2
+    with:
+      artifact-name: opentelemetry-javawrapper-layer.zip
+      layer-name: opentelemetry-javawrapper
+      component-version: ${{needs.build-layer.outputs.JAVAWRAPPER_VERSION}}
+      # architecture:
+      runtimes: java8.al2 java11 java17
       release-group: prod
       aws_region: ${{ matrix.aws_region }}
     secrets: inherit
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,10 @@ changelog: @@
           labels:
             - java
+        - title: Ruby
+          labels:
+            - ruby
         - title: Other Dependencies
           labels:
             - dependencies
@@ Expand Down @@