File tree Expand file tree Collapse file tree 3 files changed +10
-3
lines changed
all/src/main/java/io/opentelemetry/api
testing-internal/src/main/java/io/opentelemetry/api/testing/internal
sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure Expand file tree Collapse file tree 3 files changed +10
-3
lines changed Original file line number Diff line number Diff line change @@ -72,7 +72,7 @@ private GlobalOpenTelemetry() {}
72
72
* interface FQCN but the specified provider cannot be found.
73
73
*/
74
74
public static OpenTelemetry get () {
75
- OpenTelemetry openTelemetry = globalOpenTelemetry ;
75
+ ObfuscatedOpenTelemetry openTelemetry = globalOpenTelemetry ;
76
76
if (openTelemetry == null ) {
77
77
synchronized (mutex ) {
78
78
openTelemetry = globalOpenTelemetry ;
@@ -88,7 +88,7 @@ public static OpenTelemetry get() {
88
88
}
89
89
}
90
90
}
91
- return openTelemetry ;
91
+ return openTelemetry . delegate == OpenTelemetry . noop () ? OpenTelemetry . noop () : openTelemetry ;
92
92
}
93
93
94
94
/**
Original file line number Diff line number Diff line change @@ -115,4 +115,11 @@ void toString_noop_Valid() {
115
115
+ "propagators=DefaultContextPropagators{textMapPropagator=NoopTextMapPropagator}"
116
116
+ "}" );
117
117
}
118
+
119
+ @ Test
120
+ void neverReturnsObfuscatedNoop () {
121
+ assertThat (GlobalOpenTelemetry .get ()).isSameAs (OpenTelemetry .noop ());
122
+ // ensure sequential calls of GlobalOpenTelemetry.get() return same object
123
+ assertThat (GlobalOpenTelemetry .get ()).isSameAs (OpenTelemetry .noop ());
124
+ }
118
125
}
Original file line number Diff line number Diff line change @@ -372,7 +372,7 @@ void builder_addLoggerProviderCustomizer() {
372
372
373
373
@ Test
374
374
void builder_setResultAsGlobalFalse () {
375
- GlobalOpenTelemetry .set (OpenTelemetry .noop ( ));
375
+ GlobalOpenTelemetry .set (mock ( OpenTelemetry .class ));
376
376
377
377
OpenTelemetrySdk openTelemetry = builder .build ().getOpenTelemetrySdk ();
378
378
You can’t perform that action at this time.
0 commit comments