From 43133d4fed4ab96acaaab2778e42fe90536e2f92 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 31 Jan 2023 13:19:46 -0800 Subject: [PATCH] update test to match changes in https://github.com/open-telemetry/opentelemetry-collector/pull/7017 Signed-off-by: Alex Boten --- .../awscloudwatchlogsexporter/config_test.go | 11 ++++++---- exporter/awscloudwatchlogsexporter/go.mod | 2 +- exporter/awskinesisexporter/config_test.go | 11 ++++++---- exporter/awskinesisexporter/go.mod | 2 +- exporter/clickhouseexporter/config_test.go | 11 ++++++---- exporter/clickhouseexporter/go.mod | 2 +- .../internal/metadata/metadata.go | 7 ++++--- .../internal/metadata/metadata_test.go | 4 ++-- exporter/f5cloudexporter/config_test.go | 11 ++++++---- exporter/f5cloudexporter/go.mod | 2 +- exporter/googlecloudexporter/config_test.go | 11 ++++++---- exporter/googlecloudexporter/go.mod | 4 ++-- exporter/googlecloudexporter/go.sum | 4 ++-- .../config_test.go | 11 ++++++---- .../googlemanagedprometheusexporter/go.mod | 2 +- exporter/influxdbexporter/config_test.go | 5 +++++ exporter/jaegerexporter/config_test.go | 11 ++++++---- exporter/jaegerexporter/go.mod | 2 +- exporter/kafkaexporter/config_test.go | 11 ++++++---- exporter/kafkaexporter/go.mod | 2 +- exporter/lokiexporter/config_test.go | 11 ++++++---- exporter/lokiexporter/go.mod | 2 +- exporter/lokiexporter/legacy_config_test.go | 21 ++++++++++++------- exporter/mezmoexporter/config_test.go | 11 ++++++---- exporter/mezmoexporter/go.mod | 2 +- .../config_test.go | 11 ++++++---- .../prometheusremotewriteexporter/factory.go | 11 ++++++---- exporter/prometheusremotewriteexporter/go.mod | 2 +- exporter/pulsarexporter/config_test.go | 11 ++++++---- exporter/pulsarexporter/go.mod | 2 +- exporter/sapmexporter/config_test.go | 11 ++++++---- exporter/sapmexporter/go.mod | 2 +- exporter/signalfxexporter/config_test.go | 11 ++++++---- exporter/signalfxexporter/go.mod | 2 +- exporter/skywalkingexporter/config_test.go | 11 ++++++---- exporter/skywalkingexporter/go.mod | 2 +- exporter/splunkhecexporter/config_test.go | 11 ++++++---- exporter/splunkhecexporter/go.mod | 2 +- .../tanzuobservabilityexporter/config_test.go | 11 ++++++---- exporter/tanzuobservabilityexporter/go.mod | 2 +- exporter/zipkinexporter/config_test.go | 11 ++++++---- exporter/zipkinexporter/go.mod | 2 +- 42 files changed, 178 insertions(+), 110 deletions(-) diff --git a/exporter/awscloudwatchlogsexporter/config_test.go b/exporter/awscloudwatchlogsexporter/config_test.go index 82e23ef4a6c2..c918ecb4ba74 100644 --- a/exporter/awscloudwatchlogsexporter/config_test.go +++ b/exporter/awscloudwatchlogsexporter/config_test.go @@ -18,6 +18,7 @@ import ( "path/filepath" "testing" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -58,10 +59,12 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(typeStr, "e2-no-retries-short-queue"), expected: &Config{ RetrySettings: exporterhelper.RetrySettings{ - Enabled: false, - InitialInterval: defaultRetrySettings.InitialInterval, - MaxInterval: defaultRetrySettings.MaxInterval, - MaxElapsedTime: defaultRetrySettings.MaxElapsedTime, + Enabled: false, + InitialInterval: defaultRetrySettings.InitialInterval, + MaxInterval: defaultRetrySettings.MaxInterval, + MaxElapsedTime: defaultRetrySettings.MaxElapsedTime, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, AWSSessionSettings: awsutil.CreateDefaultSessionConfig(), LogGroupName: "test-2", diff --git a/exporter/awscloudwatchlogsexporter/go.mod b/exporter/awscloudwatchlogsexporter/go.mod index f21737959b7f..383d89760021 100644 --- a/exporter/awscloudwatchlogsexporter/go.mod +++ b/exporter/awscloudwatchlogsexporter/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/aws/aws-sdk-go v1.44.189 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/google/uuid v1.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.70.0 @@ -18,7 +19,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 // indirect diff --git a/exporter/awskinesisexporter/config_test.go b/exporter/awskinesisexporter/config_test.go index 18e76bde06fa..38b1fd85f342 100644 --- a/exporter/awskinesisexporter/config_test.go +++ b/exporter/awskinesisexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -60,10 +61,12 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(typeStr, ""), expected: &Config{ RetrySettings: exporterhelper.RetrySettings{ - Enabled: false, - MaxInterval: 30 * time.Second, - InitialInterval: 5 * time.Second, - MaxElapsedTime: 300 * time.Second, + Enabled: false, + MaxInterval: 30 * time.Second, + InitialInterval: 5 * time.Second, + MaxElapsedTime: 300 * time.Second, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), QueueSettings: exporterhelper.NewDefaultQueueSettings(), diff --git a/exporter/awskinesisexporter/go.mod b/exporter/awskinesisexporter/go.mod index 1a810474c8f8..f5c741984b8f 100644 --- a/exporter/awskinesisexporter/go.mod +++ b/exporter/awskinesisexporter/go.mod @@ -8,6 +8,7 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.13.10 github.com/aws/aws-sdk-go-v2/service/kinesis v1.17.0 github.com/aws/aws-sdk-go-v2/service/sts v1.18.2 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/gogo/protobuf v1.3.2 github.com/google/uuid v1.3.0 github.com/jaegertracing/jaeger v1.41.0 @@ -35,7 +36,6 @@ require ( github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect github.com/aws/smithy-go v1.13.5 // indirect github.com/benbjohnson/clock v1.3.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/exporter/clickhouseexporter/config_test.go b/exporter/clickhouseexporter/config_test.go index 8942435bc90e..32171ae25f19 100644 --- a/exporter/clickhouseexporter/config_test.go +++ b/exporter/clickhouseexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -65,10 +66,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 5 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 5 * time.Second, - MaxInterval: 30 * time.Second, - MaxElapsedTime: 300 * time.Second, + Enabled: true, + InitialInterval: 5 * time.Second, + MaxInterval: 30 * time.Second, + MaxElapsedTime: 300 * time.Second, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: QueueSettings{ QueueSize: 100, diff --git a/exporter/clickhouseexporter/go.mod b/exporter/clickhouseexporter/go.mod index e47c995aa34d..3b49738da234 100644 --- a/exporter/clickhouseexporter/go.mod +++ b/exporter/clickhouseexporter/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/ClickHouse/clickhouse-go/v2 v2.4.3 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.70.1-0.20230130215412-26bd7b2bf678 @@ -19,7 +20,6 @@ require ( github.com/ClickHouse/ch-go v0.50.0 // indirect github.com/andybalholm/brotli v1.0.4 // indirect github.com/benbjohnson/clock v1.3.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.6.1 // indirect diff --git a/exporter/datadogexporter/internal/metadata/metadata.go b/exporter/datadogexporter/internal/metadata/metadata.go index dac1e112d798..de9441daa483 100644 --- a/exporter/datadogexporter/internal/metadata/metadata.go +++ b/exporter/datadogexporter/internal/metadata/metadata.go @@ -30,6 +30,7 @@ import ( "github.com/DataDog/datadog-agent/pkg/otlp/model/attributes/gcp" "github.com/DataDog/datadog-agent/pkg/otlp/model/source" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/pdata/pcommon" conventions "go.opentelemetry.io/collector/semconv/v1.6.1" "go.uber.org/zap" @@ -106,13 +107,13 @@ type Meta struct { // metadataFromAttributes gets metadata info from attributes following // OpenTelemetry semantic conventions func metadataFromAttributes(attrs pcommon.Map) *HostMetadata { - return metadataFromAttributesWithRegistry(attrs) + return metadataFromAttributesWithRegistry(HostnamePreviewFeatureGate, attrs) } -func metadataFromAttributesWithRegistry(attrs pcommon.Map) *HostMetadata { +func metadataFromAttributesWithRegistry(gate *featuregate.Gate, attrs pcommon.Map) *HostMetadata { hm := &HostMetadata{Meta: &Meta{}, Tags: &HostTags{}} - var usePreviewHostnameLogic = HostnamePreviewFeatureGate.IsEnabled() + var usePreviewHostnameLogic = gate.IsEnabled() if src, ok := attributes.SourceFromAttributes(attrs, usePreviewHostnameLogic); ok && src.Kind == source.HostnameKind { hm.InternalHostname = src.Identifier hm.Meta.Hostname = src.Identifier diff --git a/exporter/datadogexporter/internal/metadata/metadata_test.go b/exporter/datadogexporter/internal/metadata/metadata_test.go index 3f76a358c9bd..fc170596aef7 100644 --- a/exporter/datadogexporter/internal/metadata/metadata_test.go +++ b/exporter/datadogexporter/internal/metadata/metadata_test.go @@ -244,9 +244,9 @@ func TestMetadataFromAttributes(t *testing.T) { for _, testInstance := range tests { t.Run(testInstance.name, func(t *testing.T) { registry := featuregate.NewRegistry() - registry.MustRegister(HostnamePreviewFeatureGate.ID(), featuregate.StageBeta) + gate := registry.MustRegister(HostnamePreviewFeatureGate.ID(), featuregate.StageBeta) require.NoError(t, registry.Set(HostnamePreviewFeatureGate.ID(), testInstance.usePreviewHostnameLogic)) - metadata := metadataFromAttributesWithRegistry(testInstance.attrs) + metadata := metadataFromAttributesWithRegistry(gate, testInstance.attrs) assert.Equal(t, testInstance.expected.InternalHostname, metadata.InternalHostname) assert.Equal(t, testInstance.expected.Meta, metadata.Meta) assert.ElementsMatch(t, testInstance.expected.Tags.GCP, metadata.Tags.GCP) diff --git a/exporter/f5cloudexporter/config_test.go b/exporter/f5cloudexporter/config_test.go index d2cbaa06198a..449380a9166c 100644 --- a/exporter/f5cloudexporter/config_test.go +++ b/exporter/f5cloudexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -43,10 +44,12 @@ func TestLoadConfig(t *testing.T) { expectedCfg := &Config{ Config: otlphttp.Config{ RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/f5cloudexporter/go.mod b/exporter/f5cloudexporter/go.mod index 4af6ed3f0b25..8783d65052ce 100644 --- a/exporter/f5cloudexporter/go.mod +++ b/exporter/f5cloudexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5clou go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.70.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.70.1-0.20230130215412-26bd7b2bf678 @@ -16,7 +17,6 @@ require ( require ( cloud.google.com/go/compute v1.14.0 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect diff --git a/exporter/googlecloudexporter/config_test.go b/exporter/googlecloudexporter/config_test.go index d2708430af86..bdabe43fb7ba 100644 --- a/exporter/googlecloudexporter/config_test.go +++ b/exporter/googlecloudexporter/config_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -74,10 +75,12 @@ func TestLoadConfig(t *testing.T) { }, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/googlecloudexporter/go.mod b/exporter/googlecloudexporter/go.mod index b7a46a235107..b12f0317e1c8 100644 --- a/exporter/googlecloudexporter/go.mod +++ b/exporter/googlecloudexporter/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.70.1-0.20230130215412-26bd7b2bf678 go.opentelemetry.io/collector/component v0.70.1-0.20230130215412-26bd7b2bf678 @@ -21,7 +22,6 @@ require ( cloud.google.com/go/trace v1.8.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/go-logr/logr v1.2.3 // indirect @@ -62,7 +62,7 @@ require ( google.golang.org/api v0.108.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa // indirect - google.golang.org/grpc v1.52.1 // indirect + google.golang.org/grpc v1.52.3 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/exporter/googlecloudexporter/go.sum b/exporter/googlecloudexporter/go.sum index 929f8d8ed451..bd0397e588ec 100644 --- a/exporter/googlecloudexporter/go.sum +++ b/exporter/googlecloudexporter/go.sum @@ -475,8 +475,8 @@ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.52.1 h1:2NpOPk5g5Xtb0qebIEs7hNIa++PdtZLo2AQUpc1YnSU= -google.golang.org/grpc v1.52.1/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ= +google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/exporter/googlemanagedprometheusexporter/config_test.go b/exporter/googlemanagedprometheusexporter/config_test.go index 58010d807a45..13ae51897925 100644 --- a/exporter/googlemanagedprometheusexporter/config_test.go +++ b/exporter/googlemanagedprometheusexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -53,10 +54,12 @@ func TestLoadConfig(t *testing.T) { UserAgent: "opentelemetry-collector-contrib {{version}}", }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/googlemanagedprometheusexporter/go.mod b/exporter/googlemanagedprometheusexporter/go.mod index 712fc9847112..c42541a45499 100644 --- a/exporter/googlemanagedprometheusexporter/go.mod +++ b/exporter/googlemanagedprometheusexporter/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector v0.35.0 github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/collector/googlemanagedprometheus v0.35.0 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.70.1-0.20230130215412-26bd7b2bf678 go.opentelemetry.io/collector/component v0.70.1-0.20230130215412-26bd7b2bf678 @@ -22,7 +23,6 @@ require ( github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.11.0 // indirect github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.35.0 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-kit/log v0.2.1 // indirect diff --git a/exporter/influxdbexporter/config_test.go b/exporter/influxdbexporter/config_test.go index 917a23b1729b..0d0b26673dc9 100644 --- a/exporter/influxdbexporter/config_test.go +++ b/exporter/influxdbexporter/config_test.go @@ -19,6 +19,8 @@ import ( "testing" "time" + // TODO: uncomment this after update core dependencies + // "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -60,6 +62,9 @@ func TestLoadConfig(t *testing.T) { InitialInterval: 1 * time.Second, MaxInterval: 3 * time.Second, MaxElapsedTime: 10 * time.Second, + // TODO: uncomment these after update core dependencies + // RandomizationFactor: backoff.DefaultRandomizationFactor, + // Multiplier: backoff.DefaultMultiplier, }, Org: "my-org", Bucket: "my-bucket", diff --git a/exporter/jaegerexporter/config_test.go b/exporter/jaegerexporter/config_test.go index bbce95026179..4442623e6dff 100644 --- a/exporter/jaegerexporter/config_test.go +++ b/exporter/jaegerexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -48,10 +49,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 10 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/jaegerexporter/go.mod b/exporter/jaegerexporter/go.mod index 7077d7f3bdd9..c65e01cd6797 100644 --- a/exporter/jaegerexporter/go.mod +++ b/exporter/jaegerexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaeger go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.70.0 @@ -20,7 +21,6 @@ require ( require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/apache/thrift v0.17.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/exporter/kafkaexporter/config_test.go b/exporter/kafkaexporter/config_test.go index ed02a976511d..d366e1c5c31f 100644 --- a/exporter/kafkaexporter/config_test.go +++ b/exporter/kafkaexporter/config_test.go @@ -21,6 +21,7 @@ import ( "time" "github.com/Shopify/sarama" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -45,10 +46,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 10 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/kafkaexporter/go.mod b/exporter/kafkaexporter/go.mod index 7d0665b5a9c7..afef1efa41e9 100644 --- a/exporter/kafkaexporter/go.mod +++ b/exporter/kafkaexporter/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( github.com/Shopify/sarama v1.38.1 github.com/aws/aws-sdk-go v1.44.189 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 @@ -23,7 +24,6 @@ require ( require ( github.com/apache/thrift v0.17.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/eapache/go-resiliency v1.3.0 // indirect github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect diff --git a/exporter/lokiexporter/config_test.go b/exporter/lokiexporter/config_test.go index fb06c16ccd1c..f348305af811 100644 --- a/exporter/lokiexporter/config_test.go +++ b/exporter/lokiexporter/config_test.go @@ -20,6 +20,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -61,10 +62,12 @@ func TestLoadConfigNewExporter(t *testing.T) { Timeout: time.Second * 10, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/lokiexporter/go.mod b/exporter/lokiexporter/go.mod index c0d4faf015a2..1eb7dafce264 100644 --- a/exporter/lokiexporter/go.mod +++ b/exporter/lokiexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/lokiex go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 github.com/grafana/loki/pkg/push v0.0.0-20230127072203-4e8cc8d71928 @@ -22,7 +23,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.6.0 // indirect diff --git a/exporter/lokiexporter/legacy_config_test.go b/exporter/lokiexporter/legacy_config_test.go index aad1f20a8571..bea83b4ba63c 100644 --- a/exporter/lokiexporter/legacy_config_test.go +++ b/exporter/lokiexporter/legacy_config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -62,10 +63,12 @@ func TestLoadConfig(t *testing.T) { Timeout: time.Second * 10, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, @@ -108,10 +111,12 @@ func TestLoadConfig(t *testing.T) { Timeout: time.Second * 30, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 5 * time.Second, - MaxInterval: 30 * time.Second, - MaxElapsedTime: 5 * time.Minute, + Enabled: true, + InitialInterval: 5 * time.Second, + MaxInterval: 30 * time.Second, + MaxElapsedTime: 5 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/mezmoexporter/config_test.go b/exporter/mezmoexporter/config_test.go index b30651f3e90a..6a8b24c3f5db 100644 --- a/exporter/mezmoexporter/config_test.go +++ b/exporter/mezmoexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -52,10 +53,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 5 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: false, - InitialInterval: 99 * time.Second, - MaxInterval: 199 * time.Second, - MaxElapsedTime: 299 * time.Minute, + Enabled: false, + InitialInterval: 99 * time.Second, + MaxInterval: 199 * time.Second, + MaxElapsedTime: 299 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: false, diff --git a/exporter/mezmoexporter/go.mod b/exporter/mezmoexporter/go.mod index 60a4c210c960..b31161299b5e 100644 --- a/exporter/mezmoexporter/go.mod +++ b/exporter/mezmoexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/mezmoe go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/stretchr/testify v1.8.1 go.opentelemetry.io/collector v0.70.1-0.20230130215412-26bd7b2bf678 go.opentelemetry.io/collector/component v0.70.1-0.20230130215412-26bd7b2bf678 @@ -13,7 +14,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect diff --git a/exporter/prometheusremotewriteexporter/config_test.go b/exporter/prometheusremotewriteexporter/config_test.go index 766ae5c9c68a..52ee6cd9b9df 100644 --- a/exporter/prometheusremotewriteexporter/config_test.go +++ b/exporter/prometheusremotewriteexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -51,10 +52,12 @@ func TestLoadConfig(t *testing.T) { expected: &Config{ TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, RemoteWriteQueue: RemoteWriteQueue{ Enabled: true, diff --git a/exporter/prometheusremotewriteexporter/factory.go b/exporter/prometheusremotewriteexporter/factory.go index f90dc08f3d87..a364eacd7542 100644 --- a/exporter/prometheusremotewriteexporter/factory.go +++ b/exporter/prometheusremotewriteexporter/factory.go @@ -19,6 +19,7 @@ import ( "errors" "time" + "github.com/cenkalti/backoff/v4" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config/confighttp" "go.opentelemetry.io/collector/config/configopaque" @@ -89,10 +90,12 @@ func createDefaultConfig() component.Config { ExternalLabels: map[string]string{}, TimeoutSettings: exporterhelper.NewDefaultTimeoutSettings(), RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 50 * time.Millisecond, - MaxInterval: 200 * time.Millisecond, - MaxElapsedTime: 1 * time.Minute, + Enabled: true, + InitialInterval: 50 * time.Millisecond, + MaxInterval: 200 * time.Millisecond, + MaxElapsedTime: 1 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, HTTPClientSettings: confighttp.HTTPClientSettings{ Endpoint: "http://some.url:9411/api/prom/push", diff --git a/exporter/prometheusremotewriteexporter/go.mod b/exporter/prometheusremotewriteexporter/go.mod index c841f9067e3c..01ac78177390 100644 --- a/exporter/prometheusremotewriteexporter/go.mod +++ b/exporter/prometheusremotewriteexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/promet go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/fsnotify/fsnotify v1.6.0 github.com/gogo/protobuf v1.3.2 github.com/golang/snappy v0.0.4 @@ -24,7 +25,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect diff --git a/exporter/pulsarexporter/config_test.go b/exporter/pulsarexporter/config_test.go index 00b7d06e917b..136c6a6910a6 100644 --- a/exporter/pulsarexporter/config_test.go +++ b/exporter/pulsarexporter/config_test.go @@ -20,6 +20,7 @@ import ( "time" "github.com/apache/pulsar-client-go/pulsar" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -44,10 +45,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 20 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/pulsarexporter/go.mod b/exporter/pulsarexporter/go.mod index 46cdbd253932..e0bf6dbcc60d 100644 --- a/exporter/pulsarexporter/go.mod +++ b/exporter/pulsarexporter/go.mod @@ -4,6 +4,7 @@ go 1.18 require ( github.com/apache/pulsar-client-go v0.8.1 + github.com/cenkalti/backoff/v4 v4.2.0 github.com/gogo/protobuf v1.3.2 github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 @@ -27,7 +28,6 @@ require ( github.com/apache/thrift v0.17.0 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/danieljoos/wincred v1.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/exporter/sapmexporter/config_test.go b/exporter/sapmexporter/config_test.go index baef85d5c8f4..aad935940021 100644 --- a/exporter/sapmexporter/config_test.go +++ b/exporter/sapmexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -61,10 +62,12 @@ func TestLoadConfig(t *testing.T) { Timeout: 10 * time.Second, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 6cec614734d8..d9a8bd8914da 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmex go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/jaegertracing/jaeger v1.41.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/batchperresourceattr v0.70.0 @@ -19,7 +20,6 @@ require ( require ( github.com/apache/thrift v0.17.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect diff --git a/exporter/signalfxexporter/config_test.go b/exporter/signalfxexporter/config_test.go index 24c151a1c389..33d282ff566f 100644 --- a/exporter/signalfxexporter/config_test.go +++ b/exporter/signalfxexporter/config_test.go @@ -20,6 +20,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" apmcorrelation "github.com/signalfx/signalfx-agent/pkg/apm/correlations" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -74,10 +75,12 @@ func TestLoadConfig(t *testing.T) { MaxIdleConnsPerHost: &seventy, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 7c9937304b26..200449e8064b 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signal go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/gobwas/glob v0.2.3 github.com/gogo/protobuf v1.3.2 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.70.0 @@ -29,7 +30,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect diff --git a/exporter/skywalkingexporter/config_test.go b/exporter/skywalkingexporter/config_test.go index 8c0de16dfd2f..dd86d99c78f4 100644 --- a/exporter/skywalkingexporter/config_test.go +++ b/exporter/skywalkingexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -50,10 +51,12 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(typeStr, "2"), expected: &Config{ RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/skywalkingexporter/go.mod b/exporter/skywalkingexporter/go.mod index c114ffe8f4c6..4b3ed287aa3f 100644 --- a/exporter/skywalkingexporter/go.mod +++ b/exporter/skywalkingexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/skywal go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 github.com/stretchr/testify v1.8.1 @@ -18,7 +19,6 @@ require ( ) require ( - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect diff --git a/exporter/splunkhecexporter/config_test.go b/exporter/splunkhecexporter/config_test.go index 37f2e59c0e2e..b0e2ae61a7e2 100644 --- a/exporter/splunkhecexporter/config_test.go +++ b/exporter/splunkhecexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -81,10 +82,12 @@ func TestLoadConfig(t *testing.T) { MaxIdleConnsPerHost: &hundred, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 8e6bcb11a4a7..1bc83847e5f3 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunk go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/json-iterator/go v1.1.12 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.70.0 @@ -20,7 +21,6 @@ require ( require ( github.com/benbjohnson/clock v1.3.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect diff --git a/exporter/tanzuobservabilityexporter/config_test.go b/exporter/tanzuobservabilityexporter/config_test.go index 50692d9160eb..5c184e6615c2 100644 --- a/exporter/tanzuobservabilityexporter/config_test.go +++ b/exporter/tanzuobservabilityexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -55,10 +56,12 @@ func TestLoadConfig(t *testing.T) { QueueSize: 10, }, RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 60 * time.Second, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 60 * time.Second, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, } assert.Equal(t, expected, actual) diff --git a/exporter/tanzuobservabilityexporter/go.mod b/exporter/tanzuobservabilityexporter/go.mod index 55d81b9ecc7d..01e799399a91 100644 --- a/exporter/tanzuobservabilityexporter/go.mod +++ b/exporter/tanzuobservabilityexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/tanzuo go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/google/uuid v1.3.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.70.0 github.com/stretchr/testify v1.8.1 @@ -20,7 +21,6 @@ require ( contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect diff --git a/exporter/zipkinexporter/config_test.go b/exporter/zipkinexporter/config_test.go index f091d1401386..f0c81c7f4e15 100644 --- a/exporter/zipkinexporter/config_test.go +++ b/exporter/zipkinexporter/config_test.go @@ -19,6 +19,7 @@ import ( "testing" "time" + "github.com/cenkalti/backoff/v4" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" @@ -49,10 +50,12 @@ func TestLoadConfig(t *testing.T) { id: component.NewIDWithName(typeStr, "2"), expected: &Config{ RetrySettings: exporterhelper.RetrySettings{ - Enabled: true, - InitialInterval: 10 * time.Second, - MaxInterval: 1 * time.Minute, - MaxElapsedTime: 10 * time.Minute, + Enabled: true, + InitialInterval: 10 * time.Second, + MaxInterval: 1 * time.Minute, + MaxElapsedTime: 10 * time.Minute, + RandomizationFactor: backoff.DefaultRandomizationFactor, + Multiplier: backoff.DefaultMultiplier, }, QueueSettings: exporterhelper.QueueSettings{ Enabled: true, diff --git a/exporter/zipkinexporter/go.mod b/exporter/zipkinexporter/go.mod index 33cb3a8973d1..e27ce3186857 100644 --- a/exporter/zipkinexporter/go.mod +++ b/exporter/zipkinexporter/go.mod @@ -3,6 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkin go 1.18 require ( + github.com/cenkalti/backoff/v4 v4.2.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin v0.70.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.70.0 @@ -17,7 +18,6 @@ require ( require ( github.com/apache/thrift v0.17.0 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/go-logr/logr v1.2.3 // indirect