diff --git a/exporters/otlp/otlptrace/internal/gen.go b/exporters/otlp/otlptrace/internal/gen.go index 17b9fa70ee7e..7b9684c2679c 100644 --- a/exporters/otlp/otlptrace/internal/gen.go +++ b/exporters/otlp/otlptrace/internal/gen.go @@ -14,9 +14,6 @@ package internal // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal" -//go:generate gotmpl --body=../../../../internal/shared/otlp/wrappederror.go.tmpl "--data={}" --out=wrappederror.go -//go:generate gotmpl --body=../../../../internal/shared/otlp/wrappederror_test.go.tmpl "--data={}" --out=wrappederror_test.go - //go:generate gotmpl --body=../../../../internal/shared/otlp/otlptrace/header.go.tmpl "--data={}" --out=header.go //go:generate gotmpl --body=../../../../internal/shared/otlp/otlptrace/header_test.go.tmpl "--data={}" --out=header_test.go diff --git a/exporters/otlp/otlptrace/internal/wrappederror.go b/exporters/otlp/otlptrace/internal/wrappederror.go deleted file mode 100644 index 7f434140acb7..000000000000 --- a/exporters/otlp/otlptrace/internal/wrappederror.go +++ /dev/null @@ -1,64 +0,0 @@ -// Code created by gotmpl. DO NOT MODIFY. -// source: internal/shared/otlp/wrappederror.go.tmpl - -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package internal // import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal" - -// ErrorKind is used to identify the kind of export error -// being wrapped. -type ErrorKind int - -const ( - // TracesExport indicates the error comes from the OTLP trace exporter. - TracesExport ErrorKind = iota -) - -// prefix returns a prefix for the Error() string. -func (k ErrorKind) prefix() string { - switch k { - case TracesExport: - return "traces export: " - default: - return "unknown: " - } -} - -// wrappedExportError wraps an OTLP exporter error with the kind of -// signal that produced it. -type wrappedExportError struct { - wrap error - kind ErrorKind -} - -// WrapTracesError wraps an error from the OTLP exporter for traces. -func WrapTracesError(err error) error { - return wrappedExportError{ - wrap: err, - kind: TracesExport, - } -} - -var _ error = wrappedExportError{} - -// Error attaches a prefix corresponding to the kind of exporter. -func (t wrappedExportError) Error() string { - return t.kind.prefix() + t.wrap.Error() -} - -// Unwrap returns the wrapped error. -func (t wrappedExportError) Unwrap() error { - return t.wrap -} diff --git a/exporters/otlp/otlptrace/internal/wrappederror_test.go b/exporters/otlp/otlptrace/internal/wrappederror_test.go deleted file mode 100644 index 29f6e48209fd..000000000000 --- a/exporters/otlp/otlptrace/internal/wrappederror_test.go +++ /dev/null @@ -1,35 +0,0 @@ -// Code created by gotmpl. DO NOT MODIFY. -// source: internal/shared/otlp/wrappederror_test.go.tmpl - -// Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package internal // import "go.opentelemetry.io/otel/exporters/otlp/internal" - -import ( - "context" - "errors" - "testing" - - "github.com/stretchr/testify/require" -) - -func TestWrappedError(t *testing.T) { - e := WrapTracesError(context.Canceled) - - require.Equal(t, context.Canceled, errors.Unwrap(e)) - require.Equal(t, TracesExport, e.(wrappedExportError).kind) - require.Equal(t, "traces export: context canceled", e.Error()) - require.True(t, errors.Is(e, context.Canceled)) -}