Skip to content

Commit

Permalink
[receiver/solacereceiver]: Fix for receiver unexpectedly terminating …
Browse files Browse the repository at this point in the history
…on reporting traces when used with a memory limiter processor and under high load (open-telemetry#35958)

**Description:** The Solace receiver may unexpectedly terminate on
reporting traces when used with a memory limiter processor and under
high load.

**Link to tracking Issue:** N/A

**Testing:** N/A

**Documentation:** N/A
  • Loading branch information
oodigie authored and sbylica-splunk committed Dec 17, 2024
1 parent a873345 commit 7cb2faa
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 2 deletions.
27 changes: 27 additions & 0 deletions .chloggen/solacereceiver_fix_span_count_nil_pointer_segfault.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: bug_fix

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

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "The Solace receiver may unexpectedly terminate on reporting traces when used with a memory limiter processor and under high load"

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [35958]

# (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:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# 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: [user]
2 changes: 1 addition & 1 deletion pkg/kafka/topic/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/open-telemetry/opentelemetry-collector-contrib/pkg/kafka/topic

go 1.22
go 1.22.0
8 changes: 7 additions & 1 deletion receiver/solacereceiver/receiver.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/pdata/ptrace"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/metric"
Expand Down Expand Up @@ -257,10 +258,15 @@ func (s *solaceTracesReceiver) receiveMessage(ctx context.Context, service messa
}

var flowControlCount int64
var spanCount int
flowControlLoop:
for {
// forward to next consumer. Forwarding errors are not fatal so are not propagated to the caller.
// Temporary consumer errors will lead to redelivered messages, permanent will be accepted
if (traces != ptrace.Traces{}) {
spanCount = traces.SpanCount() // get the span count into a variable before we call consumeTraces
}

forwardErr := s.nextConsumer.ConsumeTraces(ctx, traces)
if forwardErr != nil {
if !consumererror.IsPermanent(forwardErr) {
Expand Down Expand Up @@ -288,7 +294,7 @@ flowControlLoop:
}
} else {
// no forward error
s.telemetryBuilder.SolacereceiverReportedSpans.Add(ctx, int64(traces.SpanCount()), metric.WithAttributeSet(s.metricAttrs))
s.telemetryBuilder.SolacereceiverReportedSpans.Add(ctx, int64(spanCount), metric.WithAttributeSet(s.metricAttrs))
break flowControlLoop
}
}
Expand Down

0 comments on commit 7cb2faa

Please sign in to comment.