diff --git a/api/src/main/java/io/opentelemetry/api/DefaultOpenTelemetry.java b/api/src/main/java/io/opentelemetry/api/DefaultOpenTelemetry.java index 3976c6cee3..629b39408f 100644 --- a/api/src/main/java/io/opentelemetry/api/DefaultOpenTelemetry.java +++ b/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; diff --git a/api/src/main/java/io/opentelemetry/api/OpenTelemetry.java b/api/src/main/java/io/opentelemetry/api/OpenTelemetry.java index d4c61656da..9cb5965fca 100644 --- a/api/src/main/java/io/opentelemetry/api/OpenTelemetry.java +++ b/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. * *

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 - * io.opentelemetry.api.trace.spi.TracerProviderFactory} or {@link - * io.opentelemetry.api.metrics.spi.MeterProviderFactory} found on the classpath, or otherwise will - * be default, with no-op behavior. + * {@link OpenTelemetryFactory}, {@link TracerProviderFactory} or {@link MeterProviderFactory} found + * on the classpath, or otherwise will be default, with no-op behavior. * *

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 - * io.opentelemetry.api.trace.spi.TracerProviderFactory} or{@link - * io.opentelemetry.api.metrics.spi.MeterProviderFactory}, found on the classpath, or otherwise - * will be default, with no-op behavior. + * OpenTelemetryFactory}, {@link TracerProviderFactory} or{@link 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. diff --git a/api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java b/api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java index 67bd240c6b..4c9b25a069 100644 --- a/api/src/main/java/io/opentelemetry/api/trace/TracerProvider.java +++ b/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; /** diff --git a/api/src/main/java/io/opentelemetry/api/spi/OpenTelemetryFactory.java b/api/src/main/java/io/opentelemetry/spi/OpenTelemetryFactory.java similarity index 95% rename from api/src/main/java/io/opentelemetry/api/spi/OpenTelemetryFactory.java rename to api/src/main/java/io/opentelemetry/spi/OpenTelemetryFactory.java index b7a8c102a7..9b437de1fc 100644 --- a/api/src/main/java/io/opentelemetry/api/spi/OpenTelemetryFactory.java +++ b/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; diff --git a/api/src/main/java/io/opentelemetry/api/metrics/spi/MeterProviderFactory.java b/api/src/main/java/io/opentelemetry/spi/metrics/MeterProviderFactory.java similarity index 95% rename from api/src/main/java/io/opentelemetry/api/metrics/spi/MeterProviderFactory.java rename to api/src/main/java/io/opentelemetry/spi/metrics/MeterProviderFactory.java index 36f942df84..180d9393aa 100644 --- a/api/src/main/java/io/opentelemetry/api/metrics/spi/MeterProviderFactory.java +++ b/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; diff --git a/api/src/main/java/io/opentelemetry/api/metrics/spi/package-info.java b/api/src/main/java/io/opentelemetry/spi/metrics/package-info.java similarity index 86% rename from api/src/main/java/io/opentelemetry/api/metrics/spi/package-info.java rename to api/src/main/java/io/opentelemetry/spi/metrics/package-info.java index 3f825f6587..e0f0367136 100644 --- a/api/src/main/java/io/opentelemetry/api/metrics/spi/package-info.java +++ b/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; diff --git a/api/src/main/java/io/opentelemetry/api/trace/spi/TracerProviderFactory.java b/api/src/main/java/io/opentelemetry/spi/trace/TracerProviderFactory.java similarity index 95% rename from api/src/main/java/io/opentelemetry/api/trace/spi/TracerProviderFactory.java rename to api/src/main/java/io/opentelemetry/spi/trace/TracerProviderFactory.java index f1cb35e1dd..5e78cb505e 100644 --- a/api/src/main/java/io/opentelemetry/api/trace/spi/TracerProviderFactory.java +++ b/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; diff --git a/api/src/main/java/io/opentelemetry/api/trace/spi/package-info.java b/api/src/main/java/io/opentelemetry/spi/trace/package-info.java similarity index 86% rename from api/src/main/java/io/opentelemetry/api/trace/spi/package-info.java rename to api/src/main/java/io/opentelemetry/spi/trace/package-info.java index 94dba969a1..47f6c73973 100644 --- a/api/src/main/java/io/opentelemetry/api/trace/spi/package-info.java +++ b/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; diff --git a/api/src/test/java/io/opentelemetry/api/OpenTelemetryTest.java b/api/src/test/java/io/opentelemetry/api/OpenTelemetryTest.java index 94986824b3..4fd3bcb7df 100644 --- a/api/src/test/java/io/opentelemetry/api/OpenTelemetryTest.java +++ b/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; diff --git a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java b/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java index 14e7d4430a..cc30d2c068 100644 --- a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdk.java +++ b/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; diff --git a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkFactory.java b/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkFactory.java index 6ad9232dfc..24ee4512b0 100644 --- a/sdk/all/src/main/java/io/opentelemetry/sdk/OpenTelemetrySdkFactory.java +++ b/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 diff --git a/sdk/all/src/main/resources/META-INF/services/io.opentelemetry.api.spi.OpenTelemetryFactory b/sdk/all/src/main/resources/META-INF/services/io.opentelemetry.spi.OpenTelemetryFactory similarity index 100% rename from sdk/all/src/main/resources/META-INF/services/io.opentelemetry.api.spi.OpenTelemetryFactory rename to sdk/all/src/main/resources/META-INF/services/io.opentelemetry.spi.OpenTelemetryFactory diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java index 50734ab405..95469b61cf 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/spi/MeterProviderFactorySdk.java +++ b/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}. diff --git a/sdk/metrics/src/main/resources/META-INF/services/io.opentelemetry.api.metrics.spi.MeterProviderFactory b/sdk/metrics/src/main/resources/META-INF/services/io.opentelemetry.spi.metrics.MeterProviderFactory similarity index 100% rename from sdk/metrics/src/main/resources/META-INF/services/io.opentelemetry.api.metrics.spi.MeterProviderFactory rename to sdk/metrics/src/main/resources/META-INF/services/io.opentelemetry.spi.metrics.MeterProviderFactory diff --git a/sdk/tracing/src/main/java/io/opentelemetry/sdk/trace/spi/TracerProviderFactorySdk.java b/sdk/tracing/src/main/java/io/opentelemetry/sdk/trace/spi/TracerProviderFactorySdk.java index 0ece181f14..06c8c87aeb 100644 --- a/sdk/tracing/src/main/java/io/opentelemetry/sdk/trace/spi/TracerProviderFactorySdk.java +++ b/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 { diff --git a/sdk/tracing/src/main/resources/META-INF/services/io.opentelemetry.api.trace.spi.TracerProviderFactory b/sdk/tracing/src/main/resources/META-INF/services/io.opentelemetry.spi.trace.TracerProviderFactory similarity index 100% rename from sdk/tracing/src/main/resources/META-INF/services/io.opentelemetry.api.trace.spi.TracerProviderFactory rename to sdk/tracing/src/main/resources/META-INF/services/io.opentelemetry.spi.trace.TracerProviderFactory