move provider to sdk-extensions/incubator and rename to otlp/stdout a…

…s per spec

exporters/logging-otlp/build.gradle.kts

@@ -20,6 +20,5 @@ dependencies {
 
   testImplementation(project(":sdk:testing"))
 
-  testImplementation("com.google.guava:guava")
   testImplementation("org.skyscreamer:jsonassert")
 }

exporters/logging-otlp/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider

@@ -1,2 +1 @@
 io.opentelemetry.exporter.logging.otlp.internal.logs.LoggingLogRecordExporterProvider
-io.opentelemetry.exporter.logging.otlp.internal.logs.OtlpStdoutLogRecordExporterProvider

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

@@ -30,7 +30,7 @@ final class LogRecordExporterConfiguration {
     EXPORTER_ARTIFACT_ID_BY_NAME.put("console", "opentelemetry-exporter-logging");
     EXPORTER_ARTIFACT_ID_BY_NAME.put("logging", "opentelemetry-exporter-logging");
     EXPORTER_ARTIFACT_ID_BY_NAME.put("logging-otlp", "opentelemetry-exporter-logging-otlp");
-    EXPORTER_ARTIFACT_ID_BY_NAME.put("otlp-stdout", "opentelemetry-exporter-logging-otlp");
+    EXPORTER_ARTIFACT_ID_BY_NAME.put("otlp/stdout", "opentelemetry-sdk-extensions-incubator");
     EXPORTER_ARTIFACT_ID_BY_NAME.put("otlp", "opentelemetry-exporter-otlp");
   }
 

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

@@ -46,10 +46,10 @@ void configureExporter_KnownSpiExportersNotOnClasspath() {
         .hasMessage(
             "otel.logs.exporter set to \"logging-otlp\" but opentelemetry-exporter-logging-otlp"
                 + " not found on classpath. Make sure to add it as a dependency.");
-    assertThatThrownBy(() -> configureExporter("otlp-stdout", spiExportersManager))
+    assertThatThrownBy(() -> configureExporter("otlp/stdout", spiExportersManager))
         .isInstanceOf(ConfigurationException.class)
         .hasMessage(
-            "otel.logs.exporter set to \"otlp-stdout\" but opentelemetry-exporter-logging-otlp"
+            "otel.logs.exporter set to \"otlp/stdout\" but opentelemetry-exporter-logging-otlp"
                 + " not found on classpath. Make sure to add it as a dependency.");
     assertThatThrownBy(() -> configureExporter("otlp", spiExportersManager))
         .isInstanceOf(ConfigurationException.class)

sdk-extensions/autoconfigure/src/testFullConfig/java/io/opentelemetry/sdk/autoconfigure/LogRecordExporterConfigurationTest.java

@@ -39,7 +39,7 @@ void configureExporter_KnownSpiExportersOnClasspath() {
     assertThat(
             LogRecordExporterConfiguration.configureExporter("logging-otlp", spiExportersManager))
         .isInstanceOf(OtlpJsonLoggingLogRecordExporter.class);
-    assertThat(LogRecordExporterConfiguration.configureExporter("otlp-stdout", spiExportersManager))
+    assertThat(LogRecordExporterConfiguration.configureExporter("otlp/stdout", spiExportersManager))
         .isInstanceOf(OtlpStdoutLogRecordExporter.class);
     assertThat(LogRecordExporterConfiguration.configureExporter("otlp", spiExportersManager))
         .isInstanceOf(OtlpGrpcLogRecordExporter.class);

sdk-extensions/incubator/build.gradle.kts

@@ -29,6 +29,7 @@ dependencies {
   api("com.fasterxml.jackson.core:jackson-annotations")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
   implementation(project(":sdk-extensions:autoconfigure"))
+  implementation(project(":exporters:logging-otlp"))
 
   testImplementation(project(":sdk:testing"))
   testImplementation(project(":sdk-extensions:autoconfigure"))
@@ -43,6 +44,7 @@ dependencies {
   testImplementation("com.linecorp.armeria:armeria-junit5")
 
   testImplementation("com.google.guava:guava-testlib")
+  testImplementation("org.skyscreamer:jsonassert")
 }
 
 // The following tasks download the JSON Schema files from open-telemetry/opentelemetry-configuration and generate classes from the type definitions which are used with jackson-databind to parse JSON / YAML to the configuration schema.

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterComponentProvider.java → sdk-extensions/incubator/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterComponentProvider.java

@@ -25,7 +25,7 @@ public Class<LogRecordExporter> getType() {
 
   @Override
   public String getName() {
-    return "otlp-stdout";
+    return "otlp/stdout";
   }
 
   @Override

exporters/logging-otlp/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterProvider.java → sdk-extensions/incubator/src/main/java/io/opentelemetry/exporter/logging/otlp/internal/logs/OtlpStdoutLogRecordExporterProvider.java

@@ -24,6 +24,6 @@ public LogRecordExporter createExporter(ConfigProperties config) {
 
   @Override
   public String getName() {
-    return "otlp-stdout";
+    return "otlp/stdout";
   }
 }

sdk-extensions/incubator/src/main/resources/META-INF/services/io.opentelemetry.sdk.autoconfigure.spi.logs.ConfigurableLogRecordExporterProvider

@@ -0,0 +1 @@
+io.opentelemetry.exporter.logging.otlp.internal.logs.OtlpStdoutLogRecordExporterProvider

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/AbstractOtlpStdoutExporterTest.java → sdk-extensions/incubator/src/test/java/io/opentelemetry/exporter/logging/otlp/AbstractOtlpStdoutExporterTest.java

@@ -104,8 +104,8 @@ private String output(@Nullable OutputStream outputStream, @Nullable Path file)
     }
   }
 
-  @BeforeAll
   @SuppressWarnings("SystemOut")
+  @BeforeAll
   static void setUpStatic() {
     systemOut = System.out;
     System.setOut(SYSTEM_OUT_PRINT_STREAM);
@@ -233,7 +233,7 @@ protected OtlpStdoutLogRecordExporter exporterFromComponentProvider(
                     .filter(
                         p -> {
                           ComponentProvider<?> c = (ComponentProvider<?>) p;
-                          return "otlp-stdout".equals(c.getName())
+                          return "otlp/stdout".equals(c.getName())
                               && c.getType().equals(componentProviderType);
                         })
                     .findFirst()

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpStdoutLogRecordExporterTest.java → sdk-extensions/incubator/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpStdoutLogRecordExporterTest.java

@@ -20,7 +20,7 @@ class OtlpStdoutLogRecordExporterTest
 
   public OtlpStdoutLogRecordExporterTest() {
     super(
-        "otlp-stdout",
+        "otlp/stdout",
         TestDataExporter.forLogs(),
         OtlpStdoutLogRecordExporter.class,
         ConfigurableLogRecordExporterProvider.class,