Rename opentelemetry-extension-incubator to opentelemetry-api-incubator, merge opentelemetry-api-events

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.

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
 

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"))

extensions/incubator/src/jmh/java/io/opentelemetry/extension/incubator/PassThroughPropagatorBenchmark.java → 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;

api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitter.java → 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;

api/events/src/main/java/io/opentelemetry/api/events/DefaultEventEmitterProvider.java → 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 {
 

api/events/src/main/java/io/opentelemetry/api/events/EventBuilder.java → 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;

api/events/src/main/java/io/opentelemetry/api/events/EventEmitter.java → 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;

api/events/src/main/java/io/opentelemetry/api/events/EventEmitterBuilder.java → 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.

api/events/src/main/java/io/opentelemetry/api/events/EventEmitterProvider.java → 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;
 

api/events/src/main/java/io/opentelemetry/api/events/GlobalEventEmitterProvider.java → 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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValue.java → 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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueArray.java → 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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBoolean.java → 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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueBytes.java → 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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueDouble.java → 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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueLong.java → 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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueString.java → 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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/AnyValueType.java → 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 <a

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/ExtendedLogRecordBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValue.java → api/incubator/src/main/java/io/opentelemetry/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.

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValueImpl.java → api/incubator/src/main/java/io/opentelemetry/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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/logs/KeyAnyValueList.java → api/incubator/src/main/java/io/opentelemetry/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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/DoubleGauge.java → api/incubator/src/main/java/io/opentelemetry/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleCounterBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleGaugeBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleHistogramBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedDoubleUpDownCounterBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongCounterBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongGaugeBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongHistogramBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/ExtendedLongUpDownCounterBuilder.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/metrics/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/metrics/LongGauge.java → api/incubator/src/main/java/io/opentelemetry/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/CaseInsensitiveMap.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/ExtendedContextPropagators.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/propagation/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;

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/propagation/PassThroughPropagator.java → api/incubator/src/main/java/io/opentelemetry/api/incubator/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;
 

extensions/incubator/src/main/java/io/opentelemetry/extension/incubator/trace/ExtendedSpan.java → api/incubator/src/main/java/io/opentelemetry/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;