From 3add376fb116c21544fb16144f14b98f473f8810 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Wed, 20 Mar 2024 10:11:31 -0700 Subject: [PATCH 1/2] [etw] clean include path --- exporters/etw/include/opentelemetry/exporters/etw/etw_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h index 1bf47ded54..9aba33070a 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h @@ -10,7 +10,7 @@ #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span_id.h" -#include "opentelemetry//sdk/trace/sampler.h" +#include "opentelemetry/sdk/trace/sampler.h" #include "opentelemetry/exporters/etw/etw_provider.h" #include "opentelemetry/exporters/etw/etw_tail_sampler.h" #include "opentelemetry/sdk/trace/id_generator.h" From a9e7d859573d58b3fd97415695b9761517bac100 Mon Sep 17 00:00:00 2001 From: Tom Tan Date: Wed, 20 Mar 2024 10:27:58 -0700 Subject: [PATCH 2/2] fix include order --- exporters/etw/include/opentelemetry/exporters/etw/etw_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h b/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h index 9aba33070a..dae8f5b075 100644 --- a/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h +++ b/exporters/etw/include/opentelemetry/exporters/etw/etw_config.h @@ -10,10 +10,10 @@ #include "opentelemetry/nostd/variant.h" #include "opentelemetry/trace/span_id.h" -#include "opentelemetry/sdk/trace/sampler.h" #include "opentelemetry/exporters/etw/etw_provider.h" #include "opentelemetry/exporters/etw/etw_tail_sampler.h" #include "opentelemetry/sdk/trace/id_generator.h" +#include "opentelemetry/sdk/trace/sampler.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter