Removing all instrument name check conditions under name validation disabling feature flag

Author: anujnegi270

opentelemetry-sdk/src/metrics/meter.rs

@@ -20,21 +20,29 @@ use crate::metrics::{
 use super::noop::NoopSyncInstrument;
 
 // maximum length of instrument name
+#[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_MAX_LENGTH: usize = 255;
+
 // maximum length of instrument unit name
 const INSTRUMENT_UNIT_NAME_MAX_LENGTH: usize = 63;
+
+// Characters allowed in instrument name
 #[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_ALLOWED_NON_ALPHANUMERIC_CHARS: [char; 4] = ['_', '.', '-', '/'];
 
-// instrument validation error strings
+// instrument name validation error strings
+#[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_EMPTY: &str = "instrument name must be non-empty";
+#[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_LENGTH: &str = "instrument name must be less than 256 characters";
 #[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_INVALID_CHAR: &str =
     "characters in instrument name must be ASCII and belong to the alphanumeric characters, '_', '.', '-' and '/'";
 #[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
 const INSTRUMENT_NAME_FIRST_ALPHABETIC: &str =
     "instrument name must start with an alphabetic character";
+
+// instrument unit validation error strings
 const INSTRUMENT_UNIT_LENGTH: &str = "instrument unit must be less than 64 characters";
 const INSTRUMENT_UNIT_INVALID_CHAR: &str = "characters in instrument unit must be ASCII";
 
@@ -584,20 +592,8 @@ fn validate_bucket_boundaries(boundaries: &[f64]) -> MetricResult<()> {
 // }
 
 #[cfg(feature = "experimental_metrics_disable_name_validation")]
-fn validate_instrument_name(name: &str) -> MetricResult<()> {
-    if name.is_empty() {
-        return Err(MetricError::InvalidInstrumentConfiguration(
-            INSTRUMENT_NAME_EMPTY,
-        ));
-    }
-    if name.len() > INSTRUMENT_NAME_MAX_LENGTH {
-        return Err(MetricError::InvalidInstrumentConfiguration(
-            INSTRUMENT_NAME_LENGTH,
-        ));
-    }
-
-    // No name restrictions when name validation is disabled,
-    // except for empty names and length
+fn validate_instrument_name(_name: &str) -> MetricResult<()> {
+    // No name restrictions when name validation is disabled
     Ok(())
 }
 
@@ -707,12 +703,15 @@ mod tests {
     use crate::metrics::MetricError;
 
     use super::{
-        validate_instrument_name, validate_instrument_unit, INSTRUMENT_NAME_EMPTY,
-        INSTRUMENT_NAME_LENGTH, INSTRUMENT_UNIT_INVALID_CHAR, INSTRUMENT_UNIT_LENGTH,
+        validate_instrument_name, validate_instrument_unit, INSTRUMENT_UNIT_INVALID_CHAR,
+        INSTRUMENT_UNIT_LENGTH,
     };
 
     #[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
-    use super::{INSTRUMENT_NAME_FIRST_ALPHABETIC, INSTRUMENT_NAME_INVALID_CHAR};
+    use super::{
+        INSTRUMENT_NAME_EMPTY, INSTRUMENT_NAME_FIRST_ALPHABETIC, INSTRUMENT_NAME_INVALID_CHAR,
+        INSTRUMENT_NAME_LENGTH,
+    };
 
     #[test]
     #[cfg(not(feature = "experimental_metrics_disable_name_validation"))]
@@ -763,12 +762,12 @@ mod tests {
             ("_startWithNoneAlphabet", ""),
             ("utf8char锈", ""),
             ("a".repeat(255).leak(), ""),
-            ("a".repeat(256).leak(), INSTRUMENT_NAME_LENGTH),
+            ("a".repeat(256).leak(), ""),
             ("invalid name", ""),
             ("allow/slash", ""),
             ("allow_under_score", ""),
             ("allow.dots.ok", ""),
-            ("", INSTRUMENT_NAME_EMPTY),
+            ("", ""),
             ("\\allow\\slash /sec", ""),
             ("\\allow\\$$slash /sec", ""),
             ("Total $ Count", ""),

opentelemetry-sdk/src/metrics/mod.rs

@@ -225,6 +225,8 @@ mod tests {
         let invalid_instrument_names = vec![
             "_startWithNoneAlphabet",
             "utf8char锈",
+            "",
+            "a".repeat(256).leak(),
             "\\allow\\slash /sec",
             "\\allow\\$$slash /sec",
             "Total $ Count",