Skip to content
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

Jump to bottom

[BUILD] Improve the handling of OPENTELEMETRY_HAVE_WORKING_REGEX. #2430

Merged
merged 1 commit into from
Dec 5, 2023
Merged

[BUILD] Improve the handling of OPENTELEMETRY_HAVE_WORKING_REGEX. #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions api/include/opentelemetry/trace/trace_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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}$");
Expand All @@ -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]))
Expand Down Expand Up @@ -307,6 +308,7 @@ class OPENTELEMETRY_EXPORT TraceState
}
return true;
}
#endif

static bool IsLowerCaseAlphaOrDigit(char c) { return isdigit(c) || islower(c); }

Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/metrics/view/predicate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion sdk/src/metrics/instrument_metadata_validator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <algorithm>
#include <iostream>

#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
#if OPENTELEMETRY_HAVE_WORKING_REGEX
# include <regex>
#endif

Expand Down
6 changes: 3 additions & 3 deletions sdk/test/metrics/histogram_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

#include <gtest/gtest.h>

#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
#if OPENTELEMETRY_HAVE_WORKING_REGEX
# include <regex>
#endif

Expand Down Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion sdk/test/metrics/view_registry_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <gtest/gtest.h>

#if defined(OPENTELEMETRY_HAVE_WORKING_REGEX)
#if OPENTELEMETRY_HAVE_WORKING_REGEX
# include <regex>
#endif

Expand Down