From b4b57efe4525244ce09f2b382be8efc06fb41519 Mon Sep 17 00:00:00 2001 From: alrex Date: Mon, 27 Sep 2021 17:43:46 -0700 Subject: [PATCH] Rename `pdata.AggregationTemporality*` to `pdata.MetricAggregationTemporality*` (#5457) * rename AggregationTemporality -> MetricAggregationTemporality * make update-otel * update changelog * update configtls.TLSClientSetting to *configtls.TLSClientSetting * update DefaultBuildInfo to NewDefaultBuildInfo * update influxdb libraries * hack to work around tools caching --- CHANGELOG.md | 1 + cmd/mdatagen/metricdata.go | 6 +-- cmd/mdatagen/metricdata_test.go | 6 +-- .../alibabacloudlogserviceexporter/go.mod | 4 +- .../alibabacloudlogserviceexporter/go.sum | 8 ++-- exporter/awscloudwatchlogsexporter/go.mod | 4 +- exporter/awscloudwatchlogsexporter/go.sum | 8 ++-- exporter/awsemfexporter/datapoint.go | 2 +- exporter/awsemfexporter/go.mod | 4 +- exporter/awsemfexporter/go.sum | 8 ++-- exporter/awskinesisexporter/go.mod | 4 +- exporter/awskinesisexporter/go.sum | 8 ++-- .../auth_test.go | 4 +- .../config_test.go | 2 +- .../factory_test.go | 2 +- .../awsprometheusremotewriteexporter/go.mod | 4 +- .../awsprometheusremotewriteexporter/go.sum | 8 ++-- exporter/awsxrayexporter/go.mod | 4 +- exporter/awsxrayexporter/go.sum | 8 ++-- exporter/azuremonitorexporter/go.mod | 4 +- exporter/azuremonitorexporter/go.sum | 8 ++-- exporter/carbonexporter/go.mod | 4 +- exporter/carbonexporter/go.sum | 8 ++-- exporter/datadogexporter/go.mod | 4 +- exporter/datadogexporter/go.sum | 8 ++-- .../internal/translator/metrics_translator.go | 14 +++---- .../translator/metrics_translator_test.go | 38 +++++++++---------- exporter/dynatraceexporter/go.mod | 4 +- exporter/dynatraceexporter/go.sum | 8 ++-- .../metrics_exporter_test.go | 4 +- .../serialization/histogram.go | 4 +- .../serialization/histogram_test.go | 6 +-- .../dynatraceexporter/serialization/sum.go | 8 ++-- .../serialization/sum_test.go | 26 ++++++------- exporter/elasticexporter/go.mod | 4 +- exporter/elasticexporter/go.sum | 8 ++-- exporter/elasticsearchexporter/go.mod | 4 +- exporter/elasticsearchexporter/go.sum | 8 ++-- exporter/f5cloudexporter/go.mod | 4 +- exporter/f5cloudexporter/go.sum | 8 ++-- exporter/fileexporter/go.mod | 4 +- exporter/fileexporter/go.sum | 8 ++-- exporter/googlecloudexporter/go.mod | 4 +- exporter/googlecloudexporter/go.sum | 8 ++-- exporter/googlecloudpubsubexporter/go.mod | 4 +- exporter/googlecloudpubsubexporter/go.sum | 8 ++-- exporter/honeycombexporter/go.mod | 4 +- exporter/honeycombexporter/go.sum | 8 ++-- exporter/humioexporter/config_test.go | 2 +- exporter/humioexporter/factory_test.go | 2 +- exporter/humioexporter/go.mod | 4 +- exporter/humioexporter/go.sum | 8 ++-- exporter/influxdbexporter/go.mod | 6 +-- exporter/influxdbexporter/go.sum | 12 +++--- exporter/jaegerexporter/exporter_test.go | 14 +++---- exporter/jaegerexporter/go.mod | 4 +- exporter/jaegerexporter/go.sum | 8 ++-- exporter/kafkaexporter/go.mod | 4 +- exporter/kafkaexporter/go.sum | 8 ++-- exporter/loadbalancingexporter/go.mod | 4 +- exporter/loadbalancingexporter/go.sum | 8 ++-- exporter/logzioexporter/go.mod | 4 +- exporter/logzioexporter/go.sum | 8 ++-- exporter/lokiexporter/config_test.go | 2 +- exporter/lokiexporter/go.mod | 4 +- exporter/lokiexporter/go.sum | 8 ++-- exporter/newrelicexporter/go.mod | 4 +- exporter/newrelicexporter/go.sum | 8 ++-- exporter/newrelicexporter/metrics.go | 2 +- exporter/newrelicexporter/metrics_test.go | 8 ++-- exporter/newrelicexporter/transformer.go | 2 +- exporter/newrelicexporter/transformer_test.go | 10 ++--- exporter/observiqexporter/client_test.go | 2 +- exporter/observiqexporter/converter_test.go | 2 +- exporter/observiqexporter/go.mod | 4 +- exporter/observiqexporter/go.sum | 8 ++-- exporter/opencensusexporter/config_test.go | 2 +- exporter/opencensusexporter/factory_test.go | 8 ++-- exporter/opencensusexporter/go.mod | 4 +- exporter/opencensusexporter/go.sum | 8 ++-- .../opencensusexporter/opencensus_test.go | 12 +++--- exporter/prometheusexporter/accumulator.go | 10 ++--- .../prometheusexporter/accumulator_test.go | 20 +++++----- exporter/prometheusexporter/collector_test.go | 10 ++--- exporter/prometheusexporter/go.mod | 4 +- exporter/prometheusexporter/go.sum | 8 ++-- .../prometheusexporter/prometheus_test.go | 4 +- .../config_test.go | 2 +- .../exporter_test.go | 2 +- .../factory_test.go | 2 +- exporter/prometheusremotewriteexporter/go.mod | 4 +- exporter/prometheusremotewriteexporter/go.sum | 8 ++-- .../prometheusremotewriteexporter/helper.go | 4 +- .../testutil_test.go | 10 ++--- exporter/sapmexporter/go.mod | 4 +- exporter/sapmexporter/go.sum | 8 ++-- exporter/sentryexporter/go.mod | 4 +- exporter/sentryexporter/go.sum | 8 ++-- exporter/signalfxexporter/factory_test.go | 6 +-- exporter/signalfxexporter/go.mod | 4 +- exporter/signalfxexporter/go.sum | 8 ++-- .../internal/correlation/correlation_test.go | 2 +- .../internal/translation/converter.go | 4 +- .../internal/translation/converter_test.go | 10 ++--- exporter/splunkhecexporter/exporter_test.go | 4 +- exporter/splunkhecexporter/go.mod | 4 +- exporter/splunkhecexporter/go.sum | 8 ++-- exporter/stackdriverexporter/go.mod | 4 +- exporter/stackdriverexporter/go.sum | 8 ++-- exporter/sumologicexporter/go.mod | 4 +- exporter/sumologicexporter/go.sum | 8 ++-- exporter/tanzuobservabilityexporter/go.mod | 4 +- exporter/tanzuobservabilityexporter/go.sum | 8 ++-- exporter/zipkinexporter/go.mod | 4 +- exporter/zipkinexporter/go.sum | 8 ++-- extension/awsxrayproxy/go.mod | 4 +- extension/awsxrayproxy/go.sum | 8 ++-- extension/bearertokenauthextension/go.mod | 4 +- extension/bearertokenauthextension/go.sum | 8 ++-- extension/fluentbitextension/go.mod | 4 +- extension/fluentbitextension/go.sum | 8 ++-- extension/healthcheckextension/go.mod | 4 +- extension/healthcheckextension/go.sum | 8 ++-- extension/httpforwarder/extension_test.go | 2 +- extension/httpforwarder/go.mod | 4 +- extension/httpforwarder/go.sum | 8 ++-- extension/oauth2clientauthextension/go.mod | 4 +- extension/oauth2clientauthextension/go.sum | 8 ++-- extension/observer/dockerobserver/go.mod | 4 +- extension/observer/dockerobserver/go.sum | 8 ++-- extension/observer/ecsobserver/go.mod | 4 +- extension/observer/ecsobserver/go.sum | 8 ++-- extension/observer/hostobserver/go.mod | 4 +- extension/observer/hostobserver/go.sum | 8 ++-- extension/observer/k8sobserver/go.mod | 4 +- extension/observer/k8sobserver/go.sum | 8 ++-- extension/oidcauthextension/go.mod | 4 +- extension/oidcauthextension/go.sum | 8 ++-- extension/pprofextension/go.mod | 4 +- extension/pprofextension/go.sum | 8 ++-- extension/storage/go.mod | 4 +- extension/storage/go.sum | 8 ++-- go.mod | 8 ++-- go.sum | 16 ++++---- internal/aws/proxy/go.mod | 2 +- internal/aws/proxy/go.sum | 6 +-- internal/coreinternal/go.mod | 4 +- internal/coreinternal/go.sum | 8 ++-- .../coreinternal/goldendataset/metrics_gen.go | 4 +- internal/coreinternal/testdata/metric.go | 4 +- internal/kubelet/go.mod | 2 +- internal/kubelet/go.sum | 4 +- internal/splunk/go.mod | 4 +- internal/splunk/go.sum | 8 ++-- internal/stanza/go.mod | 4 +- internal/stanza/go.sum | 8 ++-- internal/tools/go.mod | 2 +- pkg/batchperresourceattr/go.mod | 4 +- pkg/batchperresourceattr/go.sum | 8 ++-- pkg/resourcetotelemetry/go.mod | 4 +- pkg/resourcetotelemetry/go.sum | 8 ++-- pkg/translator/jaeger/go.mod | 2 +- pkg/translator/jaeger/go.sum | 8 ++-- pkg/translator/opencensus/go.mod | 2 +- pkg/translator/opencensus/go.sum | 8 ++-- pkg/translator/opencensus/metrics_to_oc.go | 4 +- .../opencensus/metrics_to_oc_test.go | 16 ++++---- pkg/translator/opencensus/oc_to_metrics.go | 6 +-- pkg/translator/zipkin/go.mod | 2 +- pkg/translator/zipkin/go.sum | 8 ++-- processor/attributesprocessor/go.mod | 4 +- processor/attributesprocessor/go.sum | 8 ++-- processor/cumulativetodeltaprocessor/go.mod | 4 +- processor/cumulativetodeltaprocessor/go.sum | 8 ++-- .../cumulativetodeltaprocessor/processor.go | 4 +- .../processor_test.go | 4 +- processor/deltatorateprocessor/go.mod | 4 +- processor/deltatorateprocessor/go.sum | 8 ++-- processor/deltatorateprocessor/processor.go | 2 +- .../deltatorateprocessor/processor_test.go | 4 +- processor/filterprocessor/go.mod | 4 +- processor/filterprocessor/go.sum | 8 ++-- processor/groupbyattrsprocessor/go.mod | 4 +- processor/groupbyattrsprocessor/go.sum | 8 ++-- processor/groupbytraceprocessor/go.mod | 4 +- processor/groupbytraceprocessor/go.sum | 8 ++-- processor/k8sattributesprocessor/go.mod | 4 +- processor/k8sattributesprocessor/go.sum | 8 ++-- processor/metricsgenerationprocessor/go.mod | 4 +- processor/metricsgenerationprocessor/go.sum | 8 ++-- processor/metricstransformprocessor/go.mod | 4 +- processor/metricstransformprocessor/go.sum | 8 ++-- .../probabilisticsamplerprocessor/go.mod | 4 +- .../probabilisticsamplerprocessor/go.sum | 8 ++-- processor/resourcedetectionprocessor/go.mod | 4 +- processor/resourcedetectionprocessor/go.sum | 8 ++-- processor/resourceprocessor/go.mod | 4 +- processor/resourceprocessor/go.sum | 8 ++-- processor/routingprocessor/go.mod | 4 +- processor/routingprocessor/go.sum | 8 ++-- processor/spanmetricsprocessor/go.mod | 4 +- processor/spanmetricsprocessor/go.sum | 8 ++-- processor/spanmetricsprocessor/processor.go | 4 +- .../spanmetricsprocessor/processor_test.go | 4 +- processor/spanprocessor/go.mod | 4 +- processor/spanprocessor/go.sum | 8 ++-- processor/tailsamplingprocessor/go.mod | 4 +- processor/tailsamplingprocessor/go.sum | 8 ++-- receiver/awscontainerinsightreceiver/go.mod | 4 +- receiver/awscontainerinsightreceiver/go.sum | 8 ++-- .../awsecscontainermetricsreceiver/go.mod | 4 +- .../awsecscontainermetricsreceiver/go.sum | 8 ++-- .../awsecscontainermetrics/translator.go | 2 +- receiver/awsxrayreceiver/go.mod | 4 +- receiver/awsxrayreceiver/go.sum | 8 ++-- receiver/carbonreceiver/go.mod | 4 +- receiver/carbonreceiver/go.sum | 8 ++-- receiver/cloudfoundryreceiver/go.mod | 4 +- receiver/cloudfoundryreceiver/go.sum | 8 ++-- receiver/collectdreceiver/go.mod | 4 +- receiver/collectdreceiver/go.sum | 8 ++-- receiver/dockerstatsreceiver/go.mod | 4 +- receiver/dockerstatsreceiver/go.sum | 8 ++-- receiver/dockerstatsreceiver/metrics.go | 4 +- receiver/dockerstatsreceiver/metrics_test.go | 2 +- receiver/dotnetdiagnosticsreceiver/go.mod | 4 +- receiver/dotnetdiagnosticsreceiver/go.sum | 8 ++-- .../metrics/converter.go | 2 +- receiver/filelogreceiver/go.mod | 4 +- receiver/filelogreceiver/go.sum | 8 ++-- receiver/fluentforwardreceiver/go.mod | 4 +- receiver/fluentforwardreceiver/go.sum | 8 ++-- receiver/googlecloudpubsubreceiver/go.mod | 4 +- receiver/googlecloudpubsubreceiver/go.sum | 8 ++-- receiver/hostmetricsreceiver/go.mod | 4 +- receiver/hostmetricsreceiver/go.sum | 8 ++-- .../internal/metadata/generated_metrics.go | 2 +- .../internal/metadata/generated_metrics.go | 14 +++---- .../internal/metadata/generated_metrics.go | 4 +- .../internal/metadata/generated_metrics.go | 2 +- .../internal/metadata/generated_metrics.go | 10 ++--- .../internal/metadata/generated_metrics.go | 6 +-- .../internal/metadata/generated_metrics.go | 4 +- .../internal/metadata/generated_metrics.go | 8 ++-- receiver/influxdbreceiver/go.mod | 6 +-- receiver/influxdbreceiver/go.sum | 12 +++--- receiver/jaegerreceiver/go.mod | 4 +- receiver/jaegerreceiver/go.sum | 8 ++-- receiver/jaegerreceiver/jaeger_agent_test.go | 2 +- .../jaegerreceiver/trace_receiver_test.go | 2 +- receiver/jmxreceiver/go.mod | 4 +- receiver/jmxreceiver/go.sum | 8 ++-- receiver/k8sclusterreceiver/go.mod | 4 +- receiver/k8sclusterreceiver/go.sum | 8 ++-- receiver/kafkametricsreceiver/go.mod | 4 +- receiver/kafkametricsreceiver/go.sum | 8 ++-- receiver/kafkareceiver/go.mod | 4 +- receiver/kafkareceiver/go.sum | 8 ++-- receiver/kubeletstatsreceiver/go.mod | 4 +- receiver/kubeletstatsreceiver/go.sum | 8 ++-- receiver/memcachedreceiver/go.mod | 4 +- receiver/memcachedreceiver/go.sum | 8 ++-- .../internal/metadata/generated_metrics.go | 6 +-- receiver/mongodbatlasreceiver/go.mod | 4 +- receiver/mongodbatlasreceiver/go.sum | 8 ++-- receiver/nginxreceiver/go.mod | 4 +- receiver/nginxreceiver/go.sum | 8 ++-- .../internal/metadata/generated_metrics.go | 6 +-- receiver/nginxreceiver/scraper_test.go | 2 +- receiver/opencensusreceiver/go.mod | 4 +- receiver/opencensusreceiver/go.sum | 8 ++-- receiver/podmanreceiver/go.mod | 4 +- receiver/podmanreceiver/go.sum | 8 ++-- receiver/podmanreceiver/metrics.go | 2 +- receiver/prometheusexecreceiver/go.mod | 4 +- receiver/prometheusexecreceiver/go.sum | 8 ++-- receiver/prometheusreceiver/go.mod | 4 +- receiver/prometheusreceiver/go.sum | 8 ++-- receiver/receivercreator/go.mod | 4 +- receiver/receivercreator/go.sum | 8 ++-- receiver/redisreceiver/go.mod | 4 +- receiver/redisreceiver/go.sum | 8 ++-- receiver/redisreceiver/pdata.go | 4 +- receiver/sapmreceiver/go.mod | 4 +- receiver/sapmreceiver/go.sum | 8 ++-- receiver/scraperhelper/go.mod | 4 +- receiver/scraperhelper/go.sum | 8 ++-- receiver/signalfxreceiver/go.mod | 4 +- receiver/signalfxreceiver/go.sum | 8 ++-- receiver/signalfxreceiver/receiver_test.go | 4 +- .../signalfxv2_to_metricdata.go | 4 +- .../signalfxv2_to_metricdata_test.go | 6 +-- receiver/simpleprometheusreceiver/go.mod | 4 +- receiver/simpleprometheusreceiver/go.sum | 8 ++-- receiver/splunkhecreceiver/go.mod | 4 +- receiver/splunkhecreceiver/go.sum | 8 ++-- receiver/statsdreceiver/go.mod | 4 +- receiver/statsdreceiver/go.sum | 8 ++-- .../protocol/metric_translator.go | 4 +- .../protocol/metric_translator_test.go | 2 +- receiver/syslogreceiver/go.mod | 4 +- receiver/syslogreceiver/go.sum | 8 ++-- receiver/tcplogreceiver/go.mod | 4 +- receiver/tcplogreceiver/go.sum | 8 ++-- receiver/udplogreceiver/go.mod | 4 +- receiver/udplogreceiver/go.sum | 8 ++-- receiver/wavefrontreceiver/go.mod | 4 +- receiver/wavefrontreceiver/go.sum | 8 ++-- receiver/windowsperfcountersreceiver/go.mod | 4 +- receiver/windowsperfcountersreceiver/go.sum | 8 ++-- receiver/zipkinreceiver/go.mod | 4 +- receiver/zipkinreceiver/go.sum | 8 ++-- receiver/zookeeperreceiver/go.mod | 4 +- receiver/zookeeperreceiver/go.sum | 8 ++-- .../internal/metadata/generated_metrics.go | 6 +-- testbed/datasenders/jaeger.go | 2 +- testbed/datasenders/opencensus.go | 2 +- testbed/go.mod | 4 +- testbed/go.sum | 8 ++-- .../mockawsxrayreceiver/go.mod | 4 +- .../mockawsxrayreceiver/go.sum | 8 ++-- testbed/testbed/in_process_collector.go | 2 +- testbed/testbed/senders.go | 4 +- 323 files changed, 955 insertions(+), 954 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a707dbc4d45..b035749a6d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Rename `k8s_tagger` configuration `k8sattributes`. - filelog receiver: use empty value for `SeverityText` field instead of `"Undefined"` (#5423) - Rename `configparser.ConfigMap` to `config.Map` +- Rename `pdata.AggregationTemporality*` to `pdata.MetricAggregationTemporality*` ## v0.36.0 diff --git a/cmd/mdatagen/metricdata.go b/cmd/mdatagen/metricdata.go index 56894928592b..89333c65d4bf 100644 --- a/cmd/mdatagen/metricdata.go +++ b/cmd/mdatagen/metricdata.go @@ -78,11 +78,11 @@ type Aggregated struct { func (agg Aggregated) Type() string { switch agg.Aggregation { case "delta": - return "pdata.AggregationTemporalityDelta" + return "pdata.MetricAggregationTemporalityDelta" case "cumulative": - return "pdata.AggregationTemporalityCumulative" + return "pdata.MetricAggregationTemporalityCumulative" default: - return "pdata.AggregationTemporalityUnknown" + return "pdata.MetricAggregationTemporalityUnknown" } } diff --git a/cmd/mdatagen/metricdata_test.go b/cmd/mdatagen/metricdata_test.go index 2908f694dc15..3b2269b55baf 100644 --- a/cmd/mdatagen/metricdata_test.go +++ b/cmd/mdatagen/metricdata_test.go @@ -39,11 +39,11 @@ func TestMetricData(t *testing.T) { func TestAggregation(t *testing.T) { delta := Aggregated{Aggregation: "delta"} - assert.Equal(t, "pdata.AggregationTemporalityDelta", delta.Type()) + assert.Equal(t, "pdata.MetricAggregationTemporalityDelta", delta.Type()) cumulative := Aggregated{Aggregation: "cumulative"} - assert.Equal(t, "pdata.AggregationTemporalityCumulative", cumulative.Type()) + assert.Equal(t, "pdata.MetricAggregationTemporalityCumulative", cumulative.Type()) unknown := Aggregated{Aggregation: ""} - assert.Equal(t, "pdata.AggregationTemporalityUnknown", unknown.Type()) + assert.Equal(t, "pdata.MetricAggregationTemporalityUnknown", unknown.Type()) } diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index edf78e5ffffb..50a68bf27c0e 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 06d1378fa818..bbc4e826d453 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -516,11 +516,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index b69543170422..1ae1c8c38210 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/aws/aws-sdk-go v1.40.47 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/awscloudwatchlogsexporter/go.sum b/exporter/awscloudwatchlogsexporter/go.sum index e245f84b38b1..f4c8fe2dcbb1 100644 --- a/exporter/awscloudwatchlogsexporter/go.sum +++ b/exporter/awscloudwatchlogsexporter/go.sum @@ -379,11 +379,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/awsemfexporter/datapoint.go b/exporter/awsemfexporter/datapoint.go index cf1c5437601c..aabc68d5b703 100644 --- a/exporter/awsemfexporter/datapoint.go +++ b/exporter/awsemfexporter/datapoint.go @@ -238,7 +238,7 @@ func getDataPoints(pmd *pdata.Metric, metadata cWMetricMetadata, logger *zap.Log } case pdata.MetricDataTypeSum: metric := pmd.Sum() - adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pdata.AggregationTemporalityCumulative + adjusterMetadata.adjustToDelta = metric.AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative dps = numberDataPointSlice{ metadata.instrumentationLibraryName, adjusterMetadata, diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index 9cbec32d84a8..e1e10305b481 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -12,8 +12,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 032684dbdc73..055c77c07eea 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -398,11 +398,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index fc6a4c93ef84..db28ccaf30b7 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/golang/protobuf v1.5.2 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index 4d8a28aae9e8..e869abd1d101 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -984,11 +984,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/awsprometheusremotewriteexporter/auth_test.go b/exporter/awsprometheusremotewriteexporter/auth_test.go index 8f9e7304308c..2d1ec0a5bd32 100644 --- a/exporter/awsprometheusremotewriteexporter/auth_test.go +++ b/exporter/awsprometheusremotewriteexporter/auth_test.go @@ -56,7 +56,7 @@ func TestRequestSignature(t *testing.T) { setting := confighttp.HTTPClientSettings{ Endpoint: serverURL.String(), - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: &configtls.TLSClientSetting{}, ReadBufferSize: 0, WriteBufferSize: 0, Timeout: 0, @@ -102,7 +102,7 @@ func TestLeakingBody(t *testing.T) { setting := confighttp.HTTPClientSettings{ Endpoint: serverURL.String(), - TLSSetting: configtls.TLSClientSetting{}, + TLSSetting: &configtls.TLSClientSetting{}, ReadBufferSize: 0, WriteBufferSize: 0, Timeout: 0, diff --git a/exporter/awsprometheusremotewriteexporter/config_test.go b/exporter/awsprometheusremotewriteexporter/config_test.go index fc5388dbb044..2fea45b4751d 100644 --- a/exporter/awsprometheusremotewriteexporter/config_test.go +++ b/exporter/awsprometheusremotewriteexporter/config_test.go @@ -71,7 +71,7 @@ func TestLoadConfig(t *testing.T) { ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "https://aps-workspaces.us-east-1.amazonaws.com/workspaces/ws-XXX/api/v1/remote_write", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/var/lib/mycert.pem", }, diff --git a/exporter/awsprometheusremotewriteexporter/factory_test.go b/exporter/awsprometheusremotewriteexporter/factory_test.go index 5924ecd1b484..4c23fdf71cff 100644 --- a/exporter/awsprometheusremotewriteexporter/factory_test.go +++ b/exporter/awsprometheusremotewriteexporter/factory_test.go @@ -60,7 +60,7 @@ func TestCreateMetricsExporter(t *testing.T) { invalidConfig.HTTPClientSettings = confighttp.HTTPClientSettings{} invalidTLSConfig := af.CreateDefaultConfig().(*Config) - invalidTLSConfig.HTTPClientSettings.TLSSetting = configtls.TLSClientSetting{ + invalidTLSConfig.HTTPClientSettings.TLSSetting = &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "non-existent file", CertFile: "", diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index 76321b063d34..b4249fa4e317 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.40.47 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( @@ -34,7 +34,7 @@ require ( github.com/tidwall/tinylru v1.0.2 // indirect github.com/tidwall/wal v0.1.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 1e31f1b2c85c..b06213675a1f 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -983,11 +983,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index d7e96beab23e..c274613ec705 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.36.0 github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 84f0ad9ecc2d..debca2a026cc 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -381,11 +381,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 02aaa0b583d0..2044c1851ba0 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/microsoft/ApplicationInsights-Go v0.4.4 github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/net v0.0.0-20210614182718-04defd469f4e diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 75e5ce33c4d6..72a77220ce0c 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -389,11 +389,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 561e918fbd41..94a9032d2021 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index a2c820451243..5692eb670ce8 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 2587b840ec8c..162316b03c59 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -16,8 +16,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.5 // indirect github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 gopkg.in/DataDog/dd-trace-go.v1 v1.33.0 gopkg.in/zorkian/go-datadog-api.v2 v2.30.0 diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 5d60f6cc88db..259ab07a1bc8 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -453,11 +453,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/datadogexporter/internal/translator/metrics_translator.go b/exporter/datadogexporter/internal/translator/metrics_translator.go index 538ac2250d3e..20d8c36d8ce3 100644 --- a/exporter/datadogexporter/internal/translator/metrics_translator.go +++ b/exporter/datadogexporter/internal/translator/metrics_translator.go @@ -78,7 +78,7 @@ func getTags(labels pdata.AttributeMap) []string { func isCumulativeMonotonic(md pdata.Metric) bool { switch md.DataType() { case pdata.MetricDataTypeSum: - return md.Sum().AggregationTemporality() == pdata.AggregationTemporalityCumulative && + return md.Sum().AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative && md.Sum().IsMonotonic() } return false @@ -387,15 +387,15 @@ func (t *Translator) MapMetrics(md pdata.Metrics) (series []datadog.Metric, sl s datapoints = t.mapNumberMetrics(md.Name(), metrics.Gauge, md.Gauge().DataPoints(), attributeTags) case pdata.MetricDataTypeSum: switch md.Sum().AggregationTemporality() { - case pdata.AggregationTemporalityCumulative: + case pdata.MetricAggregationTemporalityCumulative: if t.cfg.SendMonotonic && isCumulativeMonotonic(md) { datapoints = t.mapNumberMonotonicMetrics(md.Name(), md.Sum().DataPoints(), attributeTags) } else { datapoints = t.mapNumberMetrics(md.Name(), metrics.Gauge, md.Sum().DataPoints(), attributeTags) } - case pdata.AggregationTemporalityDelta: + case pdata.MetricAggregationTemporalityDelta: datapoints = t.mapNumberMetrics(md.Name(), metrics.Count, md.Sum().DataPoints(), attributeTags) - default: // pdata.AggregationTemporalityUnspecified or any other not supported type + default: // pdata.MetricAggregationTemporalityUnspecified or any other not supported type t.logger.Debug("Unknown or unsupported aggregation temporality", zap.String(metricName, md.Name()), zap.Any("aggregation temporality", md.Sum().AggregationTemporality()), @@ -404,10 +404,10 @@ func (t *Translator) MapMetrics(md pdata.Metrics) (series []datadog.Metric, sl s } case pdata.MetricDataTypeHistogram: switch md.Histogram().AggregationTemporality() { - case pdata.AggregationTemporalityCumulative, pdata.AggregationTemporalityDelta: - delta := md.Histogram().AggregationTemporality() == pdata.AggregationTemporalityDelta + case pdata.MetricAggregationTemporalityCumulative, pdata.MetricAggregationTemporalityDelta: + delta := md.Histogram().AggregationTemporality() == pdata.MetricAggregationTemporalityDelta datapoints, sketchesPoints = t.mapHistogramMetrics(md.Name(), md.Histogram().DataPoints(), delta, attributeTags) - default: // pdata.AggregationTemporalityUnspecified or any other not supported type + default: // pdata.MetricAggregationTemporalityUnspecified or any other not supported type t.logger.Debug("Unknown or unsupported aggregation temporality", zap.String("metric name", md.Name()), zap.Any("aggregation temporality", md.Histogram().AggregationTemporality()), diff --git a/exporter/datadogexporter/internal/translator/metrics_translator_test.go b/exporter/datadogexporter/internal/translator/metrics_translator_test.go index d2e798fb37a7..bbf22e9ce3af 100644 --- a/exporter/datadogexporter/internal/translator/metrics_translator_test.go +++ b/exporter/datadogexporter/internal/translator/metrics_translator_test.go @@ -84,7 +84,7 @@ func TestIsCumulativeMonotonic(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(false) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) assert.False(t, isCumulativeMonotonic(metric)) } @@ -97,7 +97,7 @@ func TestIsCumulativeMonotonic(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) assert.True(t, isCumulativeMonotonic(metric)) } @@ -108,7 +108,7 @@ func TestIsCumulativeMonotonic(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) assert.True(t, isCumulativeMonotonic(metric)) } @@ -745,13 +745,13 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("unspecified.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityUnspecified) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityUnspecified) // Int Sum (delta) met = metricsArray.AppendEmpty() met.SetName("int.delta.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsInt = met.Sum().DataPoints() dpInt = dpsInt.AppendEmpty() dpInt.SetTimestamp(seconds(0)) @@ -761,7 +761,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("double.delta.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDouble = met.Sum().DataPoints() dpDouble = dpsDouble.AppendEmpty() dpDouble.SetTimestamp(seconds(0)) @@ -771,7 +771,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("int.delta.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsInt = met.Sum().DataPoints() dpInt = dpsInt.AppendEmpty() dpInt.SetTimestamp(seconds(0)) @@ -781,7 +781,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("double.delta.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDouble = met.Sum().DataPoints() dpDouble = dpsDouble.AppendEmpty() dpDouble.SetTimestamp(seconds(0)) @@ -791,13 +791,13 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("unspecified.histogram") met.SetDataType(pdata.MetricDataTypeHistogram) - met.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityUnspecified) + met.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityUnspecified) // Histogram (delta) met = metricsArray.AppendEmpty() met.SetName("double.histogram") met.SetDataType(pdata.MetricDataTypeHistogram) - met.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDoubleHist := met.Histogram().DataPoints() dpDoubleHist := dpsDoubleHist.AppendEmpty() dpDoubleHist.SetCount(20) @@ -810,7 +810,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("int.cumulative.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dpsInt = met.Sum().DataPoints() dpsInt.EnsureCapacity(2) dpInt = dpsInt.AppendEmpty() @@ -821,7 +821,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("double.cumulative.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dpsDouble = met.Sum().DataPoints() dpsDouble.EnsureCapacity(2) dpDouble = dpsDouble.AppendEmpty() @@ -832,7 +832,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("int.cumulative.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) met.Sum().SetIsMonotonic(true) dpsInt = met.Sum().DataPoints() dpsInt.EnsureCapacity(2) @@ -847,7 +847,7 @@ func createTestMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("double.cumulative.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) met.Sum().SetIsMonotonic(true) dpsDouble = met.Sum().DataPoints() dpsDouble.EnsureCapacity(2) @@ -952,7 +952,7 @@ func createNaNMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("nan.delta.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDouble = met.Sum().DataPoints() dpDouble = dpsDouble.AppendEmpty() dpDouble.SetTimestamp(seconds(0)) @@ -962,7 +962,7 @@ func createNaNMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("nan.delta.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDouble = met.Sum().DataPoints() dpDouble = dpsDouble.AppendEmpty() dpDouble.SetTimestamp(seconds(0)) @@ -972,7 +972,7 @@ func createNaNMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("nan.histogram") met.SetDataType(pdata.MetricDataTypeHistogram) - met.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + met.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dpsDoubleHist := met.Histogram().DataPoints() dpDoubleHist := dpsDoubleHist.AppendEmpty() dpDoubleHist.SetCount(20) @@ -984,7 +984,7 @@ func createNaNMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("nan.cumulative.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dpsDouble = met.Sum().DataPoints() dpsDouble.EnsureCapacity(2) dpDouble = dpsDouble.AppendEmpty() @@ -995,7 +995,7 @@ func createNaNMetrics() pdata.Metrics { met = metricsArray.AppendEmpty() met.SetName("nan.cumulative.monotonic.sum") met.SetDataType(pdata.MetricDataTypeSum) - met.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + met.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) met.Sum().SetIsMonotonic(true) dpsDouble = met.Sum().DataPoints() dpsDouble.EnsureCapacity(2) diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index db27a5d2cc98..14a9d6831bff 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 70be2a51eb94..49583af138f4 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -413,11 +413,11 @@ 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.36.0/go.mod h1:w/nWBmMpwBF1Lk3o7XYuT7m369ByBKCQs1cVSFN+X78= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.23.0 h1:MgRuo0JZZX8J9WLRjyd7OpTSbaLOdQXXJa6SnZvlWLM= go.opentelemetry.io/contrib v0.23.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.23.0/go.mod h1:RlEDuaJ0wF4rNG/GOd8zknRW44rKISkcdsp46kt+FcA= diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index 46df9052f5eb..bb1c6b5c78b2 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -116,7 +116,7 @@ func Test_exporter_PushMetricsData(t *testing.T) { doubleHistogramDataPoint.SetExplicitBounds([]float64{0, 2, 4, 8}) doubleHistogramDataPoint.SetBucketCounts([]uint64{0, 1, 0, 1, 0}) doubleHistogramDataPoint.SetTimestamp(testTimestamp) - doubleHistogram.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + doubleHistogram.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) type fields struct { logger *zap.Logger @@ -472,7 +472,7 @@ func Test_exporter_start_InvalidHTTPClientSettings(t *testing.T) { config := &config.Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/non/existent", }, diff --git a/exporter/dynatraceexporter/serialization/histogram.go b/exporter/dynatraceexporter/serialization/histogram.go index 665168ba7e40..69a415030834 100644 --- a/exporter/dynatraceexporter/serialization/histogram.go +++ b/exporter/dynatraceexporter/serialization/histogram.go @@ -22,8 +22,8 @@ import ( "go.opentelemetry.io/collector/model/pdata" ) -func serializeHistogram(name, prefix string, dims dimensions.NormalizedDimensionList, t pdata.AggregationTemporality, dp pdata.HistogramDataPoint) (string, error) { - if t == pdata.AggregationTemporalityCumulative { +func serializeHistogram(name, prefix string, dims dimensions.NormalizedDimensionList, t pdata.MetricAggregationTemporality, dp pdata.HistogramDataPoint) (string, error) { + if t == pdata.MetricAggregationTemporalityCumulative { // convert to delta histogram // skip first point because there is nothing to calculate a delta from // what if bucket bounds change diff --git a/exporter/dynatraceexporter/serialization/histogram_test.go b/exporter/dynatraceexporter/serialization/histogram_test.go index 394cd6dbeef9..6e62b86f9a9a 100644 --- a/exporter/dynatraceexporter/serialization/histogram_test.go +++ b/exporter/dynatraceexporter/serialization/histogram_test.go @@ -39,19 +39,19 @@ func Test_serializeHistogram(t *testing.T) { histWithNonEmptyFirstLast.SetTimestamp(pdata.Timestamp(time.Date(2021, 07, 16, 12, 30, 0, 0, time.UTC).UnixNano())) t.Run("delta with prefix and dimension", func(t *testing.T) { - got, err := serializeHistogram("delta_hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityDelta, hist) + got, err := serializeHistogram("delta_hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityDelta, hist) assert.NoError(t, err) assert.Equal(t, "prefix.delta_hist,key=value gauge,min=0,max=8,sum=9.5,count=2 1626438600000", got) }) t.Run("delta with non-empty first and last bucket", func(t *testing.T) { - got, err := serializeHistogram("delta_nonempty_first_last_hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityDelta, histWithNonEmptyFirstLast) + got, err := serializeHistogram("delta_nonempty_first_last_hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityDelta, histWithNonEmptyFirstLast) assert.NoError(t, err) assert.Equal(t, "prefix.delta_nonempty_first_last_hist,key=value gauge,min=0,max=8,sum=9.5,count=3 1626438600000", got) }) t.Run("cumulative with prefix and dimension", func(t *testing.T) { - got, err := serializeHistogram("hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, hist) + got, err := serializeHistogram("hist", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, hist) assert.Error(t, err) assert.Equal(t, "", got) }) diff --git a/exporter/dynatraceexporter/serialization/sum.go b/exporter/dynatraceexporter/serialization/sum.go index dfcea435cf1d..9a6fcebe86e5 100644 --- a/exporter/dynatraceexporter/serialization/sum.go +++ b/exporter/dynatraceexporter/serialization/sum.go @@ -24,14 +24,14 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/internal/common/ttlmap" ) -func serializeSum(name, prefix string, dims dimensions.NormalizedDimensionList, t pdata.AggregationTemporality, dp pdata.NumberDataPoint, prev *ttlmap.TTLMap) (string, error) { +func serializeSum(name, prefix string, dims dimensions.NormalizedDimensionList, t pdata.MetricAggregationTemporality, dp pdata.NumberDataPoint, prev *ttlmap.TTLMap) (string, error) { switch t { - case pdata.AggregationTemporalityCumulative: + case pdata.MetricAggregationTemporalityCumulative: return serializeCumulativeCounter(name, prefix, dims, dp, prev) // for now unspecified is treated as delta - case pdata.AggregationTemporalityUnspecified: + case pdata.MetricAggregationTemporalityUnspecified: fallthrough - case pdata.AggregationTemporalityDelta: + case pdata.MetricAggregationTemporalityDelta: return serializeDeltaCounter(name, prefix, dims, dp) } diff --git a/exporter/dynatraceexporter/serialization/sum_test.go b/exporter/dynatraceexporter/serialization/sum_test.go index 69d0396f16a1..a3dcd780a416 100644 --- a/exporter/dynatraceexporter/serialization/sum_test.go +++ b/exporter/dynatraceexporter/serialization/sum_test.go @@ -30,7 +30,7 @@ func Test_serializeSum(t *testing.T) { dp := pdata.NewNumberDataPoint() dp.SetIntVal(5) - got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(), pdata.AggregationTemporalityDelta, dp, ttlmap.New(1, 1)) + got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(), pdata.MetricAggregationTemporalityDelta, dp, ttlmap.New(1, 1)) assert.NoError(t, err) assert.Equal(t, "prefix.int_sum count,delta=5", got) }) @@ -42,7 +42,7 @@ func Test_serializeSum(t *testing.T) { prev := ttlmap.New(1, 1) - got, err := serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityDelta, dp, prev) + got, err := serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityDelta, dp, prev) assert.NoError(t, err) assert.Equal(t, "prefix.double_sum,key=value count,delta=5.5 1626438600000", got) }) @@ -52,7 +52,7 @@ func Test_serializeSum(t *testing.T) { dp.SetIntVal(5) dp.SetTimestamp(pdata.Timestamp(time.Date(2021, 07, 16, 12, 30, 0, 0, time.UTC).UnixNano())) - got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityDelta, dp, ttlmap.New(1, 1)) + got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityDelta, dp, ttlmap.New(1, 1)) assert.NoError(t, err) assert.Equal(t, "prefix.int_sum,key=value count,delta=5 1626438600000", got) }) @@ -68,11 +68,11 @@ func Test_serializeSum(t *testing.T) { prev := ttlmap.New(1, 1) - got, err := serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp, prev) + got, err := serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp, prev) assert.NoError(t, err) assert.Equal(t, "", got) - got, err = serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp2, prev) + got, err = serializeSum("double_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp2, prev) assert.NoError(t, err) assert.Equal(t, "prefix.double_sum,key=value count,delta=1.5 1626438660000", got) }) @@ -88,11 +88,11 @@ func Test_serializeSum(t *testing.T) { prev := ttlmap.New(1, 1) - got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp, prev) + got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp, prev) assert.NoError(t, err) assert.Equal(t, "", got) - got, err = serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp2, prev) + got, err = serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp2, prev) assert.NoError(t, err) assert.Equal(t, "prefix.int_sum,key=value count,delta=5 1626438660000", got) }) @@ -124,10 +124,10 @@ func Test_serializeSum(t *testing.T) { prev := ttlmap.New(1, 1) - got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "a")), pdata.AggregationTemporalityCumulative, dp, prev) - got2, err2 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "b")), pdata.AggregationTemporalityCumulative, dp2, prev) - got3, err3 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "a")), pdata.AggregationTemporalityCumulative, dp3, prev) - got4, err4 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "b")), pdata.AggregationTemporalityCumulative, dp4, prev) + got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "a")), pdata.MetricAggregationTemporalityCumulative, dp, prev) + got2, err2 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "b")), pdata.MetricAggregationTemporalityCumulative, dp2, prev) + got3, err3 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "a")), pdata.MetricAggregationTemporalityCumulative, dp3, prev) + got4, err4 := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "b")), pdata.MetricAggregationTemporalityCumulative, dp4, prev) assert.NoError(t, err) assert.NoError(t, err2) @@ -150,13 +150,13 @@ func Test_serializeSum(t *testing.T) { prev := ttlmap.New(1, 1) - got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp, prev) + got, err := serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp, prev) assert.NoError(t, err) assert.Equal(t, "", got) assert.Equal(t, dp, prev.Get("int_sum")) - got, err = serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.AggregationTemporalityCumulative, dp2, prev) + got, err = serializeSum("int_sum", "prefix", dimensions.NewNormalizedDimensionList(dimensions.NewDimension("key", "value")), pdata.MetricAggregationTemporalityCumulative, dp2, prev) assert.NoError(t, err) assert.Equal(t, "", got) diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index db8e98a7b825..0cbd6575325d 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.13.1 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 8e43ccf9dd54..1d95f504d63a 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -394,11 +394,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index f48b7a290820..02244ad617fb 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/elastic/go-elasticsearch/v7 v7.14.0 github.com/elastic/go-structform v0.0.9 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 5e7164780374..91202aa28d03 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -377,11 +377,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 5c7051783b80..41753da55f7c 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f google.golang.org/api v0.57.0 @@ -29,7 +29,7 @@ require ( github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect go.opentelemetry.io/otel v1.0.0 // indirect diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 7994f845612c..2a692a6301cb 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -406,11 +406,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/exporter/fileexporter/go.mod b/exporter/fileexporter/go.mod index 6e7dc126f853..6d88428aebe3 100644 --- a/exporter/fileexporter/go.mod +++ b/exporter/fileexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/exporter/fileexporter/go.sum b/exporter/fileexporter/go.sum index f079ef4abcca..0bfbd172afd9 100644 --- a/exporter/fileexporter/go.sum +++ b/exporter/fileexporter/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index 6ac2c8fbc443..22f40eaf08d5 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.opentelemetry.io/otel v1.0.0 go.opentelemetry.io/otel/sdk v1.0.0 go.opentelemetry.io/otel/trace v1.0.0 diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index f7d5406ca944..67822d46e1bd 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -429,11 +429,11 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/exporter/googlecloudpubsubexporter/go.mod b/exporter/googlecloudpubsubexporter/go.mod index 78b93e20b9dc..e01ed1ea9294 100644 --- a/exporter/googlecloudpubsubexporter/go.mod +++ b/exporter/googlecloudpubsubexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/googlecloudpubsubexporter/go.sum b/exporter/googlecloudpubsubexporter/go.sum index 4e86b584637b..497006df5370 100644 --- a/exporter/googlecloudpubsubexporter/go.sum +++ b/exporter/googlecloudpubsubexporter/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index ee23ef247576..acb5455b5c1a 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/honeycombio/libhoney-go v1.15.4 github.com/klauspost/compress v1.13.6 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 ) diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index 2a98c64e24d9..ba79dc7c59e2 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -397,11 +397,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/humioexporter/config_test.go b/exporter/humioexporter/config_test.go index 02d495f700af..2d2b38ccc5fa 100644 --- a/exporter/humioexporter/config_test.go +++ b/exporter/humioexporter/config_test.go @@ -115,7 +115,7 @@ func TestLoadAllSettings(t *testing.T) { Timeout: 10 * time.Second, ReadBufferSize: 4096, WriteBufferSize: 4096, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: false, InsecureSkipVerify: false, ServerName: "", diff --git a/exporter/humioexporter/factory_test.go b/exporter/humioexporter/factory_test.go index 163ccffc3bc3..baaaf27161c2 100644 --- a/exporter/humioexporter/factory_test.go +++ b/exporter/humioexporter/factory_test.go @@ -89,7 +89,7 @@ func TestCreateTracesExporter(t *testing.T) { Tag: TagNone, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://localhost:8080", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CertFile: "", KeyFile: "key.key", diff --git a/exporter/humioexporter/go.mod b/exporter/humioexporter/go.mod index 3919d7134f35..3f187b4ea524 100644 --- a/exporter/humioexporter/go.mod +++ b/exporter/humioexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/humioexporter/go.sum b/exporter/humioexporter/go.sum index 0efc02abb2fd..bd9e80f914df 100644 --- a/exporter/humioexporter/go.sum +++ b/exporter/humioexporter/go.sum @@ -375,11 +375,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/influxdbexporter/go.mod b/exporter/influxdbexporter/go.mod index e74f1fdb5837..d037d7a7a51e 100644 --- a/exporter/influxdbexporter/go.mod +++ b/exporter/influxdbexporter/go.mod @@ -4,11 +4,11 @@ go 1.17 require ( github.com/influxdata/influxdb-observability/common v0.2.7 - github.com/influxdata/influxdb-observability/otel2influx v0.2.7 + github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/influxdbexporter/go.sum b/exporter/influxdbexporter/go.sum index 61c1c94ce6a8..dba8904a9cf8 100644 --- a/exporter/influxdbexporter/go.sum +++ b/exporter/influxdbexporter/go.sum @@ -229,8 +229,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb-observability/common v0.2.7 h1:C+oDh8Kbw+Ykx9yog/uJXL27rwMN3hgTLQfAFg1eQO0= github.com/influxdata/influxdb-observability/common v0.2.7/go.mod h1:+8VMGrfWZnXjc1c/oP+N4O/sHoneWgN3ojAHwgYgV4A= -github.com/influxdata/influxdb-observability/otel2influx v0.2.7 h1:FACov3tcGCKfEGXsyUbgUOQx3zXffXaCFbN3ntAzh1E= -github.com/influxdata/influxdb-observability/otel2influx v0.2.7/go.mod h1:tE3OSy4RyAHIjxYlFZBsWorEM3aqaUeqSx3mbacm8KI= +github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a h1:YUrcmqUgG8ZLenYQEcwEniVZIHRcxU9PLH7WSQDzWGA= +github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a/go.mod h1:vk9y2BdPA6ifcQO+8Qfp0r21wVXHtRLdoiMLytW0cZk= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184 h1:modYba1g1we+YJf0yGTwmohVWVAxcAch18nPg3e24OY= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184/go.mod h1:03nmhxzZ7Xk2pdG+lmMd7mHDfeVOYFyhOgwO61qWU98= github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod h1:6+9Xt5Sq1rWx+glMgxhcg2c0DUaehK+5TDcPZ76GypY= @@ -389,12 +389,12 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/jaegerexporter/exporter_test.go b/exporter/jaegerexporter/exporter_test.go index 1059ad86cbaf..e4a52f7ba9c7 100644 --- a/exporter/jaegerexporter/exporter_test.go +++ b/exporter/jaegerexporter/exporter_test.go @@ -53,7 +53,7 @@ func TestNew(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, Keepalive: nil, @@ -92,7 +92,7 @@ func TestNew(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "testdata/test_cert.pem", }, @@ -110,7 +110,7 @@ func TestNew(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "testdata/test_cert.pem", }, @@ -133,7 +133,7 @@ func TestNew(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "testdata/test_cert_missing.pem", }, @@ -212,7 +212,7 @@ func TestMutualTLS(t *testing.T) { cfg.QueueSettings.Enabled = false cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: serverAddr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: caPath, CertFile: clientCertPath, @@ -264,7 +264,7 @@ func TestConnectionStateChange(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, Keepalive: nil, @@ -316,7 +316,7 @@ func TestConnectionReporterEndsOnStopped(t *testing.T) { Headers: nil, Endpoint: "foo.bar", Compression: "", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, Keepalive: nil, diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 66373d290e81..9d366b465dec 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) diff --git a/exporter/jaegerexporter/go.sum b/exporter/jaegerexporter/go.sum index 33ab774343fe..9ba6c4b4cbd9 100644 --- a/exporter/jaegerexporter/go.sum +++ b/exporter/jaegerexporter/go.sum @@ -982,11 +982,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 7ae16a1b86f9..b0c751ba52d2 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/stretchr/testify v1.7.0 github.com/xdg-go/scram v1.0.2 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/kafkaexporter/go.sum b/exporter/kafkaexporter/go.sum index dd311a6bbadc..3617a087bd13 100644 --- a/exporter/kafkaexporter/go.sum +++ b/exporter/kafkaexporter/go.sum @@ -1001,11 +1001,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index df426ec64406..fe90600458e3 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 6b1e34d4fcea..50f0a3baba98 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -378,12 +378,12 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 9f1a44d40d75..472185e15492 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/logzio/jaeger-logzio v1.0.3 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 10b167078ca8..251c920a457f 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -1036,11 +1036,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index 956f10bd9b62..5b03f170cbfd 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -52,7 +52,7 @@ func TestLoadConfig(t *testing.T) { "X-Custom-Header": "loki_rocks", }, Endpoint: "https://loki:3100/loki/api/v1/push", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/var/lib/mycert.pem", CertFile: "certfile", diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 398d0cf2ef54..3f57974ab851 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/prometheus/common v0.31.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index a556776a7516..f021267ff486 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -971,11 +971,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index 92bbfe5dc9d4..d8cdfb53eb66 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 google.golang.org/grpc v1.41.0 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index b56b05bbd059..d84284691917 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -392,11 +392,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/newrelicexporter/metrics.go b/exporter/newrelicexporter/metrics.go index 086164bb6e45..0f56d9893674 100644 --- a/exporter/newrelicexporter/metrics.go +++ b/exporter/newrelicexporter/metrics.go @@ -97,7 +97,7 @@ func buildView(tagKeys []tag.Key, m stats.Measure, a *view.Aggregation) *view.Vi type metricStatsKey struct { MetricType pdata.MetricDataType - MetricTemporality pdata.AggregationTemporality + MetricTemporality pdata.MetricAggregationTemporality } type spanStatsKey struct { diff --git a/exporter/newrelicexporter/metrics_test.go b/exporter/newrelicexporter/metrics_test.go index af8a1b6be3eb..d223a8cefd4a 100644 --- a/exporter/newrelicexporter/metrics_test.go +++ b/exporter/newrelicexporter/metrics_test.go @@ -145,10 +145,10 @@ func TestRecordMetricMetadata(t *testing.T) { dataOutputCount: 20, externalDuration: 50, metricMetadataCount: map[metricStatsKey]int{ - {MetricType: pdata.MetricDataTypeSummary}: 1, - {MetricType: pdata.MetricDataTypeHistogram}: 1, - {MetricType: pdata.MetricDataTypeSum, MetricTemporality: pdata.AggregationTemporalityDelta}: 2, - {MetricType: pdata.MetricDataTypeSum, MetricTemporality: pdata.AggregationTemporalityCumulative}: 3, + {MetricType: pdata.MetricDataTypeSummary}: 1, + {MetricType: pdata.MetricDataTypeHistogram}: 1, + {MetricType: pdata.MetricDataTypeSum, MetricTemporality: pdata.MetricAggregationTemporalityDelta}: 2, + {MetricType: pdata.MetricDataTypeSum, MetricTemporality: pdata.MetricAggregationTemporalityCumulative}: 3, }, } diff --git a/exporter/newrelicexporter/transformer.go b/exporter/newrelicexporter/transformer.go index 292f7ee159cb..ac960325146a 100644 --- a/exporter/newrelicexporter/transformer.go +++ b/exporter/newrelicexporter/transformer.go @@ -312,7 +312,7 @@ func (t *transformer) Metric(m pdata.Metric) ([]telemetry.Metric, error) { val = float64(point.IntVal()) } - if temporality != pdata.AggregationTemporalityDelta { + if temporality != pdata.MetricAggregationTemporalityDelta { t.logger.Debug("Converting metric to gauge where AggregationTemporality != Delta", zap.String("MetricName", m.Name()), zap.Stringer("Temporality", temporality), diff --git a/exporter/newrelicexporter/transformer_test.go b/exporter/newrelicexporter/transformer_test.go index acbb166b49f6..a6b4883fbd14 100644 --- a/exporter/newrelicexporter/transformer_test.go +++ b/exporter/newrelicexporter/transformer_test.go @@ -617,7 +617,7 @@ func TestTransformSum(t *testing.T) { m.SetUnit("1") m.SetDataType(pdata.MetricDataTypeSum) d := m.Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dp := d.DataPoints().AppendEmpty() dp.SetStartTimestamp(start) dp.SetTimestamp(end) @@ -631,7 +631,7 @@ func TestTransformSum(t *testing.T) { m.SetUnit("1") m.SetDataType(pdata.MetricDataTypeSum) d := m.Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := d.DataPoints().AppendEmpty() dp.SetStartTimestamp(start) dp.SetTimestamp(end) @@ -645,7 +645,7 @@ func TestTransformSum(t *testing.T) { m.SetUnit("1") m.SetDataType(pdata.MetricDataTypeSum) d := m.Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dp := d.DataPoints().AppendEmpty() dp.SetStartTimestamp(start) dp.SetTimestamp(end) @@ -659,7 +659,7 @@ func TestTransformSum(t *testing.T) { m.SetUnit("1") m.SetDataType(pdata.MetricDataTypeSum) d := m.Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := d.DataPoints().AppendEmpty() dp.SetStartTimestamp(start) dp.SetTimestamp(end) @@ -767,7 +767,7 @@ func TestUnsupportedMetricTypes(t *testing.T) { dp.SetSum(8.0) dp.SetExplicitBounds([]float64{3, 7, 11}) dp.SetBucketCounts([]uint64{1, 1, 0, 0}) - h.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + h.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) t.Run("DoubleHistogram", func(t *testing.T) { testTransformMetricWithError(t, m, consumererror.Permanent(&errUnsupportedMetricType{})) diff --git a/exporter/observiqexporter/client_test.go b/exporter/observiqexporter/client_test.go index d968500eaf1f..53c41165d1d8 100644 --- a/exporter/observiqexporter/client_test.go +++ b/exporter/observiqexporter/client_test.go @@ -79,7 +79,7 @@ func newTestClient(config *Config, httpClient *http.Client) *client { client: httpClient, logger: zap.NewNop(), config: config, - buildVersion: component.DefaultBuildInfo().Version, + buildVersion: component.NewDefaultBuildInfo().Version, } } diff --git a/exporter/observiqexporter/converter_test.go b/exporter/observiqexporter/converter_test.go index 3ee1bce58650..f60bbd15e458 100644 --- a/exporter/observiqexporter/converter_test.go +++ b/exporter/observiqexporter/converter_test.go @@ -322,7 +322,7 @@ func TestLogdataToObservIQFormat(t *testing.T) { logs, testCase.agentID, testCase.agentName, - component.DefaultBuildInfo().Version) + component.NewDefaultBuildInfo().Version) if testCase.expectErr { require.NotEmpty(t, errs) diff --git a/exporter/observiqexporter/go.mod b/exporter/observiqexporter/go.mod index 297654ece7d1..6ed4f103dbe9 100644 --- a/exporter/observiqexporter/go.mod +++ b/exporter/observiqexporter/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/observiqexporter/go.sum b/exporter/observiqexporter/go.sum index 0b741e76e495..682336e9a02c 100644 --- a/exporter/observiqexporter/go.sum +++ b/exporter/observiqexporter/go.sum @@ -374,11 +374,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 7be68681852e..8f5e103bb831 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -66,7 +66,7 @@ func TestLoadConfig(t *testing.T) { }, Endpoint: "1.2.3.4:1234", Compression: "on", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/var/lib/mycert.pem", }, diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index f5e62a8c8f33..3e7fcd903202 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -62,7 +62,7 @@ func TestCreateTracesExporter(t *testing.T) { ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: false, }, }, @@ -76,7 +76,7 @@ func TestCreateTracesExporter(t *testing.T) { ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: false, }, }, @@ -142,7 +142,7 @@ func TestCreateTracesExporter(t *testing.T) { ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "testdata/test_cert.pem", }, @@ -157,7 +157,7 @@ func TestCreateTracesExporter(t *testing.T) { ExporterSettings: config.NewExporterSettings(config.NewID(typeStr)), GRPCClientSettings: configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "nosuchfile", }, diff --git a/exporter/opencensusexporter/go.mod b/exporter/opencensusexporter/go.mod index cc706d7a5914..09b1bf65f1f0 100644 --- a/exporter/opencensusexporter/go.mod +++ b/exporter/opencensusexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/grpc v1.41.0 ) diff --git a/exporter/opencensusexporter/go.sum b/exporter/opencensusexporter/go.sum index 0353c1a6b0be..fce4d6974a76 100644 --- a/exporter/opencensusexporter/go.sum +++ b/exporter/opencensusexporter/go.sum @@ -394,11 +394,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/opencensusexporter/opencensus_test.go b/exporter/opencensusexporter/opencensus_test.go index 80a648162424..7f6222b924f8 100644 --- a/exporter/opencensusexporter/opencensus_test.go +++ b/exporter/opencensusexporter/opencensus_test.go @@ -49,7 +49,7 @@ func TestSendTraces(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } @@ -90,7 +90,7 @@ func TestSendTraces_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } @@ -114,7 +114,7 @@ func TestSendTraces_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } @@ -147,7 +147,7 @@ func TestSendMetrics(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: endpoint, - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } @@ -187,7 +187,7 @@ func TestSendMetrics_NoBackend(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } @@ -211,7 +211,7 @@ func TestSendMetrics_AfterStop(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.GRPCClientSettings = configgrpc.GRPCClientSettings{ Endpoint: "localhost:56569", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, } diff --git a/exporter/prometheusexporter/accumulator.go b/exporter/prometheusexporter/accumulator.go index f78a91b447fa..1f6bf5f73128 100644 --- a/exporter/prometheusexporter/accumulator.go +++ b/exporter/prometheusexporter/accumulator.go @@ -158,7 +158,7 @@ func (a *lastValueAccumulator) accumulateSum(metric pdata.Metric, il pdata.Instr doubleSum := metric.Sum() // Drop metrics with non-cumulative aggregations - if doubleSum.AggregationTemporality() != pdata.AggregationTemporalityCumulative { + if doubleSum.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative { return } @@ -172,7 +172,7 @@ func (a *lastValueAccumulator) accumulateSum(metric pdata.Metric, il pdata.Instr if !ok { m := createMetric(metric) m.Sum().SetIsMonotonic(metric.Sum().IsMonotonic()) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) ip.CopyTo(m.Sum().DataPoints().AppendEmpty()) a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now}) n++ @@ -187,7 +187,7 @@ func (a *lastValueAccumulator) accumulateSum(metric pdata.Metric, il pdata.Instr m := createMetric(metric) m.Sum().SetIsMonotonic(metric.Sum().IsMonotonic()) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) ip.CopyTo(m.Sum().DataPoints().AppendEmpty()) a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now}) n++ @@ -199,7 +199,7 @@ func (a *lastValueAccumulator) accumulateDoubleHistogram(metric pdata.Metric, il doubleHistogram := metric.Histogram() // Drop metrics with non-cumulative aggregations - if doubleHistogram.AggregationTemporality() != pdata.AggregationTemporalityCumulative { + if doubleHistogram.AggregationTemporality() != pdata.MetricAggregationTemporalityCumulative { return } @@ -226,7 +226,7 @@ func (a *lastValueAccumulator) accumulateDoubleHistogram(metric pdata.Metric, il m := createMetric(metric) ip.CopyTo(m.Histogram().DataPoints().AppendEmpty()) - m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) a.registeredMetrics.Store(signature, &accumulatedValue{value: m, instrumentationLibrary: il, updated: now}) n++ } diff --git a/exporter/prometheusexporter/accumulator_test.go b/exporter/prometheusexporter/accumulator_test.go index f615bc8defcd..e704a80acd92 100644 --- a/exporter/prometheusexporter/accumulator_test.go +++ b/exporter/prometheusexporter/accumulator_test.go @@ -42,7 +42,7 @@ func TestAccumulateDeltaAggregation(t *testing.T) { fillMetric: func(ts time.Time, metric pdata.Metric) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(42) dp.Attributes().InsertString("label_1", "1") @@ -55,7 +55,7 @@ func TestAccumulateDeltaAggregation(t *testing.T) { fillMetric: func(ts time.Time, metric pdata.Metric) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(42.42) dp.Attributes().InsertString("label_1", "1") @@ -68,7 +68,7 @@ func TestAccumulateDeltaAggregation(t *testing.T) { fillMetric: func(ts time.Time, metric pdata.Metric) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeHistogram) - metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) metric.SetDescription("test description") dp := metric.Histogram().DataPoints().AppendEmpty() dp.SetBucketCounts([]uint64{5, 2}) @@ -142,7 +142,7 @@ func TestAccumulateMetrics(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) metric.SetDescription("test description") metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(int64(v)) dp.Attributes().InsertString("label_1", "1") @@ -158,7 +158,7 @@ func TestAccumulateMetrics(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) metric.SetDescription("test description") metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(v) dp.Attributes().InsertString("label_1", "1") @@ -174,7 +174,7 @@ func TestAccumulateMetrics(t *testing.T) { metric.SetDataType(pdata.MetricDataTypeSum) metric.SetDescription("test description") metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(int64(v)) dp.Attributes().InsertString("label_1", "1") @@ -189,7 +189,7 @@ func TestAccumulateMetrics(t *testing.T) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(v) @@ -204,7 +204,7 @@ func TestAccumulateMetrics(t *testing.T) { metric := metrics.AppendEmpty() metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeHistogram) - metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Histogram().DataPoints().AppendEmpty() dp.SetBucketCounts([]uint64{5, 2}) @@ -288,7 +288,7 @@ func getMetricProperties(metric pdata.Metric) ( attributes pdata.AttributeMap, ts time.Time, value float64, - temporality pdata.AggregationTemporality, + temporality pdata.MetricAggregationTemporality, isMonotonic bool, ) { switch metric.DataType() { @@ -302,7 +302,7 @@ func getMetricProperties(metric pdata.Metric) ( case pdata.MetricValueTypeDouble: value = dp.DoubleVal() } - temporality = pdata.AggregationTemporalityUnspecified + temporality = pdata.MetricAggregationTemporalityUnspecified isMonotonic = false case pdata.MetricDataTypeSum: attributes = metric.Sum().DataPoints().At(0).Attributes() diff --git a/exporter/prometheusexporter/collector_test.go b/exporter/prometheusexporter/collector_test.go index 2b690f9721b2..7ad24a39f2b9 100644 --- a/exporter/prometheusexporter/collector_test.go +++ b/exporter/prometheusexporter/collector_test.go @@ -203,7 +203,7 @@ func TestCollectMetrics(t *testing.T) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(42) @@ -223,7 +223,7 @@ func TestCollectMetrics(t *testing.T) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(42.42) @@ -243,7 +243,7 @@ func TestCollectMetrics(t *testing.T) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(42) @@ -263,7 +263,7 @@ func TestCollectMetrics(t *testing.T) { metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(42.42) @@ -360,7 +360,7 @@ func TestAccumulateHistograms(t *testing.T) { metric = pdata.NewMetric() metric.SetName("test_metric") metric.SetDataType(pdata.MetricDataTypeHistogram) - metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) metric.SetDescription("test description") dp := metric.Histogram().DataPoints().AppendEmpty() dp.SetBucketCounts([]uint64{5, 2}) diff --git a/exporter/prometheusexporter/go.mod b/exporter/prometheusexporter/go.mod index 47ff458eed01..6708c6cfee63 100644 --- a/exporter/prometheusexporter/go.mod +++ b/exporter/prometheusexporter/go.mod @@ -10,8 +10,8 @@ require ( github.com/prometheus/client_model v0.2.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/exporter/prometheusexporter/go.sum b/exporter/prometheusexporter/go.sum index 7f25ef602fd1..1859a7f2f8a0 100644 --- a/exporter/prometheusexporter/go.sum +++ b/exporter/prometheusexporter/go.sum @@ -1097,11 +1097,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index fb5f7109e566..5fcdcb335349 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -318,7 +318,7 @@ func metricBuilder(delta int64, prefix string) pdata.Metrics { m1.SetDataType(pdata.MetricDataTypeSum) d1 := m1.Sum() d1.SetIsMonotonic(true) - d1.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + d1.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp1 := d1.DataPoints().AppendEmpty() dp1.SetStartTimestamp(pdata.NewTimestampFromTime(time.Unix(1543160298+delta, 100000090))) dp1.SetTimestamp(pdata.NewTimestampFromTime(time.Unix(1543160298+delta, 100000997))) @@ -333,7 +333,7 @@ func metricBuilder(delta int64, prefix string) pdata.Metrics { m2.SetDataType(pdata.MetricDataTypeSum) d2 := m2.Sum() d2.SetIsMonotonic(true) - d2.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + d2.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp2 := d2.DataPoints().AppendEmpty() dp2.SetStartTimestamp(pdata.NewTimestampFromTime(time.Unix(1543160298, 100000090))) dp2.SetTimestamp(pdata.NewTimestampFromTime(time.Unix(1543160298, 100000997))) diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index cb7618c4fddf..caea2890d2d0 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -67,7 +67,7 @@ func Test_loadConfig(t *testing.T) { ExternalLabels: map[string]string{"key1": "value1", "key2": "value2"}, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:8888", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/var/lib/mycert.pem", // This is subject to change, but currently I have no idea what else to put here lol }, diff --git a/exporter/prometheusremotewriteexporter/exporter_test.go b/exporter/prometheusremotewriteexporter/exporter_test.go index d5e771d5428d..4081e6d3d8c7 100644 --- a/exporter/prometheusremotewriteexporter/exporter_test.go +++ b/exporter/prometheusremotewriteexporter/exporter_test.go @@ -172,7 +172,7 @@ func Test_Start(t *testing.T) { returnErrorOnStartUp: true, clientSettings: confighttp.HTTPClientSettings{ Endpoint: "https://some.url:9411/api/prom/push", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "non-existent file", CertFile: "", diff --git a/exporter/prometheusremotewriteexporter/factory_test.go b/exporter/prometheusremotewriteexporter/factory_test.go index 649bb67689fa..8d5457758e9d 100644 --- a/exporter/prometheusremotewriteexporter/factory_test.go +++ b/exporter/prometheusremotewriteexporter/factory_test.go @@ -40,7 +40,7 @@ func Test_createMetricsExporter(t *testing.T) { invalidConfig := createDefaultConfig().(*Config) invalidConfig.HTTPClientSettings = confighttp.HTTPClientSettings{} invalidTLSConfig := createDefaultConfig().(*Config) - invalidTLSConfig.HTTPClientSettings.TLSSetting = configtls.TLSClientSetting{ + invalidTLSConfig.HTTPClientSettings.TLSSetting = &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "non-existent file", CertFile: "", diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index fc3a4db288bc..3126b067989e 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -11,8 +11,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 github.com/tidwall/wal v0.1.5 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/exporter/prometheusremotewriteexporter/go.sum b/exporter/prometheusremotewriteexporter/go.sum index 58981fb726c5..daacfd9d9def 100644 --- a/exporter/prometheusremotewriteexporter/go.sum +++ b/exporter/prometheusremotewriteexporter/go.sum @@ -979,11 +979,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/prometheusremotewriteexporter/helper.go b/exporter/prometheusremotewriteexporter/helper.go index e17f580a90b8..ee5437d6400d 100644 --- a/exporter/prometheusremotewriteexporter/helper.go +++ b/exporter/prometheusremotewriteexporter/helper.go @@ -53,9 +53,9 @@ func validateMetrics(metric pdata.Metric) bool { case pdata.MetricDataTypeGauge: return metric.Gauge().DataPoints().Len() != 0 case pdata.MetricDataTypeSum: - return metric.Sum().DataPoints().Len() != 0 && metric.Sum().AggregationTemporality() == pdata.AggregationTemporalityCumulative + return metric.Sum().DataPoints().Len() != 0 && metric.Sum().AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative case pdata.MetricDataTypeHistogram: - return metric.Histogram().DataPoints().Len() != 0 && metric.Histogram().AggregationTemporality() == pdata.AggregationTemporalityCumulative + return metric.Histogram().DataPoints().Len() != 0 && metric.Histogram().AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative case pdata.MetricDataTypeSummary: return metric.Summary().DataPoints().Len() != 0 } diff --git a/exporter/prometheusremotewriteexporter/testutil_test.go b/exporter/prometheusremotewriteexporter/testutil_test.go index a7fea8359c7b..320d90a6cef7 100644 --- a/exporter/prometheusremotewriteexporter/testutil_test.go +++ b/exporter/prometheusremotewriteexporter/testutil_test.go @@ -249,7 +249,7 @@ func getIntSumMetric(name string, attributes pdata.AttributeMap, value int64, ts metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(value) attributes.CopyTo(dp.Attributes()) @@ -263,7 +263,7 @@ func getEmptyCumulativeSumMetric(name string) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) return metric } @@ -271,7 +271,7 @@ func getSumMetric(name string, attributes pdata.AttributeMap, value float64, ts metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeSum) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Sum().DataPoints().AppendEmpty() dp.SetDoubleVal(value) attributes.CopyTo(dp.Attributes()) @@ -292,7 +292,7 @@ func getEmptyCumulativeHistogramMetric(name string) pdata.Metric { metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeHistogram) - metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) return metric } @@ -300,7 +300,7 @@ func getHistogramMetric(name string, attributes pdata.AttributeMap, ts uint64, s metric := pdata.NewMetric() metric.SetName(name) metric.SetDataType(pdata.MetricDataTypeHistogram) - metric.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := metric.Histogram().DataPoints().AppendEmpty() dp.SetCount(count) dp.SetSum(sum) diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 9adf3cf0c0c1..a12534425ce1 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 99cceda85f52..f5698410287e 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1132,11 +1132,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 23b381d3b6eb..b50e06f61724 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -6,8 +6,8 @@ require ( github.com/getsentry/sentry-go v0.11.0 github.com/google/go-cmp v0.5.6 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index b81020570613..3aebc156a47b 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -471,11 +471,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/signalfxexporter/factory_test.go b/exporter/signalfxexporter/factory_test.go index 89a27a596fa3..8f71aaf17fa0 100644 --- a/exporter/signalfxexporter/factory_test.go +++ b/exporter/signalfxexporter/factory_test.go @@ -333,7 +333,7 @@ func testMetricsData() pdata.ResourceMetrics { m2.SetDescription("Disk I/O.") m2.SetDataType(pdata.MetricDataTypeSum) m2.Sum().SetIsMonotonic(true) - m2.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m2.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp21 := m2.Sum().DataPoints().AppendEmpty() dp21.Attributes().InitFromMap(map[string]pdata.AttributeValue{ "host": pdata.NewAttributeValueString("host0"), @@ -373,7 +373,7 @@ func testMetricsData() pdata.ResourceMetrics { m3.SetUnit("bytes") m3.SetDataType(pdata.MetricDataTypeSum) m3.Sum().SetIsMonotonic(true) - m3.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m3.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp31 := m3.Sum().DataPoints().AppendEmpty() dp31.Attributes().InitFromMap(map[string]pdata.AttributeValue{ "host": pdata.NewAttributeValueString("host0"), @@ -413,7 +413,7 @@ func testMetricsData() pdata.ResourceMetrics { m4.SetUnit("bytes") m4.SetDataType(pdata.MetricDataTypeSum) m4.Sum().SetIsMonotonic(true) - m4.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m4.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp41 := m4.Sum().DataPoints().AppendEmpty() dp41.Attributes().InitFromMap(map[string]pdata.AttributeValue{ "device": pdata.NewAttributeValueString("sda1"), diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index a950e185723f..0bc55b6f3902 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -13,8 +13,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index b20aa5e3c471..9b0cd5a42df0 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -448,11 +448,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/signalfxexporter/internal/correlation/correlation_test.go b/exporter/signalfxexporter/internal/correlation/correlation_test.go index 5eae0bb6f15a..973028690928 100644 --- a/exporter/signalfxexporter/internal/correlation/correlation_test.go +++ b/exporter/signalfxexporter/internal/correlation/correlation_test.go @@ -66,7 +66,7 @@ func TestTrackerStart(t *testing.T) { config: &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/non/existent", }, diff --git a/exporter/signalfxexporter/internal/translation/converter.go b/exporter/signalfxexporter/internal/translation/converter.go index f5447d9da080..1e65c23e3e6e 100644 --- a/exporter/signalfxexporter/internal/translation/converter.go +++ b/exporter/signalfxexporter/internal/translation/converter.go @@ -246,13 +246,13 @@ func fromMetricDataTypeToMetricType(metric pdata.Metric) *sfxpb.MetricType { if !metric.Sum().IsMonotonic() { return &sfxMetricTypeGauge } - if metric.Sum().AggregationTemporality() == pdata.AggregationTemporalityDelta { + if metric.Sum().AggregationTemporality() == pdata.MetricAggregationTemporalityDelta { return &sfxMetricTypeCounter } return &sfxMetricTypeCumulativeCounter case pdata.MetricDataTypeHistogram: - if metric.Histogram().AggregationTemporality() == pdata.AggregationTemporalityDelta { + if metric.Histogram().AggregationTemporality() == pdata.MetricAggregationTemporalityDelta { return &sfxMetricTypeCounter } return &sfxMetricTypeCumulativeCounter diff --git a/exporter/signalfxexporter/internal/translation/converter_test.go b/exporter/signalfxexporter/internal/translation/converter_test.go index cdd3baf49660..e3bc889b979a 100644 --- a/exporter/signalfxexporter/internal/translation/converter_test.go +++ b/exporter/signalfxexporter/internal/translation/converter_test.go @@ -166,7 +166,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetName("cumulative_double_with_dims") m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) initDoublePt(m.Sum().DataPoints().AppendEmpty()) } { @@ -174,7 +174,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetName("cumulative_int_with_dims") m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) initInt64Pt(m.Sum().DataPoints().AppendEmpty()) } { @@ -182,7 +182,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetName("delta_double_with_dims") m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) initDoublePt(m.Sum().DataPoints().AppendEmpty()) } { @@ -190,7 +190,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m.SetName("delta_int_with_dims") m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) initInt64Pt(m.Sum().DataPoints().AppendEmpty()) } { @@ -579,7 +579,7 @@ func Test_MetricDataToSignalFxV2(t *testing.T) { m := ilm.Metrics().AppendEmpty() m.SetName("double_delta_histo") m.SetDataType(pdata.MetricDataTypeHistogram) - m.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) initHistDP(m.Histogram().DataPoints().AppendEmpty()) } return out diff --git a/exporter/splunkhecexporter/exporter_test.go b/exporter/splunkhecexporter/exporter_test.go index 2a7523c615f9..0d3d6e1600bf 100644 --- a/exporter/splunkhecexporter/exporter_test.go +++ b/exporter/splunkhecexporter/exporter_test.go @@ -47,7 +47,7 @@ import ( ) func TestNew(t *testing.T) { - buildInfo := component.DefaultBuildInfo() + buildInfo := component.NewDefaultBuildInfo() got, err := createExporter(nil, zap.NewNop(), &buildInfo) assert.EqualError(t, err, "nil config") assert.Nil(t, got) @@ -333,7 +333,7 @@ func TestConsumeLogsData(t *testing.T) { } func TestExporterStartAlwaysReturnsNil(t *testing.T) { - buildInfo := component.DefaultBuildInfo() + buildInfo := component.NewDefaultBuildInfo() config := &Config{ Endpoint: "https://example.com:8088", Token: "abc", diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 02c3033d5d1b..338edb70abb5 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index a2c820451243..5692eb670ce8 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 40290ba174b8..f9fc1d2b6b12 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -36,7 +36,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/sdk v1.0.0 // indirect diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index f7d5406ca944..67822d46e1bd 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -429,11 +429,11 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.22.6/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 66123cf4e554..14f8b602d2e6 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 0efc02abb2fd..bd9e80f914df 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -375,11 +375,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index ec59e2a56a8b..d29e9f5bcdb5 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 github.com/wavefronthq/wavefront-sdk-go v0.9.9 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/exporter/tanzuobservabilityexporter/go.sum b/exporter/tanzuobservabilityexporter/go.sum index b9a0efa61bdb..b3c8b79646d0 100644 --- a/exporter/tanzuobservabilityexporter/go.sum +++ b/exporter/tanzuobservabilityexporter/go.sum @@ -401,11 +401,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index ff54a70ac767..ec4aa54a1759 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.36.0 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/exporter/zipkinexporter/go.sum b/exporter/zipkinexporter/go.sum index ee52eb0d2c51..9894792c88d7 100644 --- a/exporter/zipkinexporter/go.sum +++ b/exporter/zipkinexporter/go.sum @@ -985,11 +985,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/extension/awsxrayproxy/go.mod b/extension/awsxrayproxy/go.mod index 7e2a3cec69af..840c14a2f4bc 100644 --- a/extension/awsxrayproxy/go.mod +++ b/extension/awsxrayproxy/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -21,7 +21,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/awsxrayproxy/go.sum b/extension/awsxrayproxy/go.sum index 1b8ad9cdcf73..d50d32d8efc9 100644 --- a/extension/awsxrayproxy/go.sum +++ b/extension/awsxrayproxy/go.sum @@ -387,11 +387,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 7e797af77926..544b63f4b8d3 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index fa48229f945a..dd0ccaf5ebe0 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -372,11 +372,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/fluentbitextension/go.mod b/extension/fluentbitextension/go.mod index c476d68d6866..3100de435552 100644 --- a/extension/fluentbitextension/go.mod +++ b/extension/fluentbitextension/go.mod @@ -7,7 +7,7 @@ require ( github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 github.com/tklauser/go-sysconf v0.3.6 // indirect - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -28,7 +28,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/numcpus v0.2.2 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/fluentbitextension/go.sum b/extension/fluentbitextension/go.sum index 4a8ea51c01d7..4cf727759c32 100644 --- a/extension/fluentbitextension/go.sum +++ b/extension/fluentbitextension/go.sum @@ -378,11 +378,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/healthcheckextension/go.mod b/extension/healthcheckextension/go.mod index e8de5ca16c1f..9a55622f5548 100644 --- a/extension/healthcheckextension/go.mod +++ b/extension/healthcheckextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/jaegertracing/jaeger v1.26.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -22,7 +22,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/healthcheckextension/go.sum b/extension/healthcheckextension/go.sum index 4a0fc35f652c..e9ee0dacccf2 100644 --- a/extension/healthcheckextension/go.sum +++ b/extension/healthcheckextension/go.sum @@ -976,11 +976,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/httpforwarder/extension_test.go b/extension/httpforwarder/extension_test.go index 1babd110edec..1ab24bca7d76 100644 --- a/extension/httpforwarder/extension_test.go +++ b/extension/httpforwarder/extension_test.go @@ -143,7 +143,7 @@ func TestExtension(t *testing.T) { config: &Config{ Egress: confighttp.HTTPClientSettings{ Endpoint: "localhost:9090", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/non/existent", }, diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 5bba504e8cf3..df371ee0d544 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 29c50e5af260..1f04de40b152 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -387,11 +387,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index 5b4bf3f7f36c..931a687d3617 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( cloud.google.com/go v0.83.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 google.golang.org/grpc v1.41.0 @@ -25,7 +25,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index f738334125ba..102320c1f684 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -377,11 +377,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/observer/dockerobserver/go.mod b/extension/observer/dockerobserver/go.mod index da8ff4814b00..c5ab834374a7 100644 --- a/extension/observer/dockerobserver/go.mod +++ b/extension/observer/dockerobserver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/observer/dockerobserver/go.sum b/extension/observer/dockerobserver/go.sum index fa48229f945a..dd0ccaf5ebe0 100644 --- a/extension/observer/dockerobserver/go.sum +++ b/extension/observer/dockerobserver/go.sum @@ -372,11 +372,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/observer/ecsobserver/go.mod b/extension/observer/ecsobserver/go.mod index 0b4b1c6086c3..07025f07872a 100644 --- a/extension/observer/ecsobserver/go.mod +++ b/extension/observer/ecsobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.40.47 github.com/hashicorp/golang-lru v0.5.4 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/multierr v1.7.0 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/observer/ecsobserver/go.sum b/extension/observer/ecsobserver/go.sum index 08a7cfc1f1c0..a2c799734c9b 100644 --- a/extension/observer/ecsobserver/go.sum +++ b/extension/observer/ecsobserver/go.sum @@ -380,11 +380,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 6d0865fc3018..ab2e215b427b 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -7,7 +7,7 @@ require ( github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 github.com/tklauser/go-sysconf v0.3.6 // indirect - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -29,7 +29,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/tklauser/numcpus v0.2.2 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 4a8ea51c01d7..4cf727759c32 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -378,11 +378,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index f5d731f17bbf..bbd3a08de725 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 @@ -37,7 +37,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 876f2d1af585..7a6ba0ee28c1 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -455,11 +455,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 1bc3cdddb5da..16e807bd367e 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -6,7 +6,7 @@ require ( github.com/coreos/go-oidc v2.2.1+incompatible github.com/pquerna/cachecontrol v0.1.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect google.golang.org/grpc v1.41.0 @@ -27,7 +27,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index b1317fde6078..15cda04b6bb0 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -376,11 +376,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/pprofextension/go.mod b/extension/pprofextension/go.mod index 457d666eb9be..21a6dbb71ae3 100644 --- a/extension/pprofextension/go.mod +++ b/extension/pprofextension/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -20,7 +20,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/pprofextension/go.sum b/extension/pprofextension/go.sum index 1b8ad9cdcf73..d50d32d8efc9 100644 --- a/extension/pprofextension/go.sum +++ b/extension/pprofextension/go.sum @@ -387,11 +387,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/extension/storage/go.mod b/extension/storage/go.mod index a67f6a17b449..29155b3df526 100644 --- a/extension/storage/go.mod +++ b/extension/storage/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.etcd.io/bbolt v1.3.6 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -24,7 +24,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/extension/storage/go.sum b/extension/storage/go.sum index 05361dc991eb..c1e00b97b36a 100644 --- a/extension/storage/go.sum +++ b/extension/storage/go.sum @@ -374,11 +374,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/go.mod b/go.mod index 94710fb516f5..c4db60c844ca 100644 --- a/go.mod +++ b/go.mod @@ -99,7 +99,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.36.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365 ) @@ -210,8 +210,8 @@ require ( github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/influxdb-observability/common v0.2.7 // indirect - github.com/influxdata/influxdb-observability/influx2otel v0.2.7 // indirect - github.com/influxdata/influxdb-observability/otel2influx v0.2.7 // indirect + github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a // indirect + github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a // indirect github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 // indirect github.com/jaegertracing/jaeger v1.26.0 // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect @@ -335,7 +335,7 @@ require ( go.etcd.io/bbolt v1.3.6 // indirect go.mongodb.org/atlas v0.12.0 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect go.opentelemetry.io/contrib/zpages v0.24.0 // indirect diff --git a/go.sum b/go.sum index f0c5ca710467..71f645520f35 100644 --- a/go.sum +++ b/go.sum @@ -1143,10 +1143,10 @@ github.com/influxdata/influxdb v1.8.4/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbf github.com/influxdata/influxdb v1.9.2/go.mod h1:UEe3MeD9AaP5rlPIes102IhYua3FhIWZuOXNHxDjSrI= github.com/influxdata/influxdb-observability/common v0.2.7 h1:C+oDh8Kbw+Ykx9yog/uJXL27rwMN3hgTLQfAFg1eQO0= github.com/influxdata/influxdb-observability/common v0.2.7/go.mod h1:+8VMGrfWZnXjc1c/oP+N4O/sHoneWgN3ojAHwgYgV4A= -github.com/influxdata/influxdb-observability/influx2otel v0.2.7 h1:YIXH+qNQgAtTA5U3s/wxDxxh5Vz+ylhZhyuRxtfTBqs= -github.com/influxdata/influxdb-observability/influx2otel v0.2.7/go.mod h1:ASyDMoPChvIgbEOvghwc5NxngOgXThp9MFKs7efNLtQ= -github.com/influxdata/influxdb-observability/otel2influx v0.2.7 h1:FACov3tcGCKfEGXsyUbgUOQx3zXffXaCFbN3ntAzh1E= -github.com/influxdata/influxdb-observability/otel2influx v0.2.7/go.mod h1:tE3OSy4RyAHIjxYlFZBsWorEM3aqaUeqSx3mbacm8KI= +github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a h1:M1icFq7kplCzTyDD7mR+A+tonX9DXTSe/gesRHiUDaQ= +github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a/go.mod h1:FLm8rofBlsS1fOah0FvRnNsdWAn485FpYRqfklNnJ24= +github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a h1:YUrcmqUgG8ZLenYQEcwEniVZIHRcxU9PLH7WSQDzWGA= +github.com/influxdata/influxdb-observability/otel2influx v0.0.0-20210927215436-943f6419116a/go.mod h1:vk9y2BdPA6ifcQO+8Qfp0r21wVXHtRLdoiMLytW0cZk= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxdb1-client v0.0.0-20200827194710-b269163b24ab/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxql v1.1.0/go.mod h1:KpVI7okXjK6PRi3Z5B+mtKZli+R1DnZgb3N+tzevNgo= @@ -2054,14 +2054,14 @@ 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.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib v0.21.0 h1:RMJ6GlUVzLYp/zmItxTTdAmr1gnpO/HHMFmvjAhvJQM= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= diff --git a/internal/aws/proxy/go.mod b/internal/aws/proxy/go.mod index 761fe0388875..2599bf8680d3 100644 --- a/internal/aws/proxy/go.mod +++ b/internal/aws/proxy/go.mod @@ -6,7 +6,7 @@ require ( github.com/aws/aws-sdk-go v1.40.47 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/internal/aws/proxy/go.sum b/internal/aws/proxy/go.sum index c3f7c0ce3504..a9c713e6ed96 100644 --- a/internal/aws/proxy/go.sum +++ b/internal/aws/proxy/go.sum @@ -378,10 +378,10 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/internal/coreinternal/go.mod b/internal/coreinternal/go.mod index 9bfeaf72ea1b..57f42b1a4b10 100644 --- a/internal/coreinternal/go.mod +++ b/internal/coreinternal/go.mod @@ -8,8 +8,8 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) diff --git a/internal/coreinternal/go.sum b/internal/coreinternal/go.sum index d79b36c91e4c..4680337085e7 100644 --- a/internal/coreinternal/go.sum +++ b/internal/coreinternal/go.sum @@ -388,11 +388,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/internal/coreinternal/goldendataset/metrics_gen.go b/internal/coreinternal/goldendataset/metrics_gen.go index ccf7cb740c57..f0c94f0348bd 100644 --- a/internal/coreinternal/goldendataset/metrics_gen.go +++ b/internal/coreinternal/goldendataset/metrics_gen.go @@ -127,12 +127,12 @@ func (g *metricGenerator) populateMetrics(cfg MetricsCfg, ilm pdata.Instrumentat metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(cfg.IsMonotonicSum) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) populateNumberPoints(cfg, sum.DataPoints()) case pdata.MetricDataTypeHistogram: metric.SetDataType(pdata.MetricDataTypeHistogram) histo := metric.Histogram() - histo.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + histo.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) populateDoubleHistogram(cfg, histo) } } diff --git a/internal/coreinternal/testdata/metric.go b/internal/coreinternal/testdata/metric.go index 3b864526bb67..5f4eadfaa000 100644 --- a/internal/coreinternal/testdata/metric.go +++ b/internal/coreinternal/testdata/metric.go @@ -279,10 +279,10 @@ func initMetric(m pdata.Metric, name string, ty pdata.MetricDataType) { case pdata.MetricDataTypeSum: sum := m.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) case pdata.MetricDataTypeHistogram: histo := m.Histogram() - histo.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + histo.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) } } diff --git a/internal/kubelet/go.mod b/internal/kubelet/go.mod index 2fbbb9f7ca48..1c446f1bbe54 100644 --- a/internal/kubelet/go.mod +++ b/internal/kubelet/go.mod @@ -5,7 +5,7 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/internal/kubelet/go.sum b/internal/kubelet/go.sum index d39940f5baff..c2ef865a7a7f 100644 --- a/internal/kubelet/go.sum +++ b/internal/kubelet/go.sum @@ -443,8 +443,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index b307a199ebc5..6bd49314c853 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index 4e86b584637b..497006df5370 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index 34bce92ce321..395ea2947f65 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.36.0 github.com/open-telemetry/opentelemetry-log-collection v0.21.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/multierr v1.6.0 go.uber.org/zap v1.19.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index f4a8f2507bb3..64aeb139551d 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -1126,12 +1126,12 @@ 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 1f5bde25d605..56ea29991e7f 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/addlicense v1.0.0 github.com/google/go-cmp v0.5.6 // indirect github.com/jstemmer/go-junit-report v0.9.1 - github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen v0.0.0-00010101000000-000000000000 + github.com/open-telemetry/opentelemetry-collector-contrib/cmd/mdatagen v0.36.0 github.com/pavius/impi v0.0.3 github.com/prometheus/common v0.29.0 // indirect github.com/stretchr/objx v0.2.0 // indirect diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 9257dbd9a289..cd2357790e9d 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index c891ae9e89e5..4fc503254426 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -358,11 +358,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/pkg/resourcetotelemetry/go.mod b/pkg/resourcetotelemetry/go.mod index de3dfe98f560..61b199e04bbc 100644 --- a/pkg/resourcetotelemetry/go.mod +++ b/pkg/resourcetotelemetry/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/pkg/resourcetotelemetry/go.sum b/pkg/resourcetotelemetry/go.sum index da8d5dcd149b..d88ee6510508 100644 --- a/pkg/resourcetotelemetry/go.sum +++ b/pkg/resourcetotelemetry/go.sum @@ -385,11 +385,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/pkg/translator/jaeger/go.mod b/pkg/translator/jaeger/go.mod index d8eb169ad4d6..d0e57f962dcb 100644 --- a/pkg/translator/jaeger/go.mod +++ b/pkg/translator/jaeger/go.mod @@ -6,7 +6,7 @@ require ( github.com/jaegertracing/jaeger v1.26.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/pkg/translator/jaeger/go.sum b/pkg/translator/jaeger/go.sum index 4a7c255aaa15..43a135f70a84 100644 --- a/pkg/translator/jaeger/go.sum +++ b/pkg/translator/jaeger/go.sum @@ -964,11 +964,11 @@ 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.28.0/go.mod h1:AP/BTXwo1eedoJO7V+HQ68CSvJU1lcdqOzJCgt1VsNs= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/pkg/translator/opencensus/go.mod b/pkg/translator/opencensus/go.mod index a7e9330c6992..df895fb72a9c 100644 --- a/pkg/translator/opencensus/go.mod +++ b/pkg/translator/opencensus/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/opencensus/go.sum b/pkg/translator/opencensus/go.sum index 66ebee1f0dc0..d7bb5002dc11 100644 --- a/pkg/translator/opencensus/go.sum +++ b/pkg/translator/opencensus/go.sum @@ -377,11 +377,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/pkg/translator/opencensus/metrics_to_oc.go b/pkg/translator/opencensus/metrics_to_oc.go index 58a7fbfdb3dd..6ac7507821e0 100644 --- a/pkg/translator/opencensus/metrics_to_oc.go +++ b/pkg/translator/opencensus/metrics_to_oc.go @@ -172,13 +172,13 @@ func descriptorTypeToOC(metric pdata.Metric, allNumberDataPointValueInt bool) oc return gaugeType(allNumberDataPointValueInt) case pdata.MetricDataTypeSum: sd := metric.Sum() - if sd.IsMonotonic() && sd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { + if sd.IsMonotonic() && sd.AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative { return cumulativeType(allNumberDataPointValueInt) } return gaugeType(allNumberDataPointValueInt) case pdata.MetricDataTypeHistogram: hd := metric.Histogram() - if hd.AggregationTemporality() == pdata.AggregationTemporalityCumulative { + if hd.AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative { return ocmetrics.MetricDescriptor_CUMULATIVE_DISTRIBUTION } return ocmetrics.MetricDescriptor_GAUGE_DISTRIBUTION diff --git a/pkg/translator/opencensus/metrics_to_oc_test.go b/pkg/translator/opencensus/metrics_to_oc_test.go index 9975a1cb1596..7d29566dd789 100644 --- a/pkg/translator/opencensus/metrics_to_oc_test.go +++ b/pkg/translator/opencensus/metrics_to_oc_test.go @@ -199,7 +199,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(false) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) m.Sum().DataPoints().AppendEmpty().SetIntVal(1) return m }, @@ -211,7 +211,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(false) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().DataPoints().AppendEmpty().SetIntVal(1) return m }, @@ -223,7 +223,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) m.Sum().DataPoints().AppendEmpty().SetIntVal(1) return m }, @@ -235,7 +235,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().DataPoints().AppendEmpty().SetIntVal(1) return m }, @@ -247,7 +247,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(false) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) m.Sum().DataPoints().AppendEmpty().SetDoubleVal(1) return m }, @@ -259,7 +259,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(false) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().DataPoints().AppendEmpty().SetDoubleVal(1) return m }, @@ -271,7 +271,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) m.Sum().DataPoints().AppendEmpty().SetDoubleVal(1) return m }, @@ -283,7 +283,7 @@ func TestMetricsType(t *testing.T) { m := pdata.NewMetric() m.SetDataType(pdata.MetricDataTypeSum) m.Sum().SetIsMonotonic(true) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().DataPoints().AppendEmpty().SetDoubleVal(1) return m }, diff --git a/pkg/translator/opencensus/oc_to_metrics.go b/pkg/translator/opencensus/oc_to_metrics.go index da1ae1107c1f..78014939e3d7 100644 --- a/pkg/translator/opencensus/oc_to_metrics.go +++ b/pkg/translator/opencensus/oc_to_metrics.go @@ -167,18 +167,18 @@ func descriptorTypeToMetrics(t ocmetrics.MetricDescriptor_Type, metric pdata.Met metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) return pdata.MetricDataTypeSum, pdata.MetricValueTypeInt case ocmetrics.MetricDescriptor_CUMULATIVE_DOUBLE: metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) return pdata.MetricDataTypeSum, pdata.MetricValueTypeDouble case ocmetrics.MetricDescriptor_CUMULATIVE_DISTRIBUTION: metric.SetDataType(pdata.MetricDataTypeHistogram) histo := metric.Histogram() - histo.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + histo.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) return pdata.MetricDataTypeHistogram, pdata.MetricValueTypeNone case ocmetrics.MetricDescriptor_SUMMARY: metric.SetDataType(pdata.MetricDataTypeSummary) diff --git a/pkg/translator/zipkin/go.mod b/pkg/translator/zipkin/go.mod index 89cfcdc0a053..4d308ca432bf 100644 --- a/pkg/translator/zipkin/go.mod +++ b/pkg/translator/zipkin/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) diff --git a/pkg/translator/zipkin/go.sum b/pkg/translator/zipkin/go.sum index be6f399fbb6c..4018f438ba73 100644 --- a/pkg/translator/zipkin/go.sum +++ b/pkg/translator/zipkin/go.sum @@ -969,11 +969,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/attributesprocessor/go.mod b/processor/attributesprocessor/go.mod index 012f80a36bfc..f740dcdedcbe 100644 --- a/processor/attributesprocessor/go.mod +++ b/processor/attributesprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/processor/attributesprocessor/go.sum b/processor/attributesprocessor/go.sum index 7d5f681993a3..457702e97540 100644 --- a/processor/attributesprocessor/go.sum +++ b/processor/attributesprocessor/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/cumulativetodeltaprocessor/go.mod b/processor/cumulativetodeltaprocessor/go.mod index 8462a1752000..e7d59f099110 100644 --- a/processor/cumulativetodeltaprocessor/go.mod +++ b/processor/cumulativetodeltaprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/cumulativetodeltaprocessor/go.sum b/processor/cumulativetodeltaprocessor/go.sum index 229b0cb391d3..3cbd17e330d7 100644 --- a/processor/cumulativetodeltaprocessor/go.sum +++ b/processor/cumulativetodeltaprocessor/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/cumulativetodeltaprocessor/processor.go b/processor/cumulativetodeltaprocessor/processor.go index 05aa0ea4ed81..c4250822f385 100644 --- a/processor/cumulativetodeltaprocessor/processor.go +++ b/processor/cumulativetodeltaprocessor/processor.go @@ -62,7 +62,7 @@ func (ctdp *cumulativeToDeltaProcessor) processMetrics(_ context.Context, md pda for k := 0; k < metricSlice.Len(); k++ { metric := metricSlice.At(k) if ctdp.metrics[metric.Name()] { - if metric.DataType() == pdata.MetricDataTypeSum && metric.Sum().AggregationTemporality() == pdata.AggregationTemporalityCumulative { + if metric.DataType() == pdata.MetricDataTypeSum && metric.Sum().AggregationTemporality() == pdata.MetricAggregationTemporalityCumulative { dataPoints := metric.Sum().DataPoints() for l := 0; l < dataPoints.Len(); l++ { @@ -82,7 +82,7 @@ func (ctdp *cumulativeToDeltaProcessor) processMetrics(_ context.Context, md pda fromDataPoint.SetDoubleVal(result.(delta).value) fromDataPoint.SetStartTimestamp(pdata.NewTimestampFromTime(result.(delta).prevTimestamp)) } - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) } } } diff --git a/processor/cumulativetodeltaprocessor/processor_test.go b/processor/cumulativetodeltaprocessor/processor_test.go index a3ab5b7c4664..db1cf02f70f4 100644 --- a/processor/cumulativetodeltaprocessor/processor_test.go +++ b/processor/cumulativetodeltaprocessor/processor_test.go @@ -178,9 +178,9 @@ func generateTestMetrics(tm testMetric) pdata.Metrics { sum.SetIsMonotonic(true) if tm.isCumulative[i] { - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) } else { - sum.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) } for _, value := range tm.metricValues[i] { diff --git a/processor/deltatorateprocessor/go.mod b/processor/deltatorateprocessor/go.mod index 94143d69c176..1253feed8a57 100644 --- a/processor/deltatorateprocessor/go.mod +++ b/processor/deltatorateprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/deltatorateprocessor/go.sum b/processor/deltatorateprocessor/go.sum index 229b0cb391d3..3cbd17e330d7 100644 --- a/processor/deltatorateprocessor/go.sum +++ b/processor/deltatorateprocessor/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/deltatorateprocessor/processor.go b/processor/deltatorateprocessor/processor.go index 88da758092e6..7414252b6662 100644 --- a/processor/deltatorateprocessor/processor.go +++ b/processor/deltatorateprocessor/processor.go @@ -61,7 +61,7 @@ func (dtrp *deltaToRateProcessor) processMetrics(_ context.Context, md pdata.Met if _, ok := dtrp.ConfiguredMetrics[metric.Name()]; !ok { continue } - if metric.DataType() != pdata.MetricDataTypeSum || metric.Sum().AggregationTemporality() != pdata.AggregationTemporalityDelta { + if metric.DataType() != pdata.MetricDataTypeSum || metric.Sum().AggregationTemporality() != pdata.MetricAggregationTemporalityDelta { dtrp.logger.Info(fmt.Sprintf("Configured metric for rate calculation %s is not a delta sum\n", metric.Name())) continue } diff --git a/processor/deltatorateprocessor/processor_test.go b/processor/deltatorateprocessor/processor_test.go index c3fd53e9d9e5..9dae17870c31 100644 --- a/processor/deltatorateprocessor/processor_test.go +++ b/processor/deltatorateprocessor/processor_test.go @@ -193,9 +193,9 @@ func generateSumMetrics(tm testMetric) pdata.Metrics { sum.SetIsMonotonic(true) if tm.isDelta[i] { - sum.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) } else { - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) } for _, value := range tm.metricValues[i] { diff --git a/processor/filterprocessor/go.mod b/processor/filterprocessor/go.mod index 97987e39bf74..12fb74bc0a88 100644 --- a/processor/filterprocessor/go.mod +++ b/processor/filterprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/filterprocessor/go.sum b/processor/filterprocessor/go.sum index 49e6a703693b..c3eda7db28e3 100644 --- a/processor/filterprocessor/go.sum +++ b/processor/filterprocessor/go.sum @@ -389,11 +389,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 3ed57c81396b..89401049fe53 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 4e86b584637b..497006df5370 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 1b23331a0705..d8041c7d6cff 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index c5a58ae425e5..760dcb39b3f9 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -372,12 +372,12 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.30.2-0.20210719230137-809cae954ed3/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/k8sattributesprocessor/go.mod b/processor/k8sattributesprocessor/go.mod index 20dffa3b83c6..c00fcf2be625 100644 --- a/processor/k8sattributesprocessor/go.mod +++ b/processor/k8sattributesprocessor/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 diff --git a/processor/k8sattributesprocessor/go.sum b/processor/k8sattributesprocessor/go.sum index 606ad4332961..f6cb122beb5e 100644 --- a/processor/k8sattributesprocessor/go.sum +++ b/processor/k8sattributesprocessor/go.sum @@ -462,11 +462,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/metricsgenerationprocessor/go.mod b/processor/metricsgenerationprocessor/go.mod index db6277749687..abcaf61c2a13 100644 --- a/processor/metricsgenerationprocessor/go.mod +++ b/processor/metricsgenerationprocessor/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/metricsgenerationprocessor/go.sum b/processor/metricsgenerationprocessor/go.sum index 229b0cb391d3..3cbd17e330d7 100644 --- a/processor/metricsgenerationprocessor/go.sum +++ b/processor/metricsgenerationprocessor/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 69659172ea32..5a6b32b7caec 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/go-cmp v0.5.6 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index e0eb60abb7f9..165d3ed6b3ff 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/probabilisticsamplerprocessor/go.mod b/processor/probabilisticsamplerprocessor/go.mod index 198c14d88ac0..95ea77aa3cbb 100644 --- a/processor/probabilisticsamplerprocessor/go.mod +++ b/processor/probabilisticsamplerprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/processor/probabilisticsamplerprocessor/go.sum b/processor/probabilisticsamplerprocessor/go.sum index 7d5f681993a3..457702e97540 100644 --- a/processor/probabilisticsamplerprocessor/go.sum +++ b/processor/probabilisticsamplerprocessor/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index 87f8d209c0a7..5932352e8151 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -14,8 +14,8 @@ require ( github.com/morikuni/aec v1.0.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 8b98031b5903..3e08b78026ca 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -817,11 +817,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/resourceprocessor/go.mod b/processor/resourceprocessor/go.mod index a43515b65749..0497aa604d07 100644 --- a/processor/resourceprocessor/go.mod +++ b/processor/resourceprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/processor/resourceprocessor/go.sum b/processor/resourceprocessor/go.sum index 7d5f681993a3..457702e97540 100644 --- a/processor/resourceprocessor/go.sum +++ b/processor/resourceprocessor/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index 46ddb924cec5..357437334ec3 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerexporter v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 33ab774343fe..9ba6c4b4cbd9 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -982,11 +982,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 692eb7d8cffe..bc76fa0c0e5c 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index da1d27ec33f8..384c9b4b3c83 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -1233,11 +1233,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/processor/spanmetricsprocessor/processor.go b/processor/spanmetricsprocessor/processor.go index 8c49885dba14..2489ebce89f5 100644 --- a/processor/spanmetricsprocessor/processor.go +++ b/processor/spanmetricsprocessor/processor.go @@ -247,7 +247,7 @@ func (p *processorImp) collectLatencyMetrics(ilm pdata.InstrumentationLibraryMet mLatency := ilm.Metrics().AppendEmpty() mLatency.SetDataType(pdata.MetricDataTypeHistogram) mLatency.SetName("latency") - mLatency.Histogram().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + mLatency.Histogram().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) timestamp := pdata.NewTimestampFromTime(time.Now()) @@ -273,7 +273,7 @@ func (p *processorImp) collectCallMetrics(ilm pdata.InstrumentationLibraryMetric mCalls.SetDataType(pdata.MetricDataTypeSum) mCalls.SetName("calls_total") mCalls.Sum().SetIsMonotonic(true) - mCalls.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + mCalls.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dpCalls := mCalls.Sum().DataPoints().AppendEmpty() dpCalls.SetStartTimestamp(pdata.NewTimestampFromTime(p.startTime)) diff --git a/processor/spanmetricsprocessor/processor_test.go b/processor/spanmetricsprocessor/processor_test.go index 047ac7b5f58c..dfaadfddea96 100644 --- a/processor/spanmetricsprocessor/processor_test.go +++ b/processor/spanmetricsprocessor/processor_test.go @@ -343,7 +343,7 @@ func verifyConsumeMetricsInput(input pdata.Metrics, t *testing.T) bool { assert.Equal(t, "calls_total", m.At(mi).Name()) data := m.At(mi).Sum() - assert.Equal(t, pdata.AggregationTemporalityCumulative, data.AggregationTemporality()) + assert.Equal(t, pdata.MetricAggregationTemporalityCumulative, data.AggregationTemporality()) assert.True(t, data.IsMonotonic()) dps := data.DataPoints() @@ -363,7 +363,7 @@ func verifyConsumeMetricsInput(input pdata.Metrics, t *testing.T) bool { assert.Equal(t, "latency", m.At(mi).Name()) data := m.At(mi).Histogram() - assert.Equal(t, pdata.AggregationTemporalityCumulative, data.AggregationTemporality()) + assert.Equal(t, pdata.MetricAggregationTemporalityCumulative, data.AggregationTemporality()) dps := data.DataPoints() require.Equal(t, 1, dps.Len()) diff --git a/processor/spanprocessor/go.mod b/processor/spanprocessor/go.mod index 566c1d1ec7e1..ce5c60e3a1a6 100644 --- a/processor/spanprocessor/go.mod +++ b/processor/spanprocessor/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/processor/spanprocessor/go.sum b/processor/spanprocessor/go.sum index 7d5f681993a3..457702e97540 100644 --- a/processor/spanprocessor/go.sum +++ b/processor/spanprocessor/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 76bffdf9bb2e..14e2d45eb299 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -7,8 +7,8 @@ require ( github.com/google/uuid v1.3.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 0b741e76e495..682336e9a02c 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -374,11 +374,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/awscontainerinsightreceiver/go.mod b/receiver/awscontainerinsightreceiver/go.mod index 5b1542c9b293..77a5b66d81b5 100644 --- a/receiver/awscontainerinsightreceiver/go.mod +++ b/receiver/awscontainerinsightreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.36.0 github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 k8s.io/api v0.22.2 k8s.io/apimachinery v0.22.2 diff --git a/receiver/awscontainerinsightreceiver/go.sum b/receiver/awscontainerinsightreceiver/go.sum index 68ee1cf803c3..e564a71c05b5 100644 --- a/receiver/awscontainerinsightreceiver/go.sum +++ b/receiver/awscontainerinsightreceiver/go.sum @@ -565,12 +565,12 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.30.2-0.20210723184018-3b7d6ce4830c/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 6f2ba7856588..a9eb735d74e4 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index 2838d4188019..2eb96a43338a 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -388,11 +388,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/translator.go b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/translator.go index 75669f426a6d..1d0fb8243813 100644 --- a/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/translator.go +++ b/receiver/awsecscontainermetricsreceiver/internal/awsecscontainermetrics/translator.go @@ -86,7 +86,7 @@ func appendIntSum(metricName string, unit string, value int64, ts pdata.Timestam metric.SetDataType(pdata.MetricDataTypeSum) intSum := metric.Sum() - intSum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + intSum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) appendIntDataPoint(intSum.DataPoints(), value, ts) } diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index e7990b9b3ae8..67d5d67bbfc2 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index f2e307ea4196..e2071a19ace1 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -395,11 +395,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e5ac73447537..08e6906a6733 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 @@ -26,7 +26,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index a2c820451243..5692eb670ce8 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/cloudfoundryreceiver/go.mod b/receiver/cloudfoundryreceiver/go.mod index 6e01ce9a43b4..cc84226b0b45 100644 --- a/receiver/cloudfoundryreceiver/go.mod +++ b/receiver/cloudfoundryreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect ) @@ -23,7 +23,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/cloudfoundryreceiver/go.sum b/receiver/cloudfoundryreceiver/go.sum index 0181a2ed73ad..519d4ef44109 100644 --- a/receiver/cloudfoundryreceiver/go.sum +++ b/receiver/cloudfoundryreceiver/go.sum @@ -372,11 +372,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 0d94f941c1b8..459d7bade2ac 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 @@ -27,7 +27,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index e0eb60abb7f9..165d3ed6b3ff 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index 73a144280076..6135e40ef125 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/docker v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index a76766fe7513..e95109b33cde 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -780,11 +780,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/dockerstatsreceiver/metrics.go b/receiver/dockerstatsreceiver/metrics.go index 8d7209eca5e2..65205d61b9c2 100644 --- a/receiver/dockerstatsreceiver/metrics.go +++ b/receiver/dockerstatsreceiver/metrics.go @@ -228,7 +228,7 @@ func populateCumulative(dest pdata.Metric, name string, unit string, val int64, populateMetricMetadata(dest, name, unit, pdata.MetricDataTypeSum) sum := dest.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dp := sum.DataPoints().AppendEmpty() dp.SetIntVal(val) dp.SetTimestamp(ts) @@ -239,7 +239,7 @@ func populateCumulativeMultiPoints(dest pdata.Metric, name string, unit string, populateMetricMetadata(dest, name, unit, pdata.MetricDataTypeSum) sum := dest.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dps := sum.DataPoints() dps.EnsureCapacity(len(vals)) for i := range vals { diff --git a/receiver/dockerstatsreceiver/metrics_test.go b/receiver/dockerstatsreceiver/metrics_test.go index 04cba74ea92f..c4cc53c1e398 100644 --- a/receiver/dockerstatsreceiver/metrics_test.go +++ b/receiver/dockerstatsreceiver/metrics_test.go @@ -78,7 +78,7 @@ func metricsData( case MetricTypeCumulative: mdMetric.SetDataType(pdata.MetricDataTypeSum) mdMetric.Sum().SetIsMonotonic(true) - mdMetric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + mdMetric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dps = mdMetric.Sum().DataPoints() case MetricTypeGauge, MetricTypeDoubleGauge: mdMetric.SetDataType(pdata.MetricDataTypeGauge) diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 3457e9095706..1feac86b7a6a 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 4e86b584637b..497006df5370 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/dotnetdiagnosticsreceiver/metrics/converter.go b/receiver/dotnetdiagnosticsreceiver/metrics/converter.go index 8cf1aba26342..686545eac93b 100644 --- a/receiver/dotnetdiagnosticsreceiver/metrics/converter.go +++ b/receiver/dotnetdiagnosticsreceiver/metrics/converter.go @@ -53,7 +53,7 @@ func rawMetricToPdata(dm dotnet.Metric, pdm pdata.Metric, startTime, now time.Ti case "Sum": pdm.SetDataType(pdata.MetricDataTypeSum) sum := pdm.Sum() - sum.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) dps := sum.DataPoints() dp := dps.AppendEmpty() dp.SetStartTimestamp(pdata.NewTimestampFromTime(startTime)) diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index e7384973200c..49e88eb2bdc9 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.36.0 github.com/open-telemetry/opentelemetry-log-collection v0.21.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index fc390e6ccc57..798c4eaf76fd 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -1131,12 +1131,12 @@ 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.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/receiver/fluentforwardreceiver/go.mod b/receiver/fluentforwardreceiver/go.mod index c09a42920fdf..c677fa1723c1 100644 --- a/receiver/fluentforwardreceiver/go.mod +++ b/receiver/fluentforwardreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/stretchr/testify v1.7.0 github.com/tinylib/msgp v1.1.6 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/fluentforwardreceiver/go.sum b/receiver/fluentforwardreceiver/go.sum index eea6ae8aba17..5a30d7ea9db8 100644 --- a/receiver/fluentforwardreceiver/go.sum +++ b/receiver/fluentforwardreceiver/go.sum @@ -377,11 +377,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/googlecloudpubsubreceiver/go.mod b/receiver/googlecloudpubsubreceiver/go.mod index 768e690e084f..3f2369767489 100644 --- a/receiver/googlecloudpubsubreceiver/go.mod +++ b/receiver/googlecloudpubsubreceiver/go.mod @@ -4,7 +4,7 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -25,7 +25,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/googlecloudpubsubreceiver/go.sum b/receiver/googlecloudpubsubreceiver/go.sum index 4e86b584637b..497006df5370 100644 --- a/receiver/googlecloudpubsubreceiver/go.sum +++ b/receiver/googlecloudpubsubreceiver/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/hostmetricsreceiver/go.mod b/receiver/hostmetricsreceiver/go.mod index f5a67636c067..3b0f30f9e7ff 100644 --- a/receiver/hostmetricsreceiver/go.mod +++ b/receiver/hostmetricsreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 diff --git a/receiver/hostmetricsreceiver/go.sum b/receiver/hostmetricsreceiver/go.sum index 297dabac240b..433142ef44ce 100644 --- a/receiver/hostmetricsreceiver/go.sum +++ b/receiver/hostmetricsreceiver/go.sum @@ -400,11 +400,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go index 31934472f499..1ef608ca57de 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics.go @@ -84,7 +84,7 @@ var Metrics = &metricStruct{ metric.SetUnit("s") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go index bf641839a5d2..2442602d0604 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/diskscraper/internal/metadata/generated_metrics.go @@ -102,7 +102,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -113,7 +113,7 @@ var Metrics = &metricStruct{ metric.SetUnit("s") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -124,7 +124,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{operations}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -135,7 +135,7 @@ var Metrics = &metricStruct{ metric.SetUnit("s") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -146,7 +146,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{operations}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -157,7 +157,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{operations}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -168,7 +168,7 @@ var Metrics = &metricStruct{ metric.SetUnit("s") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go index 1b795219aff3..d0f5f710f915 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper/internal/metadata/generated_metrics.go @@ -87,7 +87,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{inodes}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -98,7 +98,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go index 87464382ab6d..4074dbf68527 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/memoryscraper/internal/metadata/generated_metrics.go @@ -84,7 +84,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go index 7a2a0c9184b8..d47eb9ebe761 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/networkscraper/internal/metadata/generated_metrics.go @@ -96,7 +96,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{connections}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -107,7 +107,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{packets}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -118,7 +118,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{errors}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -129,7 +129,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -140,7 +140,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{packets}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go index 7dc81aafa2c7..11959353ba57 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/internal/metadata/generated_metrics.go @@ -90,7 +90,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{faults}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -101,7 +101,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{operations}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -112,7 +112,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go index 34ce62626343..c1e149869a5d 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processesscraper/internal/metadata/generated_metrics.go @@ -87,7 +87,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{processes}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -98,7 +98,7 @@ var Metrics = &metricStruct{ metric.SetUnit("{processes}") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go index 2c3f1af7f5ff..ff4d68606cba 100644 --- a/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go +++ b/receiver/hostmetricsreceiver/internal/scraper/processscraper/internal/metadata/generated_metrics.go @@ -93,7 +93,7 @@ var Metrics = &metricStruct{ metric.SetUnit("s") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -104,7 +104,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -115,7 +115,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -126,7 +126,7 @@ var Metrics = &metricStruct{ metric.SetUnit("By") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(false) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/influxdbreceiver/go.mod b/receiver/influxdbreceiver/go.mod index 35519f3efdd4..612993c2c1c5 100644 --- a/receiver/influxdbreceiver/go.mod +++ b/receiver/influxdbreceiver/go.mod @@ -4,9 +4,9 @@ go 1.17 require ( github.com/influxdata/influxdb-observability/common v0.2.7 - github.com/influxdata/influxdb-observability/influx2otel v0.2.7 + github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a github.com/influxdata/line-protocol/v2 v2.0.0-20210520103755-6551a972d603 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) @@ -25,7 +25,7 @@ require ( github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/rs/cors v1.8.0 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/internal/metric v0.23.0 // indirect diff --git a/receiver/influxdbreceiver/go.sum b/receiver/influxdbreceiver/go.sum index 3f346e1e9083..3fc768257fff 100644 --- a/receiver/influxdbreceiver/go.sum +++ b/receiver/influxdbreceiver/go.sum @@ -227,8 +227,8 @@ github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1: github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/influxdb-observability/common v0.2.7 h1:C+oDh8Kbw+Ykx9yog/uJXL27rwMN3hgTLQfAFg1eQO0= github.com/influxdata/influxdb-observability/common v0.2.7/go.mod h1:+8VMGrfWZnXjc1c/oP+N4O/sHoneWgN3ojAHwgYgV4A= -github.com/influxdata/influxdb-observability/influx2otel v0.2.7 h1:YIXH+qNQgAtTA5U3s/wxDxxh5Vz+ylhZhyuRxtfTBqs= -github.com/influxdata/influxdb-observability/influx2otel v0.2.7/go.mod h1:ASyDMoPChvIgbEOvghwc5NxngOgXThp9MFKs7efNLtQ= +github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a h1:M1icFq7kplCzTyDD7mR+A+tonX9DXTSe/gesRHiUDaQ= +github.com/influxdata/influxdb-observability/influx2otel v0.0.0-20210927215436-943f6419116a/go.mod h1:FLm8rofBlsS1fOah0FvRnNsdWAn485FpYRqfklNnJ24= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184 h1:modYba1g1we+YJf0yGTwmohVWVAxcAch18nPg3e24OY= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184/go.mod h1:03nmhxzZ7Xk2pdG+lmMd7mHDfeVOYFyhOgwO61qWU98= github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod h1:6+9Xt5Sq1rWx+glMgxhcg2c0DUaehK+5TDcPZ76GypY= @@ -386,12 +386,12 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.35.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/jaegerreceiver/go.mod b/receiver/jaegerreceiver/go.mod index a9389c210682..96df221d9aae 100644 --- a/receiver/jaegerreceiver/go.mod +++ b/receiver/jaegerreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.36.0 github.com/stretchr/testify v1.7.0 github.com/uber/jaeger-lib v2.4.1+incompatible - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/grpc v1.41.0 ) diff --git a/receiver/jaegerreceiver/go.sum b/receiver/jaegerreceiver/go.sum index da77fddfd348..f118665b22e6 100644 --- a/receiver/jaegerreceiver/go.sum +++ b/receiver/jaegerreceiver/go.sum @@ -1011,11 +1011,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index 306807f587ba..33620f15bb00 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -144,7 +144,7 @@ func TestJaegerHTTP(t *testing.T) { AgentHTTPPort: int(port), RemoteSamplingClientSettings: configgrpc.GRPCClientSettings{ Endpoint: addr.String(), - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ Insecure: true, }, }, diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index e6037f6eccdb..ca279162dbd9 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -510,7 +510,7 @@ func TestSamplingStrategiesMutualTLS(t *testing.T) { cfg := factory.CreateDefaultConfig().(*Config) cfg.RemoteSampling = &RemoteSamplingConfig{ GRPCClientSettings: configgrpc.GRPCClientSettings{ - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: caPath, CertFile: clientCertPath, diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 445ccb2a5832..d3ef6c69f151 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index 3409e7134726..8553377d92c8 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -751,11 +751,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 5877c485e4d4..65ec4e8aba66 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -14,8 +14,8 @@ require ( github.com/openshift/api v0.0.0-20210521075222-e273a339932a github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index e82eb79be3dc..2d1e22e9ad18 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -496,11 +496,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 54fd93aa6d47..27da117eda79 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 057bf84305ea..453da904beb1 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -1018,11 +1018,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/kafkareceiver/go.mod b/receiver/kafkareceiver/go.mod index b82e80922e54..dcb02ea7bb9e 100644 --- a/receiver/kafkareceiver/go.mod +++ b/receiver/kafkareceiver/go.mod @@ -14,8 +14,8 @@ require ( github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/kafkareceiver/go.sum b/receiver/kafkareceiver/go.sum index ec6bdf55950b..b227d4d7142d 100644 --- a/receiver/kafkareceiver/go.sum +++ b/receiver/kafkareceiver/go.sum @@ -1004,11 +1004,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index b1a945cdf6fe..b1cf286b728f 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -11,8 +11,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index da979459ccc8..25f4cd48a083 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -519,11 +519,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index f3e599d58d69..d09e5b9b7225 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 79b826f4a18f..67e4f191a182 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -403,11 +403,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/memcachedreceiver/internal/metadata/generated_metrics.go b/receiver/memcachedreceiver/internal/metadata/generated_metrics.go index 6ed186e07b37..a1730bbe1145 100644 --- a/receiver/memcachedreceiver/internal/metadata/generated_metrics.go +++ b/receiver/memcachedreceiver/internal/metadata/generated_metrics.go @@ -114,7 +114,7 @@ var Metrics = &metricStruct{ metric.SetUnit("connections") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -125,7 +125,7 @@ var Metrics = &metricStruct{ metric.SetUnit("connections") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -136,7 +136,7 @@ var Metrics = &metricStruct{ metric.SetUnit("connections") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/mongodbatlasreceiver/go.mod b/receiver/mongodbatlasreceiver/go.mod index edc58bf881da..8417510b8957 100644 --- a/receiver/mongodbatlasreceiver/go.mod +++ b/receiver/mongodbatlasreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/mongodb-forks/digest v1.0.3 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.36.0 go.mongodb.org/atlas v0.12.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b // indirect ) @@ -26,7 +26,7 @@ require ( github.com/pelletier/go-toml v1.9.3 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/mongodbatlasreceiver/go.sum b/receiver/mongodbatlasreceiver/go.sum index ae665d923f23..03c439c03e81 100644 --- a/receiver/mongodbatlasreceiver/go.sum +++ b/receiver/mongodbatlasreceiver/go.sum @@ -380,11 +380,11 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 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/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 5dadd881e665..4eae8ac400cd 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.11.1 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 // indirect diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index e29defb12407..720cd84eee25 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -739,11 +739,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/nginxreceiver/internal/metadata/generated_metrics.go b/receiver/nginxreceiver/internal/metadata/generated_metrics.go index e48a6f8eba14..9f80167d83de 100644 --- a/receiver/nginxreceiver/internal/metadata/generated_metrics.go +++ b/receiver/nginxreceiver/internal/metadata/generated_metrics.go @@ -93,7 +93,7 @@ var Metrics = &metricStruct{ metric.SetUnit("connections") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -113,7 +113,7 @@ var Metrics = &metricStruct{ metric.SetUnit("connections") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -124,7 +124,7 @@ var Metrics = &metricStruct{ metric.SetUnit("requests") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, } diff --git a/receiver/nginxreceiver/scraper_test.go b/receiver/nginxreceiver/scraper_test.go index 058390630462..66ae0e7fc99c 100644 --- a/receiver/nginxreceiver/scraper_test.go +++ b/receiver/nginxreceiver/scraper_test.go @@ -137,7 +137,7 @@ func TestScraperFailedStart(t *testing.T) { sc := newNginxScraper(zap.NewNop(), &Config{ HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "localhost:8080", - TLSSetting: configtls.TLSClientSetting{ + TLSSetting: &configtls.TLSClientSetting{ TLSSetting: configtls.TLSSetting{ CAFile: "/non/existent", }, diff --git a/receiver/opencensusreceiver/go.mod b/receiver/opencensusreceiver/go.mod index 83e794c2ffc2..a563a738c1ea 100644 --- a/receiver/opencensusreceiver/go.mod +++ b/receiver/opencensusreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/rs/cors v1.8.0 github.com/soheilhy/cmux v0.1.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 go.opentelemetry.io/otel v1.0.0 go.opentelemetry.io/otel/trace v1.0.0 diff --git a/receiver/opencensusreceiver/go.sum b/receiver/opencensusreceiver/go.sum index 0353c1a6b0be..fce4d6974a76 100644 --- a/receiver/opencensusreceiver/go.sum +++ b/receiver/opencensusreceiver/go.sum @@ -394,11 +394,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/podmanreceiver/go.mod b/receiver/podmanreceiver/go.mod index f77a194a9046..2a403c8b355a 100644 --- a/receiver/podmanreceiver/go.mod +++ b/receiver/podmanreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 ) diff --git a/receiver/podmanreceiver/go.sum b/receiver/podmanreceiver/go.sum index 7b38bfaa62ec..d9ee77cd3885 100644 --- a/receiver/podmanreceiver/go.sum +++ b/receiver/podmanreceiver/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/podmanreceiver/metrics.go b/receiver/podmanreceiver/metrics.go index cff483536cff..983cfb70edef 100644 --- a/receiver/podmanreceiver/metrics.go +++ b/receiver/podmanreceiver/metrics.go @@ -96,7 +96,7 @@ func sum(ilm pdata.MetricSlice, metricName string, unit string, points []point, metric.SetDataType(pdata.MetricDataTypeSum) sum := metric.Sum() sum.SetIsMonotonic(true) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dataPoints := sum.DataPoints() diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 4fc4bd6e853e..db9384f33774 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/prometheus/common v0.31.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index 77ea87cbc553..080bf02be0dd 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -1101,11 +1101,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/prometheusreceiver/go.mod b/receiver/prometheusreceiver/go.mod index 4181405011c8..ae86c9bbd138 100644 --- a/receiver/prometheusreceiver/go.mod +++ b/receiver/prometheusreceiver/go.mod @@ -13,8 +13,8 @@ require ( github.com/prometheus/common v0.31.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 google.golang.org/protobuf v1.27.1 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/prometheusreceiver/go.sum b/receiver/prometheusreceiver/go.sum index a28bd87cfdd1..cac95f9b8800 100644 --- a/receiver/prometheusreceiver/go.sum +++ b/receiver/prometheusreceiver/go.sum @@ -1097,11 +1097,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index df6fd1bd0aed..8819f361311c 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.36.0 github.com/spf13/cast v1.4.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 503b9ef6d9fe..f2e315d35a2d 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -392,11 +392,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index fe2297dc91b4..928a5d22154e 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,8 +9,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/interval v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 169c4593baf0..eca84042250f 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -417,11 +417,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/redisreceiver/pdata.go b/receiver/redisreceiver/pdata.go index 6edc34fa2c75..f6bba34ba870 100644 --- a/receiver/redisreceiver/pdata.go +++ b/receiver/redisreceiver/pdata.go @@ -64,7 +64,7 @@ func initIntMetric(m *redisMetric, value int64, t *timeBundle, dest pdata.Metric } else if m.pdType == pdata.MetricDataTypeSum { sum := dest.Sum() sum.SetIsMonotonic(m.isMonotonic) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) pt = sum.DataPoints().AppendEmpty() pt.SetStartTimestamp(pdata.NewTimestampFromTime(t.serverStart)) } @@ -82,7 +82,7 @@ func initDoubleMetric(m *redisMetric, value float64, t *timeBundle, dest pdata.M } else if m.pdType == pdata.MetricDataTypeSum { sum := dest.Sum() sum.SetIsMonotonic(m.isMonotonic) - sum.SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + sum.SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) pt = sum.DataPoints().AppendEmpty() pt.SetStartTimestamp(pdata.NewTimestampFromTime(t.serverStart)) } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 2ec8e9c08356..2327db756e66 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -11,8 +11,8 @@ require ( github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e ) require ( diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 0236c3b89419..3c1b2b6f08f9 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1135,11 +1135,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/scraperhelper/go.mod b/receiver/scraperhelper/go.mod index a8162632c660..ceca3809a5f5 100644 --- a/receiver/scraperhelper/go.mod +++ b/receiver/scraperhelper/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.opentelemetry.io/otel v1.0.0 go.opentelemetry.io/otel/trace v1.0.0 go.uber.org/zap v1.19.1 diff --git a/receiver/scraperhelper/go.sum b/receiver/scraperhelper/go.sum index 89fb9e561715..d09fb8e0020d 100644 --- a/receiver/scraperhelper/go.sum +++ b/receiver/scraperhelper/go.sum @@ -372,11 +372,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 658e75553a70..01b08dd7eeb9 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -10,8 +10,8 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 1ef0e5b6f743..443b30262c2c 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -464,11 +464,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/signalfxreceiver/receiver_test.go b/receiver/signalfxreceiver/receiver_test.go index e860c942e4c5..3ed2f4cdcb3b 100644 --- a/receiver/signalfxreceiver/receiver_test.go +++ b/receiver/signalfxreceiver/receiver_test.go @@ -139,7 +139,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { m := ilm.Metrics().AppendEmpty() m.SetName("cumulative_double_with_dims") m.SetDataType(pdata.MetricDataTypeSum) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().SetIsMonotonic(true) doublePt := m.Sum().DataPoints().AppendEmpty() doublePt.SetTimestamp(ts) @@ -149,7 +149,7 @@ func Test_signalfxeceiver_EndToEnd(t *testing.T) { m := ilm.Metrics().AppendEmpty() m.SetName("cumulative_int_with_dims") m.SetDataType(pdata.MetricDataTypeSum) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().SetIsMonotonic(true) int64Pt := m.Sum().DataPoints().AppendEmpty() int64Pt.SetTimestamp(ts) diff --git a/receiver/signalfxreceiver/signalfxv2_to_metricdata.go b/receiver/signalfxreceiver/signalfxv2_to_metricdata.go index 84bde4c5e5df..2a8a68b9f364 100644 --- a/receiver/signalfxreceiver/signalfxv2_to_metricdata.go +++ b/receiver/signalfxreceiver/signalfxv2_to_metricdata.go @@ -94,12 +94,12 @@ func fillInType(sfxDataPoint *sfxpb.DataPoint, m pdata.Metric) (err error) { case sfxpb.MetricType_COUNTER: m.SetDataType(pdata.MetricDataTypeSum) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) m.Sum().SetIsMonotonic(true) case sfxpb.MetricType_CUMULATIVE_COUNTER: m.SetDataType(pdata.MetricDataTypeSum) - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) m.Sum().SetIsMonotonic(true) default: err = fmt.Errorf("unknown data-point type (%d)", sfxMetricType) diff --git a/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go b/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go index d15d8b206c34..a3e5505e30a4 100644 --- a/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go +++ b/receiver/signalfxreceiver/signalfxv2_to_metricdata_test.go @@ -55,7 +55,7 @@ func Test_signalFxV2ToMetricsData(t *testing.T) { case pdata.MetricDataTypeGauge: dps = m.Gauge().DataPoints() case pdata.MetricDataTypeSum: - m.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + m.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) dps = m.Sum().DataPoints() } @@ -112,7 +112,7 @@ func Test_signalFxV2ToMetricsData(t *testing.T) { wantMetricsData: func() pdata.Metrics { m := buildDefaultMetricsData(pdata.MetricDataTypeSum, 13) d := m.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) d.SetIsMonotonic(true) return m }(), @@ -130,7 +130,7 @@ func Test_signalFxV2ToMetricsData(t *testing.T) { wantMetricsData: func() pdata.Metrics { m := buildDefaultMetricsData(pdata.MetricDataTypeSum, 13.13) d := m.ResourceMetrics().At(0).InstrumentationLibraryMetrics().At(0).Metrics().At(0).Sum() - d.SetAggregationTemporality(pdata.AggregationTemporalityDelta) + d.SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) d.SetIsMonotonic(true) return m }(), diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index c26b835a37d5..eff64edcc106 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/prometheus/common v0.31.0 github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e k8s.io/client-go v0.22.2 ) @@ -94,7 +94,7 @@ require ( github.com/spf13/cast v1.4.1 // indirect github.com/spf13/pflag v1.0.5 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 10dfa164861c..d37ba4bed09c 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1111,11 +1111,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index aa0eda87af55..2f7343cb3fc9 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index 0f8e4c94edc8..83c7c3c1530f 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -393,11 +393,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index fcc84d4b5949..22f094467ac7 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.opentelemetry.io/otel v1.0.0 go.uber.org/zap v1.19.1 diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index db465b77dfdc..6e111d31c311 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/statsdreceiver/protocol/metric_translator.go b/receiver/statsdreceiver/protocol/metric_translator.go index a8ecc4a4a48b..11411f581173 100644 --- a/receiver/statsdreceiver/protocol/metric_translator.go +++ b/receiver/statsdreceiver/protocol/metric_translator.go @@ -30,9 +30,9 @@ func buildCounterMetric(parsedMetric statsDMetric, isMonotonicCounter bool, time } nm.SetDataType(pdata.MetricDataTypeSum) - nm.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + nm.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) if isMonotonicCounter { - nm.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + nm.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) } nm.Sum().SetIsMonotonic(true) diff --git a/receiver/statsdreceiver/protocol/metric_translator_test.go b/receiver/statsdreceiver/protocol/metric_translator_test.go index 986a93ab413e..7df0ca7cb55a 100644 --- a/receiver/statsdreceiver/protocol/metric_translator_test.go +++ b/receiver/statsdreceiver/protocol/metric_translator_test.go @@ -41,7 +41,7 @@ func TestBuildCounterMetric(t *testing.T) { expectedMetric.SetName("testCounter") expectedMetric.SetUnit("meter") expectedMetric.SetDataType(pdata.MetricDataTypeSum) - expectedMetric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityDelta) + expectedMetric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityDelta) expectedMetric.Sum().SetIsMonotonic(true) dp := expectedMetric.Sum().DataPoints().AppendEmpty() dp.SetIntVal(32) diff --git a/receiver/syslogreceiver/go.mod b/receiver/syslogreceiver/go.mod index ef9c0332d8af..712b75f93f2c 100644 --- a/receiver/syslogreceiver/go.mod +++ b/receiver/syslogreceiver/go.mod @@ -6,8 +6,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.36.0 github.com/open-telemetry/opentelemetry-log-collection v0.21.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/syslogreceiver/go.sum b/receiver/syslogreceiver/go.sum index a6796e0da66d..51030b1480c2 100644 --- a/receiver/syslogreceiver/go.sum +++ b/receiver/syslogreceiver/go.sum @@ -1131,12 +1131,12 @@ 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.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/receiver/tcplogreceiver/go.mod b/receiver/tcplogreceiver/go.mod index 9458a56943fe..7b851f030ac3 100644 --- a/receiver/tcplogreceiver/go.mod +++ b/receiver/tcplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.36.0 github.com/open-telemetry/opentelemetry-log-collection v0.21.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e gopkg.in/yaml.v2 v2.4.0 ) @@ -29,7 +29,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/tcplogreceiver/go.sum b/receiver/tcplogreceiver/go.sum index ab1fbd1260cf..46ee93094d3b 100644 --- a/receiver/tcplogreceiver/go.sum +++ b/receiver/tcplogreceiver/go.sum @@ -1130,12 +1130,12 @@ 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.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/receiver/udplogreceiver/go.mod b/receiver/udplogreceiver/go.mod index c59c6e384703..99a7d6634be9 100644 --- a/receiver/udplogreceiver/go.mod +++ b/receiver/udplogreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.36.0 github.com/open-telemetry/opentelemetry-log-collection v0.21.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e gopkg.in/yaml.v2 v2.4.0 ) @@ -28,7 +28,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rogpeppe/go-internal v1.6.1 // indirect github.com/spf13/cast v1.4.1 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/udplogreceiver/go.sum b/receiver/udplogreceiver/go.sum index 2a7546391255..00a5b78a5db0 100644 --- a/receiver/udplogreceiver/go.sum +++ b/receiver/udplogreceiver/go.sum @@ -1129,12 +1129,12 @@ 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.31.0/go.mod h1:A9vKmEa2MI/vJXNUoRinq9w25ZMmxWJLYXYELHkBEw0= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.31.0/go.mod h1:PcHNnM+RUl0uD8VkSn93PO78N7kQYhfqpI/eki57pl4= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib v0.21.0/go.mod h1:EH4yDYeNoaTqn/8yCWQmfNB78VHfGX2Jt2bvnvzBlGM= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.21.0/go.mod h1:Vm5u/mtkj1OMhtao0v+BGo2LUoLCgHYXvRmj0jWITlE= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 3eb32cc69093..1efbaa397c12 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) @@ -26,7 +26,7 @@ require ( github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/cast v1.4.1 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 // indirect + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e // indirect go.opentelemetry.io/otel v1.0.0 // indirect go.opentelemetry.io/otel/metric v0.23.0 // indirect go.opentelemetry.io/otel/trace v1.0.0 // indirect diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index a2c820451243..5692eb670ce8 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -390,11 +390,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 8ab161114153..1b5cfe9f3eb4 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -5,8 +5,8 @@ go 1.17 require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 ) diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 4e86b584637b..497006df5370 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/zipkinreceiver/go.mod b/receiver/zipkinreceiver/go.mod index 1d5580a5bb24..49c69f586df6 100644 --- a/receiver/zipkinreceiver/go.mod +++ b/receiver/zipkinreceiver/go.mod @@ -8,8 +8,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.36.0 github.com/openzipkin/zipkin-go v0.2.5 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e google.golang.org/protobuf v1.27.1 ) diff --git a/receiver/zipkinreceiver/go.sum b/receiver/zipkinreceiver/go.sum index ee52eb0d2c51..9894792c88d7 100644 --- a/receiver/zipkinreceiver/go.sum +++ b/receiver/zipkinreceiver/go.sum @@ -985,11 +985,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 9875a464df44..5f5d441005c5 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -7,8 +7,8 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.36.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/scraperhelper v0.36.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index 37366ac2b5a2..6048d5e81b96 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -416,11 +416,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go b/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go index 03483a62a324..103e9c63c609 100644 --- a/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go +++ b/receiver/zookeeperreceiver/internal/metadata/generated_metrics.go @@ -168,7 +168,7 @@ var Metrics = &metricStruct{ metric.SetUnit("1") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -233,7 +233,7 @@ var Metrics = &metricStruct{ metric.SetUnit("1") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ @@ -244,7 +244,7 @@ var Metrics = &metricStruct{ metric.SetUnit("1") metric.SetDataType(pdata.MetricDataTypeSum) metric.Sum().SetIsMonotonic(true) - metric.Sum().SetAggregationTemporality(pdata.AggregationTemporalityCumulative) + metric.Sum().SetAggregationTemporality(pdata.MetricAggregationTemporalityCumulative) }, }, &metricImpl{ diff --git a/testbed/datasenders/jaeger.go b/testbed/datasenders/jaeger.go index 5b1fa3376e03..7b1921ee1e84 100644 --- a/testbed/datasenders/jaeger.go +++ b/testbed/datasenders/jaeger.go @@ -52,7 +52,7 @@ func (je *jaegerGRPCDataSender) Start() error { // Disable sending queue, we should push data from the caller goroutine. cfg.QueueSettings.Enabled = false cfg.Endpoint = je.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = &configtls.TLSClientSetting{ Insecure: true, } params := componenttest.NewNopExporterCreateSettings() diff --git a/testbed/datasenders/opencensus.go b/testbed/datasenders/opencensus.go index abcc1579d2f5..f5fa218dd154 100644 --- a/testbed/datasenders/opencensus.go +++ b/testbed/datasenders/opencensus.go @@ -33,7 +33,7 @@ type ocDataSender struct { func (ods *ocDataSender) fillConfig(cfg *opencensusexporter.Config) *opencensusexporter.Config { cfg.Endpoint = ods.GetEndpoint().String() - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = &configtls.TLSClientSetting{ Insecure: true, } return cfg diff --git a/testbed/go.mod b/testbed/go.mod index 95f75dd82493..173d7f103810 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -26,8 +26,8 @@ require ( github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02 github.com/shirou/gopsutil v3.21.8+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/atomic v1.9.0 go.uber.org/zap v1.19.1 golang.org/x/text v0.3.7 diff --git a/testbed/go.sum b/testbed/go.sum index ade1cd8c5dca..7fb76fc5ac6f 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1460,11 +1460,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0 h1:1hCzM7mwQbFQgk3Q4lAVEsGV6NB4Uj6Jt3EU+OiSBc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0 h1:qW6j1kJU24yo2xIu16Py4m4AXn1dd+s2uKllGnTFAm0= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 65ea1aad4d45..523c67042e59 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -4,8 +4,8 @@ go 1.17 require ( github.com/gorilla/mux v1.8.0 - go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1 - go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 + go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e + go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e go.uber.org/zap v1.19.1 ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index c8b16ebf85bf..111d9db9a744 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -373,11 +373,11 @@ 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.36.1-0.20210927115055-45a848d8abe1 h1:rjDEdQEWbwijXnKfW0JWKR4LOesLXiBobRt6lqlRmXo= -go.opentelemetry.io/collector v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e h1:RgVhrq6K2vDlezD6iFQoPoakvyiWPfUjKTu/I6uQNa4= +go.opentelemetry.io/collector v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:JlxQbf/HOLld0JcP1jo7DWrA5w0HX9qZZjHJO75Oiy0= go.opentelemetry.io/collector/model v0.36.0/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1 h1:XajRuuMlca0dBOsK1d9/faAcskEI6ZDhUS0nrd5XZdU= -go.opentelemetry.io/collector/model v0.36.1-0.20210927115055-45a848d8abe1/go.mod h1:+7YCSjJG+MqiIFjauzt7oM2qkqBsaJWh5hcsO4fwsAc= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e h1:d4pAfuyfjjq39C0DoaMp2AzRMRJ3uJduQ8BPYEsLfBY= +go.opentelemetry.io/collector/model v0.36.1-0.20210927193005-ebb0fbd6f23e/go.mod h1:ESh1oWDNdS4fTg9sTFoYuiuvs8QuaX8yNGTPix3JZc8= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.24.0/go.mod h1:O0cG0vP6TP3c323kh70JmeG1jN69Sn9Z5HxgmeASFWY= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.24.0/go.mod h1:7W3JSDYTtH3qKKHrS1fMiwLtK7iZFLPq1+7htfspX/E= go.opentelemetry.io/contrib/zpages v0.24.0/go.mod h1:/dZbBvWhnvD1wWk0xaTdRpqDuPorUGZgOVZwgsdaDsM= diff --git a/testbed/testbed/in_process_collector.go b/testbed/testbed/in_process_collector.go index b995250dbfed..634181c28cfb 100644 --- a/testbed/testbed/in_process_collector.go +++ b/testbed/testbed/in_process_collector.go @@ -51,7 +51,7 @@ func (ipp *inProcessCollector) PrepareConfig(configStr string) (configCleanup fu func (ipp *inProcessCollector) Start(args StartParams) error { settings := service.CollectorSettings{ - BuildInfo: component.DefaultBuildInfo(), + BuildInfo: component.NewDefaultBuildInfo(), Factories: ipp.factories, ConfigMapProvider: parserprovider.NewInMemoryMapProvider(strings.NewReader(ipp.configStr)), } diff --git a/testbed/testbed/senders.go b/testbed/testbed/senders.go index a3ec52a025f5..9be47f57d4f8 100644 --- a/testbed/testbed/senders.go +++ b/testbed/testbed/senders.go @@ -114,7 +114,7 @@ func (ods *otlpHTTPDataSender) fillConfig(cfg *otlphttpexporter.Config) *otlphtt cfg.RetrySettings.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueSettings.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = &configtls.TLSClientSetting{ Insecure: true, } return cfg @@ -244,7 +244,7 @@ func (ods *otlpDataSender) fillConfig(cfg *otlpexporter.Config) *otlpexporter.Co cfg.RetrySettings.Enabled = false // Disable sending queue, we should push data from the caller goroutine. cfg.QueueSettings.Enabled = false - cfg.TLSSetting = configtls.TLSClientSetting{ + cfg.TLSSetting = &configtls.TLSClientSetting{ Insecure: true, } return cfg