From 6dfbc14e1909a34472e6b776b440997f5f418a3c Mon Sep 17 00:00:00 2001 From: Bogdan Drutu Date: Tue, 3 Nov 2020 16:27:57 -0800 Subject: [PATCH] Rename package name for exporters to singular exporter (#1992) Signed-off-by: Bogdan Drutu --- exporters/inmemory/build.gradle | 2 +- .../inmemory/InMemoryMetricExporter.java | 2 +- .../inmemory/InMemorySpanExporter.java | 2 +- .../inmemory/InMemoryTracing.java | 2 +- .../inmemory/InMemoryMetricExporterTest.java | 2 +- .../inmemory/InMemorySpanExporterTest.java | 2 +- .../inmemory/InMemoryTracingTest.java | 2 +- exporters/jaeger-thrift/build.gradle | 2 +- .../jaeger/thrift}/Adapter.java | 2 +- .../thrift}/JaegerThriftSpanExporter.java | 2 +- .../jaeger/thrift}/AdapterTest.java | 2 +- .../thrift}/JaegerThriftIntegrationTest.java | 2 +- .../thrift}/JaegerThriftSpanExporterTest.java | 2 +- exporters/jaeger/build.gradle | 2 +- .../jaeger/Adapter.java | 4 +-- .../jaeger/JaegerGrpcSpanExporter.java | 14 ++++----- .../main/proto/jaeger/api_v2/collector.proto | 2 +- .../src/main/proto/jaeger/api_v2/model.proto | 2 +- .../jaeger/AdapterTest.java | 4 +-- .../jaeger/JaegerGrpcSpanExporterTest.java | 25 +++++++--------- .../jaeger/JaegerIntegrationTest.java | 2 +- exporters/logging/build.gradle | 2 +- .../logging/LoggingMetricExporter.java | 2 +- .../logging/LoggingSpanExporter.java | 2 +- .../logging/LoggingMetricExporterTest.java | 2 +- .../logging/LoggingSpanExporterTest.java | 2 +- exporters/otlp/build.gradle | 2 +- .../otlp/CommonAdapter.java | 2 +- .../otlp/CommonProperties.java | 2 +- .../otlp/MetricAdapter.java | 2 +- .../otlp/OtlpGrpcMetricExporter.java | 2 +- .../otlp/OtlpGrpcSpanExporter.java | 2 +- .../otlp/ResourceAdapter.java | 2 +- .../otlp/SpanAdapter.java | 2 +- .../otlp/package-info.java | 30 +++++++++---------- .../otlp/CommonAdapterTest.java | 2 +- .../otlp/MetricAdapterTest.java | 2 +- .../otlp/OtlpGrpcMetricExporterTest.java | 2 +- .../otlp/OtlpGrpcSpanExporterTest.java | 5 ++-- .../otlp/ResourceAdapterTest.java | 2 +- .../otlp/SpanAdapterTest.java | 2 +- exporters/prometheus/build.gradle | 2 +- .../prometheus/MetricAdapter.java | 2 +- .../prometheus/PrometheusCollector.java | 2 +- .../prometheus/MetricAdapterTest.java | 2 +- .../prometheus/PrometheusCollectorTest.java | 2 +- exporters/zipkin/build.gradle | 2 +- .../zipkin/ZipkinSpanExporter.java | 2 +- .../ZipkinSpanExporterEndToEndHttpTest.java | 2 +- .../zipkin/ZipkinSpanExporterTest.java | 2 +- .../io/opentelemetry/SendTraceToJaeger.java | 2 +- .../perf/OtlpPipelineStressTest.java | 4 +-- .../junit5/OpenTelemetryExtension.java | 2 +- 53 files changed, 87 insertions(+), 91 deletions(-) rename exporters/inmemory/src/main/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemoryMetricExporter.java (98%) rename exporters/inmemory/src/main/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemorySpanExporter.java (98%) rename exporters/inmemory/src/main/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemoryTracing.java (98%) rename exporters/inmemory/src/test/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemoryMetricExporterTest.java (98%) rename exporters/inmemory/src/test/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemorySpanExporterTest.java (98%) rename exporters/inmemory/src/test/java/io/opentelemetry/{exporters => exporter}/inmemory/InMemoryTracingTest.java (98%) rename exporters/jaeger-thrift/src/main/java/io/opentelemetry/{exporters/jaeger => exporter/jaeger/thrift}/Adapter.java (99%) rename exporters/jaeger-thrift/src/main/java/io/opentelemetry/{exporters/jaeger => exporter/jaeger/thrift}/JaegerThriftSpanExporter.java (99%) rename exporters/jaeger-thrift/src/test/java/io/opentelemetry/{exporters/jaeger => exporter/jaeger/thrift}/AdapterTest.java (99%) rename exporters/jaeger-thrift/src/test/java/io/opentelemetry/{exporters/jaeger => exporter/jaeger/thrift}/JaegerThriftIntegrationTest.java (98%) rename exporters/jaeger-thrift/src/test/java/io/opentelemetry/{exporters/jaeger => exporter/jaeger/thrift}/JaegerThriftSpanExporterTest.java (99%) rename exporters/jaeger/src/main/java/io/opentelemetry/{exporters => exporter}/jaeger/Adapter.java (98%) rename exporters/jaeger/src/main/java/io/opentelemetry/{exporters => exporter}/jaeger/JaegerGrpcSpanExporter.java (95%) rename exporters/jaeger/src/test/java/io/opentelemetry/{exporters => exporter}/jaeger/AdapterTest.java (99%) rename exporters/jaeger/src/test/java/io/opentelemetry/{exporters => exporter}/jaeger/JaegerGrpcSpanExporterTest.java (92%) rename exporters/jaeger/src/test/java/io/opentelemetry/{exporters => exporter}/jaeger/JaegerIntegrationTest.java (98%) rename exporters/logging/src/main/java/io/opentelemetry/{exporters => exporter}/logging/LoggingMetricExporter.java (96%) rename exporters/logging/src/main/java/io/opentelemetry/{exporters => exporter}/logging/LoggingSpanExporter.java (96%) rename exporters/logging/src/test/java/io/opentelemetry/{exporters => exporter}/logging/LoggingMetricExporterTest.java (98%) rename exporters/logging/src/test/java/io/opentelemetry/{exporters => exporter}/logging/LoggingSpanExporterTest.java (98%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/CommonAdapter.java (99%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/CommonProperties.java (91%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/MetricAdapter.java (99%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/OtlpGrpcMetricExporter.java (99%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/OtlpGrpcSpanExporter.java (99%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/ResourceAdapter.java (95%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/SpanAdapter.java (99%) rename exporters/otlp/src/main/java/io/opentelemetry/{exporters => exporter}/otlp/package-info.java (73%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/CommonAdapterTest.java (99%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/MetricAdapterTest.java (99%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/OtlpGrpcMetricExporterTest.java (99%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/OtlpGrpcSpanExporterTest.java (98%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/ResourceAdapterTest.java (98%) rename exporters/otlp/src/test/java/io/opentelemetry/{exporters => exporter}/otlp/SpanAdapterTest.java (99%) rename exporters/prometheus/src/main/java/io/opentelemetry/{exporters => exporter}/prometheus/MetricAdapter.java (99%) rename exporters/prometheus/src/main/java/io/opentelemetry/{exporters => exporter}/prometheus/PrometheusCollector.java (97%) rename exporters/prometheus/src/test/java/io/opentelemetry/{exporters => exporter}/prometheus/MetricAdapterTest.java (99%) rename exporters/prometheus/src/test/java/io/opentelemetry/{exporters => exporter}/prometheus/PrometheusCollectorTest.java (98%) rename exporters/zipkin/src/main/java/io/opentelemetry/{exporters => exporter}/zipkin/ZipkinSpanExporter.java (99%) rename exporters/zipkin/src/test/java/io/opentelemetry/{exporters => exporter}/zipkin/ZipkinSpanExporterEndToEndHttpTest.java (99%) rename exporters/zipkin/src/test/java/io/opentelemetry/{exporters => exporter}/zipkin/ZipkinSpanExporterTest.java (99%) diff --git a/exporters/inmemory/build.gradle b/exporters/inmemory/build.gradle index 0cdeca5446..81991d8da5 100644 --- a/exporters/inmemory/build.gradle +++ b/exporters/inmemory/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry InMemory Export' -ext.moduleName = "io.opentelemetry.exporters.inmemory" +ext.moduleName = "io.opentelemetry.exporter.inmemory" dependencies { api project(':opentelemetry-sdk') diff --git a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporter.java b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporter.java similarity index 98% rename from exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporter.java rename to exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporter.java index 8df90e39bf..840f502504 100644 --- a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporter.java +++ b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.metrics.data.MetricData; diff --git a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporter.java b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporter.java similarity index 98% rename from exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporter.java rename to exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporter.java index 5471b7c609..ca6b6dbf49 100644 --- a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporter.java +++ b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryTracing.java b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryTracing.java similarity index 98% rename from exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryTracing.java rename to exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryTracing.java index c23134325c..c0f0ffe423 100644 --- a/exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryTracing.java +++ b/exporters/inmemory/src/main/java/io/opentelemetry/exporter/inmemory/InMemoryTracing.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import com.google.auto.value.AutoValue; import io.opentelemetry.api.OpenTelemetry; diff --git a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporterTest.java b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporterTest.java similarity index 98% rename from exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporterTest.java rename to exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporterTest.java index 270ee01a04..73155c6bf3 100644 --- a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryMetricExporterTest.java +++ b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryMetricExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporterTest.java similarity index 98% rename from exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java rename to exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporterTest.java index 01f2de0597..e240d4ff25 100644 --- a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java +++ b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemorySpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryTracingTest.java b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryTracingTest.java similarity index 98% rename from exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryTracingTest.java rename to exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryTracingTest.java index d7c3d3a4a6..b1be1c9963 100644 --- a/exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemoryTracingTest.java +++ b/exporters/inmemory/src/test/java/io/opentelemetry/exporter/inmemory/InMemoryTracingTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.inmemory; +package io.opentelemetry.exporter.inmemory; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/exporters/jaeger-thrift/build.gradle b/exporters/jaeger-thrift/build.gradle index 9f09282e2d..ebe18cb4d6 100644 --- a/exporters/jaeger-thrift/build.gradle +++ b/exporters/jaeger-thrift/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry - Jaeger Thrift Exporter' -ext.moduleName = "io.opentelemetry.exporters.jaeger-thrift" +ext.moduleName = "io.opentelemetry.exporter.jaeger.thrift" dependencies { api project(':opentelemetry-sdk') diff --git a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java similarity index 99% rename from exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java rename to exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java index e745c2a6a6..fc0287b78f 100644 --- a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java +++ b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/Adapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger.thrift; import static io.opentelemetry.api.common.AttributeKey.booleanKey; diff --git a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporter.java b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporter.java similarity index 99% rename from exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporter.java rename to exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporter.java index ff0d05898b..db54f8f746 100644 --- a/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporter.java +++ b/exporters/jaeger-thrift/src/main/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger.thrift; import io.jaegertracing.internal.exceptions.SenderException; import io.jaegertracing.thrift.internal.senders.HttpSender; diff --git a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/AdapterTest.java similarity index 99% rename from exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java rename to exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/AdapterTest.java index 78540f7b95..17cc649566 100644 --- a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java +++ b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/AdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger.thrift; import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey; import static io.opentelemetry.api.common.AttributeKey.booleanKey; diff --git a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftIntegrationTest.java b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftIntegrationTest.java similarity index 98% rename from exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftIntegrationTest.java rename to exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftIntegrationTest.java index 88954a0aa8..8e8af0cdcd 100644 --- a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftIntegrationTest.java +++ b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftIntegrationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger.thrift; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterTest.java similarity index 99% rename from exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java rename to exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterTest.java index 46ae8f8b45..19f5f47563 100644 --- a/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporters/jaeger/JaegerThriftSpanExporterTest.java +++ b/exporters/jaeger-thrift/src/test/java/io/opentelemetry/exporter/jaeger/thrift/JaegerThriftSpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger.thrift; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; diff --git a/exporters/jaeger/build.gradle b/exporters/jaeger/build.gradle index 147d272a32..263098bd73 100644 --- a/exporters/jaeger/build.gradle +++ b/exporters/jaeger/build.gradle @@ -7,7 +7,7 @@ plugins { } description = 'OpenTelemetry - Jaeger Exporter' -ext.moduleName = "io.opentelemetry.exporters.jaeger" +ext.moduleName = "io.opentelemetry.exporter.jaeger" dependencies { api project(':opentelemetry-sdk'), diff --git a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/Adapter.java similarity index 98% rename from exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java rename to exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/Adapter.java index 39f9e03145..3cb7a376dd 100644 --- a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/Adapter.java +++ b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/Adapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger; import static io.opentelemetry.api.common.AttributeKey.booleanKey; @@ -15,7 +15,7 @@ import io.opentelemetry.api.common.AttributeConsumer; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.ReadableAttributes; import io.opentelemetry.api.trace.SpanId; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils; import io.opentelemetry.sdk.trace.data.SpanData; import io.opentelemetry.sdk.trace.data.SpanData.Event; diff --git a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporter.java b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporter.java similarity index 95% rename from exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporter.java rename to exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporter.java index c7509b4254..42f1f55f66 100644 --- a/exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporter.java +++ b/exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; @@ -12,12 +12,12 @@ import com.google.common.util.concurrent.MoreExecutors; import io.grpc.ConnectivityState; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Collector; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Collector.PostSpansRequest; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Collector.PostSpansResponse; -import io.opentelemetry.exporters.jaeger.proto.api_v2.CollectorServiceGrpc; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model.Process; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Collector; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Collector.PostSpansRequest; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Collector.PostSpansResponse; +import io.opentelemetry.exporter.jaeger.proto.api_v2.CollectorServiceGrpc; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Model; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Model.Process; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.export.ConfigBuilder; import io.opentelemetry.sdk.resources.Resource; diff --git a/exporters/jaeger/src/main/proto/jaeger/api_v2/collector.proto b/exporters/jaeger/src/main/proto/jaeger/api_v2/collector.proto index 520309ddf9..03d6b6be8c 100644 --- a/exporters/jaeger/src/main/proto/jaeger/api_v2/collector.proto +++ b/exporters/jaeger/src/main/proto/jaeger/api_v2/collector.proto @@ -9,7 +9,7 @@ package jaeger.api_v2; import "jaeger/api_v2/model.proto"; -option java_package = "io.opentelemetry.exporters.jaeger.proto.api_v2"; +option java_package = "io.opentelemetry.exporter.jaeger.proto.api_v2"; message PostSpansRequest { Batch batch = 1; diff --git a/exporters/jaeger/src/main/proto/jaeger/api_v2/model.proto b/exporters/jaeger/src/main/proto/jaeger/api_v2/model.proto index bf40c71e98..0d2bd21278 100644 --- a/exporters/jaeger/src/main/proto/jaeger/api_v2/model.proto +++ b/exporters/jaeger/src/main/proto/jaeger/api_v2/model.proto @@ -10,7 +10,7 @@ package jaeger.api_v2; import "google/protobuf/timestamp.proto"; import "google/protobuf/duration.proto"; -option java_package = "io.opentelemetry.exporters.jaeger.proto.api_v2"; +option java_package = "io.opentelemetry.exporter.jaeger.proto.api_v2"; enum ValueType { STRING = 0; diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/AdapterTest.java similarity index 99% rename from exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java rename to exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/AdapterTest.java index 0b551f63af..4c986ee1bb 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/AdapterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/AdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger; import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey; import static io.opentelemetry.api.common.AttributeKey.booleanKey; @@ -25,7 +25,7 @@ import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.TraceFlags; import io.opentelemetry.api.trace.TraceState; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils; import io.opentelemetry.sdk.resources.Resource; import io.opentelemetry.sdk.testing.trace.TestSpanData; diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java similarity index 92% rename from exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java rename to exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java index 74eba92e33..763465f977 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporterTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -24,12 +24,9 @@ import io.grpc.stub.StreamObserver; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.api.common.Attributes; import io.opentelemetry.api.trace.Span.Kind; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Collector; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Collector.PostSpansRequest; -import io.opentelemetry.exporters.jaeger.proto.api_v2.CollectorServiceGrpc; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model.KeyValue; -import io.opentelemetry.exporters.jaeger.proto.api_v2.Model.Span; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Collector; +import io.opentelemetry.exporter.jaeger.proto.api_v2.CollectorServiceGrpc; +import io.opentelemetry.exporter.jaeger.proto.api_v2.Model; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.InstrumentationLibraryInfo; import io.opentelemetry.sdk.common.export.ConfigBuilder; @@ -58,7 +55,7 @@ class JaegerGrpcSpanExporterTest { private static final String SPAN_ID_2 = "0000000000aef789"; private final Closer closer = Closer.create(); - private ArgumentCaptor requestCaptor; + private ArgumentCaptor requestCaptor; private JaegerGrpcSpanExporter exporter; @BeforeEach @@ -190,16 +187,16 @@ class JaegerGrpcSpanExporterTest { // verify verify(service, times(2)).postSpans(requestCaptor.capture(), ArgumentMatchers.any()); - List requests = requestCaptor.getAllValues(); + List requests = requestCaptor.getAllValues(); assertEquals(2, requests.size()); - for (PostSpansRequest request : requests) { + for (Collector.PostSpansRequest request : requests) { Model.Batch batch = request.getBatch(); verifyBatch(batch); - Optional processTag = + Optional processTag = getTagValue(batch.getProcess().getTagsList(), "resource-attr-key-1"); - Optional processTag2 = + Optional processTag2 = getTagValue(batch.getProcess().getTagsList(), "resource-attr-key-2"); if (processTag.isPresent()) { assertFalse(processTag2.isPresent()); @@ -253,11 +250,11 @@ class JaegerGrpcSpanExporterTest { .getVStr()); } - private static Optional getSpanTagValue(Span span, String tagKey) { + private static Optional getSpanTagValue(Model.Span span, String tagKey) { return getTagValue(span.getTagsList(), tagKey); } - private static Optional getTagValue(List tags, String tagKey) { + private static Optional getTagValue(List tags, String tagKey) { return tags.stream().filter(kv -> kv.getKey().equals(tagKey)).findFirst(); } diff --git a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerIntegrationTest.java b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerIntegrationTest.java similarity index 98% rename from exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerIntegrationTest.java rename to exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerIntegrationTest.java index 66e2870cd9..8ac1a80ff7 100644 --- a/exporters/jaeger/src/test/java/io/opentelemetry/exporters/jaeger/JaegerIntegrationTest.java +++ b/exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerIntegrationTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.jaeger; +package io.opentelemetry.exporter.jaeger; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/exporters/logging/build.gradle b/exporters/logging/build.gradle index e38ca34a35..3d5414bf4a 100644 --- a/exporters/logging/build.gradle +++ b/exporters/logging/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry - Logging Exporter' -ext.moduleName = "io.opentelemetry.exporters.logging" +ext.moduleName = "io.opentelemetry.exporter.logging" dependencies { api project(':opentelemetry-sdk') diff --git a/exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingMetricExporter.java b/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingMetricExporter.java similarity index 96% rename from exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingMetricExporter.java rename to exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingMetricExporter.java index 14d9da8baa..14666bf0e5 100644 --- a/exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingMetricExporter.java +++ b/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingMetricExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.logging; +package io.opentelemetry.exporter.logging; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.metrics.data.MetricData; diff --git a/exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingSpanExporter.java b/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingSpanExporter.java similarity index 96% rename from exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingSpanExporter.java rename to exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingSpanExporter.java index 07df53523b..a7b927b872 100644 --- a/exporters/logging/src/main/java/io/opentelemetry/exporters/logging/LoggingSpanExporter.java +++ b/exporters/logging/src/main/java/io/opentelemetry/exporter/logging/LoggingSpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.logging; +package io.opentelemetry.exporter.logging; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.trace.data.SpanData; diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java similarity index 98% rename from exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java rename to exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java index e10a768c5b..5cde8c18f5 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingMetricExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingMetricExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.logging; +package io.opentelemetry.exporter.logging; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingSpanExporterTest.java similarity index 98% rename from exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java rename to exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingSpanExporterTest.java index ac9dfd3901..b98574c34b 100644 --- a/exporters/logging/src/test/java/io/opentelemetry/exporters/logging/LoggingSpanExporterTest.java +++ b/exporters/logging/src/test/java/io/opentelemetry/exporter/logging/LoggingSpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.logging; +package io.opentelemetry.exporter.logging; import static io.opentelemetry.api.common.AttributeKey.booleanKey; import static java.util.Collections.singletonList; diff --git a/exporters/otlp/build.gradle b/exporters/otlp/build.gradle index c93c8844a6..735215f216 100644 --- a/exporters/otlp/build.gradle +++ b/exporters/otlp/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry Protocol Exporter' -ext.moduleName = "io.opentelemetry.exporters.otlp" +ext.moduleName = "io.opentelemetry.exporter.otlp" dependencies { api project(':opentelemetry-sdk') diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonAdapter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonAdapter.java similarity index 99% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonAdapter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonAdapter.java index c3888899d6..44fd40eb19 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonAdapter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import io.opentelemetry.api.common.AttributeKey; import io.opentelemetry.proto.common.v1.AnyValue; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonProperties.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonProperties.java similarity index 91% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonProperties.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonProperties.java index 0c97ae7dda..a6136bf17a 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/CommonProperties.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/CommonProperties.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; public class CommonProperties { public static final String KEY_TIMEOUT = "otel.exporter.otlp.timeout"; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/MetricAdapter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/MetricAdapter.java similarity index 99% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/MetricAdapter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/MetricAdapter.java index 1b45eff89e..104a8380bb 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/MetricAdapter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/MetricAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE; import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_DELTA; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporter.java similarity index 99% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporter.java index 5dcdce0960..cd5ef94f6f 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.grpc.Metadata.ASCII_STRING_MARSHALLER; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporter.java similarity index 99% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporter.java index 1bad6ddeb7..7fe22f9016 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.grpc.Metadata.ASCII_STRING_MARSHALLER; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/ResourceAdapter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/ResourceAdapter.java similarity index 95% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/ResourceAdapter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/ResourceAdapter.java index 1bc84ed966..d6a6e9a015 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/ResourceAdapter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/ResourceAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import io.opentelemetry.api.common.AttributeConsumer; import io.opentelemetry.api.common.AttributeKey; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/SpanAdapter.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/SpanAdapter.java similarity index 99% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/SpanAdapter.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/SpanAdapter.java index 09833109fe..7b27e379c8 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/SpanAdapter.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/SpanAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.proto.trace.v1.Span.SpanKind.SPAN_KIND_CLIENT; import static io.opentelemetry.proto.trace.v1.Span.SpanKind.SPAN_KIND_CONSUMER; diff --git a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/package-info.java b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/package-info.java similarity index 73% rename from exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/package-info.java rename to exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/package-info.java index a98e68d847..422396dc4f 100644 --- a/exporters/otlp/src/main/java/io/opentelemetry/exporters/otlp/package-info.java +++ b/exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/package-info.java @@ -9,22 +9,22 @@ *

Contents

* *
    - *
  • {@link io.opentelemetry.exporters.otlp.CommonAdapter} - *
  • {@link io.opentelemetry.exporters.otlp.MetricAdapter} - *
  • {@link io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter} - *
  • {@link io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter} - *
  • {@link io.opentelemetry.exporters.otlp.ResourceAdapter} - *
  • {@link io.opentelemetry.exporters.otlp.SpanAdapter} + *
  • {@link io.opentelemetry.exporter.otlp.CommonAdapter} + *
  • {@link io.opentelemetry.exporter.otlp.MetricAdapter} + *
  • {@link io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter} + *
  • {@link io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter} + *
  • {@link io.opentelemetry.exporter.otlp.ResourceAdapter} + *
  • {@link io.opentelemetry.exporter.otlp.SpanAdapter} *
* - *

Configuration options for {@link io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter} and - * {@link io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter} can be read from system properties, + *

Configuration options for {@link io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter} and + * {@link io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter} can be read from system properties, * environment variables, or {@link java.util.Properties} objects. * - *

{@link io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter}

+ *

{@link io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter}

* *

For system properties and {@link java.util.Properties} objects, {@link - * io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter} will look for the following names: + * io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter} will look for the following names: * *

    *
  • {@code otel.exporter.otlp.metric.timeout}: to set the max waiting time allowed to send each @@ -35,7 +35,7 @@ *
  • {@code otel.exporter.otlp.metric.headers}: the headers associated with the requests. *
* - *

For environment variables, {@link io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporter} will + *

For environment variables, {@link io.opentelemetry.exporter.otlp.OtlpGrpcMetricExporter} will * look for the following names: * *

    @@ -49,10 +49,10 @@ * * In both cases, if a property is missing, the name without "metric" is used to resolve the value. * - *

    {@link io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter}

    + *

    {@link io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter}

    * *

    For system properties and {@link java.util.Properties} objects, {@link - * io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter} will look for the following names: + * io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter} will look for the following names: * *

      *
    • {@code otel.exporter.otlp.span.timeout}: to set the max waiting time allowed to send each @@ -63,7 +63,7 @@ *
    • {@code otel.exporter.otlp.span.headers}: the headers associated with the requests. *
    * - *

    For environment variables, {@link io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter} will + *

    For environment variables, {@link io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter} will * look for the following names: * *

      @@ -77,4 +77,4 @@ * * In both cases, if a property is missing, the name without "span" is used to resolve the value. */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/CommonAdapterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/CommonAdapterTest.java similarity index 99% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/CommonAdapterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/CommonAdapterTest.java index 10e279dded..ceef8c2de1 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/CommonAdapterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/CommonAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey; import static io.opentelemetry.api.common.AttributeKey.booleanKey; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/MetricAdapterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/MetricAdapterTest.java similarity index 99% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/MetricAdapterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/MetricAdapterTest.java index 70a8f4584e..fffc890517 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/MetricAdapterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/MetricAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static io.opentelemetry.proto.metrics.v1.AggregationTemporality.AGGREGATION_TEMPORALITY_CUMULATIVE; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporterTest.java similarity index 99% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporterTest.java index d84dbf53f2..d4a482c324 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcMetricExporterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcMetricExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporterTest.java similarity index 98% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporterTest.java index 00b5e7b311..56e4dbca87 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/OtlpGrpcSpanExporterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/OtlpGrpcSpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -17,7 +17,6 @@ import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; import io.opentelemetry.api.trace.Span.Kind; -import io.opentelemetry.exporters.otlp.OtlpGrpcMetricExporterTest.ConfigBuilderTest; import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest; import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceResponse; import io.opentelemetry.proto.collector.trace.v1.TraceServiceGrpc; @@ -59,7 +58,7 @@ class OtlpGrpcSpanExporterTest { "key=value;key2=value2=;key3=val=ue3; key4 = value4 ;key5= "); OtlpGrpcSpanExporter.Builder config = OtlpGrpcSpanExporter.builder(); OtlpGrpcSpanExporter.Builder spy = Mockito.spy(config); - spy.fromConfigMap(options, ConfigBuilderTest.getNaming()); + spy.fromConfigMap(options, OtlpGrpcMetricExporterTest.ConfigBuilderTest.getNaming()); Mockito.verify(spy).setDeadlineMs(12); Mockito.verify(spy).setEndpoint("http://localhost:6553"); Mockito.verify(spy).setUseTls(false); diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/ResourceAdapterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/ResourceAdapterTest.java similarity index 98% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/ResourceAdapterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/ResourceAdapterTest.java index ac613178df..f1c2b6dd3b 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/ResourceAdapterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/ResourceAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.api.common.AttributeKey.booleanKey; import static io.opentelemetry.api.common.AttributeKey.doubleKey; diff --git a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/SpanAdapterTest.java similarity index 99% rename from exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java rename to exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/SpanAdapterTest.java index 2a4cbabe82..f0637171e6 100644 --- a/exporters/otlp/src/test/java/io/opentelemetry/exporters/otlp/SpanAdapterTest.java +++ b/exporters/otlp/src/test/java/io/opentelemetry/exporter/otlp/SpanAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.otlp; +package io.opentelemetry.exporter.otlp; import static io.opentelemetry.api.common.AttributeKey.booleanKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; diff --git a/exporters/prometheus/build.gradle b/exporters/prometheus/build.gradle index 4088b9c42e..ee948e86f6 100644 --- a/exporters/prometheus/build.gradle +++ b/exporters/prometheus/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry Prometheus Exporter' -ext.moduleName = "io.opentelemetry.exporters.prometheus" +ext.moduleName = "io.opentelemetry.exporter.prometheus" dependencies { api project(':opentelemetry-sdk') diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java similarity index 99% rename from exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java rename to exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java index f134527111..78faba5cdd 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/MetricAdapter.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/MetricAdapter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.prometheus; +package io.opentelemetry.exporter.prometheus; import static io.prometheus.client.Collector.doubleToGoString; diff --git a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/PrometheusCollector.java b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusCollector.java similarity index 97% rename from exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/PrometheusCollector.java rename to exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusCollector.java index a21ee80090..0ef1886751 100644 --- a/exporters/prometheus/src/main/java/io/opentelemetry/exporters/prometheus/PrometheusCollector.java +++ b/exporters/prometheus/src/main/java/io/opentelemetry/exporter/prometheus/PrometheusCollector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.prometheus; +package io.opentelemetry.exporter.prometheus; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.export.MetricProducer; diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/MetricAdapterTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java similarity index 99% rename from exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/MetricAdapterTest.java rename to exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java index a161be9fbb..da11b9e409 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/MetricAdapterTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/MetricAdapterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.prometheus; +package io.opentelemetry.exporter.prometheus; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/PrometheusCollectorTest.java b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java similarity index 98% rename from exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/PrometheusCollectorTest.java rename to exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java index 4cffbb59d8..3a4bebef38 100644 --- a/exporters/prometheus/src/test/java/io/opentelemetry/exporters/prometheus/PrometheusCollectorTest.java +++ b/exporters/prometheus/src/test/java/io/opentelemetry/exporter/prometheus/PrometheusCollectorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.prometheus; +package io.opentelemetry.exporter.prometheus; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/zipkin/build.gradle b/exporters/zipkin/build.gradle index 9b99dae7d2..99a7290912 100644 --- a/exporters/zipkin/build.gradle +++ b/exporters/zipkin/build.gradle @@ -6,7 +6,7 @@ plugins { } description = 'OpenTelemetry - Zipkin Exporter' -ext.moduleName = "io.opentelemetry.exporters.zipkin" +ext.moduleName = "io.opentelemetry.exporter.zipkin" dependencies { compileOnly libraries.auto_value diff --git a/exporters/zipkin/src/main/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporter.java b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java similarity index 99% rename from exporters/zipkin/src/main/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporter.java rename to exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java index bd0c7d4bbb..250874bea8 100644 --- a/exporters/zipkin/src/main/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporter.java +++ b/exporters/zipkin/src/main/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporter.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.zipkin; +package io.opentelemetry.exporter.zipkin; import static io.opentelemetry.api.common.AttributeKey.stringKey; import static java.util.concurrent.TimeUnit.NANOSECONDS; diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java similarity index 99% rename from exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java rename to exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java index 7bc9e80847..a8d51ed3dd 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterEndToEndHttpTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterEndToEndHttpTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.zipkin; +package io.opentelemetry.exporter.zipkin; import static org.assertj.core.api.Assertions.assertThat; diff --git a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java similarity index 99% rename from exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java rename to exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java index 46e1920f86..cf2c958e63 100644 --- a/exporters/zipkin/src/test/java/io/opentelemetry/exporters/zipkin/ZipkinSpanExporterTest.java +++ b/exporters/zipkin/src/test/java/io/opentelemetry/exporter/zipkin/ZipkinSpanExporterTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.exporters.zipkin; +package io.opentelemetry.exporter.zipkin; import static io.opentelemetry.api.common.AttributeKey.booleanArrayKey; import static io.opentelemetry.api.common.AttributeKey.booleanKey; diff --git a/integration-tests/src/main/java/io/opentelemetry/SendTraceToJaeger.java b/integration-tests/src/main/java/io/opentelemetry/SendTraceToJaeger.java index 32d569618f..4d2c34986d 100644 --- a/integration-tests/src/main/java/io/opentelemetry/SendTraceToJaeger.java +++ b/integration-tests/src/main/java/io/opentelemetry/SendTraceToJaeger.java @@ -10,7 +10,7 @@ import io.grpc.ManagedChannelBuilder; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; -import io.opentelemetry.exporters.jaeger.JaegerGrpcSpanExporter; +import io.opentelemetry.exporter.jaeger.JaegerGrpcSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor; diff --git a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java index b5af16dd1b..71dfe080b6 100644 --- a/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java +++ b/perf-harness/src/test/java/io/opentelemetry/perf/OtlpPipelineStressTest.java @@ -15,8 +15,8 @@ import io.opentelemetry.api.common.Labels; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Tracer; import io.opentelemetry.context.Scope; -import io.opentelemetry.exporters.inmemory.InMemoryMetricExporter; -import io.opentelemetry.exporters.otlp.OtlpGrpcSpanExporter; +import io.opentelemetry.exporter.inmemory.InMemoryMetricExporter; +import io.opentelemetry.exporter.otlp.OtlpGrpcSpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.metrics.data.MetricData; import io.opentelemetry.sdk.metrics.data.MetricData.LongPoint; diff --git a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java index fe9daa6e85..08e397060c 100644 --- a/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java +++ b/sdk/testing/src/main/java/io/opentelemetry/sdk/testing/junit5/OpenTelemetryExtension.java @@ -8,7 +8,7 @@ package io.opentelemetry.sdk.testing.junit5; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.trace.propagation.HttpTraceContext; import io.opentelemetry.context.propagation.DefaultContextPropagators; -import io.opentelemetry.exporters.inmemory.InMemorySpanExporter; +import io.opentelemetry.exporter.inmemory.InMemorySpanExporter; import io.opentelemetry.sdk.OpenTelemetrySdk; import io.opentelemetry.sdk.trace.TracerSdkManagement; import io.opentelemetry.sdk.trace.TracerSdkProvider;