Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Warning fixes.
  • Loading branch information
CodeBlanch committed Feb 7, 2024
commit ea6aaceba4d3e43fce688e907418bd81bf209b22
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

#if EXPOSE_EXPERIMENTAL_FEATURES
using System.ComponentModel;
#endif
#if NET6_0_OR_GREATER
using System.Diagnostics.CodeAnalysis;
#endif
#endif
using System.Diagnostics.Metrics;
using System.Text.RegularExpressions;
using Microsoft.Extensions.DependencyInjection;
Expand Down Expand Up @@ -256,40 +256,6 @@ public static MeterProviderBuilder SetMaxMetricPointsPerMetricStream(this MeterP
return meterProviderBuilder;
}

#if EXPOSE_EXPERIMENTAL_FEATURES
/// <summary>
/// Sets a positive integer value defining the maximum number of
/// data points allowed for metrics managed by the MeterProvider.
/// </summary>
/// <remarks>
/// <para><b>WARNING</b>: This is an experimental API which might change or
/// be removed in the future. Use at your own risk.</para>
/// </remarks>
/// <param name="meterProviderBuilder"><see cref="MeterProviderBuilder"/>.</param>
/// <param name="cardinalityLimit">Cardinality limit.</param>
/// <returns>The supplied <see cref="MeterProviderBuilder"/> for chaining.</returns>
#if NET8_0_OR_GREATER
[Experimental(DiagnosticDefinitions.CardinalityLimitExperimentalApi, UrlFormat = DiagnosticDefinitions.ExperimentalApiUrlFormat)]
#endif
public
#else
internal
#endif
static MeterProviderBuilder SetCardinalityLimit(this MeterProviderBuilder meterProviderBuilder, int cardinalityLimit)
{
Guard.ThrowIfOutOfRange(cardinalityLimit, min: 1, max: int.MaxValue);

meterProviderBuilder.ConfigureBuilder((sp, builder) =>
{
if (builder is MeterProviderBuilderSdk meterProviderBuilderSdk)
{
meterProviderBuilderSdk.SetCardinalityLimit(cardinalityLimit);
}
});

return meterProviderBuilder;
}

/// <summary>
/// Sets the <see cref="ResourceBuilder"/> from which the Resource associated with
/// this provider is built from. Overwrites currently set ResourceBuilder.
Expand Down Expand Up @@ -351,6 +317,40 @@ public static MeterProvider Build(this MeterProviderBuilder meterProviderBuilder
throw new NotSupportedException($"Build is not supported on '{meterProviderBuilder?.GetType().FullName ?? "null"}' instances.");
}

#if EXPOSE_EXPERIMENTAL_FEATURES
/// <summary>
/// Sets a positive integer value defining the maximum number of
/// data points allowed for metrics managed by the MeterProvider.
/// </summary>
/// <remarks>
/// <para><b>WARNING</b>: This is an experimental API which might change or
/// be removed in the future. Use at your own risk.</para>
/// </remarks>
/// <param name="meterProviderBuilder"><see cref="MeterProviderBuilder"/>.</param>
/// <param name="cardinalityLimit">Cardinality limit.</param>
/// <returns>The supplied <see cref="MeterProviderBuilder"/> for chaining.</returns>
#if NET8_0_OR_GREATER
[Experimental(DiagnosticDefinitions.CardinalityLimitExperimentalApi, UrlFormat = DiagnosticDefinitions.ExperimentalApiUrlFormat)]
#endif
public
#else
internal
#endif
static MeterProviderBuilder SetCardinalityLimit(this MeterProviderBuilder meterProviderBuilder, int cardinalityLimit)
{
Guard.ThrowIfOutOfRange(cardinalityLimit, min: 1, max: int.MaxValue);

meterProviderBuilder.ConfigureBuilder((sp, builder) =>
{
if (builder is MeterProviderBuilderSdk meterProviderBuilderSdk)
{
meterProviderBuilderSdk.SetCardinalityLimit(cardinalityLimit);
}
});

return meterProviderBuilder;
}

#if EXPOSE_EXPERIMENTAL_FEATURES
/// <summary>
/// Sets the <see cref="ExemplarFilter"/> to be used for this provider.
Expand Down
2 changes: 1 addition & 1 deletion test/OpenTelemetry.Tests/Metrics/MetricViewTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@ public void CardinalityLimitofMatchingViewTakesPrecedenceOverMetricProviderWhenB

using var container = this.BuildMeterProvider(out var meterProvider, builder => builder
.AddMeter(meter.Name)
.SetMaxMetricPointsPerMetricStream(3)
.SetCardinalityLimit(3)
.AddView((instrument) =>
{
return new MetricStreamConfiguration() { Name = "MetricStreamA", CardinalityLimit = 10000 };
Expand Down