Add forward slash to InstrumentName log message (open-telemetry#6343)

breedx-splk · web-flow · commit 6c7770bb25a6 · 2024-04-11T09:32:13.000-05:00
diff --git a/api/all/src/main/java/io/opentelemetry/api/metrics/Meter.java b/api/all/src/main/java/io/opentelemetry/api/metrics/Meter.java
@@ -65,7 +65,7 @@ public interface Meter {
    * callbacks).
    *
    * @param name the name of the Counter. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring a Counter instrument. Defaults to recording long values, but
    *     may be changed.
    * @see <a
@@ -81,7 +81,7 @@ public interface Meter {
    * callbacks).
    *
    * @param name the name of the UpDownCounter. Instrument names must consist of 255 or fewer
-   *     characters including alphanumeric, _, ., -, and start with a letter.
+   *     characters including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring an UpDownCounter instrument. Defaults to recording long
    *     values, but may be changed.
    * @see <a
@@ -94,7 +94,7 @@ public interface Meter {
    * Constructs a Histogram instrument.
    *
    * @param name the name of the Histogram. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder for configuring a Histogram synchronous instrument. Defaults to recording
    *     double values, but may be changed.
    * @see <a
@@ -107,7 +107,7 @@ public interface Meter {
    * Constructs an Asynchronous Gauge instrument.
    *
    * @param name the name of the Gauge. Instrument names must consist of 255 or fewer characters
-   *     including alphanumeric, _, ., -, and start with a letter.
+   *     including alphanumeric, _, ., -, /, and start with a letter.
    * @return a builder used for configuring a Gauge instrument. Defaults to recording double values,
    *     but may be changed.
    * @see <a
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/SdkMeter.java
@@ -163,7 +163,7 @@ static boolean checkValidInstrumentName(String name) {
           Level.WARNING,
           "Instrument name \""
               + name
-              + "\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, and start with a letter.",
+              + "\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, /, and start with a letter.",
           new AssertionError());
     }
 
diff --git a/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterTest.java b/sdk/metrics/src/test/java/io/opentelemetry/sdk/metrics/SdkMeterTest.java
@@ -94,7 +94,7 @@ void builder_InvalidName() {
   void checkValidInstrumentName_InvalidNameLogs() {
     assertThat(checkValidInstrumentName("1")).isFalse();
     sdkMeterLogs.assertContains(
-        "Instrument name \"1\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, and start with a letter.");
+        "Instrument name \"1\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, /, and start with a letter.");
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ static boolean checkValidInstrumentName(String name) {`
`163`	`163`	`Level.WARNING,`
`164`	`164`	`"Instrument name \""`
`165`	`165`	`+ name`
`166`		`- + "\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, and start with a letter.",`
	`166`	`+ + "\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, /, and start with a letter.",`
`167`	`167`	`new AssertionError());`
`168`	`168`	`}`
`169`	`169`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void builder_InvalidName() {`
`94`	`94`	`void checkValidInstrumentName_InvalidNameLogs() {`
`95`	`95`	`assertThat(checkValidInstrumentName("1")).isFalse();`
`96`	`96`	`sdkMeterLogs.assertContains(`
`97`		`- "Instrument name \"1\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, and start with a letter.");`
	`97`	`+ "Instrument name \"1\" is invalid, returning noop instrument. Instrument names must consist of 255 or fewer characters including alphanumeric, _, ., -, /, and start with a letter.");`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`@Test`