diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 05733cb..9c4c68e 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -56,7 +56,7 @@ jobs: - uses: actions/setup-node@v4 if: env.LANGUAGE == 'nodejs' with: - node-version: '14' + node-version: '20' - name: Cache (NodeJS) if: env.LANGUAGE == 'nodejs' uses: actions/cache@v3 @@ -85,7 +85,7 @@ jobs: run: ${{ env.BUILD_COMMAND }} - name: Upload artifacts - java if: env.LANGUAGE == 'java' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip @@ -97,14 +97,14 @@ jobs: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/libs/java-sample-app.jar - name: Upload artifacts - java sample-app if: env.LANGUAGE == 'java' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/libs/java-sample-app.jar if-no-files-found: error - name: Upload artifacts - nodejs if: env.LANGUAGE == 'nodejs' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip @@ -116,14 +116,14 @@ jobs: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/nodejs-sample-app.zip - name: Upload artifacts - nodejs sample-app if: env.LANGUAGE == 'nodejs' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/aws-sdk/build/nodejs-sample-app.zip if-no-files-found: error - name: Upload artifacts - python layer if: env.LANGUAGE == 'python' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ${{ env.LANGUAGE }}/${{ env.ARTIFACT_ARCHIVE_BASE_NAME }}-${{ matrix.architecture }}.zip @@ -135,7 +135,7 @@ jobs: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/build/python-sample-app.zip - name: Upload artifacts - python sample-app if: env.LANGUAGE == 'python' && success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: opentelemetry-lambda/${{ env.LANGUAGE }}/sample-apps/build/python-sample-app.zip diff --git a/.github/workflows/pr-build-java.yml b/.github/workflows/pr-build-java.yml index 73eb648..5e16396 100644 --- a/.github/workflows/pr-build-java.yml +++ b/.github/workflows/pr-build-java.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'java/**' + - 'opentelemetry-lambda/**' - '.github/workflows/*-java.yml' - '.github/workflows/tests.yml' - '!java/sample-apps/template.yaml' diff --git a/.github/workflows/pr-build-nodejs.yml b/.github/workflows/pr-build-nodejs.yml index 1320f82..5d39a4d 100644 --- a/.github/workflows/pr-build-nodejs.yml +++ b/.github/workflows/pr-build-nodejs.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'nodejs/**' + - 'opentelemetry-lambda/**' - '.github/workflows/*-nodejs.yml' - '.github/workflows/tests.yml' - '!nodejs/sample-apps/template.yaml' diff --git a/.github/workflows/pr-build-python.yml b/.github/workflows/pr-build-python.yml index fd65970..cc939e3 100644 --- a/.github/workflows/pr-build-python.yml +++ b/.github/workflows/pr-build-python.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - 'python/**' + - 'opentelemetry-lambda/**' - '.github/workflows/*-python.yml' - '.github/workflows/tests.yml' - '!python/sample-apps/template.yaml' diff --git a/.github/workflows/publish-dev-layer.yml b/.github/workflows/publish-dev-layer.yml index bf4722d..4dba43c 100644 --- a/.github/workflows/publish-dev-layer.yml +++ b/.github/workflows/publish-dev-layer.yml @@ -52,7 +52,7 @@ jobs: with: python-version: '3.9' - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ~/artifact diff --git a/.github/workflows/publish-release-layer.yml b/.github/workflows/publish-release-layer.yml index 1f8854e..7d0b726 100644 --- a/.github/workflows/publish-release-layer.yml +++ b/.github/workflows/publish-release-layer.yml @@ -64,7 +64,7 @@ jobs: with: python-version: '3.9' - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ~/artifact @@ -102,7 +102,7 @@ jobs: echo "| ${{ matrix.aws_region }} | $LAYER_ARN |" > layer-arn-${{ matrix.architecture }}-${{ matrix.aws_region }} - name: Upload Layer ARN if: success() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ env.ARTIFACT_NAME }}-${{ env.LANGUAGE }}-${{ matrix.architecture }}-layer-arns-artifact path: layer-arn-${{ matrix.architecture }}-${{ matrix.aws_region }} diff --git a/.github/workflows/release-build-java.yml b/.github/workflows/release-build-java.yml index e525afe..2da16db 100644 --- a/.github/workflows/release-build-java.yml +++ b/.github/workflows/release-build-java.yml @@ -31,27 +31,27 @@ jobs: id: extract_tag run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/java-v})" - name: Download amd64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-java-amd64-artifacts path: artifacts/ - name: Download arm64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-java-arm64-artifacts path: artifacts/ - name: Download sample-app artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: sample-app-java-amd64-artifacts path: artifacts/ - name: Download amd64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-java-amd64-layer-arns-artifact path: amd64layerarns/ - name: Download arm64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-java-arm64-layer-arns-artifact path: arm64layerarns/ diff --git a/.github/workflows/release-build-nodejs.yml b/.github/workflows/release-build-nodejs.yml index f0eafd4..a96d2ef 100644 --- a/.github/workflows/release-build-nodejs.yml +++ b/.github/workflows/release-build-nodejs.yml @@ -31,27 +31,27 @@ jobs: id: extract_tag run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/nodejs-v})" - name: Download amd64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-nodejs-amd64-artifacts path: artifacts/ - name: Download arm 64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-nodejs-arm64-artifacts path: artifacts/ - name: Download sample-app artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: sample-app-nodejs-amd64-artifacts path: artifacts/ - name: Download amd64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-nodejs-amd64-layer-arns-artifact path: amd64layerarns/ - name: Download arm64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-nodejs-arm64-layer-arns-artifact path: arm64layerarns/ diff --git a/.github/workflows/release-build-python.yml b/.github/workflows/release-build-python.yml index ce0de3d..c0d4350 100644 --- a/.github/workflows/release-build-python.yml +++ b/.github/workflows/release-build-python.yml @@ -31,27 +31,27 @@ jobs: id: extract_tag run: echo "::set-output name=tag::$(echo ${GITHUB_REF#refs/tags/python-v})" - name: Download amd64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-python-amd64-artifacts path: artifacts/ - name: Download arm64 layer artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-python-arm64-artifacts path: artifacts/ - name: Download sample-app artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: sample-app-python-amd64-artifacts path: artifacts/ - name: Download amd64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-python-amd64-layer-arns-artifact path: amd64layerarns/ - name: Download arm64 Layer ARNs - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: ${{ github.ref_name }}-python-arm64-layer-arns-artifact path: arm64layerarns/ diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 00615a7..cd44774 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -94,7 +94,7 @@ jobs: with: python-version: '3.9' - name: Download sample-app artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: sample-app-${{ env.LANGUAGE }}-${{ matrix.architecture }}-artifacts path: ~/artifact diff --git a/nodejs/packages/layer/src/wrapper.js b/nodejs/packages/layer/src/wrapper.ts similarity index 100% rename from nodejs/packages/layer/src/wrapper.js rename to nodejs/packages/layer/src/wrapper.ts diff --git a/opentelemetry-lambda b/opentelemetry-lambda index fbd9db5..5cc1580 160000 --- a/opentelemetry-lambda +++ b/opentelemetry-lambda @@ -1 +1 @@ -Subproject commit fbd9db5a1ad58428dc52a8839cfc792eebc3051d +Subproject commit 5cc158009047d6c5cdc9fad69b4a28e75c7c92f7 diff --git a/utils/receiver-mock/deploy/task_definition.tf b/utils/receiver-mock/deploy/task_definition.tf index 8caa518..78a3376 100644 --- a/utils/receiver-mock/deploy/task_definition.tf +++ b/utils/receiver-mock/deploy/task_definition.tf @@ -11,7 +11,7 @@ resource "aws_ecs_task_definition" "aws-ecs-task" { container_definitions = jsonencode([ { name = "${var.app_name}-container" - image = "public.ecr.aws/sumologic/kubernetes-tools:2.19.0" + image = "public.ecr.aws/sumologic/kubernetes-tools:2.24.0" cpu = 1024 memory = 2048 essential = true