Skip to content

Commit 0b8ddb5

Browse files
authored
Lambda Layer Update - Update opentelemetry-lambda submodule (#677)
* Lambda Layer Update - Update opentelemetry-lambda submodule * Delete Collector Patch
1 parent d632359 commit 0b8ddb5

File tree

12 files changed

+251
-834
lines changed

12 files changed

+251
-834
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@v4
6969
with:
70-
go-version: '^1.20.5'
70+
go-version: '^1.20.7'
7171
- uses: actions/setup-java@v3
7272
if: ${{ matrix.language == 'java' }}
7373
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
submodules: recursive
3434
- uses: actions/setup-go@v4
3535
with:
36-
go-version: '^1.20.5'
36+
go-version: '^1.20.7'
3737
- uses: actions/setup-python@v4
3838
with:
3939
python-version: '3.x'

.github/workflows/main-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
submodules: recursive
8585
- uses: actions/setup-go@v4
8686
with:
87-
go-version: '^1.20.5'
87+
go-version: '^1.20.7'
8888
- uses: actions/setup-java@v3
8989
if: ${{ matrix.language == 'java' }}
9090
with:

.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@v4
2626
with:
27-
go-version: '^1.20.5'
27+
go-version: '^1.20.7'
2828
- uses: actions/setup-java@v3
2929
if: ${{ matrix.language == 'java' }}
3030
with:

OTEL_Version.patch

Lines changed: 0 additions & 631 deletions
This file was deleted.

adot/collector/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.31.0
1+
v0.32.0
Lines changed: 73 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,40 @@
11
module github.com/aws-observability/aws-otel-lambda/adot/collector/lambdacomponents
22

3-
go 1.19
3+
go 1.20
44

55
require (
6-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.80.0
7-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.80.0
8-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.80.0
9-
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.80.0
6+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.82.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.82.0
8+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.82.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.82.0
1010
github.com/stretchr/testify v1.8.4
11-
go.opentelemetry.io/collector v0.80.0
12-
go.opentelemetry.io/collector/exporter v0.80.0
13-
go.opentelemetry.io/collector/exporter/loggingexporter v0.80.0
14-
go.opentelemetry.io/collector/exporter/otlpexporter v0.80.0
15-
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.80.0
16-
go.opentelemetry.io/collector/extension v0.80.0
17-
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013
18-
go.opentelemetry.io/collector/receiver v0.80.0
19-
go.opentelemetry.io/collector/receiver/otlpreceiver v0.80.0
11+
go.opentelemetry.io/collector v0.82.0
12+
go.opentelemetry.io/collector/exporter v0.82.0
13+
go.opentelemetry.io/collector/exporter/loggingexporter v0.82.0
14+
go.opentelemetry.io/collector/exporter/otlpexporter v0.82.0
15+
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.82.0
16+
go.opentelemetry.io/collector/extension v0.82.0
17+
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0014
18+
go.opentelemetry.io/collector/receiver v0.82.0
19+
go.opentelemetry.io/collector/receiver/otlpreceiver v0.82.0
2020
go.uber.org/multierr v1.11.0
2121
)
2222

2323
require (
24+
cloud.google.com/go/compute/metadata v0.2.4-0.20230814220023-e36ec17b85d1 // indirect
2425
contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
25-
github.com/aws/aws-sdk-go v1.44.282 // indirect
26-
github.com/aws/aws-sdk-go-v2 v1.18.0 // indirect
27-
github.com/aws/aws-sdk-go-v2/config v1.18.25 // indirect
28-
github.com/aws/aws-sdk-go-v2/credentials v1.13.24 // indirect
29-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.3 // indirect
30-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.33 // indirect
31-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.27 // indirect
32-
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.34 // indirect
33-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.27 // indirect
34-
github.com/aws/aws-sdk-go-v2/service/sso v1.12.10 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.10 // indirect
36-
github.com/aws/aws-sdk-go-v2/service/sts v1.19.0 // indirect
26+
github.com/aws/aws-sdk-go v1.44.309 // indirect
27+
github.com/aws/aws-sdk-go-v2 v1.19.0 // indirect
28+
github.com/aws/aws-sdk-go-v2/config v1.18.28 // indirect
29+
github.com/aws/aws-sdk-go-v2/credentials v1.13.27 // indirect
30+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.13.5 // indirect
31+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.35 // indirect
32+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.29 // indirect
33+
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.36 // indirect
34+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.29 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/sso v1.12.13 // indirect
36+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.13 // indirect
37+
github.com/aws/aws-sdk-go-v2/service/sts v1.19.3 // indirect
3738
github.com/aws/smithy-go v1.13.5 // indirect
3839
github.com/beorn7/perks v1.0.1 // indirect
3940
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
@@ -51,27 +52,29 @@ require (
5152
github.com/golang/protobuf v1.5.3 // indirect
5253
github.com/golang/snappy v0.0.4 // indirect
5354
github.com/google/uuid v1.3.0 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
5456
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5557
github.com/jmespath/go-jmespath v0.4.0 // indirect
5658
github.com/json-iterator/go v1.1.12 // indirect
57-
github.com/klauspost/compress v1.16.6 // indirect
59+
github.com/klauspost/compress v1.16.7 // indirect
5860
github.com/knadh/koanf v1.5.0 // indirect
61+
github.com/knadh/koanf/v2 v2.0.1 // indirect
5962
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
6063
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6164
github.com/mitchellh/copystructure v1.2.0 // indirect
62-
github.com/mitchellh/mapstructure v1.5.0 // indirect
65+
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
6366
github.com/mitchellh/reflectwalk v1.0.2 // indirect
6467
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6568
github.com/modern-go/reflect2 v1.0.2 // indirect
66-
github.com/mostynb/go-grpc-compression v1.1.19 // indirect
67-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.80.0 // indirect
68-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.80.0 // indirect
69-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.80.0 // indirect
70-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.80.0 // indirect
71-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.80.0 // indirect
72-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.80.0 // indirect
73-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.80.0 // indirect
74-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.80.0 // indirect
69+
github.com/mostynb/go-grpc-compression v1.2.0 // indirect
70+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.82.0 // indirect
71+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.82.0 // indirect
72+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.82.0 // indirect
73+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.82.0 // indirect
74+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.82.0 // indirect
75+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.82.0 // indirect
76+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.82.0 // indirect
77+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.82.0 // indirect
7578
github.com/pmezard/go-difflib v1.0.0 // indirect
7679
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
7780
github.com/prometheus/client_golang v1.16.0 // indirect
@@ -81,7 +84,7 @@ require (
8184
github.com/prometheus/prometheus v0.43.1 // indirect
8285
github.com/prometheus/statsd_exporter v0.22.7 // indirect
8386
github.com/rs/cors v1.9.0 // indirect
84-
github.com/shirou/gopsutil/v3 v3.23.5 // indirect
87+
github.com/shirou/gopsutil/v3 v3.23.6 // indirect
8588
github.com/shoenig/go-m1cpu v0.1.6 // indirect
8689
github.com/spf13/cobra v1.7.0 // indirect
8790
github.com/spf13/pflag v1.0.5 // indirect
@@ -94,43 +97,52 @@ require (
9497
github.com/tklauser/numcpus v0.6.0 // indirect
9598
github.com/yusufpapurcu/wmi v1.2.3 // indirect
9699
go.opencensus.io v0.24.0 // indirect
97-
go.opentelemetry.io/collector/component v0.80.0 // indirect
98-
go.opentelemetry.io/collector/config/configauth v0.80.0 // indirect
99-
go.opentelemetry.io/collector/config/configcompression v0.80.0 // indirect
100-
go.opentelemetry.io/collector/config/configgrpc v0.80.0 // indirect
101-
go.opentelemetry.io/collector/config/confighttp v0.80.0 // indirect
102-
go.opentelemetry.io/collector/config/confignet v0.80.0 // indirect
103-
go.opentelemetry.io/collector/config/configopaque v0.80.0 // indirect
104-
go.opentelemetry.io/collector/config/configtelemetry v0.80.0 // indirect
105-
go.opentelemetry.io/collector/config/configtls v0.80.0 // indirect
106-
go.opentelemetry.io/collector/config/internal v0.80.0 // indirect
107-
go.opentelemetry.io/collector/confmap v0.80.0 // indirect
108-
go.opentelemetry.io/collector/connector v0.80.0 // indirect
109-
go.opentelemetry.io/collector/consumer v0.80.0 // indirect
110-
go.opentelemetry.io/collector/extension/auth v0.80.0 // indirect
111-
go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 // indirect
112-
go.opentelemetry.io/collector/processor v0.80.0 // indirect
113-
go.opentelemetry.io/collector/semconv v0.80.0 // indirect
100+
go.opentelemetry.io/collector/component v0.82.0 // indirect
101+
go.opentelemetry.io/collector/config/configauth v0.82.0 // indirect
102+
go.opentelemetry.io/collector/config/configcompression v0.82.0 // indirect
103+
go.opentelemetry.io/collector/config/configgrpc v0.82.0 // indirect
104+
go.opentelemetry.io/collector/config/confighttp v0.82.0 // indirect
105+
go.opentelemetry.io/collector/config/confignet v0.82.0 // indirect
106+
go.opentelemetry.io/collector/config/configopaque v0.82.0 // indirect
107+
go.opentelemetry.io/collector/config/configtelemetry v0.82.0 // indirect
108+
go.opentelemetry.io/collector/config/configtls v0.82.0 // indirect
109+
go.opentelemetry.io/collector/config/internal v0.82.0 // indirect
110+
go.opentelemetry.io/collector/confmap v0.82.0 // indirect
111+
go.opentelemetry.io/collector/connector v0.82.0 // indirect
112+
go.opentelemetry.io/collector/consumer v0.82.0 // indirect
113+
go.opentelemetry.io/collector/extension/auth v0.82.0 // indirect
114+
go.opentelemetry.io/collector/pdata v1.0.0-rcv0014 // indirect
115+
go.opentelemetry.io/collector/processor v0.82.0 // indirect
116+
go.opentelemetry.io/collector/semconv v0.82.0 // indirect
114117
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
115118
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
116119
go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
117120
go.opentelemetry.io/otel v1.16.0 // indirect
118121
go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect
122+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
123+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.39.0 // indirect
124+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.39.0 // indirect
125+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.39.0 // indirect
119126
go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
127+
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v0.39.0 // indirect
128+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
120129
go.opentelemetry.io/otel/metric v1.16.0 // indirect
121130
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
122131
go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
123132
go.opentelemetry.io/otel/trace v1.16.0 // indirect
133+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
124134
go.uber.org/atomic v1.10.0 // indirect
125135
go.uber.org/zap v1.24.0 // indirect
126-
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
127-
golang.org/x/net v0.11.0 // indirect
128-
golang.org/x/sys v0.9.0 // indirect
129-
golang.org/x/text v0.10.0 // indirect
136+
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
137+
golang.org/x/net v0.12.0 // indirect
138+
golang.org/x/sys v0.10.0 // indirect
139+
golang.org/x/text v0.11.0 // indirect
130140
gonum.org/v1/gonum v0.13.0 // indirect
141+
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
131143
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
132-
google.golang.org/grpc v1.56.0 // indirect
133-
google.golang.org/protobuf v1.30.0 // indirect
144+
google.golang.org/grpc v1.57.0 // indirect
145+
google.golang.org/protobuf v1.31.0 // indirect
134146
gopkg.in/yaml.v2 v2.4.0 // indirect
135147
gopkg.in/yaml.v3 v3.0.1 // indirect
136148
)

0 commit comments

Comments
 (0)