From f09b7630bc46b60386781394db008d5cc724267f Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 24 Mar 2025 13:09:22 -0700 Subject: [PATCH 01/14] Update workflow to run on submodule changes --- .github/workflows/pr-build-python.yml | 1 + 1 file changed, 1 insertion(+) 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' From b3bf43de0c6cb76012bd913084a66564e71618fd Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 24 Mar 2025 13:20:01 -0700 Subject: [PATCH 02/14] Update actions/upload-artifact --- .github/workflows/build-artifacts.yml | 12 ++++++------ .github/workflows/publish-release-layer.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 05733cb..a12b0a6 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -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/publish-release-layer.yml b/.github/workflows/publish-release-layer.yml index 1f8854e..247f0fd 100644 --- a/.github/workflows/publish-release-layer.yml +++ b/.github/workflows/publish-release-layer.yml @@ -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 }} From 547c35a2bbd8daf3be1662ffe34505c22f419b17 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 24 Mar 2025 13:27:34 -0700 Subject: [PATCH 03/14] Update actions/download-artifact to v4 --- .github/workflows/publish-dev-layer.yml | 2 +- .github/workflows/publish-release-layer.yml | 2 +- .github/workflows/release-build-java.yml | 10 +++++----- .github/workflows/release-build-nodejs.yml | 10 +++++----- .github/workflows/release-build-python.yml | 10 +++++----- .github/workflows/tests.yml | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) 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 247f0fd..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 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 From 54e61d4177a0ccb92e8572eb7ec0472989d2201c Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Thu, 27 Mar 2025 09:30:52 -0700 Subject: [PATCH 04/14] Update PR workflows to run on submodule change --- .github/workflows/pr-build-java.yml | 1 + .github/workflows/pr-build-nodejs.yml | 1 + 2 files changed, 2 insertions(+) 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' From 2729caf9cdea2db16f74d7064d180ee836e57f28 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 7 Apr 2025 12:22:41 -0700 Subject: [PATCH 05/14] Rename wrapper.js to wrapper.ts --- nodejs/packages/layer/src/{wrapper.js => wrapper.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename nodejs/packages/layer/src/{wrapper.js => wrapper.ts} (100%) 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 From 71992c5bb42acc1e1e09863368e707543be1dd26 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Tue, 15 Apr 2025 10:45:24 -0700 Subject: [PATCH 06/14] Add tmate for debugging --- .github/workflows/build-artifacts.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index a12b0a6..8cb89e9 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -83,6 +83,10 @@ jobs: ${{ runner.os }}-pip- - name: Build artifacts - ${{ matrix.architecture }} run: ${{ env.BUILD_COMMAND }} + + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Upload artifacts - java if: env.LANGUAGE == 'java' && success() uses: actions/upload-artifact@v4 From 0a7ddf232c582cc8c99c3e7acf8ad9db3958d4ab Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Tue, 15 Apr 2025 11:11:16 -0700 Subject: [PATCH 07/14] Update node to v20 --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8cb89e9..7815c43 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 From 9c1356610b0ec3144aecabefa79240b559b5ae42 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Tue, 15 Apr 2025 11:23:56 -0700 Subject: [PATCH 08/14] Try node v16 --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 7815c43..df41f04 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: '20' + node-version: '16' - name: Cache (NodeJS) if: env.LANGUAGE == 'nodejs' uses: actions/cache@v3 From 5ae3b6cfe7de0cff5b38d60b6fa3943f6921332c Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Tue, 15 Apr 2025 11:37:24 -0700 Subject: [PATCH 09/14] Setup tmate only for nodejs pipeline --- .github/workflows/build-artifacts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index df41f04..8be868c 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -85,6 +85,7 @@ jobs: run: ${{ env.BUILD_COMMAND }} - name: Setup tmate session + if: env.LANGUAGE == 'nodejs' uses: mxschmitt/action-tmate@v3 - name: Upload artifacts - java From 98acd620e15a166581a0208c38b0dbb443b24ec4 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 28 Apr 2025 07:54:18 -0700 Subject: [PATCH 10/14] Update opentelemetry-lambda to latest release --- opentelemetry-lambda | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 2043238ba97d3ed45c6a720736987c2ac44da39f Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 28 Apr 2025 10:26:34 -0700 Subject: [PATCH 11/14] Revert "Add tmate for debugging" This reverts commit 71992c5bb42acc1e1e09863368e707543be1dd26. --- .github/workflows/build-artifacts.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index 8be868c..b76d8f5 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -83,11 +83,6 @@ jobs: ${{ runner.os }}-pip- - name: Build artifacts - ${{ matrix.architecture }} run: ${{ env.BUILD_COMMAND }} - - - name: Setup tmate session - if: env.LANGUAGE == 'nodejs' - uses: mxschmitt/action-tmate@v3 - - name: Upload artifacts - java if: env.LANGUAGE == 'java' && success() uses: actions/upload-artifact@v4 From 256082edb9a4800d011d8b432a668c1df08a0357 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 28 Apr 2025 10:27:09 -0700 Subject: [PATCH 12/14] Revert "Update node to v20" This reverts commit 0a7ddf232c582cc8c99c3e7acf8ad9db3958d4ab. --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index b76d8f5..a12b0a6 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: '16' + node-version: '14' - name: Cache (NodeJS) if: env.LANGUAGE == 'nodejs' uses: actions/cache@v3 From 610bc1750bb0a7be9ec5020cd27fca63c460dea6 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 28 Apr 2025 11:25:54 -0700 Subject: [PATCH 13/14] Update receiver mock version --- utils/receiver-mock/deploy/task_definition.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 24fee7bc86ce50a2f54e97aa2b627fc513460bc2 Mon Sep 17 00:00:00 2001 From: Cyril Cressent Date: Mon, 2 Jun 2025 14:39:20 -0700 Subject: [PATCH 14/14] Bump node to v20 --- .github/workflows/build-artifacts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index a12b0a6..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