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

…s per spec

exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogRecordExporterTest.java

@@ -5,11 +5,25 @@
 
 package io.opentelemetry.exporter.logging.otlp;
 
+import static io.opentelemetry.api.common.AttributeKey.booleanKey;
+import static io.opentelemetry.api.common.AttributeKey.longKey;
+import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.github.netmikey.logunit.api.LogCapturer;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.logs.Severity;
+import io.opentelemetry.api.trace.SpanContext;
+import io.opentelemetry.api.trace.TraceFlags;
+import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.internal.testing.slf4j.SuppressLogger;
+import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
+import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.logs.export.LogRecordExporter;
+import io.opentelemetry.sdk.resources.Resource;
+import io.opentelemetry.sdk.testing.logs.TestLogRecordData;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,7 +34,49 @@
 @SuppressLogger(OtlpJsonLoggingLogRecordExporter.class)
 class OtlpJsonLoggingLogRecordExporterTest {
 
-  private final TestDataExporter<LogRecordExporter> testDataExporter = TestDataExporter.forLogs();
+  private static final Resource RESOURCE =
+      Resource.create(Attributes.builder().put("key", "value").build());
+
+  private static final LogRecordData LOG1 =
+      TestLogRecordData.builder()
+          .setResource(RESOURCE)
+          .setInstrumentationScopeInfo(
+              InstrumentationScopeInfo.builder("instrumentation")
+                  .setVersion("1")
+                  .setAttributes(Attributes.builder().put("key", "value").build())
+                  .build())
+          .setBody("body1")
+          .setSeverity(Severity.INFO)
+          .setSeverityText("INFO")
+          .setTimestamp(100L, TimeUnit.NANOSECONDS)
+          .setObservedTimestamp(200L, TimeUnit.NANOSECONDS)
+          .setAttributes(Attributes.of(stringKey("animal"), "cat", longKey("lives"), 9L))
+          .setSpanContext(
+              SpanContext.create(
+                  "12345678876543211234567887654322",
+                  "8765432112345876",
+                  TraceFlags.getDefault(),
+                  TraceState.getDefault()))
+          .build();
+
+  private static final LogRecordData LOG2 =
+      TestLogRecordData.builder()
+          .setResource(RESOURCE)
+          .setInstrumentationScopeInfo(
+              InstrumentationScopeInfo.builder("instrumentation2").setVersion("2").build())
+          .setBody("body2")
+          .setSeverity(Severity.INFO)
+          .setSeverityText("INFO")
+          .setTimestamp(100L, TimeUnit.NANOSECONDS)
+          .setObservedTimestamp(200L, TimeUnit.NANOSECONDS)
+          .setAttributes(Attributes.of(booleanKey("important"), true))
+          .setSpanContext(
+              SpanContext.create(
+                  "12345678876543211234567887654322",
+                  "8765432112345875",
+                  TraceFlags.getDefault(),
+                  TraceState.getDefault()))
+          .build();
 
   @RegisterExtension
   LogCapturer logs = LogCapturer.create().captureForType(OtlpJsonLoggingLogRecordExporter.class);
@@ -34,21 +90,90 @@ void setUp() {
 
   @Test
   void log() throws Exception {
-    testDataExporter.export(exporter);
+    exporter.export(Arrays.asList(LOG1, LOG2));
 
     assertThat(logs.getEvents())
         .hasSize(1)
         .allSatisfy(log -> assertThat(log.getLevel()).isEqualTo(Level.INFO));
     String message = logs.getEvents().get(0).getMessage();
-    String expectedJson = testDataExporter.getExpectedJson(false);
-    JSONAssert.assertEquals("Got \n" + message, expectedJson, message, /* strict= */ false);
+    JSONAssert.assertEquals(
+        "{"
+            + "   \"resource\": {"
+            + "     \"attributes\": [{"
+            + "       \"key\":\"key\","
+            + "       \"value\": {"
+            + "          \"stringValue\":\"value\""
+            + "       }"
+            + "     }]"
+            + "   },"
+            + "   \"scopeLogs\": [{"
+            + "     \"scope\":{"
+            + "       \"name\":\"instrumentation2\","
+            + "       \"version\":\"2\""
+            + "     },"
+            + "     \"logRecords\": [{"
+            + "       \"timeUnixNano\":\"100\","
+            + "       \"observedTimeUnixNano\":\"200\","
+            + "       \"severityNumber\":9,"
+            + "       \"severityText\":\"INFO\","
+            + "       \"body\": {"
+            + "         \"stringValue\":\"body2\""
+            + "       },"
+            + "       \"attributes\": [{"
+            + "         \"key\":\"important\","
+            + "         \"value\": {"
+            + "           \"boolValue\":true"
+            + "         }"
+            + "       }],"
+            + "       \"traceId\":\"12345678876543211234567887654322\","
+            + "       \"spanId\":\"8765432112345875\""
+            + "     }]"
+            + "     }, {"
+            + "     \"scope\": {"
+            + "       \"name\":\"instrumentation\","
+            + "       \"version\":\"1\","
+            + "       \"attributes\": [{"
+            + "         \"key\":\"key\","
+            + "         \"value\": {"
+            + "           \"stringValue\":\"value\""
+            + "         }"
+            + "       }]"
+            + "     },"
+            + "     \"logRecords\": [{"
+            + "       \"timeUnixNano\":\"100\","
+            + "       \"observedTimeUnixNano\":\"200\","
+            + "       \"severityNumber\":9,"
+            + "       \"severityText\":\"INFO\","
+            + "       \"body\": {"
+            + "         \"stringValue\":\"body1\""
+            + "       },"
+            + "       \"attributes\": [{"
+            + "         \"key\":\"animal\","
+            + "         \"value\": {"
+            + "           \"stringValue\":\"cat\""
+            + "         }"
+            + "       }, {"
+            + "         \"key\":\"lives\","
+            + "         \"value\":{"
+            + "           \"intValue\":\"9\""
+            + "         }"
+            + "       }],"
+            + "       \"traceId\":\"12345678876543211234567887654322\","
+            + "       \"spanId\":\"8765432112345876\""
+            + "     }]"
+            + "   }]"
+            + "}",
+        message,
+        /* strict= */ false);
     assertThat(message).doesNotContain("\n");
   }
 
   @Test
   void shutdown() {
     assertThat(exporter.shutdown().isSuccess()).isTrue();
-    assertThat(testDataExporter.export(exporter).join(10, TimeUnit.SECONDS).isSuccess()).isFalse();
+    assertThat(
+            exporter.export(Collections.singletonList(LOG1)).join(10, TimeUnit.SECONDS).isSuccess())
+        .isFalse();
     assertThat(logs.getEvents()).isEmpty();
     assertThat(exporter.shutdown().isSuccess()).isTrue();
     logs.assertContains("Calling shutdown() multiple times.");