Skip to content

Commit a9a4d80

Browse files
vasireddy99vasireddy99
authored
Lambda Layer Update : Update Collector 0.54 (#256)
* Update Collector version to 0.54.0 * Update to go version 1.18
1 parent 52268bf commit a9a4d80

File tree

6 files changed

+91
-346
lines changed

6 files changed

+91
-346
lines changed

‎.github/workflows/ci-collector.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- uses: actions/checkout@v2
2525
- uses: actions/setup-go@v2
2626
with:
27-
go-version: '^1.17'
27+
go-version: '^1.18'
2828
- uses: actions/cache@v2
2929
with:
3030
path: ~/go/pkg/mod

‎.github/workflows/pr-python.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Set up Go for ADOT Collector
3535
uses: actions/setup-go@v2
3636
with:
37-
go-version: '^1.17'
37+
go-version: '^1.18'
3838
- name: Build Python Layer which includes ADOT Collector
3939
working-directory: python/src
4040
run: ./run.sh -b

‎collector/collector.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ import (
2121
"os"
2222

2323
"go.opentelemetry.io/collector/component"
24-
"go.opentelemetry.io/collector/config"
25-
"go.opentelemetry.io/collector/config/mapconverter/expandmapconverter"
26-
"go.opentelemetry.io/collector/config/mapprovider/envmapprovider"
27-
"go.opentelemetry.io/collector/config/mapprovider/filemapprovider"
28-
"go.opentelemetry.io/collector/config/mapprovider/yamlmapprovider"
24+
"go.opentelemetry.io/collector/confmap"
25+
"go.opentelemetry.io/collector/confmap/converter/expandconverter"
26+
"go.opentelemetry.io/collector/confmap/provider/envprovider"
27+
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
28+
"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
2929
"go.opentelemetry.io/collector/service"
3030
)
3131

@@ -57,8 +57,8 @@ func getConfig() string {
5757
}
5858

5959
func NewCollector(factories component.Factories) *Collector {
60-
providers := []config.MapProvider{filemapprovider.New(), envmapprovider.New(), yamlmapprovider.New()}
61-
mapProvider := make(map[string]config.MapProvider, len(providers))
60+
providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New()}
61+
mapProvider := make(map[string]confmap.Provider, len(providers))
6262

6363
for _, provider := range providers {
6464
mapProvider[provider.Scheme()] = provider
@@ -67,7 +67,7 @@ func NewCollector(factories component.Factories) *Collector {
6767
cfgSet := service.ConfigProviderSettings{
6868
Locations: []string{getConfig()},
6969
MapProviders: mapProvider,
70-
MapConverters: []config.MapConverterFunc{expandmapconverter.New()},
70+
MapConverters: []confmap.Converter{expandconverter.New()},
7171
}
7272
cfgProvider, err := service.NewConfigProvider(cfgSet)
7373

‎collector/go.mod

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/open-telemetry/opentelemetry-lambda/collector
22

3-
go 1.17
3+
go 1.18
44

55
replace github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents => ./lambdacomponents
66

77
require (
88
github.com/open-telemetry/opentelemetry-lambda/collector/lambdacomponents v0.0.0
9-
go.opentelemetry.io/collector v0.51.0
9+
go.opentelemetry.io/collector v0.54.0
1010
)
1111

1212
require (
@@ -16,7 +16,7 @@ require (
1616
github.com/beorn7/perks v1.0.1 // indirect
1717
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
1818
github.com/cespare/xxhash/v2 v2.1.2 // indirect
19-
github.com/felixge/httpsnoop v1.0.2 // indirect
19+
github.com/felixge/httpsnoop v1.0.3 // indirect
2020
github.com/fsnotify/fsnotify v1.5.4 // indirect
2121
github.com/go-kit/log v0.2.0 // indirect
2222
github.com/go-logfmt/logfmt v0.5.1 // indirect
@@ -32,8 +32,8 @@ require (
3232
github.com/hashicorp/go-multierror v1.1.1 // indirect
3333
github.com/inconshreveable/mousetrap v1.0.0 // indirect
3434
github.com/json-iterator/go v1.1.12 // indirect
35-
github.com/klauspost/compress v1.15.3 // indirect
36-
github.com/knadh/koanf v1.4.1 // indirect
35+
github.com/klauspost/compress v1.15.6 // indirect
36+
github.com/knadh/koanf v1.4.2 // indirect
3737
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
3838
github.com/magiconair/properties v1.8.6 // indirect
3939
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
@@ -43,25 +43,25 @@ require (
4343
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4444
github.com/modern-go/reflect2 v1.0.2 // indirect
4545
github.com/mostynb/go-grpc-compression v1.1.16 // indirect
46-
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.51.0 // indirect
47-
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.51.0 // indirect
48-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.51.0 // indirect
49-
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.51.0 // indirect
50-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.51.0 // indirect
51-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.51.0 // indirect
52-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.51.0 // indirect
53-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.51.0 // indirect
54-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.51.0 // indirect
46+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.54.0 // indirect
47+
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.54.0 // indirect
48+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.54.0 // indirect
49+
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.54.0 // indirect
50+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.54.0 // indirect
51+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.54.0 // indirect
52+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.54.0 // indirect
53+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.54.0 // indirect
54+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.54.0 // indirect
5555
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
5656
github.com/prometheus/client_golang v1.12.1 // indirect
5757
github.com/prometheus/client_model v0.2.0 // indirect
58-
github.com/prometheus/common v0.34.0 // indirect
58+
github.com/prometheus/common v0.35.0 // indirect
5959
github.com/prometheus/procfs v0.7.3 // indirect
6060
github.com/prometheus/prometheus v1.8.2-0.20220117154355-4855a0c067e2 // indirect
6161
github.com/prometheus/statsd_exporter v0.21.0 // indirect
6262
github.com/rs/cors v1.8.2 // indirect
63-
github.com/shirou/gopsutil/v3 v3.22.4 // indirect
64-
github.com/spf13/cast v1.4.1 // indirect
63+
github.com/shirou/gopsutil/v3 v3.22.5 // indirect
64+
github.com/spf13/cast v1.5.0 // indirect
6565
github.com/spf13/cobra v1.4.0 // indirect
6666
github.com/spf13/pflag v1.0.5 // indirect
6767
github.com/tidwall/gjson v1.10.2 // indirect
@@ -73,11 +73,10 @@ require (
7373
github.com/tklauser/numcpus v0.4.0 // indirect
7474
github.com/yusufpapurcu/wmi v1.2.2 // indirect
7575
go.opencensus.io v0.23.0 // indirect
76-
go.opentelemetry.io/collector/pdata v0.51.0 // indirect
77-
go.opentelemetry.io/collector/semconv v0.51.0 // indirect
76+
go.opentelemetry.io/collector/pdata v0.54.0 // indirect
77+
go.opentelemetry.io/collector/semconv v0.54.0 // indirect
7878
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 // indirect
7979
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 // indirect
80-
go.opentelemetry.io/contrib/zpages v0.32.0 // indirect
8180
go.opentelemetry.io/otel v1.7.0 // indirect
8281
go.opentelemetry.io/otel/exporters/prometheus v0.30.0 // indirect
8382
go.opentelemetry.io/otel/metric v0.30.0 // indirect
@@ -87,12 +86,13 @@ require (
8786
go.uber.org/atomic v1.9.0 // indirect
8887
go.uber.org/multierr v1.8.0 // indirect
8988
go.uber.org/zap v1.21.0 // indirect
90-
golang.org/x/net v0.0.0-20220412020605-290c469a71a5 // indirect
89+
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
9190
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
92-
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect
91+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
9392
golang.org/x/text v0.3.7 // indirect
94-
google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect
95-
google.golang.org/grpc v1.46.0 // indirect
93+
google.golang.org/genproto v0.0.0-20220524023933-508584e28198 // indirect
94+
google.golang.org/grpc v1.47.0 // indirect
9695
google.golang.org/protobuf v1.28.0 // indirect
9796
gopkg.in/yaml.v2 v2.4.0 // indirect
97+
gopkg.in/yaml.v3 v3.0.1 // indirect
9898
)

0 commit comments

Comments
 (0)