Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b5c90ce
Add new otlp-centric error type
TylerHelmuth Sep 9, 2024
4e85ad6
Remove options
TylerHelmuth Sep 18, 2024
8fa1cda
merge in upstream/main
TylerHelmuth Sep 18, 2024
5acc22d
Fix lint
TylerHelmuth Sep 18, 2024
7ae4662
Merge remote-tracking branch 'upstream/main' into consumererror-otlp-…
evan-bradley May 15, 2025
947b601
Fix bad merge
evan-bradley May 15, 2025
5d51161
Adjust feedback from previous PR
evan-bradley May 15, 2025
c9ec634
go mod tidy
evan-bradley May 15, 2025
062590a
Add changelog
evan-bradley May 16, 2025
42b5cc5
Improve test coverage
evan-bradley May 16, 2025
a3021d5
Remove experimental notice
evan-bradley May 19, 2025
e58b8ca
Fix Godoc comment
evan-bradley May 21, 2025
32bd5ef
Address PR feedback
evan-bradley Jun 2, 2025
05e21df
Merge remote-tracking branch 'upstream/main' into consumererror-otlp-…
evan-bradley Jun 2, 2025
957abf5
Fix tests
evan-bradley Jun 3, 2025
0897af5
Fix lint
evan-bradley Jun 4, 2025
f4e31ab
Address PR feedback
evan-bradley Jun 10, 2025
15e3d3b
Merge remote-tracking branch 'upstream/main' into consumererror-otlp-…
evan-bradley Jun 10, 2025
2e2f7ae
Reserve behavior for success codes
evan-bradley Jul 6, 2025
5b78443
Merge remote-tracking branch 'upstream/main' into consumererror-otlp-…
evan-bradley Jul 6, 2025
8783f62
Fix lint
evan-bradley Jul 6, 2025
7e52b96
Fix lint
evan-bradley Jul 6, 2025
5d34f3b
Improve wrapped errors
evan-bradley Jul 8, 2025
c44f8a3
Merge remote-tracking branch 'upstream/main' into consumererror-otlp-…
evan-bradley Jul 8, 2025
20af93c
Merge branch 'main' into consumererror-otlp-type
evan-bradley Jul 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions .chloggen/consumererror-otlp-type.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: consumererror

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Add `Error` type

# One or more tracking issues or pull requests related to the change
issues: [7047]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: |
This type can contain information about errors that allow components (e.g. exporters)
to communicate error information back up the pipeline.

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
119 changes: 119 additions & 0 deletions consumer/consumererror/error.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package consumererror // import "go.opentelemetry.io/collector/consumer/consumererror"

import (
"net/http"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

"go.opentelemetry.io/collector/consumer/consumererror/internal/statusconversion"
)

// Error is intended to be used to encapsulate various information that can add
// context to an error that occurred within a pipeline component. Error objects
// are constructed through calling `New` with the relevant options to capture
// data around the error that occurred.
//
// It may hold multiple errors from downstream components, and can be merged
// with other errors as it travels upstream using `Combine`. The `Error` should
// be obtained from a given `error` object using `errors.As`.
type Error struct {
error
httpStatus int
grpcStatus *status.Status
retryable bool
}

var _ error = (*Error)(nil)

// NewOTLPHTTPError records an HTTP status code that was received from a server
// during data submission.
func NewOTLPHTTPError(origErr error, httpStatus int) error {
return &Error{error: origErr, httpStatus: httpStatus}
}

// NewOTLPGRPCError records a gRPC status code that was received from a server
// during data submission.
func NewOTLPGRPCError(origErr error, status *status.Status) error {
return &Error{error: origErr, grpcStatus: status}
}

// NewRetryableError records that this error is retryable according to OTLP specification.
func NewRetryableError(origErr error) error {
return &Error{error: origErr, retryable: true}
}

// Error implements the error interface.
func (e *Error) Error() string {
return e.error.Error()
}

// Unwrap returns the wrapped error for use by `errors.Is` and `errors.As`.
func (e *Error) Unwrap() error {
return e.error
}

// OTLPHTTPStatus returns an HTTP status code either directly set by the source,
// derived from a gRPC status code set by the source, or derived from Retryable.
// When deriving the value, the OTLP specification is used to map to HTTP.
// See https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md for more details.
//
// If a http status code cannot be derived from these three sources then 500 is returned.
func (e *Error) OTLPHTTPStatus() int {
if e.httpStatus != 0 {
return e.httpStatus
}
if e.grpcStatus != nil {
return statusconversion.GetHTTPStatusCodeFromStatus(e.grpcStatus)
}
if e.retryable {
return http.StatusServiceUnavailable
}
return http.StatusInternalServerError
}

// OTLPGRPCStatus returns an gRPC status code either directly set by the source,
// derived from an HTTP status code set by the source, or derived from Retryable.
// When deriving the value, the OTLP specification is used to map to GRPC.
// See https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md for more details.
//
// If a grpc code cannot be derived from these three sources then INTERNAL is returned.
func (e *Error) OTLPGRPCStatus() *status.Status {
if e.grpcStatus != nil {
return e.grpcStatus
}
if e.httpStatus != 0 {
return statusconversion.NewStatusFromMsgAndHTTPCode(e.Error(), e.httpStatus)
}
if e.retryable {
return status.New(codes.Unavailable, e.Error())
}
return status.New(codes.Unknown, e.Error())
}

// Retryable returns true if the error was created with the WithRetryable set to true,
// if the http status code is retryable according to OTLP,
// or if the grpc status is retryable according to OTLP.
// Otherwise, returns false.
//
// See https://github.com/open-telemetry/opentelemetry-proto/blob/main/docs/specification.md for retryable
// http and grpc codes.
func (e *Error) Retryable() bool {
if e.retryable {
return true
}
switch e.httpStatus {
case http.StatusTooManyRequests, http.StatusBadGateway, http.StatusServiceUnavailable, http.StatusGatewayTimeout:
return true
}
if e.grpcStatus != nil {
switch e.grpcStatus.Code() {
case codes.Canceled, codes.DeadlineExceeded, codes.Aborted, codes.OutOfRange, codes.Unavailable, codes.DataLoss:
return true
}
}
return false
}
Loading
Loading