Skip to content

Commit

Permalink
Upgrade Collector Dependencies to v0.47.0 (#1069)
Browse files Browse the repository at this point in the history 
* Create test_canary.yml

* Delete test_canary.yml

* update dependencies to 0.47

* added replace statement workaround, go mod tidy + make test

Co-authored-by: Ruthvik Ravindra <ruthvikravindra1997@gmail.com>
  • Loading branch information
@erichsueh3 @ruthvik17
erichsueh3 and ruthvik17 authored Mar 18, 2022
1 parent 3b19e98 commit 238df1c
Show file tree
Hide file tree
Showing 4 changed files with 546 additions and 246 deletions.
149 changes: 76 additions & 73 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,47 +3,47 @@ module github.com/aws-observability/aws-otel-collector
go 1.17

require (
github.com/aws/aws-sdk-go v1.43.19
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.46.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.46.0
github.com/aws/aws-sdk-go v1.43.21
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.47.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.47.0
github.com/opencontainers/runc v1.1.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.4.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.46.0
github.com/stretchr/testify v1.7.1
go.opentelemetry.io/collector v0.47.0
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158
golang.org/x/sys v0.0.0-20220318055525-2edf467146b5
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

Expand All @@ -59,7 +59,7 @@ require (
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/DataDog/agent-payload/v5 v5.0.16 // indirect
github.com/DataDog/agent-payload/v5 v5.0.18 // indirect
github.com/DataDog/datadog-agent/pkg/quantile v0.33.1 // indirect
github.com/DataDog/datadog-agent/pkg/trace/exportable v0.0.0-20201016145401-4646cf596b02 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-20201009092105-58e18918b2db // indirect
Expand Down Expand Up @@ -93,7 +93,7 @@ require (
github.com/dgraph-io/ristretto v0.1.0 // indirect
github.com/digitalocean/godo v1.73.0 // indirect
github.com/docker/distribution v2.8.0-beta.1+incompatible // indirect
github.com/docker/docker v20.10.12+incompatible // indirect
github.com/docker/docker v20.10.13+incompatible // indirect
github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
Expand All @@ -110,7 +110,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/go-stack/stack v1.8.1 // indirect
github.com/go-zookeeper/zk v1.0.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/godbus/dbus/v5 v5.0.6 // indirect
Expand All @@ -132,8 +132,9 @@ require (
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/consul/api v1.12.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-hclog v1.1.0 // indirect
github.com/hashicorp/go-hclog v1.2.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
Expand All @@ -143,13 +144,13 @@ require (
github.com/hetznercloud/hcloud-go v1.33.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jaegertracing/jaeger v1.31.0 // indirect
github.com/jaegertracing/jaeger v1.32.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/karrick/godirwalk v1.16.1 // indirect
github.com/klauspost/compress v1.14.4 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/knadh/koanf v1.4.0 // indirect
github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect
github.com/linode/linodego v1.2.1 // indirect
Expand All @@ -175,29 +176,29 @@ require (
github.com/mrunalp/fileutils v0.5.0 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/olivere/elastic v6.2.37+incompatible // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.46.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.47.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.47.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
Expand Down Expand Up @@ -237,7 +238,7 @@ require (
github.com/subosito/gotenv v1.2.0 // indirect
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
github.com/syndtr/goleveldb v1.0.0 // indirect
github.com/tidwall/gjson v1.10.2 // indirect
github.com/tidwall/gjson v1.12.1 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/tidwall/tinylru v1.1.0 // indirect
Expand All @@ -251,7 +252,7 @@ require (
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.46.0 // indirect
go.opentelemetry.io/collector/model v0.47.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.29.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0 // indirect
go.opentelemetry.io/contrib/zpages v0.29.0 // indirect
Expand All @@ -264,22 +265,22 @@ require (
go.opentelemetry.io/otel/trace v1.4.1 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/goleak v1.1.12 // indirect
golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.1.9 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
gonum.org/v1/gonum v0.9.3 // indirect
google.golang.org/api v0.70.0 // indirect
google.golang.org/api v0.72.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf // indirect
google.golang.org/grpc v1.44.0 // indirect
google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6 // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/DataDog/dd-trace-go.v1 v1.36.0 // indirect
gopkg.in/DataDog/dd-trace-go.v1 v1.37.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand All @@ -305,3 +306,5 @@ exclude github.com/google/flatbuffers v1.12.0

// see https://github.com/aws-observability/aws-otel-collector/issues/977
exclude github.com/docker/distribution v2.8.0+incompatible

replace github.com/go-chi/chi/v4 => github.com/go-chi/chi v4.0.0+incompatible
Loading

0 comments on commit 238df1c

Please sign in to comment.