Modify resourcedetection processor to use our aws-cwa-dev confighttp (o…

…pen-telemetry#44) * Modify resourcedetection processor to use our aws-cwa-dev confighttp
jj22ee · Jul 10, 2023 · 13e423f · 13e423f
1 parent f341e6f
commit 13e423f
Show file tree

Hide file tree

Showing 10 changed files with 321 additions and 195 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -130,6 +130,7 @@ pkg/batchperresourceattr/ @open-telemetry/collect
 pkg/experimentalmetricmetadata/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick
 
 override/aws/ @open-telemetry/collector-contrib-approvers @sethAmazon
+config/confighttp/ @open-telemetry/collector-contrib-approvers @JayPolanco
 
 processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
 processor/cumulativetodeltaprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth

diff --git a/go.mod b/go.mod
@@ -164,23 +164,25 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.77.0
  github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.77.0
- go.opentelemetry.io/collector v0.77.0
- go.opentelemetry.io/collector/exporter v0.77.0
+ go.opentelemetry.io/collector v0.81.0
+ go.opentelemetry.io/collector/exporter v0.81.0
  go.opentelemetry.io/collector/exporter/loggingexporter v0.77.0
  go.opentelemetry.io/collector/exporter/otlpexporter v0.77.0
  go.opentelemetry.io/collector/exporter/otlphttpexporter v0.77.0
+ go.opentelemetry.io/collector/extension v0.81.0
  go.opentelemetry.io/collector/extension/ballastextension v0.77.0
- go.opentelemetry.io/collector/extension/zpagesextension v0.77.0
+ go.opentelemetry.io/collector/extension/zpagesextension v0.81.0
+ go.opentelemetry.io/collector/processor v0.81.0
  go.opentelemetry.io/collector/processor/batchprocessor v0.77.0
  go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.77.0
- go.opentelemetry.io/collector/receiver v0.77.0
+ go.opentelemetry.io/collector/receiver v0.81.0
  go.opentelemetry.io/collector/receiver/otlpreceiver v0.77.0
 )
 
 require (
  bitbucket.org/atlassian/go-asap/v2 v2.6.0 // indirect
- cloud.google.com/go v0.110.0 // indirect
- cloud.google.com/go/compute v1.19.0 // indirect
+ cloud.google.com/go v0.110.2 // indirect
+ cloud.google.com/go/compute v1.20.0 // indirect
  cloud.google.com/go/compute/metadata v0.2.3 // indirect
  cloud.google.com/go/iam v0.13.0 // indirect
  cloud.google.com/go/logging v1.7.0 // indirect
@@ -257,6 +259,7 @@ require (
  github.com/alecthomas/participle/v2 v2.0.0 // indirect
  github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
  github.com/aliyun/aliyun-log-go-sdk v0.1.44 // indirect
+ github.com/amazon-contributing/opentelemetry-collector-contrib/config/confighttp v0.0.0-20230707224110-f341e6f45ea3 // indirect
  github.com/amazon-contributing/opentelemetry-collector-contrib/override/aws v0.0.0-20230630150539-890f186a40da // indirect
  github.com/andybalholm/brotli v1.0.5 // indirect
  github.com/antonmedv/expr v1.12.5 // indirect
@@ -301,7 +304,7 @@ require (
  github.com/cilium/ebpf v0.8.1 // indirect
  github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect
  github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe // indirect
- github.com/cncf/xds/go v0.0.0-20230112175826-46e39c7b9b43 // indirect
+ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
  github.com/containerd/console v1.0.3 // indirect
  github.com/containerd/ttrpc v1.1.0 // indirect
  github.com/coreos/go-oidc v2.2.1+incompatible // indirect
@@ -326,8 +329,8 @@ require (
  github.com/elastic/go-elasticsearch/v7 v7.17.7 // indirect
  github.com/elastic/go-structform v0.0.10 // indirect
  github.com/emicklei/go-restful/v3 v3.10.1 // indirect
- github.com/envoyproxy/go-control-plane v0.11.0 // indirect
- github.com/envoyproxy/protoc-gen-validate v0.9.1 // indirect
+ github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f // indirect
+ github.com/envoyproxy/protoc-gen-validate v0.10.1 // indirect
  github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
  github.com/facebook/time v0.0.0-20220713225404-f7a0d7702d50 // indirect
  github.com/fatih/color v1.14.1 // indirect
@@ -374,10 +377,10 @@ require (
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/go-querystring v1.1.0 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
- github.com/google/s2a-go v0.1.2 // indirect
+ github.com/google/s2a-go v0.1.4 // indirect
  github.com/google/uuid v1.3.0 // indirect
  github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
- github.com/googleapis/gax-go/v2 v2.8.0 // indirect
+ github.com/googleapis/gax-go/v2 v2.10.0 // indirect
  github.com/gophercloud/gophercloud v1.2.0 // indirect
  github.com/gorilla/mux v1.8.0 // indirect
  github.com/gorilla/websocket v1.5.0 // indirect
@@ -432,8 +435,9 @@ require (
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/karrick/godirwalk v1.17.0 // indirect
  github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
- github.com/klauspost/compress v1.16.5 // indirect
+ github.com/klauspost/compress v1.16.7 // indirect
  github.com/knadh/koanf v1.5.0 // indirect
+ github.com/knadh/koanf/v2 v2.0.1 // indirect
  github.com/kolo/xmlrpc v0.0.0-20220921171641-a4b6fa1dd06b // indirect
  github.com/kr/fs v0.1.0 // indirect
  github.com/kylelemons/godebug v1.1.0 // indirect
@@ -458,14 +462,14 @@ require (
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/hashstructure v1.1.0 // indirect
  github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
- github.com/mitchellh/mapstructure v1.5.0 // indirect
+ github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/sys/mountinfo v0.6.2 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/mongodb-forks/digest v1.0.4 // indirect
  github.com/montanaflynn/stats v0.6.6 // indirect
- github.com/mostynb/go-grpc-compression v1.1.17 // indirect
+ github.com/mostynb/go-grpc-compression v1.2.0 // indirect
  github.com/mrunalp/fileutils v0.5.0 // indirect
  github.com/mtibben/percent v0.2.1 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -528,11 +532,11 @@ require (
  github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
  github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
  github.com/pquerna/cachecontrol v0.1.0 // indirect
- github.com/prometheus/client_golang v1.15.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.42.0 // indirect
+ github.com/prometheus/client_golang v1.16.0 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.44.0 // indirect
  github.com/prometheus/common/sigv4 v0.1.0 // indirect
- github.com/prometheus/procfs v0.9.0 // indirect
+ github.com/prometheus/procfs v0.10.1 // indirect
  github.com/prometheus/prometheus v0.43.0 // indirect
  github.com/prometheus/statsd_exporter v0.22.7 // indirect
  github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
@@ -543,8 +547,8 @@ require (
  github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect
  github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
  github.com/segmentio/asm v1.2.0 // indirect
- github.com/shirou/gopsutil/v3 v3.23.4 // indirect
- github.com/shoenig/go-m1cpu v0.1.5 // indirect
+ github.com/shirou/gopsutil/v3 v3.23.5 // indirect
+ github.com/shoenig/go-m1cpu v0.1.6 // indirect
  github.com/shopspring/decimal v1.3.1 // indirect
  github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect
  github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect
@@ -561,7 +565,7 @@ require (
  github.com/spf13/cobra v1.7.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/stretchr/objx v0.5.0 // indirect
- github.com/stretchr/testify v1.8.2 // indirect
+ github.com/stretchr/testify v1.8.4 // indirect
  github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
  github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.650 // indirect
  github.com/tg123/go-htpasswd v1.2.1 // indirect
@@ -588,50 +592,63 @@ require (
  github.com/xdg-go/stringprep v1.0.4 // indirect
  github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
  github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
- github.com/yusufpapurcu/wmi v1.2.2 // indirect
+ github.com/yusufpapurcu/wmi v1.2.3 // indirect
  go.etcd.io/bbolt v1.3.7 // indirect
  go.mongodb.org/atlas v0.25.0 // indirect
  go.mongodb.org/mongo-driver v1.11.4 // indirect
  go.opencensus.io v0.24.0 // indirect
- go.opentelemetry.io/collector/component v0.77.0 // indirect
- go.opentelemetry.io/collector/confmap v0.77.0 // indirect
- go.opentelemetry.io/collector/consumer v0.77.0 // indirect
- go.opentelemetry.io/collector/featuregate v0.77.0 // indirect
- go.opentelemetry.io/collector/pdata v1.0.0-rcv0011 // indirect
- go.opentelemetry.io/collector/semconv v0.77.0 // indirect
- go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.41.1 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.41.1 // indirect
- go.opentelemetry.io/contrib/propagators/b3 v1.15.0 // indirect
- go.opentelemetry.io/contrib/zpages v0.41.1 // indirect
- go.opentelemetry.io/otel v1.15.1 // indirect
- go.opentelemetry.io/otel/bridge/opencensus v0.38.0 // indirect
- go.opentelemetry.io/otel/exporters/prometheus v0.38.1 // indirect
- go.opentelemetry.io/otel/metric v0.38.1 // indirect
- go.opentelemetry.io/otel/sdk v1.15.1 // indirect
- go.opentelemetry.io/otel/sdk/metric v0.38.1 // indirect
- go.opentelemetry.io/otel/trace v1.15.1 // indirect
- go.uber.org/atomic v1.10.0 // indirect
+ go.opentelemetry.io/collector/component v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configgrpc v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/confighttp v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/confignet v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configtelemetry v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/configtls v0.81.0 // indirect
+ go.opentelemetry.io/collector/config/internal v0.81.0 // indirect
+ go.opentelemetry.io/collector/confmap v0.81.0 // indirect
+ go.opentelemetry.io/collector/connector v0.81.0 // indirect
+ go.opentelemetry.io/collector/consumer v0.81.0 // indirect
+ go.opentelemetry.io/collector/extension/auth v0.81.0 // indirect
+ go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect
+ go.opentelemetry.io/collector/pdata v1.0.0-rcv0013 // indirect
+ go.opentelemetry.io/collector/semconv v0.81.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
+ go.opentelemetry.io/contrib/propagators/b3 v1.17.0 // indirect
+ go.opentelemetry.io/contrib/zpages v0.42.0 // indirect
+ go.opentelemetry.io/otel v1.16.0 // indirect
+ go.opentelemetry.io/otel/bridge/opencensus v0.39.0 // indirect
+ go.opentelemetry.io/otel/exporters/prometheus v0.39.0 // indirect
+ go.opentelemetry.io/otel/metric v1.16.0 // indirect
+ go.opentelemetry.io/otel/sdk v1.16.0 // indirect
+ go.opentelemetry.io/otel/sdk/metric v0.39.0 // indirect
+ go.opentelemetry.io/otel/trace v1.16.0 // indirect
+ go.uber.org/atomic v1.11.0 // indirect
  go.uber.org/goleak v1.2.1 // indirect
  go.uber.org/multierr v1.11.0 // indirect
  go.uber.org/zap v1.24.0 // indirect
- golang.org/x/crypto v0.8.0 // indirect
+ golang.org/x/crypto v0.11.0 // indirect
  golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
  golang.org/x/mod v0.10.0 // indirect
- golang.org/x/net v0.9.0 // indirect
- golang.org/x/oauth2 v0.7.0 // indirect
- golang.org/x/sync v0.1.0 // indirect
- golang.org/x/sys v0.7.0 // indirect
- golang.org/x/term v0.7.0 // indirect
- golang.org/x/text v0.9.0 // indirect
+ golang.org/x/net v0.12.0 // indirect
+ golang.org/x/oauth2 v0.8.0 // indirect
+ golang.org/x/sync v0.2.0 // indirect
+ golang.org/x/sys v0.10.0 // indirect
+ golang.org/x/term v0.10.0 // indirect
+ golang.org/x/text v0.11.0 // indirect
  golang.org/x/time v0.3.0 // indirect
  golang.org/x/tools v0.8.0 // indirect
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  gonum.org/v1/gonum v0.13.0 // indirect
- google.golang.org/api v0.120.0 // indirect
+ google.golang.org/api v0.125.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
- google.golang.org/grpc v1.54.0 // indirect
- google.golang.org/protobuf v1.30.0 // indirect
+ google.golang.org/genproto v0.0.0-20230629202037-9506855d4529 // indirect
+ google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect
+ google.golang.org/grpc v1.56.2 // indirect
+ google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
  gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect