diff --git a/exporter/exporterhelper/internal/experr/err.go b/exporter/exporterhelper/internal/experr/err.go new file mode 100644 index 0000000000..4080e0369d --- /dev/null +++ b/exporter/exporterhelper/internal/experr/err.go @@ -0,0 +1,29 @@ +// Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + +package experr // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal/experr" + +import ( + "errors" +) + +type shutdownErr struct { + err error +} + +func NewShutdownErr(err error) error { + return shutdownErr{err: err} +} + +func (s shutdownErr) Error() string { + return "interrupted due to shutdown: " + s.err.Error() +} + +func (s shutdownErr) Unwrap() error { + return s.err +} + +func IsShutdownErr(err error) bool { + var sdErr shutdownErr + return errors.As(err, &sdErr) +} diff --git a/exporter/internal/experr/err_test.go b/exporter/exporterhelper/internal/experr/err_test.go similarity index 100% rename from exporter/internal/experr/err_test.go rename to exporter/exporterhelper/internal/experr/err_test.go diff --git a/exporter/exporterhelper/internal/queue_sender_test.go b/exporter/exporterhelper/internal/queue_sender_test.go index 0827be6380..8df55dab1e 100644 --- a/exporter/exporterhelper/internal/queue_sender_test.go +++ b/exporter/exporterhelper/internal/queue_sender_test.go @@ -23,8 +23,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal/queuebatch" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/request" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exporterqueue" - "go.opentelemetry.io/collector/exporter/internal/storagetest" ) type fakeEncoding struct { diff --git a/exporter/exporterhelper/internal/queuebatch/persistent_queue.go b/exporter/exporterhelper/internal/queuebatch/persistent_queue.go index dadf9671fa..fc902ae2f9 100644 --- a/exporter/exporterhelper/internal/queuebatch/persistent_queue.go +++ b/exporter/exporterhelper/internal/queuebatch/persistent_queue.go @@ -15,8 +15,8 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/experr" "go.opentelemetry.io/collector/exporter/exporterqueue" - "go.opentelemetry.io/collector/exporter/internal/experr" "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pipeline" ) diff --git a/exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go b/exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go index bf712a73e6..b9d15d9943 100644 --- a/exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go +++ b/exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/experr" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/internal/experr" - "go.opentelemetry.io/collector/exporter/internal/storagetest" "go.opentelemetry.io/collector/extension/extensiontest" "go.opentelemetry.io/collector/extension/xextension/storage" "go.opentelemetry.io/collector/pipeline" diff --git a/exporter/exporterhelper/internal/retry_sender.go b/exporter/exporterhelper/internal/retry_sender.go index 41db7248d8..c8a7a4456a 100644 --- a/exporter/exporterhelper/internal/retry_sender.go +++ b/exporter/exporterhelper/internal/retry_sender.go @@ -18,8 +18,8 @@ import ( "go.opentelemetry.io/collector/config/configretry" "go.opentelemetry.io/collector/consumer/consumererror" "go.opentelemetry.io/collector/exporter" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/experr" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/request" - "go.opentelemetry.io/collector/exporter/internal/experr" ) // TODO: Clean this by forcing all exporters to return an internal error type that always include the information about retries. diff --git a/exporter/internal/storagetest/mock_storage.go b/exporter/exporterhelper/internal/storagetest/mock_storage.go similarity index 98% rename from exporter/internal/storagetest/mock_storage.go rename to exporter/exporterhelper/internal/storagetest/mock_storage.go index 35024d35ee..c62fb2d1dd 100644 --- a/exporter/internal/storagetest/mock_storage.go +++ b/exporter/exporterhelper/internal/storagetest/mock_storage.go @@ -1,7 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 -package storagetest // import "go.opentelemetry.io/collector/exporter/internal/storagetest" +package storagetest // import "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" import ( "context" diff --git a/exporter/exporterhelper/logs_test.go b/exporter/exporterhelper/logs_test.go index d23951de9a..b4bbc68706 100644 --- a/exporter/exporterhelper/logs_test.go +++ b/exporter/exporterhelper/logs_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/internal/storagetest" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/testdata" ) diff --git a/exporter/exporterhelper/metrics_test.go b/exporter/exporterhelper/metrics_test.go index 940816450e..0745bbd3da 100644 --- a/exporter/exporterhelper/metrics_test.go +++ b/exporter/exporterhelper/metrics_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/internal/storagetest" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/testdata" ) diff --git a/exporter/exporterhelper/traces_test.go b/exporter/exporterhelper/traces_test.go index a4e7888ea0..b9f5aba6da 100644 --- a/exporter/exporterhelper/traces_test.go +++ b/exporter/exporterhelper/traces_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal/metadatatest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/internal/storagetest" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/testdata" ) diff --git a/exporter/exporterhelper/xexporterhelper/profiles_test.go b/exporter/exporterhelper/xexporterhelper/profiles_test.go index bcfc759862..33ca895c67 100644 --- a/exporter/exporterhelper/xexporterhelper/profiles_test.go +++ b/exporter/exporterhelper/xexporterhelper/profiles_test.go @@ -31,8 +31,8 @@ import ( "go.opentelemetry.io/collector/exporter/exporterhelper/internal" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/oteltest" "go.opentelemetry.io/collector/exporter/exporterhelper/internal/requesttest" + "go.opentelemetry.io/collector/exporter/exporterhelper/internal/storagetest" "go.opentelemetry.io/collector/exporter/exportertest" - "go.opentelemetry.io/collector/exporter/internal/storagetest" "go.opentelemetry.io/collector/exporter/xexporter" "go.opentelemetry.io/collector/pdata/pprofile" "go.opentelemetry.io/collector/pdata/testdata" diff --git a/exporter/internal/experr/err.go b/exporter/internal/experr/err.go index f8b109d7de..f704533639 100644 --- a/exporter/internal/experr/err.go +++ b/exporter/internal/experr/err.go @@ -4,33 +4,11 @@ package experr // import "go.opentelemetry.io/collector/exporter/internal/experr" import ( - "errors" "fmt" "go.opentelemetry.io/collector/component" ) -type shutdownErr struct { - err error -} - -func NewShutdownErr(err error) error { - return shutdownErr{err: err} -} - -func (s shutdownErr) Error() string { - return "interrupted due to shutdown: " + s.err.Error() -} - -func (s shutdownErr) Unwrap() error { - return s.err -} - -func IsShutdownErr(err error) bool { - var sdErr shutdownErr - return errors.As(err, &sdErr) -} - func ErrIDMismatch(id component.ID, typ component.Type) error { return fmt.Errorf("component type mismatch: component ID %q does not have type %q", id, typ) }