diff --git a/eng/dependabot/Versions.props b/eng/dependabot/Versions.props index c308f6c84bd..4080aefacbb 100644 --- a/eng/dependabot/Versions.props +++ b/eng/dependabot/Versions.props @@ -23,6 +23,6 @@ - 8.0.452401 + 8.0.510501 diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs index f34c28e3147..88b5e2dfdee 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/JsonCounterLogger.cs @@ -20,8 +20,8 @@ protected override void SerializeCounter(Stream stream, ICounterPayload counter) { writer.WriteStartObject(); writer.WriteString("timestamp", counter.Timestamp); - writer.WriteString("provider", counter.Provider); - writer.WriteString("name", counter.Name); + writer.WriteString("provider", counter.CounterMetadata.ProviderName); + writer.WriteString("name", counter.CounterMetadata.CounterName); writer.WriteString("displayName", counter.DisplayName); writer.WriteString("unit", counter.Unit); writer.WriteString("counterType", counter.CounterType.ToString()); diff --git a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs index 0370b2547af..49898dc5e21 100644 --- a/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs +++ b/src/Microsoft.Diagnostics.Monitoring.WebApi/Metrics/MetricsStore.cs @@ -28,8 +28,8 @@ public MetricKey(ICounterPayload metric) public override int GetHashCode() { HashCode code = new HashCode(); - code.Add(_metric.Provider); - code.Add(_metric.Name); + code.Add(_metric.CounterMetadata.ProviderName); + code.Add(_metric.CounterMetadata.CounterName); return code.ToHashCode(); } @@ -91,7 +91,7 @@ public async Task SnapshotMetrics(Stream outputStream, CancellationToken token) foreach (var metricGroup in copy) { ICounterPayload metricInfo = metricGroup.Value.First(); - string metricName = PrometheusDataModel.GetPrometheusNormalizedName(metricInfo.Provider, metricInfo.Name, metricInfo.Unit); + string metricName = PrometheusDataModel.GetPrometheusNormalizedName(metricInfo.CounterMetadata.ProviderName, metricInfo.CounterMetadata.CounterName, metricInfo.Unit); string metricType = "gauge"; //TODO Some clr metrics claim to be incrementing, but are really gauges. @@ -119,7 +119,7 @@ private static async Task WriteMetricDetails( private static bool CompareMetrics(ICounterPayload first, ICounterPayload second) { - return string.Equals(first.Name, second.Name); + return string.Equals(first.CounterMetadata.CounterName, second.CounterMetadata.CounterName); } public void Clear()