From 49200acaae150f213f2b535a4f8ae8f0024a9f78 Mon Sep 17 00:00:00 2001 From: TianlinZhao Date: Thu, 30 Jul 2020 14:13:53 -0400 Subject: [PATCH] tracer workaround --- api/include/opentelemetry/context/context_value.h | 1 - .../opentelemetry/trace/propagation/http_trace_context.h | 2 +- api/test/trace/propagation/http_text_format_test.cc | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/include/opentelemetry/context/context_value.h b/api/include/opentelemetry/context/context_value.h index 9ef85400f0..85ac90a0c8 100644 --- a/api/include/opentelemetry/context/context_value.h +++ b/api/include/opentelemetry/context/context_value.h @@ -8,7 +8,6 @@ #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span_context.h" #include "opentelemetry/trace/span.h" -#include "opentelemetry/trace/tracer.h" #include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/api/include/opentelemetry/trace/propagation/http_trace_context.h b/api/include/opentelemetry/trace/propagation/http_trace_context.h index db668537ab..0ebee00a49 100644 --- a/api/include/opentelemetry/trace/propagation/http_trace_context.h +++ b/api/include/opentelemetry/trace/propagation/http_trace_context.h @@ -17,7 +17,6 @@ #include #include #include -#include "opentelemetry/trace/propagation/http_text_format.h" #include "opentelemetry/trace/span_context.h" #include "opentelemetry/trace/trace_state.h" #include "opentelemetry/trace/key_value_iterable.h" @@ -27,6 +26,7 @@ #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/nostd/variant.h" #include "opentelemetry/nostd/span.h" +#include "opentelemetry/trace/propagation/http_text_format.h" #include "opentelemetry/trace/default_span.h" OPENTELEMETRY_BEGIN_NAMESPACE diff --git a/api/test/trace/propagation/http_text_format_test.cc b/api/test/trace/propagation/http_text_format_test.cc index 9df4b9b118..ab699d03bb 100644 --- a/api/test/trace/propagation/http_text_format_test.cc +++ b/api/test/trace/propagation/http_text_format_test.cc @@ -1,9 +1,9 @@ #include "opentelemetry/context/context.h" -#include "opentelemetry/trace/tracer.h" #include "opentelemetry/trace/span.h" #include "opentelemetry/trace/default_span.h" #include "opentelemetry/trace/span_context.h" #include "opentelemetry/nostd/string_view.h" +#include "opentelemetry/trace/tracer.h" #include "opentelemetry/nostd/span.h" #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/trace/trace_id.h"