Skip to content

fix: avoid crash when addLink is undefined on span #2061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix: avoid crash when addLink is undefined on span #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e74bd9
fix: addLink
nicole0707 Jul 1, 2025
61ce21b
test: update
nicole0707 Jul 1, 2025
1cba7af
revert
nicole0707 Jul 1, 2025
2d4a655
test: update
nicole0707 Jul 2, 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
10 changes: 7 additions & 3 deletions src/telemetry-tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,11 @@ export class PubsubSpans {
if (span) {
// Also attempt to link from message spans back to the publish RPC span.
messages.forEach(m => {
if (m.parentSpan && isSampled(m.parentSpan)) {
if (
m.parentSpan &&
isSampled(m.parentSpan) &&
typeof m.parentSpan?.addLink === 'function'
) {
m.parentSpan.addLink({context: span.spanContext()});
}
});
Expand Down Expand Up @@ -549,7 +553,7 @@ export class PubsubSpans {
if (span) {
// Also attempt to link from the subscribe span(s) back to the publish RPC span.
messageSpans.forEach(m => {
if (m && isSampled(m)) {
if (m && isSampled(m) && typeof m?.addLink === 'function') {
m.addLink({context: span.spanContext()});
}
});
Expand Down Expand Up @@ -597,7 +601,7 @@ export class PubsubSpans {
if (span) {
// Also attempt to link from the subscribe span(s) back to the publish RPC span.
messageSpans.forEach(m => {
if (m && isSampled(m)) {
if (m && isSampled(m) && typeof m?.addLink === 'function') {
m.addLink({context: span.spanContext()});
}
});
Expand Down
3 changes: 2 additions & 1 deletion test/telemetry-tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,7 @@ describe('OpenTelemetryTracer', () => {
topicName,
'test',
) as trace.Span;
const parentSpanLink = sinon.spy(span, 'addLink');
message.parentSpan = span;
span.end();

Expand All @@ -374,7 +375,6 @@ describe('OpenTelemetryTracer', () => {
topicName,
'test',
);

publishSpan?.end();
const spans = exporter.getFinishedSpans();
const publishReadSpan = spans.pop();
Expand All @@ -387,6 +387,7 @@ describe('OpenTelemetryTracer', () => {
);
assert.strictEqual(publishReadSpan.links.length, 1);
assert.strictEqual(childReadSpan.links.length, 1);
assert.strictEqual(parentSpanLink.callCount, 1);
});
});
});
Loading