Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added wildcard support for meter sources. #2459

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 40 additions & 5 deletions src/OpenTelemetry/Metrics/MeterProviderSdk.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
using System.Diagnostics;
using System.Diagnostics.Metrics;
using System.Linq;
using System.Text.RegularExpressions;
using OpenTelemetry.Internal;
using OpenTelemetry.Resources;

Expand Down Expand Up @@ -87,10 +88,38 @@ internal MeterProviderSdk(
}

// Setup Listener
var meterSourcesToSubscribe = new Dictionary<string, bool>(StringComparer.OrdinalIgnoreCase);
foreach (var name in meterSources)
var meterSourcesToSubscribe = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
Yun-Ting marked this conversation as resolved.
Show resolved Hide resolved

if (meterSources.Any())
{
meterSourcesToSubscribe[name] = true;
var wildcardMode = false;
foreach (var meterSource in meterSources)
{
if (meterSource.Contains('*'))
{
wildcardMode = true;
break;
}
}

if (wildcardMode)
{
Regex regex = GetWildcardRegex(meterSources);
foreach (var meterSource in meterSources)
Yun-Ting marked this conversation as resolved.
Show resolved Hide resolved
{
if (regex.IsMatch(meterSource))
Yun-Ting marked this conversation as resolved.
Show resolved Hide resolved
{
meterSourcesToSubscribe.Add(meterSource);
}
}
}
else
{
foreach (var meterSource in meterSources)
{
meterSourcesToSubscribe.Add(meterSource);
}
}
}

this.listener = new MeterListener();
Expand All @@ -99,7 +128,7 @@ internal MeterProviderSdk(
{
this.listener.InstrumentPublished = (instrument, listener) =>
{
if (meterSourcesToSubscribe.ContainsKey(instrument.Meter.Name))
if (meterSourcesToSubscribe.Contains(instrument.Meter.Name))
{
// Creating list with initial capacity as the maximum
// possible size, to avoid any array resize/copy internally.
Expand Down Expand Up @@ -197,7 +226,7 @@ internal MeterProviderSdk(
{
this.listener.InstrumentPublished = (instrument, listener) =>
{
if (meterSourcesToSubscribe.ContainsKey(instrument.Meter.Name))
if (meterSourcesToSubscribe.Contains(instrument.Meter.Name))
{
var metricName = instrument.Name;
Metric metric = null;
Expand Down Expand Up @@ -243,6 +272,12 @@ internal MeterProviderSdk(

this.listener.MeasurementsCompleted = (instrument, state) => this.MeasurementsCompleted(instrument, state);
this.listener.Start();

static Regex GetWildcardRegex(IEnumerable<string> collection)
{
var pattern = '^' + string.Join("|", from name in collection select "(?:" + Regex.Escape(name).Replace("\\*", ".*") + ')') + '$';
return new Regex(pattern, RegexOptions.Compiled | RegexOptions.IgnoreCase);
}
}

internal Resource Resource { get; }
Expand Down
30 changes: 30 additions & 0 deletions test/OpenTelemetry.Tests/Metrics/MetricAPITest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,36 @@ void ProcessExport(Batch<Metric> batch)
Assert.Equal(1, metricCount);
}

[Fact]
public void WildCardTest()
{
var metricItems = new List<Metric>();
int metricCount = 0;
var metricExporter = new TestExporter<Metric>(ProcessExport);

void ProcessExport(Batch<Metric> batch)
{
foreach (var metric in batch)
{
metricCount++;
}
}

var meterSources = new[] { "*", "MeterSource.*", "MeterSource.*.Namespace" };

using var meter1 = new Meter(meterSources[0]);
using var meter2 = new Meter(meterSources[1]);
using var meter3 = new Meter(meterSources[2]);

using var meterProvider = Sdk.CreateMeterProviderBuilder()
.AddMeter(meterSources[0])
.AddMeter(meterSources[1])
.AddMeter(meterSources[2])
.Build();

// Do some tests
}

[Theory]
[InlineData(true)]
[InlineData(false)]
Expand Down