Skip to content
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

Upgrade OTel dependencies to v0.43.1 #925

Merged
merged 3 commits into from
Jan 27, 2022
Merged

Upgrade OTel dependencies to v0.43.1 #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd53c25
Update params pased to NewConfigProvider
bryan-aguilar Jan 27, 2022
1a1202d
Upgraade lambdacomponents dependencies
bryan-aguilar Jan 27, 2022
8d94c23
Compact call GetConfigProvider
bryan-aguilar Jan 27, 2022
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
195 changes: 102 additions & 93 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

475 changes: 273 additions & 202 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 3 additions & 7 deletions pkg/config/config_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ import (
"log"
"os"

"go.opentelemetry.io/collector/config/configmapprovider"
"go.opentelemetry.io/collector/config/configunmarshaler"
"go.opentelemetry.io/collector/service"
)

Expand All @@ -31,13 +29,11 @@ const (
func GetConfigProvider() service.ConfigProvider {
// aws-otel-collector supports loading yaml config from Env Var
// including SSM parameter store for ECS use case
loc := getConfigFlag()
if configContent, ok := os.LookupEnv(envKey); ok {
log.Printf("Reading AOT config from environment: %v\n", configContent)
return service.NewConfigProvider(
[]configmapprovider.Provider{configmapprovider.NewEnv(envKey)},
[]service.ConfigMapConverterFunc{NewExpandConverter()},
configunmarshaler.NewDefault())
loc = "env:" + envKey
}

return service.NewDefaultConfigProvider(getConfigFlag(), getSetFlag())
return service.NewDefaultConfigProvider([]string{loc}, getSetFlag())
}
61 changes: 0 additions & 61 deletions pkg/config/expand.go
View file
Open in desktop

This file was deleted.

46 changes: 23 additions & 23 deletions pkg/lambdacomponents/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,20 @@ module github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents
go 1.17

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.42.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.43.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.43.0
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.42.0
go.opentelemetry.io/collector v0.43.1
go.uber.org/multierr v1.7.0
)

require (
github.com/aws/aws-sdk-go v1.42.27 // indirect
github.com/aws/aws-sdk-go v1.42.40 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/containerd/containerd v1.5.9 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/felixge/httpsnoop v1.0.2 // indirect
github.com/go-logr/logr v1.2.1 // indirect
Expand All @@ -28,24 +27,25 @@ require (
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.13.6 // indirect
github.com/klauspost/compress v1.14.1 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.1.15 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.42.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.42.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.42.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.42.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.42.0 // indirect
github.com/mostynb/go-grpc-compression v1.1.16 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.43.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.43.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_golang v1.12.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220111145625-076109fa1910 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/tidwall/gjson v1.10.2 // indirect
Expand All @@ -54,7 +54,7 @@ require (
github.com/tidwall/tinylru v1.1.0 // indirect
github.com/tidwall/wal v1.1.7 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.42.0 // indirect
go.opentelemetry.io/collector/model v0.43.1 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 // indirect
go.opentelemetry.io/otel v1.3.0 // indirect
Expand All @@ -63,17 +63,17 @@ require (
go.opentelemetry.io/otel/trace v1.3.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/zap v1.20.0 // indirect
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98 // indirect
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/genproto v0.0.0-20220111164026-67b88f271998 // indirect
google.golang.org/grpc v1.43.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.42.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.43.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.42.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.43.0

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.42.0
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.43.0
Loading