Skip to content

Commit 39e60f8

Browse files
traskCopilot
andauthored
Spec update: Changes to disabled config must be eventually visible (#7706)
Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: trask <[email protected]>
1 parent 685d119 commit 39e60f8

File tree

5 files changed

+6
-9
lines changed

5 files changed

+6
-9
lines changed

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogger.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ class SdkLogger implements Logger {
3333
private final LoggerSharedState loggerSharedState;
3434
private final InstrumentationScopeInfo instrumentationScopeInfo;
3535

36-
// deliberately not volatile because of performance concerns
37-
// - which means its eventually consistent
38-
protected boolean loggerEnabled;
36+
protected volatile boolean loggerEnabled;
3937

4038
SdkLogger(
4139
LoggerSharedState loggerSharedState,

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ final class SdkMeter implements Meter {
8989
private final InstrumentationScopeInfo instrumentationScopeInfo;
9090
private final Map<RegisteredReader, MetricStorageRegistry> readerStorageRegistries;
9191

92-
private boolean meterEnabled;
92+
private volatile boolean meterEnabled;
9393

9494
SdkMeter(
9595
MeterProviderSharedState meterProviderSharedState,

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/AsynchronousMetricStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public final class AsynchronousMetricStorage<T extends PointData> implements Met
8585
private long startEpochNanos;
8686
private long epochNanos;
8787

88-
private boolean enabled;
88+
private volatile boolean enabled;
8989

9090
private AsynchronousMetricStorage(
9191
RegisteredReader registeredReader,

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DefaultSynchronousMetricStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public final class DefaultSynchronousMetricStorage<T extends PointData>
7373
private final ConcurrentLinkedQueue<AggregatorHandle<T>> aggregatorHandlePool =
7474
new ConcurrentLinkedQueue<>();
7575

76-
private boolean enabled;
76+
private volatile boolean enabled;
7777

7878
DefaultSynchronousMetricStorage(
7979
RegisteredReader registeredReader,

sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkTracer.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ class SdkTracer implements Tracer {
3030

3131
private final TracerSharedState sharedState;
3232
private final InstrumentationScopeInfo instrumentationScopeInfo;
33-
// deliberately not volatile because of performance concerns
34-
// - which means its eventually consistent
35-
protected boolean tracerEnabled;
33+
34+
protected volatile boolean tracerEnabled;
3635

3736
SdkTracer(
3837
TracerSharedState sharedState,

0 commit comments

Comments
 (0)