Merge branch 'main' into fix_hangs_too_long_when_calling_forceflush

open-telemetry · Mar 21, 2024 · e7031c2 · e7031c2
2 parents bbb1f9a + 4d4f8ed
commit e7031c2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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