Skip to content

Commit c6e9a58

Browse files
authored
Update otel lambda submodule, Bumps collector and sdk layer versions (#1109)
* Add Patching to run smoke tests * Update Lambdasubmodule and remove old patches * Update java version * Update Nodejs Layer * Update go version in workflows
1 parent 1223765 commit c6e9a58

25 files changed

+4201
-2442
lines changed

.github/workflows/canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
submodules: recursive
6868
- uses: actions/setup-go@v5
6969
with:
70-
go-version: '~1.23.4'
70+
go-version: '~1.24.3'
7171
check-latest: true
7272
- uses: actions/setup-java@v4
7373
if: ${{ matrix.language == 'java' }}

.github/workflows/main-build-java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
submodules: recursive
8686
- uses: actions/setup-go@v5
8787
with:
88-
go-version: '~1.23.4'
88+
go-version: '~1.24.3'
8989
check-latest: true
9090
- uses: actions/setup-java@v4
9191
with:

.github/workflows/main-build-nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
submodules: recursive
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: '~1.23.4'
33+
go-version: '~1.24.3'
3434
check-latest: true
3535
- uses: actions/setup-node@v4
3636
with:

.github/workflows/main-build-python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
architecture: [ amd64, arm64 ]
26-
runtime: [python3.9, python3.10, python3.11]
26+
runtime: [python3.9, python3.10, python3.11, python3.12, python3.13]
2727
steps:
2828
- uses: actions/checkout@v4
2929
with:
3030
submodules: recursive
3131
- uses: actions/setup-go@v5
3232
with:
33-
go-version: '~1.23.4'
33+
go-version: '~1.24.3'
3434
check-latest: true
3535
- uses: actions/setup-python@v5
3636
with:

.github/workflows/main-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
submodules: recursive
4141
- uses: actions/setup-go@v5
4242
with:
43-
go-version: '~1.23.4'
43+
go-version: '~1.24.3'
4444
check-latest: true
4545
- uses: actions/setup-dotnet@v4
4646
if: ${{ matrix.language == 'dotnet' }}

.github/workflows/pr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
submodules: true
2525
- uses: actions/setup-go@v5
2626
with:
27-
go-version: '~1.23.4'
27+
go-version: '~1.24.3'
2828
check-latest: true
2929
- uses: actions/setup-java@v4
3030
if: ${{ matrix.language == 'java' }}

.github/workflows/release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
# above, always setup go 1.18.
274274
# if: ${{ env.TEST_LANGUAGE == 'go' }}
275275
with:
276-
go-version: '~1.23.4'
276+
go-version: '~1.24.3'
277277
check-latest: true
278278
- name: download layer tf file
279279
uses: actions/download-artifact@v4
@@ -293,6 +293,8 @@ jobs:
293293
# layer. But we only use the sample app build in the release workflow.
294294
# Also, we NEED the architecture value because some apps (like .NET and
295295
# Go) depend on this architecture value.
296+
- name: Patch ADOT
297+
run: ./patch-upstream.sh
296298
- name: Build functions
297299
run: GOARCH=${{ matrix.architecture }} ./build.sh ${{ matrix.architecture }}
298300
working-directory: ${{ env.TEST_LANGUAGE }}

.github/workflows/soaking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
submodules: recursive
6868
- uses: actions/setup-go@v5
6969
with:
70-
go-version: '~1.23.4'
70+
go-version: '~1.24.3'
7171
check-latest: true
7272
- uses: actions/setup-java@v4
7373
if: ${{ matrix.language == 'java' }}

OTEL_Version.patch

Lines changed: 3898 additions & 1311 deletions
Large diffs are not rendered by default.

adot/collector/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.42.0
1+
v0.43.0

adot/collector/lambdacomponents/go.mod

Lines changed: 82 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -5,37 +5,37 @@ go 1.23.0
55
toolchain go1.23.2
66

77
require (
8-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.115.0
9-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.115.0
10-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.115.0
11-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.115.0
8+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.117.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.117.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.117.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.117.0
1212
github.com/stretchr/testify v1.10.0
13-
go.opentelemetry.io/collector/component v0.115.0
14-
go.opentelemetry.io/collector/exporter v0.115.0
15-
go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
16-
go.opentelemetry.io/collector/exporter/otlpexporter v0.115.0
17-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.115.0
18-
go.opentelemetry.io/collector/extension v0.115.0
19-
go.opentelemetry.io/collector/otelcol v0.115.0
20-
go.opentelemetry.io/collector/receiver v0.115.0
21-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.115.0
13+
go.opentelemetry.io/collector/component v0.117.0
14+
go.opentelemetry.io/collector/exporter v0.117.0
15+
go.opentelemetry.io/collector/exporter/debugexporter v0.117.0
16+
go.opentelemetry.io/collector/exporter/otlpexporter v0.117.0
17+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.117.0
18+
go.opentelemetry.io/collector/extension v0.117.0
19+
go.opentelemetry.io/collector/otelcol v0.117.0
20+
go.opentelemetry.io/collector/receiver v0.117.0
21+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.117.0
2222
go.uber.org/multierr v1.11.0
2323
)
2424

2525
require (
2626
github.com/aws/aws-sdk-go v1.55.5 // indirect
27-
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
28-
github.com/aws/aws-sdk-go-v2/config v1.28.6 // indirect
29-
github.com/aws/aws-sdk-go-v2/credentials v1.17.47 // indirect
30-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.21 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.25 // indirect
32-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.25 // indirect
27+
github.com/aws/aws-sdk-go-v2 v1.32.7 // indirect
28+
github.com/aws/aws-sdk-go-v2/config v1.28.7 // indirect
29+
github.com/aws/aws-sdk-go-v2/credentials v1.17.48 // indirect
30+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.22 // indirect
31+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 // indirect
32+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 // indirect
3333
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
3434
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.6 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.7 // indirect
37-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.6 // indirect
38-
github.com/aws/aws-sdk-go-v2/service/sts v1.33.2 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.8 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.7 // indirect
38+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.3 // indirect
3939
github.com/aws/smithy-go v1.22.1 // indirect
4040
github.com/beorn7/perks v1.0.1 // indirect
4141
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -68,24 +68,24 @@ require (
6868
github.com/modern-go/reflect2 v1.0.2 // indirect
6969
github.com/mostynb/go-grpc-compression v1.2.3 // indirect
7070
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
71-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.115.0 // indirect
72-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.115.0 // indirect
73-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.115.0 // indirect
74-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.115.0 // indirect
75-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.115.0 // indirect
76-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.115.0 // indirect
77-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.115.0 // indirect
78-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.115.0 // indirect
79-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
71+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.117.0 // indirect
72+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.117.0 // indirect
73+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.117.0 // indirect
74+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.117.0 // indirect
75+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect
76+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.117.0 // indirect
77+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.117.0 // indirect
78+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.117.0 // indirect
79+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
8080
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8181
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
8282
github.com/prometheus/client_golang v1.20.5 // indirect
8383
github.com/prometheus/client_model v0.6.1 // indirect
84-
github.com/prometheus/common v0.60.1 // indirect
84+
github.com/prometheus/common v0.61.0 // indirect
8585
github.com/prometheus/procfs v0.15.1 // indirect
8686
github.com/prometheus/prometheus v0.54.1 // indirect
8787
github.com/rs/cors v1.11.1 // indirect
88-
github.com/shirou/gopsutil/v4 v4.24.11 // indirect
88+
github.com/shirou/gopsutil/v4 v4.24.12 // indirect
8989
github.com/spf13/cobra v1.8.1 // indirect
9090
github.com/spf13/pflag v1.0.5 // indirect
9191
github.com/tidwall/gjson v1.10.2 // indirect
@@ -96,51 +96,50 @@ require (
9696
github.com/tklauser/go-sysconf v0.3.12 // indirect
9797
github.com/tklauser/numcpus v0.6.1 // indirect
9898
github.com/yusufpapurcu/wmi v1.2.4 // indirect
99-
go.opentelemetry.io/collector v0.115.0 // indirect
100-
go.opentelemetry.io/collector/client v1.21.0 // indirect
101-
go.opentelemetry.io/collector/component/componentstatus v0.115.0 // indirect
102-
go.opentelemetry.io/collector/component/componenttest v0.115.0 // indirect
103-
go.opentelemetry.io/collector/config/configauth v0.115.0 // indirect
104-
go.opentelemetry.io/collector/config/configcompression v1.21.0 // indirect
105-
go.opentelemetry.io/collector/config/configgrpc v0.115.0 // indirect
106-
go.opentelemetry.io/collector/config/confighttp v0.115.0 // indirect
107-
go.opentelemetry.io/collector/config/confignet v1.21.0 // indirect
108-
go.opentelemetry.io/collector/config/configopaque v1.21.0 // indirect
109-
go.opentelemetry.io/collector/config/configretry v1.21.0 // indirect
110-
go.opentelemetry.io/collector/config/configtelemetry v0.115.0 // indirect
111-
go.opentelemetry.io/collector/config/configtls v1.21.0 // indirect
112-
go.opentelemetry.io/collector/config/internal v0.115.0 // indirect
113-
go.opentelemetry.io/collector/confmap v1.21.0 // indirect
114-
go.opentelemetry.io/collector/connector v0.115.0 // indirect
115-
go.opentelemetry.io/collector/connector/connectorprofiles v0.115.0 // indirect
116-
go.opentelemetry.io/collector/connector/connectortest v0.115.0 // indirect
117-
go.opentelemetry.io/collector/consumer v1.21.0 // indirect
118-
go.opentelemetry.io/collector/consumer/consumererror v0.115.0 // indirect
119-
go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles v0.115.0 // indirect
120-
go.opentelemetry.io/collector/consumer/consumerprofiles v0.115.0 // indirect
121-
go.opentelemetry.io/collector/consumer/consumertest v0.115.0 // indirect
122-
go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles v0.115.0 // indirect
123-
go.opentelemetry.io/collector/exporter/exporterprofiles v0.115.0 // indirect
124-
go.opentelemetry.io/collector/exporter/exportertest v0.115.0 // indirect
125-
go.opentelemetry.io/collector/extension/auth v0.115.0 // indirect
126-
go.opentelemetry.io/collector/extension/experimental/storage v0.115.0 // indirect
127-
go.opentelemetry.io/collector/extension/extensioncapabilities v0.115.0 // indirect
128-
go.opentelemetry.io/collector/extension/extensiontest v0.115.0 // indirect
129-
go.opentelemetry.io/collector/featuregate v1.21.0 // indirect
130-
go.opentelemetry.io/collector/internal/fanoutconsumer v0.115.0 // indirect
131-
go.opentelemetry.io/collector/internal/sharedcomponent v0.115.0 // indirect
132-
go.opentelemetry.io/collector/pdata v1.21.0 // indirect
133-
go.opentelemetry.io/collector/pdata/pprofile v0.115.0 // indirect
134-
go.opentelemetry.io/collector/pdata/testdata v0.115.0 // indirect
135-
go.opentelemetry.io/collector/pipeline v0.115.0 // indirect
136-
go.opentelemetry.io/collector/pipeline/pipelineprofiles v0.115.0 // indirect
137-
go.opentelemetry.io/collector/processor v0.115.0 // indirect
138-
go.opentelemetry.io/collector/processor/processorprofiles v0.115.0 // indirect
139-
go.opentelemetry.io/collector/processor/processortest v0.115.0 // indirect
140-
go.opentelemetry.io/collector/receiver/receiverprofiles v0.115.0 // indirect
141-
go.opentelemetry.io/collector/receiver/receivertest v0.115.0 // indirect
142-
go.opentelemetry.io/collector/semconv v0.115.0 // indirect
143-
go.opentelemetry.io/collector/service v0.115.0 // indirect
99+
go.opentelemetry.io/collector v0.117.0 // indirect
100+
go.opentelemetry.io/collector/client v1.23.0 // indirect
101+
go.opentelemetry.io/collector/component/componentstatus v0.117.0 // indirect
102+
go.opentelemetry.io/collector/component/componenttest v0.117.0 // indirect
103+
go.opentelemetry.io/collector/config/configauth v0.117.0 // indirect
104+
go.opentelemetry.io/collector/config/configcompression v1.23.0 // indirect
105+
go.opentelemetry.io/collector/config/configgrpc v0.117.0 // indirect
106+
go.opentelemetry.io/collector/config/confighttp v0.117.0 // indirect
107+
go.opentelemetry.io/collector/config/confignet v1.23.0 // indirect
108+
go.opentelemetry.io/collector/config/configopaque v1.23.0 // indirect
109+
go.opentelemetry.io/collector/config/configretry v1.23.0 // indirect
110+
go.opentelemetry.io/collector/config/configtelemetry v0.117.0 // indirect
111+
go.opentelemetry.io/collector/config/configtls v1.23.0 // indirect
112+
go.opentelemetry.io/collector/confmap v1.23.0 // indirect
113+
go.opentelemetry.io/collector/connector v0.117.0 // indirect
114+
go.opentelemetry.io/collector/connector/connectortest v0.117.0 // indirect
115+
go.opentelemetry.io/collector/connector/xconnector v0.117.0 // indirect
116+
go.opentelemetry.io/collector/consumer v1.23.0 // indirect
117+
go.opentelemetry.io/collector/consumer/consumererror v0.117.0 // indirect
118+
go.opentelemetry.io/collector/consumer/consumererror/xconsumererror v0.117.0 // indirect
119+
go.opentelemetry.io/collector/consumer/consumertest v0.117.0 // indirect
120+
go.opentelemetry.io/collector/consumer/xconsumer v0.117.0 // indirect
121+
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.117.0 // indirect
122+
go.opentelemetry.io/collector/exporter/exportertest v0.117.0 // indirect
123+
go.opentelemetry.io/collector/exporter/xexporter v0.117.0 // indirect
124+
go.opentelemetry.io/collector/extension/auth v0.117.0 // indirect
125+
go.opentelemetry.io/collector/extension/extensioncapabilities v0.117.0 // indirect
126+
go.opentelemetry.io/collector/extension/extensiontest v0.117.0 // indirect
127+
go.opentelemetry.io/collector/extension/xextension v0.117.0 // indirect
128+
go.opentelemetry.io/collector/featuregate v1.23.0 // indirect
129+
go.opentelemetry.io/collector/internal/fanoutconsumer v0.117.0 // indirect
130+
go.opentelemetry.io/collector/internal/sharedcomponent v0.117.0 // indirect
131+
go.opentelemetry.io/collector/pdata v1.23.0 // indirect
132+
go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect
133+
go.opentelemetry.io/collector/pdata/testdata v0.117.0 // indirect
134+
go.opentelemetry.io/collector/pipeline v0.117.0 // indirect
135+
go.opentelemetry.io/collector/pipeline/xpipeline v0.117.0 // indirect
136+
go.opentelemetry.io/collector/processor v0.117.0 // indirect
137+
go.opentelemetry.io/collector/processor/processortest v0.117.0 // indirect
138+
go.opentelemetry.io/collector/processor/xprocessor v0.117.0 // indirect
139+
go.opentelemetry.io/collector/receiver/receivertest v0.117.0 // indirect
140+
go.opentelemetry.io/collector/receiver/xreceiver v0.117.0 // indirect
141+
go.opentelemetry.io/collector/semconv v0.117.0 // indirect
142+
go.opentelemetry.io/collector/service v0.117.0 // indirect
144143
go.opentelemetry.io/contrib/bridges/otelzap v0.6.0 // indirect
145144
go.opentelemetry.io/contrib/config v0.10.0 // indirect
146145
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.56.0 // indirect
@@ -166,15 +165,13 @@ require (
166165
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
167166
go.uber.org/zap v1.27.0 // indirect
168167
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
169-
golang.org/x/net v0.33.0 // indirect
170-
golang.org/x/sys v0.28.0 // indirect
168+
golang.org/x/net v0.34.0 // indirect
169+
golang.org/x/sys v0.29.0 // indirect
171170
golang.org/x/text v0.21.0 // indirect
172171
gonum.org/v1/gonum v0.15.1 // indirect
173172
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
174173
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
175-
google.golang.org/grpc v1.67.1 // indirect
176-
google.golang.org/protobuf v1.35.2 // indirect
174+
google.golang.org/grpc v1.69.2 // indirect
175+
google.golang.org/protobuf v1.36.2 // indirect
177176
gopkg.in/yaml.v3 v3.0.1 // indirect
178177
)
179-
180-
exclude golang.org/x/net v0.31.0

0 commit comments

Comments
 (0)