Remove -alpha artifacts from runtime classpath of stable components

buildSrc/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -86,9 +86,7 @@ tasks {
             // https://groups.google.com/forum/#!topic/bazel-discuss/_R3A9TJSoPM
             "-Xlint:-processing",
             // We suppress the "options" warning because it prevents compilation on modern JDKs
-            "-Xlint:-options",
-            // Fail build on any warning
-            "-Werror",
+            "-Xlint:-options"
           ),
         )
       }

exporters/otlp/common/build.gradle.kts

@@ -16,7 +16,6 @@ dependencies {
   protoSource("io.opentelemetry.proto:opentelemetry-proto:${versions["io.opentelemetry.proto"]}")
 
   api(project(":exporters:common"))
-  implementation(project(":api:incubator"))
 
   compileOnly(project(":sdk:metrics"))
   compileOnly(project(":sdk:trace"))
@@ -32,6 +31,7 @@ dependencies {
   testImplementation("com.google.guava:guava")
   testImplementation("io.opentelemetry.proto:opentelemetry-proto")
 
+  jmhImplementation(project(":api:incubator"))
   jmhImplementation(project(":sdk:testing"))
   jmhImplementation("com.fasterxml.jackson.core:jackson-core")
   jmhImplementation("io.opentelemetry.proto:opentelemetry-proto")

sdk-extensions/autoconfigure/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
   api(project(":sdk:all"))
   api(project(":sdk-extensions:autoconfigure-spi"))
 
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 
   annotationProcessor("com.google.auto.value:auto-value")
 
@@ -23,6 +23,11 @@ dependencies {
 
 testing {
   suites {
+    register<JvmTestSuite>("testIncubating") {
+      dependencies {
+        implementation(project(":api:incubator"))
+      }
+    }
     register<JvmTestSuite>("testAutoConfigureOrder") {
       targets {
         all {

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java

@@ -8,7 +8,6 @@
 import static java.util.Objects.requireNonNull;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.sdk.OpenTelemetrySdk;
@@ -26,7 +25,6 @@
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
@@ -592,8 +590,12 @@ private void maybeSetAsGlobal(OpenTelemetrySdk openTelemetrySdk) {
       return;
     }
     GlobalOpenTelemetry.set(openTelemetrySdk);
-    GlobalEventLoggerProvider.set(
-        SdkEventLoggerProvider.create(openTelemetrySdk.getSdkLoggerProvider()));
+    try {
+      Class.forName("io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider");
+      IncubatingUtil.setGlobalEventLoggerProvider(openTelemetrySdk.getSdkLoggerProvider());
+    } catch (Exception e) {
+      // do nothing
+    }
     logger.log(
         Level.FINE, "Global OpenTelemetry set to {0} by autoconfiguration", openTelemetrySdk);
   }

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/IncubatingUtil.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
+import io.opentelemetry.sdk.logs.SdkLoggerProvider;
+import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
+
+final class IncubatingUtil {
+
+  private IncubatingUtil() {}
+
+  static void setGlobalEventLoggerProvider(SdkLoggerProvider sdkLoggerProvider) {
+    GlobalEventLoggerProvider.set(SdkEventLoggerProvider.create(sdkLoggerProvider));
+  }
+}

sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkTest.java

@@ -26,7 +26,6 @@
 import io.github.netmikey.logunit.api.LogCapturer;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
-import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
 import io.opentelemetry.api.trace.Span;
 import io.opentelemetry.api.trace.SpanId;
 import io.opentelemetry.api.trace.TraceId;
@@ -49,7 +48,6 @@
 import io.opentelemetry.sdk.logs.LogRecordProcessor;
 import io.opentelemetry.sdk.logs.SdkLoggerProvider;
 import io.opentelemetry.sdk.logs.SdkLoggerProviderBuilder;
-import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
 import io.opentelemetry.sdk.metrics.export.MetricReader;
@@ -156,7 +154,6 @@ public SdkLoggerProviderBuilder apply(
   @BeforeEach
   void resetGlobal() {
     GlobalOpenTelemetry.resetForTest();
-    GlobalEventLoggerProvider.resetForTest();
     builder =
         AutoConfiguredOpenTelemetrySdk.builder()
             .addPropertiesSupplier(disableExportPropertySupplier());
@@ -456,18 +453,13 @@ void builder_setResultAsGlobalFalse() {
     OpenTelemetrySdk openTelemetry = builder.build().getOpenTelemetrySdk();
 
     assertThat(GlobalOpenTelemetry.get()).extracting("delegate").isNotSameAs(openTelemetry);
-    assertThat(GlobalEventLoggerProvider.get()).isNotSameAs(openTelemetry.getSdkLoggerProvider());
   }
 
   @Test
   void builder_setResultAsGlobalTrue() {
     OpenTelemetrySdk openTelemetry = builder.setResultAsGlobal().build().getOpenTelemetrySdk();
 
     assertThat(GlobalOpenTelemetry.get()).extracting("delegate").isSameAs(openTelemetry);
-    assertThat(GlobalEventLoggerProvider.get())
-        .isInstanceOf(SdkEventLoggerProvider.class)
-        .extracting("delegateLoggerProvider")
-        .isSameAs(openTelemetry.getSdkLoggerProvider());
   }
 
   @Test

sdk-extensions/autoconfigure/src/testIncubating/java/io/opentelemetry/sdk/autoconfigure/AutoconfigureGlobalEventLoggerProviderTest.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import io.opentelemetry.api.GlobalOpenTelemetry;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.api.incubator.events.GlobalEventLoggerProvider;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.logs.internal.SdkEventLoggerProvider;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Supplier;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+class AutoconfigureGlobalEventLoggerProviderTest {
+
+  private AutoConfiguredOpenTelemetrySdkBuilder builder;
+
+  @BeforeEach
+  void resetGlobal() {
+    GlobalOpenTelemetry.resetForTest();
+    GlobalEventLoggerProvider.resetForTest();
+    builder =
+        AutoConfiguredOpenTelemetrySdk.builder()
+            .addPropertiesSupplier(disableExportPropertySupplier());
+  }
+
+  @Test
+  void builder_setResultAsGlobalFalse() {
+    GlobalOpenTelemetry.set(OpenTelemetry.noop());
+
+    OpenTelemetrySdk openTelemetry = builder.build().getOpenTelemetrySdk();
+
+    assertThat(GlobalOpenTelemetry.get()).extracting("delegate").isNotSameAs(openTelemetry);
+    assertThat(GlobalEventLoggerProvider.get()).isNotSameAs(openTelemetry.getSdkLoggerProvider());
+  }
+
+  @Test
+  void builder_setResultAsGlobalTrue() {
+    OpenTelemetrySdk openTelemetry = builder.setResultAsGlobal().build().getOpenTelemetrySdk();
+
+    assertThat(GlobalOpenTelemetry.get()).extracting("delegate").isSameAs(openTelemetry);
+    assertThat(GlobalEventLoggerProvider.get())
+        .isInstanceOf(SdkEventLoggerProvider.class)
+        .extracting("delegateLoggerProvider")
+        .isSameAs(openTelemetry.getSdkLoggerProvider());
+  }
+
+  private static Supplier<Map<String, String>> disableExportPropertySupplier() {
+    Map<String, String> props = new HashMap<>();
+    props.put("otel.metrics.exporter", "none");
+    props.put("otel.traces.exporter", "none");
+    props.put("otel.logs.exporter", "none");
+    return () -> props;
+  }
+}

sdk/logs/build.gradle.kts

@@ -12,7 +12,7 @@ otelJava.moduleName.set("io.opentelemetry.sdk.logs")
 dependencies {
   api(project(":api:all"))
   api(project(":sdk:common"))
-  implementation(project(":api:incubator"))
+  compileOnly(project(":api:incubator"))
 
   annotationProcessor("com.google.auto.value:auto-value")
 
@@ -21,3 +21,21 @@ dependencies {
   testImplementation("org.awaitility:awaitility")
   testImplementation("com.google.guava:guava")
 }
+
+testing {
+  suites {
+    register<JvmTestSuite>("testIncubating") {
+      dependencies {
+        implementation(project(":sdk:testing"))
+        implementation(project(":api:incubator"))
+        implementation("com.google.guava:guava")
+      }
+    }
+  }
+}
+
+tasks {
+  check {
+    dependsOn(testing.suites)
+  }
+}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogRecordBuilder.java

@@ -0,0 +1,86 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.logs;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Value;
+import io.opentelemetry.api.incubator.logs.ExtendedLogRecordBuilder;
+import io.opentelemetry.api.logs.LogRecordBuilder;
+import io.opentelemetry.api.logs.Severity;
+import io.opentelemetry.context.Context;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import java.time.Instant;
+import java.util.concurrent.TimeUnit;
+
+/** SDK implementation of {@link ExtendedLogRecordBuilder}. */
+final class ExtendedSdkLogRecordBuilder extends SdkLogRecordBuilder
+    implements ExtendedLogRecordBuilder {
+
+  ExtendedSdkLogRecordBuilder(
+      LoggerSharedState loggerSharedState, InstrumentationScopeInfo instrumentationScopeInfo) {
+    super(loggerSharedState, instrumentationScopeInfo);
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setTimestamp(long timestamp, TimeUnit unit) {
+    super.setTimestamp(timestamp, unit);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setTimestamp(Instant instant) {
+    super.setTimestamp(instant);
+    return this;
+  }
+
+  @Override
+  public LogRecordBuilder setObservedTimestamp(long timestamp, TimeUnit unit) {
+    super.setObservedTimestamp(timestamp, unit);
+    return this;
+  }
+
+  @Override
+  public LogRecordBuilder setObservedTimestamp(Instant instant) {
+    super.setObservedTimestamp(instant);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setContext(Context context) {
+    super.setContext(context);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setSeverity(Severity severity) {
+    super.setSeverity(severity);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setSeverityText(String severityText) {
+    super.setSeverityText(severityText);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setBody(String body) {
+    super.setBody(body);
+    return this;
+  }
+
+  @Override
+  public ExtendedSdkLogRecordBuilder setBody(Value<?> value) {
+    super.setBody(value);
+    return this;
+  }
+
+  @Override
+  public <T> ExtendedSdkLogRecordBuilder setAttribute(AttributeKey<T> key, T value) {
+    super.setAttribute(key, value);
+    return this;
+  }
+}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/ExtendedSdkLogger.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.logs;
+
+import io.opentelemetry.api.incubator.logs.ExtendedLogger;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.internal.LoggerConfig;
+
+/** SDK implementation of {@link ExtendedLogger}. */
+final class ExtendedSdkLogger extends SdkLogger implements ExtendedLogger {
+
+  private final boolean loggerEnabled;
+
+  ExtendedSdkLogger(
+      LoggerSharedState loggerSharedState,
+      InstrumentationScopeInfo instrumentationScopeInfo,
+      LoggerConfig loggerConfig) {
+    super(loggerSharedState, instrumentationScopeInfo, loggerConfig);
+    this.loggerEnabled = loggerConfig.isEnabled();
+  }
+
+  @Override
+  public boolean isEnabled() {
+    return loggerEnabled;
+  }
+}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/IncubatingUtil.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.logs;
+
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.internal.LoggerConfig;
+
+final class IncubatingUtil {
+
+  private IncubatingUtil() {}
+
+  static SdkLogger createIncubatingLogger(
+      LoggerSharedState sharedState,
+      InstrumentationScopeInfo instrumentationScopeInfo,
+      LoggerConfig tracerConfig) {
+    return new ExtendedSdkLogger(sharedState, instrumentationScopeInfo, tracerConfig);
+  }
+
+  static SdkLogRecordBuilder createIncubatingLogRecordBuilder(
+      LoggerSharedState loggerSharedState, InstrumentationScopeInfo instrumentationScopeInfo) {
+    return new ExtendedSdkLogRecordBuilder(loggerSharedState, instrumentationScopeInfo);
+  }
+}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogRecordBuilder.java

@@ -7,7 +7,6 @@
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Value;
-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;
@@ -19,7 +18,7 @@
 import javax.annotation.Nullable;
 
 /** SDK implementation of {@link LogRecordBuilder}. */
-final class SdkLogRecordBuilder implements ExtendedLogRecordBuilder {
+class SdkLogRecordBuilder implements LogRecordBuilder {
 
   private final LoggerSharedState loggerSharedState;
   private final LogLimits logLimits;