diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4d1de54157b..491f53be81a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -78,7 +78,7 @@ which implement concepts defined in the [opentelemetry-specification](https://github.com/open-telemetry/opentelemetry-specification), with a few exceptions / comments: -* The [API incubator](./extensions/incubator) and [SDK incubator](./extensions/incubator) +* The [API incubator](./api/incubator) and [SDK incubator](./sdk-extensions/incubator) contain prototypes which have been discussed in the specification or [oteps](https://github.com/open-telemetry/oteps) and have a reasonable chance of becoming part of the specification, subject to maintainers' discretion. diff --git a/README.md b/README.md index 38090b6a1d3..dc2dfe5cd2c 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,8 @@ This project contains the following top level components: * [OpenTelemetry API](api/): * [stable apis](api/all) including `Tracer`, `Span`, `SpanContext`, `Meter`, and `Baggage`. * [context api](context/) The OpenTelemetry Context implementation. - * [experimental apis](api/events) including `Events`. -* [extensions](extensions/) define additional API extensions not part of the core API, including propagators and experimental extension APIs. + * [incubating apis](api/incubator) incubating APIs, including `Events`. +* [extensions](extensions/) define additional API extensions not part of the core API, including propagators. * [sdk](sdk/) defines the implementation of the OpenTelemetry API. * [exporters](exporters/) trace, metric, and log exporters for the SDK. * [sdk-extensions](sdk-extensions/) defines additional SDK extensions, which are not part of the core SDK. @@ -235,11 +235,11 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti ### API -| Component | Description | Artifact ID | Version | Javadoc | -|-----------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|-------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [API](./api/all) | OpenTelemetry API, including metrics, traces, baggage, context | `opentelemetry-api` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api) | -| [Events API](./api/events) | OpenTelemetry Event API for emitting events. | `opentelemetry-api-events` | 1.36.0-alpha | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api-events.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api-events) | -| [Context API](./context) | OpenTelemetry context API | `opentelemetry-context` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context) | +| Component | Description | Artifact ID | Version | Javadoc | +|-----------------------------------|--------------------------------------------------------------------------------------|-------------------------------|-------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------| +| [API](./api/all) | OpenTelemetry API, including metrics, traces, baggage, context | `opentelemetry-api` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-api.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-api) | +| [API Incubator](./api/incubator) | API incubator, including pass through propagator, and extended tracer, and Event API | `opentelemetry-api-incubator` | TODO: add after first publish | TODO: add after first publish | +| [Context API](./context) | OpenTelemetry context API | `opentelemetry-context` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context) | ### API Extensions @@ -247,7 +247,6 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti |---------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [Kotlin Extension](./extensions/kotlin) | Context extension for coroutines | `opentelemetry-extension-kotlin` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-extension-kotlin.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-extension-kotlin) | | [Trace Propagators Extension](./extensions/trace-propagators) | Trace propagators, including B3, Jaeger, OT Trace | `opentelemetry-extension-trace-propagators` | 1.36.0 | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-extension-trace-propagators.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-extension-trace-propagators) | -| [Incubator Extension](./extensions/incubator) | API incubator, including pass through propagator, and extended tracer | `opentelemetry-extension-incubator` | 1.36.0-alpha | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-extension-incubator.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-extension-incubator) | ### SDK diff --git a/api/events/build.gradle.kts b/api/events/build.gradle.kts deleted file mode 100644 index 9a0262cded0..00000000000 --- a/api/events/build.gradle.kts +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id("otel.java-conventions") - id("otel.publish-conventions") - - id("otel.animalsniffer-conventions") -} - -description = "OpenTelemetry Events API" -otelJava.moduleName.set("io.opentelemetry.api.events") - -dependencies { - api(project(":api:all")) -} diff --git a/api/events/gradle.properties b/api/events/gradle.properties deleted file mode 100644 index bbcbb896228..00000000000 --- a/api/events/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -otel.release=alpha \ No newline at end of file diff --git a/extensions/incubator/README.md b/api/incubator/README.md similarity index 100% rename from extensions/incubator/README.md rename to api/incubator/README.md diff --git a/extensions/incubator/build.gradle.kts b/api/incubator/build.gradle.kts similarity index 86% rename from extensions/incubator/build.gradle.kts rename to api/incubator/build.gradle.kts index 5812f6462af..b6f726654a3 100644 --- a/extensions/incubator/build.gradle.kts +++ b/api/incubator/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } description = "OpenTelemetry API Incubator" -otelJava.moduleName.set("io.opentelemetry.extension.incubator") +otelJava.moduleName.set("io.opentelemetry.api.incubator") dependencies { api(project(":api:all")) diff --git a/extensions/incubator/gradle.properties b/api/incubator/gradle.properties similarity index 100% rename from extensions/incubator/gradle.properties rename to api/incubator/gradle.properties diff --git a/extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java b/api/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java similarity index 97% rename from extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java rename to api/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java index 06b68e6d45c..8d340985ae3 100644 --- a/extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java +++ b/api/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java @@ -5,6 +5,7 @@ package io.opentelemetry.extension.incubator; +import io.opentelemetry.api.incubator.propagation.PassThroughPropagator; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.TraceFlags; @@ -13,7 +14,6 @@ import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapGetter; import io.opentelemetry.context.propagation.TextMapPropagator; -import io.opentelemetry.extension.incubator.propagation.PassThroughPropagator; import java.util.Collections; import java.util.HashMap; import java.util.Map; diff --git a/api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitter.java similarity index 95% rename from api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitter.java index 8d9a81f8e7f..1c914a74d9d 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import io.opentelemetry.api.common.Attributes; import java.time.Instant; diff --git a/api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProvider.java similarity index 95% rename from api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProvider.java index 59f75872fa1..e69a9a3745f 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; class DefaultEventEmitterProvider implements EventEmitterProvider { diff --git a/api/events/src/main/java/io/opentelemetry/api/events/EventBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java similarity index 94% rename from api/events/src/main/java/io/opentelemetry/api/events/EventBuilder.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java index a9acabbca6c..d5eb5db85f3 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/EventBuilder.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import java.time.Instant; import java.util.concurrent.TimeUnit; diff --git a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitter.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitter.java similarity index 96% rename from api/events/src/main/java/io/opentelemetry/api/events/EventEmitter.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitter.java index 395fa4e53e5..ba588f7ec79 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitter.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import io.opentelemetry.api.common.Attributes; import javax.annotation.concurrent.ThreadSafe; diff --git a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitterBuilder.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterBuilder.java similarity index 96% rename from api/events/src/main/java/io/opentelemetry/api/events/EventEmitterBuilder.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterBuilder.java index 0bdb9e2f57e..5fa04658652 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitterBuilder.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterBuilder.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; /** * Builder class for creating {@link EventEmitter} instances. diff --git a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitterProvider.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterProvider.java similarity index 96% rename from api/events/src/main/java/io/opentelemetry/api/events/EventEmitterProvider.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterProvider.java index 521154765fa..d5eb035e3f8 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/EventEmitterProvider.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/EventEmitterProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import javax.annotation.concurrent.ThreadSafe; diff --git a/api/events/src/main/java/io/opentelemetry/api/events/GlobalEventEmitterProvider.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProvider.java similarity index 97% rename from api/events/src/main/java/io/opentelemetry/api/events/GlobalEventEmitterProvider.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProvider.java index b6b1685bbfa..bf0e8353d52 100644 --- a/api/events/src/main/java/io/opentelemetry/api/events/GlobalEventEmitterProvider.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProvider.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import io.opentelemetry.api.GlobalOpenTelemetry; import java.util.concurrent.atomic.AtomicReference; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValue.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java similarity index 98% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValue.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java index 6f250e10da7..1a1519a1044 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValue.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValue.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.nio.ByteBuffer; import java.util.List; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueArray.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java similarity index 96% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueArray.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java index dd96a60793d..ae448038b18 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueArray.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueArray.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import static java.util.stream.Collectors.joining; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBoolean.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java similarity index 95% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBoolean.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java index 5fa862b777f..fcaa7525241 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBoolean.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBoolean.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.util.Objects; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBytes.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java similarity index 95% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBytes.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java index 65697978dec..4f572dee172 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBytes.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueBytes.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueDouble.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java similarity index 94% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueDouble.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java index 4e2cdccf33b..e1ab55f8528 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueDouble.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueDouble.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.util.Objects; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueLong.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java similarity index 94% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueLong.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java index 558a08376ee..0cc1d3beafa 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueLong.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueLong.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.util.Objects; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueString.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java similarity index 95% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueString.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java index 6a7b0a1c8e2..d2b8be2e729 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueString.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueString.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import java.util.Objects; diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueType.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java similarity index 89% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueType.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java index f683cc61ea5..ea41d887094 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueType.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/logs/AnyValueType.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; /** * AnyValue type options, mirroring The README + * href="https://github.com/opentelemetry/opentelemetry-java/blob/main/api/incubator">README * explains the use cases in more detail. */ public final class ExtendedTracer implements Tracer { diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanCallable.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanCallable.java similarity index 86% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanCallable.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanCallable.java index eb87683f04d..881e1bd541d 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanCallable.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanCallable.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.trace; +package io.opentelemetry.api.incubator.trace; /** * An interface for creating a lambda that is wrapped in a span, returns a value, and that may diff --git a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanRunnable.java b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanRunnable.java similarity index 86% rename from extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanRunnable.java rename to api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanRunnable.java index 508df5a6c31..9f245f340bf 100644 --- a/extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/SpanRunnable.java +++ b/api/incubator/src/main/java/io/opentelemetry/api/incubator/trace/SpanRunnable.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.trace; +package io.opentelemetry.api.incubator.trace; /** * An interface for creating a lambda that is wrapped in a span and that may throw. diff --git a/api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterProviderTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProviderTest.java similarity index 96% rename from api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterProviderTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProviderTest.java index 04c5cc83e86..52e23c5b44d 100644 --- a/api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterProviderTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterTest.java similarity index 96% rename from api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterTest.java index 324680d13d6..a8d70533f47 100644 --- a/api/events/src/test/java/io/opentelemetry/api/events/DefaultEventEmitterTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/DefaultEventEmitterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/api/events/src/test/java/io/opentelemetry/api/events/GlobalEventEmitterProviderTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProviderTest.java similarity index 97% rename from api/events/src/test/java/io/opentelemetry/api/events/GlobalEventEmitterProviderTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProviderTest.java index f05763ea2f9..8f48c17bc5b 100644 --- a/api/events/src/test/java/io/opentelemetry/api/events/GlobalEventEmitterProviderTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/events/GlobalEventEmitterProviderTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.api.events; +package io.opentelemetry.api.incubator.events; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/logs/AnyValueTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/AnyValueTest.java similarity index 99% rename from extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/logs/AnyValueTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/AnyValueTest.java index 900cdd24c93..4f52637f575 100644 --- a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/logs/AnyValueTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/logs/AnyValueTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.logs; +package io.opentelemetry.api.incubator.logs; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/propagation/PassThroughPropagatorTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/propagation/PassThroughPropagatorTest.java similarity index 98% rename from extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/propagation/PassThroughPropagatorTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/propagation/PassThroughPropagatorTest.java index de93164c004..008694252b8 100644 --- a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/propagation/PassThroughPropagatorTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/propagation/PassThroughPropagatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.propagation; +package io.opentelemetry.api.incubator.propagation; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/trace/ExtendedTracerTest.java b/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTracerTest.java similarity index 98% rename from extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/trace/ExtendedTracerTest.java rename to api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTracerTest.java index 2268d6e59a0..9417763b842 100644 --- a/extensions/incubator/src/test/java/io/opentelemetry/extension/incubator/trace/ExtendedTracerTest.java +++ b/api/incubator/src/test/java/io/opentelemetry/api/incubator/trace/ExtendedTracerTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extension.incubator.trace; +package io.opentelemetry.api.incubator.trace; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo; import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies; @@ -14,12 +14,12 @@ import com.google.errorprone.annotations.Keep; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.propagation.ExtendedContextPropagators; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.context.Context; import io.opentelemetry.context.Scope; import io.opentelemetry.context.propagation.ContextPropagators; -import io.opentelemetry.extension.incubator.propagation.ExtendedContextPropagators; import io.opentelemetry.sdk.testing.assertj.SpanDataAssert; import io.opentelemetry.sdk.testing.junit5.OpenTelemetryExtension; import io.opentelemetry.sdk.trace.data.StatusData; diff --git a/exporters/otlp/common/build.gradle.kts b/exporters/otlp/common/build.gradle.kts index 1baf390fc34..def08665e58 100644 --- a/exporters/otlp/common/build.gradle.kts +++ b/exporters/otlp/common/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { protoSource("io.opentelemetry.proto:opentelemetry-proto:${versions["io.opentelemetry.proto"]}") api(project(":exporters:common")) - implementation(project(":extensions:incubator")) + implementation(project(":api:incubator")) compileOnly(project(":sdk:metrics")) compileOnly(project(":sdk:trace")) diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshaler.java index 2bd103a154a..0b39d15df29 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshaler.java @@ -5,9 +5,9 @@ package io.opentelemetry.exporter.internal.otlp; +import io.opentelemetry.api.incubator.logs.AnyValue; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize; -import io.opentelemetry.extension.incubator.logs.AnyValue; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import java.nio.ByteBuffer; import java.util.List; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/ArrayAnyValueMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/ArrayAnyValueMarshaler.java index e4184086468..aa1c25e9c14 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/ArrayAnyValueMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/ArrayAnyValueMarshaler.java @@ -24,7 +24,7 @@ private ArrayAnyValueMarshaler(ArrayValueMarshaler value) { } static MarshalerWithSize createAnyValue( - List> values) { + List> values) { return createInternal(values, AnyValueMarshaler::create); } diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueListAnyValueMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueListAnyValueMarshaler.java index 823c28226c8..afb884a2d86 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueListAnyValueMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueListAnyValueMarshaler.java @@ -5,11 +5,11 @@ package io.opentelemetry.exporter.internal.otlp; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.internal.marshal.MarshalerUtil; import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize; import io.opentelemetry.exporter.internal.marshal.Serializer; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import io.opentelemetry.proto.common.v1.internal.AnyValue; import io.opentelemetry.proto.common.v1.internal.KeyValueList; import java.io.IOException; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueMarshaler.java index 1db0dc2edd5..56a3fa06461 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/KeyValueMarshaler.java @@ -7,12 +7,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.api.internal.InternalAttributeKeyImpl; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.internal.marshal.MarshalerUtil; import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize; import io.opentelemetry.exporter.internal.marshal.Serializer; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import io.opentelemetry.proto.common.v1.internal.KeyValue; import java.io.IOException; import java.nio.charset.StandardCharsets; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java index 911cadf2d84..d73c88bb608 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java @@ -5,6 +5,7 @@ package io.opentelemetry.exporter.internal.otlp.logs; +import io.opentelemetry.api.incubator.logs.AnyValue; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanId; @@ -16,7 +17,6 @@ import io.opentelemetry.exporter.internal.marshal.Serializer; import io.opentelemetry.exporter.internal.otlp.AnyValueMarshaler; import io.opentelemetry.exporter.internal.otlp.KeyValueMarshaler; -import io.opentelemetry.extension.incubator.logs.AnyValue; import io.opentelemetry.proto.logs.v1.internal.LogRecord; import io.opentelemetry.proto.logs.v1.internal.SeverityNumber; import io.opentelemetry.sdk.logs.data.Body; diff --git a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshalerTest.java b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshalerTest.java index d52d504e9c4..9514249defb 100644 --- a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshalerTest.java +++ b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/AnyValueMarshalerTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.exporter.internal.otlp; -import static io.opentelemetry.extension.incubator.logs.AnyValue.of; +import static io.opentelemetry.api.incubator.logs.AnyValue.of; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; @@ -13,9 +13,9 @@ import com.google.protobuf.InvalidProtocolBufferException; import com.google.protobuf.Message; import com.google.protobuf.util.JsonFormat; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.exporter.internal.marshal.Marshaler; import io.opentelemetry.exporter.internal.marshal.MarshalerWithSize; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import io.opentelemetry.proto.common.v1.AnyValue; import io.opentelemetry.proto.common.v1.ArrayValue; import io.opentelemetry.proto.common.v1.KeyValue; @@ -36,8 +36,7 @@ class AnyValueMarshalerTest { @ParameterizedTest @MethodSource("serializeAnyValueArgs") void anyValueString( - io.opentelemetry.extension.incubator.logs.AnyValue anyValue, - AnyValue expectedSerializedValue) { + io.opentelemetry.api.incubator.logs.AnyValue anyValue, AnyValue expectedSerializedValue) { MarshalerWithSize marshaler = AnyValueMarshaler.create(anyValue); AnyValue serializedValue = parse(AnyValue.getDefaultInstance(), marshaler); assertThat(serializedValue).isEqualTo(expectedSerializedValue); diff --git a/integration-tests/otlp/build.gradle.kts b/integration-tests/otlp/build.gradle.kts index bbd9bc85c4c..5f67edda0e1 100644 --- a/integration-tests/otlp/build.gradle.kts +++ b/integration-tests/otlp/build.gradle.kts @@ -9,8 +9,7 @@ dependencies { api("org.testcontainers:junit-jupiter") implementation(project(":exporters:otlp:all")) - implementation(project(":api:events")) - implementation(project(":extensions:incubator")) + implementation(project(":api:incubator")) compileOnly("com.google.errorprone:error_prone_annotations") diff --git a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index 30ab713b118..544b9a94794 100644 --- a/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java @@ -5,7 +5,7 @@ package io.opentelemetry.integrationtest; -import static io.opentelemetry.extension.incubator.logs.AnyValue.of; +import static io.opentelemetry.api.incubator.logs.AnyValue.of; import static java.util.concurrent.CompletableFuture.completedFuture; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -21,7 +21,9 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.events.EventEmitter; +import io.opentelemetry.api.incubator.events.EventEmitter; +import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.metrics.LongCounter; @@ -40,8 +42,6 @@ import io.opentelemetry.exporter.otlp.logs.OtlpGrpcLogRecordExporter; import io.opentelemetry.exporter.otlp.metrics.OtlpGrpcMetricExporter; import io.opentelemetry.exporter.otlp.trace.OtlpGrpcSpanExporter; -import io.opentelemetry.extension.incubator.logs.ExtendedLogRecordBuilder; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest; import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse; import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest; diff --git a/sdk-extensions/autoconfigure/build.gradle.kts b/sdk-extensions/autoconfigure/build.gradle.kts index 04fbde232fc..fb73bdaa6b6 100644 --- a/sdk-extensions/autoconfigure/build.gradle.kts +++ b/sdk-extensions/autoconfigure/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { api(project(":sdk:all")) api(project(":sdk-extensions:autoconfigure-spi")) - implementation(project(":api:events")) + implementation(project(":api:incubator")) annotationProcessor("com.google.auto.value:auto-value") @@ -47,7 +47,7 @@ testing { } register("testFullConfig") { dependencies { - implementation(project(":api:events")) + implementation(project(":api:incubator")) implementation(project(":extensions:trace-propagators")) implementation(project(":exporters:logging")) implementation(project(":exporters:logging-otlp")) diff --git a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java index fe9d75adae3..08bb093939e 100644 --- a/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java +++ b/sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java @@ -8,7 +8,7 @@ import static java.util.Objects.requireNonNull; import io.opentelemetry.api.GlobalOpenTelemetry; -import io.opentelemetry.api.events.GlobalEventEmitterProvider; +import io.opentelemetry.api.incubator.events.GlobalEventEmitterProvider; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; import io.opentelemetry.sdk.OpenTelemetrySdk; diff --git a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java index 5e8ea677c7f..57b8eb011fb 100644 --- a/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java +++ b/sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java @@ -26,7 +26,7 @@ import io.github.netmikey.logunit.api.LogCapturer; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.api.events.GlobalEventEmitterProvider; +import io.opentelemetry.api.incubator.events.GlobalEventEmitterProvider; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanId; import io.opentelemetry.api.trace.TraceId; diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java index f1f880441e6..2c85ae02507 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java @@ -13,7 +13,7 @@ import io.github.netmikey.logunit.api.LogCapturer; import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; -import io.opentelemetry.api.events.GlobalEventEmitterProvider; +import io.opentelemetry.api.incubator.events.GlobalEventEmitterProvider; import io.opentelemetry.exporter.prometheus.PrometheusHttpServer; import io.opentelemetry.sdk.OpenTelemetrySdk; import java.lang.reflect.Field; diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FileConfigurationTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FileConfigurationTest.java index ea726ca3472..058b6ed91d3 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FileConfigurationTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FileConfigurationTest.java @@ -19,7 +19,7 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; -import io.opentelemetry.api.events.GlobalEventEmitterProvider; +import io.opentelemetry.api.incubator.events.GlobalEventEmitterProvider; import io.opentelemetry.api.trace.propagation.W3CTraceContextPropagator; import io.opentelemetry.context.propagation.ContextPropagators; import io.opentelemetry.context.propagation.TextMapPropagator; diff --git a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java index 3015339f71e..a5c5fc2fe24 100644 --- a/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java +++ b/sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/FullConfigTest.java @@ -18,8 +18,8 @@ import io.opentelemetry.api.GlobalOpenTelemetry; import io.opentelemetry.api.baggage.propagation.W3CBaggagePropagator; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.events.EventEmitter; -import io.opentelemetry.api.events.GlobalEventEmitterProvider; +import io.opentelemetry.api.incubator.events.EventEmitter; +import io.opentelemetry.api.incubator.events.GlobalEventEmitterProvider; import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.metrics.Meter; diff --git a/sdk/logs/build.gradle.kts b/sdk/logs/build.gradle.kts index 6640c4ed0ee..7c8c020d6a2 100644 --- a/sdk/logs/build.gradle.kts +++ b/sdk/logs/build.gradle.kts @@ -12,9 +12,7 @@ otelJava.moduleName.set("io.opentelemetry.sdk.logs") dependencies { api(project(":api:all")) api(project(":sdk:common")) - implementation(project(":extensions:incubator")) - - implementation(project(":api:events")) + implementation(project(":api:incubator")) annotationProcessor("com.google.auto.value:auto-value") diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java index 70683a0d22b..6ab1cafe648 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java @@ -6,12 +6,12 @@ package io.opentelemetry.sdk.logs; import io.opentelemetry.api.common.AttributeKey; +import io.opentelemetry.api.incubator.logs.AnyValue; +import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.api.logs.Severity; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.logs.AnyValue; -import io.opentelemetry.extension.incubator.logs.ExtendedLogRecordBuilder; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.internal.AttributesMap; import io.opentelemetry.sdk.logs.data.Body; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/AnyValueBody.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/AnyValueBody.java index 7a1a9f2138f..fdf2b936cd1 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/AnyValueBody.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/AnyValueBody.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.logs.internal; -import io.opentelemetry.extension.incubator.logs.AnyValue; +import io.opentelemetry.api.incubator.logs.AnyValue; import io.opentelemetry.sdk.logs.data.Body; import javax.annotation.concurrent.Immutable; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventBuilder.java index aefa6832242..d817edad529 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventBuilder.java @@ -5,7 +5,7 @@ package io.opentelemetry.sdk.logs.internal; -import io.opentelemetry.api.events.EventBuilder; +import io.opentelemetry.api.incubator.events.EventBuilder; import io.opentelemetry.api.logs.LogRecordBuilder; import java.time.Instant; import java.util.concurrent.TimeUnit; diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java index 885f46f7e94..0fdaa6f05ad 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProvider.java @@ -7,10 +7,10 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.events.EventBuilder; -import io.opentelemetry.api.events.EventEmitter; -import io.opentelemetry.api.events.EventEmitterBuilder; -import io.opentelemetry.api.events.EventEmitterProvider; +import io.opentelemetry.api.incubator.events.EventBuilder; +import io.opentelemetry.api.incubator.events.EventEmitter; +import io.opentelemetry.api.incubator.events.EventEmitterBuilder; +import io.opentelemetry.api.incubator.events.EventEmitterProvider; import io.opentelemetry.api.logs.LogRecordBuilder; import io.opentelemetry.api.logs.Logger; import io.opentelemetry.api.logs.LoggerBuilder; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/AnyValueBodyTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/AnyValueBodyTest.java index 0345ecbd2fa..8ac803c5c7e 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/AnyValueBodyTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/AnyValueBodyTest.java @@ -7,10 +7,10 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; +import io.opentelemetry.api.incubator.logs.AnyValue; +import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder; +import io.opentelemetry.api.incubator.logs.KeyAnyValue; import io.opentelemetry.api.logs.Logger; -import io.opentelemetry.extension.incubator.logs.AnyValue; -import io.opentelemetry.extension.incubator.logs.ExtendedLogRecordBuilder; -import io.opentelemetry.extension.incubator.logs.KeyAnyValue; import io.opentelemetry.sdk.logs.export.SimpleLogRecordProcessor; import io.opentelemetry.sdk.logs.internal.AnyValueBody; import io.opentelemetry.sdk.testing.exporter.InMemoryLogRecordExporter; diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProviderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProviderTest.java index bf7e58ddc5f..73db07cce57 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProviderTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/internal/SdkEventEmitterProviderTest.java @@ -11,7 +11,7 @@ import static org.mockito.Mockito.when; import io.opentelemetry.api.common.Attributes; -import io.opentelemetry.api.events.EventEmitter; +import io.opentelemetry.api.incubator.events.EventEmitter; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.logs.ReadWriteLogRecord; diff --git a/sdk/metrics/build.gradle.kts b/sdk/metrics/build.gradle.kts index 590a312b043..ef2dd8244a5 100644 --- a/sdk/metrics/build.gradle.kts +++ b/sdk/metrics/build.gradle.kts @@ -15,7 +15,7 @@ otelJava.moduleName.set("io.opentelemetry.sdk.metrics") dependencies { api(project(":api:all")) api(project(":sdk:common")) - implementation(project(":extensions:incubator")) + implementation(project(":api:incubator")) compileOnly("org.codehaus.mojo:animal-sniffer-annotations") diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java index d92cd29076c..d7aa5f47cad 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleCounter.java @@ -7,12 +7,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.api.metrics.ObservableDoubleCounter; import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder; import io.opentelemetry.sdk.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleGauge.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleGauge.java index e9f852510b5..1de8fa341cf 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleGauge.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleGauge.java @@ -7,13 +7,13 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.DoubleGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; import io.opentelemetry.api.metrics.DoubleGaugeBuilder; import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.api.metrics.ObservableDoubleGauge; import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.DoubleGauge; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.MeterProviderSharedState; import io.opentelemetry.sdk.metrics.internal.state.MeterSharedState; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java index 9d9c1535f0b..15dd7d2f8c7 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleHistogram.java @@ -7,11 +7,11 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.api.metrics.DoubleHistogram; import io.opentelemetry.api.metrics.DoubleHistogramBuilder; import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.sdk.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleUpDownCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleUpDownCounter.java index 6521aeef871..57188aa6a23 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleUpDownCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkDoubleUpDownCounter.java @@ -7,12 +7,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; import io.opentelemetry.api.metrics.DoubleUpDownCounter; import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.api.metrics.ObservableDoubleMeasurement; import io.opentelemetry.api.metrics.ObservableDoubleUpDownCounter; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.MeterProviderSharedState; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java index 98f806165af..3847bf716f3 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongCounter.java @@ -7,13 +7,13 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.api.metrics.LongCounter; import io.opentelemetry.api.metrics.LongCounterBuilder; import io.opentelemetry.api.metrics.ObservableLongCounter; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder; import io.opentelemetry.sdk.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.MeterProviderSharedState; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongGauge.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongGauge.java index 73492eb9849..92d9e84d098 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongGauge.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongGauge.java @@ -7,12 +7,12 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.LongGauge; import io.opentelemetry.api.metrics.LongGaugeBuilder; import io.opentelemetry.api.metrics.ObservableLongGauge; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder; -import io.opentelemetry.extension.incubator.metrics.LongGauge; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.MeterProviderSharedState; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java index 38a7e52293e..b2975886565 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongHistogram.java @@ -7,10 +7,10 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.api.metrics.LongHistogram; import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; import io.opentelemetry.sdk.internal.ThrottlingLogger; import io.opentelemetry.sdk.metrics.internal.aggregator.ExplicitBucketHistogramUtils; import io.opentelemetry.sdk.metrics.internal.descriptor.Advice; diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongUpDownCounter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongUpDownCounter.java index 9c0aff76c43..4530f3b8405 100644 --- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongUpDownCounter.java +++ b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkLongUpDownCounter.java @@ -7,13 +7,13 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; import io.opentelemetry.api.metrics.ObservableLongMeasurement; import io.opentelemetry.api.metrics.ObservableLongUpDownCounter; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.sdk.metrics.internal.descriptor.InstrumentDescriptor; import io.opentelemetry.sdk.metrics.internal.state.MeterProviderSharedState; import io.opentelemetry.sdk.metrics.internal.state.MeterSharedState; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java index 0e673021556..af6a746da00 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/AttributesAdviceTest.java @@ -14,6 +14,14 @@ import com.google.common.util.concurrent.AtomicDouble; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongCounterBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.api.metrics.DoubleCounter; import io.opentelemetry.api.metrics.DoubleCounterBuilder; import io.opentelemetry.api.metrics.DoubleGaugeBuilder; @@ -28,14 +36,6 @@ import io.opentelemetry.api.metrics.LongHistogramBuilder; import io.opentelemetry.api.metrics.LongUpDownCounter; import io.opentelemetry.api.metrics.LongUpDownCounterBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleCounterBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleUpDownCounterBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongCounterBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongHistogramBuilder; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongUpDownCounterBuilder; import io.opentelemetry.sdk.testing.assertj.AbstractPointAssert; import io.opentelemetry.sdk.testing.assertj.DoublePointAssert; import io.opentelemetry.sdk.testing.assertj.HistogramPointAssert; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/IdentityTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/IdentityTest.java index 7332e3d0dba..981d84dcd82 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/IdentityTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/IdentityTest.java @@ -8,7 +8,7 @@ import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat; import io.github.netmikey.logunit.api.LogCapturer; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleHistogramBuilder; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleHistogramBuilder; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.metrics.internal.state.MetricStorageRegistry; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleGaugeTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleGaugeTest.java index cb13c2c9e95..802029d8448 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleGaugeTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkDoubleGaugeTest.java @@ -11,10 +11,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.DoubleGauge; +import io.opentelemetry.api.incubator.metrics.ExtendedDoubleGaugeBuilder; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.ObservableDoubleGauge; -import io.opentelemetry.extension.incubator.metrics.DoubleGauge; -import io.opentelemetry.extension.incubator.metrics.ExtendedDoubleGaugeBuilder; import io.opentelemetry.internal.testing.slf4j.SuppressLogger; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.metrics.internal.state.DefaultSynchronousMetricStorage; diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongGaugeTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongGaugeTest.java index dbe04000bef..e3bd54ab4d5 100644 --- a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongGaugeTest.java +++ b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkLongGaugeTest.java @@ -11,10 +11,10 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.metrics.ExtendedLongGaugeBuilder; +import io.opentelemetry.api.incubator.metrics.LongGauge; import io.opentelemetry.api.metrics.Meter; import io.opentelemetry.api.metrics.ObservableLongGauge; -import io.opentelemetry.extension.incubator.metrics.ExtendedLongGaugeBuilder; -import io.opentelemetry.extension.incubator.metrics.LongGauge; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.exporter.InMemoryMetricReader; diff --git a/sdk/trace/build.gradle.kts b/sdk/trace/build.gradle.kts index 90c41b3b748..34690eaeeca 100644 --- a/sdk/trace/build.gradle.kts +++ b/sdk/trace/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { api(project(":api:all")) api(project(":sdk:common")) - implementation(project(":extensions:incubator")) + implementation(project(":api:incubator")) compileOnly(project(":sdk:trace-shaded-deps")) diff --git a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java index a6b28043d29..71cd2dccd67 100644 --- a/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java +++ b/sdk/trace/src/main/java/io/opentelemetry/sdk/trace/SdkSpan.java @@ -7,13 +7,13 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; +import io.opentelemetry.api.incubator.trace.ExtendedSpan; import io.opentelemetry.api.internal.GuardedBy; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanKind; import io.opentelemetry.api.trace.StatusCode; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.trace.ExtendedSpan; import io.opentelemetry.sdk.common.Clock; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.internal.AttributeUtil; diff --git a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java index df7a6ba1c02..95778058465 100644 --- a/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java +++ b/sdk/trace/src/test/java/io/opentelemetry/sdk/trace/SdkSpanTest.java @@ -25,6 +25,7 @@ import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.common.AttributesBuilder; +import io.opentelemetry.api.incubator.trace.ExtendedSpan; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanId; @@ -33,7 +34,6 @@ import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; import io.opentelemetry.context.Context; -import io.opentelemetry.extension.incubator.trace.ExtendedSpan; import io.opentelemetry.sdk.common.InstrumentationScopeInfo; import io.opentelemetry.sdk.internal.AttributesMap; import io.opentelemetry.sdk.internal.InstrumentationScopeUtil; diff --git a/settings.gradle.kts b/settings.gradle.kts index 2cdbc1038b1..9bba75b336b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -24,12 +24,11 @@ dependencyResolutionManagement { rootProject.name = "opentelemetry-java" include(":all") include(":api:all") -include(":api:events") +include(":api:incubator") include(":bom") include(":bom-alpha") include(":context") include(":dependencyManagement") -include(":extensions:incubator") include(":extensions:kotlin") include(":extensions:trace-propagators") include(":exporters:common")