Skip to content

[sdk] Allow / in metric instrument names #4882

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.

Sign up for GitHub

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

Merged
CodeBlanch merged 6 commits into from
Sep 26, 2023
Merged

[sdk] Allow / in metric instrument names #4882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ec88674
Allow `/` in metric instrument names
tombiddulph Sep 24, 2023
22976d0
Update src/OpenTelemetry/CHANGELOG.md
tombiddulph Sep 25, 2023
3aeddf1
Merged upstream
tombiddulph Sep 25, 2023
2983a2e
Update changelog order
tombiddulph Sep 25, 2023
86434a1
Merge branch 'main' into update-metric-instrument-regex
CodeBlanch Sep 25, 2023
19fdf67
Merge branch 'main' into update-metric-instrument-regex
reyang Sep 26, 2023
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
2 changes: 2 additions & 0 deletions src/OpenTelemetry/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
`AddInstrumentation` method.
([#4873](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4873))

* Allowed metric instrument names to contain `/` characters. ([#4882](https://github.com/open-telemetry/opentelemetry-dotnet/pull/4882))

## 1.6.0

Released 2023-Sep-05
Expand Down
2 changes: 1 addition & 1 deletion src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderSdk.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public MeterProviderBuilderSdk(IServiceProvider serviceProvider)
// Customers: This is not guaranteed to work forever. We may change this
// mechanism in the future do this at your own risk.
public static Regex InstrumentNameRegex { get; set; } = new(
@"^[a-z][a-z0-9-._]{0,254}$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
@"^[a-z][a-z0-9-._/]{0,254}$", RegexOptions.IgnoreCase | RegexOptions.Compiled);

public List<InstrumentationRegistration> Instrumentation { get; } = new();

Expand Down
1 change: 1 addition & 0 deletions test/OpenTelemetry.Tests/Metrics/MetricTestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public static IEnumerable<object[]> ValidInstrumentNames
new object[] { "my_metric2" },
new object[] { new string('m', 255) },
new object[] { "CaSe-InSeNsItIvE" },
new object[] { "my_metric/environment/database" },
};

public static IEnumerable<object[]> InvalidHistogramBoundaries
Expand Down