Stop publishing opentelemetry-extension-annotations artifact (#4750)

open-telemetry · Sep 12, 2022 · cdab465 · cdab465
1 parent 6c6a5fd
commit cdab465
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 185 deletions.
diff --git a/README.md b/README.md
@@ -235,7 +235,6 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
 | [Kotlin Extension](./extensions/kotlin)                       | Context extension for coroutines                                                            | `opentelemetry-extension-kotlin`            | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE-->           |
 | [Trace Propagators Extension](./extensions/trace-propagators) | Trace propagators, including B3, Jaeger, OT Trace                                           | `opentelemetry-extension-trace-propagators` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE-->           |
 | [Incubator Extension](./extensions/incubator)                 | API incubator, including pass through propagator, and extended tracer                       | `opentelemetry-extension-incubator`         | <!--VERSION_UNSTABLE-->1.18.0-alpha<!--/VERSION_UNSTABLE--> |
-| [Annotations Extension](./extensions/annotations)             | Instrumentation annotations, used in conjunction with OpenTelemetry java agent (deprecated) | `opentelemetry-extension-annotations`       | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE-->           |
 
 ### SDK
 

diff --git a/all/build.gradle.kts b/all/build.gradle.kts
@@ -47,6 +47,7 @@ dependencies {
   testImplementation("io.grpc:grpc-api")
   testImplementation("io.grpc:grpc-protobuf")
   testImplementation("io.grpc:grpc-stub")
+  testImplementation("io.opentelemetry:opentelemetry-extension-annotations")
 
   testImplementation("com.tngtech.archunit:archunit-junit5")
 }

diff --git a/all/src/test/java/io/opentelemetry/all/FallbackArtifactsTest.java b/all/src/test/java/io/opentelemetry/all/FallbackArtifactsTest.java
@@ -17,6 +17,12 @@ void exporterJaegerProto() {
     classAvailable("io.opentelemetry.exporter.jaeger.proto.api_v2.Model");
   }
 
+  @Test
+  void extensionAnnotations() {
+    classAvailable("io.opentelemetry.extension.annotations.WithSpan");
+    classAvailable("io.opentelemetry.extension.annotations.SpanAttribute");
+  }
+
   private static void classAvailable(String fqcn) {
     Assertions.assertThatCode(() -> Class.forName(fqcn)).doesNotThrowAnyException();
   }

diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -10,3 +10,4 @@ otelBom.projectFilter.set { !it.hasProperty("otel.release") }
 
 // Artifacts that were previously published and included in the BOM for backwards compatibility
 otelBom.addFallback("opentelemetry-exporter-jaeger-proto", "1.17.0")
+otelBom.addFallback("opentelemetry-extension-annotations", "1.18.0")
diff --git a/docs/apidiffs/current_vs_latest/opentelemetry-extension-annotations.txt b/docs/apidiffs/current_vs_latest/opentelemetry-extension-annotations.txt
diff --git a/extensions/annotations/README.md b/extensions/annotations/README.md
diff --git a/extensions/annotations/build.gradle.kts b/extensions/annotations/build.gradle.kts
diff --git a/...sions/annotations/src/main/java/io/opentelemetry/extension/annotations/SpanAttribute.java b/...sions/annotations/src/main/java/io/opentelemetry/extension/annotations/SpanAttribute.java
diff --git a/extensions/annotations/src/main/java/io/opentelemetry/extension/annotations/WithSpan.java b/extensions/annotations/src/main/java/io/opentelemetry/extension/annotations/WithSpan.java
diff --git a/...nsions/annotations/src/main/java/io/opentelemetry/extension/annotations/package-info.java b/...nsions/annotations/src/main/java/io/opentelemetry/extension/annotations/package-info.java
diff --git a/...notations/src/test/java/io/opentelemetry/extension/annotations/WithSpanUsageExamples.java b/...notations/src/test/java/io/opentelemetry/extension/annotations/WithSpanUsageExamples.java
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -27,7 +27,6 @@ include(":bom")
 include(":bom-alpha")
 include(":context")
 include(":dependencyManagement")
-include(":extensions:annotations")
 include(":extensions:incubator")
 include(":extensions:aws")
 include(":extensions:kotlin")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ otelBom.projectFilter.set { !it.hasProperty("otel.release") }

		// Artifacts that were previously published and included in the BOM for backwards compatibility
		otelBom.addFallback("opentelemetry-exporter-jaeger-proto", "1.17.0")
		otelBom.addFallback("opentelemetry-extension-annotations", "1.18.0")