EventHubs tracing and metrics: catch up with OTel specification

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -81,9 +81,8 @@
   <suppress checks="IllegalImport" files="com.azure.messaging.servicebus.IntegrationTestBase.java"/>
   <suppress checks="IllegalImport" files="com.azure.messaging.servicebus.TracingIntegrationTests.java"/>
   <suppress checks="IllegalImport" files="com.azure.messaging.servicebus.LoggingSpanProcessor.java"/>
-  <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.TracingIntegrationTests.java"/>
-  <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.PublishEventsTracingWithCustomContextSample.java"/>
-  <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.EventProcessorWithTracingClientSample.java"/>
+  <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.*Sample.*java"/>
+  <suppress checks="IllegalImport" files="com.azure.messaging.eventhubs.*Test.*java"/>
 
   <!-- AzureSpringMonitorConfig defines Spring bean used in https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/OpenTelemetryAutoConfiguration.java-->
   <suppress checks="com.azure.tools.checkstyle.checks.ExternalDependencyExposedCheck"

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/handler/SessionHandler.java

@@ -22,6 +22,7 @@
 
 import static com.azure.core.amqp.implementation.AmqpLoggingUtils.addErrorCondition;
 import static com.azure.core.amqp.implementation.ClientConstants.SESSION_ID_KEY;
+import static com.azure.core.amqp.implementation.ClientConstants.ERROR_DESCRIPTION_KEY;
 import static com.azure.core.amqp.implementation.ClientConstants.SESSION_NAME_KEY;
 
 /**
@@ -172,6 +173,11 @@ public void onSessionFinal(Event e) {
     }
 
     private void onSessionTimeout() {
+        logger.atWarning()
+            .addKeyValue(SESSION_NAME_KEY, sessionName)
+            .addKeyValue(ERROR_DESCRIPTION_KEY, "timeout")
+            .log("onSessionTimeout");
+
         // It is supposed to close a local session to handle timeout exception.
         // However, closing the session can result in NPE because of proton-j bug (https://issues.apache
         // .org/jira/browse/PROTON-1939).

sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/CHANGELOG.md

@@ -6,6 +6,9 @@
 
 ### Breaking Changes
 
+- Experimental checkpointing metrics are no longer reported by this package. They've been moved to `azure-messaging-eventhubs` package.
+  ([#38899](https://github.com/Azure/azure-sdk-for-java/pull/38899))
+
 ### Bugs Fixed
 
 ### Other Changes

sdk/eventhubs/azure-messaging-eventhubs-checkpointstore-blob/src/main/java/com/azure/messaging/eventhubs/checkpointstore/blob/BlobCheckpointStore.java

@@ -7,7 +7,6 @@
 import com.azure.core.util.ClientOptions;
 import com.azure.core.util.CoreUtils;
 import com.azure.core.util.logging.ClientLogger;
-import com.azure.core.util.metrics.MeterProvider;
 import com.azure.messaging.eventhubs.CheckpointStore;
 import com.azure.messaging.eventhubs.EventProcessorClient;
 import com.azure.messaging.eventhubs.models.Checkpoint;
@@ -24,13 +23,11 @@
 import reactor.core.publisher.Mono;
 
 import java.nio.ByteBuffer;
-import java.time.Instant;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -70,7 +67,6 @@ public class BlobCheckpointStore implements CheckpointStore {
     private static final ClientLogger LOGGER = new ClientLogger(BlobCheckpointStore.class);
 
     private final BlobContainerAsyncClient blobContainerAsyncClient;
-    private final MetricsHelper metricsHelper;
     private final Map<String, BlobAsyncClient> blobClients = new ConcurrentHashMap<>();
 
     /**
@@ -93,7 +89,6 @@ public BlobCheckpointStore(BlobContainerAsyncClient blobContainerAsyncClient) {
      */
     public BlobCheckpointStore(BlobContainerAsyncClient blobContainerAsyncClient, ClientOptions options) {
         this.blobContainerAsyncClient = blobContainerAsyncClient;
-        this.metricsHelper = new MetricsHelper(options == null ? null : options.getMetricsOptions(), MeterProvider.getDefaultProvider());
     }
 
     /**
@@ -267,30 +262,14 @@ public Mono<Void> updateCheckpoint(Checkpoint checkpoint) {
         metadata.put(OFFSET, offset);
         BlobAsyncClient blobAsyncClient = blobClients.get(blobName);
 
-        Mono<Void> response = blobAsyncClient.exists().flatMap(exists -> {
+        return blobAsyncClient.exists().flatMap(exists -> {
             if (exists) {
                 return blobAsyncClient.setMetadata(metadata);
             } else {
                 return blobAsyncClient.getBlockBlobAsyncClient().uploadWithResponse(Flux.just(UPLOAD_DATA), 0, null,
                     metadata, null, null, null).then();
             }
         });
-        return reportMetrics(response, checkpoint, blobName);
-    }
-
-    private Mono<Void> reportMetrics(Mono<Void> checkpointMono, Checkpoint checkpoint, String blobName) {
-        AtomicReference<Instant> startTime = metricsHelper.isCheckpointDurationEnabled() ? new AtomicReference<>() : null;
-        return checkpointMono
-            .doOnEach(signal ->  {
-                if (signal.isOnComplete() || signal.isOnError()) {
-                    metricsHelper.reportCheckpoint(checkpoint, blobName, !signal.hasError(), startTime != null ? startTime.get() : null);
-                }
-            })
-            .doOnSubscribe(ignored -> {
-                if (startTime != null) {
-                    startTime.set(Instant.now());
-                }
-            });
     }
 
     private String getBlobPrefix(String fullyQualifiedNamespace, String eventHubName, String consumerGroupName,
@@ -348,5 +327,4 @@ private Mono<PartitionOwnership> convertToPartitionOwnership(BlobItem blobItem)
 
         return Mono.empty();
     }
-
 }