Renames to match the diagnostics changes

dotnet · Nov 28, 2023 · 063fc07 · 063fc07
1 parent d01a126
commit 063fc07
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 29 deletions.
diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs
@@ -43,7 +43,7 @@ protected override async Task SerializeAsync(ICounterPayload counter)
             }
             else if (counter is CounterEndedPayload)
             {
-                Logger.CounterEndedPayload(counter.CounterInfo.CounterName);
+                Logger.CounterEndedPayload(counter.CounterMetadata.CounterName);
                 return;
             }
             else if (!counter.EventType.IsValuePublishedEvent())
@@ -70,16 +70,16 @@ protected override async Task SerializeAsync(ICounterPayload counter)
                     Quantile quantile = aggregatePercentilePayload.Quantiles[i];
 
                     SerializeCounterValues(counter.Timestamp,
-                        counter.CounterInfo.ProviderName,
-                        counter.CounterInfo.CounterName,
+                        counter.CounterMetadata.ProviderName,
+                        counter.CounterMetadata.CounterName,
                         counter.DisplayName,
                         counter.Unit,
                         counter.CounterType.ToString(),
-                        CounterUtilities.AppendPercentile(counter.Metadata, quantile.Percentage),
+                        CounterUtilities.AppendPercentile(counter.ValueTags, quantile.Percentage),
                         quantile.Value,
-                        counter.CounterInfo.MeterTags,
-                        counter.CounterInfo.InstrumentTags,
-                        counter.CounterInfo.ScopeHash);
+                        counter.CounterMetadata.MeterTags,
+                        counter.CounterMetadata.InstrumentTags,
+                        counter.CounterMetadata.ScopeHash);
 
                     if (i < aggregatePercentilePayload.Quantiles.Length - 1)
                     {
@@ -93,16 +93,16 @@ protected override async Task SerializeAsync(ICounterPayload counter)
                 _bufferWriter.Clear();
 
                 SerializeCounterValues(counter.Timestamp,
-                    counter.CounterInfo.ProviderName,
-                    counter.CounterInfo.CounterName,
+                    counter.CounterMetadata.ProviderName,
+                    counter.CounterMetadata.CounterName,
                     counter.DisplayName,
                     counter.Unit,
                     counter.CounterType.ToString(),
-                    counter.Metadata,
+                    counter.ValueTags,
                     counter.Value,
-                    counter.CounterInfo.MeterTags,
-                    counter.CounterInfo.InstrumentTags,
-                    counter.CounterInfo.ScopeHash);
+                    counter.CounterMetadata.MeterTags,
+                    counter.CounterMetadata.InstrumentTags,
+                    counter.CounterMetadata.ScopeHash);
             }
             await _stream.WriteAsync(_bufferWriter.WrittenMemory);
 

diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs
@@ -30,8 +30,8 @@ public MetricKey(ICounterPayload metric)
             public override int GetHashCode()
             {
                 HashCode code = new HashCode();
-                code.Add(_metric.CounterInfo.ProviderName);
-                code.Add(_metric.CounterInfo.CounterName);
+                code.Add(_metric.CounterMetadata.ProviderName);
+                code.Add(_metric.CounterMetadata.CounterName);
                 return code.ToHashCode();
             }
 
@@ -73,9 +73,9 @@ public void AddMetric(ICounterPayload metric)
             //Do not accept CounterEnded payloads.
             if (metric is CounterEndedPayload counterEnded)
             {
-                if (_observedEndedCounters.Add((counterEnded.CounterInfo.ProviderName, counterEnded.CounterInfo.CounterName)))
+                if (_observedEndedCounters.Add((counterEnded.CounterMetadata.ProviderName, counterEnded.CounterMetadata.CounterName)))
                 {
-                    _logger.CounterEndedPayload(counterEnded.CounterInfo.CounterName);
+                    _logger.CounterEndedPayload(counterEnded.CounterMetadata.CounterName);
                 }
                 return;
             }
@@ -137,7 +137,7 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token)
             {
                 ICounterPayload metricInfo = metricGroup.Value.First();
 
-                string metricName = PrometheusDataModel.GetPrometheusNormalizedName(metricInfo.CounterInfo.ProviderName, metricInfo.CounterInfo.CounterName, metricInfo.Unit);
+                string metricName = PrometheusDataModel.GetPrometheusNormalizedName(metricInfo.CounterMetadata.ProviderName, metricInfo.CounterMetadata.CounterName, metricInfo.Unit);
 
                 await WriteMetricHeader(metricInfo, writer, metricName);
 
@@ -243,7 +243,7 @@ private static async Task WriteMetricDetails(
 
         private static bool CompareMetrics(ICounterPayload first, ICounterPayload second)
         {
-            return string.Equals(first.CounterInfo.CounterName, second.CounterInfo.CounterName);
+            return string.Equals(first.CounterMetadata.CounterName, second.CounterMetadata.CounterName);
         }
 
         public void Clear()

diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/MetricsFormattingTests.cs
@@ -44,7 +44,7 @@ public async Task HistogramFormat_Test()
         {
             List<ICounterPayload> payload = new();
 
-            CachedCounterInfo counterInfo = new CachedCounterInfo(MeterName, InstrumentName, null, null, null);
+            CounterMetadata counterInfo = new CounterMetadata(MeterName, InstrumentName, null, null, null);
 
             payload.Add(new AggregatePercentilePayload(counterInfo, "DisplayName", string.Empty, string.Empty,
                 new Quantile[] { new Quantile(0.5, Value1), new Quantile(0.95, Value2), new Quantile(0.99, Value3) },
@@ -53,7 +53,7 @@ public async Task HistogramFormat_Test()
             using MemoryStream stream = await GetMetrics(payload);
             List<string> lines = ReadStream(stream);
 
-            string metricName = $"{MeterName.ToLowerInvariant()}_{payload[0].CounterInfo.CounterName}";
+            string metricName = $"{MeterName.ToLowerInvariant()}_{payload[0].CounterMetadata.CounterName}";
 
             const string quantile_50 = "{quantile=\"0.5\"}";
             const string quantile_95 = "{quantile=\"0.95\"}";
@@ -70,15 +70,15 @@ public async Task HistogramFormat_Test()
         [Fact]
         public async Task GaugeFormat_Test()
         {
-            CachedCounterInfo counterInfo = new CachedCounterInfo(MeterName, InstrumentName, null, null, null);
+            CounterMetadata counterInfo = new CounterMetadata(MeterName, InstrumentName, null, null, null);
 
             ICounterPayload payload = new GaugePayload(counterInfo, "DisplayName", "", null, Value1, Timestamp);
 
             MemoryStream stream = await GetMetrics(new() { payload });
 
             List<string> lines = ReadStream(stream);
 
-            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterInfo.CounterName}";
+            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterMetadata.CounterName}";
 
             Assert.Equal(3, lines.Count);
             Assert.Equal(FormattableString.Invariant($"# HELP {metricName}{payload.Unit} {payload.DisplayName}"), lines[0]);
@@ -89,15 +89,15 @@ public async Task GaugeFormat_Test()
         [Fact]
         public async Task CounterFormat_Test()
         {
-            CachedCounterInfo counterInfo = new CachedCounterInfo(MeterName, InstrumentName, null, null, null);
+            CounterMetadata counterInfo = new CounterMetadata(MeterName, InstrumentName, null, null, null);
 
             ICounterPayload payload = new RatePayload(counterInfo, "DisplayName", "", null, Value1, IntervalSeconds, Timestamp);
 
             MemoryStream stream = await GetMetrics(new() { payload });
 
             List<string> lines = ReadStream(stream);
 
-            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterInfo.CounterName}";
+            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterMetadata.CounterName}";
 
             Assert.Equal(3, lines.Count);
             Assert.Equal($"# HELP {metricName}{payload.Unit} {payload.DisplayName}", lines[0]);
@@ -112,15 +112,15 @@ public async Task CounterFormat_Test_Tags()
             string instrumentTags = "InstrumentTagKey=InstrumentTagValue,InstrumentTagKey2=InstrumentTagValue2";
             string scopeHash = "123";
 
-            CachedCounterInfo counterInfo = new CachedCounterInfo(MeterName, InstrumentName, meterTags, instrumentTags, scopeHash);
+            CounterMetadata counterInfo = new CounterMetadata(MeterName, InstrumentName, meterTags, instrumentTags, scopeHash);
 
             ICounterPayload payload = new RatePayload(counterInfo, "DisplayName", "", null, Value1, IntervalSeconds, Timestamp);
 
             MemoryStream stream = await GetMetrics(new() { payload });
 
             List<string> lines = ReadStream(stream);
 
-            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterInfo.CounterName}";
+            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterMetadata.CounterName}";
             string metricTags = "{MeterTagKey=\"MeterTagValue\", MeterTagKey2=\"MeterTagValue2\", InstrumentTagKey=\"InstrumentTagValue\", InstrumentTagKey2=\"InstrumentTagValue2\"}";
 
             Assert.Equal(3, lines.Count);
@@ -132,15 +132,15 @@ public async Task CounterFormat_Test_Tags()
         [Fact]
         public async Task UpDownCounterFormat_Test()
         {
-            CachedCounterInfo counterInfo = new CachedCounterInfo(MeterName, InstrumentName, null, null, null);
+            CounterMetadata counterInfo = new CounterMetadata(MeterName, InstrumentName, null, null, null);
 
             ICounterPayload payload = new UpDownCounterPayload(counterInfo, "DisplayName", "", null, Value1, Timestamp);
 
             MemoryStream stream = await GetMetrics(new() { payload });
 
             List<string> lines = ReadStream(stream);
 
-            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterInfo.CounterName}";
+            string metricName = $"{MeterName.ToLowerInvariant()}_{payload.CounterMetadata.CounterName}";
 
             Assert.Equal(3, lines.Count);
             Assert.Equal(FormattableString.Invariant($"# HELP {metricName}{payload.Unit} {payload.DisplayName}"), lines[0]);