Rename package name for extensions to singular extension (#1995)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Nov 4, 2020 · 3014bb7 · 3014bb7
1 parent 139fcf2
commit 3014bb7
Show file tree

Hide file tree

Showing 33 changed files with 46 additions and 46 deletions.
diff --git 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/WithSpan.java → .../extension/auto/annotations/WithSpan.java b/...extensions/auto/annotations/WithSpan.java → .../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/...nsions/auto/annotations/package-info.java → ...ension/auto/annotations/package-info.java b/...nsions/auto/annotations/package-info.java → ...ension/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/...to/annotations/WithSpanUsageExamples.java → ...to/annotations/WithSpanUsageExamples.java b/...to/annotations/WithSpanUsageExamples.java → ...to/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/...ons/metrics/runtime/GarbageCollector.java → ...ion/metrics/runtime/GarbageCollector.java b/...ons/metrics/runtime/GarbageCollector.java → ...ion/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/...tensions/metrics/runtime/MemoryPools.java → ...xtension/metrics/runtime/MemoryPools.java b/...tensions/metrics/runtime/MemoryPools.java → ...xtension/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/...ensions/metrics/runtime/package-info.java → ...tension/metrics/runtime/package-info.java b/...ensions/metrics/runtime/package-info.java → ...tension/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/...on/PropagatorContextExtractBenchmark.java → ...on/PropagatorContextExtractBenchmark.java b/...on/PropagatorContextExtractBenchmark.java → ...on/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/...ion/PropagatorContextInjectBenchmark.java → ...ion/PropagatorContextInjectBenchmark.java b/...ion/PropagatorContextInjectBenchmark.java → ...ion/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/.../trace/propagation/AwsXRayPropagator.java → .../trace/propagation/AwsXRayPropagator.java b/.../trace/propagation/AwsXRayPropagator.java → .../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/...sions/trace/propagation/B3Propagator.java → ...nsion/trace/propagation/B3Propagator.java b/...sions/trace/propagation/B3Propagator.java → ...nsion/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/...ce/propagation/B3PropagatorExtractor.java → ...ce/propagation/B3PropagatorExtractor.java b/...ce/propagation/B3PropagatorExtractor.java → ...ce/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/...B3PropagatorExtractorMultipleHeaders.java → ...B3PropagatorExtractorMultipleHeaders.java b/...B3PropagatorExtractorMultipleHeaders.java → ...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/...on/B3PropagatorExtractorSingleHeader.java → ...on/B3PropagatorExtractorSingleHeader.java b/...on/B3PropagatorExtractorSingleHeader.java → ...on/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/...ace/propagation/B3PropagatorInjector.java → ...ace/propagation/B3PropagatorInjector.java b/...ace/propagation/B3PropagatorInjector.java → ...ace/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/.../B3PropagatorInjectorMultipleHeaders.java → .../B3PropagatorInjectorMultipleHeaders.java b/.../B3PropagatorInjectorMultipleHeaders.java → .../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/...ion/B3PropagatorInjectorSingleHeader.java → ...ion/B3PropagatorInjectorSingleHeader.java b/...ion/B3PropagatorInjectorSingleHeader.java → ...ion/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/propagation/Common.java → ...y/extension/trace/propagation/Common.java b/.../extensions/trace/propagation/Common.java → ...y/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/...s/trace/propagation/JaegerPropagator.java → ...n/trace/propagation/JaegerPropagator.java b/...s/trace/propagation/JaegerPropagator.java → ...n/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/...trace/propagation/OtTracerPropagator.java → ...trace/propagation/OtTracerPropagator.java b/...trace/propagation/OtTracerPropagator.java → ...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/...nsions/trace/propagation/StringUtils.java → ...ension/trace/propagation/StringUtils.java b/...nsions/trace/propagation/StringUtils.java → ...ension/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/...ace/propagation/TraceMultiPropagator.java → ...ace/propagation/TraceMultiPropagator.java b/...ace/propagation/TraceMultiPropagator.java → ...ace/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/...sions/trace/propagation/package-info.java → ...nsion/trace/propagation/package-info.java b/...sions/trace/propagation/package-info.java → ...nsion/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/...ce/propagation/AwsXRayPropagatorTest.java → ...ce/propagation/AwsXRayPropagatorTest.java b/...ce/propagation/AwsXRayPropagatorTest.java → ...ce/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/...s/trace/propagation/B3PropagatorTest.java → ...n/trace/propagation/B3PropagatorTest.java b/...s/trace/propagation/B3PropagatorTest.java → ...n/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/...ace/propagation/JaegerPropagatorTest.java → ...ace/propagation/JaegerPropagatorTest.java b/...ace/propagation/JaegerPropagatorTest.java → ...ace/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/...e/propagation/OtTracerPropagatorTest.java → ...e/propagation/OtTracerPropagatorTest.java b/...e/propagation/OtTracerPropagatorTest.java → ...e/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/...ns/trace/propagation/StringUtilsTest.java → ...on/trace/propagation/StringUtilsTest.java b/...ns/trace/propagation/StringUtilsTest.java → ...on/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/...propagation/TraceMultiPropagatorTest.java → ...propagation/TraceMultiPropagatorTest.java b/...propagation/TraceMultiPropagatorTest.java → ...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/...ry/extensions/trace/CurrentSpanUtils.java → ...try/extension/trace/CurrentSpanUtils.java b/...ry/extensions/trace/CurrentSpanUtils.java → ...try/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/...emetry/extensions/trace/MessageEvent.java → ...lemetry/extension/trace/MessageEvent.java b/...emetry/extensions/trace/MessageEvent.java → ...lemetry/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/...emetry/extensions/trace/package-info.java → ...lemetry/extension/trace/package-info.java b/...emetry/extensions/trace/package-info.java → ...lemetry/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/...xtensions/trace/CurrentSpanUtilsTest.java → ...extension/trace/CurrentSpanUtilsTest.java b/...xtensions/trace/CurrentSpanUtilsTest.java → ...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;