pass meter provider to avoid using the global otel instance

Author: zeitlinger

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

@@ -7,6 +7,7 @@
 
 import io.opentelemetry.api.incubator.config.DeclarativeConfigException;
 import io.opentelemetry.api.incubator.config.DeclarativeConfigProperties;
+import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.sdk.autoconfigure.internal.SpiHelper;
 import io.opentelemetry.sdk.autoconfigure.spi.internal.ComponentProvider;
 import java.io.Closeable;
@@ -20,6 +21,7 @@
 class DeclarativeConfigContext {
 
   private final SpiHelper spiHelper;
+  private MeterProvider meterProvider;
   private final List<Closeable> closeables = new ArrayList<>();
 
   DeclarativeConfigContext(SpiHelper spiHelper) {
@@ -39,6 +41,14 @@ List<Closeable> getCloseables() {
     return Collections.unmodifiableList(closeables);
   }
 
+  public MeterProvider getMeterProvider() {
+    return meterProvider;
+  }
+
+  public void setMeterProvider(MeterProvider meterProvider) {
+    this.meterProvider = meterProvider;
+  }
+
   /**
    * Find a registered {@link ComponentProvider} with {@link ComponentProvider#getType()} matching
    * {@code type}, {@link ComponentProvider#getName()} matching {@code name}, and call {@link

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

@@ -52,6 +52,7 @@ public LogRecordProcessor create(
       if (batchModel.getScheduleDelay() != null) {
         builder.setScheduleDelay(Duration.ofMillis(batchModel.getScheduleDelay()));
       }
+      builder.setMeterProvider(context.getMeterProvider());
 
       return context.addCloseable(builder.build());
     }

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

@@ -9,6 +9,7 @@
 import io.opentelemetry.sdk.OpenTelemetrySdk;
 import io.opentelemetry.sdk.OpenTelemetrySdkBuilder;
 import io.opentelemetry.sdk.extension.incubator.fileconfig.internal.model.OpenTelemetryConfigurationModel;
+import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -53,6 +54,16 @@ public OpenTelemetrySdk create(
       resource = ResourceFactory.getInstance().create(model.getResource(), context);
     }
 
+    if (model.getMeterProvider() != null) {
+      SdkMeterProvider meterProvider =
+          MeterProviderFactory.getInstance()
+              .create(model.getMeterProvider(), context)
+              .setResource(resource)
+              .build();
+      context.setMeterProvider(meterProvider);
+      builder.setMeterProvider(context.addCloseable(meterProvider));
+    }
+
     if (model.getLoggerProvider() != null) {
       builder.setLoggerProvider(
           context.addCloseable(
@@ -77,15 +88,6 @@ public OpenTelemetrySdk create(
                   .build()));
     }
 
-    if (model.getMeterProvider() != null) {
-      builder.setMeterProvider(
-          context.addCloseable(
-              MeterProviderFactory.getInstance()
-                  .create(model.getMeterProvider(), context)
-                  .setResource(resource)
-                  .build()));
-    }
-
     return context.addCloseable(builder.build());
   }
 }

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

@@ -47,6 +47,8 @@ public SpanProcessor create(SpanProcessorModel model, DeclarativeConfigContext c
       if (batchModel.getScheduleDelay() != null) {
         builder.setScheduleDelay(Duration.ofMillis(batchModel.getScheduleDelay()));
       }
+      builder.setMeterProvider(context.getMeterProvider());
+
       return context.addCloseable(builder.build());
     }