Merge branch 'main' into vibankwa/add-persistent-storage-apis-to-otlp

open-telemetry · Aug 25, 2023 · 990fddb · 990fddb
2 parents 196ebed + 0ee80d5
commit 990fddb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/examples/AspNetCore/README.md b/examples/AspNetCore/README.md
@@ -1,6 +1,6 @@
-# OpenTelemetry ASP.Net Core 6  Web API Example
+# OpenTelemetry ASP.NET Core 7 Web API Example
 
-This example uses the new WebApplication host that ships with .Net 6
+This example uses the new WebApplication host that ships with .NET 7
 and shows how to setup
 
 1. OpenTelemetry logging

diff --git a/src/OpenTelemetry/CHANGELOG.md b/src/OpenTelemetry/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Increased the character limit of the Meter instrument name from 63 to 255.
+  ([#4774](https://github.com/open-telemetry/opentelemetry-dotnet/issues/4774))
+
 ## 1.6.0-rc.1
 
 Released 2023-Aug-21

diff --git a/src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderSdk.cs b/src/OpenTelemetry/Metrics/Builder/MeterProviderBuilderSdk.cs
@@ -48,7 +48,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,62}$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        @"^[a-z][a-z0-9-._]{0,254}$", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
     public List<InstrumentationRegistration> Instrumentation { get; } = new();
 

diff --git a/test/OpenTelemetry.Tests/Metrics/MetricTestData.cs b/test/OpenTelemetry.Tests/Metrics/MetricTestData.cs
@@ -25,7 +25,7 @@ public static IEnumerable<object[]> InvalidInstrumentNames
                 new object[] { "-first-char-not-alphabetic" },
                 new object[] { "1first-char-not-alphabetic" },
                 new object[] { "invalid+separator" },
-                new object[] { new string('m', 64) },
+                new object[] { new string('m', 256) },
                 new object[] { "a\xb5" }, // `\xb5` is the Micro character
        };
 
@@ -37,7 +37,7 @@ public static IEnumerable<object[]> ValidInstrumentNames
                 new object[] { "my-2-instrument" },
                 new object[] { "my.metric" },
                 new object[] { "my_metric2" },
-                new object[] { new string('m', 63) },
+                new object[] { new string('m', 255) },
                 new object[] { "CaSe-InSeNsItIvE" },
        };