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.

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

Avoid potential race condition with Observation.NOOP #3946

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Avoid potential race condition with Observation.NOOP #3946

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
9 changes: 2 additions & 7 deletions micrometer-observation/src/main/java/io/micrometer/observation/NoopObservation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,9 @@
*/
final class NoopObservation implements Observation {

/**
* Instance of {@link NoopObservation}.
*/
static final NoopObservation INSTANCE = new NoopObservation();

private static final Context CONTEXT = new Context();

private NoopObservation() {
NoopObservation() {
}

@Override
Expand Down Expand Up @@ -119,7 +114,7 @@ private NoopScope() {

@Override
public Observation getCurrentObservation() {
return NoopObservation.INSTANCE;
return Observation.NOOP;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion micrometer-observation/src/main/java/io/micrometer/observation/NoopObservationRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private NoopObservationRegistry() {

@Override
public Observation getCurrentObservation() {
return NoopObservation.INSTANCE;
return Observation.NOOP;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion micrometer-observation/src/main/java/io/micrometer/observation/Observation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public interface Observation extends ObservationView {
/**
* No-op observation.
*/
Observation NOOP = NoopObservation.INSTANCE;
Observation NOOP = new NoopObservation();

/**
* Create and start an {@link Observation} with the given name. All Observations of
Expand Down