open-telemetry
/
opentelemetry-collector
mirror of https://github.com/open-telemetry/opentelemetry-collector.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[chore] Move exporter/internal to exporterhelper/internal when possible (#12683) 

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
This commit is contained in:
Bogdan Drutu 2025-03-20 09:08:31 -07:00 committed by GitHub
parent 6aad9d10e4
commit 6e64a27421
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
exporter/exporterhelper/internal/experr/err.go Normal file
View File

@ -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)
}

0
exporter/internal/experr/err_test.go → exporter/exporterhelper/internal/experr/err_test.go
View File

2
exporter/exporterhelper/internal/queue_sender_test.go
View File

@ -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 {

2
exporter/exporterhelper/internal/queuebatch/persistent_queue.go
View File

@ -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"
)

4
exporter/exporterhelper/internal/queuebatch/persistent_queue_test.go
View File

@ -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"

2
exporter/exporterhelper/internal/retry_sender.go
View File

@ -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.

2
exporter/internal/storagetest/mock_storage.go → exporter/exporterhelper/internal/storagetest/mock_storage.go
View File

@ -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"

2
exporter/exporterhelper/logs_test.go
View File

@ -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"
)

2
exporter/exporterhelper/metrics_test.go
View File

@ -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"
)

2
exporter/exporterhelper/traces_test.go
View File

@ -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"
)

2
exporter/exporterhelper/xexporterhelper/profiles_test.go
View File

@ -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"

22
exporter/internal/experr/err.go
View File

@ -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)
}