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.

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

Skeleton of a tracer for AWS X-Ray #8526

Merged
merged 19 commits into from
Oct 22, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Address feedback
Signed-off-by: Marco Magdy <[email protected]>
  • Loading branch information
marcomagdy committed Oct 10, 2019
commit 553166a38cbcf9211eca6bd08771cc16c6493c22
1 change: 1 addition & 0 deletions api/envoy/config/trace/v2/trace.proto
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ message OpenCensusConfig {
repeated TraceContext outgoing_trace_context = 9;
}

// [#not-implemented-hide:]
// Configuration for AWS X-Ray tracer.
message XRayConfig {
// The endpoint of the X-Ray Daemon where the spans will be sent. Since by default daemon
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/tracers/xray/sampling_strategy.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class SamplingStrategy {
* sampleRequest determines if the given request should be traced or not.
*/
virtual bool sampleRequest(const SamplingRequest& sampling_request) {
(void)sampling_request; // unused for now
UNREFERENCED_PARAMETER(sampling_request); // unused for now
return rng_() % 100 == 42;
}

Expand Down
2 changes: 1 addition & 1 deletion source/extensions/tracers/xray/tracer.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Tracer {
public:
Tracer(absl::string_view segment_name, TimeSource& time_source)
: segment_name_(segment_name), time_source_(time_source) {
(void)time_source_;
UNREFERENCED_PARAMETER(time_source_);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions source/extensions/tracers/xray/util.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bool wildcardMatch(absl::string_view pattern, absl::string_view input) {
return true;
}

size_t i = 0, p = 0, iStar = input.size(), pStar = 0;
size_t i = 0, p = 0, i_star = input.size(), p_star = 0;
while (i < input.size()) {
if (p < pattern.size() && absl::ascii_tolower(input[i]) == absl::ascii_tolower(pattern[p])) {
++i;
Expand All @@ -28,11 +28,11 @@ bool wildcardMatch(absl::string_view pattern, absl::string_view input) {
++i;
++p;
} else if (p < pattern.size() && pattern[p] == glob) {
iStar = i;
pStar = p++;
} else if (iStar != input.size()) {
i = ++iStar;
p = pStar + 1;
i_star = i;
p_star = p++;
} else if (i_star != input.size()) {
i = ++i_star;
p = p_star + 1;
} else {
return false;
}
Expand Down
1 change: 1 addition & 0 deletions source/extensions/tracers/xray/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ namespace XRay {
* @return whether the text matches the pattern.
*/
bool wildcardMatch(absl::string_view pattern, absl::string_view input);

} // namespace XRay
} // namespace Tracers
} // namespace Extensions
Expand Down
16 changes: 8 additions & 8 deletions test/extensions/tracers/xray/util_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,53 +7,53 @@ namespace Extensions {
namespace Tracers {
namespace XRay {

TEST(XRayWildcardTest, matchingEmpty) {
TEST(XRayWildcardTest, MatchingEmpty) {
ASSERT_TRUE(wildcardMatch("", ""));
ASSERT_FALSE(wildcardMatch("", "42"));
ASSERT_TRUE(wildcardMatch("*", ""));
ASSERT_FALSE(wildcardMatch("?", ""));
}

TEST(XRayWildcardTest, matchIdentityCaseInsensitive) {
TEST(XRayWildcardTest, MatchIdentityCaseInsensitive) {
ASSERT_TRUE(wildcardMatch("foo", "foo"));
ASSERT_TRUE(wildcardMatch("foo", "FOO"));
ASSERT_TRUE(wildcardMatch("foo", "Foo"));
ASSERT_TRUE(wildcardMatch("6543210", "6543210"));
}

TEST(XRayWildcardTest, matchIdentityExtra) {
TEST(XRayWildcardTest, MatchIdentityExtra) {
ASSERT_FALSE(wildcardMatch("foo", "foob"));
ASSERT_FALSE(wildcardMatch("foo", "xfoo"));
ASSERT_FALSE(wildcardMatch("foo", "bar"));
}

TEST(XRayWildcardTest, singleWildcard) {
TEST(XRayWildcardTest, SingleWildcard) {
ASSERT_FALSE(wildcardMatch("f?o", "boo"));
ASSERT_TRUE(wildcardMatch("fo?", "foo"));
}

TEST(XRayWildcardTest, multipleWildcards) {
TEST(XRayWildcardTest, MultipleWildcards) {
ASSERT_FALSE(wildcardMatch("f??", "boo"));
ASSERT_TRUE(wildcardMatch("he??o", "Hello"));
ASSERT_TRUE(wildcardMatch("?o?", "foo"));
}

TEST(XRayWildcardTest, globMatch) {
TEST(XRayWildcardTest, GlobMatch) {
ASSERT_TRUE(wildcardMatch("f?o*ba*", "foobazbar"));
ASSERT_TRUE(wildcardMatch("*oo", "foo"));
ASSERT_TRUE(wildcardMatch("*o?", "foo"));
ASSERT_TRUE(wildcardMatch("mis*spell", "mistily spell"));
ASSERT_TRUE(wildcardMatch("mis*spell", "misspell"));
}

TEST(XRayWildcardTest, globMismatch) {
TEST(XRayWildcardTest, GlobMismatch) {
ASSERT_FALSE(wildcardMatch("foo*", "fo0"));
ASSERT_FALSE(wildcardMatch("fo*obar", "foobaz"));
ASSERT_FALSE(wildcardMatch("mis*spellx", "mispellx"));
ASSERT_FALSE(wildcardMatch("f?*", "boo"));
}

TEST(XRayWildcardTest, onlyGlob) {
TEST(XRayWildcardTest, OnlyGlob) {
ASSERT_TRUE(wildcardMatch("*", "foo"));
ASSERT_TRUE(wildcardMatch("*", "anything"));
ASSERT_TRUE(wildcardMatch("*", "12354"));
Expand Down