Rename package name for sdk extensions to singular extension (#2002)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>

exporters/jaeger/src/main/java/io/opentelemetry/exporter/jaeger/Adapter.java

@@ -16,7 +16,7 @@ import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.ReadableAttributes;
 import io.opentelemetry.api.trace.SpanId;
 import io.opentelemetry.exporter.jaeger.proto.api_v2.Model;
-import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extension.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.SpanData.Event;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;

exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/AdapterTest.java

@@ -26,7 +26,7 @@ import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.TraceFlags;
 import io.opentelemetry.api.trace.TraceState;
 import io.opentelemetry.exporter.jaeger.proto.api_v2.Model;
-import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extension.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.testing.trace.TestSpanData;
 import io.opentelemetry.sdk.trace.data.SpanData;

exporters/jaeger/src/test/java/io/opentelemetry/exporter/jaeger/JaegerGrpcSpanExporterTest.java

@@ -30,7 +30,7 @@ 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;
-import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extension.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.testing.trace.TestSpanData;
 import io.opentelemetry.sdk.trace.data.SpanData;

exporters/otlp/src/main/java/io/opentelemetry/exporter/otlp/SpanAdapter.java

@@ -25,7 +25,7 @@ import io.opentelemetry.proto.trace.v1.Span;
 import io.opentelemetry.proto.trace.v1.Span.SpanKind;
 import io.opentelemetry.proto.trace.v1.Status;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extension.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.SpanData.Event;

sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.export;
+package io.opentelemetry.sdk.extension.trace.export;
 
 import com.google.common.base.Preconditions;
 import com.lmax.disruptor.SleepingWaitStrategy;

sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/DisruptorEventQueue.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.export;
+package io.opentelemetry.sdk.extension.trace.export;
 
 import com.lmax.disruptor.EventFactory;
 import com.lmax.disruptor.EventHandler;

sdk-extensions/async-processor/src/main/java/io/opentelemetry/sdk/extension/trace/export/package-info.java

@@ -8,6 +8,6 @@
  * for processing exported spans.
  */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.trace.export;
+package io.opentelemetry.sdk.extension.trace.export;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/async-processor/src/test/java/io/opentelemetry/sdk/extension/trace/export/DisruptorAsyncSpanProcessorTest.java

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

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/AwsXrayIdGenerator.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws;
+package io.opentelemetry.sdk.extension.trace.aws;
 
 import io.opentelemetry.api.trace.TraceId;
 import io.opentelemetry.sdk.trace.IdGenerator;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/package-info.java

@@ -5,6 +5,6 @@
 
 /** Provides implementations of SDK interfaces which integrate natively with AWS infrastructure. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.trace.aws;
+package io.opentelemetry.sdk.extension.trace.aws;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/AwsResourceConstants.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 final class AwsResourceConstants {
 

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/BeanstalkResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/DockerHelper.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.google.common.annotations.VisibleForTesting;
 import java.io.BufferedReader;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/Ec2Resource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/EcsResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Strings;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/EksResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/JdkHttpClient.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import com.google.common.io.ByteStreams;
 import java.io.ByteArrayOutputStream;

sdk-extensions/aws-v1-support/src/main/java/io/opentelemetry/sdk/extension/trace/aws/resource/package-info.java

@@ -8,6 +8,6 @@
  * information for AWS services.
  */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/aws-v1-support/src/main/resources/META-INF/services/io.opentelemetry.sdk.resources.ResourceProvider

@@ -1,4 +1,4 @@
-io.opentelemetry.sdk.extensions.trace.aws.resource.BeanstalkResource
-io.opentelemetry.sdk.extensions.trace.aws.resource.Ec2Resource
-io.opentelemetry.sdk.extensions.trace.aws.resource.EcsResource
-io.opentelemetry.sdk.extensions.trace.aws.resource.EksResource
+io.opentelemetry.sdk.extension.trace.aws.resource.BeanstalkResource
+io.opentelemetry.sdk.extension.trace.aws.resource.Ec2Resource
+io.opentelemetry.sdk.extension.trace.aws.resource.EcsResource
+io.opentelemetry.sdk.extension.trace.aws.resource.EksResource

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/AwsXRayIdGeneratorTest.java

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

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/BeanstalkResourceTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/DockerHelperTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/Ec2ResourceTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/EcsResourceTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/EksResourceTest.java

@@ -3,11 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
-import static io.opentelemetry.sdk.extensions.trace.aws.resource.EksResource.AUTH_CONFIGMAP_PATH;
-import static io.opentelemetry.sdk.extensions.trace.aws.resource.EksResource.CW_CONFIGMAP_PATH;
-import static io.opentelemetry.sdk.extensions.trace.aws.resource.EksResource.K8S_SVC_URL;
+import static io.opentelemetry.sdk.extension.trace.aws.resource.EksResource.AUTH_CONFIGMAP_PATH;
+import static io.opentelemetry.sdk.extension.trace.aws.resource.EksResource.CW_CONFIGMAP_PATH;
+import static io.opentelemetry.sdk.extension.trace.aws.resource.EksResource.K8S_SVC_URL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;

sdk-extensions/aws-v1-support/src/test/java/io/opentelemetry/sdk/extension/trace/aws/resource/JdkHttpClientTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.aws.resource;
+package io.opentelemetry.sdk.extension.trace.aws.resource;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.any;
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSampler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import com.google.common.annotations.VisibleForTesting;
 import io.grpc.ManagedChannel;
@@ -11,11 +11,11 @@ import io.opentelemetry.api.common.ReadableAttributes;
 import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.DaemonThreadFactory;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.PerOperationSamplingStrategies;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyResponse;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc.SamplingManagerBlockingStub;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.PerOperationSamplingStrategies;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyResponse;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.SamplingManagerGrpc.SamplingManagerBlockingStub;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/PerOperationSampler.java

@@ -3,12 +3,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import io.opentelemetry.api.common.ReadableAttributes;
 import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.OperationSamplingStrategy;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.OperationSamplingStrategy;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimiter.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import io.opentelemetry.sdk.common.Clock;
 import java.util.concurrent.atomic.AtomicLong;

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSampler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import static io.opentelemetry.api.common.AttributeKey.doubleKey;
 import static io.opentelemetry.api.common.AttributeKey.stringKey;

sdk-extensions/jaeger-remote-sampler/src/main/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/package-info.java

@@ -5,6 +5,6 @@
 
 /** Support for the Jaeger remote sampler. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/jaeger-remote-sampler/src/main/proto/jaeger/api_v2/sampling.proto

@@ -9,7 +9,7 @@ package jaeger.api_v2;
 
 import "google/api/annotations.proto";
 
-option java_package = "io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2";
+option java_package = "io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2";
 
 enum SamplingStrategyType {
   PROBABILISTIC = 0;

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerIntegrationTest.java

@@ -3,9 +3,9 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
-import static io.opentelemetry.sdk.extensions.trace.jaeger.sampler.JaegerRemoteSamplerTest.samplerIsType;
+import static io.opentelemetry.sdk.extension.trace.jaeger.sampler.JaegerRemoteSamplerTest.samplerIsType;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/JaegerRemoteSamplerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
@@ -17,11 +17,11 @@ import io.grpc.Server;
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.RateLimitingSamplingStrategy;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyType;
-import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.RateLimitingSamplingStrategy;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyType;
+import io.opentelemetry.sdk.extension.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.IOException;
 import java.util.concurrent.Callable;

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimiterTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

sdk-extensions/jaeger-remote-sampler/src/test/java/io/opentelemetry/sdk/extension/trace/jaeger/sampler/RateLimitingSamplerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.trace.jaeger.sampler;
+package io.opentelemetry.sdk.extension.trace.jaeger.sampler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;

sdk-extensions/logging/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 description = 'OpenTelemetry Contrib Logging Support'
-ext.moduleName = "io.opentelemetry.sdk.extensions.logging"
+ext.moduleName = "io.opentelemetry.sdk.extension.logging"
 
 dependencies {
     api project(':opentelemetry-sdk')

sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/TraceProtoUtils.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.otproto;
+package io.opentelemetry.sdk.extension.otproto;
 
 import com.google.protobuf.ByteString;
 import io.opentelemetry.api.trace.SpanId;

sdk-extensions/otproto/src/main/java/io/opentelemetry/sdk/extension/otproto/package-info.java

@@ -5,6 +5,6 @@
 
 /** Utilities for working with the OTLP format for traces. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.otproto;
+package io.opentelemetry.sdk.extension.otproto;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/otproto/src/test/java/io/opentelemetry/sdk/extension/otproto/TraceProtoUtilsTest.java

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

sdk-extensions/resources/README.md

@@ -7,7 +7,7 @@ common environments. Currently the resources provide the following semantic conv
 
 ### Operating System
 
-Provider: `io.opentelemetry.sdk.extensions.resources.OsResource`
+Provider: `io.opentelemetry.sdk.extension.resources.OsResource`
 
 Specification: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/resource/semantic_conventions/os.md
 
@@ -17,7 +17,7 @@ Implemented attributes:
 
 ### Process
 
-Implementation: `io.opentelemetry.sdk.extensions.resources.ProcessResource`
+Implementation: `io.opentelemetry.sdk.extension.resources.ProcessResource`
 
 Specification: https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/resource/semantic_conventions/process.md
 

sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/OsResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.resources;
+package io.opentelemetry.sdk.extension.resources;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.resources.ResourceAttributes;

sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/ProcessResource.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.resources;
+package io.opentelemetry.sdk.extension.resources;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.resources.ResourceAttributes;

sdk-extensions/resources/src/main/java/io/opentelemetry/sdk/extension/resources/package-info.java

@@ -8,6 +8,6 @@
  * information.
  */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.resources;
+package io.opentelemetry.sdk.extension.resources;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/resources/src/main/resources/META-INF/services/io.opentelemetry.sdk.resources.ResourceProvider

@@ -1,2 +1,2 @@
-io.opentelemetry.sdk.extensions.resources.OsResource
-io.opentelemetry.sdk.extensions.resources.ProcessResource
+io.opentelemetry.sdk.extension.resources.OsResource
+io.opentelemetry.sdk.extension.resources.ProcessResource

sdk-extensions/resources/src/test/java/io/opentelemetry/sdk/extension/resources/OsResourceTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.resources;
+package io.opentelemetry.sdk.extension.resources;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assumptions.assumeThat;

sdk-extensions/resources/src/test/java/io/opentelemetry/sdk/extension/resources/ProcessResourceTest.java

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

sdk-extensions/tracing-incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/data/DelegatingSpanData.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.incubator.trace.data;
+package io.opentelemetry.sdk.extension.incubator.trace.data;
 
 import static java.util.Objects.requireNonNull;
 

sdk-extensions/tracing-incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/data/SpanDataBuilder.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.incubator.trace.data;
+package io.opentelemetry.sdk.extension.incubator.trace.data;
 
 import com.google.auto.value.AutoValue;
 import io.opentelemetry.api.common.ReadableAttributes;
@@ -25,7 +25,7 @@ import javax.annotation.concurrent.Immutable;
  * Attributes newAttributes = Attributes.builder(data.getAttributes())
  *   .setAttribute("client_type", clientType)
  *   .build();
- * data = io.opentelemetry.sdk.extensions.incubator.trace.data.SpanData.builder(data)
+ * data = io.opentelemetry.sdk.extension.incubator.trace.data.SpanData.builder(data)
  *   .setAttributes(newAttributes)
  *   .build();
  * exporter.export(data);

sdk-extensions/tracing-incubator/src/main/java/io/opentelemetry/sdk/extension/incubator/trace/data/package-info.java

@@ -5,6 +5,6 @@
 
 /** Experimental utilities for working with exported trace data. */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.incubator.trace.data;
+package io.opentelemetry.sdk.extension.incubator.trace.data;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/trace/data/DelegatingSpanDataTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.incubator.trace.data;
+package io.opentelemetry.sdk.extension.incubator.trace.data;
 
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 import static org.assertj.core.api.Assertions.assertThat;

sdk-extensions/tracing-incubator/src/test/java/io/opentelemetry/sdk/extension/incubator/trace/data/SpanDataBuilderTest.java

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

sdk-extensions/zpages/src/jmh/java/io/opentelemetry/sdk/extension/zpages/TracezDataAggregatorBenchmark.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;

sdk-extensions/zpages/src/jmh/java/io/opentelemetry/sdk/extension/zpages/TracezSpanBucketsBenchmark.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.trace.Span;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/IndexZPageHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import java.io.OutputStream;
 import java.io.PrintStream;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/LatencyBoundary.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import java.util.concurrent.TimeUnit;
 

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/SpanBucket.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import com.google.common.primitives.UnsignedInts;
 import io.opentelemetry.sdk.trace.ReadableSpan;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TraceConfigzZPageHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import io.opentelemetry.sdk.trace.TracerSdkManagement;
 import io.opentelemetry.sdk.trace.config.TraceConfig;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezDataAggregator.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import io.opentelemetry.api.trace.StatusCode;
 import io.opentelemetry.sdk.trace.ReadableSpan;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanBuckets.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.api.trace.StatusCode;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessor.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.common.CompletableResultCode;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import static com.google.common.html.HtmlEscapers.htmlEscaper;
 import static com.google.common.net.UrlEscapers.urlFormParameterEscaper;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/ZPageHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import java.io.OutputStream;
 import java.util.Map;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/ZPageHttpHandler.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Splitter;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/ZPageLogo.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import com.google.common.io.BaseEncoding;
 import com.google.common.io.ByteStreams;

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/ZPageServer.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import static com.google.common.base.Preconditions.checkState;
 

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/ZPageStyle.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 /** This class contains the unified CSS styles for all zPages. */
 final class ZPageStyle {

sdk-extensions/zpages/src/main/java/io/opentelemetry/sdk/extension/zpages/package-info.java

@@ -7,6 +7,6 @@
  * The ZPages endpoint for providing debug information about an app instrumented with OpenTelemetry.
  */
 @ParametersAreNonnullByDefault
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import javax.annotation.ParametersAreNonnullByDefault;

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/IndexZPageHandlerTest.java

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

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/SpanBucketTest.java

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

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TraceConfigzZPageHandlerTest.java

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

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezDataAggregatorTest.java

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

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezSpanProcessorTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.when;

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/TracezZPageHandlerTest.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.sdk.extensions.zpages;
+package io.opentelemetry.sdk.extension.zpages;
 
 import static com.google.common.net.UrlEscapers.urlFormParameterEscaper;
 import static org.assertj.core.api.Assertions.assertThat;

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/ZPageHttpHandlerTest.java

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

sdk-extensions/zpages/src/test/java/io/opentelemetry/sdk/extension/zpages/ZPageServerTest.java

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