From f30dc60ef61450bb5a116d17a08f0802fbc6185f Mon Sep 17 00:00:00 2001 From: Vihas Splunk Date: Wed, 12 Jul 2023 14:13:25 +0530 Subject: [PATCH] add changelog --- .chloggen/handle-grpc-status-codes.yaml | 16 ++++++++++++++++ receiver/otlpreceiver/internal/trace/otlp.go | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 .chloggen/handle-grpc-status-codes.yaml diff --git a/.chloggen/handle-grpc-status-codes.yaml b/.chloggen/handle-grpc-status-codes.yaml new file mode 100644 index 00000000000..39cf9a61002 --- /dev/null +++ b/.chloggen/handle-grpc-status-codes.yaml @@ -0,0 +1,16 @@ +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: otlpreceiver + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Ensure OTLP receiver handles consume errors correctly + +# One or more tracking issues or pull requests related to the change +issues: [4335] + +# (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: Make sure OTLP receiver returns correct status code and follows the receiver contract (gRPC) diff --git a/receiver/otlpreceiver/internal/trace/otlp.go b/receiver/otlpreceiver/internal/trace/otlp.go index 16efa686286..217596e1980 100644 --- a/receiver/otlpreceiver/internal/trace/otlp.go +++ b/receiver/otlpreceiver/internal/trace/otlp.go @@ -60,5 +60,5 @@ func (r *Receiver) Export(ctx context.Context, req ptraceotlp.ExportRequest) (pt } return ptraceotlp.NewExportResponse(), s.Err() } - return ptraceotlp.NewExportResponse(), nil + return ptraceotlp.NewExportResponse(), err }