Skip to content

End span even if ExtendedSpanProcessor.onEnding throws #9022

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
ultramancode wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −1
Open

End span even if ExtendedSpanProcessor.onEnding throws #9022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import io.opentelemetry.sdk.common.internal.AttributesMap;
import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver;
import io.opentelemetry.sdk.common.internal.InstrumentationScopeUtil;
import io.opentelemetry.sdk.common.internal.ThrowableUtil;
import io.opentelemetry.sdk.resources.Resource;
import io.opentelemetry.sdk.trace.data.EventData;
import io.opentelemetry.sdk.trace.data.ExceptionEventData;
Expand Down Expand Up @@ -575,7 +576,12 @@ private void endInternal(long endEpochNanos) {
if (spanProcessor instanceof ExtendedSpanProcessor) {
ExtendedSpanProcessor extendedSpanProcessor = (ExtendedSpanProcessor) spanProcessor;
if (extendedSpanProcessor.isOnEndingRequired()) {
extendedSpanProcessor.onEnding(this);
try {
extendedSpanProcessor.onEnding(this);
} catch (Throwable t) {
ThrowableUtil.propagateIfFatal(t);
logger.log(Level.WARNING, "SpanProcessor threw an Exception in onEnding", t);
}
}
}
synchronized (lock) {
Expand Down
30 changes: 30 additions & 0 deletions sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Expand All @@ -40,6 +41,7 @@
import io.opentelemetry.api.trace.TraceId;
import io.opentelemetry.api.trace.TraceState;
import io.opentelemetry.context.Context;
import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
import io.opentelemetry.sdk.common.internal.AttributesMap;
import io.opentelemetry.sdk.common.internal.ExceptionAttributeResolver;
Expand Down Expand Up @@ -256,6 +258,34 @@ void onEnding_latencyPinned() {
assertThat(spanLatencyInProcessor.get()).isEqualTo(expectedDuration);
}

@Test
@SuppressLogger(SdkSpan.class)
void onEnding_processorThrows() {
SdkSpan span = createTestSpan(SpanKind.INTERNAL);
doThrow(new IllegalStateException("onEnding failed")).when(spanProcessor).onEnding(any());

assertThatCode(span::end).doesNotThrowAnyException();
assertThat(span.hasEnded()).isTrue();
assertThat(span).extracting("spanEndingThread").isNull();
verify(spanProcessor).onEnd(same(span));
}

@Test
@SuppressLogger(SdkSpan.class)
void onEnding_processorThrowsCheckedException() {
SdkSpan span = createTestSpan(SpanKind.INTERNAL);
doAnswer(
invocation -> {
throw new Exception("onEnding failed");
})
.when(spanProcessor)
.onEnding(any());

assertThatCode(span::end).doesNotThrowAnyException();
assertThat(span.hasEnded()).isTrue();
verify(spanProcessor).onEnd(same(span));
}

@Test
void toSpanData_ActiveSpan() {
SdkSpan span = createTestSpan(SpanKind.INTERNAL);
Expand Down
Loading