diff --git a/QUICKSTART.md b/QUICKSTART.md index d4a4ae6e133..7a86b09cbad 100644 --- a/QUICKSTART.md +++ b/QUICKSTART.md @@ -500,5 +500,5 @@ public class IgnoreExportErrorsFilter implements Filter { ```properties ## Registering the custom filter on the BatchSpanProcessor -io.opentelemetry.sdk.trace.export.BatchSpanProcessor = io.opentelemetry.extensions.logging.IgnoreExportErrorsFilter +io.opentelemetry.sdk.trace.export.BatchSpanProcessor = io.opentelemetry.extension.logging.IgnoreExportErrorsFilter ``` diff --git a/extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/WithSpan.java b/extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/WithSpan.java similarity index 96% rename from extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/WithSpan.java rename to extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/WithSpan.java index 0a44b7b3d2b..8d64e576225 100644 --- a/extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/WithSpan.java +++ b/extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/WithSpan.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.auto.annotations; +package io.opentelemetry.extension.auto.annotations; import io.opentelemetry.api.trace.Span.Kind; import java.lang.annotation.ElementType; diff --git a/extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/package-info.java b/extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/package-info.java similarity index 93% rename from extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/package-info.java rename to extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/package-info.java index 788bc881ce0..b4c9f68ca37 100644 --- a/extensions/auto-annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/package-info.java +++ b/extensions/auto-annotations/src/main/java/io/opentelemetry/extension/auto/annotations/package-info.java @@ -14,6 +14,6 @@ * You cannot guarantee that users of your library will use that in their production system. */ @ParametersAreNonnullByDefault -package io.opentelemetry.extensions.auto.annotations; +package io.opentelemetry.extension.auto.annotations; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/extensions/auto-annotations/src/test/java/io/opentelemetry/extensions/auto/annotations/WithSpanUsageExamples.java b/extensions/auto-annotations/src/test/java/io/opentelemetry/extension/auto/annotations/WithSpanUsageExamples.java similarity index 95% rename from extensions/auto-annotations/src/test/java/io/opentelemetry/extensions/auto/annotations/WithSpanUsageExamples.java rename to extensions/auto-annotations/src/test/java/io/opentelemetry/extension/auto/annotations/WithSpanUsageExamples.java index 5db7ef71ccd..6ccc4409816 100644 --- a/extensions/auto-annotations/src/test/java/io/opentelemetry/extensions/auto/annotations/WithSpanUsageExamples.java +++ b/extensions/auto-annotations/src/test/java/io/opentelemetry/extension/auto/annotations/WithSpanUsageExamples.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.auto.annotations; +package io.opentelemetry.extension.auto.annotations; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.Span.Kind; diff --git a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/GarbageCollector.java b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/GarbageCollector.java similarity index 93% rename from extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/GarbageCollector.java rename to extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/GarbageCollector.java index 79d2b5069c1..d36cd6c23bc 100644 --- a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/GarbageCollector.java +++ b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/GarbageCollector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.metrics.runtime; +package io.opentelemetry.extension.metrics.runtime; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Labels; @@ -40,7 +40,7 @@ public final class GarbageCollector { /** Constructs a new module that will export metrics in the "runtime.jvm.gc" namespace. */ public GarbageCollector() { this.garbageCollectors = ManagementFactory.getGarbageCollectorMXBeans(); - this.meter = OpenTelemetry.getGlobalMeter("io.opentelemetry.extensions.metrics.runtime.gc"); + this.meter = OpenTelemetry.getGlobalMeter(GarbageCollector.class.getName()); } /** Export all metrics generated by this module. */ diff --git a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/MemoryPools.java b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/MemoryPools.java similarity index 97% rename from extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/MemoryPools.java rename to extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/MemoryPools.java index 9219d3396aa..911c0f881ed 100644 --- a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/MemoryPools.java +++ b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/MemoryPools.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.metrics.runtime; +package io.opentelemetry.extension.metrics.runtime; import io.opentelemetry.api.OpenTelemetry; import io.opentelemetry.api.common.Labels; @@ -53,7 +53,7 @@ public final class MemoryPools { public MemoryPools() { this.memoryBean = ManagementFactory.getMemoryMXBean(); this.poolBeans = ManagementFactory.getMemoryPoolMXBeans(); - this.meter = OpenTelemetry.getGlobalMeter("io.opentelemetry.extensions.metrics.runtime.memory"); + this.meter = OpenTelemetry.getGlobalMeter(MemoryPools.class.getName()); } /** Export only the "area" metric. */ diff --git a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/package-info.java b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/package-info.java similarity index 80% rename from extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/package-info.java rename to extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/package-info.java index 6626d570a85..247be30f27c 100644 --- a/extensions/runtime-metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/package-info.java +++ b/extensions/runtime-metrics/src/main/java/io/opentelemetry/extension/metrics/runtime/package-info.java @@ -5,6 +5,6 @@ /** Metric collection for the JVM runtime. */ @ParametersAreNonnullByDefault -package io.opentelemetry.extensions.metrics.runtime; +package io.opentelemetry.extension.metrics.runtime; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextExtractBenchmark.java b/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextExtractBenchmark.java similarity index 99% rename from extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextExtractBenchmark.java rename to extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextExtractBenchmark.java index 81e21c2e902..505400e28f5 100644 --- a/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextExtractBenchmark.java +++ b/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextExtractBenchmark.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; diff --git a/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextInjectBenchmark.java b/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextInjectBenchmark.java similarity index 98% rename from extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextInjectBenchmark.java rename to extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextInjectBenchmark.java index dffa1f312ed..f2c3e9664d2 100644 --- a/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextInjectBenchmark.java +++ b/extensions/trace-propagators/src/jmh/java/io/opentelemetry/extension/trace/propagation/PropagatorContextInjectBenchmark.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagator.java similarity index 99% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagator.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagator.java index ca65cfcd513..7533ff67a54 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3Propagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java similarity index 98% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3Propagator.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java index 46be9ca1357..3b257066f0b 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3Propagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3Propagator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapPropagator; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractor.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractor.java similarity index 88% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractor.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractor.java index 819a04d3b16..6e1ea61e344 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractor.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractor.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapPropagator; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorMultipleHeaders.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorMultipleHeaders.java similarity index 85% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorMultipleHeaders.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorMultipleHeaders.java index ad67daa1951..8d074719681 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorMultipleHeaders.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorMultipleHeaders.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; -import static io.opentelemetry.extensions.trace.propagation.B3Propagator.SAMPLED_HEADER; -import static io.opentelemetry.extensions.trace.propagation.B3Propagator.SPAN_ID_HEADER; -import static io.opentelemetry.extensions.trace.propagation.B3Propagator.TRACE_ID_HEADER; +import static io.opentelemetry.extension.trace.propagation.B3Propagator.SAMPLED_HEADER; +import static io.opentelemetry.extension.trace.propagation.B3Propagator.SPAN_ID_HEADER; +import static io.opentelemetry.extension.trace.propagation.B3Propagator.TRACE_ID_HEADER; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorSingleHeader.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorSingleHeader.java similarity index 90% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorSingleHeader.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorSingleHeader.java index 524a8f29dbf..07bd090eec0 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorSingleHeader.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorExtractorSingleHeader.java @@ -3,10 +3,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; -import static io.opentelemetry.extensions.trace.propagation.B3Propagator.COMBINED_HEADER; -import static io.opentelemetry.extensions.trace.propagation.B3Propagator.COMBINED_HEADER_DELIMITER; +import static io.opentelemetry.extension.trace.propagation.B3Propagator.COMBINED_HEADER; +import static io.opentelemetry.extension.trace.propagation.B3Propagator.COMBINED_HEADER_DELIMITER; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjector.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjector.java similarity index 86% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjector.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjector.java index ac24bc027bb..f09d801168c 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjector.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjector.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.context.Context; import io.opentelemetry.context.propagation.TextMapPropagator; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorMultipleHeaders.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java similarity index 95% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorMultipleHeaders.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java index 6a526ddf86c..f1451118b1c 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorMultipleHeaders.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorMultipleHeaders.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorSingleHeader.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java similarity index 97% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorSingleHeader.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java index d55fdeff910..465ba2b54c8 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorSingleHeader.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/B3PropagatorInjectorSingleHeader.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/Common.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/Common.java similarity index 97% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/Common.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/Common.java index 6b8bf54f6ca..aded602ff0c 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/Common.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/Common.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.SpanContext; import io.opentelemetry.api.trace.SpanId; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java similarity index 99% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagator.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java index 7f64ce6066f..1265151e468 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/JaegerPropagator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java similarity index 95% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagator.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java index dab6529f9c6..9b3df451e64 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagator.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; -import static io.opentelemetry.extensions.trace.propagation.Common.MAX_TRACE_ID_LENGTH; +import static io.opentelemetry.extension.trace.propagation.Common.MAX_TRACE_ID_LENGTH; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.SpanContext; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/StringUtils.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/StringUtils.java similarity index 97% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/StringUtils.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/StringUtils.java index bc8f713e66f..64c7793dfa2 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/StringUtils.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/StringUtils.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import java.util.Objects; import javax.annotation.concurrent.Immutable; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagator.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagator.java similarity index 99% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagator.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagator.java index 9f78d15f708..e7d8e8feea3 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagator.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagator.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import io.opentelemetry.api.trace.Span; import io.opentelemetry.context.Context; diff --git a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/package-info.java b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/package-info.java similarity index 85% rename from extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/package-info.java rename to extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/package-info.java index 9d57ad422af..c5494a029ab 100644 --- a/extensions/trace-propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/package-info.java +++ b/extensions/trace-propagators/src/main/java/io/opentelemetry/extension/trace/propagation/package-info.java @@ -8,6 +8,6 @@ * formats that are commonly used in distributed tracing. */ @ParametersAreNonnullByDefault -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagatorTest.java similarity index 98% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagatorTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagatorTest.java index fe915d1c6bd..6d11395f76a 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/AwsXRayPropagatorTest.java @@ -3,9 +3,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; -import static io.opentelemetry.extensions.trace.propagation.AwsXRayPropagator.TRACE_HEADER_KEY; +import static io.opentelemetry.extension.trace.propagation.AwsXRayPropagator.TRACE_HEADER_KEY; import static org.assertj.core.api.Assertions.assertThat; import io.opentelemetry.api.trace.Span; diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java similarity index 99% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java index c0d95f9e21f..1084da26928 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/B3PropagatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/JaegerPropagatorTest.java similarity index 96% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagatorTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/JaegerPropagatorTest.java index b3e99ddbcad..19ee5244827 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/JaegerPropagatorTest.java @@ -3,11 +3,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; -import static io.opentelemetry.extensions.trace.propagation.JaegerPropagator.DEPRECATED_PARENT_SPAN; -import static io.opentelemetry.extensions.trace.propagation.JaegerPropagator.PROPAGATION_HEADER; -import static io.opentelemetry.extensions.trace.propagation.JaegerPropagator.PROPAGATION_HEADER_DELIMITER; +import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.DEPRECATED_PARENT_SPAN; +import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER; +import static io.opentelemetry.extension.trace.propagation.JaegerPropagator.PROPAGATION_HEADER_DELIMITER; import static org.assertj.core.api.Assertions.assertThat; import io.jaegertracing.internal.JaegerSpanContext; @@ -29,7 +29,7 @@ import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -/** Unit tests for {@link io.opentelemetry.extensions.trace.propagation.JaegerPropagator}. */ +/** Unit tests for {@link io.opentelemetry.extension.trace.propagation.JaegerPropagator}. */ class JaegerPropagatorTest { private static final TraceState TRACE_STATE_DEFAULT = TraceState.builder().build(); diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagatorTest.java similarity index 99% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagatorTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagatorTest.java index d07bb51f4d0..c0a9ce278d2 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/OtTracerPropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/OtTracerPropagatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import static org.assertj.core.api.Assertions.assertThat; diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/StringUtilsTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/StringUtilsTest.java similarity index 95% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/StringUtilsTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/StringUtilsTest.java index 4a6f1395a7d..120f87d10d3 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/StringUtilsTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/StringUtilsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagatorTest.java b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagatorTest.java similarity index 99% rename from extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagatorTest.java rename to extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagatorTest.java index c486194ef52..0908795a5bb 100644 --- a/extensions/trace-propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/TraceMultiPropagatorTest.java +++ b/extensions/trace-propagators/src/test/java/io/opentelemetry/extension/trace/propagation/TraceMultiPropagatorTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace.propagation; +package io.opentelemetry.extension.trace.propagation; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/CurrentSpanUtils.java b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/CurrentSpanUtils.java similarity index 98% rename from extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/CurrentSpanUtils.java rename to extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/CurrentSpanUtils.java index f2266af323e..ad2215c6c4d 100644 --- a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/CurrentSpanUtils.java +++ b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/CurrentSpanUtils.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace; +package io.opentelemetry.extension.trace; import io.opentelemetry.api.trace.Span; import io.opentelemetry.api.trace.StatusCode; diff --git a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/MessageEvent.java b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/MessageEvent.java similarity index 98% rename from extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/MessageEvent.java rename to extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/MessageEvent.java index 964c00d9594..7d7cbf89b95 100644 --- a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/MessageEvent.java +++ b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/MessageEvent.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace; +package io.opentelemetry.extension.trace; import static io.opentelemetry.api.common.AttributeKey.longKey; import static io.opentelemetry.api.common.AttributeKey.stringKey; diff --git a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/package-info.java b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/package-info.java similarity index 84% rename from extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/package-info.java rename to extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/package-info.java index 9b017fce463..fba2f170333 100644 --- a/extensions/trace-utils/src/main/java/io/opentelemetry/extensions/trace/package-info.java +++ b/extensions/trace-utils/src/main/java/io/opentelemetry/extension/trace/package-info.java @@ -5,6 +5,6 @@ /** Experimental utilities for working with tracing APIs. */ @ParametersAreNonnullByDefault -package io.opentelemetry.extensions.trace; +package io.opentelemetry.extension.trace; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/extensions/trace-utils/src/test/java/io/opentelemetry/extensions/trace/CurrentSpanUtilsTest.java b/extensions/trace-utils/src/test/java/io/opentelemetry/extension/trace/CurrentSpanUtilsTest.java similarity index 99% rename from extensions/trace-utils/src/test/java/io/opentelemetry/extensions/trace/CurrentSpanUtilsTest.java rename to extensions/trace-utils/src/test/java/io/opentelemetry/extension/trace/CurrentSpanUtilsTest.java index 96ac31f3cb4..a9da39cc1e9 100644 --- a/extensions/trace-utils/src/test/java/io/opentelemetry/extensions/trace/CurrentSpanUtilsTest.java +++ b/extensions/trace-utils/src/test/java/io/opentelemetry/extension/trace/CurrentSpanUtilsTest.java @@ -3,7 +3,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package io.opentelemetry.extensions.trace; +package io.opentelemetry.extension.trace; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.never;