Skip to content
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.

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

setStatus method conforms to the specified behavior regarding status … #6808

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7f9ef5f
setStatus method conforms to the specified behavior regarding status …
Victorsesan Oct 21, 2024
ef46f8f
fix
Victorsesan Oct 23, 2024
9590742
Merge branch 'open-telemetry:main' into main
Victorsesan Oct 23, 2024
a9fb915
Fixed and adjusted the following.
Victorsesan Oct 24, 2024
500d261
Merge branch 'main' of github.com:Victorsesan/opentelemetry-java
Victorsesan Oct 24, 2024
aa731c7
fix comments
Victorsesan Oct 25, 2024
bed6535
fix comment
Victorsesan Oct 25, 2024
c21608c
Created a test in the sdkspantest to see if codecov will have line 4…
Victorsesan Oct 26, 2024
ec33889
test 2
Victorsesan Oct 26, 2024
ab67793
.
Victorsesan Oct 26, 2024
189c416
.
Victorsesan Oct 26, 2024
7991abf
.
Victorsesan Oct 26, 2024
448ece8
ensured span's status does not change after it has ended in the nothi…
Victorsesan Nov 3, 2024
5a62252
Merge branch 'open-telemetry:main' into main
Victorsesan Nov 3, 2024
2fdd372
#
Victorsesan Nov 4, 2024
d452c3e
#
Victorsesan Nov 4, 2024
f04bb8d
Update sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Victorsesan Nov 8, 2024
5aa430e
Update sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Victorsesan Nov 8, 2024
db6a054
Update sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Victorsesan Nov 8, 2024
b1776cf
Update sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Victorsesan Nov 8, 2024
d9e11e8
Update sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java
Victorsesan Nov 8, 2024
8fc9659
Added a new test to help ensure that my setStatus method behaves cor…
Victorsesan Nov 8, 2024
cb9283e
Merge branch 'main' of github.com:Victorsesan/opentelemetry-java
Victorsesan Nov 8, 2024
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
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please revert this change

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;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove 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) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use spotless to ensure consist code formatting. Please run ./gradlew spotlessApply.

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.");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only log a warning the target status code is != StatusCode.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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#nit: Let's skip the extra allocation if the status code doesn't stand to change.

Suggested change
this.status = StatusData.create(statusCode, null); // Ignore description for non-ERROR statuses
if (currentStatusCode != statusCode) {
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
Loading