Skip to content

Commit

Permalink
Merge pull request #28 from ZhaoTianlin990121/test_revert
Browse files Browse the repository at this point in the history 
Test revert
  • Loading branch information
@ZhaoTianlin990121
ZhaoTianlin990121 authored Aug 21, 2020
2 parents 127c6f1 + c6690b0 commit 5b66308
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 238 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@

# Bazel files
/bazel-*
/.idea/
287 changes: 49 additions & 238 deletions api/test/trace/propagation/http_text_format_test.cc
View file
Original file line number Diff line number Diff line change
@@ -1,276 +1,87 @@
#include "opentelemetry/trace/propagation/http_text_format.h"
#include "opentelemetry/trace/propagation/http_trace_context.h"
#include "opentelemetry/context/context.h"
#include "opentelemetry/trace/span.h"
#include "opentelemetry/nostd/shared_ptr.h"
#include "opentelemetry/nostd/span.h"
#include "opentelemetry/nostd/string_view.h"
#include "opentelemetry/trace/default_span.h"
#include "opentelemetry/trace/span.h"
#include "opentelemetry/trace/span_context.h"
#include "opentelemetry/nostd/string_view.h"
#include "opentelemetry/nostd/span.h"
#include "opentelemetry/nostd/shared_ptr.h"
#include "opentelemetry/trace/trace_id.h"

#include "opentelemetry/trace/tracer.h"

#include <map>
#include <memory>
#include <string>

#include <gtest/gtest.h>

#include "opentelemetry/trace/default_span.h"
#include "opentelemetry/trace/propagation/http_text_format.h"
#include "opentelemetry/trace/propagation/http_trace_context.h"

using namespace opentelemetry;

static nostd::string_view Getter(const std::map<std::string,std::string> &carrier, nostd::string_view trace_type = "traceparent") {
auto it = carrier.find(std::string(trace_type));
if (it != carrier.end()) {
return nostd::string_view(it->second);
}
return "";
static nostd::string_view Getter(const std::map<std::string, std::string> &carrier,
nostd::string_view trace_type = "traceparent")
{
auto it = carrier.find(std::string(trace_type));
if (it != carrier.end())
{
return nostd::string_view(it->second);
}
return "";
}

static void Setter(std::map<std::string,std::string> &carrier, nostd::string_view trace_type = "traceparent", nostd::string_view trace_description = "") {
carrier[std::string(trace_type)] = std::string(trace_description);
static void Setter(std::map<std::string, std::string> &carrier,
nostd::string_view trace_type = "traceparent",
nostd::string_view trace_description = "")
{
carrier[std::string(trace_type)] = std::string(trace_description);
}

static trace::propagation::HttpTraceContext<std::map<std::string,std::string>> format = trace::propagation::HttpTraceContext<std::map<std::string,std::string>>();
using MapHttpTraceContext =
trace::propagation::HttpTraceContext<std::map<std::string, std::string>>;

static nostd::string_view trace_id = "12345678901234567890123456789012";
static nostd::string_view span_id = "1234567890123456";
static MapHttpTraceContext format = MapHttpTraceContext();

using map_http_trace_context = trace::propagation::HttpTraceContext<std::map<std::string,std::string>>;
TEST(HTTPTextFormatTest, TraceIdBufferGeneration)
{
constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
trace::TraceId id(buf);
EXPECT_EQ(map_http_trace_context::GenerateTraceIdFromString("01020304050607080807aabbccddeeff"),id);
constexpr uint8_t buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 8, 7, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
EXPECT_EQ(MapHttpTraceContext::GenerateTraceIdFromString("01020304050607080807aabbccddeeff"),
trace::TraceId(buf));
}

TEST(HTTPTextFormatTest, SpanIdBufferGeneration)
{
constexpr uint8_t buf[] = {1, 2, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
trace::SpanId id(buf);
EXPECT_EQ(map_http_trace_context::GenerateSpanIdFromString("0102aabbccddeeff"),id);
constexpr uint8_t buf[] = {1, 2, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
EXPECT_EQ(MapHttpTraceContext::GenerateSpanIdFromString("0102aabbccddeeff"), trace::SpanId(buf));
}

TEST(HTTPTextFormatTest, TraceFlagsBufferGeneration)
{
trace::TraceFlags flags;
EXPECT_EQ(map_http_trace_context::GenerateTraceFlagsFromString("00"),flags);
}

TEST(HTTPTextFormatTest, GeneralTest)
{
const std::map<std::string,std::string> carrier = {{"traceparent","00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"},{"tracestate","congo=congosSecondPosition,rojo=rojosFirstPosition"}};
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter,carrier,ctx1);
std::map<std::string,std::string> c2 = {};
format.Inject(Setter,c2,ctx2);
EXPECT_EQ(std::string(c2["traceparent"]),"00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01");
EXPECT_EQ(std::string(c2["tracestate"]),"congo=congosSecondPosition,rojo=rojosFirstPosition");
EXPECT_EQ(carrier.size(),c2.size());
}

TEST(HTTPTextFormatTest, NoTraceParentHeader)
{
// When trace context headers are not present, a new SpanContext
// should be created.
const std::map<std::string,std::string> carrier = {};
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter, carrier, ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
EXPECT_EQ(span->GetContext().trace_id(),trace::SpanContext().trace_id());
EXPECT_EQ(span->GetContext().span_id(),trace::SpanContext().span_id());
EXPECT_EQ(span->GetContext().trace_flags(),trace::SpanContext().trace_flags());
EXPECT_EQ(span->GetContext().trace_state(),trace::SpanContext().trace_state());
}

//TEST(HTTPTextFormatTest, HeadersWithTraceState)
//{
// // When there is a trace parent and trace state header, data from
// // both should be added to the SpanContext.
// nostd::string_view trace_parent_value = "00-"+ trace_id + "-" + span_id + "-00";
// nostd::string_view trace_state_value = "foo=1,bar=2,baz=3";
// std::map<nostd::string_view,nostd:string_view> carrier = { {"traceparent", trace_parent_value},
// {"tracestate", trace_state_value} };
// trace::SpanContext span_context = trace::propagation::GetCurrentSpan(
// format.Extract(
// Getter,
// carrier,
// Context()
// )
// ).GetContext();
// EXPECT_EQ(span_context.trace_id(), TraceId(nostd::span(trace_id,trace_id.length())));
// EXPECT_EQ(span_context.span_id(), SpanId(nostd::span(span_id,span_id.length())));
// EXPECT_EQ(span_context.trace_state(), {"foo": "1", "bar": "2", "baz": "3"}); // I am not certain how to create a trace state from map yet. Meeting with host hopefully to solve this
// EXPECT_TRUE(span_context.HasRemoteParent());
// std::map<nostd::string_view,nostd::string_view> carrier = {};
// Span span = trace.DefaultSpan(span_context);
//
// context::Context ctx = trace.SetSpanInContext(span,context::Context());
// format.Inject(Setter, carrier, ctx);
// EXPECT_EQ(carrier["traceparent"], traceparent_value);
// int count = 0;
// int start = -1;
// int end = -1;
// nostd::string_view trace_state_string = carrier["tracestate"];
// for (int i = 0; i <= trace_state_string.length(); i++) {
// if (trace_state_string[i] == ',' || i == trace_state_string.length()) {
// count++;
// nostd::string_view str = trace_state_string.substr(start,end);
// start = -1;
// end = -1;
// EXPECT_TRUE(str == "foo=1" || str == "bar=2" || str == "baz=3");
// } else {
// if (trace_state_string[i] != ' ' && start == -1) {
// start = i;
// }
// if (trace_state_string[i] != ' ') {
// end = i;
// }
// }
// }
// EXPECT_EQ(count, 3);
//}
//
TEST(HTTPTextFormatTest, InvalidTraceId)
{
// If the trace id is invalid, we must ignore the full trace parent header,
// and return a random, valid trace.
// Also ignore any trace state.
const std::map<std::string,std::string> carrier = { {"traceparent", "00-00000000000000000000000000000000-1234567890123456-00"},
{"tracestate", "foo=1,bar=2,foo=3"} };
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter, carrier, ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
EXPECT_EQ(span->GetContext().trace_id(),trace::SpanContext().trace_id());
EXPECT_EQ(span->GetContext().span_id(),trace::SpanContext().span_id());
EXPECT_EQ(span->GetContext().trace_flags(),trace::SpanContext().trace_flags());
EXPECT_EQ(span->GetContext().trace_state(),trace::SpanContext().trace_state());
}

TEST(HTTPTextFormatTest, InvalidParentId)
{
// If the parent id is invalid, we must ignore the full trace parent
// header.
// Also ignore any trace state.
const std::map<std::string,std::string> carrier = { {"traceparent", "00-00000000000000000000000000000000-0000000000000000-00"},
{"tracestate", "foo=1,bar=2,foo=3"} };
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter, carrier, ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
EXPECT_EQ(span->GetContext().trace_id(),trace::SpanContext().trace_id());
EXPECT_EQ(span->GetContext().span_id(),trace::SpanContext().span_id());
EXPECT_EQ(span->GetContext().trace_flags(),trace::SpanContext().trace_flags());
EXPECT_EQ(span->GetContext().trace_state(),trace::SpanContext().trace_state());
EXPECT_EQ(MapHttpTraceContext::GenerateTraceFlagsFromString("00"), trace::TraceFlags());
}

TEST(HTTPTextFormatTest, NoSendEmptyTraceState)
{
// If the trace state is empty, do not set the header.
const std::map<std::string,std::string> carrier = {{"traceparent","00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"}};
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter,carrier,ctx1);
std::map<std::string,std::string> c2 = {};
format.Inject(Setter,c2,ctx2);
EXPECT_TRUE(carrier.count("traceparent") > 0);
EXPECT_FALSE(carrier.count("tracestate") > 0);
}

TEST(HTTPTextFormatTest, FormatNotSupported)
{
// If the trace parent does not adhere to the supported format, discard it and
// create a new trace context.
const std::map<std::string,std::string> carrier = { {"traceparent", "00-12345678901234567890123456789012-1234567890123456-00-residue"},
{"tracestate", "foo=1,bar=2,foo=3"} };
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter,carrier,ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
EXPECT_FALSE(span->GetContext().IsValid());
EXPECT_EQ(span->GetContext().trace_id(),trace::SpanContext().trace_id());
EXPECT_EQ(span->GetContext().span_id(),trace::SpanContext().span_id());
EXPECT_EQ(span->GetContext().trace_flags(),trace::SpanContext().trace_flags());
EXPECT_EQ(span->GetContext().trace_state(),trace::SpanContext().trace_state());
// If the trace state is empty, do not set the header.
const std::map<std::string, std::string> carrier = {
{"traceparent", "00-4bf92f3577b34da6a3ce929d0e0e4736-0102030405060708-01"}};
context::Context ctx1 =
context::Context("current-span", nostd::shared_ptr<trace::Span>(new trace::DefaultSpan()));
context::Context ctx2 = format.Extract(Getter, carrier, ctx1);
std::map<std::string, std::string> c2 = {};
format.Inject(Setter, c2, ctx2);
EXPECT_TRUE(carrier.count("traceparent") > 0);
EXPECT_FALSE(carrier.count("tracestate") > 0);
}

TEST(HTTPTextFormatTest, PropagateInvalidContext)
{
// Do not propagate invalid trace context.
std::map<std::string,std::string> carrier = {};
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan(trace::SpanContext::GetInvalid())};

context::Context ctx{"current-span",sp};
format.Inject(Setter, carrier, ctx);
EXPECT_TRUE(carrier.count("traceparent") == 0);
}

TEST(HTTPTextFormatTest, TraceStateHeaderWithTrailingComma)
{
// Do not propagate invalid trace context.
const std::map<std::string,std::string> carrier = { {"traceparent", "00-12345678901234567890123456789012-1234567890123456-00"},
{"tracestate", "foo=1,"} };
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter,carrier,ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
trace::TraceState trace_state = span->GetContext().trace_state();
EXPECT_TRUE(trace_state.Get("foo", "1"));
// Do not propagate invalid trace context.
std::map<std::string, std::string> carrier = {};
context::Context ctx{
"current-span",
nostd::shared_ptr<trace::Span>(new trace::DefaultSpan(trace::SpanContext::GetInvalid()))};
format.Inject(Setter, carrier, ctx);
EXPECT_TRUE(carrier.count("traceparent") == 0);
}

TEST(HTTPTextFormatTest, TraceStateKeys)
{
// Test for valid key patterns in the tracestate
std::string trace_state_value = "1a-2f@foo=bar1,1a-_*/2b@foo=bar2,foo=bar3,foo-_*/bar=bar4";
const std::map<std::string,std::string> carrier = { {"traceparent", "00-12345678901234567890123456789012-1234567890123456-00"},
{"tracestate", trace_state_value} };
nostd::shared_ptr<trace::Span> sp{new trace::DefaultSpan()};
context::Context ctx1 = context::Context("current-span",sp);
context::Context ctx2 = format.Extract(Getter,carrier,ctx1);
trace::Span* span = map_http_trace_context::GetCurrentSpan(ctx2);
trace::TraceState trace_state = span->GetContext().trace_state();
EXPECT_TRUE(trace_state.Get("1a-2f@foo", "bar1"));
EXPECT_TRUE(trace_state.Get("1a-_*/2b@foo", "bar2"));
EXPECT_TRUE(trace_state("foo", "bar3"));
EXPECT_TRUE(trace_state("foo-_*/bar", "bar4"));
}


// Dilapidated Tests:
//// I am not very sure how to make tests for httpformat_test as some functions output complex objects which cannot be
//// compared with some hard coded answers.
//TEST(HTTPTextFormatTest, DefaultConstructionNoCrash)
//{
// HTTPTextFormat httptextformat = HTTPTextFormat();
//}
//
//TEST(HTTPTextFormatTest, ExtractNoCrush)
//{
// HTTPTextFormat httptextformat = HTTPTextFormat();
// Context ctx = Context();
// std::map<char,int> carrier;
// extract(getter, carrier, ctx);
//}
//
//TEST(HTTPTextFormatTest, InjectNoCrush)
//{
// HTTPTextFormat httptextformat = HTTPTextFormat();
// Context ctx = Context();
// std::map<char,int> carrier = {{'1',1},{'2',2},{'3',3}};
// inject(setter, carrier, ctx);
//}
//
//// In this test we want to see the after injecting a header's information into a context,
//// when we extract it it will give use back the same information for the header info.
//TEST(HTTPTextFormatTest, CompositeOperations)
//{
// HTTPTextFormat httptextformat = HTTPTextFormat();
// Context ctx = Context();
// std::map<char,int> carrier = {{'1',1},{'2',2},{'3',3}};
// inject(setter, carrier, ctx);
// std::map<char,int> res;
// extract(getter, res, ctx);
// EXPECT_EQ(res, carrier);
//}

0 comments on commit 5b66308

Please sign in to comment.