Skip to content

Commit ca30dc6

Browse files
arun-annamalaiarun-annamalai
committed
fix: add java17 as compatible runtime in collector makefile
1 parent 506ebea commit ca30dc6

File tree

6 files changed

+36
-28
lines changed

6 files changed

+36
-28
lines changed

‎.github/workflows/ci-python.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626

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

3133
steps:

‎.github/workflows/release-layer-java.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ jobs:
102102
layer-name: opentelemetry-javaagent
103103
component-version: ${{needs.build-layer.outputs.JAVAAGENT_VERSION}}
104104
# architecture:
105+
# If you add a java runtime here, please make sure that the collector/Makefile publish and publish-layer targets
106+
# get updated as well
105107
runtimes: java8.al2 java11 java17
106108
release-group: prod
107109
aws_region: ${{ matrix.aws_region }}

‎.github/workflows/release-layer-nodejs.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ jobs:
8787
layer-name: opentelemetry-nodejs
8888
component-version: ${{needs.build-layer.outputs.NODEJS_VERSION}}
8989
# architecture:
90+
# If you add a nodejs runtime here, please make sure that the collector/Makefile publish and publish-layer targets
91+
# get updated as well
9092
runtimes: nodejs18.x nodejs20.x nodejs22.x
9193
release-group: prod
9294
aws_region: ${{ matrix.aws_region }}

‎collector/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ package: build
4747

4848
.PHONY: publish
4949
publish:
50-
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
50+
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
5151

5252
.PHONY: publish-layer
5353
publish-layer: package
5454
@echo Publishing collector extension layer...
55-
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
55+
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
5656
@echo OpenTelemetry Collector layer published.
5757

5858
.PHONY: set-otelcol-version

‎collector/internal/tools/go.mod‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/open-telemetry/opentelemetry-lambda/collector/internal/tools
22

3-
go 1.19
3+
go 1.23
4+
5+
toolchain go1.23.4
46

57
require (
68
github.com/client9/misspell v0.3.4

‎collector/receiver/telemetryapireceiver/go.mod‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ replace github.com/open-telemetry/opentelemetry-lambda/collector => ../../
77
require (
88
github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
99
github.com/open-telemetry/opentelemetry-lambda/collector v0.98.0
10-
github.com/stretchr/testify v1.9.0
11-
go.opentelemetry.io/collector/component v0.113.0
12-
go.opentelemetry.io/collector/confmap v1.19.0
13-
go.opentelemetry.io/collector/consumer v0.113.0
14-
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
15-
go.opentelemetry.io/collector/pdata v1.19.0
16-
go.opentelemetry.io/collector/receiver v0.113.0
17-
go.opentelemetry.io/collector/receiver/receivertest v0.113.0
18-
go.opentelemetry.io/collector/semconv v0.113.0
10+
github.com/stretchr/testify v1.10.0
11+
go.opentelemetry.io/collector/component v0.116.0
12+
go.opentelemetry.io/collector/confmap v1.22.0
13+
go.opentelemetry.io/collector/consumer v1.22.0
14+
go.opentelemetry.io/collector/consumer/consumertest v0.116.0
15+
go.opentelemetry.io/collector/pdata v1.22.0
16+
go.opentelemetry.io/collector/receiver v0.116.0
17+
go.opentelemetry.io/collector/receiver/receivertest v0.116.0
18+
go.opentelemetry.io/collector/semconv v0.116.0
1919
go.uber.org/zap v1.27.0
2020
)
2121

@@ -29,29 +29,29 @@ require (
2929
github.com/json-iterator/go v1.1.12 // indirect
3030
github.com/knadh/koanf/maps v0.1.1 // indirect
3131
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
32-
github.com/knadh/koanf/v2 v2.1.1 // indirect
32+
github.com/knadh/koanf/v2 v2.1.2 // indirect
3333
github.com/mitchellh/copystructure v1.2.0 // indirect
3434
github.com/mitchellh/reflectwalk v1.0.2 // indirect
3535
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3636
github.com/modern-go/reflect2 v1.0.2 // indirect
3737
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
38-
go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect
39-
go.opentelemetry.io/collector/consumer/consumererror v0.113.0 // indirect
38+
go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
39+
go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect
4040
go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0 // indirect
41-
go.opentelemetry.io/collector/pdata/pprofile v0.113.0 // indirect
42-
go.opentelemetry.io/collector/pipeline v0.113.0 // indirect
41+
go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect
42+
go.opentelemetry.io/collector/pipeline v0.116.0 // indirect
4343
go.opentelemetry.io/collector/receiver/receiverprofiles v0.113.0 // indirect
44-
go.opentelemetry.io/otel v1.31.0 // indirect
45-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
46-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
47-
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
48-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
44+
go.opentelemetry.io/otel v1.32.0 // indirect
45+
go.opentelemetry.io/otel/metric v1.32.0 // indirect
46+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
47+
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
48+
go.opentelemetry.io/otel/trace v1.32.0 // indirect
4949
go.uber.org/multierr v1.11.0 // indirect
50-
golang.org/x/net v0.30.0 // indirect
51-
golang.org/x/sys v0.26.0 // indirect
52-
golang.org/x/text v0.19.0 // indirect
53-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
54-
google.golang.org/grpc v1.67.1 // indirect
55-
google.golang.org/protobuf v1.35.1 // indirect
50+
golang.org/x/net v0.32.0 // indirect
51+
golang.org/x/sys v0.28.0 // indirect
52+
golang.org/x/text v0.21.0 // indirect
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
54+
google.golang.org/grpc v1.68.1 // indirect
55+
google.golang.org/protobuf v1.35.2 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
5757
)

0 commit comments

Comments
 (0)