Skip to content

Commit

Permalink
setStatus method conforms to the specified behavior regarding status …
Browse files Browse the repository at this point in the history
…code priorities and description handling

Relate to #6797
  • Loading branch information
Victorsesan committed Oct 21, 2024
1 parent 628db61 commit 7f9ef5f
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 14 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ bin

# Vim
.swp

.fake
43 changes: 29 additions & 14 deletions sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Original file line number Diff line number Diff line change
Expand Up @@ -418,22 +418,37 @@ private void addTimedEvent(EventData timedEvent) {

@Override
public ReadWriteSpan setStatus(StatusCode statusCode, @Nullable String description) {
if (statusCode == null) {
return this;
}
synchronized (lock) {
if (!isModifiableByCurrentThread()) {
logger.log(Level.FINE, "Calling setStatus() on an ended Span.");
return this;
} else if (this.status.getStatusCode() == StatusCode.OK) {
logger.log(Level.FINE, "Calling setStatus() on a Span that is already set to OK.");
return this;
if (statusCode == null) {
return this; // No action if statusCode is null
}
this.status = StatusData.create(statusCode, description);
}
return this;
synchronized (lock) {
if (!isModifiableByCurrentThread()) {
logger.log(Level.FINE, "Calling setStatus() on an ended Span.");
return this; // Prevent modification if the span has ended
}

// Check the current status and enforce priority rules
StatusCode currentStatusCode = this.status.getStatusCode();

// Prevent setting a lower priority status
if (currentStatusCode == StatusCode.OK) {
logger.log(Level.FINE, "Calling setStatus() on a Span that is already set to OK.");
return this; // Do not allow lower priority status to override OK
} else if (currentStatusCode == StatusCode.ERROR && statusCode == StatusCode.UNSET) {
logger.log(Level.FINE, "Cannot set status to UNSET when current status is ERROR.");
return this; // Do not allow UNSET to override ERROR
}

// Set the status, ignoring description if status is not ERROR
if (statusCode == StatusCode.ERROR) {
this.status = StatusData.create(statusCode, description); // Allow description for ERROR
} else {
this.status = StatusData.create(statusCode, null); // Ignore description for non-ERROR statuses
}
}
return this; // Return the current span for method chaining
}

@Override
public ReadWriteSpan recordException(Throwable exception) {
recordException(exception, Attributes.empty());
Expand Down

0 comments on commit 7f9ef5f

Please sign in to comment.