merged from upstream

malkia · Sep 13, 2024 · 08d20a0 · 08d20a0
2 parents b223e9e + c6d3945
commit 08d20a0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h b/exporters/memory/include/opentelemetry/exporters/memory/in_memory_span_data.h
@@ -7,7 +7,6 @@
 #include <memory>
 #include <vector>
 
-
 #include "opentelemetry/version.h"
 #include "opentelemetry/exporters/memory/in_memory_data.h"
 #include "opentelemetry/sdk/trace/span_data.h"

diff --git a/test_common/include/opentelemetry/test_common/ext/http/client/http_client_test_factory.h b/test_common/include/opentelemetry/test_common/ext/http/client/http_client_test_factory.h
@@ -7,6 +7,7 @@
 
 #include "opentelemetry/version.h"
 #include "opentelemetry/ext/http/client/http_client.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace ext

diff --git a/third_party/opentelemetry-proto b/third_party/opentelemetry-proto