Skip to content

Fix Java/Python workflow, improve NodeJS workflow (#44) #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ccressent merged 14 commits into from
Jun 6, 2025
Merged

Fix Java/Python workflow, improve NodeJS workflow (#44) #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f09b763
Update workflow to run on submodule changes
ccressent Mar 24, 2025
b3bf43d
Update actions/upload-artifact
ccressent Mar 24, 2025
547c35a
Update actions/download-artifact to v4
ccressent Mar 24, 2025
54e61d4
Update PR workflows to run on submodule change
ccressent Mar 27, 2025
2729caf
Rename wrapper.js to wrapper.ts
ccressent Apr 7, 2025
71992c5
Add tmate for debugging
ccressent Apr 15, 2025
0a7ddf2
Update node to v20
ccressent Apr 15, 2025
9c13566
Try node v16
ccressent Apr 15, 2025
5ae3b6c
Setup tmate only for nodejs pipeline
ccressent Apr 15, 2025
98acd62
Update opentelemetry-lambda to latest release
ccressent Apr 28, 2025
2043238
Revert "Add tmate for debugging"
ccressent Apr 28, 2025
256082e
Revert "Update node to v20"
ccressent Apr 28, 2025
610bc17
Update receiver mock version
ccressent Apr 28, 2025
24fee7b
Bump node to v20
ccressent Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-build-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'java/**'
- 'opentelemetry-lambda/**'
- '.github/workflows/*-java.yml'
- '.github/workflows/tests.yml'
- '!java/sample-apps/template.yaml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-build-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'nodejs/**'
- 'opentelemetry-lambda/**'
- '.github/workflows/*-nodejs.yml'
- '.github/workflows/tests.yml'
- '!nodejs/sample-apps/template.yaml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pr-build-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'python/**'
- 'opentelemetry-lambda/**'
- '.github/workflows/*-python.yml'
- '.github/workflows/tests.yml'
- '!python/sample-apps/template.yaml'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-dev-layer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release-layer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-build-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-build-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-build-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 nodejs/packages/layer/src/wrapper.js → nodejs/packages/layer/src/wrapper.ts
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion opentelemetry-lambda
Open in desktop
Submodule opentelemetry-lambda updated 202 files
2 changes: 1 addition & 1 deletion utils/receiver-mock/deploy/task_definition.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading