diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml index 0c8005f0cd..4bbf8d40a8 100644 --- a/.github/workflows/ci-python.yml +++ b/.github/workflows/ci-python.yml @@ -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: diff --git a/.github/workflows/release-layer-java.yml b/.github/workflows/release-layer-java.yml index 857824f470..5361d56808 100644 --- a/.github/workflows/release-layer-java.yml +++ b/.github/workflows/release-layer-java.yml @@ -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 }} diff --git a/.github/workflows/release-layer-nodejs.yml b/.github/workflows/release-layer-nodejs.yml index 83677ae334..fd4639c061 100644 --- a/.github/workflows/release-layer-nodejs.yml +++ b/.github/workflows/release-layer-nodejs.yml @@ -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 }} diff --git a/collector/Makefile b/collector/Makefile index 0e5ebd0438..39dcb2993e 100644 --- a/collector/Makefile +++ b/collector/Makefile @@ -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 diff --git a/collector/internal/tools/go.mod b/collector/internal/tools/go.mod index 29e784251e..00134ecb36 100644 --- a/collector/internal/tools/go.mod +++ b/collector/internal/tools/go.mod @@ -1,6 +1,8 @@ module github.com/open-telemetry/opentelemetry-lambda/collector/internal/tools -go 1.19 +go 1.23 + +toolchain go1.23.4 require ( github.com/client9/misspell v0.3.4 diff --git a/collector/receiver/telemetryapireceiver/go.mod b/collector/receiver/telemetryapireceiver/go.mod index 7ced0dbff6..e80c6fa61b 100644 --- a/collector/receiver/telemetryapireceiver/go.mod +++ b/collector/receiver/telemetryapireceiver/go.mod @@ -7,15 +7,15 @@ replace github.com/open-telemetry/opentelemetry-lambda/collector => ../../ require ( github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259 github.com/open-telemetry/opentelemetry-lambda/collector v0.98.0 - github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.113.0 - go.opentelemetry.io/collector/confmap v1.19.0 - go.opentelemetry.io/collector/consumer v0.113.0 - go.opentelemetry.io/collector/consumer/consumertest v0.113.0 - go.opentelemetry.io/collector/pdata v1.19.0 - go.opentelemetry.io/collector/receiver v0.113.0 - go.opentelemetry.io/collector/receiver/receivertest v0.113.0 - go.opentelemetry.io/collector/semconv v0.113.0 + github.com/stretchr/testify v1.10.0 + go.opentelemetry.io/collector/component v0.116.0 + go.opentelemetry.io/collector/confmap v1.22.0 + go.opentelemetry.io/collector/consumer v1.22.0 + go.opentelemetry.io/collector/consumer/consumertest v0.116.0 + go.opentelemetry.io/collector/pdata v1.22.0 + go.opentelemetry.io/collector/receiver v0.116.0 + go.opentelemetry.io/collector/receiver/receivertest v0.116.0 + go.opentelemetry.io/collector/semconv v0.116.0 go.uber.org/zap v1.27.0 ) @@ -29,29 +29,29 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/knadh/koanf/providers/confmap v0.1.0 // indirect - github.com/knadh/koanf/v2 v2.1.1 // indirect + github.com/knadh/koanf/v2 v2.1.2 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect - go.opentelemetry.io/collector/consumer/consumererror v0.113.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect + go.opentelemetry.io/collector/consumer/consumererror v0.116.0 // indirect go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0 // indirect - go.opentelemetry.io/collector/pdata/pprofile v0.113.0 // indirect - go.opentelemetry.io/collector/pipeline v0.113.0 // indirect + go.opentelemetry.io/collector/pdata/pprofile v0.116.0 // indirect + go.opentelemetry.io/collector/pipeline v0.116.0 // indirect go.opentelemetry.io/collector/receiver/receiverprofiles v0.113.0 // indirect - go.opentelemetry.io/otel v1.31.0 // indirect - go.opentelemetry.io/otel/metric v1.31.0 // indirect - go.opentelemetry.io/otel/sdk v1.31.0 // indirect - go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect - go.opentelemetry.io/otel/trace v1.31.0 // indirect + go.opentelemetry.io/otel v1.32.0 // indirect + go.opentelemetry.io/otel/metric v1.32.0 // indirect + go.opentelemetry.io/otel/sdk v1.32.0 // indirect + go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect + go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/text v0.19.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect - google.golang.org/grpc v1.67.1 // indirect - google.golang.org/protobuf v1.35.1 // indirect + golang.org/x/net v0.32.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect + google.golang.org/grpc v1.68.1 // indirect + google.golang.org/protobuf v1.35.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect )