Skip to content

Commit 5f388fb

Browse files
committed
rebase
1 parent 40e6bd1 commit 5f388fb

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

sdk-extensions/incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/fileconfig/DeclarativeConfigContext.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,26 @@
77

88
import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
99
import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
10+
import io.opentelemetry.api.metrics.MeterProvider;
1011
import io.opentelemetry.common.ComponentLoader;
1112
import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
1213
import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
14+
import io.opentelemetry.sdk.resources.Resource;
1315
import java.io.Closeable;
1416
import java.util.ArrayList;
1517
import java.util.Collections;
1618
import java.util.List;
1719
import java.util.function.Function;
1820
import java.util.stream.Collectors;
21+
import javax.annotation.Nullable;
1922

2023
/** Declarative configuration context and state carrier. */
2124
class DeclarativeConfigContext {
2225

2326
private final SpiHelper spiHelper;
2427
private final List<Closeable> closeables = new ArrayList<>();
25-
private Resource resource = Resource.empty();
2628
@Nullable private volatile MeterProvider meterProvider;
29+
private Resource resource = Resource.empty();
2730

2831
// Visible for testing
2932
DeclarativeConfigContext(SpiHelper spiHelper) {

0 commit comments

Comments
 (0)