Merge opentelemetry-api-events into opentelemetry-api-incubator

README.md

@@ -48,8 +48,7 @@ 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`.
-  * [incubating apis](api/incubator) including 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.
@@ -236,12 +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`           | <!--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) |
-| [API  Incubator](./extensions/incubator) | API incubator, including pass through propagator, and extended tracer | `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)       |
+| 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](./extensions/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
 

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;

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

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

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

integration-tests/otlp/build.gradle.kts

@@ -9,7 +9,6 @@ dependencies {
   api("org.testcontainers:junit-jupiter")
 
   implementation(project(":exporters:otlp:all"))
-  implementation(project(":api:events"))
   implementation(project(":api:incubator"))
 
   compileOnly("com.google.errorprone:error_prone_annotations")

integration-tests/otlp/src/main/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

@@ -21,7 +21,7 @@
 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;

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<JvmTestSuite>("testFullConfig") {
       dependencies {
-        implementation(project(":api:events"))
+        implementation(project(":api:incubator"))
         implementation(project(":extensions:trace-propagators"))
         implementation(project(":exporters:logging"))
         implementation(project(":exporters:logging-otlp"))

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;

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;

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;

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;

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;

sdk/logs/build.gradle.kts

@@ -14,8 +14,6 @@ dependencies {
   api(project(":sdk:common"))
   implementation(project(":api:incubator"))
 
-  implementation(project(":api:events"))
-
   annotationProcessor("com.google.auto.value:auto-value")
 
   testImplementation(project(":sdk:testing"))

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;

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;

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;

settings.gradle.kts

@@ -24,7 +24,6 @@ dependencyResolutionManagement {
 rootProject.name = "opentelemetry-java"
 include(":all")
 include(":api:all")
-include(":api:events")
 include(":api:incubator")
 include(":bom")
 include(":bom-alpha")