diff --git a/exporters/otlp-http/logs/build.gradle.kts b/exporters/otlp-http/logs/build.gradle.kts index c3a3c1aa2d..6c13a48d6f 100644 --- a/exporters/otlp-http/logs/build.gradle.kts +++ b/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")) diff --git a/exporters/otlp-http/logs/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporter.java b/exporters/otlp-http/logs/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporter.java index 300add6021..55a0fc38b5 100644 --- a/exporters/otlp-http/logs/src/main/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporter.java +++ b/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; diff --git a/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java b/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java index ec019bd8c2..33f1681b32 100644 --- a/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java +++ b/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; diff --git a/exporters/otlp/common/build.gradle.kts b/exporters/otlp/common/build.gradle.kts index 586daa9c26..a5cba224fd 100644 --- a/exporters/otlp/common/build.gradle.kts +++ b/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") diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogMarshaler.java index 3fb4d2e3d0..327a9adaa3 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogMarshaler.java +++ b/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()); diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshaler.java index df09a11bfa..2781399df9 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshaler.java +++ b/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; diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/ResourceLogsMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/ResourceLogsMarshaler.java index 753eec402d..c39907303d 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/otlp/internal/logs/ResourceLogsMarshaler.java +++ b/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; diff --git a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshalerTest.java b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshalerTest.java index 8aec41ab7f..f72611e117 100644 --- a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/otlp/internal/logs/LogsRequestMarshalerTest.java +++ b/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) diff --git a/exporters/otlp/logs/build.gradle.kts b/exporters/otlp/logs/build.gradle.kts index 286e6367fc..92bf4ba196 100644 --- a/exporters/otlp/logs/build.gradle.kts +++ b/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")) diff --git a/exporters/otlp/logs/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporter.java b/exporters/otlp/logs/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporter.java index 3ef9924e71..267cb32152 100644 --- a/exporters/otlp/logs/src/main/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporter.java +++ b/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; diff --git a/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogsExporterTest.java b/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogsExporterTest.java index b66245862a..60827a30a6 100644 --- a/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogsExporterTest.java +++ b/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; diff --git a/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java b/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java index 02bc626c04..5b7e872ff7 100644 --- a/exporters/otlp/logs/src/testGrpcNetty/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java +++ b/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; diff --git a/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java b/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java index 02bc626c04..5b7e872ff7 100644 --- a/exporters/otlp/logs/src/testGrpcNettyShaded/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java +++ b/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; diff --git a/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java b/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java index 02bc626c04..5b7e872ff7 100644 --- a/exporters/otlp/logs/src/testGrpcOkhttp/java/io/opentelemetry/exporter/otlp/logs/ExportTest.java +++ b/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; diff --git a/exporters/otlp/logs/src/testOkHttpOnly/java/io/opentelemetry/exporter/otlp/logs/OkHttpOnlyExportTest.java b/exporters/otlp/logs/src/testOkHttpOnly/java/io/opentelemetry/exporter/otlp/logs/OkHttpOnlyExportTest.java index ded7260740..02c2f08d28 100644 --- a/exporters/otlp/logs/src/testOkHttpOnly/java/io/opentelemetry/exporter/otlp/logs/OkHttpOnlyExportTest.java +++ b/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; diff --git a/integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java b/integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java index 4b037a70bb..3ba3766ee8 100644 --- a/integration-tests/src/testOtlpCommon/java/io/opentelemetry/integrationtest/OtlpExporterIntegrationTest.java +++ b/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; diff --git a/sdk-extensions/logging/README.md b/sdk/logs/README.md similarity index 100% rename from sdk-extensions/logging/README.md rename to sdk/logs/README.md diff --git a/sdk-extensions/logging/build.gradle.kts b/sdk/logs/build.gradle.kts similarity index 100% rename from sdk-extensions/logging/build.gradle.kts rename to sdk/logs/build.gradle.kts diff --git a/sdk-extensions/logging/gradle.properties b/sdk/logs/gradle.properties similarity index 100% rename from sdk-extensions/logging/gradle.properties rename to sdk/logs/gradle.properties diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogProcessor.java similarity index 86% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogProcessor.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogProcessor.java index b8c33bbcec..0837e7806d 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogProcessor.java +++ b/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 { diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSink.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSink.java similarity index 80% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSink.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSink.java index 959d67b864..b5e852308a 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSink.java +++ b/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 { diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProvider.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSinkSdkProvider.java similarity index 95% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProvider.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSinkSdkProvider.java index 9a40ed3707..c6fa8df5c6 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProvider.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSinkSdkProviderBuilder.java similarity index 86% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderBuilder.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogSinkSdkProviderBuilder.java index fc115a6acb..e51d93cb20 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderBuilder.java +++ b/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() {} diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Body.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Body.java similarity index 95% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Body.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Body.java index d71f8a5dd4..b452d6af87 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Body.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogData.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java similarity index 97% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogData.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java index 70fa17eea2..8f64aca9bc 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogData.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecord.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecord.java similarity index 96% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecord.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecord.java index bbcbbdbcea..b427d8779c 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecord.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecordBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecordBuilder.java similarity index 98% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecordBuilder.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogRecordBuilder.java index 4c56496216..8aefdaac4e 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/LogRecordBuilder.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Severity.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Severity.java similarity index 93% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Severity.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/Severity.java index 70f65fe6fd..bea09c2166 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/Severity.java +++ b/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), diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/StringBody.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/StringBody.java similarity index 91% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/StringBody.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/StringBody.java index 88416f6df6..4496528f7f 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/StringBody.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/package-info.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/package-info.java similarity index 83% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/package-info.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/package-info.java index c08a1596be..00cd9fba78 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/data/package-info.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessor.java similarity index 97% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessor.java index a0091d9e8d..c51aab1161 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessor.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessorBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessorBuilder.java similarity index 98% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessorBuilder.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/BatchLogProcessorBuilder.java index 5bfaa84e7a..eeaa3044b4 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/BatchLogProcessorBuilder.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/LogExporter.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogExporter.java similarity index 74% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/LogExporter.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/LogExporter.java index c3e505d75d..6f0e229981 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/LogExporter.java +++ b/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; /** diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/package-info.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/package-info.java similarity index 81% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/package-info.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/export/package-info.java index 6785bd37c0..e05d0e9e7e 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/export/package-info.java +++ b/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; diff --git a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/package-info.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/package-info.java similarity index 71% rename from sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/package-info.java rename to sdk/logs/src/main/java/io/opentelemetry/sdk/logs/package-info.java index 0d62278b4c..4adcab4a99 100644 --- a/sdk-extensions/logging/src/main/java/io/opentelemetry/sdk/logging/package-info.java +++ b/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; diff --git a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LogSinkSdkProviderTest.java similarity index 93% rename from sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderTest.java rename to sdk/logs/src/test/java/io/opentelemetry/sdk/logs/LogSinkSdkProviderTest.java index 0194b1298b..9753cbb8a4 100644 --- a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/LogSinkSdkProviderTest.java +++ b/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; diff --git a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/data/BodyTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/data/BodyTest.java similarity index 90% rename from sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/data/BodyTest.java rename to sdk/logs/src/test/java/io/opentelemetry/sdk/logs/data/BodyTest.java index 1c1dbab6b4..35f0ae4200 100644 --- a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/data/BodyTest.java +++ b/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; diff --git a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/sdk/BatchLogProcessorTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/sdk/BatchLogProcessorTest.java similarity index 89% rename from sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/sdk/BatchLogProcessorTest.java rename to sdk/logs/src/test/java/io/opentelemetry/sdk/logs/sdk/BatchLogProcessorTest.java index bb62e1c96a..6a3093776f 100644 --- a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/sdk/BatchLogProcessorTest.java +++ b/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; diff --git a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogExporter.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogExporter.java similarity index 87% rename from sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogExporter.java rename to sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogExporter.java index 46b803a33c..418d16a0fd 100644 --- a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogExporter.java +++ b/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; diff --git a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogProcessor.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogProcessor.java similarity index 86% rename from sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogProcessor.java rename to sdk/logs/src/test/java/io/opentelemetry/sdk/logs/util/TestLogProcessor.java index d3210ccb0b..e92a5635e7 100644 --- a/sdk-extensions/logging/src/test/java/io/opentelemetry/sdk/logging/util/TestLogProcessor.java +++ b/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; diff --git a/settings.gradle.kts b/settings.gradle.kts index 207b24391a..90d465f162 100644 --- a/settings.gradle.kts +++ b/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")