Rename contrib to extensions

README.md

@@ -17,11 +17,19 @@ This project contains the following top level components:
   * [correlationcontext](/api/src/main/java/io/opentelemetry/correlationcontext): Collection of entries in the form of key-value pairs of data that can be propagated to provide contextual information.
   * [context](api/src/main/java/io/opentelemetry/context/): In-process and inter-process propagation layer.
   * [metrics](api/src/main/java/io/opentelemetry/metrics/): Metrics layer.
+* [extensions](extensions/): Additional extensions API, which are not part of the core API.
 * [sdk](sdk/): The reference implementation complying to the OpenTelemetry API.
+* [sdk_extensions](sdk_extensions/): Additional extensions to SDK.
 * [OpenTracing shim](opentracing_shim/): A bridge layer from OpenTelemetry to the OpenTracing API.
 
 We would love to hear from the larger community: please provide feedback proactively.
 
+### Note about extensions
+Both API and SDK extensions consist of various component which, for various reasons, are not deemed
+to be suitable for inclusion into the core artifact.
+We still aim to provide the same level of quality and guarantee for them, as for the core components.
+Please don't hesitate to use them if you find them useful. 
+
 ## Project setup and contribute
 
 Please refer to the [contribution guide](CONTRIBUTING.md)

all/build.gradle

@@ -8,10 +8,10 @@ ext.moduleName = "io.opentelemetry.all"
 def subprojects = [
         project(':opentelemetry-api'),
         project(':opentelemetry-context-prop'),
-        project(':opentelemetry-contrib-runtime-metrics'),
-        project(':opentelemetry-contrib-trace-propagators'),
-        project(':opentelemetry-contrib-trace-utils'),
-        project(':opentelemetry-contrib-auto-annotations'),
+        project(':opentelemetry-extension-runtime-metrics'),
+        project(':opentelemetry-extension-trace-propagators'),
+        project(':opentelemetry-extension-trace-utils'),
+        project(':opentelemetry-extension-auto-annotations'),
         project(':opentelemetry-exporters-logging'),
         project(':opentelemetry-exporters-inmemory'),
         project(':opentelemetry-exporters-jaeger'),
@@ -20,11 +20,11 @@ def subprojects = [
         project(':opentelemetry-exporters-zipkin'),
         project(':opentelemetry-opentracing-shim'),
         project(':opentelemetry-sdk'),
-        project(':opentelemetry-sdk-contrib-async-processor'),
-        project(':opentelemetry-sdk-contrib-auto-config'),
-        project(':opentelemetry-sdk-contrib-otproto'),
-        project(':opentelemetry-sdk-contrib-testbed'),
-        project(':opentelemetry-sdk-contrib-jaeger-remote-sampler'),
+        project(':opentelemetry-sdk-extension-async-processor'),
+        project(':opentelemetry-sdk-extension-auto-config'),
+        project(':opentelemetry-sdk-extension-otproto'),
+        project(':opentelemetry-sdk-extension-testbed'),
+        project(':opentelemetry-sdk-extension-jaeger-remote-sampler'),
 ]
 
 for (subproject in rootProject.subprojects) {

exporters/jaeger/build.gradle

@@ -12,7 +12,7 @@ ext.moduleName = "io.opentelemetry.exporters.jaeger"
 dependencies {
     api project(':opentelemetry-sdk')
 
-    implementation project(':opentelemetry-sdk-contrib-otproto'),
+    implementation project(':opentelemetry-sdk-extension-otproto'),
             project(':opentelemetry-sdk'),
             libraries.grpc_api,
             libraries.grpc_protobuf,

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

@@ -24,7 +24,7 @@
 import io.opentelemetry.common.Attributes;
 import io.opentelemetry.common.KeyValueConsumer;
 import io.opentelemetry.exporters.jaeger.proto.api_v2.Model;
-import io.opentelemetry.sdk.contrib.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extensions.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/exporters/jaeger/AdapterTest.java

@@ -26,7 +26,7 @@
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.common.Attributes;
 import io.opentelemetry.exporters.jaeger.proto.api_v2.Model;
-import io.opentelemetry.sdk.contrib.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.data.EventImpl;
 import io.opentelemetry.sdk.trace.data.SpanData;

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

@@ -31,7 +31,7 @@
 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.sdk.contrib.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
 import io.opentelemetry.sdk.trace.data.test.TestSpanData;

exporters/otlp/build.gradle

@@ -11,7 +11,7 @@ ext.moduleName = "io.opentelemetry.exporters.otlp"
 dependencies {
     api project(':opentelemetry-sdk')
 
-    implementation project(':opentelemetry-sdk-contrib-otproto'),
+    implementation project(':opentelemetry-sdk-extension-otproto'),
             libraries.grpc_api,
             libraries.grpc_protobuf,
             libraries.grpc_stub,

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

@@ -26,7 +26,7 @@
 import io.opentelemetry.proto.trace.v1.Status;
 import io.opentelemetry.proto.trace.v1.Status.StatusCode;
 import io.opentelemetry.sdk.common.InstrumentationLibraryInfo;
-import io.opentelemetry.sdk.contrib.otproto.TraceProtoUtils;
+import io.opentelemetry.sdk.extensions.otproto.TraceProtoUtils;
 import io.opentelemetry.sdk.resources.Resource;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import io.opentelemetry.sdk.trace.data.SpanData.Event;

contrib/auto_annotations/build.gradle → extensions/auto_annotations/build.gradle

@@ -5,8 +5,8 @@ plugins {
     id "ru.vyarus.animalsniffer"
 }
 
-description = 'OpenTelemetry Contrib Auto Annotations'
-ext.moduleName = "io.opentelemetry.contrib.auto.annotations"
+description = 'OpenTelemetry Extension Auto Annotations'
+ext.moduleName = "io.opentelemetry.extension.auto.annotations"
 
 dependencies {
     implementation project(':opentelemetry-api')

contrib/auto_annotations/src/main/java/io/opentelemetry/contrib/auto/annotations/WithSpan.java → extensions/auto_annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/WithSpan.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.auto.annotations;
+package io.opentelemetry.extensions.auto.annotations;
 
 import io.opentelemetry.trace.Span.Kind;
 import java.lang.annotation.ElementType;

contrib/auto_annotations/src/main/java/io/opentelemetry/contrib/auto/annotations/package-info.java → extensions/auto_annotations/src/main/java/io/opentelemetry/extensions/auto/annotations/package-info.java

@@ -24,4 +24,4 @@
  * useless without some kind of annotation processing, such as bytecode manipulation during runtime.
  * You cannot guarantee that users of your library will use that in their production system.
  */
-package io.opentelemetry.contrib.auto.annotations;
+package io.opentelemetry.extensions.auto.annotations;

contrib/auto_annotations/src/test/java/io/opentelemetry/contrib/auto/annotations/WithSpanUsageExamples.java → extensions/auto_annotations/src/test/java/io/opentelemetry/extensions/auto/annotations/WithSpanUsageExamples.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.auto.annotations;
+package io.opentelemetry.extensions.auto.annotations;
 
 import io.opentelemetry.trace.Span;
 import io.opentelemetry.trace.Span.Kind;

contrib/runtime_metrics/build.gradle → extensions/runtime_metrics/build.gradle

@@ -5,8 +5,8 @@ plugins {
     id "ru.vyarus.animalsniffer"
 }
 
-description = 'OpenTelemetry Contrib Runtime Metrics'
-ext.moduleName = "io.opentelemetry.contrib.metrics.runtime"
+description = 'OpenTelemetry Extension Runtime Metrics'
+ext.moduleName = "io.opentelemetry.extension.metrics.runtime"
 
 dependencies {
     implementation project(':opentelemetry-api')

contrib/runtime_metrics/src/main/java/io/opentelemetry/contrib/metrics/runtime/GarbageCollector.java → extensions/runtime_metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/GarbageCollector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.metrics.runtime;
+package io.opentelemetry.extensions.metrics.runtime;
 
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.metrics.AsynchronousInstrument.Callback;

contrib/runtime_metrics/src/main/java/io/opentelemetry/contrib/metrics/runtime/MemoryPools.java → extensions/runtime_metrics/src/main/java/io/opentelemetry/extensions/metrics/runtime/MemoryPools.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.metrics.runtime;
+package io.opentelemetry.extensions.metrics.runtime;
 
 import io.opentelemetry.OpenTelemetry;
 import io.opentelemetry.metrics.AsynchronousInstrument.Callback;

contrib/trace_propagators/build.gradle → extensions/trace_propagators/build.gradle

@@ -6,8 +6,8 @@ plugins {
     id "me.champeau.gradle.jmh"
 }
 
-description = 'OpenTelemetry Contrib Trace Propagators'
-ext.moduleName = "io.opentelemetry.contrib.trace.propagation"
+description = 'OpenTelemetry Extension Trace Propagators'
+ext.moduleName = "io.opentelemetry.extension.trace.propagation"
 
 dependencies {
     api project(':opentelemetry-api')

contrib/trace_propagators/src/jmh/java/io/opentelemetry/contrib/trace/propagation/PropagatorContextExtractBenchmark.java → extensions/trace_propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextExtractBenchmark.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.trace.Span;

contrib/trace_propagators/src/jmh/java/io/opentelemetry/contrib/trace/propagation/PropagatorContextInjectBenchmark.java → extensions/trace_propagators/src/jmh/java/io/opentelemetry/extensions/trace/propagation/PropagatorContextInjectBenchmark.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.trace.DefaultSpan;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/AwsXRayPropagator.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3Propagator.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3Propagator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorExtractor.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractor.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.MAX_SPAN_ID_LENGTH;
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.MAX_TRACE_ID_LENGTH;
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.TRUE_INT;
+import static io.opentelemetry.extensions.trace.propagation.B3Propagator.MAX_SPAN_ID_LENGTH;
+import static io.opentelemetry.extensions.trace.propagation.B3Propagator.MAX_TRACE_ID_LENGTH;
+import static io.opentelemetry.extensions.trace.propagation.B3Propagator.TRUE_INT;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorExtractorMultipleHeaders.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorMultipleHeaders.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.SAMPLED_HEADER;
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.SPAN_ID_HEADER;
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.TRACE_ID_HEADER;
+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 io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorExtractorSingleHeader.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorExtractorSingleHeader.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.COMBINED_HEADER;
-import static io.opentelemetry.contrib.trace.propagation.B3Propagator.COMBINED_HEADER_DELIMITER;
+import static io.opentelemetry.extensions.trace.propagation.B3Propagator.COMBINED_HEADER;
+import static io.opentelemetry.extensions.trace.propagation.B3Propagator.COMBINED_HEADER_DELIMITER;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorInjector.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorInjectorMultipleHeaders.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorMultipleHeaders.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorInjectorSingleHeader.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorInjectorSingleHeader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/main/java/io/opentelemetry/contrib/trace/propagation/JaegerPropagator.java → extensions/trace_propagators/src/main/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import static io.opentelemetry.internal.Utils.checkNotNull;
 

contrib/trace_propagators/src/test/java/io/opentelemetry/contrib/trace/propagation/AwsXRayPropagatorTest.java → extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/AwsXRayPropagatorTest.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import static com.google.common.truth.Truth.assertThat;
-import static io.opentelemetry.contrib.trace.propagation.AwsXRayPropagator.TRACE_HEADER_KEY;
+import static io.opentelemetry.extensions.trace.propagation.AwsXRayPropagator.TRACE_HEADER_KEY;
 
 import io.grpc.Context;
 import io.opentelemetry.context.propagation.HttpTextFormat;

contrib/trace_propagators/src/test/java/io/opentelemetry/contrib/trace/propagation/B3PropagatorTest.java → extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/B3PropagatorTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import static com.google.common.truth.Truth.assertThat;
 

contrib/trace_propagators/src/test/java/io/opentelemetry/contrib/trace/propagation/JaegerPropagatorTest.java → extensions/trace_propagators/src/test/java/io/opentelemetry/extensions/trace/propagation/JaegerPropagatorTest.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace.propagation;
+package io.opentelemetry.extensions.trace.propagation;
 
 import static com.google.common.truth.Truth.assertThat;
-import static io.opentelemetry.contrib.trace.propagation.JaegerPropagator.DEPRECATED_PARENT_SPAN;
-import static io.opentelemetry.contrib.trace.propagation.JaegerPropagator.PROPAGATION_HEADER;
-import static io.opentelemetry.contrib.trace.propagation.JaegerPropagator.PROPAGATION_HEADER_DELIMITER;
+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 io.grpc.Context;
 import io.jaegertracing.internal.JaegerSpanContext;
@@ -44,7 +44,7 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/** Unit tests for {@link io.opentelemetry.contrib.trace.propagation.JaegerPropagator}. */
+/** Unit tests for {@link io.opentelemetry.extensions.trace.propagation.JaegerPropagator}. */
 @RunWith(JUnit4.class)
 public class JaegerPropagatorTest {
 

contrib/trace_utils/build.gradle → extensions/trace_utils/build.gradle

@@ -5,8 +5,8 @@ plugins {
     id "ru.vyarus.animalsniffer"
 }
 
-description = 'OpenTelemetry Contrib Trace Utils'
-ext.moduleName = "io.opentelemetry.contrib.trace"
+description = 'OpenTelemetry Extension Trace Utils'
+ext.moduleName = "io.opentelemetry.extension.trace"
 
 dependencies {
     api project(':opentelemetry-api')

contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/CurrentSpanUtils.java → extensions/trace_utils/src/main/java/io/opentelemetry/extensions/trace/CurrentSpanUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace;
+package io.opentelemetry.extensions.trace;
 
 import io.grpc.Context;
 import io.opentelemetry.trace.Span;

contrib/trace_utils/src/main/java/io/opentelemetry/contrib/trace/MessageEvent.java → extensions/trace_utils/src/main/java/io/opentelemetry/extensions/trace/MessageEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace;
+package io.opentelemetry.extensions.trace;
 
 import io.opentelemetry.common.AttributeValue;
 import io.opentelemetry.common.Attributes;

contrib/trace_utils/src/test/java/io/opentelemetry/contrib/trace/CurrentSpanUtilsTest.java → extensions/trace_utils/src/test/java/io/opentelemetry/extensions/trace/CurrentSpanUtilsTest.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.opentelemetry.contrib.trace;
+package io.opentelemetry.extensions.trace;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;

sdk_contrib/async_processor/build.gradle → sdk_extensions/async_processor/build.gradle

@@ -5,8 +5,8 @@ plugins {
     id "ru.vyarus.animalsniffer"
 }
 
-description = 'OpenTelemetry SDK Contrib'
-ext.moduleName = "io.opentelemetry.sdk.contrib.trace.export"
+description = 'OpenTelemetry SDK Extension'
+ext.moduleName = "io.opentelemetry.sdk.extension.trace.export"
 
 dependencies {
     api project(':opentelemetry-api'),