Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Shims

* OpenCensus: Preserve status description when converting a span status to OpenTelemetry

## Version 1.63.0 (2026-06-05)

### API
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,13 @@ public void addMessageEvent(MessageEvent messageEvent) {
@Override
public void setStatus(Status status) {
Preconditions.checkNotNull(status, "status");
DelegatingSpan.super.setStatus(status.isOk() ? StatusCode.OK : StatusCode.ERROR);
StatusCode code = status.isOk() ? StatusCode.OK : StatusCode.ERROR;
String description = status.getDescription();
if (description == null) {
DelegatingSpan.super.setStatus(code);
} else {
DelegatingSpan.super.setStatus(code, description);
}
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.opencensusshim;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import io.opencensus.trace.Status;
import io.opentelemetry.api.trace.Span;
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.StatusCode;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;

@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
class OpenTelemetrySpanImplTest {

@Mock private Span otelSpan;

private OpenTelemetrySpanImpl shimSpan() {
when(otelSpan.getSpanContext()).thenReturn(SpanContext.getInvalid());
return new OpenTelemetrySpanImpl(otelSpan);
}

@Test
void setStatus_preservesDescription() {
shimSpan().setStatus(Status.UNKNOWN.withDescription("connection refused"));

verify(otelSpan).setStatus(StatusCode.ERROR, "connection refused");
}

@Test
void setStatus_withoutDescription_setsCodeOnly() {
shimSpan().setStatus(Status.OK);

verify(otelSpan).setStatus(StatusCode.OK);
verify(otelSpan, never()).setStatus(any(StatusCode.class), anyString());
}
}
Loading