Skip to content

Commit 4c7028d

Browse files
committed
fix format and cmpl
1 parent 4b994e6 commit 4c7028d

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

api/all/src/main/java/io/opentelemetry/api/GlobalOpenTelemetry.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.opentelemetry.context.propagation.ContextPropagators;
1818
import java.lang.reflect.InvocationTargetException;
1919
import java.lang.reflect.Method;
20-
import java.util.function.Function;
2120
import java.util.function.Supplier;
2221
import java.util.logging.Level;
2322
import java.util.logging.Logger;
@@ -121,8 +120,8 @@ public static void set(OpenTelemetry openTelemetry) {
121120
/**
122121
* Sets the {@link OpenTelemetry} that should be the global instance.
123122
*
124-
* <p>This method calls the given {@code supplier} and calls {@link #set(OpenTelemetry)}, all while holding the
125-
* {@link GlobalOpenTelemetry} mutex.
123+
* <p>This method calls the given {@code supplier} and calls {@link #set(OpenTelemetry)}, all
124+
* while holding the {@link GlobalOpenTelemetry} mutex.
126125
*/
127126
public static void set(Supplier<OpenTelemetry> supplier) {
128127
synchronized (mutex) {

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.util.HashMap;
4242
import java.util.List;
4343
import java.util.Map;
44+
import java.util.Objects;
4445
import java.util.concurrent.atomic.AtomicReference;
4546
import java.util.function.BiFunction;
4647
import java.util.function.Function;
@@ -429,11 +430,13 @@ public AutoConfiguredOpenTelemetrySdk build() {
429430
return buildImpl();
430431
}
431432
AtomicReference<AutoConfiguredOpenTelemetrySdk> autoConfiguredRef = new AtomicReference<>();
432-
GlobalOpenTelemetry.set(() -> {
433-
autoConfiguredRef.set(buildImpl());
434-
return autoConfiguredRef.get().getOpenTelemetrySdk();
435-
});
436-
return autoConfiguredRef.get();
433+
GlobalOpenTelemetry.set(
434+
() -> {
435+
AutoConfiguredOpenTelemetrySdk sdk = buildImpl();
436+
autoConfiguredRef.set(sdk);
437+
return sdk.getOpenTelemetrySdk();
438+
});
439+
return Objects.requireNonNull(autoConfiguredRef.get());
437440
}
438441

439442
private AutoConfiguredOpenTelemetrySdk buildImpl() {

0 commit comments

Comments
 (0)