Revert "Add Pulsar MessagingProducerMetrics (open-telemetry#11591)"

This reverts commit a46c8a0.
trask · Jul 14, 2024 · 745d994 · 745d994
1 parent 746ef01
commit 745d994
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 286 deletions.
diff --git a/instrumentation-api-incubator/build.gradle.kts b/instrumentation-api-incubator/build.gradle.kts
@@ -21,7 +21,6 @@ dependencies {
   testImplementation(project(":testing-common"))
   testImplementation("io.opentelemetry:opentelemetry-sdk")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
-  testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
 }
 
 tasks {

diff --git a/...opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java b/...opentelemetry/instrumentation/api/incubator/semconv/messaging/MessagingMetricsAdvice.java
diff --git a/...entelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java b/...entelemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetrics.java
diff --git a/...lemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java b/...lemetry/instrumentation/api/incubator/semconv/messaging/MessagingProducerMetricsTest.java
diff --git a/...va/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java b/...va/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/telemetry/PulsarSingletons.java
@@ -13,7 +13,6 @@
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessageOperation;
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesExtractor;
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingAttributesGetter;
-import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingProducerMetrics;
 import io.opentelemetry.instrumentation.api.incubator.semconv.messaging.MessagingSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
@@ -137,8 +136,7 @@ private static Instrumenter<PulsarRequest, Void> createProducerInstrumenter() {
             .addAttributesExtractor(
                 createMessagingAttributesExtractor(getter, MessageOperation.PUBLISH))
             .addAttributesExtractor(
-                ServerAttributesExtractor.create(new PulsarNetClientAttributesGetter()))
-            .addOperationMetrics(MessagingProducerMetrics.get());
+                ServerAttributesExtractor.create(new PulsarNetClientAttributesGetter()));
 
     if (AgentInstrumentationConfig.get()
         .getBoolean("otel.instrumentation.pulsar.experimental-span-attributes", false)) {

diff --git a/...java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java b/...java/io/opentelemetry/javaagent/instrumentation/pulsar/v2_8/AbstractPulsarClientTest.java
@@ -22,7 +22,6 @@
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
-import io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions;
 import io.opentelemetry.sdk.trace.data.LinkData;
 import io.opentelemetry.sdk.trace.data.SpanData;
 import java.time.Duration;
@@ -77,10 +76,6 @@ abstract class AbstractPulsarClientTest {
 
   private static final AttributeKey<String> MESSAGE_TYPE =
       AttributeKey.stringKey("messaging.pulsar.message.type");
-  private static final double[] DURATION_BUCKETS =
-      new double[] {
-        0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1.0, 2.5, 5.0, 7.5, 10.0
-      };
 
   @BeforeAll
   static void beforeAll() throws PulsarClientException {
@@ -168,26 +163,6 @@ void testConsumeNonPartitionedTopicUsingBatchReceive() throws Exception {
                         .hasParent(trace.getSpan(0))
                         .hasAttributesSatisfyingExactly(
                             batchReceiveAttributes(topic, null, false))));
-
-    assertThat(testing.metrics())
-        .satisfiesExactlyInAnyOrder(
-            metric ->
-                OpenTelemetryAssertions.assertThat(metric)
-                    .hasName("messaging.publish.duration")
-                    .hasUnit("s")
-                    .hasDescription("Measures the duration of publish operation.")
-                    .hasHistogramSatisfying(
-                        histogram ->
-                            histogram.hasPointsSatisfying(
-                                point ->
-                                    point
-                                        .hasSumGreaterThan(0.0)
-                                        .hasAttributesSatisfying(
-                                            equalTo(MESSAGING_SYSTEM, "pulsar"),
-                                            equalTo(MESSAGING_DESTINATION_NAME, topic),
-                                            equalTo(SERVER_PORT, brokerPort),
-                                            equalTo(SERVER_ADDRESS, brokerHost))
-                                        .hasBucketBoundaries(DURATION_BUCKETS))));
   }
 
   @Test