Skip to content

Update otel lambda submodule, Bumps collector and sdk layer versions #1109

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
merged 5 commits into from
May 23, 2025
Merged

Update otel lambda submodule, Bumps collector and sdk layer versions #1109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b7b601d
Add Patching to run smoke tests
vasireddy99 Mar 26, 2025
346830c
Update Lambdasubmodule and remove old patches
vasireddy99 May 22, 2025
6dc9432
Update java version
vasireddy99 May 23, 2025
aa873a8
Update Nodejs Layer
vasireddy99 May 23, 2025
d902633
Update go version in workflows
vasireddy99 May 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: 1 addition & 1 deletion .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-java@v4
if: ${{ matrix.language == 'java' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-java@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build-nodejs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-node@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main-build-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
fail-fast: false
matrix:
architecture: [ amd64, arm64 ]
runtime: [python3.9, python3.10, python3.11]
runtime: [python3.9, python3.10, python3.11, python3.12, python3.13]
steps:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-python@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-dotnet@v4
if: ${{ matrix.language == 'dotnet' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
submodules: true
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-java@v4
if: ${{ matrix.language == 'java' }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:
# above, always setup go 1.18.
# if: ${{ env.TEST_LANGUAGE == 'go' }}
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- name: download layer tf file
uses: actions/download-artifact@v4
Expand All @@ -293,6 +293,8 @@ jobs:
# layer. But we only use the sample app build in the release workflow.
# Also, we NEED the architecture value because some apps (like .NET and
# Go) depend on this architecture value.
- name: Patch ADOT
run: ./patch-upstream.sh
- name: Build functions
run: GOARCH=${{ matrix.architecture }} ./build.sh ${{ matrix.architecture }}
working-directory: ${{ env.TEST_LANGUAGE }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/soaking.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
submodules: recursive
- uses: actions/setup-go@v5
with:
go-version: '~1.23.4'
go-version: '~1.24.3'
check-latest: true
- uses: actions/setup-java@v4
if: ${{ matrix.language == 'java' }}
Expand Down
5,209 changes: 3,898 additions & 1,311 deletions OTEL_Version.patch
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion adot/collector/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.42.0
v0.43.0
167 changes: 82 additions & 85 deletions adot/collector/lambdacomponents/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,37 @@ go 1.23.0
toolchain go1.23.2

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.115.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.115.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.115.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.115.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.117.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.117.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.117.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.117.0
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v0.115.0
go.opentelemetry.io/collector/exporter v0.115.0
go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0
go.opentelemetry.io/collector/extension v0.115.0
go.opentelemetry.io/collector/otelcol v0.115.0
go.opentelemetry.io/collector/receiver v0.115.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
go.opentelemetry.io/collector/component v0.117.0
go.opentelemetry.io/collector/exporter v0.117.0
go.opentelemetry.io/collector/exporter/debugexporter v0.117.0
go.opentelemetry.io/collector/exporter/otlpexporter v0.117.0
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.117.0
go.opentelemetry.io/collector/extension v0.117.0
go.opentelemetry.io/collector/otelcol v0.117.0
go.opentelemetry.io/collector/receiver v0.117.0
go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0
go.uber.org/multierr v1.11.0
)

require (
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.7 // indirect
github.com/aws/aws-sdk-go-v2/config v1.28.7 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 // indirect
github.com/aws/smithy-go v1.22.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
Expand Down Expand Up @@ -68,24 +68,24 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.115.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.115.0 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.117.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.117.0 // indirect
github.com/pierrec/lz4/v4 v4.1.22 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.20.5 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.60.1 // indirect
github.com/prometheus/common v0.61.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/prometheus v0.54.1 // indirect
github.com/rs/cors v1.11.1 // indirect
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
github.com/shirou/gopsutil/v4 v4.24.12 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tidwall/gjson v1.10.2 // indirect
Expand All @@ -96,51 +96,50 @@ require (
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector v0.115.0 // indirect
go.opentelemetry.io/collector/client v1.21.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.115.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.115.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.115.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.21.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.115.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.115.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.21.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.21.0 // indirect
go.opentelemetry.io/collector/config/configretry v1.21.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.115.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.21.0 // indirect
go.opentelemetry.io/collector/config/internal v0.115.0 // indirect
go.opentelemetry.io/collector/confmap v1.21.0 // indirect
go.opentelemetry.io/collector/connector v0.115.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.115.0 // indirect
go.opentelemetry.io/collector/consumer v1.21.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.115.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.115.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.115.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.115.0 // indirect
go.opentelemetry.io/collector/extension/experimental/storage v0.115.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.115.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.115.0 // indirect
go.opentelemetry.io/collector/featuregate v1.21.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.115.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.115.0 // indirect
go.opentelemetry.io/collector/pdata v1.21.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.115.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.115.0 // indirect
go.opentelemetry.io/collector/pipeline v0.115.0 // indirect
go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/processor v0.115.0 // indirect
go.opentelemetry.io/collector/processor/processorprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.115.0 // indirect
go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.115.0 // indirect
go.opentelemetry.io/collector/semconv v0.115.0 // indirect
go.opentelemetry.io/collector/service v0.115.0 // indirect
go.opentelemetry.io/collector v0.117.0 // indirect
go.opentelemetry.io/collector/client v1.23.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.117.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.117.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.117.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.23.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.117.0 // indirect
go.opentelemetry.io/collector/config/confighttp v0.117.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.23.0 // indirect
go.opentelemetry.io/collector/config/configopaque v1.23.0 // indirect
go.opentelemetry.io/collector/config/configretry v1.23.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect
go.opentelemetry.io/collector/config/configtls v1.23.0 // indirect
go.opentelemetry.io/collector/confmap v1.23.0 // indirect
go.opentelemetry.io/collector/connector v0.117.0 // indirect
go.opentelemetry.io/collector/connector/connectortest v0.117.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.117.0 // indirect
go.opentelemetry.io/collector/consumer v1.23.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.117.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.117.0 // indirect
go.opentelemetry.io/collector/consumer/consumertest v0.117.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.117.0 // indirect
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.117.0 // indirect
go.opentelemetry.io/collector/exporter/exportertest v0.117.0 // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.117.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.117.0 // indirect
go.opentelemetry.io/collector/extension/extensioncapabilities v0.117.0 // indirect
go.opentelemetry.io/collector/extension/extensiontest v0.117.0 // indirect
go.opentelemetry.io/collector/extension/xextension v0.117.0 // indirect
go.opentelemetry.io/collector/featuregate v1.23.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.117.0 // indirect
go.opentelemetry.io/collector/internal/sharedcomponent v0.117.0 // indirect
go.opentelemetry.io/collector/pdata v1.23.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.117.0 // indirect
go.opentelemetry.io/collector/pipeline v0.117.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 // indirect
go.opentelemetry.io/collector/processor v0.117.0 // indirect
go.opentelemetry.io/collector/processor/processortest v0.117.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.117.0 // indirect
go.opentelemetry.io/collector/receiver/receivertest v0.117.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.117.0 // indirect
go.opentelemetry.io/collector/semconv v0.117.0 // indirect
go.opentelemetry.io/collector/service v0.117.0 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
go.opentelemetry.io/contrib/config v0.10.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
Expand All @@ -166,15 +165,13 @@ require (
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/net v0.34.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/text v0.21.0 // indirect
gonum.org/v1/gonum v0.15.1 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
google.golang.org/grpc v1.67.1 // indirect
google.golang.org/protobuf v1.35.2 // indirect
google.golang.org/grpc v1.69.2 // indirect
google.golang.org/protobuf v1.36.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

exclude golang.org/x/net v0.31.0
Loading
Loading