Move logging extension to logs signal module (#3738)

exporters/otlp-http/logs/build.gradle.kts

@@ -9,7 +9,7 @@ description = "OpenTelemetry Protocol HTTP Logs Exporter"
 otelJava.moduleName.set("io.opentelemetry.exporter.otlp.http.logs")
 
 dependencies {
-  api(project(":sdk-extensions:logging"))
+  api(project(":sdk:logs"))
 
   implementation(project(":exporters:otlp:common"))
 

exporters/otlp-http/logs/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporter.java

@@ -15,8 +15,8 @@ import io.opentelemetry.exporter.otlp.internal.grpc.GrpcStatusUtil;
 import io.opentelemetry.exporter.otlp.internal.logs.LogsRequestMarshaler;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.internal.ThrottlingLogger;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.export.LogExporter;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.export.LogExporter;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.logging.Level;

exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java

@@ -28,10 +28,10 @@ import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.Body;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.Body;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.IdGenerator;
 import java.io.ByteArrayOutputStream;

exporters/otlp/common/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
   api(project(":api:all"))
   api(project(":sdk:all"))
   api(project(":sdk:metrics"))
-  compileOnly(project(":sdk-extensions:logging"))
+  compileOnly(project(":sdk:logs"))
 
   compileOnly("com.fasterxml.jackson.core:jackson-core")
 
@@ -32,7 +32,7 @@ dependencies {
 
   annotationProcessor("com.google.auto.value:auto-value")
 
-  testImplementation(project(":sdk-extensions:logging"))
+  testImplementation(project(":sdk:logs"))
   testImplementation(project(":sdk:testing"))
 
   testImplementation("com.fasterxml.jackson.core:jackson-core")

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogMarshaler.java

@@ -13,7 +13,7 @@ import io.opentelemetry.exporter.otlp.internal.Serializer;
 import io.opentelemetry.exporter.otlp.internal.StringAnyValueMarshaler;
 import io.opentelemetry.proto.logs.v1.internal.LogRecord;
 import io.opentelemetry.proto.logs.v1.internal.SeverityNumber;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.Severity;
 import java.io.IOException;
 
 final class LogMarshaler extends MarshalerWithSize {
@@ -28,7 +28,7 @@ final class LogMarshaler extends MarshalerWithSize {
   private final String traceId;
   private final String spanId;
 
-  static LogMarshaler create(io.opentelemetry.sdk.logging.data.LogData logData) {
+  static LogMarshaler create(io.opentelemetry.sdk.logs.data.LogData logData) {
     KeyValueMarshaler[] attributeMarshalers =
         KeyValueMarshaler.createRepeated(logData.getAttributes());
 

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshaler.java

@@ -10,8 +10,8 @@ import io.opentelemetry.exporter.otlp.internal.MarshalerUtil;
 import io.opentelemetry.exporter.otlp.internal.MarshalerWithSize;
 import io.opentelemetry.exporter.otlp.internal.Serializer;
 import io.opentelemetry.proto.collector.logs.v1.internal.ExportLogsServiceRequest;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.io.IOException;
 import java.util.Collection;

exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/ResourceLogsMarshaler.java

@@ -13,7 +13,7 @@ import io.opentelemetry.exporter.otlp.internal.ResourceMarshaler;
 import io.opentelemetry.exporter.otlp.internal.Serializer;
 import io.opentelemetry.proto.logs.v1.internal.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogData;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.IOException;
 import java.util.Collection;

exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshalerTest.java

@@ -24,7 +24,7 @@ import io.opentelemetry.proto.logs.v1.InstrumentationLibraryLogs;
 import io.opentelemetry.proto.logs.v1.LogRecord;
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -49,7 +49,7 @@ class LogsRequestMarshalerTest {
     ResourceLogsMarshaler[] resourceLogsMarshalers =
         ResourceLogsMarshaler.create(
             Collections.singleton(
-                io.opentelemetry.sdk.logging.data.LogRecord.builder(
+                io.opentelemetry.sdk.logs.data.LogRecord.builder(
                         Resource.builder().put("one", 1).setSchemaUrl("http://url").build(),
                         InstrumentationLibraryInfo.create("testLib", "1.0", "http://url"))
                     .setName(NAME)
@@ -82,7 +82,7 @@ class LogsRequestMarshalerTest {
         parse(
             LogRecord.getDefaultInstance(),
             LogMarshaler.create(
-                io.opentelemetry.sdk.logging.data.LogRecord.builder(
+                io.opentelemetry.sdk.logs.data.LogRecord.builder(
                         Resource.create(Attributes.builder().put("testKey", "testValue").build()),
                         InstrumentationLibraryInfo.create("instrumentation", "1"))
                     .setName(NAME)

exporters/otlp/logs/build.gradle.kts

@@ -18,7 +18,7 @@ testSets {
 }
 
 dependencies {
-  api(project(":sdk-extensions:logging"))
+  api(project(":sdk:logs"))
 
   implementation(project(":exporters:otlp:common"))
 

exporters/otlp/logs/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporter.java

@@ -8,8 +8,8 @@ package io.opentelemetry.exporter.otlp.logs;
 import io.opentelemetry.exporter.otlp.internal.grpc.GrpcExporter;
 import io.opentelemetry.exporter.otlp.internal.logs.LogsRequestMarshaler;
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.export.LogExporter;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.export.LogExporter;
 import java.util.Collection;
 import javax.annotation.concurrent.ThreadSafe;
 

exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogsExporterTest.java

@@ -31,9 +31,9 @@ import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
 import io.opentelemetry.proto.logs.v1.ResourceLogs;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java

@@ -22,9 +22,9 @@ import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java

@@ -22,9 +22,9 @@ import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java

@@ -22,9 +22,9 @@ import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceRequest;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.proto.collector.logs.v1.LogsServiceGrpc;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;

exporters/otlp/logs/src/testOkHttpOnly/java/io/opentelemetry/exporter/otlp/logs/OkHttpOnlyExportTest.java

@@ -19,9 +19,9 @@ import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.exporter.otlp.internal.grpc.OkHttpGrpcExporterBuilder;
 import io.opentelemetry.proto.collector.logs.v1.ExportLogsServiceResponse;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
 import io.opentelemetry.sdk.resources.Resource;
 import java.net.InetAddress;
 import java.net.UnknownHostException;

integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java

@@ -51,10 +51,10 @@ import io.opentelemetry.proto.trace.v1.InstrumentationLibrarySpans;
 import io.opentelemetry.proto.trace.v1.ResourceSpans;
 import io.opentelemetry.proto.trace.v1.Span.Link;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.Body;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
-import io.opentelemetry.sdk.logging.export.LogExporter;
+import io.opentelemetry.sdk.logs.data.Body;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
+import io.opentelemetry.sdk.logs.export.LogExporter;
 import io.opentelemetry.sdk.metrics.SdkMeterProvider;
 import io.opentelemetry.sdk.metrics.export.MetricExporter;
 import io.opentelemetry.sdk.metrics.export.MetricReaderFactory;

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

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import io.opentelemetry.sdk.trace.SdkTracerProvider;
 
 public interface LogProcessor {

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

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 
 /** A LogSink accepts logging records for transmission to an aggregator or log processing system. */
 public interface LogSink {

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

@@ -3,10 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
 public final class LogSinkSdkProviderBuilder {
   LogSinkSdkProviderBuilder() {}

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Body.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import javax.annotation.concurrent.Immutable;
 

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecord.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.api.common.Attributes;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecordBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Severity.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 public enum Severity {
   UNDEFINED_SEVERITY_NUMBER(0),

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/StringBody.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import com.google.auto.value.AutoValue;
 import javax.annotation.concurrent.Immutable;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/package-info.java

@@ -5,6 +5,6 @@
 
 /** The data format to model logs for export. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.export;
+package io.opentelemetry.sdk.logs.export;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
@@ -13,9 +13,9 @@ import io.opentelemetry.api.metrics.LongCounter;
 import io.opentelemetry.api.metrics.Meter;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.internal.DaemonThreadFactory;
-import io.opentelemetry.sdk.logging.LogProcessor;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.LogProcessor;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import java.util.ArrayList;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessorBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.export;
+package io.opentelemetry.sdk.logs.export;
 
 import io.opentelemetry.api.internal.Utils;
 import java.util.Objects;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogExporter.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.export;
+package io.opentelemetry.sdk.logs.export;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import java.util.Collection;
 
 /**

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/package-info.java

@@ -5,6 +5,6 @@
 
 /** Log exporters. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.logging.export;
+package io.opentelemetry.sdk.logs.export;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk/logs/src/main/java/io/opentelemetry/sdk/logs/package-info.java

@@ -6,9 +6,9 @@
 /**
  * The OpenTelemetry SDK implementation of logging.
  *
- * @see io.opentelemetry.sdk.logging.LogSinkSdkProvider
+ * @see io.opentelemetry.sdk.logs.LogSinkSdkProvider
  */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LogSinkSdkProviderTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging;
+package io.opentelemetry.sdk.logs;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -15,12 +15,12 @@ import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.sdk.common.CompletableResultCode;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
-import io.opentelemetry.sdk.logging.export.BatchLogProcessor;
-import io.opentelemetry.sdk.logging.util.TestLogExporter;
-import io.opentelemetry.sdk.logging.util.TestLogProcessor;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
+import io.opentelemetry.sdk.logs.export.BatchLogProcessor;
+import io.opentelemetry.sdk.logs.util.TestLogExporter;
+import io.opentelemetry.sdk.logs.util.TestLogProcessor;
 import io.opentelemetry.sdk.resources.Resource;
 import java.time.Duration;
 import java.util.List;

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/data/BodyTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.data;
+package io.opentelemetry.sdk.logs.data;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/sdk/BatchLogProcessorTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.sdk;
+package io.opentelemetry.sdk.logs.sdk;
 
 import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -13,10 +13,10 @@ import io.opentelemetry.api.trace.SpanId;
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.logging.data.LogRecord;
-import io.opentelemetry.sdk.logging.data.Severity;
-import io.opentelemetry.sdk.logging.export.BatchLogProcessor;
-import io.opentelemetry.sdk.logging.util.TestLogExporter;
+import io.opentelemetry.sdk.logs.data.LogRecord;
+import io.opentelemetry.sdk.logs.data.Severity;
+import io.opentelemetry.sdk.logs.export.BatchLogProcessor;
+import io.opentelemetry.sdk.logs.util.TestLogExporter;
 import io.opentelemetry.sdk.resources.Resource;
 import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Test;

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogExporter.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.util;
+package io.opentelemetry.sdk.logs.util;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.data.LogData;
-import io.opentelemetry.sdk.logging.export.LogExporter;
+import io.opentelemetry.sdk.logs.data.LogData;
+import io.opentelemetry.sdk.logs.export.LogExporter;
 import java.util.ArrayList;
 import java.util.Collection;
 import javax.annotation.Nullable;

sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogProcessor.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.logging.util;
+package io.opentelemetry.sdk.logs.util;
 
 import io.opentelemetry.sdk.common.CompletableResultCode;
-import io.opentelemetry.sdk.logging.LogProcessor;
-import io.opentelemetry.sdk.logging.data.LogRecord;
+import io.opentelemetry.sdk.logs.LogProcessor;
+import io.opentelemetry.sdk.logs.data.LogRecord;
 import java.util.ArrayList;
 import java.util.List;
 

settings.gradle.kts

@@ -59,6 +59,7 @@ include(":opentracing-shim")
 include(":perf-harness")
 include(":sdk:all")
 include(":sdk:common")
+include(":sdk:logs")
 include(":sdk:metrics")
 include(":sdk:metrics-testing")
 include(":sdk:testing")
@@ -67,7 +68,6 @@ include(":sdk:trace-shaded-deps")
 include(":sdk-extensions:autoconfigure")
 include(":sdk-extensions:autoconfigure-spi")
 include(":sdk-extensions:aws")
-include(":sdk-extensions:logging")
 include(":sdk-extensions:resources")
 include(":sdk-extensions:tracing-incubator")
 include(":sdk-extensions:jaeger-remote-sampler")