diff --git a/CHANGELOG.md b/CHANGELOG.md index 08eb172c46..33a7121ac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,19 @@ ## Unreleased +## v0.32.0 + +This Splunk OpenTelemetry Connector release includes changes from the [opentelemetry-collector v0.32.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.32.0) and the [opentelemetry-collector-contrib v0.32.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.32.0) releases. + ### 💡 Enhancements 💡 -- smartagent/signalfx-forwarder now works with `k8s_tagger` processor. (#590) +- `smartagent` receiver: `signalfx-forwarder` now works with `k8s_tagger` processor. (#590) +- Add [Fargate](https://github.com/signalfx/splunk-otel-collector/blob/main/deployments/fargate/README.md) deployment support +- Update bundled Smart Agent to [v5.11.3](https://github.com/signalfx/signalfx-agent/releases/tag/v5.11.3) + +### 🧰 Bug fixes 🧰 + +- `smartagent` receiver: Set redirected logrus logger level (#593) ## v0.31.0 diff --git a/go.mod b/go.mod index 0dedf44da3..01c556befc 100644 --- a/go.mod +++ b/go.mod @@ -13,61 +13,61 @@ require ( github.com/hashicorp/vault-plugin-auth-gcp v0.9.0 github.com/hashicorp/vault/api v1.1.0 github.com/hashicorp/vault/sdk v0.2.1 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.31.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.31.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.32.0 github.com/openzipkin/zipkin-go v0.2.5 github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657 github.com/signalfx/golib/v3 v3.3.36 github.com/signalfx/signalfx-agent v1.0.1-0.20210810132027-665c019ace62 github.com/sirupsen/logrus v1.8.1 - github.com/spf13/cast v1.3.1 + github.com/spf13/cast v1.4.0 github.com/stretchr/testify v1.7.0 go.etcd.io/etcd v0.5.0-alpha.5.0.20200425165423-262c93980547 - go.opentelemetry.io/collector v0.31.0 - go.opentelemetry.io/collector/model v0.31.0 - go.uber.org/zap v1.18.1 - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 + go.opentelemetry.io/collector v0.32.0 + go.opentelemetry.io/collector/model v0.32.0 + go.uber.org/zap v1.19.0 + golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c gopkg.in/yaml.v2 v2.4.0 ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.31.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.31.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter => github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval => github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.32.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver => github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.32.0 ) // each of these is required for the smartagentreceiver diff --git a/go.sum b/go.sum index 2cbb558bec..e87fc00d91 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,10 @@ cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECH cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0 h1:hVhK90DwCdOAYGME/FJd9vNIZye9HBR6Yy3fu4js3N8= cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0 h1:MjvSkUq8RuAb+2JLDi5VQmmExRJPUQ3JLCWpRB6fmdw= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -72,8 +74,10 @@ github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo github.com/Azure/azure-storage-blob-go v0.11.0/go.mod h1:A0u4VjtpgZJ7Y7um/+ix2DHBuEKFC6sEIlj0xc13a4Q= github.com/Azure/azure-storage-blob-go v0.13.0 h1:lgWHvFh+UYBNVQLFHXkvul2f6yOPA9PIH82RTG2cSwc= github.com/Azure/azure-storage-blob-go v0.13.0/go.mod h1:pA9kNqtjUeQF2zOSu4s//nUdBD+e64lEuc4sVnuOfNs= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= +github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -178,6 +182,7 @@ github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a h1:KFHLI4QGttB0 github.com/Sectorbob/mlab-ns2 v0.0.0-20171030222938-d3aa0c295a8a/go.mod h1:D73UAuEPckrDorYZdtlCu2ySOLuPB5W4rhIkmmc/XbI= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/sarama v1.22.2-0.20190604114437-cd910a683f9f/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs= +github.com/Shopify/sarama v1.29.0/go.mod h1:2QpgD79wpdAESqNQMxNc0KYMkycd4slxGdV3TWSVqrU= github.com/Shopify/sarama v1.29.1 h1:wBAacXbYVLmWieEA/0X/JagDdCZ8NVFOfS6l6+2u5S0= github.com/Shopify/sarama v1.29.1/go.mod h1:mdtqvCSg8JOxk8PmpTNGyo6wzd4BMm4QXSfDnTXmgkE= github.com/Shopify/toxiproxy v2.1.4+incompatible h1:TKdv8HiTLgE5wdJuEML90aBgNWsokNbMijUGhmcoBJc= @@ -261,8 +266,8 @@ github.com/aws/aws-sdk-go v1.37.19/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2z github.com/aws/aws-sdk-go v1.38.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.3/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.40.8 h1:LBeBOKdgxaR1tknlENTBhcN8CjutpofbMJPtl/6Yug4= -github.com/aws/aws-sdk-go v1.40.8/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.40.24 h1:qtXDYFzAxEmmZaa+4JA9loBqOujO0vm4ZOJoEmjG21E= +github.com/aws/aws-sdk-go v1.40.24/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.3.2/go.mod h1:7OaACgj2SX3XGWnrIjGlJM22h6yD6MEWKvm7levnnM8= github.com/aws/aws-sdk-go-v2 v1.7.0 h1:UYGnoIPIzed+ycmgw8Snb/0HK+KlMD+SndLTneG8ncE= @@ -297,6 +302,7 @@ github.com/axw/gocov v1.0.0/go.mod h1:LvQpEYiwwIb2nYkXY2fDWhg9/AsYqkhmrCshjlUJEC github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw= github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= +github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -459,8 +465,8 @@ github.com/docker/docker v1.4.2-0.20200319182547-c7ad2b866182/go.mod h1:eEKB0N0r github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v17.12.0-ce-rc1.0.20200706150819-a40b877fbb9e+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.8+incompatible h1:RVqD337BgQicVCzYrrlhLDWhq6OAD2PJDUg2LsEUvKM= +github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -497,8 +503,9 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/esimonov/ifshort v1.0.1/go.mod h1:yZqNJUrNn20K8Q9n2CrjTKYyVEmX209Hgu+M1LBpeZE= github.com/evanphx/json-patch v0.0.0-20190203023257-5858425f7550/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs= +github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4 h1:fP04zlkPjAGpsduG7xN3rRkxjAqkJaIQnnkNYYw/pAk= @@ -515,8 +522,9 @@ github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= @@ -687,7 +695,6 @@ github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTM github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-redis/redis/v7 v7.4.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs= @@ -786,8 +793,9 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0 h1:jlYHihg//f7RRwuPfptm04yp4s7O6Kw8EZiVYIGcH0g= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= @@ -836,8 +844,9 @@ github.com/google/addlicense v0.0.0-20190510175307-22550fa7c1b0/go.mod h1:QtPG26 github.com/google/addlicense v0.0.0-20200906110928-a0294312aa76/go.mod h1:EMjYTRimagHs1FwlIqKyX3wAM0u3rA+McvlIIWmSamA= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1-0.20190321164330-bfb38958ad22 h1:GBnith66ViL/ZPY9pFWyRVGAqwlyvUriBBY6Se8ce2A= github.com/google/btree v1.0.1-0.20190321164330-bfb38958ad22/go.mod h1:KPLJImlGmCXVHjMRPHvVvsnK6w8xtANRk3w3QfinNG8= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.26.1 h1:g367RUHc9jQZfiXt2ZAHBoHXgAwMxradQPB3ufM5GrQ= github.com/google/cadvisor v0.26.1/go.mod h1:1nql6U13uTHaLYB8rLS5x9IJc2qT6Xd/Tr1sTX6NE48= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -884,6 +893,8 @@ github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210323184331-8eee2492667d/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v0.0.0-20170306145142-6a5e28554805/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -899,8 +910,9 @@ github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsC github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1 h1:A8Yhf6EtqTv9RMsU6MQTyrtV1TjWlR6xU9BsZIwuTCM= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= github.com/gookit/color v1.3.6/go.mod h1:R3ogXq2B9rTbXoSHJ1HyUVAZ3poOJHpd9nQmyGZsfvQ= github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gophercloud/gophercloud v0.16.0 h1:sWjPfypuzxRxjVbk3/MsU4H8jS0NNlyauZtIUl78BPU= @@ -1002,8 +1014,9 @@ github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrj github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.16.1 h1:IVQwpTGNRRIHafnTs2dQLIk4ENtneRIEEJWOVDqz99o= github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs= +github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.1.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.0 h1:8exGP7ego3OmkfksihtSouGMZ+hQrhxx+FVELeXpVPE= @@ -1180,8 +1193,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huaweicloud/golangsdk v0.0.0-20200304081349-45ec0797f2a4/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iancoleman/strcase v0.0.0-20171129010253-3de563c3dc08/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= -github.com/iancoleman/strcase v0.1.3 h1:dJBk1m2/qjL1twPLf68JND55vvivMupZ4wIzE8CTdBw= -github.com/iancoleman/strcase v0.1.3/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= +github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -1254,8 +1267,10 @@ github.com/jaegertracing/jaeger v1.6.1-0.20180720151925-933efb3a52b0/go.mod h1:L github.com/jaegertracing/jaeger v1.15.1/go.mod h1:LUWPSnzNPGRubM8pk0inANGitpiMOOxihXx0+53llXI= github.com/jaegertracing/jaeger v1.22.0/go.mod h1:WnwW68MjJEViSLRQhe0nkIsBDaF3CzfFd8wJcpJv24k= github.com/jaegertracing/jaeger v1.22.1-0.20210317135401-40e96f966d7c/go.mod h1:evuKmxY4/hIwkih8fF8OCfhwLxKwL+X1b5W8BezFtDo= -github.com/jaegertracing/jaeger v1.24.0 h1:wbzvajFSsV3j5843nIlyUa70+uQevKsT3l7MV29jlxU= +github.com/jaegertracing/jaeger v1.23.0/go.mod h1:gB6Qc+Kjd/IX1G82oGTArbHI3ZRO//iUkaMW+gzL9uw= github.com/jaegertracing/jaeger v1.24.0/go.mod h1:mqdtFDA447va5j0UewDaAWyNlGreGQyhGxXVhbF58gQ= +github.com/jaegertracing/jaeger v1.25.0 h1:6mevWzUxgLl0SoNwfJEvmsZhJvkTP5GdHPfJq74SSug= +github.com/jaegertracing/jaeger v1.25.0/go.mod h1:2OPl4X+hPgPPat+u6FfwdItUR8V0qfynfWfVPcsZ9c0= github.com/jarcoal/httpmock v0.0.0-20180424175123-9c70cfe4a1da/go.mod h1:ks+b9deReOc7jgqp+e7LuFiCBH6Rm5hL32cLcEAArb4= github.com/jarcoal/httpmock v1.0.4/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= github.com/jarcoal/httpmock v1.0.5/go.mod h1:ATjnClrvW/3tijVmpL/va5Z3aAyGvqU3gCT8nX0Txik= @@ -1364,8 +1379,8 @@ github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgo github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= github.com/knadh/koanf v1.1.1/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY= -github.com/knadh/koanf v1.2.0 h1:fANR65nD9cI3HGm0s3pmzqh4hkknt4TasmZzh+rLy1M= -github.com/knadh/koanf v1.2.0/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY= +github.com/knadh/koanf v1.2.1 h1:tVR+BbAM5PA2YkB0OMyfSnEsmt3uygpn3R0WB6jKw7s= +github.com/knadh/koanf v1.2.1/go.mod h1:xpPTwMhsA/aaQLAilyCCqfpEiY1gpa160AiCuWHJUjY= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1373,8 +1388,9 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= @@ -1522,8 +1538,9 @@ github.com/mjibson/esc v0.2.0/go.mod h1:9Hw9gxxfHulMF5OJKCyhYD7PzlSdhzXyaGEBRPH1 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ= -github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 h1:rzf0wL0CHVc8CEsgyygG0Mn9CNCCPZqOPaz8RiiHYQk= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= +github.com/moby/term v0.0.0-20210610120745-9d4ed1856297 h1:yH0SvLzcbZxcJXho2yh7CqdENGMQe73Cw3woZBpPli0= +github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1598,6 +1615,7 @@ github.com/olekukonko/tablewriter v0.0.0-20180130162743-b8a9be070da4/go.mod h1:v github.com/olekukonko/tablewriter v0.0.4 h1:vHD/YYe1Wolo78koG299f7V/VAS08c6IpCLn+Ejf/w8= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olivere/elastic v6.2.35+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= +github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1606,6 +1624,7 @@ github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+ github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.1/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M= github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= @@ -1621,74 +1640,74 @@ github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.4 h1:NiTx7EEvBzu9sFOD1zORteLSt3o8gnlvZZwSE9TnY9U= github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.31.0 h1:COEpJFBtfHYVSsxBUWtUeNixVFLmxD383uYPv91K6+o= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.31.0/go.mod h1:Sm08UNmkpfUKFvyFn5OiHgrQzWYCvTppsFkGcAHjWBE= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.31.0 h1:1eFyEBS/rLrp+oeABB068Jy+xUnuYIQAIpxoefckQu4= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.31.0/go.mod h1:AbA96ME3YhTDDVesgeaglMUjlaTPAIo6/ww2kHBb43M= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.31.0 h1:Yc0pHSyvlusevjLirhZXlHg4Yd0haqEaSgaB9nZXkVA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.31.0/go.mod h1:u8CWN5eOJ+zwIZmgAvvxX8Fiei7kC4MSyJk3qukAviY= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.31.0 h1:gyxyDuQHh7SwD4e4V+L645vQ5hs9GIkrqM7kwlNuWSU= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.31.0/go.mod h1:aosKo+Za/Hilg9doFn0RCkdudX9cl3Avg9FlH47w1E4= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.31.0 h1:/wDygfCD3PwbARU+FDbuzu3UKvfUQp4hQpzKUCi0v6I= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.31.0/go.mod h1:MPt8Ufjzlq1RbW2GP713ORw8N/xvdHiZtD9FH50+Q5M= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.31.0 h1:SBN2efGY7DlzhZyen5IfWDman4WW3L8Xuw5zx1JjE04= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.31.0/go.mod h1:34YyZIF2DEjEhAOgw9CJBkDgT2mP7mjgN+gHM/UL82g= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.31.0 h1:9ZegFsLN6I2kDxMuHgDjKFU1CXAlGlssQ4ImrF+0t7c= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.31.0/go.mod h1:Bcmnnr5FSrO6k5cwqN2tnpy6IgCkTMv4t0GdIYRUWBI= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.31.0 h1:CWlLRwyTFwH5WHDvcFnV/vKyUnPX5ONqgvgtQojDC94= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.31.0/go.mod h1:Dok+5gnfmgg5qK0AWraNHELYv6CKgnWhDMxRFiJmobU= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.31.0 h1:buQUeUGEgrcDPaBueab4ukztgSoTQUVJO5wfI8nlId8= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.31.0/go.mod h1:aSPHJBXAYFwIJrKspYfagcAQBhR0zZXd4bR4Vk12308= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.31.0 h1:uPK6jxgrQnQAa1GebUTRQZk9kC1iwqtvgoJVntTstTM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.31.0/go.mod h1:p9gS27thOrEvy5d/rnFX7IGQyyeo7rkTx2QJNcd5cIw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.31.0 h1:nUlPbGvp4zayZ7eYPqdGbtqkecPPhlpX4Pp6pKg7j8E= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.31.0/go.mod h1:Mxp9+gYIf+lTpTgDafRTmdwf3ZMCF7j9AIJPU/HG4TY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.31.0 h1:yxNDIyudd+/Aw8hGz8zZnkrAE2Xxry25V/t0esEqBes= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.31.0/go.mod h1:v/ey+zffD/BNr6aftyhzUuWMzumkVIOgCjbWx5fUcUw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.31.0 h1:a+3uE81kyYKuQRwvjQ0OJkGWOdEXyx+s8yAsqSDXxJk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.31.0/go.mod h1:62k0hnpHG2Jq7/O3o25xT1/xAwwYjbGqYXOlegkMhpM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.31.0 h1:ms3pMnKGTTZbd2f6c1trPnGSDonULfts8/cbStpONdw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.31.0/go.mod h1:6NNvD1HqUNNiL7JdNL5chunlinF5ANfy2f2gDX9S5GI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.31.0 h1:0oZhzW/PJzfp7/1FKC7wDNwWZmTnhZ4rV5q2LkJ0VbA= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.31.0/go.mod h1:TEB0vij8RwWUTcThVb/ocQhOvZ4OJNPOfs9RJfJjEEs= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.31.0 h1:/g4lyA+CmXLmHzLwEIjgPoU1pAiu3B+KJDXc88sma9Y= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.31.0/go.mod h1:AIOe06EzYKKhHv7nbOXAhjGwCaauSHEAoc4D7rey0BU= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.31.0 h1:uIRxyJ02ZQDwddaQQiosLgTyEm/OsmsUHtSck5mMw/U= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.31.0/go.mod h1:OiWBkft3r5QBIeH0ldn9aGrYVV+JArz7btU3Cnx4phc= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.31.0 h1:yiNA5mp76inwpEVDSfIMUU93u4gREmOH4/kkS5gbGvY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.31.0/go.mod h1:yCBT+392+dfqWOiJOrZbHe8+GfucV6Dy6GVcts6iuPU= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.31.0 h1:g5sc/lJqwmMUM7Y86SK1Hqa5UlPo0NRS2fDs/i0ysZo= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.31.0/go.mod h1:iXBUifO63i/UA9q3DmAlm0RBOOJxaY5qe0H9v/q7HKw= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.31.0 h1:k+VuHmKh2GJDJdycNv3879TsqiUPVilKRKqMnExkzkI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.31.0/go.mod h1:6hJuTBl7wTBXUn3vxFEcdXlHNrD0G5gRZgAGmMvApqM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.31.0 h1:s/R3uh9zZ4Huw6g2p24gbfFDVgJLBwvcHu53L9jdFz8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.31.0/go.mod h1:X12chw/7aZm9P9EhVQeiizgHe9tpgTurfaE5YpmRY14= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.31.0 h1:1E1LajVXh8UzI1BunwSi7vUnePm5VXQGCc6wqCGOKsY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.31.0/go.mod h1:hM8rjKUBBO9Bd7js+ab9G3IZAo+vZNaN2zCWjN6K9MA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.31.0 h1:S6X7J5opdIMvMTQ/cqU+uhcs/RyEYFKTEoZWffU7lHM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.31.0/go.mod h1:F7uEgaTchGPGpBkx+PbtAgKZ/SdNwJNSpIeyExPR/fQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.31.0 h1:xt3qz9kkhAp/Sh+Ex8L9mk27RMcoQu/cVcTDSF7aTbA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.31.0/go.mod h1:EEIKUtZR821/p9RjJTUoavgnxOy4Z9bKFRN+kCgGBaU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.31.0 h1:DiGB5JGSEiwvEEQ6z58h5hKGp67fH/VLY0EWwxm4L+I= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.31.0/go.mod h1:DZGM8/zQAXsBT5o2//uNP2Q4NqasoHcj5a2wi9OQoAk= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.31.0 h1:JXQ7EwGXWfu+YsRjnIX64Us3xCbRLUTOqb2wAlHQhfo= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.31.0/go.mod h1:ZwRBrJ6eFLMWi7Zmpd9YjtqILhxNRqXRR8mDDad0kRg= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.31.0 h1:XWvuH2qzQsrEnOTEhlcGddSj8fDqTidmoo52MBFV6cQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.31.0/go.mod h1:pF9sFc1XC3bqumYV4nZwKWOTW+jI5HOWd8D5ZzxVBAc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.31.0 h1:l+jJf6SJFLyLnUOJkA1onAztf3FVNC9xfjjn7Ezp7lM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.31.0/go.mod h1:QiVruSnnPAivI6TcQpZzhSSI5F7UURos7k0b07bpx78= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.31.0 h1:zQ8aSRWJP0SvMg9NdQ8yqb2W3q4FuXKimIgxAj4Xeis= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.31.0/go.mod h1:dTlVEtTUekY4tupo1g39ExWWbb4KM2C4QCEYovxTyvs= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.31.0 h1:ax19z9XPpiBtf53qmVPlWEjuflw8XXX3M8dwy1WT3T4= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.31.0/go.mod h1:2EN2TxfrR6guIPtu83bSmKEEo8fU5iYXz0sEba/fSdY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.31.0 h1:W0DEhnCVSRi+dS74h7aT4anm6QrLOtuGYb5ijpQakEQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.31.0/go.mod h1:XBn17BK+9dm/FcM/URjAOJjV+8/nvXv1mrlCYoMFCpU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.31.0 h1:lp4xK2wgsQUNvq1yy8ZfEj1oxrxm4v0uhbmC0DZ/MYs= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.31.0/go.mod h1:GsDuXAUHuutN5PKxEb5xYzVqJeifjjY3/CNgY831+uw= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.31.0 h1:ZhbutgXKkUu/CrG9uxQALmtXUKYe7sLHR1VCBufmPn4= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.31.0/go.mod h1:RBxbTB2woqaYqJem/2NF46r7UNRO+8s1AB4unmOX0MA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.31.0 h1:LMTDz5fvv6FOmF3HFhxodDBrdNtFnzQNZ6rgvfbussE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.31.0/go.mod h1:g3qJ9FIjX/OeDfAV0jc2yKgKEzdkecYb+ZPMQcBnFT4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.32.0 h1:SfMYK735Ys4jy4+5iyjQeLhT4Ag37MMFLtRIUKZAPbc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.32.0/go.mod h1:9AXQ0cHY1+aubaXhJ5mlbe+wkfXfe6RaTcziHlJxfNQ= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.32.0 h1:dRbGd+W9jlSI/z/aKN315JfQJwAwhsxq9QIGaaqil1A= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.32.0/go.mod h1:+hZfJPn7Lr45tv2RxcVY0bAlsA0EckZr+sZCWN/n7Y4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.32.0 h1:p+OSGrEcprpi72/N9YZ4xnGKGloXkMGaWmvg/RddUvg= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.32.0/go.mod h1:1Xe8K6I3cj12e7R75kQLxRkvX/2bsLBRLoeIEGVlduA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.32.0 h1:YTsfqAT5NJSFYdRdJ1A3ZuvMSjD7YNeA+tty8PqowEg= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.32.0/go.mod h1:s699+w1f0y3C943MjpeZ1E4U+VXCIAmNVH/KYlDlCVo= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.32.0 h1:KnWP5Ak780C8feJnFm/ywqFE8G0d1EgervFUjx+i70w= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.32.0/go.mod h1:MPt8Ufjzlq1RbW2GP713ORw8N/xvdHiZtD9FH50+Q5M= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.32.0 h1:6e2NQGuzdT1g9j0uHA8ZmEgvp6FUIEbP73K56QVOg9c= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.32.0/go.mod h1:NmQrWf9PEJQCP5z9dF5y1qh9473rhS4Qe4JEwwvGyw4= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.32.0 h1:0fuRo/n9ptRZ+uWoebYijI8o6vtqSFTfeRzbKbgVW+8= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.32.0/go.mod h1:ZTUTjCrAWsSt9R7rZ0oFuH9KJIMghbjqoRIUKnSVaMI= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.32.0 h1:K4DqZ08iAcpWk5rwbXxMMzAm2KzL8aZWKlVBpQ71bDY= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.32.0/go.mod h1:oG4vv+UwsUbK2QOWuVYdRmIY7dLfeshYKSeZJ+eDph8= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.32.0 h1:oeB/Lvs8jPq/Kk/tO4extNdaQ9DWS7CVgJj0nQwW7hc= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.32.0/go.mod h1:q6GfnN7biPfb0wC251iUr6v6mRaBur85ramaU4mV3Qw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.32.0 h1:7wJaCYux0yIaU/8vU2DQhyA5Vut9YnP4hagzP7j2Hfo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.32.0/go.mod h1:xqdpIPolBuIKuPr5ypUQ6Ckmjd/WI4kwr/qiGBs1rmQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.32.0 h1:pQ3qPrnvx11JZSJLSq2sFv9nsnNJKq1PkeRGzmDBSN8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.32.0/go.mod h1:4uuXhslK7FmLJMSu4Q3pVNw830nmspp8ceZWPyeKWOc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.32.0 h1:qRUDVB6x+CvRGoIjHQbcrmHJ4FMddWHGHW8MKB1Cy8I= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.32.0/go.mod h1:mpPEhqUbUdaoWNQLWvOulCN5lBDpcj11CuDwnNXa7fI= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.32.0 h1:aAv0t3N+3ywhhb83Xf8nKA9YfwgTihbi11zmtsBN4mk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.32.0/go.mod h1:aqlCNpIhNwEzxqpPcJW63Q7/Y9BWeij37CUbhjgk3CE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.32.0 h1:T6Kh0VNByCYPZhE4GhAwAP72zpRTezy+IplzWK7Qofw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.32.0/go.mod h1:D2cK9w2s1NQ+azg/PAO23IMp0u3kH4iCK+44NKhsfrc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.32.0 h1:9lkoKxhntEEHEI1qPK9ZTmqoCo/bzo9m3wmkgCiXCaM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.32.0/go.mod h1:cVEcPw3Qu78eu7t9kZiP450zGShZtYas+u1YNEK1pPY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.32.0 h1:1OJYq4RQedAUN/g60UdpE2SC7WzKicqKoqha/Mx2osE= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.32.0/go.mod h1:peioOrWL0EDeiuKels5vNDKjHij66Y+1QXK6xc/pUEI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.32.0 h1:I+nCEKwPVh80lIHKADFHUY8ZFjCpLNxoCpvu4LDyWmo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.32.0/go.mod h1:AIOe06EzYKKhHv7nbOXAhjGwCaauSHEAoc4D7rey0BU= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.32.0 h1:vg1Q6EVxodkN+c6dK3S/OWUxBAF5r0NE7y1U4lWOc5o= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.32.0/go.mod h1:T+Cf+wJNWuNjbw/ad/sEgr8ntF+Vowmg1YEPZhuEx/M= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.32.0 h1:mS3J34S19BB6BbKcsMmG2+l1+/ZLSZOpn3OAm/5r6JI= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.32.0/go.mod h1:75iKEcu//FE0e23RK3NzzC6lBMASMl6LjdQHLBNUwgQ= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.32.0 h1:ARD1ElcKzFpo4QRKo7KRXUfy2mSvxPOvCK8mKKaBUeo= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.32.0/go.mod h1:CL+RFf+cROak8vs4YZEbO8h4TNuBBV3/+OM9kHJ4/mQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.32.0 h1:8c0jHedYLKdU0FQma6AdgB00Dv8Jfzb8xUcpFYvlbEM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.32.0/go.mod h1:y9s4qgJlnGwsdm9Z1Mol25rorzcPUZmVRTaiWDtOFIY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.32.0 h1:OnNeUoWWujGiGrSBOTiZqM9dHghZ4Ulgs6mxalvsL7s= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.32.0/go.mod h1:AB42uzPeIYgJnOs7crfaq+5nbU6ilkPW3Bonp1J9LsA= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.32.0 h1:h+WD6sxrayfsf1kGa0xpP+Ab5hnK38OwieT4c6vmR/I= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.32.0/go.mod h1:U5JHuqPPvt0k1XGC8HBuEK4r97/mL9snyghAjU/VLYE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.32.0 h1:W2ea+zbzHSerpsQpEFFxDRT3vX6aEMNfUu1RJRis6CU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.32.0/go.mod h1:5cZjAQI8hVz2BYrlm7xWB2p6q/gUlnjT2FMC1BIE/xg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.32.0 h1:EisEclsNetRIoyOdQ1lI1snUQNG7eqTE+PWSKU9NERs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.32.0/go.mod h1:tgHW3p6dD+E0R9/Vb+G6BZG04q2IOnonjHOexyVzuuQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.32.0 h1:ExPfBZY2tu8Ac9oHsX2eUuroOrMFoTHICLqQhqErDmE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.32.0/go.mod h1:6B7bjL8DnpUnsDadTsuMm0ZDCCqCp5Eap8r2VTyNAik= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.32.0 h1:ZZCLcX+WxWvQAm5vSGNEyZbUECI9OV2rlME1zQNgoJk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.32.0/go.mod h1:NsyY9jIs++YmSSUqVIuEzn+N3n8AaA2K7Vqpew/Log8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.32.0 h1:1xON2yLph8cMT0/LVMDuTyBPSBYJ1JiUBlaJUhflmDk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.32.0/go.mod h1:4C3OMAKSKM0J7LPoK75AlgZobaqT0VqcM7gQhXtcLUU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.32.0 h1:NHYwoN/traNpkfw/5efJ7He/sB/3I9wBsgy97zRTbYM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.32.0/go.mod h1:5OKnM1kTMd6pV4RukgUe7FW0Xoww70qgR4XMuP5l7L0= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.32.0 h1:6yuXUvgRZ52RspPupkfAFi+psOW3U4lMpTbD28miyks= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.32.0/go.mod h1:DPt43ylMVcOlKTuWsWYjjNyT348cWX0MiXM3UGBObL8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.32.0 h1:oKTVsta0KW1MopeAe3IgC7eUZb461FC/I5cFqFEd0Io= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.32.0/go.mod h1:K64gmLb0xmCCtm/P/zWAJeJJGz7JsvKPZ3mkqf6p508= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.32.0 h1:qiaOuSlmkLbBQGRWDjhyip4KN25bxlF4PiZWMBGCZhU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.32.0/go.mod h1:YziJXfMv+O/uvdPpE2yzuQmrTtyzVZeR4hfP7+hIxcE= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.32.0 h1:KVKas84kS2eKIXFGYiDZl139kmAr7PupGK3R8RL1FI8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.32.0/go.mod h1:vHu4OxUCYPgvXJf69QBevOTnxFjSut5T7ozetNqeXjQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.32.0 h1:SVF294zOTzDYs8qzwiJl9454gVWI6PMxYTEpNXqpEkw= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.32.0/go.mod h1:tCAv6j33Vv1zBg6srnGBTankqFKu1YHMD67THH+vfpc= github.com/open-telemetry/opentelemetry-log-collection v0.20.0 h1:v465KMVk5EWXFmbUhUcy1NTByQBsPXEDZzDx3kRRIoI= github.com/open-telemetry/opentelemetry-log-collection v0.20.0/go.mod h1:HLo/eNwLb0vZLB/XHTFVvsake+RSd2aycTNRoOxPvMs= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1844,10 +1863,12 @@ github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16 github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.23.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= +github.com/prometheus/common v0.25.0/go.mod h1:H6QK/N6XVT42whUeIdI3dp36w49c+/iMDk7UAI2qm7Q= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.30.0 h1:JEkYlQnpzrzQFxi6gnukFPdQ+ac82oRhzMcIduJu/Ug= +github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1893,6 +1914,8 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.1/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.0 h1:P2KMzcFwrPoSjkF1WLRPsp3UMLyql8L4v9hQpVeK5so= @@ -1941,8 +1964,10 @@ github.com/shirou/gopsutil v2.18.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMT github.com/shirou/gopsutil v2.20.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.20.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.1+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil v3.21.6+incompatible h1:mmZtAlWSd8U2HeRTjswbnDLPxqsEoK01NK+GZ1P+nEM= +github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.6+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/shirou/gopsutil v3.21.7+incompatible h1:g/wcPHcuCQvHSePVofjQljd2vX4ty0+J6VoMB+NPcdk= +github.com/shirou/gopsutil v3.21.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil/v3 v3.21.1/go.mod h1:igHnfak0qnw1biGeI2qKQvu0ZkwvEkUcCLlYhZzdr/4= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24 h1:pntxY8Ary0t43dCZ5dqY4YTJCObLY1kIXl0uzMv+7DE= @@ -2039,8 +2064,9 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.4.0 h1:WhlbjwB9EGCc8W5Rxdkus+wmH2ASRwwTJk6tgHKwdqQ= +github.com/spf13/cast v1.4.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= @@ -2114,8 +2140,10 @@ github.com/tidwall/wal v0.1.4 h1:YDUbo2ShwiaGoEu74tC2oQlQFj4iDw+iA9qkkanSKC4= github.com/tidwall/wal v0.1.4/go.mod h1:ww7Pd44/KnyETODJPUPKrzLlYjI72GZWlucNKt7pOt0= github.com/timakin/bodyclose v0.0.0-20200424151742-cb6215831a94/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0= github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= +github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= +github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= +github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/go-sysconf v0.3.6 h1:oc1sJWvKkmvIxhDHeKWvZS4f6AW+YcoguSfRF2/Hmo4= github.com/tklauser/go-sysconf v0.3.6/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= @@ -2246,34 +2274,52 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs= go.opentelemetry.io/collector v0.30.1/go.mod h1:ER3czrkP35ADgO89Q31KGljiQpPW09FKWrXRH61X4BM= -go.opentelemetry.io/collector v0.30.2-0.20210723184018-3b7d6ce4830c/go.mod h1:0FNTwbt9+EAgunYeQDsRf5Q2KxtLxl8ePVkr/VYQ2T4= -go.opentelemetry.io/collector v0.31.0 h1:Lxrsl/fhYQTcsrAOwklQpKi8T+ghxLEmmUjFqeyfeYs= -go.opentelemetry.io/collector v0.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= +go.opentelemetry.io/collector v0.32.0 h1:4g8SPAYJ/Q6HxTE2Du3wPVZH8KZp8VvNnEULv/Mq06A= +go.opentelemetry.io/collector v0.32.0/go.mod h1:a5wyyAdpMtOVMRu2CKHHpOqg8Et+abTdcMIceGZ6OUA= go.opentelemetry.io/collector/model v0.30.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/collector/model v0.30.2-0.20210723184018-3b7d6ce4830c/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/collector/model v0.31.0 h1:IgMOkSBd/n/gV4EQQ1nJ+/ylddOlqTfMGjku91yC0d8= -go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= -go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= +go.opentelemetry.io/collector/model v0.32.0 h1:cilYDoMwUKxqW/XrWFYbI7KUee4g6t2H1QLPPmi/gWs= +go.opentelemetry.io/collector/model v0.32.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= +go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0 h1:68WZYF6CrnsXIVDYc51cR9VmTX2IM7y0svo7s4lu5kQ= +go.opentelemetry.io/contrib v0.22.0 h1:0F7gDEjgb1WGn4ODIjaCAg75hmqF+UN0LiVgwxsCodc= +go.opentelemetry.io/contrib v0.22.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0 h1:G1vNyNfKknFvrKVC8ga8EYIECy0s5D/QPW4QPRSMhwc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0 h1:TjqELdtCtlOJQrTnXd2y+RP6wXKZUnnJer0HR0CSo18= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.22.0/go.mod h1:KjqwX4uJNaj479ZjFpADOMJKOM4rBXq4kN7nbeuGKrY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.21.0/go.mod h1:JQAtechjxLEL81EjmbRwxBq/XEzGaHcsPuDHAx54hg4= -go.opentelemetry.io/contrib/zpages v0.0.0-20210722161726-7668016acb73 h1:PiFJH3VOaYus2l1ogMKKMoCNXhNjaEhYTe+88s1E3pI= -go.opentelemetry.io/contrib/zpages v0.0.0-20210722161726-7668016acb73/go.mod h1:NAkejuYm41lpyL43Fu1XdnCOYxN5NVV80/MJ03JQ/X8= -go.opentelemetry.io/otel v1.0.0-RC1 h1:4CeoX93DNTWt8awGK9JmNXzF9j7TyOu9upscEdtcdXc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.22.0 h1:WHjZguqT+3UjTgFum33hWZYybDVnx8u9q5/kQDfaGTs= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.22.0/go.mod h1:o3MuU25bYroYnc2TOKe8mTk8f9X1oPFO6C5RCoPKtSU= +go.opentelemetry.io/contrib/zpages v0.22.0 h1:4TA4lwy/lFIdbNTqbDI1XDxQXc2CtTonIH/5R7G+sTo= +go.opentelemetry.io/contrib/zpages v0.22.0/go.mod h1:pO7VUk5qoCiekzXk0XCuQcKQsKBHyjx9KFIW1Vlc8dw= +go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.0.0-RC1/go.mod h1:x9tRa9HK4hSSq7jf2TKbqFbtt58/TGk0f9XiEYISI1I= -go.opentelemetry.io/otel/internal/metric v0.21.0 h1:gZlIBo5O51hZOOZz8vEcuRx/l5dnADadKfpT70AELoo= +go.opentelemetry.io/otel v1.0.0-RC2 h1:SHhxSjB+omnGZPgGlKe+QMp3MyazcOHdQ8qwo89oKbg= +go.opentelemetry.io/otel v1.0.0-RC2/go.mod h1:w1thVQ7qbAy8MHb0IFj8a5Q2QU0l2ksf8u/CN8m3NOM= +go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/internal/metric v0.21.0/go.mod h1:iOfAaY2YycsXfYD4kaRSbLx2LKmfpKObWBEv9QK5zFo= -go.opentelemetry.io/otel/metric v0.21.0 h1:ZtcJlHqVE4l8Su0WOLOd9fEPheJuYEiQ0wr9wv2p25I= +go.opentelemetry.io/otel/internal/metric v0.22.0 h1:Q9bS02XRykSRIbggaU4hVF9oWOP9PyILu26zJWoKmk0= +go.opentelemetry.io/otel/internal/metric v0.22.0/go.mod h1:7qVuMihW/ktMonEfOvBXuh6tfMvvEyoIDgeJNRloYbQ= +go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.21.0/go.mod h1:JWCt1bjivC4iCrz/aCrM1GSw+ZcvY44KCbaeeRhzHnc= -go.opentelemetry.io/otel/oteltest v1.0.0-RC1 h1:G685iP3XiskCwk/z0eIabL55XUl2gk0cljhGk9sB0Yk= +go.opentelemetry.io/otel/metric v0.22.0 h1:/qv10BzznqEifrXBwsTT370OCN1PRgt+mnjzMwxJKrQ= +go.opentelemetry.io/otel/metric v0.22.0/go.mod h1:KcsUkBiYGW003DJ+ugd2aqIRIfjabD9jeOUXqsAtrq0= +go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/oteltest v1.0.0-RC1/go.mod h1:+eoIG0gdEOaPNftuy1YScLr1Gb4mL/9lpDkZ0JjMRq4= -go.opentelemetry.io/otel/sdk v1.0.0-RC1 h1:Sy2VLOOg24bipyC29PhuMXYNJrLsxkie8hyI7kUlG9Q= -go.opentelemetry.io/otel/sdk v1.0.0-RC1/go.mod h1:kj6yPn7Pgt5ByRuwesbaWcRLA+V7BSDg3Hf8xRvsvf8= -go.opentelemetry.io/otel/trace v1.0.0-RC1 h1:jrjqKJZEibFrDz+umEASeU3LvdVyWKlnTh7XEfwrT58= +go.opentelemetry.io/otel/oteltest v1.0.0-RC2 h1:xNKqMhlZYkASSyvF4JwObZFMq0jhFN3c3SP+2rCzVPk= +go.opentelemetry.io/otel/oteltest v1.0.0-RC2/go.mod h1:kiQ4tw5tAL4JLTbcOYwK1CWI1HkT5aiLzHovgOVnz/A= +go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= +go.opentelemetry.io/otel/sdk v1.0.0-RC2 h1:ROuteeSCBaZNjiT9JcFzZepmInDvLktR28Y6qKo8bCs= +go.opentelemetry.io/otel/sdk v1.0.0-RC2/go.mod h1:fgwHyiDn4e5k40TD9VX243rOxXR+jzsWBZYA2P5jpEw= +go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= +go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= +go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.0.0-RC1/go.mod h1:86UHmyHWFEtWjfWPSbu0+d0Pf9Q6e1U+3ViBOc+NXAg= +go.opentelemetry.io/otel/trace v1.0.0-RC2 h1:dunAP0qDULMIT82atj34m5RgvsIK6LcsXf1c/MsYg1w= +go.opentelemetry.io/otel/trace v1.0.0-RC2/go.mod h1:JPQ+z6nNw9mqEGT8o3eoPTdnNI+Aj5JcxEsVGREIAy4= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.3.3-0.20190226011305-5328d69c76a9/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -2301,8 +2347,9 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= +go.uber.org/zap v1.19.0 h1:mZQZefskPPCMIBCSEH0v2/iUqqLrYtaeqwD6FUGUnFE= +go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -2342,6 +2389,7 @@ golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -2463,7 +2511,10 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q= @@ -2485,8 +2536,9 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210323180902-22b0adad7558/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c h1:pkQiBZBvdos9qq4wBAHqlzuZHEXo07pqV06ef90u1WI= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 h1:3B43BWw0xEBsLZ/NO1VALz6fppU3481pik+2Ksv45z8= +golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2546,7 +2598,6 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191112214154-59a1497f0cea/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2609,14 +2660,17 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE= @@ -2641,8 +2695,9 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 h1:Vv0JUPWTyeqUq42B2WJ1FeIDjjvGKoA2Ss+Ts0lAVbs= golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs= +golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20170915040203-e531a2a1c15f/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2762,8 +2817,11 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -2813,8 +2871,10 @@ google.golang.org/api v0.42.0/go.mod h1:+Oj4s6ch2SEGtPjGqfUfZonBH0GjQH89gTeKKAEG google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0 h1:RDAPWfNFY06dffEXfn7hZF5Fr1ZbnChzfQZAPyBd1+I= google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= +google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= +google.golang.org/api v0.51.0 h1:SQaA2Cx57B+iPw2MBgyjEkoeMkRK2IenSGoia0U3lCk= +google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2870,6 +2930,7 @@ google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2884,8 +2945,12 @@ google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaE google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d h1:KzwjikDymrEmYYbdyfievTwjEeGlu+OM6oiKBkF3Jfg= google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f h1:4m1jFN3fHeKo0UvpraW2ipO2O0rgp5w2ugXeggtecAk= +google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= @@ -2997,27 +3062,30 @@ k8s.io/api v0.19.2/go.mod h1:IQpK0zFQ1xc5iNIQPqzgoOwuFugaYHK4iCknlAQP9nI= k8s.io/api v0.20.5/go.mod h1:FQjAceXnVaWDeov2YUWhOb6Yt+5UjErkp6UO3nczO1Y= k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.21.3 h1:cblWILbLO8ar+Fj6xdDGr603HRsf8Wu9E9rngJeprZQ= k8s.io/api v0.21.3/go.mod h1:hUgeYHUbBp23Ue4qdX9tR8/ANi/g3ehylAqDn9NWVOg= +k8s.io/api v0.22.0 h1:elCpMZ9UE8dLdYxr55E06TmSeji9I3KH494qH70/y+c= +k8s.io/api v0.22.0/go.mod h1:0AoXXqst47OI/L0oGKq9DG61dvGRPXs7X4/B7KyjBCU= k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b/go.mod h1:FW86P8YXVLsbuplGMZeb20J3jYHscrDqw4jELaFJvRU= k8s.io/apimachinery v0.18.2/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.5/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.21.0/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.21.3 h1:3Ju4nvjCngxxMYby0BimUk+pQHPOQp3eCGChk5kfVII= k8s.io/apimachinery v0.21.3/go.mod h1:H/IM+5vH9kZRNJ4l3x/fXP/5bOPJaVP/guptnZPeCFI= +k8s.io/apimachinery v0.22.0 h1:CqH/BdNAzZl+sr3tc0D3VsK3u6ARVSo3GWyLmfIjbP0= +k8s.io/apimachinery v0.22.0/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= k8s.io/client-go v0.20.5/go.mod h1:Ee5OOMMYvlH8FCZhDsacjMlCBwetbGZETwo1OA+e6Zw= k8s.io/client-go v0.21.0/go.mod h1:nNBytTF9qPFDEhoqgEPaarobC8QPae13bElIVHzIglA= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.21.3 h1:J9nxZTOmvkInRDCzcSNQmPJbDYN/PjlxXT9Mos3HcLg= k8s.io/client-go v0.21.3/go.mod h1:+VPhCgTsaFmGILxR/7E1N0S+ryO010QBeNCv5JwRGYU= +k8s.io/client-go v0.22.0 h1:sD6o9O6tCwUKCENw8v+HFsuAbq2jCu8cWC61/ydwA50= +k8s.io/client-go v0.22.0/go.mod h1:GUjIuXR5PiEv/RVK5OODUsm6eZk7wtSWZSaSJbpFdGg= k8s.io/code-generator v0.19.2/go.mod h1:moqLn7w0t9cMs4+5CQyxnfA/HV8MF6aAVENF+WZZhgk= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.20.5/go.mod h1:l0isoBLGyQKwRoTWbPHR6jNDd3/VqQD43cNlsjddGng= -k8s.io/component-base v0.21.3/go.mod h1:kkuhtfEHeZM6LkX0saqSK8PbdO7A0HigUngmhhrwfGQ= +k8s.io/component-base v0.22.0/go.mod h1:SXj6Z+V6P6GsBhHZVbWCw9hFjUdUYnJerlhhPnYCBCg= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= @@ -3031,21 +3099,24 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.8.0 h1:Q3gmuM9hKEjefWFFYF0Mat+YyFJvsUyYuwyNNJ5C9Ts= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= +k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 h1:vEx13qjvaZ4yfObSSXW7BrMc/KQBBT/Jyee8XtLf4x0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM= +k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kubelet v0.20.5/go.mod h1:iM18y0xm/1VlznuHFGBd9YVT9MM15TgEWJrJHrZ4mtQ= -k8s.io/kubelet v0.21.3 h1:7ZFKnfKRj2/6SN4XKY9rN6JQdVTDYKEAlAWBi9L6EYo= -k8s.io/kubelet v0.21.3/go.mod h1:QT3On5Zlarq8Vpt96uTAnjoHB45fUyyxEwutMLmsxac= +k8s.io/kubelet v0.22.0 h1:cVu1RWuikW9dMJSXDG2f6k81u7NuURrnzphgY/tQxZE= +k8s.io/kubelet v0.22.0/go.mod h1:CMdsuh9OFgbpeE+n46GpVMDecLlI0HxSRHMoNrTmJk4= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9 h1:imL9YgXQ9p7xmPzHFm/vVd/cF78jad+n4wK1ABwYtMM= +k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= layeh.com/radius v0.0.0-20190322222518-890bc1058917/go.mod h1:fywZKyu//X7iRzaxLgPWsvc0L26IUpVvE/aeIL2JtIQ= mvdan.cc/gofumpt v0.1.0/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= diff --git a/internal/buildscripts/packaging/smart-agent-release.txt b/internal/buildscripts/packaging/smart-agent-release.txt index c1ac7aa60a..e6a1f918fd 100644 --- a/internal/buildscripts/packaging/smart-agent-release.txt +++ b/internal/buildscripts/packaging/smart-agent-release.txt @@ -1 +1 @@ -v5.11.2 \ No newline at end of file +v5.11.3 \ No newline at end of file diff --git a/internal/configprovider/helpers.go b/internal/configprovider/helpers.go index 8704444f57..6783cb0cb1 100644 --- a/internal/configprovider/helpers.go +++ b/internal/configprovider/helpers.go @@ -19,21 +19,14 @@ import ( "go.opentelemetry.io/collector/config/experimental/configsource" ) -// WatcherNotSupported is the a watcher function that always returns ErrWatcherNotSupported. -func WatcherNotSupported() error { - return configsource.ErrWatcherNotSupported -} - type retrieved struct { - value interface{} - watchForUpdateFn func() error + value interface{} } // NewRetrieved is a helper that implements the Retrieved interface. -func NewRetrieved(value interface{}, watchForUpdateFn func() error) configsource.Retrieved { +func NewRetrieved(value interface{}) configsource.Retrieved { return &retrieved{ value, - watchForUpdateFn, } } @@ -43,6 +36,28 @@ func (r *retrieved) Value() interface{} { return r.value } -func (r *retrieved) WatchForUpdate() error { +type watchableRetrieved struct { + retrieved + watchForUpdateFn func() error +} + +// NewWatchableRetrieved is a helper that implements the Watchable interface. +func NewWatchableRetrieved(value interface{}, watchForUpdateFn func() error) configsource.Retrieved { + return &watchableRetrieved{ + retrieved: retrieved{ + value: value, + }, + watchForUpdateFn: watchForUpdateFn, + } +} + +var _ configsource.Watchable = (*watchableRetrieved)(nil) +var _ configsource.Retrieved = (*watchableRetrieved)(nil) + +func (r *watchableRetrieved) Value() interface{} { + return r.retrieved.value +} + +func (r *watchableRetrieved) WatchForUpdate() error { return r.watchForUpdateFn() } diff --git a/internal/configprovider/manager.go b/internal/configprovider/manager.go index 9efeedfccf..70c473cba8 100644 --- a/internal/configprovider/manager.go +++ b/internal/configprovider/manager.go @@ -172,7 +172,7 @@ type Manager struct { // is being closed. closeCh chan struct{} // watchers keeps track of all WatchForUpdate functions for retrieved values. - watchers []func() error + watchers []configsource.Watchable // watchersWG is used to ensure that Close waits for all WatchForUpdate calls // to complete. watchersWG sync.WaitGroup @@ -237,18 +237,14 @@ func (m *Manager) WatchForUpdate() error { doneCh := make(chan struct{}) defer close(doneCh) - for _, watcher := range m.watchers { + for i := range m.watchers { + watcher := m.watchers[i] m.watchersWG.Add(1) - watcherFn := watcher go func() { defer m.watchersWG.Done() + err := watcher.WatchForUpdate() - err := watcherFn() switch { - case errors.Is(err, configsource.ErrWatcherNotSupported): - // The watcher for the retrieved value is not supported, nothing to - // do, just exit from the goroutine. - return case errors.Is(err, configsource.ErrSessionClosed): // The Session from which this watcher was retrieved is being closed. // There is no error to report, just exit from the goroutine. @@ -371,7 +367,9 @@ func (m *Manager) expandConfigSource(ctx context.Context, cfgSrc configsource.Co return nil, fmt.Errorf("config source %q failed to retrieve value: %w", cfgSrcName, err) } - m.watchers = append(m.watchers, retrieved.WatchForUpdate) + if watcher, okWatcher := retrieved.(configsource.Watchable); okWatcher { + m.watchers = append(m.watchers, watcher) + } return retrieved.Value(), nil } diff --git a/internal/configprovider/testconfigsource_test.go b/internal/configprovider/testconfigsource_test.go index d5800901a9..71514502b7 100644 --- a/internal/configprovider/testconfigsource_test.go +++ b/internal/configprovider/testconfigsource_test.go @@ -65,17 +65,17 @@ func (t *testConfigSource) Retrieve(ctx context.Context, selector string, params return nil, fmt.Errorf("no value for selector %q", selector) } - watchForUpdateFn := func() error { - return configsource.ErrWatcherNotSupported - } - if entry.WatchForUpdateFn != nil { - watchForUpdateFn = entry.WatchForUpdateFn + return &watchableRetrieved{ + retrieved: retrieved{ + value: entry.Value, + }, + watchForUpdateFn: entry.WatchForUpdateFn, + }, nil } return &retrieved{ - value: entry.Value, - watchForUpdateFn: watchForUpdateFn, + value: entry.Value, }, nil } diff --git a/internal/configsource/envvarconfigsource/session.go b/internal/configsource/envvarconfigsource/session.go index 9a722539ad..8fac464bf4 100644 --- a/internal/configsource/envvarconfigsource/session.go +++ b/internal/configsource/envvarconfigsource/session.go @@ -60,7 +60,7 @@ func (e *envVarSession) Retrieve(_ context.Context, selector string, params inte value, ok := os.LookupEnv(selector) if ok { // Environment variable found, everything is done. - return configprovider.NewRetrieved(value, configprovider.WatcherNotSupported), nil + return configprovider.NewRetrieved(value), nil } defaultValue, ok := e.defaults[selector] @@ -70,7 +70,7 @@ func (e *envVarSession) Retrieve(_ context.Context, selector string, params inte } } - return configprovider.NewRetrieved(defaultValue, configprovider.WatcherNotSupported), nil + return configprovider.NewRetrieved(defaultValue), nil } func (e *envVarSession) RetrieveEnd(context.Context) error { diff --git a/internal/configsource/envvarconfigsource/session_test.go b/internal/configsource/envvarconfigsource/session_test.go index 7708214b35..260d65b096 100644 --- a/internal/configsource/envvarconfigsource/session_test.go +++ b/internal/configsource/envvarconfigsource/session_test.go @@ -103,7 +103,8 @@ func TestEnvVarConfigSource_Session(t *testing.T) { require.NoError(t, err) require.NotNil(t, r) assert.Equal(t, tt.expected, r.Value()) - assert.Equal(t, configsource.ErrWatcherNotSupported, r.WatchForUpdate()) + _, ok := r.(configsource.Watchable) + assert.False(t, ok) }) } } diff --git a/internal/configsource/etcd2configsource/session.go b/internal/configsource/etcd2configsource/session.go index c7b951c517..c18551b203 100644 --- a/internal/configsource/etcd2configsource/session.go +++ b/internal/configsource/etcd2configsource/session.go @@ -55,7 +55,7 @@ func (s *etcd2Session) Retrieve(ctx context.Context, selector string, _ interfac watchCtx, cancel := context.WithCancel(context.Background()) s.closeFuncs = append(s.closeFuncs, cancel) - return configprovider.NewRetrieved(resp.Node.Value, s.newWatcher(watchCtx, selector, resp.Node.ModifiedIndex)), nil + return configprovider.NewWatchableRetrieved(resp.Node.Value, s.newWatcher(watchCtx, selector, resp.Node.ModifiedIndex)), nil } func (s *etcd2Session) RetrieveEnd(context.Context) error { diff --git a/internal/configsource/etcd2configsource/session_test.go b/internal/configsource/etcd2configsource/session_test.go index 0df845c3cf..38d4183b5b 100644 --- a/internal/configsource/etcd2configsource/session_test.go +++ b/internal/configsource/etcd2configsource/session_test.go @@ -55,7 +55,8 @@ func TestSessionRetrieve(t *testing.T) { retrieved, err := session.Retrieve(context.Background(), c.key, nil) if c.expect != nil { assert.NoError(t, err) - assert.NotNil(t, retrieved.WatchForUpdate) + _, okWatcher := retrieved.(configsource.Watchable) + assert.True(t, okWatcher) return } assert.Error(t, err) @@ -90,7 +91,8 @@ func TestWatcher(t *testing.T) { retrieved, err := session.Retrieve(context.Background(), "k1", nil) assert.NoError(t, err) assert.NotNil(t, retrieved.Value) - assert.NotNil(t, retrieved.WatchForUpdate) + retrievedWatcher, okWatcher := retrieved.(configsource.Watchable) + assert.True(t, okWatcher) assert.False(t, watcher.closed) go func() { @@ -104,7 +106,7 @@ func TestWatcher(t *testing.T) { } }() - err = retrieved.WatchForUpdate() + err = retrievedWatcher.WatchForUpdate() switch { case c.close: diff --git a/internal/configsource/includeconfigsource/session.go b/internal/configsource/includeconfigsource/session.go index cee9290149..4544f4a487 100644 --- a/internal/configsource/includeconfigsource/session.go +++ b/internal/configsource/includeconfigsource/session.go @@ -60,7 +60,7 @@ func (is *includeSession) Retrieve(_ context.Context, selector string, params in } if !is.WatchFiles { - return configprovider.NewRetrieved(buf.Bytes(), configprovider.WatcherNotSupported), nil + return configprovider.NewRetrieved(buf.Bytes()), nil } watchForUpdateFn, err := is.watchFile(selector) @@ -68,7 +68,10 @@ func (is *includeSession) Retrieve(_ context.Context, selector string, params in return nil, err } - return configprovider.NewRetrieved(buf.Bytes(), watchForUpdateFn), nil + if watchForUpdateFn == nil { + return configprovider.NewRetrieved(buf.Bytes()), nil + } + return configprovider.NewWatchableRetrieved(buf.Bytes(), watchForUpdateFn), nil } func (is *includeSession) RetrieveEnd(context.Context) error { @@ -91,7 +94,7 @@ func newSession(config Config) *includeSession { } func (is *includeSession) watchFile(file string) (func() error, error) { - watchForUpdateFn := configprovider.WatcherNotSupported + var watchForUpdateFn func() error if _, watched := is.watchedFiles[file]; watched { // This file is already watched another watch function is not needed. return watchForUpdateFn, nil diff --git a/internal/configsource/includeconfigsource/session_test.go b/internal/configsource/includeconfigsource/session_test.go index 1632c93e75..1c9cb2b87e 100644 --- a/internal/configsource/includeconfigsource/session_test.go +++ b/internal/configsource/includeconfigsource/session_test.go @@ -107,7 +107,8 @@ func TestIncludeConfigSource_DeleteFile(t *testing.T) { require.NotNil(t, r) assert.Equal(t, []byte("42"), r.Value()) - assert.Equal(t, configsource.ErrWatcherNotSupported, r.WatchForUpdate()) + _, ok := r.(configsource.Watchable) + assert.False(t, ok) } func TestIncludeConfigSource_DeleteFileError(t *testing.T) { diff --git a/internal/configsource/vaultconfigsource/session.go b/internal/configsource/vaultconfigsource/session.go index 9372eb371a..7c3bf3788c 100644 --- a/internal/configsource/vaultconfigsource/session.go +++ b/internal/configsource/vaultconfigsource/session.go @@ -58,7 +58,7 @@ var _ configsource.Session = (*vaultSession)(nil) func (v *vaultSession) Retrieve(_ context.Context, selector string, _ interface{}) (configsource.Retrieved, error) { // By default assume that watcher is not supported. The exception will be the first // value read from the vault secret. - watchForUpdateFn := watcherNotSupported + var watchForUpdateFn func() error if v.secret == nil { if err := v.readSecret(); err != nil { @@ -79,7 +79,10 @@ func (v *vaultSession) Retrieve(_ context.Context, selector string, _ interface{ return nil, &errBadSelector{fmt.Errorf("no value at path %q for key %q", v.path, selector)} } - return configprovider.NewRetrieved(value, watchForUpdateFn), nil + if watchForUpdateFn == nil { + return configprovider.NewRetrieved(value), nil + } + return configprovider.NewWatchableRetrieved(value, watchForUpdateFn), nil } func (v *vaultSession) RetrieveEnd(context.Context) error { @@ -211,19 +214,19 @@ func (v *vaultSession) buildPollingWatcher() (func() error, error) { mdValue := v.secret.Data["metadata"] if mdValue == nil || !strings.Contains(v.path, "/data/") { v.logger.Warn("Missing metadata to create polling watcher for vault config source", zap.String("path", v.path)) - return watcherNotSupported, nil + return nil, nil } mdMap, ok := mdValue.(map[string]interface{}) if !ok { v.logger.Warn("Metadata not in the expected format to create polling watcher for vault config source", zap.String("path", v.path)) - return watcherNotSupported, nil + return nil, nil } originalVersion := v.extractVersionMetadata(mdMap, "created_time", "version") if originalVersion == nil { v.logger.Warn("Failed to extract version metadata to create to create polling watcher for vault config source", zap.String("path", v.path)) - return watcherNotSupported, nil + return nil, nil } watcherFn := func() error { @@ -316,7 +319,3 @@ func traverseToKey(data map[string]interface{}, key string) interface{} { } } } - -func watcherNotSupported() error { - return configsource.ErrWatcherNotSupported -} diff --git a/internal/configsource/vaultconfigsource/session_test.go b/internal/configsource/vaultconfigsource/session_test.go index fbaf9b1c1a..10ef06e8e5 100644 --- a/internal/configsource/vaultconfigsource/session_test.go +++ b/internal/configsource/vaultconfigsource/session_test.go @@ -93,11 +93,14 @@ func TestVaultSessionForKV(t *testing.T) { require.NoError(t, s.RetrieveEnd(context.Background())) + watcher, ok := retrieved.(configsource.Watchable) + require.True(t, ok) + var watcherErr error doneCh := make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrieved.WatchForUpdate() + watcherErr = watcher.WatchForUpdate() }() require.NoError(t, s.Close(context.Background())) @@ -142,15 +145,19 @@ func TestVaultPollingKVUpdate(t *testing.T) { // RetrieveEnd require.NoError(t, s.RetrieveEnd(context.Background())) + watcherK0, ok := retrievedK0.(configsource.Watchable) + require.True(t, ok) + // Only the first retrieved key provides a working watcher. - require.Equal(t, configsource.ErrWatcherNotSupported, retrievedK1.WatchForUpdate()) + _, ok = retrievedK1.(configsource.Watchable) + require.False(t, ok) var watcherErr error var doneCh chan struct{} doneCh = make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrievedK0.WatchForUpdate() + watcherErr = watcherK0.WatchForUpdate() }() requireCmdRun(t, updateKVStore) @@ -172,11 +179,14 @@ func TestVaultPollingKVUpdate(t *testing.T) { require.NoError(t, err) require.Equal(t, "v1.1", retrievedUpdatedK1.Value().(string)) + watcherUpdatedK1, ok := retrievedUpdatedK1.(configsource.Watchable) + require.True(t, ok) + // Wait for close. doneCh = make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrievedUpdatedK1.WatchForUpdate() + watcherErr = watcherUpdatedK1.WatchForUpdate() }() require.NoError(t, s.Close(context.Background())) @@ -223,10 +233,14 @@ func TestVaultRenewableSecret(t *testing.T) { // RetrieveEnd require.NoError(t, s.RetrieveEnd(context.Background())) + watcherUser, ok := retrievedUser.(configsource.Watchable) + require.True(t, ok) + // Only the first retrieved key provides a working watcher. - require.Equal(t, configsource.ErrWatcherNotSupported, retrievedPwd.WatchForUpdate()) + _, ok = retrievedPwd.(configsource.Watchable) + require.False(t, ok) - watcherErr := retrievedUser.WatchForUpdate() + watcherErr := watcherUser.WatchForUpdate() require.ErrorIs(t, watcherErr, configsource.ErrValueUpdated) // Close current session. @@ -247,11 +261,14 @@ func TestVaultRenewableSecret(t *testing.T) { require.NoError(t, err) require.NotEqual(t, retrievedPwd.Value(), retrievedUpdatedPwd.Value()) + watcherUpdatedPwd, ok := retrievedUpdatedPwd.(configsource.Watchable) + require.True(t, ok) + // Wait for close. doneCh := make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrievedUpdatedUser.WatchForUpdate() + watcherErr = watcherUpdatedPwd.WatchForUpdate() }() runtime.Gosched() @@ -293,12 +310,15 @@ func TestVaultV1SecretWithTTL(t *testing.T) { // RetrieveEnd require.NoError(t, s.RetrieveEnd(context.Background())) + watcher, ok := retrievedValue.(configsource.Watchable) + require.True(t, ok) + var watcherErr error var doneCh chan struct{} doneCh = make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrievedValue.WatchForUpdate() + watcherErr = watcher.WatchForUpdate() }() // Wait for update. @@ -318,11 +338,14 @@ func TestVaultV1SecretWithTTL(t *testing.T) { require.NoError(t, err) require.Equal(t, "s3cr3t", retrievedValue.Value().(string)) + watcher, ok = retrievedValue.(configsource.Watchable) + require.True(t, ok) + // Wait for close. doneCh = make(chan struct{}) go func() { defer close(doneCh) - watcherErr = retrievedValue.WatchForUpdate() + watcherErr = watcher.WatchForUpdate() }() require.NoError(t, s.Close(context.Background())) @@ -363,16 +386,8 @@ func TestVaultV1NonWatchableSecret(t *testing.T) { // RetrieveEnd require.NoError(t, s.RetrieveEnd(context.Background())) - var watcherErr error - doneCh := make(chan struct{}) - go func() { - defer close(doneCh) - watcherErr = retrievedValue.WatchForUpdate() - }() - - // Wait for update. - <-doneCh - require.ErrorIs(t, watcherErr, configsource.ErrWatcherNotSupported) + _, ok := retrievedValue.(configsource.Watchable) + require.False(t, ok) // Close current session. require.NoError(t, s.Close(context.Background())) diff --git a/internal/configsource/zookeeperconfigsource/session.go b/internal/configsource/zookeeperconfigsource/session.go index be47a5ac93..101b1bc22c 100644 --- a/internal/configsource/zookeeperconfigsource/session.go +++ b/internal/configsource/zookeeperconfigsource/session.go @@ -53,7 +53,7 @@ func (s *zkSession) Retrieve(ctx context.Context, selector string, _ interface{} return nil, err } - return configprovider.NewRetrieved(value, newWatcher(watchCh, s.closeCh)), nil + return configprovider.NewWatchableRetrieved(value, newWatcher(watchCh, s.closeCh)), nil } func (s *zkSession) RetrieveEnd(context.Context) error { diff --git a/internal/configsource/zookeeperconfigsource/session_test.go b/internal/configsource/zookeeperconfigsource/session_test.go index 639b9919f0..dc7ad1c9d6 100644 --- a/internal/configsource/zookeeperconfigsource/session_test.go +++ b/internal/configsource/zookeeperconfigsource/session_test.go @@ -54,7 +54,8 @@ func TestSessionRetrieve(t *testing.T) { retrieved, err := session.Retrieve(context.Background(), c.key, nil) if c.expect != nil { assert.NoError(t, err) - assert.NotNil(t, retrieved.WatchForUpdate) + _, okWatcher := retrieved.(configsource.Watchable) + assert.True(t, okWatcher) return } assert.Error(t, err) @@ -89,7 +90,8 @@ func TestWatcher(t *testing.T) { retrieved, err := session.Retrieve(context.Background(), "k1", nil) assert.NoError(t, err) assert.NotNil(t, retrieved.Value) - assert.NotNil(t, retrieved.WatchForUpdate) + retrievedWatcher, okWatcher := retrieved.(configsource.Watchable) + assert.True(t, okWatcher) assert.Contains(t, conn.watches, "k1") watcher := conn.watches["k1"] @@ -108,7 +110,7 @@ func TestWatcher(t *testing.T) { } }() - err = retrieved.WatchForUpdate() + err = retrievedWatcher.WatchForUpdate() switch { case c.close: assert.ErrorIs(t, err, configsource.ErrSessionClosed) diff --git a/internal/extension/smartagentextension/config.go b/internal/extension/smartagentextension/config.go index df377b0560..f0b0868a05 100644 --- a/internal/extension/smartagentextension/config.go +++ b/internal/extension/smartagentextension/config.go @@ -25,7 +25,7 @@ import ( "gopkg.in/yaml.v2" ) -var _ config.CustomUnmarshable = (*Config)(nil) +var _ config.Unmarshallable = (*Config)(nil) type Config struct { config.ExtensionSettings `mapstructure:",squash"` diff --git a/internal/receiver/smartagentreceiver/config.go b/internal/receiver/smartagentreceiver/config.go index e04c5e9f5e..977ea47286 100644 --- a/internal/receiver/smartagentreceiver/config.go +++ b/internal/receiver/smartagentreceiver/config.go @@ -32,7 +32,7 @@ import ( const defaultIntervalSeconds = 10 -var _ config.CustomUnmarshable = (*Config)(nil) +var _ config.Unmarshallable = (*Config)(nil) var errDimensionClientValue = fmt.Errorf("dimensionClients must be an array of compatible exporter names") diff --git a/internal/receiver/smartagentreceiver/receiver_test.go b/internal/receiver/smartagentreceiver/receiver_test.go index 8783573fb8..f5a1b5c69d 100644 --- a/internal/receiver/smartagentreceiver/receiver_test.go +++ b/internal/receiver/smartagentreceiver/receiver_test.go @@ -125,18 +125,16 @@ func TestSmartAgentReceiver(t *testing.T) { for l := 0; l < dg.DataPoints().Len(); l++ { dgdp := dg.DataPoints().At(l) labels = dgdp.LabelsMap() - var val interface{} = dgdp.Value() - _, ok := val.(float64) - assert.True(t, ok, "invalid value of MetricDataTypeGauge metric %s", name) + var val = dgdp.DoubleVal() + assert.NotEqual(t, val, 0, "invalid value of MetricDataTypeGauge metric %s", name) } case pdata.MetricDataTypeSum: ds := metric.Sum() for l := 0; l < ds.DataPoints().Len(); l++ { dsdp := ds.DataPoints().At(l) labels = dsdp.LabelsMap() - var val interface{} = dsdp.Value() - _, ok := val.(float64) - assert.True(t, ok, "invalid value of MetricDataTypeSum metric %s", name) + var val float64 = dsdp.DoubleVal() + assert.NotEqual(t, val, 0, "invalid value of MetricDataTypeSum metric %s", name) } default: t.Errorf("unexpected type %#v for metric %s", metric.DataType(), name)