Skip to content

fix: add java17 as compatible runtime in collector makefile #1667

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
tylerbenson merged 2 commits into from
Jan 23, 2025
Merged

fix: add java17 as compatible runtime in collector makefile #1667

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cef2b1
fix: add java17 as compatible runtime in collector makefile
arun-annamalai Jan 15, 2025
a3188fc
Add java21 to the supported runtimes list
tylerbenson Jan 23, 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
2 changes: 2 additions & 0 deletions .github/workflows/ci-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:

strategy:
matrix:
# If you add a python version here, please make sure that the collector/Makefile publish and publish-layer targets
# get updated as well
python: ['3.8', '3.9', '3.10', '3.11', '3.12']

steps:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release-layer-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ jobs:
layer-name: opentelemetry-javaagent
component-version: ${{needs.build-layer.outputs.JAVAAGENT_VERSION}}
# architecture:
# If you add a java runtime here, please make sure that the collector/Makefile publish and publish-layer targets
# get updated as well
runtimes: java8.al2 java11 java17
release-group: prod
aws_region: ${{ matrix.aws_region }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/release-layer-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ jobs:
layer-name: opentelemetry-nodejs
component-version: ${{needs.build-layer.outputs.NODEJS_VERSION}}
# architecture:
# If you add a nodejs runtime here, please make sure that the collector/Makefile publish and publish-layer targets
# get updated as well
runtimes: nodejs18.x nodejs20.x nodejs22.x
release-group: prod
aws_region: ${{ matrix.aws_region }}
Expand Down
4 changes: 2 additions & 2 deletions collector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ package: build

.PHONY: publish
publish:
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text

.PHONY: publish-layer
publish-layer: package
@echo Publishing collector extension layer...
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text
aws lambda publish-layer-version --layer-name $(LAYER_NAME) --zip-file fileb://$(BUILD_SPACE)/opentelemetry-collector-layer-$(GOARCH).zip --compatible-runtimes nodejs16.x nodejs18.x nodejs20.x nodejs22.x java11 java17 java21 python3.8 python3.9 python3.10 python3.11 python3.12 --query 'LayerVersionArn' --output text
@echo OpenTelemetry Collector layer published.

.PHONY: set-otelcol-version
Expand Down
2 changes: 1 addition & 1 deletion java/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ To build the wrapper layer, run
./gradlew :layer-wrapper:build
```

The layer zip file will be present at `./layer-wrapper/build/distributions/opentelemetry-java-wrapper.zip`.
The layer zip file will be present at `./layer-wrapper/build/distributions/opentelemetry-javawrapper-layer.zip`.

## Sample applications

Expand Down
Loading