-
-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Provide all metric labels in OpenTelemetry & StatsD (#2183)
Co-authored-by: Sagi Vaknin <[email protected]>
- Loading branch information
1 parent
d89f60c
commit 2ae09eb
Showing
27 changed files
with
231 additions
and
113 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using GuardNet; | ||
| using Microsoft.Extensions.Logging; | ||
| using Promitor.Core; | ||
| using Promitor.Core.Metrics; | ||
| using Promitor.Core.Scraping.Configuration.Providers.Interfaces; | ||
|
|
||
| namespace Promitor.Integrations.Sinks.Core | ||
| { | ||
| public class MetricSink | ||
| { | ||
| protected ILogger Logger { get; } | ||
| protected IMetricsDeclarationProvider MetricsDeclarationProvider { get; } | ||
|
|
||
| protected MetricSink(IMetricsDeclarationProvider metricsDeclarationProvider, ILogger logger) | ||
| { | ||
| Guard.NotNull(metricsDeclarationProvider, nameof(metricsDeclarationProvider)); | ||
| Guard.NotNull(logger, nameof(logger)); | ||
|
|
||
| MetricsDeclarationProvider = metricsDeclarationProvider; | ||
| Logger = logger; | ||
| } | ||
|
|
||
| public Dictionary<string, string> DetermineLabels(string metricName, ScrapeResult scrapeResult, MeasuredMetric measuredMetric, Func<string, string> mutateLabelName = null) | ||
| { | ||
| var metricDefinition = MetricsDeclarationProvider.GetPrometheusDefinition(metricName); | ||
| var defaultLabels = MetricsDeclarationProvider.GetDefaultLabels(); | ||
|
|
||
| var labels = new Dictionary<string, string>(scrapeResult.Labels.Select(label => | ||
| { | ||
| var labelName = DetermineLabelName(label.Key, mutateLabelName); | ||
| return new KeyValuePair<string, string>(labelName, label.Value); | ||
| })); | ||
|
|
||
| if (measuredMetric.IsDimensional) | ||
| { | ||
| labels.Add(DetermineLabelName(measuredMetric.DimensionName, mutateLabelName), measuredMetric.DimensionValue); | ||
| } | ||
|
|
||
| if (metricDefinition?.Labels?.Any() == true) | ||
| { | ||
| foreach (var customLabel in metricDefinition.Labels) | ||
| { | ||
| var customLabelKey = DetermineLabelName(customLabel.Key, mutateLabelName); | ||
| if (labels.TryGetValue(customLabelKey, out var label)) | ||
| { | ||
| Logger.LogWarning("Custom label {CustomLabelName} was already specified with value '{LabelValue}' instead of '{CustomLabelValue}'. Ignoring...", customLabel.Key, label, customLabel.Value); | ||
| continue; | ||
| } | ||
|
|
||
| labels.Add(customLabelKey, customLabel.Value); | ||
| } | ||
| } | ||
|
|
||
| foreach (var defaultLabel in defaultLabels) | ||
| { | ||
| var defaultLabelKey = DetermineLabelName(defaultLabel.Key, mutateLabelName); | ||
| labels.TryAdd(defaultLabelKey, defaultLabel.Value); | ||
| } | ||
|
|
||
| // Add the tenant id | ||
| var metricsDeclaration = MetricsDeclarationProvider.Get(applyDefaults: true); | ||
| labels.TryAdd("tenant_id", metricsDeclaration.AzureMetadata.TenantId); | ||
|
|
||
| var orderedLabels = labels.OrderBy(kvp => kvp.Key).ToDictionary(kvp => kvp.Key, kvp => kvp.Value); | ||
|
|
||
| return orderedLabels; | ||
| } | ||
|
|
||
| private static string DetermineLabelName(string originalLabelName, Func<string, string> mutateLabelName) | ||
| { | ||
| return mutateLabelName!= null ? mutateLabelName.Invoke(originalLabelName) : originalLabelName; | ||
| } | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
src/Promitor.Integrations.Sinks.Core/Promitor.Integrations.Sinks.Core.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net7.0</TargetFramework> | ||
| <RuntimeFrameworkVersion>7.0.7</RuntimeFrameworkVersion> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> | ||
| <NoWarn>1701;1702;1591</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| <NoWarn>1701;1702;1591</NoWarn> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\Promitor.Core.Scraping\Promitor.Core.Scraping.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.