Move the SPI interfaces to .spi.* packages (#2005)

api/src/main/java/io/opentelemetry/api/DefaultOpenTelemetry.java

@@ -8,12 +8,12 @@ package io.opentelemetry.api;
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.api.metrics.spi.MeterProviderFactory;
-import io.opentelemetry.api.spi.OpenTelemetryFactory;
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.api.trace.spi.TracerProviderFactory;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.DefaultContextPropagators;
+import io.opentelemetry.spi.OpenTelemetryFactory;
+import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 import java.util.ServiceLoader;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.ThreadSafe;

api/src/main/java/io/opentelemetry/api/OpenTelemetry.java

@@ -12,16 +12,17 @@ import io.opentelemetry.api.metrics.MeterProvider;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.spi.OpenTelemetryFactory;
+import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 
 /**
  * The entrypoint to telemetry functionality for tracing, metrics and baggage.
  *
  * <p>A global singleton can be retrieved by {@link #get()}. The default for the returned {@link
  * OpenTelemetry}, if none has been set via {@link #set(OpenTelemetry)}, will be created with any
- * {@link io.opentelemetry.api.spi.OpenTelemetryFactory}, {@link
+ * {@link OpenTelemetryFactory}, {@link TracerProviderFactory} or {@link MeterProviderFactory} found
- * io.opentelemetry.api.trace.spi.TracerProviderFactory} or {@link
+ * on the classpath, or otherwise will be default, with no-op behavior.
- * io.opentelemetry.api.metrics.spi.MeterProviderFactory} found on the classpath, or otherwise will
- * be default, with no-op behavior.
  *
  * <p>If using the OpenTelemetry SDK, you may want to instantiate the {@link OpenTelemetry} to
  * provide configuration, for example of {@code Resource} or {@code Sampler}. See {@code
@@ -36,10 +37,8 @@ public interface OpenTelemetry {
   /**
    * Returns the registered global {@link OpenTelemetry}. If no call to {@link #set(OpenTelemetry)}
    * has been made so far, a default {@link OpenTelemetry} composed of functionality any {@link
-   * io.opentelemetry.api.spi.OpenTelemetryFactory}, {@link
+   * OpenTelemetryFactory}, {@link TracerProviderFactory} or{@link MeterProviderFactory}, found on
-   * io.opentelemetry.api.trace.spi.TracerProviderFactory} or{@link
+   * the classpath, or otherwise will be default, with no-op behavior.
-   * io.opentelemetry.api.metrics.spi.MeterProviderFactory}, found on the classpath, or otherwise
-   * will be default, with no-op behavior.
    *
    * @throws IllegalStateException if a provider has been specified by system property using the
    *     interface FQCN but the specified provider cannot be found.

api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.api.trace;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.trace.spi.TracerProviderFactory;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 import javax.annotation.concurrent.ThreadSafe;
 
 /**

api/src/main/java/io/opentelemetry/spi/OpenTelemetryFactory.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.api.spi;
+package io.opentelemetry.spi;
 
 import io.opentelemetry.api.OpenTelemetry;
 

api/src/main/java/io/opentelemetry/spi/metrics/MeterProviderFactory.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.api.metrics.spi;
+package io.opentelemetry.spi.metrics;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.metrics.MeterProvider;

api/src/main/java/io/opentelemetry/spi/metrics/package-info.java

@@ -5,6 +5,6 @@
 
 /** The SPI (service provider interface) for initializing the OpenTelemetry metrics API. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.api.metrics.spi;
+package io.opentelemetry.spi.metrics;
 
 import javax.annotation.ParametersAreNonnullByDefault;

api/src/main/java/io/opentelemetry/spi/trace/TracerProviderFactory.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.api.trace.spi;
+package io.opentelemetry.spi.trace;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.TracerProvider;

api/src/main/java/io/opentelemetry/spi/trace/package-info.java

@@ -5,6 +5,6 @@
 
 /** The SPI (service provider interface) for initializing the OpenTelemetry tracing API. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.api.trace.spi;
+package io.opentelemetry.spi.trace;
 
 import javax.annotation.ParametersAreNonnullByDefault;

api/src/test/java/io/opentelemetry/api/OpenTelemetryTest.java

@@ -24,13 +24,13 @@ import io.opentelemetry.api.metrics.LongValueObserver;
 import io.opentelemetry.api.metrics.LongValueRecorder;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.api.metrics.spi.MeterProviderFactory;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.api.trace.spi.TracerProviderFactory;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.DefaultContextPropagators;
+import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;

sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java

@@ -11,10 +11,8 @@ import com.google.common.annotations.VisibleForTesting;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.internal.Obfuscated;
 import io.opentelemetry.api.metrics.MeterProvider;
-import io.opentelemetry.api.metrics.spi.MeterProviderFactory;
 import io.opentelemetry.api.trace.Tracer;
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.api.trace.spi.TracerProviderFactory;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.DefaultContextPropagators;
 import io.opentelemetry.sdk.common.Clock;
@@ -23,6 +21,8 @@ import io.opentelemetry.sdk.metrics.MeterSdkProvider;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.TracerSdkManagement;
 import io.opentelemetry.sdk.trace.TracerSdkProvider;
+import io.opentelemetry.spi.metrics.MeterProviderFactory;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 import java.util.ServiceLoader;
 import java.util.concurrent.atomic.AtomicBoolean;
 import javax.annotation.Nullable;

sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkFactory.java

@@ -6,7 +6,7 @@
 package io.opentelemetry.sdk;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.spi.OpenTelemetryFactory;
+import io.opentelemetry.spi.OpenTelemetryFactory;
 
 /**
  * Factory SPI implementation to register a {@link OpenTelemetrySdk} as the default {@link

sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.sdk.metrics.spi;
 
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.metrics.spi.MeterProviderFactory;
 import io.opentelemetry.sdk.metrics.MeterSdkProvider;
+import io.opentelemetry.spi.metrics.MeterProviderFactory;
 
 /**
  * {@code MeterProvider} provider implementation for {@link MeterProviderFactory}.

sdk/tracing/src/main/java/io/opentelemetry/sdk/trace/spi/TracerProviderFactorySdk.java

@@ -6,8 +6,8 @@
 package io.opentelemetry.sdk.trace.spi;
 
 import io.opentelemetry.api.trace.TracerProvider;
-import io.opentelemetry.api.trace.spi.TracerProviderFactory;
 import io.opentelemetry.sdk.trace.TracerSdkProvider;
+import io.opentelemetry.spi.trace.TracerProviderFactory;
 
 /** SDK implementation of the TracerProviderFactory for SPI. */
 public final class TracerProviderFactorySdk implements TracerProviderFactory {