From 8c985f8d1b9d82634486e446a998b0c089f89452 Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Mon, 15 Mar 2021 07:57:30 -0700 Subject: [PATCH] Update core to latest, fix breaking change in exporter helper Push funcs (#2688) Signed-off-by: Bogdan Drutu --- .../alibabacloudlogserviceexporter/go.mod | 2 +- .../alibabacloudlogserviceexporter/go.sum | 6 +-- .../logs_exporter.go | 7 +-- .../logsdata_to_logservice.go | 9 ++-- .../logsdata_to_logservice_test.go | 3 +- .../metrics_exporter.go | 7 +-- .../metricsdata_to_logservice.go | 4 +- .../metricsdata_to_logservice_test.go | 3 +- .../trace_exporter.go | 6 +-- .../tracedata_to_logservice.go | 4 +- .../tracedata_to_logservice_test.go | 3 +- exporter/awsemfexporter/emf_exporter.go | 14 +++--- exporter/awsemfexporter/emf_exporter_test.go | 12 ++--- exporter/awsemfexporter/go.mod | 2 +- exporter/awsemfexporter/go.sum | 8 ++-- exporter/awskinesisexporter/go.mod | 2 +- exporter/awskinesisexporter/go.sum | 8 ++-- .../awsprometheusremotewriteexporter/go.mod | 2 +- .../awsprometheusremotewriteexporter/go.sum | 8 ++-- exporter/awsxrayexporter/awsxray.go | 10 ++--- exporter/awsxrayexporter/go.mod | 2 +- exporter/awsxrayexporter/go.sum | 8 ++-- exporter/azuremonitorexporter/go.mod | 2 +- exporter/azuremonitorexporter/go.sum | 8 ++-- .../azuremonitorexporter/traceexporter.go | 6 +-- .../traceexporter_test.go | 13 ++---- exporter/carbonexporter/exporter.go | 8 ++-- exporter/carbonexporter/exporter_test.go | 3 +- exporter/carbonexporter/go.mod | 2 +- exporter/carbonexporter/go.sum | 8 ++-- exporter/datadogexporter/factory.go | 8 ++-- exporter/datadogexporter/go.mod | 2 +- exporter/datadogexporter/go.sum | 8 ++-- exporter/datadogexporter/metrics_exporter.go | 6 +-- .../datadogexporter/metrics_exporter_test.go | 4 +- exporter/datadogexporter/traces_exporter.go | 4 +- .../datadogexporter/traces_exporter_test.go | 3 +- exporter/dynatraceexporter/go.mod | 2 +- exporter/dynatraceexporter/go.sum | 8 ++-- .../dynatraceexporter/metrics_exporter.go | 14 +++--- .../metrics_exporter_test.go | 44 ++++++------------ exporter/elasticexporter/exporter.go | 16 +++---- exporter/elasticexporter/go.mod | 2 +- exporter/elasticexporter/go.sum | 8 ++-- exporter/elasticsearchexporter/exporter.go | 2 +- exporter/elasticsearchexporter/go.mod | 2 +- exporter/elasticsearchexporter/go.sum | 8 ++-- exporter/f5cloudexporter/go.mod | 2 +- exporter/f5cloudexporter/go.sum | 8 ++-- exporter/honeycombexporter/go.mod | 2 +- exporter/honeycombexporter/go.sum | 8 ++-- exporter/honeycombexporter/honeycomb.go | 7 +-- exporter/jaegerthrifthttpexporter/exporter.go | 14 +++--- exporter/jaegerthrifthttpexporter/go.mod | 2 +- exporter/jaegerthrifthttpexporter/go.sum | 8 ++-- exporter/loadbalancingexporter/go.mod | 2 +- exporter/loadbalancingexporter/go.sum | 8 ++-- exporter/logzioexporter/exporter.go | 12 +++-- exporter/logzioexporter/exporter_test.go | 6 +-- exporter/logzioexporter/go.mod | 2 +- exporter/logzioexporter/go.sum | 8 ++-- exporter/lokiexporter/exporter.go | 16 +++---- exporter/lokiexporter/exporter_test.go | 8 +--- exporter/lokiexporter/go.mod | 4 +- exporter/lokiexporter/go.sum | 8 ++-- exporter/newrelicexporter/go.mod | 2 +- exporter/newrelicexporter/go.sum | 8 ++-- exporter/newrelicexporter/newrelic.go | 20 ++++----- exporter/sapmexporter/exporter.go | 12 ++--- exporter/sapmexporter/exporter_test.go | 4 +- exporter/sapmexporter/go.mod | 2 +- exporter/sapmexporter/go.sum | 8 ++-- exporter/sentryexporter/go.mod | 2 +- exporter/sentryexporter/go.sum | 8 ++-- exporter/sentryexporter/sentry_exporter.go | 8 ++-- .../correlation/correlation.go | 6 +-- exporter/signalfxexporter/exporter.go | 11 ++--- exporter/signalfxexporter/exporter_test.go | 2 +- exporter/signalfxexporter/go.mod | 2 +- exporter/signalfxexporter/go.sum | 8 ++-- exporter/splunkhecexporter/client.go | 45 +++++++------------ exporter/splunkhecexporter/exporter.go | 6 +-- exporter/splunkhecexporter/exporter_test.go | 32 +++++-------- exporter/splunkhecexporter/go.mod | 2 +- exporter/splunkhecexporter/go.sum | 8 ++-- exporter/stackdriverexporter/go.mod | 2 +- exporter/stackdriverexporter/go.sum | 8 ++-- exporter/stackdriverexporter/stackdriver.go | 12 +++-- exporter/sumologicexporter/exporter.go | 16 +++---- exporter/sumologicexporter/exporter_test.go | 31 +++++-------- exporter/sumologicexporter/go.mod | 2 +- exporter/sumologicexporter/go.sum | 8 ++-- exporter/uptraceexporter/exporter.go | 10 ++--- exporter/uptraceexporter/exporter_test.go | 7 +-- exporter/uptraceexporter/go.mod | 2 +- exporter/uptraceexporter/go.sum | 8 ++-- extension/httpforwarder/go.mod | 2 +- extension/httpforwarder/go.sum | 6 +-- extension/observer/hostobserver/go.mod | 2 +- extension/observer/hostobserver/go.sum | 8 ++-- extension/observer/k8sobserver/go.mod | 2 +- extension/observer/k8sobserver/go.sum | 8 ++-- go.mod | 2 +- go.sum | 8 ++-- internal/splunk/go.mod | 2 +- internal/splunk/go.sum | 6 +-- internal/stanza/go.mod | 2 +- internal/stanza/go.sum | 6 +-- pkg/batchperresourceattr/go.mod | 2 +- pkg/batchperresourceattr/go.sum | 6 +-- pkg/batchpersignal/go.mod | 2 +- pkg/batchpersignal/go.sum | 6 +-- pkg/batchpertrace/go.mod | 2 +- pkg/batchpertrace/go.sum | 6 +-- processor/groupbyattrsprocessor/go.mod | 2 +- processor/groupbyattrsprocessor/go.sum | 8 ++-- processor/groupbytraceprocessor/go.mod | 2 +- processor/groupbytraceprocessor/go.sum | 6 +-- processor/k8sprocessor/go.mod | 2 +- processor/k8sprocessor/go.sum | 8 ++-- processor/metricstransformprocessor/go.mod | 2 +- processor/metricstransformprocessor/go.sum | 8 ++-- processor/resourcedetectionprocessor/go.mod | 2 +- processor/resourcedetectionprocessor/go.sum | 8 ++-- processor/routingprocessor/go.mod | 2 +- processor/routingprocessor/go.sum | 8 ++-- processor/spanmetricsprocessor/go.mod | 2 +- processor/spanmetricsprocessor/go.sum | 8 ++-- processor/tailsamplingprocessor/go.mod | 2 +- processor/tailsamplingprocessor/go.sum | 8 ++-- .../awsecscontainermetricsreceiver/go.mod | 2 +- .../awsecscontainermetricsreceiver/go.sum | 8 ++-- receiver/awsxrayreceiver/go.mod | 2 +- receiver/awsxrayreceiver/go.sum | 8 ++-- receiver/carbonreceiver/go.mod | 2 +- receiver/carbonreceiver/go.sum | 8 ++-- receiver/collectdreceiver/go.mod | 2 +- receiver/collectdreceiver/go.sum | 8 ++-- receiver/dockerstatsreceiver/go.mod | 2 +- receiver/dockerstatsreceiver/go.sum | 8 ++-- receiver/dotnetdiagnosticsreceiver/go.mod | 2 +- receiver/dotnetdiagnosticsreceiver/go.sum | 8 ++-- receiver/filelogreceiver/go.mod | 2 +- receiver/filelogreceiver/go.sum | 8 ++-- receiver/jmxreceiver/go.mod | 2 +- receiver/jmxreceiver/go.sum | 8 ++-- receiver/k8sclusterreceiver/go.mod | 2 +- receiver/k8sclusterreceiver/go.sum | 6 +-- receiver/kafkametricsreceiver/go.mod | 2 +- receiver/kafkametricsreceiver/go.sum | 8 ++-- receiver/kubeletstatsreceiver/go.mod | 2 +- receiver/kubeletstatsreceiver/go.sum | 8 ++-- receiver/memcachedreceiver/go.mod | 2 +- receiver/memcachedreceiver/go.sum | 8 ++-- receiver/nginxreceiver/go.mod | 2 +- receiver/nginxreceiver/go.sum | 8 ++-- receiver/prometheusexecreceiver/go.mod | 4 +- receiver/prometheusexecreceiver/go.sum | 8 ++-- receiver/receivercreator/go.mod | 2 +- receiver/receivercreator/go.sum | 8 ++-- receiver/redisreceiver/go.mod | 2 +- receiver/redisreceiver/go.sum | 6 +-- receiver/sapmreceiver/go.mod | 2 +- receiver/sapmreceiver/go.sum | 8 ++-- receiver/signalfxreceiver/go.mod | 2 +- receiver/signalfxreceiver/go.sum | 8 ++-- receiver/simpleprometheusreceiver/go.mod | 4 +- receiver/simpleprometheusreceiver/go.sum | 8 ++-- receiver/splunkhecreceiver/go.mod | 2 +- receiver/splunkhecreceiver/go.sum | 8 ++-- receiver/statsdreceiver/go.mod | 2 +- receiver/statsdreceiver/go.sum | 8 ++-- receiver/wavefrontreceiver/go.mod | 2 +- receiver/wavefrontreceiver/go.sum | 8 ++-- receiver/windowsperfcountersreceiver/go.mod | 2 +- receiver/windowsperfcountersreceiver/go.sum | 8 ++-- receiver/zookeeperreceiver/go.mod | 2 +- receiver/zookeeperreceiver/go.sum | 8 ++-- testbed/go.mod | 2 +- testbed/go.sum | 8 ++-- .../mockawsxrayreceiver/go.mod | 2 +- .../mockawsxrayreceiver/go.sum | 6 +-- 182 files changed, 535 insertions(+), 627 deletions(-) diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index e213acf0f02cf..8abb59a3126c0 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index ded34dd826a55..52d319c70729c 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -753,7 +753,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -904,8 +904,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/alibabacloudlogserviceexporter/logs_exporter.go b/exporter/alibabacloudlogserviceexporter/logs_exporter.go index e0fc466457fe0..ec2e7ef063137 100644 --- a/exporter/alibabacloudlogserviceexporter/logs_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/logs_exporter.go @@ -49,10 +49,11 @@ type logServiceLogsSender struct { func (s *logServiceLogsSender) pushLogsData( ctx context.Context, - md pdata.Logs) (droppedTimeSeries int, err error) { - slsLogs, dropped := logDataToLogService(md) + md pdata.Logs) error { + var err error + slsLogs := logDataToLogService(md) if len(slsLogs) > 0 { err = s.client.SendLogs(slsLogs) } - return dropped, err + return err } diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go index cffd08131cdf4..1365e948fb6ef 100644 --- a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice.go @@ -42,8 +42,7 @@ const ( slsLogInstrumentationVersion = "otlp.version" ) -func logDataToLogService(ld pdata.Logs) ([]*sls.Log, int) { - numDroppedLogs := 0 +func logDataToLogService(ld pdata.Logs) []*sls.Log { slsLogs := make([]*sls.Log, 0) rls := ld.ResourceLogs() for i := 0; i < rls.Len(); i++ { @@ -57,16 +56,14 @@ func logDataToLogService(ld pdata.Logs) ([]*sls.Log, int) { logs := ils.Logs() for j := 0; j < logs.Len(); j++ { slsLog := mapLogRecordToLogService(logs.At(j), resourceContents, instrumentationLibraryContents) - if slsLog == nil { - numDroppedLogs++ - } else { + if slsLog != nil { slsLogs = append(slsLogs, slsLog) } } } } - return slsLogs, numDroppedLogs + return slsLogs } func resourceToLogContents(resource pdata.Resource) []*sls.LogContent { diff --git a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go index f88793ff8d734..73c566b0fb7be 100644 --- a/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/logsdata_to_logservice_test.go @@ -100,9 +100,8 @@ func createLogData(numberOfLogs int) pdata.Logs { func TestLogsDataToLogService(t *testing.T) { totalLogCount := 10 validLogCount := totalLogCount - 1 - gotLogs, dropped := logDataToLogService(createLogData(10)) + gotLogs := logDataToLogService(createLogData(10)) assert.Equal(t, len(gotLogs), 9) - assert.Equal(t, dropped, 1) gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs)) diff --git a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go index 23a8491fa2110..757051549663f 100644 --- a/exporter/alibabacloudlogserviceexporter/metrics_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/metrics_exporter.go @@ -50,10 +50,11 @@ type logServiceMetricsSender struct { func (s *logServiceMetricsSender) pushMetricsData( _ context.Context, md pdata.Metrics, -) (droppedTimeSeries int, err error) { - logs, dts := metricsDataToLogServiceData(s.logger, md) +) error { + var err error + logs := metricsDataToLogServiceData(s.logger, md) if len(logs) > 0 { err = s.client.SendLogs(logs) } - return dts, err + return err } diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go index 587563e2041e7..e9195cc5bb276 100644 --- a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice.go @@ -357,7 +357,7 @@ func metricDataToLogServiceData(md pdata.Metric, defaultLabels KeyValues) (logs func metricsDataToLogServiceData( _ *zap.Logger, md pdata.Metrics, -) (logs []*sls.Log, numDroppedTimeSeries int) { +) (logs []*sls.Log) { resMetrics := md.ResourceMetrics() for i := 0; i < resMetrics.Len(); i++ { @@ -376,5 +376,5 @@ func metricsDataToLogServiceData( } } - return logs, numDroppedTimeSeries + return logs } diff --git a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go index d1e16fbd005b9..192dd339c607c 100644 --- a/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/metricsdata_to_logservice_test.go @@ -139,8 +139,7 @@ func TestMetricDataToLogService(t *testing.T) { doubleSummaryDataPoint.QuantileValues().Append(quantileVal) doubleSummaryDataPoint.QuantileValues().Append(quantileVal2) - gotLogs, gotNumDroppedTimeSeries := metricsDataToLogServiceData(logger, md) - assert.Equal(t, gotNumDroppedTimeSeries, 0) + gotLogs := metricsDataToLogServiceData(logger, md) gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs)) for _, log := range gotLogs { diff --git a/exporter/alibabacloudlogserviceexporter/trace_exporter.go b/exporter/alibabacloudlogserviceexporter/trace_exporter.go index a3387100ae0f8..a678d08f7daa8 100644 --- a/exporter/alibabacloudlogserviceexporter/trace_exporter.go +++ b/exporter/alibabacloudlogserviceexporter/trace_exporter.go @@ -50,11 +50,11 @@ type logServiceTraceSender struct { func (s *logServiceTraceSender) pushTraceData( _ context.Context, td pdata.Traces, -) (int, error) { +) error { var err error - slsLogs, dropped := traceDataToLogServiceData(td) + slsLogs := traceDataToLogServiceData(td) if len(slsLogs) > 0 { err = s.client.SendLogs(slsLogs) } - return dropped, err + return err } diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go index dcf986424673f..ec77782aa1b1a 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice.go @@ -44,14 +44,14 @@ const ( ) // traceDataToLogService translates trace data into the LogService format. -func traceDataToLogServiceData(td pdata.Traces) ([]*sls.Log, int) { +func traceDataToLogServiceData(td pdata.Traces) []*sls.Log { var slsLogs []*sls.Log resourceSpansSlice := td.ResourceSpans() for i := 0; i < resourceSpansSlice.Len(); i++ { logs := resourceSpansToLogServiceData(resourceSpansSlice.At(i)) slsLogs = append(slsLogs, logs...) } - return slsLogs, 0 + return slsLogs } func resourceSpansToLogServiceData(resourceSpans pdata.ResourceSpans) []*sls.Log { diff --git a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go index 9e46042c6aab7..108f44f254d29 100644 --- a/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go +++ b/exporter/alibabacloudlogserviceexporter/tracedata_to_logservice_test.go @@ -40,9 +40,8 @@ func (kv logKeyValuePairs) Swap(i, j int) { kv[i], kv[j] = kv[j], kv[i] } func (kv logKeyValuePairs) Less(i, j int) bool { return kv[i].Key < kv[j].Key } func TestTraceDataToLogService(t *testing.T) { - gotLogs, dropped := traceDataToLogServiceData(constructSpanData()) + gotLogs := traceDataToLogServiceData(constructSpanData()) assert.Equal(t, len(gotLogs), 2) - assert.Equal(t, dropped, 0) gotLogPairs := make([][]logKeyValuePair, 0, len(gotLogs)) diff --git a/exporter/awsemfexporter/emf_exporter.go b/exporter/awsemfexporter/emf_exporter.go index 75ec460dd1833..d44cb9cf3217b 100644 --- a/exporter/awsemfexporter/emf_exporter.go +++ b/exporter/awsemfexporter/emf_exporter.go @@ -102,7 +102,7 @@ func NewEmfExporter( ) } -func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (droppedTimeSeries int, err error) { +func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) error { rms := md.ResourceMetrics() labels := map[string]string{} for i := 0; i < rms.Len(); i++ { @@ -139,8 +139,7 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (dr if pusher != nil { returnError := pusher.AddLogEntry(putLogEvent) if returnError != nil { - err = wrapErrorIfBadRequest(&returnError) - return + return wrapErrorIfBadRequest(&returnError) } } } @@ -149,17 +148,17 @@ func (emf *emfExporter) pushMetricsData(_ context.Context, md pdata.Metrics) (dr returnError := pusher.ForceFlush() if returnError != nil { //TODO now we only have one pusher, so it's ok to return after first error occurred - err = wrapErrorIfBadRequest(&returnError) + err := wrapErrorIfBadRequest(&returnError) if err != nil { emf.logger.Error("Error force flushing logs. Skipping to next pusher.", zap.Error(err)) } - return + return err } } emf.logger.Info("Finish processing resource metrics", zap.Any("labels", labels)) - return + return nil } func (emf *emfExporter) getPusher(logGroup, logStream string) Pusher { @@ -195,8 +194,7 @@ func (emf *emfExporter) listPushers() []Pusher { } func (emf *emfExporter) ConsumeMetrics(ctx context.Context, md pdata.Metrics) error { - _, err := emf.pushMetricsData(ctx, md) - return err + return emf.pushMetricsData(ctx, md) } // Shutdown stops the exporter and is invoked during shutdown. diff --git a/exporter/awsemfexporter/emf_exporter_test.go b/exporter/awsemfexporter/emf_exporter_test.go index b5d493cb54a6b..976510aa49299 100644 --- a/exporter/awsemfexporter/emf_exporter_test.go +++ b/exporter/awsemfexporter/emf_exporter_test.go @@ -463,14 +463,10 @@ func TestPushMetricsDataWithErr(t *testing.T) { }, } md := internaldata.OCToMetrics(mdata) - _, err = exp.(*emfExporter).pushMetricsData(ctx, md) - assert.NotNil(t, err) - _, err = exp.(*emfExporter).pushMetricsData(ctx, md) - assert.NotNil(t, err) - _, err = exp.(*emfExporter).pushMetricsData(ctx, md) - assert.Nil(t, err) - err = exp.(*emfExporter).Shutdown(ctx) - assert.Nil(t, err) + assert.NotNil(t, exp.(*emfExporter).pushMetricsData(ctx, md)) + assert.NotNil(t, exp.(*emfExporter).pushMetricsData(ctx, md)) + assert.Nil(t, exp.(*emfExporter).pushMetricsData(ctx, md)) + assert.Nil(t, exp.(*emfExporter).Shutdown(ctx)) } func TestNewExporterWithoutConfig(t *testing.T) { diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod index bee1687c8e8ab..cb3cf9497dc74 100644 --- a/exporter/awsemfexporter/go.mod +++ b/exporter/awsemfexporter/go.mod @@ -17,7 +17,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum index 3502bc80b2ba8..2f69641555a32 100644 --- a/exporter/awsemfexporter/go.sum +++ b/exporter/awsemfexporter/go.sum @@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1046,8 +1046,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE= diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 0750801a83520..5a91dad07cfcf 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/signalfx/opencensus-go-exporter-kinesis v0.6.3 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awskinesisexporter/go.sum b/exporter/awskinesisexporter/go.sum index ffe0f3b8dcd14..ee2570ee3e59c 100644 --- a/exporter/awskinesisexporter/go.sum +++ b/exporter/awskinesisexporter/go.sum @@ -889,8 +889,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1076,8 +1076,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/awsprometheusremotewriteexporter/go.mod b/exporter/awsprometheusremotewriteexporter/go.mod index ef61325e03ba1..4cc989ae27959 100644 --- a/exporter/awsprometheusremotewriteexporter/go.mod +++ b/exporter/awsprometheusremotewriteexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/awsprometheusremotewriteexporter/go.sum b/exporter/awsprometheusremotewriteexporter/go.sum index 93078d161f9fe..15e9356e54860 100644 --- a/exporter/awsprometheusremotewriteexporter/go.sum +++ b/exporter/awsprometheusremotewriteexporter/go.sum @@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1046,8 +1046,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/awsxrayexporter/awsxray.go b/exporter/awsxrayexporter/awsxray.go index a11b2515380d2..705f2616f334b 100644 --- a/exporter/awsxrayexporter/awsxray.go +++ b/exporter/awsxrayexporter/awsxray.go @@ -48,9 +48,9 @@ func newTraceExporter( return exporterhelper.NewTraceExporter( config, logger, - func(ctx context.Context, td pdata.Traces) (totalDroppedSpans int, err error) { + func(ctx context.Context, td pdata.Traces) error { + var err error logger.Debug("TraceExporter", typeLog, nameLog, zap.Int("#spans", td.SpanCount())) - totalDroppedSpans = 0 documents := make([]*string, 0, td.SpanCount()) for i := 0; i < td.ResourceSpans().Len(); i++ { rspans := td.ResourceSpans().At(i) @@ -62,7 +62,6 @@ func newTraceExporter( config.(*Config).IndexedAttributes, config.(*Config).IndexAllAttributes) if localErr != nil { logger.Debug("Error translating span.", zap.Error(localErr)) - totalDroppedSpans++ continue } documents = append(documents, &document) @@ -83,15 +82,12 @@ func newTraceExporter( } if output != nil { logger.Debug("response: " + output.String()) - if output.UnprocessedTraceSegments != nil { - totalDroppedSpans += len(output.UnprocessedTraceSegments) - } } if err != nil { break } } - return totalDroppedSpans, err + return err }, exporterhelper.WithShutdown(func(context.Context) error { return logger.Sync() diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index b4a27d6626e1a..902bc72b6990c 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 93078d161f9fe..15e9356e54860 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1046,8 +1046,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 2d969d87c0df7..66881f386fa80 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 golang.org/x/net v0.0.0-20210119194325-5f4716e94777 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 1e4d62e11996f..0e17aff1d0d86 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -882,8 +882,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1056,8 +1056,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/azuremonitorexporter/traceexporter.go b/exporter/azuremonitorexporter/traceexporter.go index e484c931270fc..f8fbaff8beec9 100644 --- a/exporter/azuremonitorexporter/traceexporter.go +++ b/exporter/azuremonitorexporter/traceexporter.go @@ -58,15 +58,15 @@ func (v *traceVisitor) visit( return true } -func (exporter *traceExporter) onTraceData(context context.Context, traceData pdata.Traces) (droppedSpans int, err error) { +func (exporter *traceExporter) onTraceData(context context.Context, traceData pdata.Traces) error { spanCount := traceData.SpanCount() if spanCount == 0 { - return 0, nil + return nil } visitor := &traceVisitor{exporter: exporter} Accept(traceData, visitor) - return (spanCount - visitor.processed), visitor.err + return visitor.err } // Returns a new instance of the trace exporter diff --git a/exporter/azuremonitorexporter/traceexporter_test.go b/exporter/azuremonitorexporter/traceexporter_test.go index c9fe89b23d14a..dadd08d583c26 100644 --- a/exporter/azuremonitorexporter/traceexporter_test.go +++ b/exporter/azuremonitorexporter/traceexporter_test.go @@ -37,9 +37,7 @@ func TestExporterTraceDataCallbackNoSpans(t *testing.T) { traces := pdata.NewTraces() - droppedSpans, err := exporter.onTraceData(context.Background(), traces) - assert.Nil(t, err) - assert.Equal(t, 0, droppedSpans) + assert.NoError(t, exporter.onTraceData(context.Background(), traces)) mockTransportChannel.AssertNumberOfCalls(t, "Send", 0) } @@ -65,9 +63,7 @@ func TestExporterTraceDataCallbackSingleSpan(t *testing.T) { ilss.Spans().Resize(1) span.CopyTo(ilss.Spans().At(0)) - droppedSpans, err := exporter.onTraceData(context.Background(), traces) - assert.Nil(t, err) - assert.Equal(t, 0, droppedSpans) + assert.NoError(t, exporter.onTraceData(context.Background(), traces)) mockTransportChannel.AssertNumberOfCalls(t, "Send", 1) } @@ -97,10 +93,9 @@ func TestExporterTraceDataCallbackSingleSpanNoEnvelope(t *testing.T) { ilss.Spans().Resize(1) span.CopyTo(ilss.Spans().At(0)) - droppedSpans, err := exporter.onTraceData(context.Background(), traces) - assert.NotNil(t, err) + err := exporter.onTraceData(context.Background(), traces) + assert.Error(t, err) assert.True(t, consumererror.IsPermanent(err), "error should be permanent") - assert.Equal(t, 1, droppedSpans) mockTransportChannel.AssertNumberOfCalls(t, "Send", 0) } diff --git a/exporter/carbonexporter/exporter.go b/exporter/carbonexporter/exporter.go index b0492d395b102..cc8bb1d39e64a 100644 --- a/exporter/carbonexporter/exporter.go +++ b/exporter/carbonexporter/exporter.go @@ -58,15 +58,15 @@ type carbonSender struct { connPool *connPool } -func (cs *carbonSender) pushMetricsData(_ context.Context, md pdata.Metrics) (int, error) { - lines, converted, dropped := metricDataToPlaintext(internaldata.MetricsToOC(md)) +func (cs *carbonSender) pushMetricsData(_ context.Context, md pdata.Metrics) error { + lines, _, _ := metricDataToPlaintext(internaldata.MetricsToOC(md)) if _, err := cs.connPool.Write([]byte(lines)); err != nil { // Use the sum of converted and dropped since the write failed for all. - return converted + dropped, err + return err } - return dropped, nil + return nil } func (cs *carbonSender) Shutdown(context.Context) error { diff --git a/exporter/carbonexporter/exporter_test.go b/exporter/carbonexporter/exporter_test.go index 7130c7dc71400..113652f20c450 100644 --- a/exporter/carbonexporter/exporter_test.go +++ b/exporter/carbonexporter/exporter_test.go @@ -268,8 +268,7 @@ func Test_connPool_Concurrency(t *testing.T) { go func() { <-startCh for i := 0; i < writesPerRoutine; i++ { - _, err := sender.pushMetricsData(ctx, md) - assert.NoError(t, err) + assert.NoError(t, sender.pushMetricsData(ctx, md)) } writersWG.Done() }() diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 4e39a5ec2b3cf..0034afa800069 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/datadogexporter/factory.go b/exporter/datadogexporter/factory.go index 5465a85dab393..9b690a785090e 100644 --- a/exporter/datadogexporter/factory.go +++ b/exporter/datadogexporter/factory.go @@ -104,7 +104,7 @@ func createMetricsExporter( var pushMetricsFn exporterhelper.PushMetrics if cfg.OnlyMetadata { - pushMetricsFn = func(_ context.Context, md pdata.Metrics) (int, error) { + pushMetricsFn = func(_ context.Context, md pdata.Metrics) error { // only sending metadata use only metrics once := cfg.OnceMetadata() once.Do(func() { @@ -114,7 +114,7 @@ func createMetricsExporter( } go metadata.Pusher(ctx, params, cfg, attrs) }) - return 0, nil + return nil } } else { pushMetricsFn = newMetricsExporter(ctx, params, cfg).PushMetricsData @@ -154,7 +154,7 @@ func createTraceExporter( var pushTracesFn exporterhelper.PushTraces if cfg.OnlyMetadata { - pushTracesFn = func(_ context.Context, td pdata.Traces) (int, error) { + pushTracesFn = func(_ context.Context, td pdata.Traces) error { // only sending metadata, use only attributes once := cfg.OnceMetadata() once.Do(func() { @@ -164,7 +164,7 @@ func createTraceExporter( } go metadata.Pusher(ctx, params, cfg, attrs) }) - return 0, nil + return nil } } else { pushTracesFn = newTraceExporter(ctx, params, cfg).pushTraceData diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod index 96c932ea7b713..45eeff4728d18 100644 --- a/exporter/datadogexporter/go.mod +++ b/exporter/datadogexporter/go.mod @@ -19,7 +19,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/DataDog/dd-trace-go.v1 v1.28.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum index 91f7379d0b9d5..e8134a97f3429 100644 --- a/exporter/datadogexporter/go.sum +++ b/exporter/datadogexporter/go.sum @@ -897,8 +897,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1077,8 +1077,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/datadogexporter/metrics_exporter.go b/exporter/datadogexporter/metrics_exporter.go index 4dc31407c0926..cac18365d73c7 100644 --- a/exporter/datadogexporter/metrics_exporter.go +++ b/exporter/datadogexporter/metrics_exporter.go @@ -54,7 +54,7 @@ func newMetricsExporter(ctx context.Context, params component.ExporterCreatePara return &metricsExporter{params, cfg, ctx, client, prevPts} } -func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pdata.Metrics) (int, error) { +func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pdata.Metrics) error { // Start host metadata with resource attributes from // the first payload. @@ -69,10 +69,10 @@ func (exp *metricsExporter) PushMetricsData(ctx context.Context, md pdata.Metric }) } - ms, droppedTimeSeries := mapMetrics(exp.cfg.Metrics, exp.prevPts, md) + ms, _ := mapMetrics(exp.cfg.Metrics, exp.prevPts, md) metrics.ProcessMetrics(ms, exp.params.Logger, exp.cfg) err := exp.client.PostMetrics(ms) - return droppedTimeSeries, err + return err } diff --git a/exporter/datadogexporter/metrics_exporter_test.go b/exporter/datadogexporter/metrics_exporter_test.go index 954d42daf93af..74dc9f895825f 100644 --- a/exporter/datadogexporter/metrics_exporter_test.go +++ b/exporter/datadogexporter/metrics_exporter_test.go @@ -49,12 +49,12 @@ func TestNewExporter(t *testing.T) { // The client should have been created correctly exp := newMetricsExporter(context.Background(), params, cfg) assert.NotNil(t, exp) - _, _ = exp.PushMetricsData(context.Background(), testutils.TestMetrics.Clone()) + _ = exp.PushMetricsData(context.Background(), testutils.TestMetrics.Clone()) assert.Equal(t, len(server.MetadataChan), 0) cfg.SendMetadata = true cfg.UseResourceMetadata = true - _, _ = exp.PushMetricsData(context.Background(), testutils.TestMetrics.Clone()) + _ = exp.PushMetricsData(context.Background(), testutils.TestMetrics.Clone()) body := <-server.MetadataChan var recvMetadata metadata.HostMetadata err := json.Unmarshal(body, &recvMetadata) diff --git a/exporter/datadogexporter/traces_exporter.go b/exporter/datadogexporter/traces_exporter.go index 8a3471e29764c..997bfba793383 100644 --- a/exporter/datadogexporter/traces_exporter.go +++ b/exporter/datadogexporter/traces_exporter.go @@ -113,7 +113,7 @@ func newTraceExporter(ctx context.Context, params component.ExporterCreateParams func (exp *traceExporter) pushTraceData( ctx context.Context, td pdata.Traces, -) (int, error) { +) error { // Start host metadata with resource attributes from // the first payload. @@ -151,7 +151,7 @@ func (exp *traceExporter) pushTraceData( _ = exp.client.PostMetrics(ms) - return len(aggregatedTraces), nil + return nil } // gives us flexibility to add custom retry logic later diff --git a/exporter/datadogexporter/traces_exporter_test.go b/exporter/datadogexporter/traces_exporter_test.go index 0420bffb2a481..0f4ac5bc026b6 100644 --- a/exporter/datadogexporter/traces_exporter_test.go +++ b/exporter/datadogexporter/traces_exporter_test.go @@ -191,9 +191,8 @@ func TestPushTraceData(t *testing.T) { params := component.ExporterCreateParams{Logger: zap.NewNop()} exp := newTraceExporter(context.Background(), params, cfg) - tracesLength, err := exp.pushTraceData(context.Background(), testutils.TestTraces.Clone()) + err := exp.pushTraceData(context.Background(), testutils.TestTraces.Clone()) assert.NoError(t, err) - assert.Equal(t, 1, tracesLength) body := <-server.MetadataChan var recvMetadata metadata.HostMetadata diff --git a/exporter/dynatraceexporter/go.mod b/exporter/dynatraceexporter/go.mod index 9c7917e6ed1f7..f15e507b7ee71 100644 --- a/exporter/dynatraceexporter/go.mod +++ b/exporter/dynatraceexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/dynatraceexporter/go.sum b/exporter/dynatraceexporter/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/exporter/dynatraceexporter/go.sum +++ b/exporter/dynatraceexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/dynatraceexporter/metrics_exporter.go b/exporter/dynatraceexporter/metrics_exporter.go index ce8b3d9c22a2d..f9eaba32fd226 100644 --- a/exporter/dynatraceexporter/metrics_exporter.go +++ b/exporter/dynatraceexporter/metrics_exporter.go @@ -61,26 +61,26 @@ const ( maxMetricKeyLen = 250 ) -func (e *exporter) PushMetricsData(ctx context.Context, md pdata.Metrics) (int, error) { +func (e *exporter) PushMetricsData(ctx context.Context, md pdata.Metrics) error { if e.isDisabled { - return md.MetricCount(), nil + return nil } - lines, dropped := e.serializeMetrics(md) + lines, _ := e.serializeMetrics(md) // If request is empty string, there are no serializable metrics in the batch. // This can happen if all metric names are invalid if len(lines) == 0 { - return md.MetricCount(), nil + return nil } - droppedByCluster, err := e.send(ctx, lines) + _, err := e.send(ctx, lines) if err != nil { - return md.MetricCount(), err + return err } - return dropped + droppedByCluster, nil + return nil } func (e *exporter) serializeMetrics(md pdata.Metrics) ([]string, int) { diff --git a/exporter/dynatraceexporter/metrics_exporter_test.go b/exporter/dynatraceexporter/metrics_exporter_test.go index 372d195e729aa..071a28a55c3af 100644 --- a/exporter/dynatraceexporter/metrics_exporter_test.go +++ b/exporter/dynatraceexporter/metrics_exporter_test.go @@ -136,11 +136,10 @@ func Test_exporter_PushMetricsData(t *testing.T) { md pdata.Metrics } test := struct { - name string - fields fields - args args - wantDroppedTimeSeries int - wantErr bool + name string + fields fields + args args + wantErr bool }{ name: "Send metric data", fields: fields{ @@ -157,8 +156,7 @@ func Test_exporter_PushMetricsData(t *testing.T) { ctx: context.Background(), md: md, }, - wantErr: false, - wantDroppedTimeSeries: 1, + wantErr: false, } t.Run(test.name, func(t *testing.T) { @@ -167,14 +165,11 @@ func Test_exporter_PushMetricsData(t *testing.T) { cfg: test.fields.cfg, client: test.fields.client, } - gotDroppedTimeSeries, err := e.PushMetricsData(test.args.ctx, test.args.md) + err := e.PushMetricsData(test.args.ctx, test.args.md) if (err != nil) != test.wantErr { t.Errorf("exporter.PushMetricsData() error = %v, wantErr %v", err, test.wantErr) return } - if gotDroppedTimeSeries != test.wantDroppedTimeSeries { - t.Errorf("exporter.PushMetricsData() = %v, want %v", gotDroppedTimeSeries, test.wantDroppedTimeSeries) - } }) if wantBody := "prefix.int_gauge 10 100\nprefix.int_sum 10 100\nprefix.double_histogram gauge,min=9.5,max=9.5,sum=19,count=2 100\nprefix.double_gauge 10.1 100\nprefix.double_sum 10.1 100\nprefix.double_histogram gauge,min=5.05,max=5.05,sum=10.1,count=2 100"; sent != wantBody { @@ -209,14 +204,11 @@ func Test_exporter_PushMetricsData_EmptyPayload(t *testing.T) { }, client: ts.Client(), } - gotDroppedTimeSeries, err := e.PushMetricsData(context.Background(), md) + err := e.PushMetricsData(context.Background(), md) if err != nil { t.Errorf("exporter.PushMetricsData() error = %v", err) return } - if gotDroppedTimeSeries != md.MetricCount() { - t.Errorf("Expected %d metrics to be reported dropped, got %d", md.MetricCount(), gotDroppedTimeSeries) - } } func Test_exporter_PushMetricsData_isDisabled(t *testing.T) { @@ -254,14 +246,11 @@ func Test_exporter_PushMetricsData_isDisabled(t *testing.T) { client: ts.Client(), isDisabled: true, } - gotDroppedTimeSeries, err := e.PushMetricsData(context.Background(), md) + err := e.PushMetricsData(context.Background(), md) if err != nil { t.Errorf("exporter.PushMetricsData() error = %v", err) return } - if gotDroppedTimeSeries != md.MetricCount() { - t.Errorf("Expected %d metrics to be reported dropped, got %d", md.MetricCount(), gotDroppedTimeSeries) - } } func Test_exporter_send_BadRequest(t *testing.T) { @@ -458,11 +447,10 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { md pdata.Metrics } test := struct { - name string - fields fields - args args - wantDroppedTimeSeries int - wantErr bool + name string + fields fields + args args + wantErr bool }{ name: "When the client errors, all timeseries are assumed to be dropped", fields: fields{ @@ -479,8 +467,7 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { ctx: context.Background(), md: md, }, - wantErr: true, - wantDroppedTimeSeries: 1, + wantErr: true, } t.Run(test.name, func(t *testing.T) { @@ -489,14 +476,11 @@ func Test_exporter_PushMetricsData_Error(t *testing.T) { cfg: test.fields.cfg, client: test.fields.client, } - gotDroppedTimeSeries, err := e.PushMetricsData(test.args.ctx, test.args.md) + err := e.PushMetricsData(test.args.ctx, test.args.md) if (err != nil) != test.wantErr { t.Errorf("exporter.PushMetricsData() error = %v, wantErr %v", err, test.wantErr) return } - if gotDroppedTimeSeries != test.wantDroppedTimeSeries { - t.Errorf("exporter.PushMetricsData() = %v, want %v", gotDroppedTimeSeries, test.wantDroppedTimeSeries) - } }) } diff --git a/exporter/elasticexporter/exporter.go b/exporter/elasticexporter/exporter.go index 60b2653ffc828..28d629fcb17b6 100644 --- a/exporter/elasticexporter/exporter.go +++ b/exporter/elasticexporter/exporter.go @@ -44,19 +44,17 @@ func newElasticTraceExporter( if err != nil { return nil, fmt.Errorf("cannot configure Elastic APM trace exporter: %v", err) } - return exporterhelper.NewTraceExporter(cfg, params.Logger, func(ctx context.Context, traces pdata.Traces) (int, error) { - var dropped int + return exporterhelper.NewTraceExporter(cfg, params.Logger, func(ctx context.Context, traces pdata.Traces) error { var errs []error resourceSpansSlice := traces.ResourceSpans() for i := 0; i < resourceSpansSlice.Len(); i++ { resourceSpans := resourceSpansSlice.At(i) - n, err := exporter.ExportResourceSpans(ctx, resourceSpans) + _, err := exporter.ExportResourceSpans(ctx, resourceSpans) if err != nil { errs = append(errs, err) } - dropped += n } - return dropped, consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) }) } @@ -68,19 +66,17 @@ func newElasticMetricsExporter( if err != nil { return nil, fmt.Errorf("cannot configure Elastic APM metrics exporter: %v", err) } - return exporterhelper.NewMetricsExporter(cfg, params.Logger, func(ctx context.Context, input pdata.Metrics) (int, error) { - var dropped int + return exporterhelper.NewMetricsExporter(cfg, params.Logger, func(ctx context.Context, input pdata.Metrics) error { var errs []error resourceMetricsSlice := input.ResourceMetrics() for i := 0; i < resourceMetricsSlice.Len(); i++ { resourceMetrics := resourceMetricsSlice.At(i) - n, err := exporter.ExportResourceMetrics(ctx, resourceMetrics) + _, err := exporter.ExportResourceMetrics(ctx, resourceMetrics) if err != nil { errs = append(errs, err) } - dropped += n } - return dropped, consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) }) } diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 9964d009e4689..a93ca4fb5f667 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/stretchr/testify v1.7.0 go.elastic.co/apm v1.9.1-0.20201218004853-18a8126106c6 go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect howett.net/plist v0.0.0-20201026045517-117a925f2150 // indirect diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index c6b25219eb253..6ec5df5616f87 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -885,8 +885,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1064,8 +1064,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/elasticsearchexporter/exporter.go b/exporter/elasticsearchexporter/exporter.go index dad0ba65465ed..d3bced17a28ce 100644 --- a/exporter/elasticsearchexporter/exporter.go +++ b/exporter/elasticsearchexporter/exporter.go @@ -86,7 +86,7 @@ func (e *elasticsearchExporter) Shutdown(ctx context.Context) error { return e.bulkIndexer.Close(ctx) } -func (e *elasticsearchExporter) pushLogsData(ctx context.Context, ld pdata.Logs) (dropped int, err error) { +func (e *elasticsearchExporter) pushLogsData(ctx context.Context, ld pdata.Logs) error { panic("TODO") } diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 823896f92a4fb..61a2e91ec3fa1 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index fc0c1c8db8277..47efbfb79265a 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -876,8 +876,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1047,8 +1047,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 0e431f612483e..af54d4fc24eff 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 golang.org/x/oauth2 v0.0.0-20210210192628-66670185b0cd google.golang.org/api v0.40.0 diff --git a/exporter/f5cloudexporter/go.sum b/exporter/f5cloudexporter/go.sum index 7e1241c1e3b78..f780c48ce5b5f 100644 --- a/exporter/f5cloudexporter/go.sum +++ b/exporter/f5cloudexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 59ffa229056ac..62c5dea4224d3 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index 06537e4b58b60..7fdd3d912901a 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -892,8 +892,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1067,8 +1067,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go index 0c833b511d733..17d7411365276 100644 --- a/exporter/honeycombexporter/honeycomb.go +++ b/exporter/honeycombexporter/honeycomb.go @@ -101,9 +101,8 @@ func newHoneycombTraceExporter(cfg *Config, logger *zap.Logger) (*honeycombExpor // pushTraceData is the method called when trace data is available. It will be // responsible for sending a batch of events. -func (e *honeycombExporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, error) { +func (e *honeycombExporter) pushTraceData(ctx context.Context, td pdata.Traces) error { var errs []error - goodSpans := 0 // Run the error logger. This just listens for messages in the error // response queue and writes them out using the logger. @@ -167,14 +166,12 @@ func (e *honeycombExporter) pushTraceData(ctx context.Context, td pdata.Traces) if err := ev.SendPresampled(); err != nil { errs = append(errs, err) - } else { - goodSpans++ } } } } - return td.SpanCount() - goodSpans, consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) } func getSpanKind(kind pdata.SpanKind) string { diff --git a/exporter/jaegerthrifthttpexporter/exporter.go b/exporter/jaegerthrifthttpexporter/exporter.go index 0abef5cb44ec9..4c854d48db0fe 100644 --- a/exporter/jaegerthrifthttpexporter/exporter.go +++ b/exporter/jaegerthrifthttpexporter/exporter.go @@ -78,7 +78,7 @@ type jaegerThriftHTTPSender struct { func (s *jaegerThriftHTTPSender) pushTraceData( _ context.Context, td pdata.Traces, -) (droppedSpans int, err error) { +) error { rss := td.ResourceSpans() for i := 0; i < rss.Len(); i++ { var octd traceData @@ -86,17 +86,17 @@ func (s *jaegerThriftHTTPSender) pushTraceData( tBatch, err := oCProtoToJaegerThrift(octd) if err != nil { - return td.SpanCount(), consumererror.Permanent(err) + return consumererror.Permanent(err) } body, err := serializeThrift(tBatch) if err != nil { - return td.SpanCount(), err + return err } req, err := http.NewRequest("POST", s.url, body) if err != nil { - return td.SpanCount(), err + return err } req.Header.Set("Content-Type", "application/x-thrift") @@ -108,7 +108,7 @@ func (s *jaegerThriftHTTPSender) pushTraceData( resp, err := s.client.Do(req) if err != nil { - return td.SpanCount(), err + return err } io.Copy(ioutil.Discard, resp.Body) @@ -119,11 +119,11 @@ func (s *jaegerThriftHTTPSender) pushTraceData( "HTTP %d %q", resp.StatusCode, http.StatusText(resp.StatusCode)) - return td.SpanCount(), err + return err } } - return 0, nil + return nil } func serializeThrift(obj thrift.TStruct) (*bytes.Buffer, error) { diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 4224d05489c7f..69d65aa8d12a3 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/loadbalancingexporter/go.mod b/exporter/loadbalancingexporter/go.mod index c2655c579374e..56138abe4f41e 100644 --- a/exporter/loadbalancingexporter/go.mod +++ b/exporter/loadbalancingexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/exporter/loadbalancingexporter/go.sum b/exporter/loadbalancingexporter/go.sum index 5855a9d6dc791..7c91c8f7ab2f7 100644 --- a/exporter/loadbalancingexporter/go.sum +++ b/exporter/loadbalancingexporter/go.sum @@ -855,8 +855,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1025,8 +1025,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/logzioexporter/exporter.go b/exporter/logzioexporter/exporter.go index 0fe17d35e8844..ce00fcaca56ba 100644 --- a/exporter/logzioexporter/exporter.go +++ b/exporter/logzioexporter/exporter.go @@ -95,26 +95,24 @@ func newLogzioMetricsExporter(config *Config, params component.ExporterCreatePar exporterhelper.WithShutdown(exporter.Shutdown)) } -func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces pdata.Traces) (droppedSpansCount int, err error) { - droppedSpans := 0 +func (exporter *logzioExporter) pushTraceData(ctx context.Context, traces pdata.Traces) error { batches, err := exporter.InternalTracesToJaegerTraces(traces) if err != nil { - return traces.SpanCount(), err + return err } for _, batch := range batches { for _, span := range batch.Spans { span.Process = batch.Process if err := exporter.WriteSpanFunc(ctx, span); err != nil { exporter.logger.Debug(fmt.Sprintf("dropped bad span: %s", span.String())) - droppedSpans++ } } } - return droppedSpans, nil + return nil } -func (exporter *logzioExporter) pushMetricsData(ctx context.Context, md pdata.Metrics) (int, error) { - return 0, nil +func (exporter *logzioExporter) pushMetricsData(ctx context.Context, md pdata.Metrics) error { + return nil } func (exporter *logzioExporter) Shutdown(ctx context.Context) error { diff --git a/exporter/logzioexporter/exporter_test.go b/exporter/logzioexporter/exporter_test.go index 89abc45699d01..19e08a569a931 100644 --- a/exporter/logzioexporter/exporter_test.go +++ b/exporter/logzioexporter/exporter_test.go @@ -114,8 +114,8 @@ func TestWriteSpanError(tester *testing.T) { exporter.WriteSpanFunc = func(context.Context, *model.Span) error { return errors.New("fail") } - droppedSpans, _ := exporter.pushTraceData(context.Background(), internaldata.OCToTraces(nil, nil, testSpans)) - assert.Equal(tester, 1, droppedSpans) + err := exporter.pushTraceData(context.Background(), internaldata.OCToTraces(nil, nil, testSpans)) + assert.NoError(tester, err) } func TestConversionTraceError(tester *testing.T) { @@ -130,7 +130,7 @@ func TestConversionTraceError(tester *testing.T) { exporter.InternalTracesToJaegerTraces = func(td pdata.Traces) ([]*model.Batch, error) { return nil, errors.New("fail") } - _, err := exporter.pushTraceData(context.Background(), internaldata.OCToTraces(nil, nil, testSpans)) + err := exporter.pushTraceData(context.Background(), internaldata.OCToTraces(nil, nil, testSpans)) assert.Error(tester, err) } diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod index 5989deedfcc5a..1c3d333565106 100644 --- a/exporter/logzioexporter/go.mod +++ b/exporter/logzioexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum index 6a2b248d801ad..5dea812df554e 100644 --- a/exporter/logzioexporter/go.sum +++ b/exporter/logzioexporter/go.sum @@ -898,8 +898,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1076,8 +1076,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/lokiexporter/exporter.go b/exporter/lokiexporter/exporter.go index 5d50a60330e70..9fd0cd773230c 100644 --- a/exporter/lokiexporter/exporter.go +++ b/exporter/lokiexporter/exporter.go @@ -56,23 +56,23 @@ func newExporter(config *Config, logger *zap.Logger) (*lokiExporter, error) { }, nil } -func (l *lokiExporter) pushLogData(ctx context.Context, ld pdata.Logs) (numDroppedLogs int, err error) { +func (l *lokiExporter) pushLogData(ctx context.Context, ld pdata.Logs) error { l.wg.Add(1) defer l.wg.Done() - pushReq, numDroppedLogs := l.logDataToLoki(ld) + pushReq, _ := l.logDataToLoki(ld) if len(pushReq.Streams) == 0 { - return ld.LogRecordCount(), consumererror.Permanent(fmt.Errorf("failed to transform logs into Loki log streams")) + return consumererror.Permanent(fmt.Errorf("failed to transform logs into Loki log streams")) } buf, err := encode(pushReq) if err != nil { - return ld.LogRecordCount(), consumererror.Permanent(err) + return consumererror.Permanent(err) } req, err := http.NewRequestWithContext(ctx, "POST", l.config.HTTPClientSettings.Endpoint, bytes.NewReader(buf)) if err != nil { - return ld.LogRecordCount(), consumererror.Permanent(err) + return consumererror.Permanent(err) } for k, v := range l.config.HTTPClientSettings.Headers { @@ -86,7 +86,7 @@ func (l *lokiExporter) pushLogData(ctx context.Context, ld pdata.Logs) (numDropp resp, err := l.client.Do(req) if err != nil { - return ld.LogRecordCount(), consumererror.PartialLogsError(err, ld) + return consumererror.PartialLogsError(err, ld) } _, _ = io.Copy(ioutil.Discard, resp.Body) @@ -94,10 +94,10 @@ func (l *lokiExporter) pushLogData(ctx context.Context, ld pdata.Logs) (numDropp if resp.StatusCode < http.StatusOK || resp.StatusCode >= http.StatusMultipleChoices { err = fmt.Errorf("HTTP %d %q", resp.StatusCode, http.StatusText(resp.StatusCode)) - return ld.LogRecordCount(), consumererror.PartialLogsError(err, ld) + return consumererror.PartialLogsError(err, ld) } - return numDroppedLogs, nil + return nil } func encode(pb proto.Message) ([]byte, error) { diff --git a/exporter/lokiexporter/exporter_test.go b/exporter/lokiexporter/exporter_test.go index 3fb0b1ab55d26..181273b7ef18d 100644 --- a/exporter/lokiexporter/exporter_test.go +++ b/exporter/lokiexporter/exporter_test.go @@ -151,7 +151,6 @@ func TestExporter_pushLogData(t *testing.T) { testServer bool config *Config genLogsFunc func() pdata.Logs - numDroppedLogs int errFunc func(err error) }{ { @@ -169,7 +168,6 @@ func TestExporter_pushLogData(t *testing.T) { httpResponseCode: http.StatusInternalServerError, testServer: true, genLogsFunc: genericGenLogsFunc, - numDroppedLogs: 10, errFunc: func(err error) { e := err.(consumererror.PartialError) require.Equal(t, 10, e.GetLogs().LogRecordCount()) @@ -182,7 +180,6 @@ func TestExporter_pushLogData(t *testing.T) { httpResponseCode: 0, testServer: false, genLogsFunc: genericGenLogsFunc, - numDroppedLogs: 10, errFunc: func(err error) { e := err.(consumererror.PartialError) require.Equal(t, 10, e.GetLogs().LogRecordCount()) @@ -200,7 +197,6 @@ func TestExporter_pushLogData(t *testing.T) { "not.a.match": pdata.NewAttributeValueString("random"), })) }, - numDroppedLogs: 10, errFunc: func(err error) { require.True(t, consumererror.IsPermanent(err)) require.Equal(t, "Permanent error: failed to transform logs into Loki log streams", err.Error()) @@ -231,7 +227,6 @@ func TestExporter_pushLogData(t *testing.T) { return outLogs }, - numDroppedLogs: 5, }, } for _, tt := range tests { @@ -256,7 +251,7 @@ func TestExporter_pushLogData(t *testing.T) { err = exp.start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) - numDroppedLogs, err := exp.pushLogData(context.Background(), tt.genLogsFunc()) + err = exp.pushLogData(context.Background(), tt.genLogsFunc()) if tt.errFunc != nil { tt.errFunc(err) @@ -264,7 +259,6 @@ func TestExporter_pushLogData(t *testing.T) { } assert.NoError(t, err) - assert.Equal(t, tt.numDroppedLogs, numDroppedLogs) }) } } diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index 8ec72b3fc6d54..6070c889bb3ba 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -13,10 +13,10 @@ require ( github.com/onsi/ginkgo v1.14.1 // indirect github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect - github.com/prometheus/common v0.18.0 + github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/lokiexporter/go.sum b/exporter/lokiexporter/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/exporter/lokiexporter/go.sum +++ b/exporter/lokiexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index bcc85b74c222c..1903d6b8df4b2 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/genproto v0.0.0-20210302174412-5ede27ff9881 google.golang.org/grpc v1.36.0 diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index f090a14133a79..482c8e2a84824 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -876,8 +876,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1047,8 +1047,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/newrelicexporter/newrelic.go b/exporter/newrelicexporter/newrelic.go index b52ac41745617..2a7cad202392f 100644 --- a/exporter/newrelicexporter/newrelic.go +++ b/exporter/newrelicexporter/newrelic.go @@ -138,10 +138,9 @@ func (e *exporter) extractInsertKeyFromHeader(ctx context.Context) string { return values[0] } -func (e exporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, error) { +func (e exporter) pushTraceData(ctx context.Context, td pdata.Traces) error { var ( - errs []error - goodSpans int + errs []error ) var batch telemetry.SpanBatch @@ -162,7 +161,6 @@ func (e exporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, erro } spans = append(spans, nrSpan) - goodSpans++ } batch.Spans = append(batch.Spans, spans...) } @@ -179,14 +177,14 @@ func (e exporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, erro } if err != nil { e.logger.Error("Failed to build batch", zap.Error(err)) - return 0, err + return err } // Execute the http request and handle the response response, err := http.DefaultClient.Do(req) if err != nil { e.logger.Error("Error making HTTP request.", zap.Error(err)) - return 0, &urlError{Err: err} + return &urlError{Err: err} } defer response.Body.Close() io.Copy(ioutil.Discard, response.Body) @@ -200,16 +198,15 @@ func (e exporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, erro e.logger.Debug("Error on HTTP response.", zap.String("Status", response.Status)) } - return 0, &httpError{Response: response} + return &httpError{Response: response} } - return td.SpanCount() - goodSpans, consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) } -func (e exporter) pushMetricData(ctx context.Context, md pdata.Metrics) (int, error) { +func (e exporter) pushMetricData(ctx context.Context, md pdata.Metrics) error { var errs []error - goodMetrics := 0 ocmds := internaldata.MetricsToOC(md) for _, ocmd := range ocmds { @@ -234,13 +231,12 @@ func (e exporter) pushMetricData(ctx context.Context, md pdata.Metrics) (int, er for _, m := range nrMetrics { e.harvester.RecordMetric(m) } - goodMetrics++ } } e.harvester.HarvestNow(ctx) - return md.MetricCount() - goodMetrics, consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) } func (e exporter) Shutdown(ctx context.Context) error { diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go index 6c2027663cc0a..085fdfefa900d 100644 --- a/exporter/sapmexporter/exporter.go +++ b/exporter/sapmexporter/exporter.go @@ -101,17 +101,17 @@ func newSAPMTraceExporter(cfg *Config, params component.ExporterCreateParams) (c // pushTraceData exports traces in SAPM proto by associated SFx access token and returns number of dropped spans // and the last experienced error if any translation or export failed -func (se *sapmExporter) pushTraceData(ctx context.Context, td pdata.Traces) (int, error) { +func (se *sapmExporter) pushTraceData(ctx context.Context, td pdata.Traces) error { rss := td.ResourceSpans() if rss.Len() == 0 { - return 0, nil + return nil } // All metrics in the pdata.Metrics will have the same access token because of the BatchPerResourceMetrics. accessToken := se.retrieveAccessToken(rss.At(0)) batches, err := jaeger.InternalTracesToJaegerProto(td) if err != nil { - return td.SpanCount(), consumererror.Permanent(err) + return consumererror.Permanent(err) } // Cannot remove the access token from the pdata, because exporters required to not modify incoming pdata, @@ -121,12 +121,12 @@ func (se *sapmExporter) pushTraceData(ctx context.Context, td pdata.Traces) (int err = se.client.ExportWithAccessToken(ctx, batches, accessToken) if err != nil { if sendErr, ok := err.(*sapmclient.ErrSend); ok && sendErr.Permanent { - return td.SpanCount(), consumererror.Permanent(sendErr) + return consumererror.Permanent(sendErr) } - return td.SpanCount(), err + return err } - return 0, nil + return nil } func (se *sapmExporter) retrieveAccessToken(md pdata.ResourceSpans) string { diff --git a/exporter/sapmexporter/exporter_test.go b/exporter/sapmexporter/exporter_test.go index d69e9b4e2419a..d95d906178f4b 100644 --- a/exporter/sapmexporter/exporter_test.go +++ b/exporter/sapmexporter/exporter_test.go @@ -224,13 +224,11 @@ func TestSAPMClientTokenUsageAndErrorMarshalling(t *testing.T) { assert.NotNil(t, se, "failed to create trace exporter") trace := buildTestTrace(!tt.translateError) - dropped, err := se.pushTraceData(context.Background(), trace) + err = se.pushTraceData(context.Background(), trace) if tt.sendError || tt.translateError { - assert.Equal(t, 2, dropped) require.Error(t, err) } else { - assert.Equal(t, 0, dropped) require.NoError(t, err) } }) diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 65d84aeb2dc9f..1a6a5aa49e8e9 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.0.0-00010101000000-000000000000 github.com/signalfx/sapm-proto v0.7.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 338d541301223..255cc9b5fc1a0 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -951,8 +951,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1156,8 +1156,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/sentryexporter/go.mod b/exporter/sentryexporter/go.mod index 19872c3302e42..31a7998484b72 100644 --- a/exporter/sentryexporter/go.mod +++ b/exporter/sentryexporter/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sentryexporter/go.sum b/exporter/sentryexporter/go.sum index 789a1df4812e1..2ffd31f08b29d 100644 --- a/exporter/sentryexporter/go.sum +++ b/exporter/sentryexporter/go.sum @@ -933,8 +933,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1118,8 +1118,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/sentryexporter/sentry_exporter.go b/exporter/sentryexporter/sentry_exporter.go index 1d871eb9f32e1..60cd8044471ac 100644 --- a/exporter/sentryexporter/sentry_exporter.go +++ b/exporter/sentryexporter/sentry_exporter.go @@ -49,10 +49,10 @@ type SentryExporter struct { // pushTraceData takes an incoming OpenTelemetry trace, converts them into Sentry spans and transactions // and sends them using Sentry's transport. -func (s *SentryExporter) pushTraceData(_ context.Context, td pdata.Traces) (droppedSpans int, err error) { +func (s *SentryExporter) pushTraceData(_ context.Context, td pdata.Traces) error { resourceSpans := td.ResourceSpans() if resourceSpans.Len() == 0 { - return 0, nil + return nil } maybeOrphanSpans := make([]*sentry.Span, 0, td.SpanCount()) @@ -96,7 +96,7 @@ func (s *SentryExporter) pushTraceData(_ context.Context, td pdata.Traces) (drop } if len(transactionMap) == 0 { - return 0, nil + return nil } // After the first pass through, we can't necessarily make the assumption we have not associated all @@ -107,7 +107,7 @@ func (s *SentryExporter) pushTraceData(_ context.Context, td pdata.Traces) (drop s.transport.SendTransactions(transactions) - return 0, nil + return nil } // generateTransactions creates a set of Sentry transactions from a transaction map and orphan spans. diff --git a/exporter/signalfxexporter/correlation/correlation.go b/exporter/signalfxexporter/correlation/correlation.go index 8eeaa198ac423..a60a8d5c83691 100644 --- a/exporter/signalfxexporter/correlation/correlation.go +++ b/exporter/signalfxexporter/correlation/correlation.go @@ -89,9 +89,9 @@ func newCorrelationClient(cfg *Config, accessToken string, params component.Expo // AddSpans processes the provided spans to correlate the services and environment observed // to the resources (host, pods, etc.) emitting the spans. -func (cor *Tracker) AddSpans(ctx context.Context, traces pdata.Traces) (dropped int, err error) { +func (cor *Tracker) AddSpans(ctx context.Context, traces pdata.Traces) error { if cor == nil || traces.ResourceSpans().Len() == 0 { - return + return nil } cor.once.Do(func() { @@ -131,7 +131,7 @@ func (cor *Tracker) AddSpans(ctx context.Context, traces pdata.Traces) (dropped cor.traceTracker.AddSpansGeneric(ctx, spanListWrap{traces.ResourceSpans()}) } - return + return nil } // Start correlation tracking. diff --git a/exporter/signalfxexporter/exporter.go b/exporter/signalfxexporter/exporter.go index 515945ae73076..c53d28633be29 100644 --- a/exporter/signalfxexporter/exporter.go +++ b/exporter/signalfxexporter/exporter.go @@ -182,14 +182,15 @@ func newEventExporter(config *Config, logger *zap.Logger) (*signalfxExporter, er }, nil } -func (se *signalfxExporter) pushMetrics(ctx context.Context, md pdata.Metrics) (int, error) { - numDroppedTimeSeries, err := se.pushMetricsData(ctx, md) +func (se *signalfxExporter) pushMetrics(ctx context.Context, md pdata.Metrics) error { + _, err := se.pushMetricsData(ctx, md) if err == nil && se.hostMetadataSyncer != nil { se.hostMetadataSyncer.Sync(md) } - return numDroppedTimeSeries, err + return err } -func (se *signalfxExporter) pushLogs(ctx context.Context, ld pdata.Logs) (int, error) { - return se.pushLogsData(ctx, ld) +func (se *signalfxExporter) pushLogs(ctx context.Context, ld pdata.Logs) error { + _, err := se.pushLogsData(ctx, ld) + return err } diff --git a/exporter/signalfxexporter/exporter_test.go b/exporter/signalfxexporter/exporter_test.go index 2053475b575bb..150490e1d32e3 100644 --- a/exporter/signalfxexporter/exporter_test.go +++ b/exporter/signalfxexporter/exporter_test.go @@ -480,7 +480,7 @@ func TestNewEventExporter(t *testing.T) { // This is expected to fail. ld := makeSampleResourceLogs() - _, err = got.pushLogs(context.Background(), ld) + err = got.pushLogs(context.Background(), ld) assert.Error(t, err) } diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 6df4636755324..e64a850b2b306 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201202163743-65b4fa925fc8 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 83a477be3ba20..1572a9e3e2fd5 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -882,8 +882,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1071,8 +1071,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/splunkhecexporter/client.go b/exporter/splunkhecexporter/client.go index 602c9d2dab9aa..25d26b4340810 100644 --- a/exporter/splunkhecexporter/client.go +++ b/exporter/splunkhecexporter/client.go @@ -48,23 +48,23 @@ type client struct { func (c *client) pushMetricsData( ctx context.Context, md pdata.Metrics, -) (droppedTimeSeries int, err error) { +) error { c.wg.Add(1) defer c.wg.Done() - splunkDataPoints, numDroppedTimeseries := metricDataToSplunk(c.logger, md, c.config) + splunkDataPoints, _ := metricDataToSplunk(c.logger, md, c.config) if len(splunkDataPoints) == 0 { - return numDroppedTimeseries, nil + return nil } body, compressed, err := encodeBody(&c.zippers, splunkDataPoints, c.config.DisableCompression) if err != nil { - return numMetricPoint(md), consumererror.Permanent(err) + return consumererror.Permanent(err) } req, err := http.NewRequestWithContext(ctx, "POST", c.url.String(), body) if err != nil { - return numMetricPoint(md), consumererror.Permanent(err) + return consumererror.Permanent(err) } for k, v := range c.headers { @@ -77,7 +77,7 @@ func (c *client) pushMetricsData( resp, err := c.client.Do(req) if err != nil { - return numMetricPoint(md), err + return err } io.Copy(ioutil.Discard, resp.Body) @@ -89,30 +89,25 @@ func (c *client) pushMetricsData( "HTTP %d %q", resp.StatusCode, http.StatusText(resp.StatusCode)) - return numMetricPoint(md), err + return err } - return numDroppedTimeseries, nil + return nil } func (c *client) pushTraceData( ctx context.Context, td pdata.Traces, -) (droppedSpans int, err error) { +) error { c.wg.Add(1) defer c.wg.Done() - splunkEvents, numDroppedSpans := traceDataToSplunk(c.logger, td, c.config) + splunkEvents, _ := traceDataToSplunk(c.logger, td, c.config) if len(splunkEvents) == 0 { - return numDroppedSpans, nil + return nil } - err = c.sendSplunkEvents(ctx, splunkEvents) - if err != nil { - return td.SpanCount(), err - } - - return numDroppedSpans, nil + return c.sendSplunkEvents(ctx, splunkEvents) } func (c *client) sendSplunkEvents(ctx context.Context, splunkEvents []*splunk.Event) error { @@ -153,21 +148,16 @@ func (c *client) sendSplunkEvents(ctx context.Context, splunkEvents []*splunk.Ev return nil } -func (c *client) pushLogData(ctx context.Context, ld pdata.Logs) (numDroppedLogs int, err error) { +func (c *client) pushLogData(ctx context.Context, ld pdata.Logs) error { c.wg.Add(1) defer c.wg.Done() splunkEvents := logDataToSplunk(c.logger, ld, c.config) if len(splunkEvents) == 0 { - return 0, nil - } - - err = c.sendSplunkEvents(ctx, splunkEvents) - if err != nil { - return ld.LogRecordCount(), err + return nil } - return 0, nil + return c.sendSplunkEvents(ctx, splunkEvents) } func encodeBodyEvents(zippers *sync.Pool, evs []*splunk.Event, disableCompression bool) (bodyReader io.Reader, compressed bool, err error) { @@ -223,8 +213,3 @@ func (c *client) stop(context context.Context) error { func (c *client) start(context.Context, component.Host) (err error) { return nil } - -func numMetricPoint(md pdata.Metrics) int { - _, numPoints := md.MetricAndDataPointCount() - return numPoints -} diff --git a/exporter/splunkhecexporter/exporter.go b/exporter/splunkhecexporter/exporter.go index 3c7f77edf1b0f..7ae9fcd3d8240 100644 --- a/exporter/splunkhecexporter/exporter.go +++ b/exporter/splunkhecexporter/exporter.go @@ -41,9 +41,9 @@ const ( ) type splunkExporter struct { - pushMetricsData func(ctx context.Context, md pdata.Metrics) (droppedTimeSeries int, err error) - pushTraceData func(ctx context.Context, td pdata.Traces) (numDroppedSpans int, err error) - pushLogData func(ctx context.Context, td pdata.Logs) (numDroppedSpans int, err error) + pushMetricsData func(ctx context.Context, md pdata.Metrics) error + pushTraceData func(ctx context.Context, td pdata.Traces) error + pushLogData func(ctx context.Context, td pdata.Logs) error stop func(ctx context.Context) (err error) start func(ctx context.Context, host component.Host) (err error) } diff --git a/exporter/splunkhecexporter/exporter_test.go b/exporter/splunkhecexporter/exporter_test.go index b67878eddf759..4f1ab6f60081d 100644 --- a/exporter/splunkhecexporter/exporter_test.go +++ b/exporter/splunkhecexporter/exporter_test.go @@ -75,12 +75,11 @@ func TestConsumeMetricsData(t *testing.T) { }, } tests := []struct { - name string - md internaldata.MetricsData - reqTestFunc func(t *testing.T, r *http.Request) - httpResponseCode int - numDroppedTimeSeries int - wantErr bool + name string + md internaldata.MetricsData + reqTestFunc func(t *testing.T, r *http.Request) + httpResponseCode int + wantErr bool }{ { name: "happy_path", @@ -111,12 +110,11 @@ func TestConsumeMetricsData(t *testing.T) { httpResponseCode: http.StatusAccepted, }, { - name: "response_forbidden", - md: smallBatch, - reqTestFunc: nil, - httpResponseCode: http.StatusForbidden, - numDroppedTimeSeries: 1, - wantErr: true, + name: "response_forbidden", + md: smallBatch, + reqTestFunc: nil, + httpResponseCode: http.StatusForbidden, + wantErr: true, }, { name: "large_batch", @@ -151,9 +149,7 @@ func TestConsumeMetricsData(t *testing.T) { sender := buildClient(options, config, zap.NewNop()) md := internaldata.OCToMetrics(tt.md) - numDroppedTimeSeries, err := sender.pushMetricsData(context.Background(), md) - assert.Equal(t, tt.numDroppedTimeSeries, numDroppedTimeSeries) - + err = sender.pushMetricsData(context.Background(), md) if tt.wantErr { assert.Error(t, err) return @@ -227,7 +223,6 @@ func TestConsumeLogsData(t *testing.T) { ld pdata.Logs reqTestFunc func(t *testing.T, r *http.Request) httpResponseCode int - numDroppedLogs int wantErr bool }{ { @@ -263,7 +258,6 @@ func TestConsumeLogsData(t *testing.T) { ld: smallBatch, reqTestFunc: nil, httpResponseCode: http.StatusForbidden, - numDroppedLogs: 1, wantErr: true, }, { @@ -298,9 +292,7 @@ func TestConsumeLogsData(t *testing.T) { } sender := buildClient(options, config, zap.NewNop()) - numDroppedLogs, err := sender.pushLogData(context.Background(), tt.ld) - assert.Equal(t, tt.numDroppedLogs, numDroppedLogs) - + err = sender.pushLogData(context.Background(), tt.ld) if tt.wantErr { assert.Error(t, err) return diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 8799d04469080..55baff4edb313 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index d85c91085ba03..339c8b0345c21 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -856,8 +856,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1026,8 +1026,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 35a7628c0cf3e..5556939a96924 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -16,7 +16,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.opentelemetry.io/otel v0.18.0 go.opentelemetry.io/otel/sdk v0.18.0 go.opentelemetry.io/otel/trace v0.18.0 diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index 1454d27f78932..4e5e9574c5c49 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -882,8 +882,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1053,8 +1053,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY= diff --git a/exporter/stackdriverexporter/stackdriver.go b/exporter/stackdriverexporter/stackdriver.go index 98462770fadad..11a18446889f6 100644 --- a/exporter/stackdriverexporter/stackdriver.go +++ b/exporter/stackdriverexporter/stackdriver.go @@ -179,7 +179,7 @@ func newStackdriverMetricsExporter(cfg *Config, params component.ExporterCreateP } // pushMetrics calls StackdriverExporter.PushMetricsProto on each element of the given metrics -func (me *metricsExporter) pushMetrics(ctx context.Context, m pdata.Metrics) (int, error) { +func (me *metricsExporter) pushMetrics(ctx context.Context, m pdata.Metrics) error { // PushMetricsProto doesn't bundle subsequent calls, so we need to // combine the data here to avoid generating too many RPC calls. mds := internaldata.MetricsToOC(m) @@ -205,16 +205,14 @@ func (me *metricsExporter) pushMetrics(ctx context.Context, m pdata.Metrics) (in // (which we just moved to individual metrics). dropped, err := me.mexporter.PushMetricsProto(ctx, nil, nil, metrics) recordPointCount(ctx, points-dropped, dropped, err) - return dropped, err + return err } // pushTraces calls texporter.ExportSpan for each span in the given traces -func (te *traceExporter) pushTraces(ctx context.Context, td pdata.Traces) (int, error) { +func (te *traceExporter) pushTraces(ctx context.Context, td pdata.Traces) error { var errs []error resourceSpans := td.ResourceSpans() - numSpans := td.SpanCount() - spans := make([]*traceexport.SpanSnapshot, 0, numSpans) - + spans := make([]*traceexport.SpanSnapshot, 0, td.SpanCount()) for i := 0; i < resourceSpans.Len(); i++ { sd := pdataResourceSpansToOTSpanData(resourceSpans.At(i)) spans = append(spans, sd...) @@ -224,7 +222,7 @@ func (te *traceExporter) pushTraces(ctx context.Context, td pdata.Traces) (int, if err != nil { errs = append(errs, err) } - return numSpans - len(spans), consumererror.CombineErrors(errs) + return consumererror.CombineErrors(errs) } func numPoints(metrics []*metricspb.Metric) int { diff --git a/exporter/sumologicexporter/exporter.go b/exporter/sumologicexporter/exporter.go index 5bb27ea7eccde..41f8db1876ea4 100644 --- a/exporter/sumologicexporter/exporter.go +++ b/exporter/sumologicexporter/exporter.go @@ -138,7 +138,7 @@ func newMetricsExporter( // pushLogsData groups data with common metadata and sends them as separate batched requests. // It returns the number of unsent logs and an error which contains a list of dropped records // so they can be handled by OTC retry mechanism -func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) (int, error) { +func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) error { var ( currentMetadata fields = newFields(pdata.NewAttributeMap()) previousMetadata fields = newFields(pdata.NewAttributeMap()) @@ -149,7 +149,7 @@ func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) (i c, err := newCompressor(se.config.CompressEncoding) if err != nil { - return 0, consumererror.PartialLogsError(fmt.Errorf("failed to initialize compressor: %w", err), ld) + return consumererror.PartialLogsError(fmt.Errorf("failed to initialize compressor: %w", err), ld) } sdr := newSender(se.config, se.client, se.filter, se.sources, c, se.prometheusFormatter) @@ -224,16 +224,16 @@ func (se *sumologicexporter) pushLogsData(ctx context.Context, ld pdata.Logs) (i logs.Append(log) } - return len(droppedRecords), consumererror.PartialLogsError(consumererror.CombineErrors(errs), droppedLogs) + return consumererror.PartialLogsError(consumererror.CombineErrors(errs), droppedLogs) } - return 0, nil + return nil } // pushMetricsData groups data with common metadata and send them as separate batched requests // it returns number of unsent metrics and error which contains list of dropped records // so they can be handle by the OTC retry mechanism -func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pdata.Metrics) (int, error) { +func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pdata.Metrics) error { var ( currentMetadata fields = newFields(pdata.NewAttributeMap()) previousMetadata fields = newFields(pdata.NewAttributeMap()) @@ -244,7 +244,7 @@ func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pdata.Metri c, err := newCompressor(se.config.CompressEncoding) if err != nil { - return 0, consumererror.PartialMetricsError(fmt.Errorf("failed to initialize compressor: %w", err), md) + return consumererror.PartialMetricsError(fmt.Errorf("failed to initialize compressor: %w", err), md) } sdr := newSender(se.config, se.client, se.filter, se.sources, c, se.prometheusFormatter) @@ -316,8 +316,8 @@ func (se *sumologicexporter) pushMetricsData(ctx context.Context, md pdata.Metri ilms.At(0).Metrics().Append(record.metric) } - return len(droppedRecords), consumererror.PartialMetricsError(consumererror.CombineErrors(errs), droppedMetrics) + return consumererror.PartialMetricsError(consumererror.CombineErrors(errs), droppedMetrics) } - return 0, nil + return nil } diff --git a/exporter/sumologicexporter/exporter_test.go b/exporter/sumologicexporter/exporter_test.go index 660e8eaf69a24..51f4b1b918b5e 100644 --- a/exporter/sumologicexporter/exporter_test.go +++ b/exporter/sumologicexporter/exporter_test.go @@ -120,7 +120,7 @@ func TestAllSuccess(t *testing.T) { logs := LogRecordsToLogs(exampleLog()) - _, err := test.exp.pushLogsData(context.Background(), logs) + err := test.exp.pushLogsData(context.Background(), logs) assert.NoError(t, err) } @@ -143,7 +143,7 @@ func TestResourceMerge(t *testing.T) { logs.ResourceLogs().At(0).Resource().Attributes().InsertString("key1", "overwrite_value") logs.ResourceLogs().At(0).Resource().Attributes().InsertString("key2", "additional_value") - _, err = test.exp.pushLogsData(context.Background(), logs) + err = test.exp.pushLogsData(context.Background(), logs) assert.NoError(t, err) } @@ -161,9 +161,8 @@ func TestAllFailed(t *testing.T) { logs := LogRecordsToLogs(exampleTwoLogs()) - dropped, err := test.exp.pushLogsData(context.Background(), logs) + err := test.exp.pushLogsData(context.Background(), logs) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, 2, dropped) partial, ok := err.(consumererror.PartialError) require.True(t, ok) @@ -195,9 +194,8 @@ func TestPartiallyFailed(t *testing.T) { logs := LogRecordsToLogs(records) expected := LogRecordsToLogs(records[:1]) - dropped, err := test.exp.pushLogsData(context.Background(), logs) + err = test.exp.pushLogsData(context.Background(), logs) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, 1, dropped) partial, ok := err.(consumererror.PartialError) require.True(t, ok) @@ -247,7 +245,7 @@ func TestPushInvalidCompressor(t *testing.T) { test.exp.config.CompressEncoding = "invalid" - _, err := test.exp.pushLogsData(context.Background(), logs) + err := test.exp.pushLogsData(context.Background(), logs) assert.EqualError(t, err, "failed to initialize compressor: invalid format: invalid") } @@ -284,9 +282,8 @@ func TestPushFailedBatch(t *testing.T) { logs.ResourceLogs().Append(log) } - count, err := test.exp.pushLogsData(context.Background(), logs) + err := test.exp.pushLogsData(context.Background(), logs) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, maxBufferSize, count) } func TestAllMetricsSuccess(t *testing.T) { @@ -308,7 +305,7 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 exampleIntGaugeMetric(), }) - _, err := test.exp.pushMetricsData(context.Background(), metrics) + err := test.exp.pushMetricsData(context.Background(), metrics) assert.NoError(t, err) } @@ -333,9 +330,8 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 exampleIntGaugeMetric(), }) - dropped, err := test.exp.pushMetricsData(context.Background(), metrics) + err := test.exp.pushMetricsData(context.Background(), metrics) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, 2, dropped) partial, ok := err.(consumererror.PartialError) require.True(t, ok) @@ -371,9 +367,8 @@ gauge_metric_name{foo="bar",remote_name="156955",url="http://another_url"} 245 1 metrics := metricPairToMetrics(records) expected := metricPairToMetrics(records[:1]) - dropped, err := test.exp.pushMetricsData(context.Background(), metrics) + err := test.exp.pushMetricsData(context.Background(), metrics) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, 1, dropped) partial, ok := err.(consumererror.PartialError) require.True(t, ok) @@ -397,7 +392,7 @@ func TestPushMetricsInvalidCompressor(t *testing.T) { test.exp.config.CompressEncoding = "invalid" - _, err := test.exp.pushMetricsData(context.Background(), metrics) + err := test.exp.pushMetricsData(context.Background(), metrics) assert.EqualError(t, err, "failed to initialize compressor: invalid format: invalid") } @@ -438,9 +433,8 @@ gauge_metric_name{foo="bar",key2="value2",remote_name="156955",url="http://anoth metrics := metricPairToMetrics(records) expected := metricPairToMetrics(records[:1]) - dropped, err := test.exp.pushMetricsData(context.Background(), metrics) + err = test.exp.pushMetricsData(context.Background(), metrics) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, 1, dropped) partial, ok := err.(consumererror.PartialError) require.True(t, ok) @@ -481,7 +475,6 @@ func TestPushMetricsFailedBatch(t *testing.T) { metrics.ResourceMetrics().Append(metric) } - count, err := test.exp.pushMetricsData(context.Background(), metrics) + err := test.exp.pushMetricsData(context.Background(), metrics) assert.EqualError(t, err, "error during sending data: 500 Internal Server Error") - assert.Equal(t, maxBufferSize, count) } diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 42f7a070475a1..fbba683bc1d71 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -12,6 +12,6 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/uptraceexporter/exporter.go b/exporter/uptraceexporter/exporter.go index d4ccea702e632..f881dd65e854d 100644 --- a/exporter/uptraceexporter/exporter.go +++ b/exporter/uptraceexporter/exporter.go @@ -58,7 +58,7 @@ func newTraceExporter(cfg *Config, logger *zap.Logger) (*traceExporter, error) { } // pushTraceData is the method called when trace data is available. -func (e *traceExporter) pushTraceData(ctx context.Context, traces pdata.Traces) (int, error) { +func (e *traceExporter) pushTraceData(ctx context.Context, traces pdata.Traces) error { outSpans := make([]spanexp.Span, 0, traces.SpanCount()) rsSpans := traces.ResourceSpans() @@ -103,7 +103,7 @@ func (e *traceExporter) pushTraceData(ctx context.Context, traces pdata.Traces) } if len(outSpans) == 0 { - return 0, nil + return nil } out := map[string]interface{}{ @@ -111,12 +111,12 @@ func (e *traceExporter) pushTraceData(ctx context.Context, traces pdata.Traces) } if err := e.upexp.SendSpans(ctx, out); err != nil { if err, ok := err.(temporaryError); ok && err.Temporary() { - return len(outSpans), err + return err } - return len(outSpans), consumererror.Permanent(err) + return consumererror.Permanent(err) } - return 0, nil + return nil } func (e *traceExporter) Shutdown(ctx context.Context) error { diff --git a/exporter/uptraceexporter/exporter_test.go b/exporter/uptraceexporter/exporter_test.go index 2c4945505cf8e..8dd1f358465b6 100644 --- a/exporter/uptraceexporter/exporter_test.go +++ b/exporter/uptraceexporter/exporter_test.go @@ -58,9 +58,8 @@ func TestTraceExporterEmptyTraces(t *testing.T) { require.NoError(t, err) require.NotNil(t, exp) - dropped, err := exp.pushTraceData(ctx, pdata.NewTraces()) + err = exp.pushTraceData(ctx, pdata.NewTraces()) require.NoError(t, err) - require.Zero(t, dropped) err = exp.Shutdown(ctx) require.NoError(t, err) @@ -100,10 +99,8 @@ func TestTraceExporterGenTraces(t *testing.T) { require.NoError(t, err) require.NotNil(t, exp) - dropped, err := exp.pushTraceData( - ctx, testdata.GenerateTraceDataTwoSpansSameResource()) + err = exp.pushTraceData(ctx, testdata.GenerateTraceDataTwoSpansSameResource()) require.NoError(t, err) - require.Zero(t, dropped) err = exp.Shutdown(ctx) require.NoError(t, err) diff --git a/exporter/uptraceexporter/go.mod b/exporter/uptraceexporter/go.mod index 07098aec1a629..6e1cf15fcedfd 100644 --- a/exporter/uptraceexporter/go.mod +++ b/exporter/uptraceexporter/go.mod @@ -15,7 +15,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/uptrace/uptrace-go v0.9.0 github.com/vmihailenco/msgpack/v5 v5.2.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/exporter/uptraceexporter/go.sum b/exporter/uptraceexporter/go.sum index 4389d9c72cbe4..ece48bf6fd6e5 100644 --- a/exporter/uptraceexporter/go.sum +++ b/exporter/uptraceexporter/go.sum @@ -877,8 +877,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1054,8 +1054,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.opentelemetry.io/contrib v0.18.0 h1:uqBh0brileIvG6luvBjdxzoFL8lxDGuhxJWsvK3BveI= go.opentelemetry.io/contrib v0.18.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.18.0 h1:Qc7uU8GzpQ0Gak2oOmEcpiL9uRaVhatxkE1EzNhJW00= diff --git a/extension/httpforwarder/go.mod b/extension/httpforwarder/go.mod index 9cbdf2a8b82e3..53581b6a7f010 100644 --- a/extension/httpforwarder/go.mod +++ b/extension/httpforwarder/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/httpforwarder/go.sum b/extension/httpforwarder/go.sum index 435ab92816c34..b54bd2cdb3052 100644 --- a/extension/httpforwarder/go.sum +++ b/extension/httpforwarder/go.sum @@ -736,7 +736,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -886,8 +886,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/extension/observer/hostobserver/go.mod b/extension/observer/hostobserver/go.mod index 628e7be4febc5..30887c0d25095 100644 --- a/extension/observer/hostobserver/go.mod +++ b/extension/observer/hostobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/extension/observer/hostobserver/go.sum b/extension/observer/hostobserver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/extension/observer/hostobserver/go.sum +++ b/extension/observer/hostobserver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index d95b4e86fb2b5..71091d02fd879 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.4 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 89f9a3203b77f..7fad1a0efe010 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -878,8 +878,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1050,8 +1050,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/go.mod b/go.mod index 5394653edcfa4..d4ca10ad06e4d 100644 --- a/go.mod +++ b/go.mod @@ -59,7 +59,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43 ) diff --git a/go.sum b/go.sum index 9778028ae6bdb..b9335ff59eebb 100644 --- a/go.sum +++ b/go.sum @@ -1211,8 +1211,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1486,8 +1486,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY= diff --git a/internal/splunk/go.mod b/internal/splunk/go.mod index 9f105d96c0673..c378f56d9e22d 100644 --- a/internal/splunk/go.mod +++ b/internal/splunk/go.mod @@ -5,6 +5,6 @@ go 1.15 require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/internal/splunk/go.sum b/internal/splunk/go.sum index f3bad44c84caa..e32576b644022 100644 --- a/internal/splunk/go.sum +++ b/internal/splunk/go.sum @@ -741,7 +741,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -892,8 +892,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/internal/stanza/go.mod b/internal/stanza/go.mod index 2afd48f958c12..0001022848c6f 100644 --- a/internal/stanza/go.mod +++ b/internal/stanza/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-log-collection v0.16.0 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect gopkg.in/yaml.v2 v2.4.0 diff --git a/internal/stanza/go.sum b/internal/stanza/go.sum index 269a1981de7d5..d457f08220f84 100644 --- a/internal/stanza/go.sum +++ b/internal/stanza/go.sum @@ -767,7 +767,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -919,8 +919,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/pkg/batchperresourceattr/go.mod b/pkg/batchperresourceattr/go.mod index 814f5b929b65c..7c4833fb6330f 100644 --- a/pkg/batchperresourceattr/go.mod +++ b/pkg/batchperresourceattr/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 ) diff --git a/pkg/batchperresourceattr/go.sum b/pkg/batchperresourceattr/go.sum index a3d890a7961e1..bb6262f7561c1 100644 --- a/pkg/batchperresourceattr/go.sum +++ b/pkg/batchperresourceattr/go.sum @@ -726,7 +726,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -867,8 +867,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/pkg/batchpersignal/go.mod b/pkg/batchpersignal/go.mod index 12569d60ce8a9..bb2a249a5feed 100644 --- a/pkg/batchpersignal/go.mod +++ b/pkg/batchpersignal/go.mod @@ -4,5 +4,5 @@ go 1.14 require ( github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 ) diff --git a/pkg/batchpersignal/go.sum b/pkg/batchpersignal/go.sum index a3d890a7961e1..bb6262f7561c1 100644 --- a/pkg/batchpersignal/go.sum +++ b/pkg/batchpersignal/go.sum @@ -726,7 +726,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -867,8 +867,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/pkg/batchpertrace/go.mod b/pkg/batchpertrace/go.mod index 8fb15883c04bc..f933e5b6da9fa 100644 --- a/pkg/batchpertrace/go.mod +++ b/pkg/batchpertrace/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 ) replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchpersignal => ../batchpersignal diff --git a/pkg/batchpertrace/go.sum b/pkg/batchpertrace/go.sum index a3d890a7961e1..bb6262f7561c1 100644 --- a/pkg/batchpertrace/go.sum +++ b/pkg/batchpertrace/go.sum @@ -726,7 +726,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -867,8 +867,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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/groupbyattrsprocessor/go.mod b/processor/groupbyattrsprocessor/go.mod index 7737d71a2c33d..102beb7381068 100644 --- a/processor/groupbyattrsprocessor/go.mod +++ b/processor/groupbyattrsprocessor/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbyattrsprocessor/go.sum b/processor/groupbyattrsprocessor/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/processor/groupbyattrsprocessor/go.sum +++ b/processor/groupbyattrsprocessor/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/groupbytraceprocessor/go.mod b/processor/groupbytraceprocessor/go.mod index 69c068d3ca28b..728cdf6879f1a 100644 --- a/processor/groupbytraceprocessor/go.mod +++ b/processor/groupbytraceprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/groupbytraceprocessor/go.sum b/processor/groupbytraceprocessor/go.sum index 4072ffcc1ec15..bcc87adbb4b54 100644 --- a/processor/groupbytraceprocessor/go.sum +++ b/processor/groupbytraceprocessor/go.sum @@ -737,7 +737,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -887,8 +887,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index 673f156f6e1fd..d0abb5004eb88 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/api v0.20.4 diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index 89f9a3203b77f..7fad1a0efe010 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -878,8 +878,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1050,8 +1050,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/metricstransformprocessor/go.mod b/processor/metricstransformprocessor/go.mod index 6246629d028e6..63df418ed728f 100644 --- a/processor/metricstransformprocessor/go.mod +++ b/processor/metricstransformprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/metricstransformprocessor/go.sum b/processor/metricstransformprocessor/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/processor/metricstransformprocessor/go.sum +++ b/processor/metricstransformprocessor/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/resourcedetectionprocessor/go.mod b/processor/resourcedetectionprocessor/go.mod index cd05e8e5c6dcb..944d935fe3e86 100644 --- a/processor/resourcedetectionprocessor/go.mod +++ b/processor/resourcedetectionprocessor/go.mod @@ -16,7 +16,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/resourcedetectionprocessor/go.sum b/processor/resourcedetectionprocessor/go.sum index 0bfe0aeee3310..5cea4cf5524c2 100644 --- a/processor/resourcedetectionprocessor/go.sum +++ b/processor/resourcedetectionprocessor/go.sum @@ -879,8 +879,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1050,8 +1050,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/routingprocessor/go.mod b/processor/routingprocessor/go.mod index d73ef5db7f303..6e12a8e393b7a 100644 --- a/processor/routingprocessor/go.mod +++ b/processor/routingprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/routingprocessor/go.sum b/processor/routingprocessor/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/processor/routingprocessor/go.sum +++ b/processor/routingprocessor/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/spanmetricsprocessor/go.mod b/processor/spanmetricsprocessor/go.mod index 4e30a6b897574..5894073cf138e 100644 --- a/processor/spanmetricsprocessor/go.mod +++ b/processor/spanmetricsprocessor/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/grpc v1.36.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/processor/spanmetricsprocessor/go.sum b/processor/spanmetricsprocessor/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/processor/spanmetricsprocessor/go.sum +++ b/processor/spanmetricsprocessor/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/processor/tailsamplingprocessor/go.mod b/processor/tailsamplingprocessor/go.mod index 65c3767abb655..0f6a31d44206a 100644 --- a/processor/tailsamplingprocessor/go.mod +++ b/processor/tailsamplingprocessor/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/processor/tailsamplingprocessor/go.sum b/processor/tailsamplingprocessor/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/processor/tailsamplingprocessor/go.sum +++ b/processor/tailsamplingprocessor/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/awsecscontainermetricsreceiver/go.mod b/receiver/awsecscontainermetricsreceiver/go.mod index 6ee8c33ad8b24..b9ee14f5029a5 100644 --- a/receiver/awsecscontainermetricsreceiver/go.mod +++ b/receiver/awsecscontainermetricsreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/awsecscontainermetricsreceiver/go.sum b/receiver/awsecscontainermetricsreceiver/go.sum index d0dc78f73dc1b..a2cd45cfbe875 100644 --- a/receiver/awsecscontainermetricsreceiver/go.sum +++ b/receiver/awsecscontainermetricsreceiver/go.sum @@ -877,8 +877,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1049,8 +1049,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/awsxrayreceiver/go.mod b/receiver/awsxrayreceiver/go.mod index 4343b0f96eedd..d7152e1e36ef7 100644 --- a/receiver/awsxrayreceiver/go.mod +++ b/receiver/awsxrayreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/awsxrayreceiver/go.sum b/receiver/awsxrayreceiver/go.sum index 93078d161f9fe..15e9356e54860 100644 --- a/receiver/awsxrayreceiver/go.sum +++ b/receiver/awsxrayreceiver/go.sum @@ -875,8 +875,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1046,8 +1046,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index e2ae10a1de297..441696a50a9df 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -15,7 +15,7 @@ require ( github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 41dce8a02f22b..2a2f628d0ed58 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/dockerstatsreceiver/go.mod b/receiver/dockerstatsreceiver/go.mod index e7dffc07d5010..38540bdf20147 100644 --- a/receiver/dockerstatsreceiver/go.mod +++ b/receiver/dockerstatsreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/receiver/dockerstatsreceiver/go.sum b/receiver/dockerstatsreceiver/go.sum index 4ce25fab34114..d502a105f4190 100644 --- a/receiver/dockerstatsreceiver/go.sum +++ b/receiver/dockerstatsreceiver/go.sum @@ -871,8 +871,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1042,8 +1042,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/dotnetdiagnosticsreceiver/go.mod b/receiver/dotnetdiagnosticsreceiver/go.mod index 436ca3f039c4e..abc41afdc5025 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.mod +++ b/receiver/dotnetdiagnosticsreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/dotnetdiagnosticsreceiver/go.sum b/receiver/dotnetdiagnosticsreceiver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/dotnetdiagnosticsreceiver/go.sum +++ b/receiver/dotnetdiagnosticsreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/filelogreceiver/go.mod b/receiver/filelogreceiver/go.mod index 91b38568f6f84..8fc2281bd7ebb 100644 --- a/receiver/filelogreceiver/go.mod +++ b/receiver/filelogreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/stanza v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-log-collection v0.16.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/yaml.v2 v2.4.0 ) diff --git a/receiver/filelogreceiver/go.sum b/receiver/filelogreceiver/go.sum index 6418ad7641f30..faa655af50409 100644 --- a/receiver/filelogreceiver/go.sum +++ b/receiver/filelogreceiver/go.sum @@ -884,8 +884,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1056,8 +1056,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/jmxreceiver/go.mod b/receiver/jmxreceiver/go.mod index 646c7172f41b5..a82028d40b9c8 100644 --- a/receiver/jmxreceiver/go.mod +++ b/receiver/jmxreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/shirou/gopsutil v3.21.2+incompatible github.com/stretchr/testify v1.7.0 github.com/testcontainers/testcontainers-go v0.9.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/jmxreceiver/go.sum b/receiver/jmxreceiver/go.sum index f3664cb44da60..45a4a40677a6f 100644 --- a/receiver/jmxreceiver/go.sum +++ b/receiver/jmxreceiver/go.sum @@ -895,8 +895,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1070,8 +1070,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 2dfa21d8e8d3a..4acfd8dd82082 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -12,7 +12,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/atomic v1.7.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index c9295509ebd10..34d28b8d4e283 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -764,7 +764,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -915,8 +915,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/kafkametricsreceiver/go.mod b/receiver/kafkametricsreceiver/go.mod index 0574cc8bb0496..d82d0fe72d4ec 100644 --- a/receiver/kafkametricsreceiver/go.mod +++ b/receiver/kafkametricsreceiver/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/Shopify/sarama v1.28.0 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/receiver/kafkametricsreceiver/go.sum b/receiver/kafkametricsreceiver/go.sum index 5855a9d6dc791..7c91c8f7ab2f7 100644 --- a/receiver/kafkametricsreceiver/go.sum +++ b/receiver/kafkametricsreceiver/go.sum @@ -855,8 +855,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1025,8 +1025,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 86808e7849e6f..8bdd451c819bd 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-00010101000000-000000000000 github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 gopkg.in/yaml.v2 v2.4.0 diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index c5fcd4b8ca6c8..21c8087af2408 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -873,8 +873,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/memcachedreceiver/go.mod b/receiver/memcachedreceiver/go.mod index 181a7f38dd9ad..20d988e52ada3 100644 --- a/receiver/memcachedreceiver/go.mod +++ b/receiver/memcachedreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/memcachedreceiver/go.sum b/receiver/memcachedreceiver/go.sum index 07a732092e8d4..e8ccd92ce92e5 100644 --- a/receiver/memcachedreceiver/go.sum +++ b/receiver/memcachedreceiver/go.sum @@ -882,8 +882,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1054,8 +1054,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/nginxreceiver/go.mod b/receiver/nginxreceiver/go.mod index 1e4b4398799f9..aa8a9def592ea 100644 --- a/receiver/nginxreceiver/go.mod +++ b/receiver/nginxreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/nginxreceiver/go.sum b/receiver/nginxreceiver/go.sum index cc3d047468a6d..420a229fb3d8e 100644 --- a/receiver/nginxreceiver/go.sum +++ b/receiver/nginxreceiver/go.sum @@ -880,8 +880,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1052,8 +1052,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/prometheusexecreceiver/go.mod b/receiver/prometheusexecreceiver/go.mod index 80ace8002a452..b33472fbbebd7 100644 --- a/receiver/prometheusexecreceiver/go.mod +++ b/receiver/prometheusexecreceiver/go.mod @@ -12,10 +12,10 @@ require ( github.com/onsi/ginkgo v1.14.1 // indirect github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect - github.com/prometheus/common v0.18.0 + github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/prometheusexecreceiver/go.sum b/receiver/prometheusexecreceiver/go.sum index e4940a8612d23..f936e84e7ed25 100644 --- a/receiver/prometheusexecreceiver/go.sum +++ b/receiver/prometheusexecreceiver/go.sum @@ -876,8 +876,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1047,8 +1047,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index c840d9c55e18a..2a73c9d8828c0 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -16,7 +16,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 4545d18c033d8..7e33da1725363 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index d01fd9b340bd8..51f296bf4b7f4 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -767,7 +767,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -918,8 +918,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 1f65effd2633f..80f005e94b768 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -9,7 +9,7 @@ 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.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 338d541301223..255cc9b5fc1a0 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -951,8 +951,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1156,8 +1156,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index 53482e057a6c5..1e8a6b93ff6fe 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -9,7 +9,7 @@ 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.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index 83a477be3ba20..1572a9e3e2fd5 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -882,8 +882,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1071,8 +1071,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index ba7f649f2554d..823b244b5053e 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -11,10 +11,10 @@ require ( github.com/onsi/ginkgo v1.14.1 // indirect github.com/onsi/gomega v1.10.2 // indirect github.com/pelletier/go-toml v1.8.0 // indirect - github.com/prometheus/common v0.18.0 + github.com/prometheus/common v0.19.0 github.com/prometheus/prometheus v1.8.2-0.20210217141258-a6be548dbc17 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect k8s.io/client-go v0.20.4 diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 62e754da8e038..060edea5f6b97 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -877,8 +877,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1049,8 +1049,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/splunkhecreceiver/go.mod b/receiver/splunkhecreceiver/go.mod index c5e8869c6de57..2069ecb79ea48 100644 --- a/receiver/splunkhecreceiver/go.mod +++ b/receiver/splunkhecreceiver/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/receiver/splunkhecreceiver/go.sum b/receiver/splunkhecreceiver/go.sum index c5559a7643351..1ec3dce015820 100644 --- a/receiver/splunkhecreceiver/go.sum +++ b/receiver/splunkhecreceiver/go.sum @@ -858,8 +858,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1028,8 +1028,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/statsdreceiver/go.mod b/receiver/statsdreceiver/go.mod index 34aa2aedd9a90..d8048e2abffa5 100644 --- a/receiver/statsdreceiver/go.mod +++ b/receiver/statsdreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 go.opencensus.io v0.23.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.opentelemetry.io/otel v0.18.0 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 diff --git a/receiver/statsdreceiver/go.sum b/receiver/statsdreceiver/go.sum index 7b1690dfa1819..70bf85738f8e7 100644 --- a/receiver/statsdreceiver/go.sum +++ b/receiver/statsdreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8= go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78= go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index c92983946a8dd..da56c20082df3 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 google.golang.org/protobuf v1.25.0 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/windowsperfcountersreceiver/go.mod b/receiver/windowsperfcountersreceiver/go.mod index 921983de6999c..e3e72bc665d10 100644 --- a/receiver/windowsperfcountersreceiver/go.mod +++ b/receiver/windowsperfcountersreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/pelletier/go-toml v1.8.0 // indirect github.com/spf13/viper v1.7.1 github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 golang.org/x/sys v0.0.0-20210217105451-b926d437f341 gopkg.in/ini.v1 v1.57.0 // indirect diff --git a/receiver/windowsperfcountersreceiver/go.sum b/receiver/windowsperfcountersreceiver/go.sum index 7b32678485819..55966a5f29c2a 100644 --- a/receiver/windowsperfcountersreceiver/go.sum +++ b/receiver/windowsperfcountersreceiver/go.sum @@ -874,8 +874,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1045,8 +1045,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/zookeeperreceiver/go.mod b/receiver/zookeeperreceiver/go.mod index 1bfae2853c3a1..4696a9cbd820b 100644 --- a/receiver/zookeeperreceiver/go.mod +++ b/receiver/zookeeperreceiver/go.mod @@ -13,7 +13,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/pelletier/go-toml v1.8.0 // indirect github.com/stretchr/testify v1.7.0 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/receiver/zookeeperreceiver/go.sum b/receiver/zookeeperreceiver/go.sum index d7426d4bdbf5a..9926842d3a0d7 100644 --- a/receiver/zookeeperreceiver/go.sum +++ b/receiver/zookeeperreceiver/go.sum @@ -880,8 +880,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1052,8 +1052,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/testbed/go.mod b/testbed/go.mod index 1b371d8f3e5ed..9e67f3694d5d5 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -11,7 +11,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/testbed/mockdatareceivers/mockawsxrayreceiver v0.0.0-00010101000000-000000000000 - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 ) diff --git a/testbed/go.sum b/testbed/go.sum index c0e0184eca845..4e3463088b6c8 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -991,8 +991,8 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0 h1:WCVKW7aL6LEe1uryfI9dnEc2ZqNB1Fn0ok930v0iL1Y= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0 h1:Itb4+NjG9wRdkAWgVucbM/adyIXxEhbw0866e0uZE6A= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -1216,8 +1216,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod index 3d22d9e864e5f..35030d3cdf20c 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/gorilla/mux v1.8.0 github.com/pelletier/go-toml v1.8.0 // indirect - go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca + go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 go.uber.org/zap v1.16.0 gopkg.in/ini.v1 v1.57.0 // indirect ) diff --git a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum index ad6bbc809b4ff..e7f577d9f0722 100644 --- a/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum +++ b/testbed/mockdatareceivers/mockawsxrayreceiver/go.sum @@ -738,7 +738,7 @@ github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt2 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= -github.com/prometheus/common v0.18.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= +github.com/prometheus/common v0.19.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/exporter-toolkit v0.5.1/go.mod h1:OCkM4805mmisBhLmVFw858QYi3v0wKdY6/UxrT0pZVg= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= @@ -888,8 +888,8 @@ 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.22.1-0.20210313001744-407358bb0cca h1:SSvNTr4NcCfN+oPXEf/8uvTHF1ovXTqTjF5klcnDKrs= -go.opentelemetry.io/collector v0.22.1-0.20210313001744-407358bb0cca/go.mod h1:WnNIqyLpLePghFeOgVX8rymLtCI3xztJmzZthNoB3pI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61 h1:AgoyzaZSypDR7kZP6LkwMOBVMEiS1Ovvu09spTBMUjI= +go.opentelemetry.io/collector v0.22.1-0.20210313012550-03904de3dd61/go.mod h1:D0r+9XDY4KmvjgRKOQSYm2L6TDlVM764Vq1dzoPXUPc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=