Rename opentelemetry-extension-incubator to opentelemetry-api-incubat…

…or, merge opentelemetry-api-events (#6289)
open-telemetry · Mar 21, 2024 · 44c69ea · 44c69ea
1 parent 7926c45
commit 44c69ea
Show file tree

Hide file tree

Showing 90 changed files with 120 additions and 140 deletions.
diff --git 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
@@ -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,19 +235,18 @@ 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`        | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![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` | <!--VERSION_UNSTABLE-->1.36.0-alpha<!--/VERSION_UNSTABLE--> | [![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`    | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![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`           | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![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`       | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![Javadocs](https://www.javadoc.io/badge/io.opentelemetry/opentelemetry-context.svg)](https://www.javadoc.io/doc/io.opentelemetry/opentelemetry-context)       |
 
 ### API Extensions
 
 | Component                                                     | Description                                                                                                                                                                             | Artifact ID                                 | Version                                                     | Javadoc                                                                                                                                                                                           |
 |---------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|-------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | [Kotlin Extension](./extensions/kotlin)                       | Context extension for coroutines                                                                                                                                                        | `opentelemetry-extension-kotlin`            | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![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` | <!--VERSION_STABLE-->1.36.0<!--/VERSION_STABLE-->           | [![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`         | <!--VERSION_UNSTABLE-->1.36.0-alpha<!--/VERSION_UNSTABLE--> | [![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
diff --git a/api/events/gradle.properties b/api/events/gradle.properties
diff --git a/extensions/incubator/README.md → api/incubator/README.md b/extensions/incubator/README.md → api/incubator/README.md
diff --git a/extensions/incubator/build.gradle.kts → api/incubator/build.gradle.kts b/extensions/incubator/build.gradle.kts → 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 → api/incubator/gradle.properties b/extensions/incubator/gradle.properties → api/incubator/gradle.properties
diff --git a/...bator/PassThroughPropagatorBenchmark.java → ...bator/PassThroughPropagatorBenchmark.java b/...bator/PassThroughPropagatorBenchmark.java → ...bator/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/...metry/api/events/DefaultEventEmitter.java → ...incubator/events/DefaultEventEmitter.java b/...metry/api/events/DefaultEventEmitter.java → ...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/...i/events/DefaultEventEmitterProvider.java → ...r/events/DefaultEventEmitterProvider.java b/...i/events/DefaultEventEmitterProvider.java → ...r/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/...pentelemetry/api/events/EventBuilder.java → ...ry/api/incubator/events/EventBuilder.java b/...pentelemetry/api/events/EventBuilder.java → ...ry/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/...pentelemetry/api/events/EventEmitter.java → ...ry/api/incubator/events/EventEmitter.java b/...pentelemetry/api/events/EventEmitter.java → ...ry/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/...metry/api/events/EventEmitterBuilder.java → ...incubator/events/EventEmitterBuilder.java b/...metry/api/events/EventEmitterBuilder.java → ...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/...etry/api/events/EventEmitterProvider.java → ...ncubator/events/EventEmitterProvider.java b/...etry/api/events/EventEmitterProvider.java → ...ncubator/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/...pi/events/GlobalEventEmitterProvider.java → ...or/events/GlobalEventEmitterProvider.java b/...pi/events/GlobalEventEmitterProvider.java → ...or/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/...ry/extension/incubator/logs/AnyValue.java → ...elemetry/api/incubator/logs/AnyValue.java b/...ry/extension/incubator/logs/AnyValue.java → ...elemetry/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/...tension/incubator/logs/AnyValueArray.java → ...try/api/incubator/logs/AnyValueArray.java b/...tension/incubator/logs/AnyValueArray.java → ...try/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/...nsion/incubator/logs/AnyValueBoolean.java → ...y/api/incubator/logs/AnyValueBoolean.java b/...nsion/incubator/logs/AnyValueBoolean.java → ...y/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/...tension/incubator/logs/AnyValueBytes.java → ...try/api/incubator/logs/AnyValueBytes.java b/...tension/incubator/logs/AnyValueBytes.java → ...try/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/...ension/incubator/logs/AnyValueDouble.java → ...ry/api/incubator/logs/AnyValueDouble.java b/...ension/incubator/logs/AnyValueDouble.java → ...ry/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/...xtension/incubator/logs/AnyValueLong.java → ...etry/api/incubator/logs/AnyValueLong.java b/...xtension/incubator/logs/AnyValueLong.java → ...etry/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/...ension/incubator/logs/AnyValueString.java → ...ry/api/incubator/logs/AnyValueString.java b/...ension/incubator/logs/AnyValueString.java → ...ry/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/...xtension/incubator/logs/AnyValueType.java → ...etry/api/incubator/logs/AnyValueType.java b/...xtension/incubator/logs/AnyValueType.java → ...etry/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 <a

diff --git a/...ubator/logs/ExtendedLogRecordBuilder.java → ...ubator/logs/ExtendedLogRecordBuilder.java b/...ubator/logs/ExtendedLogRecordBuilder.java → ...ubator/logs/ExtendedLogRecordBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.logs;
+package io.opentelemetry.api.incubator.logs;
 
 import io.opentelemetry.api.logs.LogRecordBuilder;
 

diff --git a/...extension/incubator/logs/KeyAnyValue.java → ...metry/api/incubator/logs/KeyAnyValue.java b/...extension/incubator/logs/KeyAnyValue.java → ...metry/api/incubator/logs/KeyAnyValue.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.logs;
+package io.opentelemetry.api.incubator.logs;
 
 /**
  * Key-value pair of {@link String} key and {@link AnyValue} value.

diff --git a/...nsion/incubator/logs/KeyAnyValueImpl.java → ...y/api/incubator/logs/KeyAnyValueImpl.java b/...nsion/incubator/logs/KeyAnyValueImpl.java → ...y/api/incubator/logs/KeyAnyValueImpl.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.logs;
+package io.opentelemetry.api.incubator.logs;
 
 import com.google.auto.value.AutoValue;
 

diff --git a/...nsion/incubator/logs/KeyAnyValueList.java → ...y/api/incubator/logs/KeyAnyValueList.java b/...nsion/incubator/logs/KeyAnyValueList.java → ...y/api/incubator/logs/KeyAnyValueList.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/...ension/incubator/metrics/DoubleGauge.java → ...ry/api/incubator/metrics/DoubleGauge.java b/...ension/incubator/metrics/DoubleGauge.java → ...ry/api/incubator/metrics/DoubleGauge.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.Attributes;
 import javax.annotation.concurrent.ThreadSafe;

diff --git a/...metrics/ExtendedDoubleCounterBuilder.java → ...metrics/ExtendedDoubleCounterBuilder.java b/...metrics/ExtendedDoubleCounterBuilder.java → ...metrics/ExtendedDoubleCounterBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleCounterBuilder;

diff --git a/...r/metrics/ExtendedDoubleGaugeBuilder.java → ...r/metrics/ExtendedDoubleGaugeBuilder.java b/...r/metrics/ExtendedDoubleGaugeBuilder.java → ...r/metrics/ExtendedDoubleGaugeBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleGaugeBuilder;

diff --git a/...trics/ExtendedDoubleHistogramBuilder.java → ...trics/ExtendedDoubleHistogramBuilder.java b/...trics/ExtendedDoubleHistogramBuilder.java → ...trics/ExtendedDoubleHistogramBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleHistogramBuilder;

diff --git a/...s/ExtendedDoubleUpDownCounterBuilder.java → ...s/ExtendedDoubleUpDownCounterBuilder.java b/...s/ExtendedDoubleUpDownCounterBuilder.java → ...s/ExtendedDoubleUpDownCounterBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.DoubleUpDownCounterBuilder;

diff --git a/...r/metrics/ExtendedLongCounterBuilder.java → ...r/metrics/ExtendedLongCounterBuilder.java b/...r/metrics/ExtendedLongCounterBuilder.java → ...r/metrics/ExtendedLongCounterBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongCounterBuilder;

diff --git a/...tor/metrics/ExtendedLongGaugeBuilder.java → ...tor/metrics/ExtendedLongGaugeBuilder.java b/...tor/metrics/ExtendedLongGaugeBuilder.java → ...tor/metrics/ExtendedLongGaugeBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongGaugeBuilder;

diff --git a/...metrics/ExtendedLongHistogramBuilder.java → ...metrics/ExtendedLongHistogramBuilder.java b/...metrics/ExtendedLongHistogramBuilder.java → ...metrics/ExtendedLongHistogramBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongHistogramBuilder;

diff --git a/...ics/ExtendedLongUpDownCounterBuilder.java → ...ics/ExtendedLongUpDownCounterBuilder.java b/...ics/ExtendedLongUpDownCounterBuilder.java → ...ics/ExtendedLongUpDownCounterBuilder.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.metrics.LongUpDownCounterBuilder;

diff --git a/...xtension/incubator/metrics/LongGauge.java → ...etry/api/incubator/metrics/LongGauge.java b/...xtension/incubator/metrics/LongGauge.java → ...etry/api/incubator/metrics/LongGauge.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.metrics;
+package io.opentelemetry.api.incubator.metrics;
 
 import io.opentelemetry.api.common.Attributes;
 import javax.annotation.concurrent.ThreadSafe;

diff --git a/...bator/propagation/CaseInsensitiveMap.java → ...bator/propagation/CaseInsensitiveMap.java b/...bator/propagation/CaseInsensitiveMap.java → ...bator/propagation/CaseInsensitiveMap.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.propagation;
+package io.opentelemetry.api.incubator.propagation;
 
 import java.util.HashMap;
 import java.util.Locale;

diff --git a/...opagation/ExtendedContextPropagators.java → ...opagation/ExtendedContextPropagators.java b/...opagation/ExtendedContextPropagators.java → ...opagation/ExtendedContextPropagators.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.propagation;
+package io.opentelemetry.api.incubator.propagation;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.context.Context;

diff --git a/...or/propagation/PassThroughPropagator.java → ...or/propagation/PassThroughPropagator.java b/...or/propagation/PassThroughPropagator.java → ...or/propagation/PassThroughPropagator.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 java.util.Objects.requireNonNull;
 

diff --git a/...tension/incubator/trace/ExtendedSpan.java → ...try/api/incubator/trace/ExtendedSpan.java b/...tension/incubator/trace/ExtendedSpan.java → ...try/api/incubator/trace/ExtendedSpan.java
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.extension.incubator.trace;
+package io.opentelemetry.api.incubator.trace;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.Span;