Delete unused metrics code (#33368)

Author: JoshLove-msft

sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpClient.cs

@@ -72,8 +72,6 @@ internal class AmqpClient : TransportClient
         /// </summary>
         private readonly AmqpMessageConverter _messageConverter;
 
-        public override ServiceBusTransportMetrics TransportMetrics { get; }
-
         /// <summary>
         ///   Initializes a new instance of the <see cref="AmqpClient"/> class.
         /// </summary>
@@ -115,19 +113,15 @@ internal AmqpClient(
             }.Uri;
 
             Credential = credential;
-            if (options.EnableTransportMetrics)
-            {
-                TransportMetrics = new ServiceBusTransportMetrics();
-            }
+
             ConnectionScope = new AmqpConnectionScope(
                 ServiceEndpoint,
                 ConnectionEndpoint,
                 credential,
                 options.TransportType,
                 options.WebProxy,
                 options.EnableCrossEntityTransactions,
-                options.RetryOptions.TryTimeout,
-                TransportMetrics);
+                options.RetryOptions.TryTimeout);
         }
 
         /// <summary>

sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpConnectionScope.cs

@@ -200,16 +200,14 @@ public override bool IsDisposed
         /// <param name="proxy">The proxy, if any, to use for communication.</param>
         /// <param name="useSingleSession">If true, all links will use a single session.</param>
         /// <param name="operationTimeout">The timeout for operations associated with the connection.</param>
-        /// <param name="metrics">The metrics instance to populate transport metrics. May be null.</param>
         public AmqpConnectionScope(
             Uri serviceEndpoint,
             Uri connectionEndpoint,
             ServiceBusTokenCredential credential,
             ServiceBusTransportType transport,
             IWebProxy proxy,
             bool useSingleSession,
-            TimeSpan operationTimeout,
-            ServiceBusTransportMetrics metrics)
+            TimeSpan operationTimeout)
         {
             Argument.AssertNotNull(serviceEndpoint, nameof(serviceEndpoint));
             Argument.AssertNotNull(credential, nameof(credential));
@@ -223,7 +221,7 @@ public AmqpConnectionScope(
             TokenProvider = new CbsTokenProvider(new ServiceBusTokenCredential(credential), AuthorizationTokenExpirationBuffer, OperationCancellationSource.Token);
             _useSingleSession = useSingleSession;
 #pragma warning disable CA2214 // Do not call overridable methods in constructors. This internal method is virtual for testing purposes.
-            Task<AmqpConnection> connectionFactory(TimeSpan timeout) => CreateAndOpenConnectionAsync(AmqpVersion, ServiceEndpoint, connectionEndpoint, Transport, Proxy, Id, timeout, metrics);
+            Task<AmqpConnection> connectionFactory(TimeSpan timeout) => CreateAndOpenConnectionAsync(AmqpVersion, ServiceEndpoint, connectionEndpoint, Transport, Proxy, Id, timeout);
 #pragma warning restore CA2214 // Do not call overridable methods in constructors
 
             ActiveConnection = new FaultTolerantAmqpObject<AmqpConnection>(
@@ -453,7 +451,6 @@ public override void Dispose()
         /// <param name="proxy">The proxy, if any, to use for communication.</param>
         /// <param name="scopeIdentifier">The unique identifier for the associated scope.</param>
         /// <param name="timeout">The timeout to consider when creating the connection.</param>
-        /// <param name="metrics">The metrics instance to populate transport metrics. May be null.</param>
         /// <returns>An AMQP connection that may be used for communicating with the Service Bus service.</returns>
         protected virtual async Task<AmqpConnection> CreateAndOpenConnectionAsync(
             Version amqpVersion,
@@ -462,8 +459,7 @@ protected virtual async Task<AmqpConnection> CreateAndOpenConnectionAsync(
             ServiceBusTransportType transportType,
             IWebProxy proxy,
             string scopeIdentifier,
-            TimeSpan timeout,
-            ServiceBusTransportMetrics metrics)
+            TimeSpan timeout)
         {
             var serviceHostName = serviceEndpoint.Host;
             var connectionHostName = connectionEndpoint.Host;
@@ -483,10 +479,6 @@ protected virtual async Task<AmqpConnection> CreateAndOpenConnectionAsync(
             TransportBase transport = await initiator.ConnectTaskAsync(timeout).ConfigureAwait(false);
 
             var connection = new AmqpConnection(transport, amqpSettings, connectionSetings);
-            if (metrics != null)
-            {
-                connection.UsageMeter = new AmqpUsageMeter(metrics);
-            }
 
             await OpenAmqpObjectAsync(connection, timeout.CalculateRemaining(stopWatch.GetElapsedTime())).ConfigureAwait(false);
 

sdk/servicebus/Azure.Messaging.ServiceBus/src/Amqp/AmqpUsageMeter.cs

@@ -93,15 +93,6 @@ public virtual async ValueTask DisposeAsync()
             }
         }
 
-        /// <summary>
-        /// Gets the metrics associated with this <see cref="ServiceBusClient"/> instance. The metrics returned represent a snapshot and will not be updated.
-        /// To get updated metrics, this method should be called again.
-        /// In order to use this property, <see cref="ServiceBusClientOptions.EnableTransportMetrics"/> must be set to <value>true</value>.
-        /// </summary>
-        internal virtual ServiceBusTransportMetrics GetTransportMetrics()
-            => Connection.InnerClient.TransportMetrics?.Clone() ??
-               throw new InvalidOperationException("Transport metrics are not enabled. To enable transport metrics, set the EnableTransportMetrics property on the ServiceBusClientOptions.");
-
         /// <summary>
         /// The connection that is used for the client.
         /// </summary>

sdk/servicebus/Azure.Messaging.ServiceBus/src/Client/ServiceBusClient.cs

@@ -81,12 +81,6 @@ public ServiceBusRetryOptions RetryOptions
         ///</value>
         public bool EnableCrossEntityTransactions { get; set; }
 
-        /// <summary>
-        /// Gets or sets whether or not to enable metrics for the associated <see cref="ServiceBusClient"/> instance.
-        /// If set to <value>true</value>, <see cref="ServiceBusClient.GetTransportMetrics"/> can be called.
-        /// </summary>
-        internal bool EnableTransportMetrics { get; set; }
-
         /// <summary>
         ///   Determines whether the specified <see cref="System.Object" /> is equal to this instance.
         /// </summary>
@@ -129,7 +123,6 @@ internal ServiceBusClientOptions Clone() =>
                 WebProxy = WebProxy,
                 RetryOptions = RetryOptions.Clone(),
                 EnableCrossEntityTransactions = EnableCrossEntityTransactions,
-                EnableTransportMetrics = EnableTransportMetrics,
                 CustomEndpointAddress = CustomEndpointAddress,
                 Identifier = Identifier
             };

sdk/servicebus/Azure.Messaging.ServiceBus/src/Client/ServiceBusClientOptions.cs

@@ -35,11 +35,6 @@ internal abstract class TransportClient : IAsyncDisposable
         ///
         public virtual Uri ServiceEndpoint { get; }
 
-        /// <summary>
-        /// The metrics related to the client.
-        /// </summary>
-        public virtual ServiceBusTransportMetrics TransportMetrics { get; }
-
         /// <summary>
         ///   Creates a sender strongly aligned with the active protocol and transport,
         ///   responsible for sending <see cref="ServiceBusMessage" /> to the entity.

sdk/servicebus/Azure.Messaging.ServiceBus/src/Client/ServiceBusTransportMetrics.cs

@@ -428,24 +428,6 @@ public static ServiceBusMessageBatch ServiceBusMessageBatch(long batchSizeBytes,
             return new ServiceBusMessageBatch(transportBatch, new EntityScopeFactory("mock", "mock"));
         }
 
-        /// <summary>
-        /// Creates a new <see cref="ServiceBusTransportMetrics"/> instance for mocking.
-        /// </summary>
-        /// <param name="lastHeartbeat">The last time that a heartbeat was received from the service.</param>
-        /// <param name="lastConnectionOpen">The last time that a connection was opened.</param>
-        /// <param name="lastConnectionClose">The last time that a connection was closed.</param>
-        /// <returns></returns>
-        internal static ServiceBusTransportMetrics ServiceBusTransportMetrics(
-            DateTimeOffset? lastHeartbeat = default,
-            DateTimeOffset? lastConnectionOpen = default,
-            DateTimeOffset? lastConnectionClose = default)
-            => new()
-            {
-                LastHeartBeat = lastHeartbeat,
-                LastConnectionOpen = lastConnectionOpen,
-                LastConnectionClose = lastConnectionClose
-            };
-
         /// <summary>
         ///   Allows for the transport event batch created by the factory to be injected for testing purposes.
         /// </summary>

sdk/servicebus/Azure.Messaging.ServiceBus/src/Core/TransportClient.cs

@@ -146,7 +146,7 @@ public async Task OpenLinkAssociatesSendLinkSource()
             var cancellationSource = new CancellationTokenSource();
             var mockSession = new AmqpSession(mockConnection, new AmqpSessionSettings(), Mock.Of<ILinkFactory>());
 
-            var mockScope = new Mock<AmqpConnectionScope>(endpoint, endpoint, credential.Object, ServiceBusTransportType.AmqpTcp, null, false, default, default)
+            var mockScope = new Mock<AmqpConnectionScope>(endpoint, endpoint, credential.Object, ServiceBusTransportType.AmqpTcp, null, false, default)
             {
                 CallBase = true,
             };
@@ -160,8 +160,7 @@ public async Task OpenLinkAssociatesSendLinkSource()
                 ItExpr.IsAny<ServiceBusTransportType>(),
                 ItExpr.IsAny<IWebProxy>(),
                 ItExpr.IsAny<string>(),
-                ItExpr.IsAny<TimeSpan>(),
-                ItExpr.IsAny<ServiceBusTransportMetrics>())
+                ItExpr.IsAny<TimeSpan>())
                 .Returns(Task.FromResult(mockConnection))
                 .Verifiable();
 
@@ -215,7 +214,7 @@ public async Task OpenLinkAssociatesReceiveLinkTarget()
             var cancellationSource = new CancellationTokenSource();
             var mockSession = new AmqpSession(mockConnection, new AmqpSessionSettings(), Mock.Of<ILinkFactory>());
 
-            var mockScope = new Mock<AmqpConnectionScope>(endpoint, endpoint, credential.Object, ServiceBusTransportType.AmqpTcp, null, false, default, default)
+            var mockScope = new Mock<AmqpConnectionScope>(endpoint, endpoint, credential.Object, ServiceBusTransportType.AmqpTcp, null, false, default)
             {
                 CallBase = true,
             };
@@ -229,8 +228,7 @@ public async Task OpenLinkAssociatesReceiveLinkTarget()
                 ItExpr.IsAny<ServiceBusTransportType>(),
                 ItExpr.IsAny<IWebProxy>(),
                 ItExpr.IsAny<string>(),
-                ItExpr.IsAny<TimeSpan>(),
-                ItExpr.IsAny<ServiceBusTransportMetrics>())
+                ItExpr.IsAny<TimeSpan>())
                 .Returns(Task.FromResult(mockConnection))
                 .Verifiable();
 
@@ -357,7 +355,7 @@ public MockConnectionScope(
                 Uri customConnectionEndpoint,
                 ServiceBusTokenCredential credential,
                 ServiceBusTransportType transport,
-                IWebProxy proxy) : base(serviceEndpoint, customConnectionEndpoint, credential, transport, proxy, false, default, default)
+                IWebProxy proxy) : base(serviceEndpoint, customConnectionEndpoint, credential, transport, proxy, false, default)
             {
                 MockConnection = new Mock<AmqpConnection>(new MockTransport(), CreateMockAmqpSettings(), new AmqpConnectionSettings());
             }
@@ -377,8 +375,7 @@ protected override Task<AmqpConnection> CreateAndOpenConnectionAsync(Version amq
                                                                                 ServiceBusTransportType transportType,
                                                                                 IWebProxy proxy,
                                                                                 string scopeIdentifier,
-                                                                                TimeSpan timeout,
-                                                                                ServiceBusTransportMetrics metrics)
+                                                                                TimeSpan timeout)
             {
                 return Task.FromResult(MockConnection.Object);
             }

sdk/servicebus/Azure.Messaging.ServiceBus/src/Primitives/ServiceBusModelFactory.cs

@@ -267,72 +267,5 @@ public async Task CanAcceptBlankSession()
                 Assert.AreEqual("", receiver.SessionId);
             }
         }
-
-        [Test]
-        public async Task MetricsAreUpdatedCorrectly()
-        {
-            await using (var scope = await ServiceBusScope.CreateWithQueue(enablePartitioning: false, enableSession: false))
-            {
-                await using var client = new ServiceBusClient(TestEnvironment.ServiceBusConnectionString, new ServiceBusClientOptions { EnableTransportMetrics = true });
-
-                ServiceBusSender sender = client.CreateSender(scope.QueueName);
-
-                await sender.SendMessageAsync(new ServiceBusMessage());
-                var metrics = client.GetTransportMetrics();
-                var firstHeartBeat = metrics.LastHeartBeat;
-                var firstOpen = metrics.LastConnectionOpen;
-                Assert.GreaterOrEqual(firstOpen, firstHeartBeat);
-
-                SimulateNetworkFailure(client);
-                await sender.SendMessageAsync(new ServiceBusMessage());
-
-                metrics = client.GetTransportMetrics();
-                var secondOpen = metrics.LastConnectionOpen;
-                Assert.Greater(secondOpen, firstOpen);
-
-                SimulateNetworkFailure(client);
-                var receiver = client.CreateReceiver(scope.QueueName);
-                await receiver.ReceiveMessageAsync(TimeSpan.FromSeconds(30));
-
-                metrics = client.GetTransportMetrics();
-                var thirdOpen = metrics.LastConnectionOpen;
-                Assert.Greater(thirdOpen, secondOpen);
-
-                await client.DisposeAsync();
-                // The close frame does not come back from the service before the DisposeAsync
-                // call is returned.
-                await Task.Delay(1000);
-                metrics = client.GetTransportMetrics();
-                Assert.Greater(metrics.LastConnectionClose, thirdOpen);
-                Assert.Greater(metrics.LastHeartBeat, firstHeartBeat);
-            }
-        }
-
-        [Test]
-        public async Task MetricsInstanceIsNotMutated()
-        {
-            await using (var scope = await ServiceBusScope.CreateWithQueue(enablePartitioning: false, enableSession: false))
-            {
-                await using var client = new ServiceBusClient(TestEnvironment.ServiceBusConnectionString, new ServiceBusClientOptions { EnableTransportMetrics = true });
-
-                ServiceBusSender sender = client.CreateSender(scope.QueueName);
-
-                await sender.SendMessageAsync(new ServiceBusMessage());
-                var metrics = client.GetTransportMetrics();
-                var firstHeartBeat = metrics.LastHeartBeat;
-                var firstOpen = metrics.LastConnectionOpen;
-                Assert.GreaterOrEqual(firstOpen, firstHeartBeat);
-
-                SimulateNetworkFailure(client);
-                await sender.SendMessageAsync(new ServiceBusMessage());
-                Assert.AreEqual(firstOpen, metrics.LastConnectionOpen);
-
-                await client.DisposeAsync();
-                // The close frame does not come back from the service before the DisposeAsync
-                // call is returned.
-                await Task.Delay(500);
-                Assert.IsNull(metrics.LastConnectionClose);
-            }
-        }
     }
 }