Skip to content

Commit

Permalink
Upgraded dependencies of collector to v0.50.0 (#1197)
Browse files Browse the repository at this point in the history
* Upgraded dependencies of collector to 0.50v

* Update pkg/config/config_factory.go

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>

Co-authored-by: bryan-aguilar <46550959+bryan-aguilar@users.noreply.github.com>
  • Loading branch information
Kausik-A and bryan-aguilar authored May 4, 2022
1 parent c05b8d7 commit a6325af
Show file tree
Hide file tree
Showing 7 changed files with 291 additions and 285 deletions.
2 changes: 1 addition & 1 deletion cmd/awscollector/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func newCommand(params service.CollectorSettings) *cobra.Command {
Version: params.BuildInfo.Version,
SilenceUsage: true,
RunE: func(cmd *cobra.Command, args []string) error {
featuregate.Apply(config.GatesList)
featuregate.GetRegistry().Apply(config.GatesList)
// Initialize provider after flags have been set
params.ConfigProvider = config.GetConfigProvider()
col, err := service.New(params)
Expand Down
2 changes: 1 addition & 1 deletion cmd/awscollector/main_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func run(params service.CollectorSettings) error {

func runService(params service.CollectorSettings) error {
// do not need to supply service name when startup is invoked through Service Control Manager directly
if err := svc.Run("", service.NewWindowsService(params)); err != nil {
if err := svc.Run("", service.NewSvcHandler(params)); err != nil {
return errors.Wrap(err, "failed to start service")
}

Expand Down
140 changes: 70 additions & 70 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,54 @@ module github.com/aws-observability/aws-otel-collector
go 1.17

require (
github.com/aws/aws-sdk-go v1.43.37
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.49.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.49.0
github.com/aws/aws-sdk-go v1.44.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/logzioexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/awsproxy v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.50.0
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.50.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.1
go.opentelemetry.io/collector v0.49.0
go.opentelemetry.io/collector v0.50.0
go.uber.org/multierr v1.8.0
go.uber.org/zap v1.21.0
golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886
gopkg.in/natefinch/lumberjack.v2 v2.0.0
)

require (
cloud.google.com/go/compute v1.5.0 // indirect
cloud.google.com/go/compute v1.6.0 // indirect
contrib.go.opencensus.io/exporter/prometheus v0.4.1 // indirect
github.com/Azure/azure-sdk-for-go v62.0.0+incompatible // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
Expand Down Expand Up @@ -110,7 +110,7 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/dynatrace-oss/dynatrace-metric-utils-go v0.3.0 // indirect
github.com/envoyproxy/go-control-plane v0.10.1 // indirect
github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
github.com/envoyproxy/protoc-gen-validate v0.6.6 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/fatih/color v1.13.0 // indirect
Expand Down Expand Up @@ -139,7 +139,7 @@ require (
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/googleapis/gax-go/v2 v2.2.0 // indirect
github.com/googleapis/gax-go/v2 v2.3.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gophercloud/gophercloud v0.24.0 // indirect
github.com/gorilla/mux v1.8.0 // indirect
Expand All @@ -158,7 +158,7 @@ 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.32.0 // indirect
github.com/jaegertracing/jaeger v1.33.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
Expand All @@ -181,7 +181,7 @@ require (
github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/sys/mountinfo v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -190,28 +190,28 @@ 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/internal/aws/awsutil v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.49.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/proxy v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.50.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.50.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 All @@ -227,7 +227,7 @@ require (
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/prometheus/client_golang v1.12.1 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.33.0 // indirect
github.com/prometheus/common v0.34.0 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/prometheus/prometheus v1.8.2-0.20220324155304-4d8bbfd4164c // indirect
Expand Down Expand Up @@ -265,8 +265,8 @@ require (
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/model v0.49.0 // indirect
go.opentelemetry.io/collector/pdata v0.49.0 // indirect
go.opentelemetry.io/collector/pdata v0.50.0 // indirect
go.opentelemetry.io/collector/semconv v0.50.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.31.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0 // indirect
go.opentelemetry.io/contrib/zpages v0.31.0 // indirect
Expand All @@ -290,18 +290,18 @@ require (
gonum.org/v1/gonum v0.11.0 // indirect
google.golang.org/api v0.74.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb // indirect
google.golang.org/grpc v1.45.0 // indirect
google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9 // indirect
google.golang.org/grpc v1.46.0 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/DataDog/dd-trace-go.v1 v1.37.1 // 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
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 // indirect
k8s.io/api v0.23.5 // indirect
k8s.io/apimachinery v0.23.5 // indirect
k8s.io/client-go v0.23.5 // indirect
k8s.io/api v0.23.6 // indirect
k8s.io/apimachinery v0.23.6 // indirect
k8s.io/client-go v0.23.6 // indirect
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.40.1 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
Expand Down
Loading

0 comments on commit a6325af

Please sign in to comment.