Merge branch 'main' into fix_semconv_2419

open-telemetry · Dec 5, 2023 · 6e457ba · 6e457ba
2 parents f441b1f + a86f8f0
commit 6e457ba
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/api/include/opentelemetry/trace/propagation/detail/hex.h b/api/include/opentelemetry/trace/propagation/detail/hex.h
@@ -4,6 +4,7 @@
 #pragma once
 
 #include <algorithm>
+#include <cstdint>
 #include <cstring>
 
 #include "opentelemetry/nostd/string_view.h"

diff --git a/api/include/opentelemetry/trace/trace_state.h b/api/include/opentelemetry/trace/trace_state.h
@@ -14,7 +14,7 @@
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/version.h"
 
-#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 #  include <regex>
 #endif
 
@@ -246,6 +246,7 @@ class OPENTELEMETRY_EXPORT TraceState
     return str.substr(left, right - left + 1);
   }
 
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
   static bool IsValidKeyRegEx(nostd::string_view key)
   {
     static std::regex reg_key("^[a-z0-9][a-z0-9*_\\-/]{0,255}$");
@@ -267,7 +268,7 @@ class OPENTELEMETRY_EXPORT TraceState
     // Need to benchmark without regex, as a string object is created here.
     return std::regex_match(std::string(value.data(), value.size()), reg_value);
   }
-
+#else
   static bool IsValidKeyNonRegEx(nostd::string_view key)
   {
     if (key.empty() || key.size() > kKeyMaxSize || !IsLowerCaseAlphaOrDigit(key[0]))
@@ -307,6 +308,7 @@ class OPENTELEMETRY_EXPORT TraceState
     }
     return true;
   }
+#endif
 
   static bool IsLowerCaseAlphaOrDigit(char c) { return isdigit(c) || islower(c); }
 

diff --git a/sdk/include/opentelemetry/sdk/metrics/view/predicate.h b/sdk/include/opentelemetry/sdk/metrics/view/predicate.h
@@ -8,7 +8,7 @@
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 
-#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 #  include <regex>
 #endif
 

diff --git a/sdk/src/metrics/instrument_metadata_validator.cc b/sdk/src/metrics/instrument_metadata_validator.cc
@@ -8,7 +8,7 @@
 #include <algorithm>
 #include <iostream>
 
-#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 #  include <regex>
 #endif
 

diff --git a/sdk/test/metrics/histogram_test.cc b/sdk/test/metrics/histogram_test.cc
@@ -13,7 +13,7 @@
 
 #include <gtest/gtest.h>
 
-#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 #  include <regex>
 #endif
 
@@ -73,7 +73,7 @@ TEST(Histogram, Double)
             actual.counts_);
 }
 
-#if (OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 // FIXME - View Preficate search is only supported through regex
 TEST(Histogram, DoubleCustomBuckets)
 {
@@ -188,7 +188,7 @@ TEST(Histogram, UInt64)
             actual.counts_);
 }
 
-#if (OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 // FIXME - View Preficate search is only supported through regex
 TEST(Histogram, UInt64CustomBuckets)
 {

diff --git a/sdk/test/metrics/view_registry_test.cc b/sdk/test/metrics/view_registry_test.cc
@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
+#if OPENTELEMETRY_HAVE_WORKING_REGEX
 #  include <regex>
 #endif