progress

Author: maximsemenov80

dotnet/src/Azure.Iot.Operations.Services/Observability/CachedCounter.cs

@@ -31,11 +31,6 @@ public void Add(double value)
         });
     }
 
-    public void Increment()
-    {
-        Add(1);
-    }
-
     public List<IncrementOperation> GetOperationsAndClear(int maxCount)
     {
         var result = new List<IncrementOperation>();

dotnet/src/Azure.Iot.Operations.Services/Observability/ICounter.cs

@@ -6,5 +6,4 @@ namespace Azure.Iot.Operations.Services.Observability;
 public interface ICounter : IMetric
 {
     void Add(double value);
-    void Increment();
 }

dotnet/src/Azure.Iot.Operations.Services/Observability/IMetricsReporterService.cs

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Azure.Iot.Operations.Services.Observability;
+
+public interface IMetricsReporterService
+{
+    void Start(CancellationToken cancellationToken = default);
+    Task StopAsync();
+    ICounter CreateCounter(string name, Dictionary<string, string> labels, string? unit = null);
+    IGauge CreateGauge(string name, Dictionary<string, string> labels, string? unit = null);
+    IHistogram CreateHistogram(string name, Dictionary<string, string> labels, string? unit = null);
+}

dotnet/src/Azure.Iot.Operations.Services/Observability/MetricsReporterService.cs

@@ -3,10 +3,12 @@
 
 using Azure.Iot.Operations.Protocol.RPC;
 using Azure.Iot.Operations.Services.Observability.AkriObservabilityService;
+using Azure.Iot.Operations.Services.Observability.Utils;
+using ITimer = Azure.Iot.Operations.Services.Observability.Utils.ITimer;
 
 namespace Azure.Iot.Operations.Services.Observability;
 
-public class MetricsReporterService : IAsyncDisposable
+public class MetricsReporterService : IAsyncDisposable, IMetricsReporterService
 {
     private readonly IAkriObservabilityService _observabilityService;
     private readonly MetricsReporterOptions _options;

dotnet/src/Azure.Iot.Operations.Services/Observability/DefaultTimerFactory.cs renamed to dotnet/src/Azure.Iot.Operations.Services/Observability/Utils/DefaultTimerFactory.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-namespace Azure.Iot.Operations.Services.Observability;
+namespace Azure.Iot.Operations.Services.Observability.Utils;
 
 public class DefaultTimerFactory : ITimerFactory
 {

dotnet/src/Azure.Iot.Operations.Services/Observability/ITimer.cs renamed to dotnet/src/Azure.Iot.Operations.Services/Observability/Utils/ITimer.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-namespace Azure.Iot.Operations.Services.Observability;
+namespace Azure.Iot.Operations.Services.Observability.Utils;
 
 public interface ITimer : IAsyncDisposable
 {

dotnet/src/Azure.Iot.Operations.Services/Observability/ITimerFactory.cs renamed to dotnet/src/Azure.Iot.Operations.Services/Observability/Utils/ITimerFactory.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-namespace Azure.Iot.Operations.Services.Observability;
+namespace Azure.Iot.Operations.Services.Observability.Utils;
 
 public interface ITimerFactory
 {

dotnet/src/Azure.Iot.Operations.Services/Observability/TimerWrapper.cs renamed to dotnet/src/Azure.Iot.Operations.Services/Observability/Utils/TimerWrapper.cs

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-namespace Azure.Iot.Operations.Services.Observability
+namespace Azure.Iot.Operations.Services.Observability.Utils
 {
     public class TimerWrapper : ITimer
     {

dotnet/test/Azure.Iot.Operations.Services.UnitTests/Observability/CachedCounterTests.cs

@@ -49,21 +49,6 @@ public void Add_AddsOperationToQueue()
         Assert.True(operations[0].Timestamp >= DateTime.UtcNow.AddMinutes(-1)); // Should be recent
     }
 
-    [Fact]
-    public void Increment_AddsOperationWithValueOne()
-    {
-        // Arrange
-        var counter = new CachedCounter(_name, _labels, _unit);
-
-        // Act
-        counter.Increment();
-
-        // Assert
-        var operations = counter.GetOperationsAndClear(10);
-        Assert.Single(operations);
-        Assert.Equal(1.0, operations[0].Value);
-    }
-
     [Fact]
     public void MultipleOperations_AddedCorrectly()
     {
@@ -72,7 +57,7 @@ public void MultipleOperations_AddedCorrectly()
 
         // Act
         counter.Add(3.0);
-        counter.Increment();
+        counter.Add(1.0);
         counter.Add(7.5);
 
         // Assert

dotnet/test/Azure.Iot.Operations.Services.UnitTests/Observability/MetricsReporterServiceTests.cs

@@ -4,9 +4,10 @@
 using Azure.Iot.Operations.Protocol.RPC;
 using Azure.Iot.Operations.Services.Observability;
 using Azure.Iot.Operations.Services.Observability.AkriObservabilityService;
+using Azure.Iot.Operations.Services.Observability.Utils;
 using Moq;
 using Xunit;
-using ITimer = Azure.Iot.Operations.Services.Observability.ITimer;
+using ITimer = Azure.Iot.Operations.Services.Observability.Utils.ITimer;
 
 namespace Azure.Iot.Operations.Services.UnitTests.Observability;