Avoid unnecessary public classes. (#1211)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · May 13, 2020 · 5b625d2 · 5b625d2
1 parent 5b31c5a
commit 5b625d2
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 139 deletions.
diff --git a/api/src/main/java/io/opentelemetry/OpenTelemetry.java b/api/src/main/java/io/opentelemetry/OpenTelemetry.java
@@ -20,16 +20,13 @@
 import io.opentelemetry.context.propagation.DefaultContextPropagators;
 import io.opentelemetry.correlationcontext.CorrelationContextManager;
 import io.opentelemetry.correlationcontext.DefaultCorrelationContextManager;
-import io.opentelemetry.correlationcontext.DefaultCorrelationContextManagerProvider;
 import io.opentelemetry.correlationcontext.spi.CorrelationContextManagerProvider;
 import io.opentelemetry.internal.Obfuscated;
 import io.opentelemetry.internal.Utils;
 import io.opentelemetry.metrics.DefaultMeterProvider;
-import io.opentelemetry.metrics.DefaultMetricsProvider;
 import io.opentelemetry.metrics.Meter;
 import io.opentelemetry.metrics.MeterProvider;
 import io.opentelemetry.metrics.spi.MetricsProvider;
-import io.opentelemetry.trace.DefaultTraceProvider;
 import io.opentelemetry.trace.DefaultTracerProvider;
 import io.opentelemetry.trace.Tracer;
 import io.opentelemetry.trace.TracerProvider;
@@ -206,19 +203,17 @@ private OpenTelemetry() {
     this.tracerProvider =
         traceProvider != null
             ? new ObfuscatedTracerProvider(traceProvider.create())
-            : DefaultTraceProvider.getInstance().create();
+            : DefaultTracerProvider.getInstance();
 
     MetricsProvider metricsProvider = loadSpi(MetricsProvider.class);
     meterProvider =
-        metricsProvider != null
-            ? metricsProvider.create()
-            : DefaultMetricsProvider.getInstance().create();
+        metricsProvider != null ? metricsProvider.create() : DefaultMeterProvider.getInstance();
     CorrelationContextManagerProvider contextManagerProvider =
         loadSpi(CorrelationContextManagerProvider.class);
     contextManager =
         contextManagerProvider != null
             ? contextManagerProvider.create()
-            : DefaultCorrelationContextManagerProvider.getInstance().create();
+            : DefaultCorrelationContextManager.getInstance();
   }
 
   /**

diff --git a/...in/java/io/opentelemetry/correlationcontext/DefaultCorrelationContextManagerProvider.java b/...in/java/io/opentelemetry/correlationcontext/DefaultCorrelationContextManagerProvider.java
diff --git a/api/src/main/java/io/opentelemetry/metrics/DefaultMetricsProvider.java b/api/src/main/java/io/opentelemetry/metrics/DefaultMetricsProvider.java
diff --git a/api/src/main/java/io/opentelemetry/trace/DefaultTraceProvider.java b/api/src/main/java/io/opentelemetry/trace/DefaultTraceProvider.java