From 440455adcbcd00dd2c68da265e13bb86688306ce Mon Sep 17 00:00:00 2001 From: Ryan Fitzpatrick Date: Mon, 10 Jan 2022 18:47:02 +0000 Subject: [PATCH 1/2] update deps to 0.42.0 --- cmd/otelcol/main.go | 34 +- go.mod | 224 ++++----- go.sum | 453 ++++++++++-------- internal/configconverter/k8s_tagger.go | 9 +- internal/configconverter/k8s_tagger_test.go | 16 +- internal/configconverter/move_hec_tls.go | 10 +- internal/configconverter/move_hec_tls_test.go | 14 +- .../configconverter/move_otlp_insecure.go | 10 +- .../move_otlp_insecure_test.go | 48 +- internal/configconverter/parser_provider.go | 74 --- .../configconverter/parser_provider_test.go | 57 --- .../configconverter/remove_ballast_key.go | 10 +- .../configprovider/config_source_provider.go | 90 ++-- .../config_source_provider_test.go | 20 +- .../exporter/httpsinkexporter/config_test.go | 4 +- .../smartagentextension/config_linux_test.go | 4 +- .../smartagentextension/config_test.go | 7 +- .../config_windows_test.go | 4 +- .../smartagentreceiver/config_linux_test.go | 4 +- .../smartagentreceiver/config_test.go | 28 +- .../smartagentreceiver/receiver_test.go | 4 +- tests/go.mod | 40 +- tests/go.sum | 283 ++++++++--- 23 files changed, 774 insertions(+), 673 deletions(-) delete mode 100644 internal/configconverter/parser_provider.go delete mode 100644 internal/configconverter/parser_provider_test.go diff --git a/cmd/otelcol/main.go b/cmd/otelcol/main.go index 0920b6b204..b6e1df0af8 100644 --- a/cmd/otelcol/main.go +++ b/cmd/otelcol/main.go @@ -18,7 +18,6 @@ package main import ( - "bytes" "flag" "fmt" "io" @@ -29,6 +28,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/configmapprovider" + "go.opentelemetry.io/collector/config/configunmarshaler" "go.opentelemetry.io/collector/service" "go.uber.org/zap" @@ -82,20 +82,21 @@ func main() { Version: version.Version, } - parserProvider := configprovider.NewConfigSourceParserProvider( - newBaseParserProvider(), + configMapProviderFromConfigSources := configprovider.NewConfigSourceConfigMapProvider( + baseConfigMapProviders(), zap.NewNop(), // The service logger is not available yet, setting it to NoP. info, configsources.Get()..., ) + var configMapConverters []service.ConfigMapConverterFunc + const noConvertConfigFlag = "--no-convert-config" if hasFlag(noConvertConfigFlag) { // the collector complains about this flag if we don't remove it removeFlag(&os.Args, noConvertConfigFlag) } else { - parserProvider = configconverter.ParserProvider( - parserProvider, + configMapConverters = append(configMapConverters, configconverter.RemoveBallastKey, configconverter.MoveOTLPInsecureKey, configconverter.MoveHecTLS, @@ -103,10 +104,16 @@ func main() { ) } + serviceConfigProvider := service.NewConfigProvider( + []configmapprovider.Provider{configMapProviderFromConfigSources}, + configMapConverters, + configunmarshaler.NewDefault(), + ) + serviceParams := service.CollectorSettings{ - BuildInfo: info, - Factories: factories, - ConfigMapProvider: parserProvider, + BuildInfo: info, + Factories: factories, + ConfigProvider: serviceConfigProvider, } if err := run(serviceParams); err != nil { @@ -370,8 +377,8 @@ func setDefaultEnvVars() { } } -// Returns a ParserProvider that reads configuration YAML from an environment variable when applicable. -func newBaseParserProvider() configmapprovider.Provider { +// Returns a []configmapprovider.Provider for reading from yaml env var or config path and set properties +func baseConfigMapProviders() []configmapprovider.Provider { var configPath string var ok bool if ok, configPath = getKeyValue(os.Args[1:], "--config"); !ok { @@ -380,10 +387,13 @@ func newBaseParserProvider() configmapprovider.Provider { configYaml := os.Getenv(configYamlEnvVarName) if configPath == "" && configYaml != "" { - return configmapprovider.NewExpand(configmapprovider.NewInMemory(bytes.NewBufferString(configYaml))) + return []configmapprovider.Provider{configmapprovider.NewEnv(configYamlEnvVarName)} } - return configmapprovider.NewDefault(configPath, getSetProperties()) + return []configmapprovider.Provider{ + configmapprovider.NewFile(configPath), + configmapprovider.NewProperties(getSetProperties()), + } } func runInteractive(settings service.CollectorSettings) error { diff --git a/go.mod b/go.mod index 91af6e7be0..9886702f84 100644 --- a/go.mod +++ b/go.mod @@ -15,53 +15,53 @@ require ( github.com/hashicorp/vault-plugin-auth-gcp v0.9.1 github.com/hashicorp/vault/api v1.1.1 github.com/jaegertracing/jaeger v1.29.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.41.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.42.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.40.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.41.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.42.0 github.com/openzipkin/zipkin-go v0.3.0 github.com/signalfx/defaults v1.2.2-0.20180531161417-70562fe60657 github.com/signalfx/golib/v3 v3.3.43 @@ -72,12 +72,12 @@ require ( github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 go.etcd.io/etcd/client/v2 v2.305.1 - go.opentelemetry.io/collector v0.41.0 - go.opentelemetry.io/collector/model v0.41.0 - go.opentelemetry.io/otel/trace v1.2.0 + go.opentelemetry.io/collector v0.42.0 + go.opentelemetry.io/collector/model v0.42.0 + go.opentelemetry.io/otel/trace v1.3.0 go.uber.org/multierr v1.7.0 - go.uber.org/zap v1.19.1 - golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 + go.uber.org/zap v1.20.0 + golang.org/x/sys v0.0.0-20211210111614-af8b64212486 gopkg.in/yaml.v2 v2.4.0 ) @@ -112,7 +112,7 @@ require ( github.com/apache/thrift v0.15.0 // indirect github.com/armon/go-metrics v0.3.10 // indirect github.com/armon/go-radix v1.0.0 // indirect - github.com/aws/aws-sdk-go v1.42.21 // indirect + github.com/aws/aws-sdk-go v1.42.27 // indirect github.com/aws/aws-sdk-go-v2 v1.9.2 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.4.3 // indirect github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0 // indirect @@ -130,7 +130,7 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/cloudfoundry-incubator/uaago v0.0.0-20190307164349-8136b7bbe76e // indirect github.com/containerd/cgroups v1.0.1 // indirect - github.com/containerd/containerd v1.5.8 // indirect + github.com/containerd/containerd v1.5.9 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f // indirect github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect @@ -138,7 +138,7 @@ require ( github.com/denisenkom/go-mssqldb v0.11.0 // indirect github.com/digitalocean/godo v1.62.0 // indirect github.com/docker/distribution v2.7.1+incompatible // indirect - github.com/docker/docker v20.10.11+incompatible // indirect + github.com/docker/docker v20.10.12+incompatible // indirect github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/eapache/go-resiliency v1.2.0 // indirect @@ -152,7 +152,8 @@ require ( github.com/go-kit/kit v0.11.0 // indirect github.com/go-kit/log v0.2.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v0.4.0 // indirect + github.com/go-logr/logr v1.2.1 // indirect + github.com/go-logr/stdr v1.2.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.13.0 // indirect github.com/go-sql-driver/mysql v1.6.0 // indirect @@ -193,7 +194,7 @@ require ( github.com/hashicorp/go-version v1.2.1 // indirect github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/hashicorp/hcl v1.0.1-vault // indirect - github.com/hashicorp/serf v0.9.5 // indirect + github.com/hashicorp/serf v0.9.6 // indirect github.com/hashicorp/vault/sdk v0.2.1 // indirect github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect github.com/hetznercloud/hcloud-go v1.26.2 // indirect @@ -224,13 +225,13 @@ require ( github.com/karrick/godirwalk v1.10.3 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.13.6 // indirect - github.com/knadh/koanf v1.3.3 // indirect + github.com/knadh/koanf v1.4.0 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/leoluk/perflib_exporter v0.1.0 // indirect github.com/lib/pq v1.10.3 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.11 // indirect + github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-ieproxy v0.0.1 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.8 // indirect @@ -259,19 +260,19 @@ require ( github.com/observiq/ctimefmt v1.0.0 // indirect github.com/oklog/run v1.1.0 // indirect github.com/olekukonko/tablewriter v0.0.4 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.41.0 // indirect - github.com/open-telemetry/opentelemetry-log-collection v0.23.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.42.0 // indirect + github.com/open-telemetry/opentelemetry-log-collection v0.24.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.0.2 // indirect @@ -294,12 +295,12 @@ require ( github.com/prometheus/prometheus v2.5.0+incompatible // indirect github.com/prometheus/statsd_exporter v0.21.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rs/cors v1.8.0 // indirect + github.com/rs/cors v1.8.2 // indirect github.com/ryanuber/go-glob v1.0.0 // indirect github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 // indirect github.com/shirou/gopsutil v3.21.10+incompatible // indirect - github.com/shirou/gopsutil/v3 v3.21.11 // indirect + github.com/shirou/gopsutil/v3 v3.21.12 // indirect github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 // indirect github.com/signalfx/gateway v1.2.19-0.20191125135538-2c417b7ae0bd // indirect github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect @@ -310,10 +311,10 @@ require ( github.com/snowflakedb/gosnowflake v1.6.3 // indirect github.com/soniah/gosnmp v0.0.0-20190220004421-68e8beac0db9 // indirect github.com/spf13/afero v1.6.0 // indirect - github.com/spf13/cobra v1.2.1 // indirect + github.com/spf13/cobra v1.3.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/spf13/viper v1.9.0 // indirect + github.com/spf13/viper v1.10.0 // indirect github.com/stretchr/objx v0.2.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/testcontainers/testcontainers-go v0.11.1 // indirect @@ -336,65 +337,66 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.5.1 // indirect go.mongodb.org/atlas v0.14.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 // indirect - go.opentelemetry.io/contrib/zpages v0.27.0 // indirect - go.opentelemetry.io/otel v1.2.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.25.0 // indirect - go.opentelemetry.io/otel/internal/metric v0.25.0 // indirect - go.opentelemetry.io/otel/metric v0.25.0 // indirect - go.opentelemetry.io/otel/sdk v1.2.0 // indirect - go.opentelemetry.io/otel/sdk/export/metric v0.25.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.25.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 // indirect + go.opentelemetry.io/contrib/zpages v0.28.0 // indirect + go.opentelemetry.io/otel v1.3.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.26.0 // indirect + go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect + go.opentelemetry.io/otel/metric v0.26.0 // indirect + go.opentelemetry.io/otel/sdk v1.3.0 // indirect + go.opentelemetry.io/otel/sdk/export/metric v0.26.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.26.0 // indirect go.uber.org/atomic v1.9.0 // indirect golang.org/x/crypto v0.0.0-20210920023735-84f357641f63 // indirect - golang.org/x/mod v0.4.2 // indirect - golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect + golang.org/x/mod v0.5.0 // indirect + golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect - golang.org/x/tools v0.1.5 // indirect + golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect gonum.org/v1/gonum v0.9.3 // indirect - google.golang.org/api v0.61.0 // indirect + google.golang.org/api v0.63.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0 // indirect - google.golang.org/grpc v1.42.0 // indirect + google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect + google.golang.org/grpc v1.43.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/fatih/set.v0 v0.1.0 // indirect gopkg.in/fsnotify.v1 v1.4.7 // indirect gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect gopkg.in/go-playground/validator.v9 v9.29.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.63.2 // indirect + gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/square/go-jose.v2 v2.5.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/api v0.22.4 // indirect - k8s.io/apimachinery v0.22.4 // indirect - k8s.io/client-go v0.22.4 // indirect - k8s.io/klog/v2 v2.9.0 // indirect - k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c // indirect - k8s.io/kubelet v0.22.4 // indirect - k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect + k8s.io/api v0.23.1 // indirect + k8s.io/apimachinery v0.23.1 // indirect + k8s.io/client-go v0.23.1 // indirect + k8s.io/klog/v2 v2.30.0 // indirect + k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect + k8s.io/kubelet v0.23.1 // indirect + k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect + sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) replace ( - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.41.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.41.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer => github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage => github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig => github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet => github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza => github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.42.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.42.0 github.com/signalfx/splunk-otel-collector/tests => ./tests ) diff --git a/go.sum b/go.sum index cc0d6cc82e..f8b3a49475 100644 --- a/go.sum +++ b/go.sum @@ -34,6 +34,7 @@ cloud.google.com/go v0.92.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+Y cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= @@ -48,6 +49,7 @@ cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7 cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= cloud.google.com/go/firestore v1.6.0/go.mod h1:afJwI0vaXwAG54kI7A//lP/lSPDkQORQuMkv56TxEPU= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/kms v0.1.0 h1:VXAb5OzejDcyhFzIDeZ5n5AUdlsFnCyexuascIwWMj0= cloud.google.com/go/kms v0.1.0/go.mod h1:8Qp8PCAypHg4FdmlyW1QRAv09BGQ9Uzh7JnmIZxPk+c= cloud.google.com/go/monitoring v0.1.0 h1:vssDZ792skH6AWCDH1OogKfs/FzgEVTB/yUAzfgBR24= @@ -276,7 +278,6 @@ github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD github.com/armon/go-metrics v0.3.3/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.4/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.7/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-proxyproto v0.0.0-20210323213023-7e956b284f0a h1:AP/vsCIvJZ129pdm9Ek7bH7yutN3hByqsMoNrWAxRQc= @@ -302,8 +303,8 @@ github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/ github.com/aws/aws-sdk-go v1.37.19/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.42.21 h1:ffd+rwCDBiJMYqNssW+oe9uPes4gQNfbYH9vH2Y1fo0= -github.com/aws/aws-sdk-go v1.42.21/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= +github.com/aws/aws-sdk-go v1.42.27 h1:kxsBXQg3ee6LLbqjp5/oUeDgG7TENFrWYDmEVnd7spU= +github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc= 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/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= @@ -362,8 +363,9 @@ 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/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.2.0 h1:9Re3G2TWxkE06LdMWMpcY6KV81GLXMGiYpPYUPkFAws= github.com/benbjohnson/clock v1.2.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -441,8 +443,10 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 h1:zH8ljVhhq7yC0MIeUL/IviMtY8hx2mK8cN9wEYb8ggw= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 h1:KwaoQzs/WeUxxJqiJsZ4euOly1Az/IgZXXSxlD/UBNk= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/cockroach-go v0.0.0-20181001143604-e0a95dfd547c/go.mod h1:XGLbWH/ujMcbPbhZq52Nv6UrCghb1yGn//133kEsvDk= @@ -513,6 +517,7 @@ github.com/couchbase/gocbcore/v9 v9.0.4/go.mod h1:jOSQeBSECyNvD7aS4lfuaw+pD5t6ci github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= @@ -567,8 +572,8 @@ github.com/docker/docker v17.12.0-ce-rc1.0.20200309214505-aa6a9891b09c+incompati github.com/docker/docker v20.10.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.8+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.11+incompatible h1:OqzI/g/W54LczvhnccGqniFoQghHx3pklbLuhfXpqGo= -github.com/docker/docker v20.10.11+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.12+incompatible h1:CEeNmFM0QZIsJCZKMkZx0ZcahTiewkrgiwfYD+dfl1U= +github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11 h1:IPrmumsT9t5BS7XcPhgsCTlkWbYg80SEXUzDpReaU6Y= github.com/docker/go-connections v0.4.1-0.20210727194412-58542c764a11/go.mod h1:a6bNUGTbQBsY6VRHTr4h/rkOXjl244DyRD0tx3fgq4Q= @@ -610,16 +615,18 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021 h1:fP+fF0up6oPY49OrjPrhIJ8yQfdIM85NXMLkMg1EXVs= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/envoyproxy/go-control-plane v0.10.1 h1:cgDRLG7bs59Zd+apAWuzLQL95obVYAymNJek76W3mgw= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2 h1:JiO+kJTpmYGjEodY7O1Zk8oZcNz1+f30UtwtXoFUPzE= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= 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/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/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= +github.com/evanphx/json-patch v4.12.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= @@ -667,6 +674,7 @@ github.com/gammazero/deque v0.0.0-20190130191400-2afb3858e9c7/go.mod h1:GeIq9qoE github.com/gammazero/workerpool v0.0.0-20190406235159-88d534f22b56/go.mod h1:w9RqFVO2BM3xwWEcAB8Fwp0OviTBBEiRmSBDfbXnd3w= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= @@ -712,8 +720,13 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.1 h1:DX7uPQ4WgAWfoh+NGGlbJQswnYIVvz0SRlLS3rPZQDA= +github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.0 h1:j4LrlVXgrbIWO83mmQUnK0Hi+YnbD+vzrE1z/EphbFE= +github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= @@ -1226,11 +1239,13 @@ github.com/hashicorp/hcl v1.0.1-vault h1:UiJeEzCWAYdVaJr8Xo4lBkTozlW1+1yxVUnpbS1 github.com/hashicorp/hcl v1.0.1-vault/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1 h1:XFSOubp8KWB+Jd2PDyaX5xUd5bhSP/+pTDZVDMzZJM8= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2 h1:5+RffWKwqJ71YPu9mWsF7ZOscZmwfasdA8kbdC7AO2g= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0 h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj34fMA= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/nomad/api v0.0.0-20191220223628-edc62acd919d/go.mod h1:WKCL+tLVhN1D+APwH3JiTRZoxcdwRk86bWu1LVCUPaE= github.com/hashicorp/raft v1.0.1/go.mod h1:DVSAWItjLjTOkVbSpWQ0j0kUADIvDaCtBxIcbNAQLkI= github.com/hashicorp/raft v1.1.2-0.20191002163536-9c6bd3e3eb17/go.mod h1:vPAJM8Asw6u8LxC3eJCUZmRP/E4QmUGE1R7g7k8sG/8= @@ -1244,8 +1259,9 @@ github.com/hashicorp/raft-snapshot v1.0.3 h1:lTgBBGMFcuKBTwHqWZ4r0TLzNsqo/OByCga github.com/hashicorp/raft-snapshot v1.0.3/go.mod h1:5sL9eUn72lH5DzsFIJ9jaysITbHksSSszImWSOTC8Ic= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hashicorp/serf v0.9.4/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.5 h1:EBWvyu9tcRszt3Bxp3KNssBMP1KuHWyO51lz9+786iM= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6 h1:uuEX1kLR6aoda1TBttmJQKDLZE1Ob7KN0NPdE7EtCDc= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/vault v1.7.6 h1:peZ1Z+Zp2iNjSUhnQ84H9jBXG1xE3zVlcSZLd7YQbKk= github.com/hashicorp/vault v1.7.6/go.mod h1:6NtoSVTBxVNRvmaR/B6UZsADOokVwp/g02pfJevoMGA= github.com/hashicorp/vault-plugin-auth-alicloud v0.8.0/go.mod h1:lyfBMcULXKJfVu8dNo1w9bUikV5oem5HKmJoWwXupnY= @@ -1506,8 +1522,9 @@ 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.3.2/go.mod h1:HZ7HMLIGbrWJUfgtEzfHvzR/rX+eIqQlBNPRr4Vt42s= -github.com/knadh/koanf v1.3.3 h1:eNtBOzQDzkzIIPRCJCx/Ha3DeD/ZFwCAp8JxyqoVAls= github.com/knadh/koanf v1.3.3/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= +github.com/knadh/koanf v1.4.0 h1:/k0Bh49SqLyLNfte9r6cvuZWrApOQhglOmhIU3L/zDw= +github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= 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= @@ -1553,6 +1570,7 @@ github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQ github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magefile/mage v1.10.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -1583,8 +1601,8 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= -github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= @@ -1704,7 +1722,6 @@ github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8q github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mostynb/go-grpc-compression v1.1.14/go.mod h1:z6FFnn1nEs6zxqgicvXTqb9IFVmb+R9zdr2BvaYH8tU= github.com/mostynb/go-grpc-compression v1.1.15 h1:9pLWmZldgo3vstd3yGyNgpCzY5gvhCrCj3PyvnvlDiY= github.com/mostynb/go-grpc-compression v1.1.15/go.mod h1:OTK+ha9cKfSY0Pb3ESCzvGhzStJrudBxXPzuC3PaA5A= github.com/mozilla/tls-observatory v0.0.0-20180409132520-8791a200eb40/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= @@ -1802,132 +1819,132 @@ github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je4 github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.41.0 h1:0jhHrvavTUqr+pu6voM5pqhUj/laZdtlsGZWRMuqVYw= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.41.0/go.mod h1:9tHJVgAT9mcyQpCfMOpM92BAmMiylKpaeUrdbC+MCuA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.41.0 h1:c8uwFcQB4k++Q/bfVdNobFwL8vhHPaP1FB8Onc4M+T0= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.41.0/go.mod h1:nf77E4KNh+1CFazfky8NzpmgjUpJU9X+soIZtWF4poI= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.41.0 h1:vQ7QRPG2+P+NaV8jmgA6hUKSqOGJn4w+MnbESQOKx0g= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.41.0/go.mod h1:2bPwTNTG6GAtG4G2IWCG6K+3ldklIBw6crX3nZlCNho= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.41.0 h1:yaIFKvWzkFmRKyR/l/nbu8ue+MUouYKIYGPTYZHnja8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.41.0/go.mod h1:xETM5ejrG58ykR0P3XHxjuFGs5x5/ln0g3nl7NjAghQ= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.41.0 h1:8OXRIcOgCSO4OSwumLRKWlSpQO1VZKJBEWO4sKOCeNY= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.41.0/go.mod h1:jTrxFVBWCSt9L14+J9hvM8K3BDZ0/Dewda9LX0hctD8= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.41.0 h1:hKyq5VI3iiWSfH/1D1Oo751gxDMvkv/WNXbY9MZO/lU= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.41.0/go.mod h1:6Pzmju31CDKvaFf3TDvd/7u6ysl8jQm6eU6hAImaArA= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.41.0 h1:tVboCEEpZLnTipr1xULAoTBHOi/jSHFWgP5giChUwFk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.41.0/go.mod h1:1X6xz8OEOZipnC0GuR1LjoHeix6eAvDlG17a7PD2NBk= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.41.0 h1:RMUrhq6rFaEdREKH84N310gyTdWMe898rx6LwIplOFM= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.41.0/go.mod h1:o8IjIF3JwhWUflSQ6J8ZxWTm1ZCKUo24fSfoXU67bPg= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.41.0 h1:ho/hxsof/UwITGx8s/L2thtWsG5gqEQ/kZSmMYuQJ+k= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.41.0/go.mod h1:mZAeCRbmwVEuK1f1LDZTdi+RbHjBIjUbli4csu9jdEc= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.41.0 h1:8MrljIIJlH1UbbyeR26I3zLcFCTq1YzNM067RNn+Hgw= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.41.0/go.mod h1:fULIHnhf5twQSrokuBaGmzgr5EQsIi6+KcH82HcjZ9U= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.41.0 h1:BdwmrO37BuWjQt569cgY6zF+cYl6CHHjPoBUCdK/zcg= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.41.0/go.mod h1:o+YbLr/fKWPjstxfcE33DlTe3OnEPHiDZnolnyXvIOo= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.41.0 h1:Am1QYzUET2TQW3FK6cf71Ebc7hcOdWojg97zioSq/To= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.41.0/go.mod h1:HL+PQRzu0sXZmHsMBX/f3aDnGEgk00KDEj4K/kzmg+I= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.41.0 h1:MZEbMBw5HYPjuG9qqbSEmCix0et2MPETK0DnX9cT/eg= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.41.0/go.mod h1:GRnUzE8ZQDjs3PChCq9ntKk8zNr+DLcuOiKwwh7WHNc= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.41.0 h1:RNlWexDzpEmWuuiz4bEQb1LMafug3Pl50JNDZFMcYn4= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.41.0/go.mod h1:Gns2v3Q60OubrFnO2loIIOVScpbUjavdO3oxQ3EJm6I= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.41.0 h1:NN6bUA0MpXu3je67SO0PYnMzGxNFpW0r6eXJGFPIP5A= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.41.0/go.mod h1:E+k96sHcNWFy2HDQzNgtW0Fwq2EJneJUazVsz/EJ0Aw= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.41.0 h1:RxPJRU4LpoFz0lQczIxDrbE0Y6NiwwMoCwWLcVjl5og= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.41.0/go.mod h1:hXgg0FzTaA4ojbYCEPmCHepTdXPEE8c2wKwuneRXIso= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.41.0 h1:W5lETnikxxOs8dxfMXksD8Y2e1Vv9H5YQYxeEVUCZaY= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.41.0/go.mod h1:IY8nT2nQ1D7psTWAilRHpex3r1RpLpcpAJ3+bfCCjhM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.41.0 h1:lDkRyByzDHUSGOfmTUW2R017LTZYUaVSeXGwDlgl7Pc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.41.0/go.mod h1:LqGFynCdFZlyBEnEiuJw6VK/ErAgsaIJjTpqmxeTkuc= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.41.0 h1:5UTs5KSdXBMJEQndt0HXn8xLV++pHBkPhmlbiQ67v9s= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.41.0/go.mod h1:p853VADd+4pfW9fPaCfEt4eD0PnHm7bVGriqjLF5rMk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.41.0 h1:PdYSTl51a+LzTvaKO1E8xbpQiCsa6/posv/ppwlpp6U= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.41.0/go.mod h1:2aEJ5zZOu1B7ntD5tS2LII3H/PiiQNXfvjPN+qeZQ+A= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.41.0 h1:X2TOHfFm9cr1Q/rlaU+0f+fCMr7Vfl4jfrY/keoE2vQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.41.0/go.mod h1:/s7g3kFBhHAs4Qm07bm3oXqz0cjcmwpeaUlapTC+/6c= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.41.0 h1:Lst40Rc2fZ2AZsz81xqUPfTIz9TUVNLiAI58gfOr54U= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.41.0/go.mod h1:Foj/qtbBqJkV5q5zGvjtyAayY2DhNLQzkPYTiOKYBm0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.41.0 h1:8ETPPqFuzOqFWhTi83y+P6F4CxU3A66FhZjJ2fG2yRI= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.41.0/go.mod h1:b4+OWjSminxNd+H5zRmwgjMDbGFVgBr8ZPwM83C8z/U= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.41.0 h1:ZcycztAoDBJE0VA+X5SJiM/B6ILcNhZZQrqQv/viJFw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.41.0/go.mod h1:qoyaDW1u/NBAgnw6agoEmqLiOy9DQwWFbacNCWRFhuQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.41.0 h1:cxV/eDlwtXdqXATiM+x8wV1wsLnH6hz1tK4U1knOzo4= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.41.0/go.mod h1:Qo8M20A7g5V1V5MpKTN0Lbhl+bMomEbKuvgCfzeSEmk= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.41.0 h1:s8MxOjnPVe+Ro9RLsYtENa1FQbEboYjgx2Q301e2APo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.41.0/go.mod h1:wT+2gYRAPgXQWuw74JRGIEH3le9Ptu7bvl2eVRAZ3VQ= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.41.0 h1:xlPhC26qz491ObV/+XyiYnEAJXT2LWmuAIoyVc5fOVI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.41.0/go.mod h1:exuM4C28jK7RC9lDae+d/lxaDkiZt7vY16vmliPSWGo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.41.0 h1:AEUdNPlYHuxMlZ2g/qpGV21+nEgBZ5u0kAUWSYKHAQ0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.41.0/go.mod h1:Sbg85JFQ+SUU8Nji6KcCjSIWwQSPUHRo4rsvOxUiar0= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.41.0 h1:cRb/flip8irbmledEYLfpRdyDxjCLLZpESzic/RWNT4= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.41.0/go.mod h1:WpA5kSHurWdyZnMsKF8PYNaaxIjo/poNQ4VD3Em8+fY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.41.0 h1:ZmvpQ3Nzk6WDbmTld+wAJkLHaSqd2tRh/pTKOkn9sSE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.41.0/go.mod h1:M/PDOTTc37LWnhCYvBvwR+920DUVsAlMMoJ3PlITXIY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.41.0 h1:EFH8Y054nw5udmRWLB4c0/Iwgsccd4JogSTyfVHEVnE= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.41.0/go.mod h1:sqUmkOgMYKP+Wvb02vYX457JFUJuU3EIB4S62yk8hbw= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.41.0 h1:NYuErfLx4MzAhW7bCuF9pfNiP2WajYs45W7XyeU8iPs= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.41.0/go.mod h1:XeQ5BK38hyy/TzKHLHlIWtbbeUfASc0MUFz6/S+gIv8= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.41.0 h1:qsENXNsTwPY4hzE1FOZL2/Lpj+CknKGQGsZS4xA/Vl8= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.41.0/go.mod h1:ha1KlW5bbhx0EkK8FGxGgo3mwZpDIZUmPXMRXnlqKD0= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.41.0 h1:2/5oOaF4GfM/fviGTj4AigRYT8qsRANoVtEPWlYU/p4= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.41.0/go.mod h1:G6qK9r8xKRjbvhutlTDM3E5r48K8+Ezgm1u8/HT88QY= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.41.0 h1:iMNF6urlRkWgZX3ycXPPeBl+zhGQasI6iJiG5j/98nI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.41.0/go.mod h1:F4M3UxPO/nLTLXuf1nrjNjZjSOwxyqNC0C+NiEy3ZdA= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.41.0 h1:Zl4m1axs+lGPYW33a2WThd+OCvUTnB6lEbWRsLZvAGE= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.41.0/go.mod h1:EKg+bShz77fNDLPYZn8ST/VBXJCGiLlTY62pMGJoA1Q= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.41.0 h1:3tPw8zbcP3uEUhhf1+TdlDcpRZ9r/sdv3AoiQdRtUdE= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.41.0/go.mod h1:jDfYIoD+TcQ2gPFC3MGt1h60CaMbmKYgDRTGdWaYeCs= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.41.0 h1:5MuQ7fjhyxuByAJ5/Ba9+sVHfJZ08PpdH2apeskagWo= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.41.0/go.mod h1:RsoD8DJuUtaAj45JpQx8YQWTanVm8od3FuU9Uyk13qE= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.41.0 h1:tbl6IeWjIYgEaWa7Aivdvh+aTpyPuRpyp+a8mcuoecs= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.41.0/go.mod h1:jkqJrYJcu9muatzMChLEMZsJ7/yQrVv/CXdTTnIZv3I= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.41.0 h1:Iu3GmKrZXFGBGk1GnhToAcfCQJUwytGqRsc5pcc4uhk= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.41.0/go.mod h1:iNSnmb+3Uf9qXjUTBvjbLx6eUW7OliUxvVF4Zj6le/Y= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.41.0 h1:10CVcOqnqmBizH18ceYcvwlN9GjFzpwDaMWcEVK1GEI= -github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.41.0/go.mod h1:Wj//bdsS33yzf+tjgXxKpRpozQWEIJCHkJSNYxdZYU8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.41.0 h1:Zz+tzJhdYPkqOZUdfsWu+k7NceBk8bYbOXE6HSzRsF4= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.41.0/go.mod h1:kqooXncbxW+SpgkW0r/5OwdEtowaDch/vlHwx1z+9vc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.41.0 h1:bCkwOnDfYwQ7mEkDAn2mpb+luDrcbmEm2ChTHsIbE20= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.41.0/go.mod h1:FFbFT7U8wG/rff3dUB4aLwBefzAOudpM7lAOZkCEvb0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.41.0 h1:HcbtG+af3j4gEoWgq7a3MECtm8OBlRJ1NzQN5nsn+Dc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.41.0/go.mod h1:22es+ViYpQsDGZbyB0rEf9zxZ13Y8qT2YaJhDI+Qr/U= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.41.0 h1:fwcbZ1HWShLgyYtGA4AbVScTAS70Vvs/YAFoogJmGVU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.41.0/go.mod h1:nYF9X0rOccg7qrnqAv9vFlqWZa9KeXBsUXZE9Q2hbis= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.42.0 h1:osS1SOHzd4KHYaIEEt897g8T6LZwwfi35XFq3oJi/vc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.42.0/go.mod h1:oaAm/i92ckTFyrfsBa1w6np9Q5r2io9730GphwyyCqI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.42.0 h1:h0uSuYhy0sOaERkAvbeNYpKTKo4RyZ3FmbiTvnQlEHM= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.42.0/go.mod h1:25vQFIlXHeqMyUAKFGg3mGDmeMvp7EYhiBpo1lO39F0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.42.0 h1:eGcTVAQrGO6kMgLRtJCtnGgnkZEuVNjIQkcjNGxW38U= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.42.0/go.mod h1:4tpDsjaZubiP8L5M/+YB50zqt2d+ZWRSwAEPFZeK+ZI= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.42.0 h1:MLAj08ACXZ9Mj+uOd4IiNaDMmcgbivXn8UvHWs6j3zs= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.42.0/go.mod h1:SNBS14dLxXgF8Ku0zpFJwWESsEKrNvJlxCsSCoIrJUA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.42.0 h1:HYt/VRsvziwsupnCiQOr8IMP1C70SPhjEk8ro0JgXLA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.42.0/go.mod h1:OwCpRYsUufGboiOrBjSEt/wIpegd9gjtGtrga/7Jzo4= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.42.0 h1:GLGxDbnoGQ5bCX/FVhhPUsv3Ue4endB8KBzMv9nuUq0= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.42.0/go.mod h1:c0oH3Q5gtRPEKR8JOtmbZxuke9FxIegMw0tVX39yHrA= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.42.0 h1:VUYe1Y9UF6g57HE1PyAzqqRgp/SAQKsViljn8Tw2ivU= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter v0.42.0/go.mod h1:mHiw+Sh/XY59PwF4LSUvd55dZvnqvtU3kSt9OSzZDLI= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.42.0 h1:PqsDj7F/iXeN1r94WzmPIf5rSMxCjsXMpu6lfg9/cMA= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.42.0/go.mod h1:VamGFHXYMXFFkN5j483JcMmoee4iarZYA00pHHtBiTU= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.42.0 h1:QjEHOmNdbJkaiTj0ks2Vxt812BZgdZj9wGibOlsivjM= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.42.0/go.mod h1:4rgstZsCqby0yLjE1QAniH2OkaXBiESd3tI3G8zDhog= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.42.0 h1:mAXWKRoCdn5P0UyW8eqHSmrhCSiwowuu5M2ATaJ6Tf4= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.42.0/go.mod h1:fULIHnhf5twQSrokuBaGmzgr5EQsIi6+KcH82HcjZ9U= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.42.0 h1:bzoXFpL91/xcDroubQtpcFvVp39IsnBXVgui/v2bJ3k= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.42.0/go.mod h1:jM422XDl8ySG8DrduyCw+fzTHipa1LH9jdBJATRFRb8= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.42.0 h1:7Q25aaXncp6nescix7X1emgG3ahB8dqIvIJ8Hg/xVks= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.42.0/go.mod h1:XlC9m2uPtabMcGrXgCqkxSHaDSg02M57AxkO8N1bwjc= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.42.0 h1:FNphjsS2if9zac71ZMy4ImFK0XvQBSOsiz5dT8z/hfk= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.42.0/go.mod h1:2EbKrav5kbXvOH7w4zUrGZ6ohKg02yYaDPAeeBzuW9k= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.42.0 h1:+xomlXMBBoTT3RA+b9sN6bHgJIw8xopnIIiHLc2VU0A= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.42.0/go.mod h1:FKllvReUv/9xEctJ6ACgSaMbT55eG/La9VPmNQn2GJ8= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.42.0 h1:1DLB90x+gOuj6bZ5g3j4fQr+Tfl5kPnpFWS858qyWNM= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.42.0/go.mod h1:YuXxMfT/uk9DFQZTkQoMQaWMMj8NTrRWpo/TsQIhZYg= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.42.0 h1:kwiCfMyoFokaogakJR9COieBxtvaqHKl6XaPlHsobI0= +github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.42.0/go.mod h1:Jp+H9Cl2ZMEkYvYDF1pAbqDlx8jSh36oEeULQqkLOFY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.42.0 h1:gjFMSdqOoG56k1/+0pbtMSZmdfa8SV7qb5eO3R0aNGk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.42.0/go.mod h1:TllRwuvCehR7Hh11gMQkvmGRWc9XrBpploV0e0blFYY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.42.0 h1:5mkzK/sLBrYn/lqPDeOjugHu+qDXka+fbJjX2/2KZvE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.42.0/go.mod h1:eM7BZiOmi9HL6UCo8AYJ1EsLA4rOMKWpNI7fZnPZ1Ss= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.42.0 h1:KzNCs6a+RsrepWQokYxAEo+mXTlw7YiCG6RFJLYZrJU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.42.0/go.mod h1:RTiapnZYPw8AZN5kx5hbquI2leFq1fEzKyiONUCWqPM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.42.0 h1:F0id2AiDaGUe2Li5U71jWpLDrE7D0BYSS7N5Y/8dfxk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.42.0/go.mod h1:WnJyPyagzjHWXunIchPEGX4sWjZ4Q+LPe2LRrKixvzs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.42.0 h1:Nrq67SdKsO/2AvTMCf+TcIsosGWXFsQN8pHOIpUpzs8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.42.0/go.mod h1:jKDv5CNsUchN0qeWKBLmPTf4vsThe4Kbxf/pYlnwi20= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.42.0 h1:Z4amBuL7Vk09IirgMGUM7N6tX81p0XS9DoJyrC6dZek= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.42.0/go.mod h1:lv1eGu8MEq4doN9UlISUftv5i60AiGbj49M0fWp69N0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.42.0 h1:WK22L2mrMe+5L6uGnsMCCAGUFAvTqHz6kTSqq2OhUnU= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.42.0/go.mod h1:sJxjsigCZpyaSkCwQChwSTf+epUPzbodwHolRfO+mDY= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.42.0 h1:ij4rr1lmuICAxUB/8GDuw+K5zWz+PzFEHLSpY8vh95A= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.42.0/go.mod h1:Mz4cBmFCCoTcTkhFXQocMeJJKOUZrESzk/4OHmbOv/0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.42.0 h1:slKJXCscshy4dgSXragQn020pAwimJ4qQphjinaKPpE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.42.0/go.mod h1:fdp5nnLuTOKyAnkFMEgkEwXIh+PenD9CyXZHe+J0kWI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.42.0 h1:Ag7bebCMrvTCmHUi/3pJQdE0ovkNnr6752nKpTWVWs8= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.42.0/go.mod h1:+FfyP1Gov6lMDYkBbdP9fxO1V3qRQDT66+FQj7JG8vY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.42.0 h1:d6uXiFrJqkHT4OoidomLn53ldanmzCEHpWdA2hpe2Vw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.42.0/go.mod h1:exuM4C28jK7RC9lDae+d/lxaDkiZt7vY16vmliPSWGo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.42.0 h1:uc7NggPC+E4od5VsfDQ48lhCEa1XmXIBPF13DnQknhM= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.42.0/go.mod h1:/KFp0pOET48I1opKx9gke4pZNf+tqNvwbKnH89PJkCI= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.42.0 h1:ZGYeLSl+KfdKO/VsZdDHZxluwjzFHqyxabvwnIqH1tU= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.42.0/go.mod h1:8Sy2HQ2dsYcNTf/GFxX/u1IKxmb+YpRtmbm470ZmzO4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.42.0 h1:V9uWzes1OIFHJiJ5MmxmwETqb7bg6FbA+hbcTSwfLrQ= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.42.0/go.mod h1:XFYX0KsJtotN/xdTs3QhhuQv0oiGpvSgXdFOAg7gMiw= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.42.0 h1:5fTy3TFOCj6aJANSfeNZ3oD9x/61Yal+0XbgL+332h4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.42.0/go.mod h1:YFwLtgW0oyFdrxZdy/Cwi6q8VHaEoupBFCZWh68uy2U= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.42.0 h1:+yT64sIdjScCdWTupAMR4c9NJMwVspFf08bxHAsqc7Y= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.42.0/go.mod h1:eZD05EJmNqWZgTT3YdIwhw02fWkB6vRzblIjGeh1Foo= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.42.0 h1:QFFelQoiBQUlTfrR0ETHCggo5HYQWp0tVenspN4FlUE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.42.0/go.mod h1:hIbuniJRaxjN71oua/rIZcuOFi8QkPHcevEClx/x4S0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.42.0 h1:D3St/bDEbjx+D82IryWhPH/LNpmUy+jOtg0brxubyiw= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.42.0/go.mod h1:lcXHlIxCayIadSApZN419jVgcSynkQg3QP28g4SLX2Y= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.42.0 h1:/LiRgeCwFKFUO5SIGX4RokNUB5YyuLXZu22t4yjYjs8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.42.0/go.mod h1:Wl6BnrY0J9i+xAdPaoe8xxel/ZCXntpivwGfdtAygP4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.42.0 h1:DnFnEVDCvoaQF1YBJAX4BKMkM/jJu66Q3ZGqffxObMg= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.42.0/go.mod h1:lbuq2J3ZvZLYv2YkCdvhAKKNWjCZUtAfQJIrOkWr0vs= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.42.0 h1:rbw6F3bme47qwzXWIcktSBKl070qS+VDl5wur7vE7s0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.42.0/go.mod h1:2RCBlj/25ow6v4RxA/9Cuzq/RQO5OulINw+2jvJAlS0= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.42.0 h1:u1bv1VSN1kRGfQuop3is7wb/2cthbuh7ESlOUPZtd6Y= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.42.0/go.mod h1:LCgqLvdqshwT8WpH5J58d2VsXU9NIsj2eqQrdZTVmU8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.42.0 h1:ScmHu6ZC6hfuDPQ5mVTg8EQHh4yPqQN5zjNRW1B42PY= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.42.0/go.mod h1:xuHp+S+Ofje2GXHqlA6aYeA7kufpe+HnmSe22NVd9p4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.42.0 h1:Reo2dTMad9weoEdrrR6I+xthS2D9IwD82SgGUcJuun4= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.42.0/go.mod h1:uB0NwrauoL663g0v5LNqaIkS641J99N1VM66if46lc8= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.42.0 h1:0IvhuGx0wPoIUKSU6xOEH2yN6EKgeyrxrtFualRedAE= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.42.0/go.mod h1:vUtj4e/LPHX7aRPmE12yMjTPPQsxkU2EW5T4pzcOwHs= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.42.0 h1:Y6dpo4s+u0DFcR6BzzNNaf2whoGYu5jXMqVQkmVeXzo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.42.0/go.mod h1:1JZnAqwx/J1pU1k+WQb6MQAeS4EhAE7cO1z0S2M6Vc0= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.42.0 h1:17wPtFbFpOZ2QlMEqOFWGvVREbBVDL6KXuf+i8WCk7g= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.42.0/go.mod h1:IRND3RZuUVIOSxmePVx4cscto6D0ULNlxQDeLA/QTj8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.42.0 h1:NK9UxCieEj3IY3X8CEnfhQIHMo/gREx+SjRqQ/JyK/g= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.42.0/go.mod h1:+5Ia4r+xrA0pMrnmcCiMNyatKUY/TtjFL6pvllXeSko= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.42.0 h1:+6h6S2kr4cPiBwOB/brqX/SMgYIqIfGl6uleF3t8bX4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.42.0/go.mod h1:0B+Ox4H4Gl5BVXyF/c38qOPswzHCvqVO2zX8Y8T10k8= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.40.0 h1:kxUcVT8yV/PheivBrpqsa3NTAmnX+vJAhWkmNnmc2Pg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.40.0/go.mod h1:a7owhwOzXe+z0n9GeeKCqeXUelNkv+qHFCZeS8KtCDA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.41.0 h1:WvMHj+g0hWb7n8I5GZAzq4dMhHypetfWvjlzIgGsvE0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.41.0/go.mod h1:lUMkjPwTXQ9Rxu0Moh+zrarQg4IQIdQiioMl9jqIC1w= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.41.0 h1:t7F+Rk3TTd4LxejJqzP2rM6hhsCGg255DngE6AiFmMc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.41.0/go.mod h1:DvEUX+9P1jGAkVO7lK8aX2hEINmIh5qVl7muJCoGYbE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.41.0 h1:/hEk9ID/C+TezerUL4mjunh4rlKzLztdf4zZDA7MXtc= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.41.0/go.mod h1:ajSxILyRBP9hEnQVJVaep75tB/PAU+5pLLN09frik+k= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.41.0 h1:edFurl7P4iFpZDIZ1wyBQvC0K5+ZqMfRInvF7o4VufY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.41.0/go.mod h1:2taVHt8zXaZVFDy2l/7uzP9upjZwdEOiRjnjIyVGIYA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.41.0 h1:GKbAqoCuZFRxbLOs+R+AM9n6QZWFn1lxAUg/+W8xLFk= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.41.0/go.mod h1:2Qk8mERjcXRDLEPCmBxQax0sfVGKAuSoVYM3VkKviEA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.41.0 h1:BgbdkZXMBwGp7RNyDJaw4A0rSHlY2YRzP2Zcn3DCY/g= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.41.0/go.mod h1:0sz0X0igE3PDr+JQRtubHRAZ4sd8ObajyrwfKj/qX9o= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.41.0 h1:qQ7WteUjjcRQFzhNbbYEkV+htkbRusR75UpiVGFPKjQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.41.0/go.mod h1:KJIh/Cuo7id9W6wzDyVrc7LtHzLI6kKlyHUVKtvpMGY= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.41.0 h1:9+zlr7Zgqm6zNOrx5zWLj+nr+68MxQGA9hdDK5lc2OA= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.41.0/go.mod h1:lIXp4R9X47EJkczGcU9GxfZyaNYpuQhlkKbz9LbLJao= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.41.0 h1:tn55t5zBE+Yc57IqChtWiHSZreUdb7xxawmZc/zMj4A= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.41.0/go.mod h1:v/1itYsFPEYgn6xAOjE6sNDMXpHW468jm3urdJVkGwE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.41.0 h1:n434AUozO4134t+pnxe9Fmg/baPlmMI5vF/1wRj9Sx0= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.41.0/go.mod h1:74lKuRGp0dNcMiPrlwdvcm9WK892oA7bC1ZihKL+rC8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.41.0 h1:x4X80KtQUXAZJz3iASPEnWaVojuIqHFlH83TxHxjP4Y= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.41.0/go.mod h1:N0mJkF8rZwBUAztCcR8Y3GgX8w5wOPN9mcVax3fdVcw= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.41.0 h1:cyjxicUJLwEqHhT05DF4I8u3sZL6ulk2NoUtYK90qj4= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.41.0/go.mod h1:dKC54YQ7hA0Ppaknr8TagGzYa5ob1paAhvUptAyy/M8= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.41.0 h1:YHmV33zPJzxE1iPCF94gkmEZUa1vDHLOQ2LDLJX7jxU= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.41.0/go.mod h1:/zmsZnYE0ardoeni+h1mX3WjmCD25M0xHZlvL4wx+nE= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.41.0 h1:xq5SHcEGedU5dIoFLSkzQX59q2v1guJluT6leVFdC3A= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.41.0/go.mod h1:sH7Bgh2B8NMnd/LoYNwSdQlQrrRGL1NKXR8cyDMqmQQ= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.41.0 h1:gW7CmnTXEKVfLVIuCqIjlD00J6tN/JO6DpW1piZVv0E= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.41.0/go.mod h1:48WlEJJc9b2jSG39GnqmQ8XQZcFD2p+rmjJw7VBurYs= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.41.0 h1:AGHstl24kwbabV13RfjWmmc8DTZYIp0NXjMDuycmlfI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.41.0/go.mod h1:yTvWhAJ98ZeDMKL3MqB4jv7bbhiZXp5+rPBllgOQlDY= -github.com/open-telemetry/opentelemetry-log-collection v0.23.0 h1:qGna00Fdu7i4kn6Pz0PcH18ksRPiih1fkpa6Nrw/5qE= -github.com/open-telemetry/opentelemetry-log-collection v0.23.0/go.mod h1:5tnjgWDjnItFXlbrd7/9w6dMheCP+cjby+d6b8hIE6Y= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.42.0 h1:OPwa68jBfWPnxhtIVCsX9YEdjb6El64md0wWUh8nc/A= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.42.0/go.mod h1:XLfg+d32CCxz+E9nhj9g+N2C8ZHKwOWecFfsOrzEojg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.42.0 h1:qvJvAHD6JCdF2k8DQlYPkGJwVprzZFGov7KcJAfQNpw= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.42.0/go.mod h1:Kg5wKB8aDWYz0/+yaHa+MfI3tPcnOt/o7KA2Q4E1K+4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.42.0 h1:MkTSFCoECldO/VAV/ZUvZmseHYchW/A9TJfoZ+jJtng= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.42.0/go.mod h1:N6tSOIc2bM6bobbukPL8cVo8UQE1LHaLXRfpnI+bIsU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.42.0 h1:Ran3c2mv4thEgUyQlbUZkfWUCgT50xiLfEXLXQsy26I= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver v0.42.0/go.mod h1:oHoYVixOWQNnjm49gYu/w8WcQhhMbPFKogqnAkxMoms= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.42.0 h1:dZfEjvZR8fT/tDprZj3IfazfCCp8DTDhjzSa53waKUQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.42.0/go.mod h1:aJm6BHnhvUjSNwWxm94S9JV6tvnwfUdy2q/EG6Kuukg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.42.0 h1:JxxMpw9KCQ/y+sUEs+g92rOBvSqClSWYneBeeiiSLTI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.42.0/go.mod h1:kBy+7yMhEalkIKfSQLgXvC6i1mxfagsfMKRBjt3vw2Y= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.42.0 h1:Ihv0G1HZiyzSRPZRLPdsu+eHT9e5FuUJcppM21DYTvI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver v0.42.0/go.mod h1:wI3oYIt0FyljlYzwlpJGo6samnZsYWan1EBXtHT6oXk= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.42.0 h1:ja7IW1Fp2ZXQycFlbbcjhLx8wcoKgtLj7wDpvU09MvI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver v0.42.0/go.mod h1:5TY7gfVOgiGEGPUSECASXWkNtpbtiPuz53SUfUTa6J8= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.42.0 h1:5dnSXTuKvWd3SKGn2h445gaDiyMq3FfXf2P6GJhrT94= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.42.0/go.mod h1:Wxla8US0akjztWl4fMCCsL4kucppQqIbtyGxrIZ++PQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.42.0 h1:/Fxc7JRDKqUvOFyxP3pkUX2R80u6HpIZru2Tv6NP1U0= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.42.0/go.mod h1:wPQ/1sAqlLoHCb9PUYIJUplZmlJymfExSO2VTwRlufY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.42.0 h1:xn7SJH1ttegfwJX22AOis6jj3u/veN4bAnFZdwT6neU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.42.0/go.mod h1:aVBkEhDM9qwe0JlpECV/ymW0Xg18SkxiJdZFEKmAqbY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.42.0 h1:KG2Un49ZbRma0SMFYcYE35BzEEHFcPm5Ju5Y1wJikVI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.42.0/go.mod h1:9IB8qJS70nHaRdtZiLU5qr1kIkFq764pBkULo4GMbZQ= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.42.0 h1:HD8POskNR5Pu+AWFA3LXOFzYxQMRsOiRMljUzIfvuEo= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver v0.42.0/go.mod h1:sWB38eSegYNR9PC8JofxNRdB5QnUFPBobT/oJDVxxXc= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.42.0 h1:TCDfR4p0BVsrUrJVX/XOVPPz/NiPEruF0rMb1RVOswM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver v0.42.0/go.mod h1:70qGz7MTwcT6I/TyU0lfe7Lx5vDM5d/iTvP3x+nEU48= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.42.0 h1:JHt0vGBM3hNzMl030h+KiBmgQFf0lbJLYvUE1I+V0SM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.42.0/go.mod h1:+3yoddBNhUFknFNI7X0ymFYKzQt+WMT31oWMk0O63gM= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.42.0 h1:qn0N6j6v01ap/gGQFTH3zBUhZHvbCjna7xQCN6ciPGU= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.42.0/go.mod h1:ZOw5nxrHEclviycNBjBJVCv6UB13Am+SzIPXGJy+LTo= +github.com/open-telemetry/opentelemetry-log-collection v0.24.0 h1:P+exKJJH6euCkYpcKrSIyTeikEn7Mg1NdJDoC6PFvVM= +github.com/open-telemetry/opentelemetry-log-collection v0.24.0/go.mod h1:396bvvFyJNNku8sWUTDc1VhwaLn02gw8JBMMNdbkDls= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= @@ -2152,14 +2169,16 @@ github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.8.0 h1:P2KMzcFwrPoSjkF1WLRPsp3UMLyql8L4v9hQpVeK5so= github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ryancurrah/gomodguard v1.2.0/go.mod h1:rNqbC4TOIdUDcVMSIpNNAzTbzXAZa6W5lnUepvuMMgQ= github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= @@ -2170,6 +2189,7 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= @@ -2298,6 +2318,7 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.1/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= 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= @@ -2310,8 +2331,9 @@ github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tL github.com/spf13/cobra v0.0.7/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -2327,8 +2349,9 @@ github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfD github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk= github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4= +github.com/spf13/viper v1.10.0 h1:mXH0UwHS4D2HwWZa75im4xIQynLfblmWV7qcWpfv0yk= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/square/go-jose v2.4.1+incompatible/go.mod h1:7MxpAF/1WTVUu8Am+T5kNy+t0902CaLWM4Z745MkOa8= github.com/square/go-jose/v3 v3.0.0-20200225220504-708a9fe87ddc/go.mod h1:JbpHhNyeVc538vtj/ECJ3gPYm1VEitNjsLhm4eJQQbg= github.com/ssgreg/nlreturn/v2 v2.1.0/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= @@ -2472,6 +2495,7 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= @@ -2524,61 +2548,59 @@ 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.39.0/go.mod h1:LSOk+VL3LFHE6Q8wuWeljbRZYpnx36wJH807vDElcos= go.opentelemetry.io/collector v0.40.0/go.mod h1:suhkm5oZbjQU/8FM2HSSI+Zrh/+VIcNjE4ZPa+WQ8ls= -go.opentelemetry.io/collector v0.41.0 h1:52AQDHN7wm+aPNWEeeq3pmLFxA4yhM8W/CnW96xOi8w= go.opentelemetry.io/collector v0.41.0/go.mod h1:jr1zPqpeMpiZumkVEHAAmg/2/GUGz+EcTP05Lr070P4= +go.opentelemetry.io/collector v0.42.0 h1:hyOOmPe7CkPeiN8NT/eCQXJwak0pYwjocjDTGw95kvU= +go.opentelemetry.io/collector v0.42.0/go.mod h1:HiryUIokIPVCspJIAXlGdpfPFCepUAFLxTzid2AH7es= go.opentelemetry.io/collector/model v0.39.0/go.mod h1:gS8A27wi+8gM3hrXL+dEjTbrbLxktjHjAwwqI31ELgQ= go.opentelemetry.io/collector/model v0.40.0/go.mod h1:dXqjAeml+cB+YzJ3kUnd3v5/JvGAKl3MqHXfgSWRIo8= -go.opentelemetry.io/collector/model v0.41.0 h1:9rsd7Kj03FOK8PpCzmd2VrqzvhLG6FZk6awOXEUQdCo= go.opentelemetry.io/collector/model v0.41.0/go.mod h1:dXqjAeml+cB+YzJ3kUnd3v5/JvGAKl3MqHXfgSWRIo8= +go.opentelemetry.io/collector/model v0.42.0 h1:jQb9oi9NwhTJu6H8cOlK/3yeg+cyWxOrQD8A5TlcqQw= +go.opentelemetry.io/collector/model v0.42.0/go.mod h1:uUgx84gI+G/tE87Oo84305q0MD8tUV9uWxg+ckAE7Ew= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.26.1/go.mod h1:4wsfAAW5N9wUHM0QTmZS8z7fvYZ1rv3m+sVeSpf8NhU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 h1:TON1iU3Y5oIytGQHIejDYLam5uoSMsmA0UV9Yupb5gQ= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0/go.mod h1:T/zQwBldOpoAEpE3HMbLnI8ydESZVz4ggw6Is4FF9LI= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 h1:Ky1MObd188aGbgb5OgNnwGuEEwI9MVIcc7rBW6zk5Ak= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.26.1/go.mod h1:4vatbW3QwS11DK0H0SB7FR31/VbthXcYorswdkVXdyg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 h1:0BgiNWjN7rUWO9HdjF4L12r8OW86QkVQcYmCjnayJLo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0/go.mod h1:bdvm3YpMxWAgEfQhtTBaVR8ceXPRuRBSQrvOBnIlHxc= -go.opentelemetry.io/contrib/zpages v0.26.1/go.mod h1:NGd/Gf9T4Wn4LsUjTB1rPfKYWZefNNrXYoSWJLvu/rY= -go.opentelemetry.io/contrib/zpages v0.27.0 h1:1ol9rwC0tn6Z3pozWh9mVrCvbqxKNqPiEchRo5J/QNc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 h1:hpEoMBvKLC6CqFZogJypr9IHwwSNF3ayEkNzD502QAM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0/go.mod h1:Ihno+mNBfZlT0Qot3XyRTdZ/9U/Cg2Pfgj75DTdIfq4= go.opentelemetry.io/contrib/zpages v0.27.0/go.mod h1:D8d5QMQJnidUFSazrcjfwq6Qw17G39JY+d4XvhQFMyI= +go.opentelemetry.io/contrib/zpages v0.28.0 h1:4ANASd9xZw1GtMfvtBuqSfnqpMC79wePb3dQLNWBrEw= +go.opentelemetry.io/contrib/zpages v0.28.0/go.mod h1:y5RYQQgfEQV6oASayfbUv5ye5bnnncor+Ln18jMrVKY= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= -go.opentelemetry.io/otel v1.1.0/go.mod h1:7cww0OW51jQ8IaZChIEdqLwgh+44+7uiTdWsAL0wQpA= -go.opentelemetry.io/otel v1.2.0 h1:YOQDvxO1FayUcT9MIhJhgMyNO1WqoduiyvQHzGN0kUQ= go.opentelemetry.io/otel v1.2.0/go.mod h1:aT17Fk0Z1Nor9e0uisf98LrntPGMnk4frBO9+dkf69I= +go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y= +go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/prometheus v0.24.0/go.mod h1:jfc9W1hVK0w9zrsE+C2ELje/M+K67cGinzeg8qQ8oog= -go.opentelemetry.io/otel/exporters/prometheus v0.25.0 h1:8f9PiHQ2yqRRWktEJ/u2cIPLD8yUagIuNOaFpSsCefI= go.opentelemetry.io/otel/exporters/prometheus v0.25.0/go.mod h1:TmEyKmTplB/cdILsJBqD9/JDK9ssGXWjsrpmMHodFLw= -go.opentelemetry.io/otel/internal/metric v0.24.0/go.mod h1:PSkQG+KuApZjBpC6ea6082ZrWUUy/w132tJ/LOU3TXk= -go.opentelemetry.io/otel/internal/metric v0.25.0 h1:w/7RXe16WdPylaIXDgcYM6t/q0K5lXgSdZOEbIEyliE= +go.opentelemetry.io/otel/exporters/prometheus v0.26.0 h1:qsF1KFEE+dIRoQN0M0D/A9mdhu0TqQCNAzl0o1S2CIM= +go.opentelemetry.io/otel/exporters/prometheus v0.26.0/go.mod h1:0/uJZI7H2y0FgMVCgCWdPzZpxPx3X3F5uInY32I9foI= go.opentelemetry.io/otel/internal/metric v0.25.0/go.mod h1:Nhuw26QSX7d6n4duoqAFi5KOQR4AuzyMcl5eXOgwxtc= +go.opentelemetry.io/otel/internal/metric v0.26.0 h1:dlrvawyd/A+X8Jp0EBT4wWEe4k5avYaXsXrBr4dbfnY= +go.opentelemetry.io/otel/internal/metric v0.26.0/go.mod h1:CbBP6AxKynRs3QCbhklyLUtpfzbqCLiafV9oY2Zj1Jk= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.24.0/go.mod h1:tpMFnCD9t+BEGiWY2bWF5+AwjuAdM0lSowQ4SBA3/K4= -go.opentelemetry.io/otel/metric v0.25.0 h1:7cXOnCADUsR3+EOqxPaSKwhEuNu0gz/56dRN1hpIdKw= go.opentelemetry.io/otel/metric v0.25.0/go.mod h1:E884FSpQfnJOMMUaq+05IWlJ4rjZpk2s/F1Ju+TEEm8= +go.opentelemetry.io/otel/metric v0.26.0 h1:VaPYBTvA13h/FsiWfxa3yZnZEm15BhStD8JZQSA773M= +go.opentelemetry.io/otel/metric v0.26.0/go.mod h1:c6YL0fhRo4YVoNs6GoByzUgBp36hBL523rECoZA5UWg= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= -go.opentelemetry.io/otel/sdk v1.1.0/go.mod h1:3aQvM6uLm6C4wJpHtT8Od3vNzeZ34Pqc6bps8MywWzo= -go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyNIo= go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U= +go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI= +go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/export/metric v0.24.0/go.mod h1:chmxXGVNcpCih5XyniVkL4VUyaEroUbOdvjVlQ8M29Y= -go.opentelemetry.io/otel/sdk/export/metric v0.25.0 h1:6UjAFmVB5Fza3K5qUJpYWGrk8QMPIqlSnya5FI46VBY= go.opentelemetry.io/otel/sdk/export/metric v0.25.0/go.mod h1:Ej7NOa+WpN49EIcr1HMUYRvxXXCCnQCg2+ovdt2z8Pk= +go.opentelemetry.io/otel/sdk/export/metric v0.26.0 h1:eNseg5yyZqaAAY+Att3owR3Bl0Is5rCZywqO1OrGx18= +go.opentelemetry.io/otel/sdk/export/metric v0.26.0/go.mod h1:UpqzSnUOjFeSIVQLPp3pYIXfB/MiMFyXXzYT/bercxQ= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.24.0/go.mod h1:KDgJgYzsIowuIDbPM9sLDZY9JJ6gqIDWCx92iWV8ejk= -go.opentelemetry.io/otel/sdk/metric v0.25.0 h1:J+Ta+4IAA5W9AdWhGQLfciEpavBqqSkBzTDeYvJLFNU= go.opentelemetry.io/otel/sdk/metric v0.25.0/go.mod h1:G4xzj4LvC6xDDSsVXpvRVclQCbofGGg4ZU2VKKtDRfg= +go.opentelemetry.io/otel/sdk/metric v0.26.0 h1:7IKp3gc/ObieCtshBeYYVFp3ZP7xIH1OzODi1Wao90Y= +go.opentelemetry.io/otel/sdk/metric v0.26.0/go.mod h1:2VIeK0kS1YvRLFg3J58ptZTXYpiWlkq2n5RQt6w7He8= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= -go.opentelemetry.io/otel/trace v1.1.0/go.mod h1:i47XtdcBQiktu5IsrPqOHe8w+sBmnLwwHt8wiUsWGTI= -go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0= go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0= +go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY= +go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= 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= @@ -2590,8 +2612,9 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= @@ -2607,8 +2630,9 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= 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.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc= +go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= 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= @@ -2705,8 +2729,9 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0 h1:UG21uOlmZabA4fW5i7ZX6bjw1xELEGg/ZLgZq9auk/Q= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20170915142106-8351a756f30f/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -2777,19 +2802,22 @@ 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-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= golang.org/x/net v0.0.0-20210427231257-85d9c07bbe3a/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/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-20210505024714-0287a6fb4125/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/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210917221730-978cfadd31cf h1:R150MpwJIv1MpS0N/pc+NhTM8ajzvlmxlY5OYsrevXQ= golang.org/x/net v0.0.0-20210917221730-978cfadd31cf/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= +golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -2811,6 +2839,7 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -2956,18 +2985,25 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210818153620-00dd8d7831e7/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881 h1:TyHqChC80pFkXWraUUf6RuB5IqFdQieMLwwCJokV2pc= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486 h1:5hpz5aRr+W1erYCL5JRhSUBJRph7l9XkNveoExlrKYk= +golang.org/x/sys v0.0.0-20211210111614-af8b64212486/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= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b h1:9zKuko04nR4gjZ4+DNjHqRlAJqbJETHwiNKDqTfOjfE= +golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915090833-1cbadb444a80/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -3117,8 +3153,9 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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/tools v0.1.6-0.20210820212750-d4cc65f0b2ff h1:VX/uD7MK0AHXGiScH3fsieUQUcpmRERPDYtqZdJnA+Q= +golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= 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= @@ -3175,8 +3212,11 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.61.0 h1:TXXKS1slM3b2bZNJwD5DV/Tp6/M2cLzLOLh9PjDhrw8= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= +google.golang.org/api v0.63.0 h1:n2bqqK895ygnBpdPDYetfy23K7fJ22wsrZKCyfuRkkA= +google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= 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= @@ -3263,9 +3303,14 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0 h1:c7yRRmuQiVMo+YppNj5MUREXUyc2lPo3DrtYMwaWQ28= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio= @@ -3303,9 +3348,11 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -3352,8 +3399,9 @@ gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.52.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c= gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo= gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q= gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4= @@ -3417,8 +3465,8 @@ k8s.io/api v0.20.5/go.mod h1:FQjAceXnVaWDeov2YUWhOb6Yt+5UjErkp6UO3nczO1Y= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.0/go.mod h1:+YbrhBBGgsxbF6o6Kj4KJPJnBmAKuXDeS3E18bgHNVU= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.22.4 h1:UvyHW0ezB2oIgHAxlYoo6UJQObYXU7awuNarwoHEOjw= -k8s.io/api v0.22.4/go.mod h1:Rgs+9gIGYC5laXQSZZ9JqT5NevNgoGiOdVWi1BAB3qk= +k8s.io/api v0.23.1 h1:ncu/qfBfUoClqwkTGbeRqqOqBCRoUAflMuOaOD7J0c8= +k8s.io/api v0.23.1/go.mod h1:WfXnOnwSqNtG62Y1CdjoMxh7r7u9QXGCkA1u0na2jgo= 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= @@ -3426,8 +3474,8 @@ k8s.io/apimachinery v0.20.5/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRp k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= 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.22.4 h1:9uwcvPpukBw/Ri0EUmWz+49cnFtaoiyEhQTK+xOe7Ck= -k8s.io/apimachinery v0.22.4/go.mod h1:yU6oA6Gnax9RrxGzVvPFFJ+mpnW6PBSqp0sx0I0HHW0= +k8s.io/apimachinery v0.23.1 h1:sfBjlDFwj2onG0Ijx5C+SrAoeUscPrmghm7wHP+uXlo= +k8s.io/apimachinery v0.23.1/go.mod h1:SADt2Kl8/sttJ62RRsi9MIV4o8f5S3coArm0Iu3fBno= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= k8s.io/client-go v0.18.2/go.mod h1:Xcm5wVGXX9HAA2JJ2sSBUn3tCJ+4SVlCbl2MNNv+CIU= k8s.io/client-go v0.19.2/go.mod h1:S5wPhCqyDNAlzM9CnEdgTGV4OqhsW3jGO1UM1epwfJA= @@ -3435,18 +3483,19 @@ k8s.io/client-go v0.20.5/go.mod h1:Ee5OOMMYvlH8FCZhDsacjMlCBwetbGZETwo1OA+e6Zw= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= 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.22.4 h1:aAQ1Wk+I3bjCNk35YWUqbaueqrIonkfDPJSPDDe8Kfg= -k8s.io/client-go v0.22.4/go.mod h1:Yzw4e5e7h1LNHA4uqnMVrpEpUs1hJOiuBsJKIlRCHDA= +k8s.io/client-go v0.23.1 h1:Ma4Fhf/p07Nmj9yAB1H7UwbFHEBrSPg8lviR24U2GiQ= +k8s.io/client-go v0.23.1/go.mod h1:6QSI8fEuqD4zgFK0xbdwfB/PthBsIxCJMa3s17WlcO0= 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.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.22.4/go.mod h1:MrSaQy4a3tFVViff8TZL6JHYSewNCLshZCwHYM58v5A= +k8s.io/component-base v0.23.1/go.mod h1:6llmap8QtJIXGDd4uIWJhAq0Op8AtQo6bDW2RrNMTeo= k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= 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= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.0.0-20190306015804-8e90cee79f82/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -3457,23 +3506,25 @@ 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/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/klog/v2 v2.30.0 h1:bUO6drIvCIsvZ/XFgfxoGFQU/a4Qkh0iAlvUR7vlHJw= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= 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/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c h1:jvamsI1tn9V0S8jicyX82qaFC0H/NKxv2e5mbqsgR80= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kubelet v0.20.5/go.mod h1:iM18y0xm/1VlznuHFGBd9YVT9MM15TgEWJrJHrZ4mtQ= -k8s.io/kubelet v0.22.4 h1:0eaVDObhAuDCDnQJS9xqgfAP5/IWHMt6un4L/DQs0so= -k8s.io/kubelet v0.22.4/go.mod h1:9dCtyqqDnXJYF9E2mejBmDQb+flkAGFBzGgnlW/goyo= +k8s.io/kubelet v0.23.1 h1:YBqEOCfSKGWbj1pofkZUpaViFKtAY6gUD8MSXek2/eI= +k8s.io/kubelet v0.23.1/go.mod h1:WdvMiehtNPhtiW8sSVVvr8YYU00L0u+0HkfMDEB0LKM= 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/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b h1:wxEMGetGMur3J1xuGLQY7GEQYg9bZxKn3tKo5k/eYcs= +k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/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= @@ -3486,6 +3537,8 @@ rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= diff --git a/internal/configconverter/k8s_tagger.go b/internal/configconverter/k8s_tagger.go index aa91a7031a..7de5047052 100644 --- a/internal/configconverter/k8s_tagger.go +++ b/internal/configconverter/k8s_tagger.go @@ -24,7 +24,11 @@ import ( ) // RenameK8sTagger will replace k8s_tagger processor items with k8sattributes ones. -func RenameK8sTagger(in *config.Map) *config.Map { +func RenameK8sTagger(in *config.Map) error { + if in == nil { + return fmt.Errorf("cannot RenameK8sTagger on nil *config.Map") + } + tagger := "k8s_tagger(/\\w+:{0,2})?" taggerRe, _ := regexp.Compile(tagger) keyExpr := fmt.Sprintf("processors::%s(.+)?", tagger) @@ -64,5 +68,6 @@ func RenameK8sTagger(in *config.Map) *config.Map { out.Set(k, v) } } - return out + *in = *out + return nil } diff --git a/internal/configconverter/k8s_tagger_test.go b/internal/configconverter/k8s_tagger_test.go index 3f892692d9..358429e965 100644 --- a/internal/configconverter/k8s_tagger_test.go +++ b/internal/configconverter/k8s_tagger_test.go @@ -29,25 +29,21 @@ package configconverter import ( - "context" "testing" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/configmapprovider" "go.opentelemetry.io/collector/config/configtest" ) func TestRenameK8sTaggerTestRenameK8sTagger(t *testing.T) { - pp := &converterProvider{ - wrapped: configmapprovider.NewFile("testdata/k8s-tagger.yaml"), - cfgMapFuncs: []CfgMapFunc{RenameK8sTagger}, - } - expected, err := configtest.LoadConfigMap("testdata/k8sattributes.yaml") + actual, err := configtest.LoadConfigMap("testdata/k8s-tagger.yaml") require.NoError(t, err) + require.NotNil(t, actual) - r, err := pp.Retrieve(context.Background(), nil) - require.NoError(t, err) - actual, err := r.Get(context.Background()) + expected, err := configtest.LoadConfigMap("testdata/k8sattributes.yaml") require.NoError(t, err) + + RenameK8sTagger(actual) + require.Equal(t, expected.ToStringMap(), actual.ToStringMap()) } diff --git a/internal/configconverter/move_hec_tls.go b/internal/configconverter/move_hec_tls.go index 5629fe6613..63ed4227b0 100644 --- a/internal/configconverter/move_hec_tls.go +++ b/internal/configconverter/move_hec_tls.go @@ -22,7 +22,11 @@ import ( "go.opentelemetry.io/collector/config" ) -func MoveHecTLS(in *config.Map) *config.Map { +func MoveHecTLS(in *config.Map) error { + if in == nil { + return fmt.Errorf("cannot MoveHecTLS on nil *config.Map") + } + const expression = "exporters::splunk_hec(/\\w+)?::(insecure_skip_verify|ca_file|cert_file|key_file)" re, _ := regexp.Compile(expression) out := config.NewMap() @@ -46,5 +50,7 @@ func MoveHecTLS(in *config.Map) *config.Map { "https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/5433", ) } - return out + + *in = *out + return nil } diff --git a/internal/configconverter/move_hec_tls_test.go b/internal/configconverter/move_hec_tls_test.go index 5abbff80ea..81413e74e4 100644 --- a/internal/configconverter/move_hec_tls_test.go +++ b/internal/configconverter/move_hec_tls_test.go @@ -15,24 +15,20 @@ package configconverter import ( - "context" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/configmapprovider" + "go.opentelemetry.io/collector/config/configtest" ) func TestMoveHecTLS(t *testing.T) { - cp := &converterProvider{ - wrapped: configmapprovider.NewFile("testdata/hec-tls.yaml"), - cfgMapFuncs: []CfgMapFunc{MoveHecTLS}, - } - r, err := cp.Retrieve(context.Background(), nil) + cfgMap, err := configtest.LoadConfigMap("testdata/hec-tls.yaml") require.NoError(t, err) + require.NotNil(t, cfgMap) + + MoveHecTLS(cfgMap) - cfgMap, err := r.Get(context.Background()) - require.NoError(t, err) assert.False(t, cfgMap.IsSet("exporters::splunk_hec::ca_file")) assert.True(t, true, cfgMap.Get("exporters::splunk_hec::tls::insecure_skip_verify")) assert.Equal(t, "my-ca-file-1", cfgMap.Get("exporters::splunk_hec::tls::ca_file")) diff --git a/internal/configconverter/move_otlp_insecure.go b/internal/configconverter/move_otlp_insecure.go index 12bee94a36..76ceb23fb9 100644 --- a/internal/configconverter/move_otlp_insecure.go +++ b/internal/configconverter/move_otlp_insecure.go @@ -22,7 +22,11 @@ import ( "go.opentelemetry.io/collector/config" ) -func MoveOTLPInsecureKey(in *config.Map) *config.Map { +func MoveOTLPInsecureKey(in *config.Map) error { + if in == nil { + return fmt.Errorf("cannot MoveOTLPInsecureKey on nil *config.Map") + } + const expr = "exporters::otlp(/\\w+)?::insecure" insecureRE, _ := regexp.Compile(expr) out := config.NewMap() @@ -44,5 +48,7 @@ func MoveOTLPInsecureKey(in *config.Map) *config.Map { "deprecated. Please update the config according to the guideline: " + "https://github.com/signalfx/splunk-otel-collector#from-0350-to-0360.") } - return out + + *in = *out + return nil } diff --git a/internal/configconverter/move_otlp_insecure_test.go b/internal/configconverter/move_otlp_insecure_test.go index 7664557c22..a12356e0ad 100644 --- a/internal/configconverter/move_otlp_insecure_test.go +++ b/internal/configconverter/move_otlp_insecure_test.go @@ -29,48 +29,32 @@ package configconverter import ( - "context" "testing" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/configmapprovider" + "go.opentelemetry.io/collector/config/configtest" ) -func TestConverterProvider_Noop(t *testing.T) { - pp := &converterProvider{ - wrapped: configmapprovider.NewFile("testdata/otlp-insecure.yaml"), - } - r, err := pp.Retrieve(context.Background(), nil) - require.NoError(t, err) - v, err := r.Get(context.Background()) - require.NoError(t, err) - assert.True(t, v.IsSet("exporters::otlp::insecure")) -} - func TestMoveOTLPInsecureKey(t *testing.T) { - pp := &converterProvider{ - wrapped: configmapprovider.NewFile("testdata/otlp-insecure.yaml"), - cfgMapFuncs: []CfgMapFunc{MoveOTLPInsecureKey}, - } - r, err := pp.Retrieve(context.Background(), nil) - require.NoError(t, err) - v, err := r.Get(context.Background()) + cfgMap, err := configtest.LoadConfigMap("testdata/otlp-insecure.yaml") require.NoError(t, err) - assert.False(t, v.IsSet("exporters::otlp::insecure")) - assert.Equal(t, true, v.Get("exporters::otlp::tls::insecure")) + require.NotNil(t, cfgMap) + + MoveOTLPInsecureKey(cfgMap) + + assert.False(t, cfgMap.IsSet("exporters::otlp::insecure")) + assert.Equal(t, true, cfgMap.Get("exporters::otlp::tls::insecure")) } func TestMoveOTLPInsecureKey_Custom(t *testing.T) { - pp := &converterProvider{ - wrapped: configmapprovider.NewFile("testdata/otlp-insecure-custom.yaml"), - cfgMapFuncs: []CfgMapFunc{MoveOTLPInsecureKey}, - } - r, err := pp.Retrieve(context.Background(), nil) - require.NoError(t, err) - v, err := r.Get(context.Background()) + cfgMap, err := configtest.LoadConfigMap("testdata/otlp-insecure-custom.yaml") require.NoError(t, err) - assert.False(t, v.IsSet("exporters::otlp/foo::insecure")) - assert.Equal(t, true, v.Get("exporters::otlp/foo::tls::insecure")) - assert.Equal(t, true, v.Get("exporters::otlp/foo::tls::insecure_skip_verify")) + require.NotNil(t, cfgMap) + + MoveOTLPInsecureKey(cfgMap) + + assert.False(t, cfgMap.IsSet("exporters::otlp/foo::insecure")) + assert.Equal(t, true, cfgMap.Get("exporters::otlp/foo::tls::insecure")) + assert.Equal(t, true, cfgMap.Get("exporters::otlp/foo::tls::insecure_skip_verify")) } diff --git a/internal/configconverter/parser_provider.go b/internal/configconverter/parser_provider.go deleted file mode 100644 index 91a3ba7f56..0000000000 --- a/internal/configconverter/parser_provider.go +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package configconverter - -import ( - "context" - "fmt" - - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configmapprovider" -) - -// converterProvider wraps a configmapprovider.Provider and accepts a list of functions that -// convert ConfigMaps. The idea is for this type to conform to the open-closed -// principle. -type converterProvider struct { - wrapped configmapprovider.Provider - retrieved configmapprovider.Retrieved - cfgMapFuncs []CfgMapFunc -} - -type CfgMapFunc func(*config.Map) *config.Map - -var _ configmapprovider.Provider = (*converterProvider)(nil) - -func ParserProvider(wrapped configmapprovider.Provider, funcs ...CfgMapFunc) configmapprovider.Provider { - return &converterProvider{wrapped: wrapped, cfgMapFuncs: funcs} -} - -func (p converterProvider) Retrieve(ctx context.Context, onChange func(*configmapprovider.ChangeEvent)) (configmapprovider.Retrieved, error) { - var err error - p.retrieved, err = p.wrapped.Retrieve(ctx, onChange) - return &p, err -} - -func (p converterProvider) Shutdown(context.Context) error { - return nil -} - -func (p *converterProvider) Get(ctx context.Context) (*config.Map, error) { - if p.retrieved == nil { - return nil, fmt.Errorf("must Retrieve() before attempting Get()") - } - cfgMap, err := p.retrieved.Get(ctx) - if err != nil { - return nil, fmt.Errorf("converterProvider.Get(): %w", err) - } - - for _, cfgMapFunc := range p.cfgMapFuncs { - cfgMap = cfgMapFunc(cfgMap) - } - - out := config.NewMap() - for _, k := range cfgMap.AllKeys() { - out.Set(k, cfgMap.Get(k)) - } - return out, nil -} - -func (p *converterProvider) Close(ctx context.Context) error { - return nil -} diff --git a/internal/configconverter/parser_provider_test.go b/internal/configconverter/parser_provider_test.go deleted file mode 100644 index 7c61ecc88f..0000000000 --- a/internal/configconverter/parser_provider_test.go +++ /dev/null @@ -1,57 +0,0 @@ -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package configconverter - -import ( - "context" - "testing" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "go.opentelemetry.io/collector/config/configmapprovider" -) - -func TestMemLimitBallastRemoverPP(t *testing.T) { - tests := []struct { - name string - fname string - key string - }{ - { - name: "default", - fname: "testdata/ballast_mem_limiter.yaml", - key: "processors::memory_limiter::ballast_size_mib", - }, - { - name: "custom", - fname: "testdata/ballast_mem_limiter_custom.yaml", - key: "processors::memory_limiter/foo::ballast_size_mib", - }, - } - for _, test := range tests { - t.Run(test.name, func(t *testing.T) { - pp := &converterProvider{ - wrapped: configmapprovider.NewFile(test.fname), - cfgMapFuncs: []CfgMapFunc{RemoveBallastKey}, - } - r, err := pp.Retrieve(context.Background(), nil) - require.NoError(t, err) - cfgMap, err := r.Get(context.Background()) - require.NoError(t, err) - b := cfgMap.IsSet(test.key) - assert.False(t, b) - }) - } -} diff --git a/internal/configconverter/remove_ballast_key.go b/internal/configconverter/remove_ballast_key.go index e303e8f70b..9dc5a797cb 100644 --- a/internal/configconverter/remove_ballast_key.go +++ b/internal/configconverter/remove_ballast_key.go @@ -15,6 +15,7 @@ package configconverter import ( + "fmt" "log" "regexp" @@ -25,7 +26,11 @@ import ( // memory_limiter processor config if it exists. This config key will go away at // some point (or already has) at which point its presence in a config will // prevent the Collector from starting. -func RemoveBallastKey(cfgMap *config.Map) *config.Map { +func RemoveBallastKey(cfgMap *config.Map) error { + if cfgMap == nil { + return fmt.Errorf("cannot RemoveBallastKey on nil *config.Map") + } + const expr = "processors::memory_limiter(/\\w+)?::ballast_size_mib" ballastKeyRegexp, _ := regexp.Compile(expr) @@ -39,5 +44,6 @@ func RemoveBallastKey(cfgMap *config.Map) *config.Map { out.Set(k, cfgMap.Get(k)) } } - return out + *cfgMap = *out + return nil } diff --git a/internal/configprovider/config_source_provider.go b/internal/configprovider/config_source_provider.go index 9f66bc0b09..6b7647a5b0 100644 --- a/internal/configprovider/config_source_provider.go +++ b/internal/configprovider/config_source_provider.go @@ -29,49 +29,83 @@ import ( type errDuplicatedConfigSourceFactory struct{ error } var ( - _ configmapprovider.Provider = (*configSourceParserProvider)(nil) - _ configmapprovider.Retrieved = (*configSourceParserProvider)(nil) + _ configmapprovider.Provider = (*configSourceConfigMapProvider)(nil) ) -type configSourceParserProvider struct { - logger *zap.Logger - csm *Manager - configServer *configServer - pp configmapprovider.Provider - retrieved configmapprovider.Retrieved - buildInfo component.BuildInfo - factories []Factory +type configSourceConfigMapProvider struct { + logger *zap.Logger + csm *Manager + configServer *configServer + wrappedProviders []configmapprovider.Provider + wrappedRetrieveds []configmapprovider.Retrieved + retrieved configmapprovider.Retrieved + buildInfo component.BuildInfo + factories []Factory } -// NewConfigSourceParserProvider creates a ParserProvider that uses config sources. -func NewConfigSourceParserProvider(pp configmapprovider.Provider, logger *zap.Logger, buildInfo component.BuildInfo, factories ...Factory) configmapprovider.Provider { - return &configSourceParserProvider{ - pp: pp, - logger: logger, - factories: factories, - buildInfo: buildInfo, +// NewConfigSourceConfigMapProvider creates a ParserProvider that uses config sources. +func NewConfigSourceConfigMapProvider(wrapped []configmapprovider.Provider, logger *zap.Logger, buildInfo component.BuildInfo, factories ...Factory) configmapprovider.Provider { + return &configSourceConfigMapProvider{ + wrappedProviders: wrapped, + logger: logger, + factories: factories, + buildInfo: buildInfo, } } -func (c *configSourceParserProvider) Retrieve(ctx context.Context, onChange func(*configmapprovider.ChangeEvent)) (configmapprovider.Retrieved, error) { +func (c *configSourceConfigMapProvider) Retrieve(ctx context.Context, onChange func(*configmapprovider.ChangeEvent)) (configmapprovider.Retrieved, error) { + for _, p := range c.wrappedProviders { + retr, err := p.Retrieve(ctx, onChange) + if err != nil { + return nil, err + } + c.wrappedRetrieveds = append(c.wrappedRetrieveds, retr) + } + var err error - c.retrieved, err = c.pp.Retrieve(ctx, onChange) - return c, err + c.retrieved, err = configmapprovider.NewRetrieved( + c.Get, + configmapprovider.WithClose(func(ctxF context.Context) error { + var e error + for _, ret := range c.wrappedRetrieveds { + e = multierr.Append(e, ret.Close(ctxF)) + } + return e + })) + + return c.retrieved, err } -func (c *configSourceParserProvider) Shutdown(ctx context.Context) error { - return c.pp.Shutdown(ctx) +func (c *configSourceConfigMapProvider) Shutdown(ctx context.Context) error { + return c.mergedShutdown(ctx) +} + +// Taken from https://github.com/open-telemetry/opentelemetry-collector/blob/40a7d72f9d77c749d2d24056a1b66a7757bc07e3/service/config_provider.go#L196 +// Copyright The OpenTelemetry Authors +func (c *configSourceConfigMapProvider) mergedShutdown(ctx context.Context) error { + var errs error + for _, p := range c.wrappedProviders { + errs = multierr.Append(errs, p.Shutdown(ctx)) + } + return errs } // Get returns a config.Parser that wraps the config.Default() with a parser // that can load and inject data from config sources. If there are no config sources // in the configuration the returned parser behaves like the config.Default(). -func (c *configSourceParserProvider) Get(ctx context.Context) (*config.Map, error) { - initialMap, err := c.retrieved.Get(ctx) - if err != nil { - return nil, err +func (c *configSourceConfigMapProvider) Get(ctx context.Context) (*config.Map, error) { + initialMap := config.NewMap() + for _, r := range c.wrappedRetrieveds { + cfgMap, err := r.Get(ctx) + if err != nil { + return nil, err + } + if err = initialMap.Merge(cfgMap); err != nil { + return nil, err + } } + var err error factories, err := makeFactoryMap(c.factories) if err != nil { return nil, err @@ -98,13 +132,13 @@ func (c *configSourceParserProvider) Get(ctx context.Context) (*config.Map, erro // WatchForUpdate is used to monitor for updates on configuration values that // were retrieved from config sources. -func (c *configSourceParserProvider) WatchForUpdate() error { +func (c *configSourceConfigMapProvider) WatchForUpdate() error { return c.csm.WatchForUpdate() } // Close ends the watch for updates and closes the parser provider and respective // config sources. -func (c *configSourceParserProvider) Close(ctx context.Context) error { +func (c *configSourceConfigMapProvider) Close(ctx context.Context) error { if c.configServer != nil { _ = c.configServer.shutdown() } diff --git a/internal/configprovider/config_source_provider_test.go b/internal/configprovider/config_source_provider_test.go index 5c9675edc0..470f4d9d22 100644 --- a/internal/configprovider/config_source_provider_test.go +++ b/internal/configprovider/config_source_provider_test.go @@ -32,7 +32,7 @@ import ( "go.uber.org/zap" ) -func TestConfigSourceParserProvider(t *testing.T) { +func TestConfigSourceConfigMapProvider(t *testing.T) { tests := []struct { parserProvider configmapprovider.Provider wantErr error @@ -70,7 +70,7 @@ func TestConfigSourceParserProvider(t *testing.T) { { name: "manager_resolve_error", parserProvider: configmapprovider.NewFile(path.Join("testdata", "manager_resolve_error.yaml")), - wantErr: fmt.Errorf("error not wrapped by specific error type: %w", configsource.ErrSessionClosed), + wantErr: fmt.Errorf("error not wrappedProviders by specific error type: %w", configsource.ErrSessionClosed), }, } @@ -83,8 +83,8 @@ func TestConfigSourceParserProvider(t *testing.T) { } } - pp := NewConfigSourceParserProvider( - configmapprovider.NewInMemory(nil), + pp := NewConfigSourceConfigMapProvider( + []configmapprovider.Provider{}, zap.NewNop(), component.NewDefaultBuildInfo(), factories..., @@ -92,10 +92,11 @@ func TestConfigSourceParserProvider(t *testing.T) { require.NotNil(t, pp) // Do not use the config.Default() to simplify the test setup. - cspp := pp.(*configSourceParserProvider) - cspp.pp = tt.parserProvider - if cspp.pp == nil { - cspp.pp = &mockParserProvider{} + cspp := pp.(*configSourceConfigMapProvider) + if tt.parserProvider == nil { + cspp.wrappedProviders = []configmapprovider.Provider{&mockParserProvider{}} + } else { + cspp.wrappedProviders = []configmapprovider.Provider{tt.parserProvider} } r, err := pp.Retrieve(context.Background(), nil) @@ -118,6 +119,7 @@ func TestConfigSourceParserProvider(t *testing.T) { defer wg.Done() watchForUpdatedError = cspp.WatchForUpdate() }() + require.NotNil(t, cspp.csm) cspp.csm.WaitForWatcher() closeErr := cspp.Close(context.Background()) @@ -136,7 +138,7 @@ type mockParserProvider struct { var _ configmapprovider.Provider = (*mockParserProvider)(nil) func (mpp *mockParserProvider) Retrieve(ctx context.Context, onChange func(*configmapprovider.ChangeEvent)) (configmapprovider.Retrieved, error) { - return mpp, nil + return configmapprovider.NewRetrieved(mpp.Get) } func (mpp *mockParserProvider) Shutdown(ctx context.Context) error { diff --git a/internal/exporter/httpsinkexporter/config_test.go b/internal/exporter/httpsinkexporter/config_test.go index fcd5b03845..28ae8c0eea 100644 --- a/internal/exporter/httpsinkexporter/config_test.go +++ b/internal/exporter/httpsinkexporter/config_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) func TestLoadConfig(t *testing.T) { @@ -31,7 +31,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Exporters[typeStr] = factory - cfg, err := configtest.LoadConfigAndValidate(path.Join(".", "testdata", "config.yaml"), factories) + cfg, err := servicetest.LoadConfigAndValidate(path.Join(".", "testdata", "config.yaml"), factories) require.NoError(t, err) require.NotNil(t, cfg) diff --git a/internal/extension/smartagentextension/config_linux_test.go b/internal/extension/smartagentextension/config_linux_test.go index 29ae3a33bc..19ab227e3a 100644 --- a/internal/extension/smartagentextension/config_linux_test.go +++ b/internal/extension/smartagentextension/config_linux_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) func TestBundleDirDefault(t *testing.T) { @@ -34,7 +34,7 @@ func TestBundleDirDefault(t *testing.T) { factory := NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "config.yaml"), factories, ) diff --git a/internal/extension/smartagentextension/config_test.go b/internal/extension/smartagentextension/config_test.go index ec18f41fd7..6b92600d10 100644 --- a/internal/extension/smartagentextension/config_test.go +++ b/internal/extension/smartagentextension/config_test.go @@ -30,6 +30,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) var tru = true @@ -41,7 +42,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "config.yaml"), factories, ) @@ -109,7 +110,7 @@ func TestSmartAgentConfigProvider(t *testing.T) { factory := NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "config.yaml"), factories, ) @@ -153,7 +154,7 @@ func TestLoadInvalidConfig(t *testing.T) { factory := NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_config.yaml"), factories, ) diff --git a/internal/extension/smartagentextension/config_windows_test.go b/internal/extension/smartagentextension/config_windows_test.go index b2fca32ec1..ffd8dafac8 100644 --- a/internal/extension/smartagentextension/config_windows_test.go +++ b/internal/extension/smartagentextension/config_windows_test.go @@ -25,7 +25,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) func TestBundleDirDefault(t *testing.T) { @@ -34,7 +34,7 @@ func TestBundleDirDefault(t *testing.T) { factory := NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "config.yaml"), factories, ) diff --git a/internal/receiver/smartagentreceiver/config_linux_test.go b/internal/receiver/smartagentreceiver/config_linux_test.go index 9c13cc39e0..1c58c5c559 100644 --- a/internal/receiver/smartagentreceiver/config_linux_test.go +++ b/internal/receiver/smartagentreceiver/config_linux_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) func TestLoadConfigWithLinuxOnlyMonitors(t *testing.T) { @@ -39,7 +39,7 @@ func TestLoadConfigWithLinuxOnlyMonitors(t *testing.T) { factory := NewFactory() factories.Receivers[config.Type(typeStr)] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "linux_config.yaml"), factories, ) diff --git a/internal/receiver/smartagentreceiver/config_test.go b/internal/receiver/smartagentreceiver/config_test.go index c6dd86716f..a168057ca8 100644 --- a/internal/receiver/smartagentreceiver/config_test.go +++ b/internal/receiver/smartagentreceiver/config_test.go @@ -39,7 +39,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" + "go.opentelemetry.io/collector/service/servicetest" ) func TestLoadConfig(t *testing.T) { @@ -48,7 +48,7 @@ func TestLoadConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "config.yaml"), factories, ) @@ -150,7 +150,7 @@ func TestLoadInvalidConfigWithoutType(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "without_type.yaml"), factories, ) require.Error(t, err) @@ -165,7 +165,7 @@ func TestLoadInvalidConfigWithUnknownType(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "unknown_type.yaml"), factories, ) require.Error(t, err) @@ -180,7 +180,7 @@ func TestLoadInvalidConfigWithUnexpectedTag(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "unexpected_tag.yaml"), factories, ) require.Error(t, err) @@ -195,7 +195,7 @@ func TestLoadInvalidConfigs(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_config.yaml"), factories, ) @@ -243,7 +243,7 @@ func TestLoadConfigWithEndpoints(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "endpoints_config.yaml"), factories, ) @@ -333,7 +333,7 @@ func TestLoadInvalidConfigWithInvalidEndpoint(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_endpoint.yaml"), factories, ) require.Error(t, err) @@ -348,7 +348,7 @@ func TestLoadInvalidConfigWithUnsupportedEndpoint(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "unsupported_endpoint.yaml"), factories, ) require.Error(t, err) @@ -363,7 +363,7 @@ func TestLoadInvalidConfigWithNonArrayDimensionClients(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_nonarray_dimension_clients.yaml"), factories, ) require.Error(t, err) @@ -378,7 +378,7 @@ func TestLoadInvalidConfigWithNonStringArrayDimensionClients(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_float_dimension_clients.yaml"), factories, ) require.Error(t, err) @@ -393,7 +393,7 @@ func TestFilteringConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "filtering_config.yaml"), factories, ) @@ -428,7 +428,7 @@ func TestInvalidFilteringConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "invalid_filtering_config.yaml"), factories, ) @@ -461,7 +461,7 @@ func TestLoadConfigWithNestedMonitorConfig(t *testing.T) { factory := NewFactory() factories.Receivers[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "nested_monitor_config.yaml"), factories, ) diff --git a/internal/receiver/smartagentreceiver/receiver_test.go b/internal/receiver/smartagentreceiver/receiver_test.go index df4d043391..ff3d9d7ede 100644 --- a/internal/receiver/smartagentreceiver/receiver_test.go +++ b/internal/receiver/smartagentreceiver/receiver_test.go @@ -34,9 +34,9 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/config/configtest" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/model/pdata" + "go.opentelemetry.io/collector/service/servicetest" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -354,7 +354,7 @@ func getSmartAgentExtensionConfig(t *testing.T) []*smartagentextension.Config { factory := smartagentextension.NewFactory() factories.Extensions[typeStr] = factory - cfg, err := configtest.LoadConfig( + cfg, err := servicetest.LoadConfig( path.Join(".", "testdata", "extension_config.yaml"), factories, ) require.NoError(t, err) diff --git a/tests/go.mod b/tests/go.mod index ed65f7f529..0ad9a125b6 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -11,21 +11,20 @@ require ( github.com/signalfx/signalfx-go v1.8.1 github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 - go.opentelemetry.io/collector v0.41.0 - go.opentelemetry.io/collector/model v0.41.0 - go.opentelemetry.io/otel/trace v1.2.0 + go.opentelemetry.io/collector v0.42.0 + go.opentelemetry.io/collector/model v0.42.0 + go.opentelemetry.io/otel/trace v1.3.0 go.uber.org/atomic v1.9.0 - go.uber.org/zap v1.19.1 + go.uber.org/zap v1.20.0 gopkg.in/yaml.v2 v2.4.0 ) require ( - cloud.google.com/go v0.81.0 // indirect + cloud.google.com/go v0.99.0 // indirect github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3 // indirect github.com/Microsoft/hcsshim v0.8.16 // indirect github.com/StackExchange/wmi v1.2.1 // indirect - github.com/benbjohnson/clock v1.2.0 // indirect github.com/cenkalti/backoff v2.2.1+incompatible // indirect github.com/cenkalti/backoff/v4 v4.1.2 // indirect github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68 // indirect @@ -34,6 +33,9 @@ require ( github.com/docker/distribution v2.7.1+incompatible // indirect github.com/docker/go-units v0.4.0 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-logr/logr v1.2.1 // indirect + github.com/go-logr/stdr v1.2.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -42,7 +44,7 @@ require ( github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect github.com/klauspost/compress v1.13.6 // indirect - github.com/knadh/koanf v1.3.3 // indirect + github.com/knadh/koanf v1.4.0 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/mapstructure v1.4.3 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect @@ -54,10 +56,10 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.1 // indirect github.com/opencontainers/runc v1.0.0-rc93 // indirect - github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rs/cors v1.8.0 // indirect + github.com/rs/cors v1.8.2 // indirect github.com/signalfx/golib/v3 v3.0.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/smartystreets/goconvey v1.6.4 // indirect @@ -65,20 +67,20 @@ require ( github.com/tklauser/go-sysconf v0.3.9 // indirect github.com/tklauser/numcpus v0.3.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 // indirect - go.opentelemetry.io/otel v1.2.0 // indirect - go.opentelemetry.io/otel/internal/metric v0.25.0 // indirect - go.opentelemetry.io/otel/metric v0.25.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 // indirect + go.opentelemetry.io/otel v1.3.0 // indirect + go.opentelemetry.io/otel/internal/metric v0.26.0 // indirect + go.opentelemetry.io/otel/metric v0.26.0 // indirect go.uber.org/multierr v1.7.0 // indirect - golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect - golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect - golang.org/x/sys v0.0.0-20211013075003-97ac67df715c // indirect + golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d // indirect + golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/sys v0.0.0-20211205182925-97ca703d548d // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect - google.golang.org/grpc v1.42.0 // indirect + google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect + google.golang.org/grpc v1.43.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/tests/go.sum b/tests/go.sum index b438f6d32f..119cd07e4e 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -18,8 +18,17 @@ cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKP cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0 h1:at8Tk2zUz63cLPR0JPWm5vp77pEZmzxEQBEfRKn1VV8= 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/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= +cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= +cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= +cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= +cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= +cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= +cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= +cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY= +cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= 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= @@ -28,7 +37,7 @@ cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4g cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -56,6 +65,7 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= @@ -74,6 +84,7 @@ github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+V github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= @@ -89,7 +100,9 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -103,8 +116,8 @@ github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+ github.com/aws/aws-sdk-go-v2/service/sts v1.7.2/go.mod h1:8EzeIqfWt2wWT4rJVu3f21TfrhJ8AEMzVybRNSb/b4g= github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/benbjohnson/clock v1.2.0 h1:9Re3G2TWxkE06LdMWMpcY6KV81GLXMGiYpPYUPkFAws= -github.com/benbjohnson/clock v1.2.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= +github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= +github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -112,7 +125,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= @@ -127,7 +139,10 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -136,14 +151,19 @@ github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmE github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= +github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= @@ -226,6 +246,7 @@ github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfc github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= @@ -272,12 +293,17 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= github.com/facebookgo/stackerr v0.0.0-20150612192056-c2fcf88613f4/go.mod h1:SBHk9aNQtiw4R4bEuzHjVmZikkUKCnO1v3lPQ21HZGk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= +github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= @@ -286,14 +312,13 @@ github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60 github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -308,6 +333,11 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.1 h1:DX7uPQ4WgAWfoh+NGGlbJQswnYIVvz0SRlLS3rPZQDA= +github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.0 h1:j4LrlVXgrbIWO83mmQUnK0Hi+YnbD+vzrE1z/EphbFE= +github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= @@ -319,8 +349,6 @@ github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL9 github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM= -github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-redis/redis v6.15.9+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= @@ -356,6 +384,7 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt 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/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -375,6 +404,7 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -397,6 +427,7 @@ github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -408,6 +439,9 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/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 v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -417,6 +451,8 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= +github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e h1:JKmoR8x90Iww1ks85zJ1lfDGgIiMDuIptTOhJq+zKyg= @@ -433,42 +469,52 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= +github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= +github.com/hashicorp/go-hclog v1.0.0/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.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= +github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= +github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= +github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= +github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= +github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoIospckxBxk6Q= github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +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= @@ -487,8 +533,10 @@ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -505,8 +553,8 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/knadh/koanf v1.3.3 h1:eNtBOzQDzkzIIPRCJCx/Ha3DeD/ZFwCAp8JxyqoVAls= -github.com/knadh/koanf v1.3.3/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= +github.com/knadh/koanf v1.4.0 h1:/k0Bh49SqLyLNfte9r6cvuZWrApOQhglOmhIU3L/zDw= +github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= 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= @@ -522,8 +570,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20180606163543-3fdea8d05856/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -532,29 +580,37 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= +github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mauricelam/genny v0.0.0-20190320071652-0800202903e5/go.mod h1:i2AazGGunAlAR5u0zXGYVmIT7nnwE6j9lwKSMx7N6ko= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= +github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -577,6 +633,7 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/morikuni/aec v0.0.0-20170113033406-39771216ff4c/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= @@ -628,8 +685,8 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -643,12 +700,14 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.0.0-20180209125602-c332b6f63c06/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= +github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_model v0.0.0-20171117100541-99fa1f4be8e5/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -659,6 +718,7 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T github.com/prometheus/common v0.0.0-20180110214958-89604d197083/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= +github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= 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= @@ -680,13 +740,15 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rs/cors v1.8.0 h1:P2KMzcFwrPoSjkF1WLRPsp3UMLyql8L4v9hQpVeK5so= -github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= +github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8= @@ -695,7 +757,7 @@ github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvW github.com/shirou/gopsutil v2.18.10+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU= github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -github.com/shirou/gopsutil/v3 v3.21.11/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA= +github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190222193949-1fb69526e884/go.mod h1:muYA2clvwCdj7nzAJ5vJIXYpJsUumhAl4Uu1wUNpWzA= @@ -725,14 +787,15 @@ github.com/smartystreets/goconvey v1.6.4-0.20190306220146-200a235640ff/go.mod h1 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/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 v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -740,7 +803,7 @@ github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -767,8 +830,7 @@ github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2bi github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= @@ -796,9 +858,9 @@ github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f/go go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -808,44 +870,44 @@ 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.41.0 h1:52AQDHN7wm+aPNWEeeq3pmLFxA4yhM8W/CnW96xOi8w= -go.opentelemetry.io/collector v0.41.0/go.mod h1:jr1zPqpeMpiZumkVEHAAmg/2/GUGz+EcTP05Lr070P4= -go.opentelemetry.io/collector/model v0.41.0 h1:9rsd7Kj03FOK8PpCzmd2VrqzvhLG6FZk6awOXEUQdCo= -go.opentelemetry.io/collector/model v0.41.0/go.mod h1:dXqjAeml+cB+YzJ3kUnd3v5/JvGAKl3MqHXfgSWRIo8= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0 h1:TON1iU3Y5oIytGQHIejDYLam5uoSMsmA0UV9Yupb5gQ= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.27.0/go.mod h1:T/zQwBldOpoAEpE3HMbLnI8ydESZVz4ggw6Is4FF9LI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0 h1:0BgiNWjN7rUWO9HdjF4L12r8OW86QkVQcYmCjnayJLo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.27.0/go.mod h1:bdvm3YpMxWAgEfQhtTBaVR8ceXPRuRBSQrvOBnIlHxc= -go.opentelemetry.io/contrib/zpages v0.27.0/go.mod h1:D8d5QMQJnidUFSazrcjfwq6Qw17G39JY+d4XvhQFMyI= -go.opentelemetry.io/otel v1.2.0 h1:YOQDvxO1FayUcT9MIhJhgMyNO1WqoduiyvQHzGN0kUQ= -go.opentelemetry.io/otel v1.2.0/go.mod h1:aT17Fk0Z1Nor9e0uisf98LrntPGMnk4frBO9+dkf69I= -go.opentelemetry.io/otel/exporters/prometheus v0.25.0/go.mod h1:TmEyKmTplB/cdILsJBqD9/JDK9ssGXWjsrpmMHodFLw= -go.opentelemetry.io/otel/internal/metric v0.25.0 h1:w/7RXe16WdPylaIXDgcYM6t/q0K5lXgSdZOEbIEyliE= -go.opentelemetry.io/otel/internal/metric v0.25.0/go.mod h1:Nhuw26QSX7d6n4duoqAFi5KOQR4AuzyMcl5eXOgwxtc= -go.opentelemetry.io/otel/metric v0.25.0 h1:7cXOnCADUsR3+EOqxPaSKwhEuNu0gz/56dRN1hpIdKw= -go.opentelemetry.io/otel/metric v0.25.0/go.mod h1:E884FSpQfnJOMMUaq+05IWlJ4rjZpk2s/F1Ju+TEEm8= -go.opentelemetry.io/otel/sdk v1.2.0 h1:wKN260u4DesJYhyjxDa7LRFkuhH7ncEVKU37LWcyNIo= -go.opentelemetry.io/otel/sdk v1.2.0/go.mod h1:jNN8QtpvbsKhgaC6V5lHiejMoKD+V8uadoSafgHPx1U= -go.opentelemetry.io/otel/sdk/export/metric v0.25.0/go.mod h1:Ej7NOa+WpN49EIcr1HMUYRvxXXCCnQCg2+ovdt2z8Pk= -go.opentelemetry.io/otel/sdk/metric v0.25.0/go.mod h1:G4xzj4LvC6xDDSsVXpvRVclQCbofGGg4ZU2VKKtDRfg= -go.opentelemetry.io/otel/trace v1.2.0 h1:Ys3iqbqZhcf28hHzrm5WAquMkDHNZTUkw7KHbuNjej0= -go.opentelemetry.io/otel/trace v1.2.0/go.mod h1:N5FLswTubnxKxOJHM7XZC074qpeEdLy3CgAVsdMucK0= +go.opentelemetry.io/collector v0.42.0 h1:hyOOmPe7CkPeiN8NT/eCQXJwak0pYwjocjDTGw95kvU= +go.opentelemetry.io/collector v0.42.0/go.mod h1:HiryUIokIPVCspJIAXlGdpfPFCepUAFLxTzid2AH7es= +go.opentelemetry.io/collector/model v0.42.0 h1:jQb9oi9NwhTJu6H8cOlK/3yeg+cyWxOrQD8A5TlcqQw= +go.opentelemetry.io/collector/model v0.42.0/go.mod h1:uUgx84gI+G/tE87Oo84305q0MD8tUV9uWxg+ckAE7Ew= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0 h1:Ky1MObd188aGbgb5OgNnwGuEEwI9MVIcc7rBW6zk5Ak= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0 h1:hpEoMBvKLC6CqFZogJypr9IHwwSNF3ayEkNzD502QAM= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0/go.mod h1:Ihno+mNBfZlT0Qot3XyRTdZ/9U/Cg2Pfgj75DTdIfq4= +go.opentelemetry.io/contrib/zpages v0.28.0/go.mod h1:y5RYQQgfEQV6oASayfbUv5ye5bnnncor+Ln18jMrVKY= +go.opentelemetry.io/otel v1.3.0 h1:APxLf0eiBwLl+SOXiJJCVYzA1OOJNyAoV8C5RNRyy7Y= +go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= +go.opentelemetry.io/otel/exporters/prometheus v0.26.0/go.mod h1:0/uJZI7H2y0FgMVCgCWdPzZpxPx3X3F5uInY32I9foI= +go.opentelemetry.io/otel/internal/metric v0.26.0 h1:dlrvawyd/A+X8Jp0EBT4wWEe4k5avYaXsXrBr4dbfnY= +go.opentelemetry.io/otel/internal/metric v0.26.0/go.mod h1:CbBP6AxKynRs3QCbhklyLUtpfzbqCLiafV9oY2Zj1Jk= +go.opentelemetry.io/otel/metric v0.26.0 h1:VaPYBTvA13h/FsiWfxa3yZnZEm15BhStD8JZQSA773M= +go.opentelemetry.io/otel/metric v0.26.0/go.mod h1:c6YL0fhRo4YVoNs6GoByzUgBp36hBL523rECoZA5UWg= +go.opentelemetry.io/otel/sdk v1.3.0 h1:3278edCoH89MEJ0Ky8WQXVmDQv3FX4ZJ3Pp+9fJreAI= +go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= +go.opentelemetry.io/otel/sdk/export/metric v0.26.0/go.mod h1:UpqzSnUOjFeSIVQLPp3pYIXfB/MiMFyXXzYT/bercxQ= +go.opentelemetry.io/otel/sdk/metric v0.26.0/go.mod h1:2VIeK0kS1YvRLFg3J58ptZTXYpiWlkq2n5RQt6w7He8= +go.opentelemetry.io/otel/trace v1.3.0 h1:doy8Hzb1RJ+I3yFhtDmwNc7tIyw1tNMOIsyPzp1NOGY= +go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= 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.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc= +go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= 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-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -856,10 +918,12 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -895,13 +959,13 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181207154023-610586996380/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -919,6 +983,7 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -943,10 +1008,12 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/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-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/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= -golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d h1:LO7XpTYMwTqxjLcGWPijK3vRXg1aWdlNOVOHRq45d7c= +golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -958,9 +1025,13 @@ golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/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/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/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= @@ -981,6 +1052,7 @@ golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -997,11 +1069,13 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= 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-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-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1011,6 +1085,7 @@ golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200120151820-655fe14d7479/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1045,6 +1120,7 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1055,11 +1131,24 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w 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/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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8= +golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d h1:FjkYO/PPp4Wi0EAUOVLxePm7qVW4r4ctbWpURyuOD0E= +golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1098,9 +1187,9 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1134,7 +1223,10 @@ golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= 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/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/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1163,7 +1255,17 @@ google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34q google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= 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/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/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= +google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= +google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= +google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= +google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= +google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= +google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1217,9 +1319,30 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +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 h1:pc16UedxnxXXtGxHCSUhafAoVHQZ0yXl8ZelMH4EETc= google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +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/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= +google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= +google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= +google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa h1:I0YcKz0I7OAhddo7ya8kMnvprhcWM045PmkBdMO9zN0= +google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1245,9 +1368,17 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.42.0 h1:XT2/MFpuPFsEX2fWh3YQtHkZ+WYZFQRfaUgLZYj/p6A= +google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.43.0 h1:Eeu7bZtDZ2DpRCsLhUlcrLnvYaMK1Gz86a+hMVvELmM= +google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1275,10 +1406,8 @@ gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qS gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= -gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= -gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= From 61f68b20657bed2e55c48ebea862ed74b6d7d3d9 Mon Sep 17 00:00:00 2001 From: Ryan Fitzpatrick Date: Thu, 13 Jan 2022 17:57:23 +0000 Subject: [PATCH 2/2] Add double dollar config source parsing compatibility --- CHANGELOG.md | 8 +- internal/configprovider/manager.go | 125 ++++++++++++------ internal/configprovider/manager_test.go | 8 +- .../testdata/envvar_cfgsrc_mix.yaml | 4 + .../testdata/envvar_cfgsrc_mix_expected.yaml | 4 + tests/general/envvar_expansion_test.go | 21 +++ .../testdata/env_config_source_labels.yaml | 30 +++++ .../env_config_source_labels.yaml | 28 ++-- .../resource_metrics/envvar_labels.yaml | 37 +++--- .../incompat_env_config_source_labels.yaml | 27 ++++ 10 files changed, 222 insertions(+), 70 deletions(-) create mode 100644 tests/general/testdata/resource_metrics/incompat_env_config_source_labels.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index ef0e278a8a..be6416b869 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,15 @@ ## Unreleased +This Splunk OpenTelemetry Collector release includes changes from the [opentelemetry-collector v0.42.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.42.0) and the [opentelemetry-collector-contrib v0.42.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.42.0) releases. + +### 🛑 Breaking changes 🛑 + +- This version adopts OpenTelemetry Core version 0.42.0, and in doing so the configuration parsing process has changed slightly. The Splunk OpenTelemetry Collector used to [evaluate user configuration twice](https://github.com/signalfx/splunk-otel-collector/issues/628) and this required escaping desired `$` literals with an additional `$` character to prevent unwanted environment variable expansion. This version no longer doubly evaluates configuration so any `$$` instances in your configuration as a workaround should be updated to `$`. [Config source directives](./internal/configsource) that include an additional `$` are provided with a temporary, backward-compatible `$${config_source:value}` and `$$config_source:value` parsing rule controlled by `SPLUNK_DOUBLE_DOLLAR_CONFIG_SOURCE_COMPATIBLE` environment variable (default `"true"`) to migrate them to single `$` usage to continue supporting the updating configs from [#930](https://github.com/signalfx/splunk-otel-collector/pull/930) and [#935](https://github.com/signalfx/splunk-otel-collector/pull/935). This functionality will be removed in a future release (#1099) + ### 🚀 New components 🚀 -- [`docker_observer`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/dockerobserver) to detect and create container endpoints, to be used with the [`receiver_creator`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/receivercreator). +- [`docker_observer`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/dockerobserver) to detect and create container endpoints, to be used with the [`receiver_creator`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/receivercreator) (#1044) ## v0.41.0 diff --git a/internal/configprovider/manager.go b/internal/configprovider/manager.go index 62827f608b..d009afdffb 100644 --- a/internal/configprovider/manager.go +++ b/internal/configprovider/manager.go @@ -18,8 +18,10 @@ import ( "context" "errors" "fmt" + "log" "net/url" "os" + "strconv" "strings" "sync" @@ -42,6 +44,8 @@ const ( // typeAndNameSeparator is the separator that is used between type and name in type/name // composite keys. typeAndNameSeparator = '/' + // dollarDollarCompatEnvVar is a temporary env var to disable backward compatibility (true by default) + dollarDollarCompatEnvVar = "SPLUNK_DOUBLE_DOLLAR_CONFIG_SOURCE_COMPATIBLE" ) // private error types to help with testability @@ -49,6 +53,13 @@ type ( errUnknownConfigSource struct{ error } ) +var ddBackwardCompatible = func() bool { + if v, err := strconv.ParseBool(strings.ToLower(os.Getenv(dollarDollarCompatEnvVar))); err == nil { + return v + } + return true +}() + // Manager is used to inject data from config sources into a configuration and also // to monitor for updates on the items injected into the configuration. All methods // of a Manager must be called only once and have an expected sequence: @@ -160,20 +171,11 @@ type ( // // For an overview about the internals of the Manager refer to the package README.md. type Manager struct { - // configSources is map from ConfigSource names (as defined in the configuration) - // and the respective instances. configSources map[string]configsource.ConfigSource - // watchingCh is used to notify users of the Manager that the WatchForUpdate function - // is ready and waiting for notifications. - watchingCh chan struct{} - // closeCh is used to notify the Manager WatchForUpdate function that the manager - // is being closed. - closeCh chan struct{} - // watchers keeps track of all WatchForUpdate functions for retrieved values. - watchers []configsource.Watchable - // watchersWG is used to ensure that Close waits for all WatchForUpdate calls - // to complete. - watchersWG sync.WaitGroup + watchingCh chan struct{} + closeCh chan struct{} + watchers []configsource.Watchable + watchersWG sync.WaitGroup } // NewManager creates a new instance of a Manager to be used to inject data from @@ -376,37 +378,49 @@ func (m *Manager) parseStringValue(ctx context.Context, s string) (interface{}, switch { case s[j+1] == expandPrefixChar: - // Escaping the prefix so $$ becomes a single $ without attempting - // to treat the string after it as a config source or env var. - expandableContent = string(expandPrefixChar) - w = 1 // consumed a single char + // temporary backward compatibility to support updated $${config_source:value} functionality + // in provided configs from 0.37.0 until 0.42.0 + bwCompatibilityRequired := false + + var expanded, sourceName string + var ww int + if ddBackwardCompatible && len(s[j+1:]) > 2 { + if s[j+2] == '{' { + if expanded, ww, sourceName = getBracketedExpandableContent(s, j+2); sourceName != "" { + bwCompatibilityRequired = true + } + } else { + if expanded, ww, sourceName = getBareExpandableContent(s, j+2); sourceName != "" { + if len(expanded) > (len(sourceName) + 1) { + if !strings.Contains(expanded[len(sourceName)+1:], "$") { + bwCompatibilityRequired = true + } + } + } + } + } - case s[j+1] == '{': - // Bracketed usage, consume everything until first '}' exactly as os.Expand. - expandableContent, w = scanToClosingBracket(s[j+1:]) - expandableContent = strings.Trim(expandableContent, " ") // Allow for some spaces. - delimIndex := strings.Index(expandableContent, string(configSourceNameDelimChar)) - if len(expandableContent) > 1 && delimIndex > -1 { - // Bracket expandableContent contains ':' treating it as a config source. - cfgSrcName = expandableContent[:delimIndex] + if bwCompatibilityRequired { + log.Printf( + `Deprecated config source directive %q has been replaced with %q. Please update your config as necessary as this will be removed in future release. To disable this replacement set the SPLUNK_DOUBLE_DOLLAR_CONFIG_SOURCE_COMPATIBLE environment variable to "false" before restarting the Collector.`, + s[j:j+2+ww], s[j+1:j+2+ww], + ) + expandableContent = expanded + w = ww + 1 + cfgSrcName = sourceName + } else { + // Escaping the prefix so $$ becomes a single $ without attempting + // to treat the string after it as a config source or env var. + expandableContent = string(expandPrefixChar) + w = 1 // consumed a single char } + case s[j+1] == '{': + expandableContent, w, cfgSrcName = getBracketedExpandableContent(s, j+1) + default: - // Non-bracketed usage, ie.: found the prefix char, it can be either a config - // source or an environment variable. - var name string - name, w = getTokenName(s[j+1:]) - expandableContent = name // Assume for now that it is an env var. - - // Peek next char after name, if it is a config source name delimiter treat the remaining of the - // string as a config source. - possibleDelimCharIndex := j + w + 1 - if possibleDelimCharIndex < len(s) && s[possibleDelimCharIndex] == configSourceNameDelimChar { - // This is a config source, since it is not delimited it will consume until end of the string. - cfgSrcName = name - expandableContent = s[j+1:] - w = len(expandableContent) // Set consumed bytes to the length of expandableContent - } + expandableContent, w, cfgSrcName = getBareExpandableContent(s, j+1) + } // At this point expandableContent contains a string to be expanded, evaluate and expand it. @@ -473,6 +487,37 @@ func (m *Manager) parseStringValue(ctx context.Context, s string) (interface{}, return string(buf) + s[i:], nil } +func getBracketedExpandableContent(s string, i int) (expandableContent string, consumed int, cfgSrcName string) { + // Bracketed usage, consume everything until first '}' exactly as os.Expand. + expandableContent, consumed = scanToClosingBracket(s[i:]) + expandableContent = strings.Trim(expandableContent, " ") // Allow for some spaces. + delimIndex := strings.Index(expandableContent, string(configSourceNameDelimChar)) + if len(expandableContent) > 1 && delimIndex > -1 { + // Bracket expandableContent contains ':' treating it as a config source. + cfgSrcName = expandableContent[:delimIndex] + } + return +} + +func getBareExpandableContent(s string, i int) (expandableContent string, consumed int, cfgSrcName string) { + // Non-bracketed usage, ie.: found the prefix char, it can be either a config + // source or an environment variable. + var name string + name, consumed = getTokenName(s[i:]) + expandableContent = name // Assume for now that it is an env var. + + // Peek next char after name, if it is a config source name delimiter treat the remaining of the + // string as a config source. + possibleDelimCharIndex := i + consumed + if possibleDelimCharIndex < len(s) && s[possibleDelimCharIndex] == configSourceNameDelimChar { + // This is a config source, since it is not delimited it will consume until end of the string. + cfgSrcName = name + expandableContent = s[i:] + consumed = len(expandableContent) // Set consumed bytes to the length of expandableContent + } + return +} + // retrieveConfigSourceData retrieves data from the specified config source and injects them into // the configuration. The Manager tracks sessions and watcher objects as needed. func (m *Manager) retrieveConfigSourceData(ctx context.Context, cfgSrcName, cfgSrcInvocation string) (interface{}, error) { diff --git a/internal/configprovider/manager_test.go b/internal/configprovider/manager_test.go index d59322891a..a4bbbdd7ba 100644 --- a/internal/configprovider/manager_test.go +++ b/internal/configprovider/manager_test.go @@ -432,7 +432,6 @@ func TestConfigSourceManager_EnvVarHandling(t *testing.T) { } return nil } - manager := newManager(map[string]configsource.ConfigSource{ "tstcfgsrc": &tstCfgSrc, }) @@ -586,7 +585,12 @@ func TestManager_expandString(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { got, err := manager.parseStringValue(ctx, tt.input) - require.IsType(t, tt.wantErr, err) + if tt.wantErr != nil { + require.Error(t, err) + require.IsType(t, tt.wantErr, err) + } else { + require.NoError(t, err) + } require.Equal(t, tt.want, got) }) } diff --git a/internal/configprovider/testdata/envvar_cfgsrc_mix.yaml b/internal/configprovider/testdata/envvar_cfgsrc_mix.yaml index 6560b52de0..134a76724f 100644 --- a/internal/configprovider/testdata/envvar_cfgsrc_mix.yaml +++ b/internal/configprovider/testdata/envvar_cfgsrc_mix.yaml @@ -10,6 +10,10 @@ envvar_legacy_05: $1/test cfgsrc_suffix: prefix-$tstcfgsrc:int_key cfgsrc_middle: prefix-${tstcfgsrc:int_key}-suffix cfgsrc_in_str: integer ${tstcfgsrc:int_key} injected as string +cfgsrc_workaround_suffix: prefix-$$tstcfgsrc:int_key +cfgsrc_braces_workaround_suffix: prefix-$${ tstcfgsrc:int_key } +cfgsrc_braces_workaround_middle: prefix-$${tstcfgsrc:int_key}-suffix +cfgsrc_braces_workaround_in_str: integer $${ tstcfgsrc:int_key} injected as string cfgsrc_params0: ${tstcfgsrc:params_key?p0=true&p1=$envvar&p2=42} cfgsrc_params1: "${tstcfgsrc:params_key?p0=false&p1=42&p2=$envvar}" cfgsrc_params2: $tstcfgsrc:params_key?p0=$$envvar diff --git a/internal/configprovider/testdata/envvar_cfgsrc_mix_expected.yaml b/internal/configprovider/testdata/envvar_cfgsrc_mix_expected.yaml index e9e9ba862c..002ceb7b38 100644 --- a/internal/configprovider/testdata/envvar_cfgsrc_mix_expected.yaml +++ b/internal/configprovider/testdata/envvar_cfgsrc_mix_expected.yaml @@ -10,6 +10,10 @@ envvar_legacy_05: /test cfgsrc_suffix: prefix-42 cfgsrc_middle: prefix-42-suffix cfgsrc_in_str: integer 42 injected as string +cfgsrc_workaround_suffix: prefix-42 +cfgsrc_braces_workaround_suffix: prefix-42 +cfgsrc_braces_workaround_middle: prefix-42-suffix +cfgsrc_braces_workaround_in_str: integer 42 injected as string cfgsrc_params0: p0: true p1: envvar_value diff --git a/tests/general/envvar_expansion_test.go b/tests/general/envvar_expansion_test.go index 46be4cee9e..7e9611b831 100644 --- a/tests/general/envvar_expansion_test.go +++ b/tests/general/envvar_expansion_test.go @@ -58,3 +58,24 @@ func TestExpandedDollarSignsViaEnvConfigSource(t *testing.T) { expectedResourceMetrics := tc.ResourceMetrics("env_config_source_labels.yaml") require.NoError(t, tc.OTLPMetricsReceiverSink.AssertAllMetricsReceived(t, *expectedResourceMetrics, 30*time.Second)) } + +func TestIncompatibleExpandedDollarSignsViaEnvConfigSource(t *testing.T) { + tc := testutils.NewTestcase(t) + defer tc.PrintLogsOnFailure() + defer tc.ShutdownOTLPMetricsReceiverSink() + + tc.SkipIfNotContainer() + + _, shutdown := tc.SplunkOtelCollectorWithEnv( + "env_config_source_labels.yaml", + map[string]string{ + "SPLUNK_DOUBLE_DOLLAR_CONFIG_SOURCE_COMPATIBLE": "false", + "AN_ENVVAR": "an-envvar-value", + }, + ) + + defer shutdown() + + expectedResourceMetrics := tc.ResourceMetrics("incompat_env_config_source_labels.yaml") + require.NoError(t, tc.OTLPMetricsReceiverSink.AssertAllMetricsReceived(t, *expectedResourceMetrics, 30*time.Second)) +} diff --git a/tests/general/testdata/env_config_source_labels.yaml b/tests/general/testdata/env_config_source_labels.yaml index 77bbb454e6..a3be42ec32 100644 --- a/tests/general/testdata/env_config_source_labels.yaml +++ b/tests/general/testdata/env_config_source_labels.yaml @@ -22,33 +22,63 @@ processors: - action: add_label new_label: single-dollar new_value: ${env:AN_ENVVAR}-suffix + - action: add_label + new_label: single-dollar-no-curly-braces + new_value: prefix-$env:AN_ENVVAR - action: add_label new_label: double-dollar new_value: $${env:AN_ENVVAR}-suffix + - action: add_label + new_label: double-dollar-no-curly-braces + new_value: prefix-$$env:AN_ENVVAR - action: add_label new_label: triple-dollar new_value: $$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: triple-dollar-no-curly-braces + new_value: prefix-$$$env:AN_ENVVAR - action: add_label new_label: quadruple-dollar new_value: $$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: quadruple-dollar-no-curly-braces + new_value: prefix-$$$$env:AN_ENVVAR - action: add_label new_label: quintuple-dollar new_value: $$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: quintuple-dollar-no-curly-braces + new_value: prefix-$$$$$env:AN_ENVVAR - action: add_label new_label: sextuple-dollar new_value: $$$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: sextuple-dollar-no-curly-braces + new_value: prefix-$$$$$$env:AN_ENVVAR - action: add_label new_label: septuple-dollar new_value: $$$$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: septuple-dollar-no-curly-braces + new_value: prefix-$$$$$$$env:AN_ENVVAR - action: add_label new_label: octuple-dollar new_value: $$$$$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: octuple-dollar-no-curly-braces + new_value: prefix-$$$$$$$$env:AN_ENVVAR - action: add_label new_label: nonuple-dollar new_value: $$$$$$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: nonuple-dollar-no-curly-braces + new_value: prefix-$$$$$$$$$env:AN_ENVVAR - action: add_label new_label: decuple-dollar new_value: $$$$$$$$$${env:AN_ENVVAR}-suffix + - action: add_label + new_label: decuple-dollar-no-curly-braces + new_value: prefix-$$$$$$$$$$env:AN_ENVVAR exporters: otlp: diff --git a/tests/general/testdata/resource_metrics/env_config_source_labels.yaml b/tests/general/testdata/resource_metrics/env_config_source_labels.yaml index 6bddf4dc88..9ddfcffafc 100644 --- a/tests/general/testdata/resource_metrics/env_config_source_labels.yaml +++ b/tests/general/testdata/resource_metrics/env_config_source_labels.yaml @@ -5,13 +5,23 @@ resource_metrics: type: IntGauge labels: state: used - single-dollar: -suffix + single-dollar: an-envvar-value-suffix + single-dollar-no-curly-braces: prefix-an-envvar-value double-dollar: an-envvar-value-suffix - triple-dollar: suffix - quadruple-dollar: ${env:AN_ENVVAR}-suffix - quintuple-dollar: $-suffix - sextuple-dollar: $an-envvar-value-suffix - septuple-dollar: $suffix - octuple-dollar: $${env:AN_ENVVAR}-suffix - nonuple-dollar: $$-suffix - decuple-dollar: $$an-envvar-value-suffix + double-dollar-no-curly-braces: prefix-an-envvar-value + triple-dollar: $an-envvar-value-suffix + triple-dollar-no-curly-braces: prefix-$an-envvar-value + quadruple-dollar: $an-envvar-value-suffix + quadruple-dollar-no-curly-braces: prefix-$an-envvar-value + quintuple-dollar: $$an-envvar-value-suffix + quintuple-dollar-no-curly-braces: prefix-$$an-envvar-value + sextuple-dollar: $$an-envvar-value-suffix + sextuple-dollar-no-curly-braces: prefix-$$an-envvar-value + septuple-dollar: $$$an-envvar-value-suffix + septuple-dollar-no-curly-braces: prefix-$$$an-envvar-value + octuple-dollar: $$$an-envvar-value-suffix + octuple-dollar-no-curly-braces: prefix-$$$an-envvar-value + nonuple-dollar: $$$$an-envvar-value-suffix + nonuple-dollar-no-curly-braces: prefix-$$$$an-envvar-value + decuple-dollar: $$$$an-envvar-value-suffix + decuple-dollar-no-curly-braces: prefix-$$$$an-envvar-value diff --git a/tests/general/testdata/resource_metrics/envvar_labels.yaml b/tests/general/testdata/resource_metrics/envvar_labels.yaml index 09b3bd8141..ba83fa96ba 100644 --- a/tests/general/testdata/resource_metrics/envvar_labels.yaml +++ b/tests/general/testdata/resource_metrics/envvar_labels.yaml @@ -7,21 +7,22 @@ resource_metrics: state: used single-dollar-no-curly-braces: an-envvar-value-suffix single-dollar-curly-braces: an-envvar-value-suffix - double-dollar-no-curly-braces: an-envvar-value-suffix - double-dollar-curly-braces: an-envvar-value-suffix - triple-dollar-no-curly-braces: -envvar-value-suffix - triple-dollar-curly-braces: -envvar-value-suffix - quadruple-dollar-no-curly-braces: $AN_ENVVAR-suffix - quadruple-dollar-curly-braces: ${AN_ENVVAR}-suffix - quintuple-dollar-no-curly-braces: $an-envvar-value-suffix - quintuple-dollar-curly-braces: $an-envvar-value-suffix - sextuple-dollar-no-curly-braces: $an-envvar-value-suffix - sextuple-dollar-curly-braces: $an-envvar-value-suffix - septuple-dollar-no-curly-braces: $-envvar-value-suffix - septuple-dollar-curly-braces: $-envvar-value-suffix - octuple-dollar-no-curly-braces: $$AN_ENVVAR-suffix - octuple-dollar-curly-braces: $${AN_ENVVAR}-suffix - nonuple-dollar-no-curly-braces: $$an-envvar-value-suffix - nonuple-dollar-curly-braces: $$an-envvar-value-suffix - decuple-dollar-no-curly-braces: $$an-envvar-value-suffix - decuple-dollar-curly-braces: $$an-envvar-value-suffix + double-dollar-no-curly-braces: $AN_ENVVAR-suffix + double-dollar-curly-braces: ${AN_ENVVAR}-suffix + triple-dollar-no-curly-braces: $an-envvar-value-suffix + triple-dollar-curly-braces: $an-envvar-value-suffix + quadruple-dollar-no-curly-braces: $$AN_ENVVAR-suffix + quadruple-dollar-curly-braces: $${AN_ENVVAR}-suffix + quintuple-dollar-no-curly-braces: $$an-envvar-value-suffix + quintuple-dollar-curly-braces: $$an-envvar-value-suffix + sextuple-dollar-no-curly-braces: $$$AN_ENVVAR-suffix + sextuple-dollar-curly-braces: $$${AN_ENVVAR}-suffix + septuple-dollar-no-curly-braces: $$$an-envvar-value-suffix + septuple-dollar-curly-braces: $$$an-envvar-value-suffix + octuple-dollar-no-curly-braces: $$$$AN_ENVVAR-suffix + octuple-dollar-curly-braces: $$$${AN_ENVVAR}-suffix + nonuple-dollar-no-curly-braces: $$$$an-envvar-value-suffix + nonuple-dollar-curly-braces: $$$$an-envvar-value-suffix + decuple-dollar-no-curly-braces: $$$$$AN_ENVVAR-suffix + decuple-dollar-curly-braces: $$$$${AN_ENVVAR}-suffix + diff --git a/tests/general/testdata/resource_metrics/incompat_env_config_source_labels.yaml b/tests/general/testdata/resource_metrics/incompat_env_config_source_labels.yaml new file mode 100644 index 0000000000..f7da0b085f --- /dev/null +++ b/tests/general/testdata/resource_metrics/incompat_env_config_source_labels.yaml @@ -0,0 +1,27 @@ +resource_metrics: + - instrumentation_library_metrics: + - metrics: + - name: system.memory.usage + type: IntGauge + labels: + state: used + single-dollar: an-envvar-value-suffix + single-dollar-no-curly-braces: prefix-an-envvar-value + double-dollar: ${env:AN_ENVVAR}-suffix + double-dollar-no-curly-braces: prefix-$env:AN_ENVVAR + triple-dollar: $an-envvar-value-suffix + triple-dollar-no-curly-braces: prefix-$an-envvar-value + quadruple-dollar: $${env:AN_ENVVAR}-suffix + quadruple-dollar-no-curly-braces: prefix-$$env:AN_ENVVAR + quintuple-dollar: $$an-envvar-value-suffix + quintuple-dollar-no-curly-braces: prefix-$$an-envvar-value + sextuple-dollar: $$${env:AN_ENVVAR}-suffix + sextuple-dollar-no-curly-braces: prefix-$$$env:AN_ENVVAR + septuple-dollar: $$$an-envvar-value-suffix + septuple-dollar-no-curly-braces: prefix-$$$an-envvar-value + octuple-dollar: $$$${env:AN_ENVVAR}-suffix + octuple-dollar-no-curly-braces: prefix-$$$$env:AN_ENVVAR + nonuple-dollar: $$$$an-envvar-value-suffix + nonuple-dollar-no-curly-braces: prefix-$$$$an-envvar-value + decuple-dollar: $$$$${env:AN_ENVVAR}-suffix + decuple-dollar-no-curly-braces: prefix-$$$$$env:AN_ENVVAR