merged from upstream

malkia · malkia · commit d4d48e121e1b · 2025-07-06T17:35:21.000-07:00
diff --git a/api/test/trace/propagation/detail/BUILD b/api/test/trace/propagation/detail/BUILD
@@ -30,8 +30,8 @@ otel_cc_test(
         "test",
         "trace",
     ],
-    deps = [
+    deps = dll_deps([
         "//api",
         "@googletest//:gtest_main",
-    ],
+    ]),
 )
diff --git a/sdk/include/opentelemetry/sdk/configuration/attributes_configuration.h b/sdk/include/opentelemetry/sdk/configuration/attributes_configuration.h
@@ -7,8 +7,8 @@
 #include <memory>
 #include <string>
 
-#include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/base2_exponential_bucket_histogram_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/base2_exponential_bucket_histogram_aggregation_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/boolean_array_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/boolean_array_attribute_value_configuration.h
@@ -5,9 +5,9 @@
 
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/boolean_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/boolean_attribute_value_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/default_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/default_aggregation_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/double_array_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/double_array_attribute_value_configuration.h
@@ -5,9 +5,9 @@
 
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/double_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/double_attribute_value_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/drop_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/drop_aggregation_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/explicit_bucket_histogram_aggregation_configuration.h
@@ -5,9 +5,9 @@
 
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_log_record_exporter_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_exporter_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_log_record_processor_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_log_record_processor_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/log_record_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/log_record_processor_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_pull_metric_exporter_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/pull_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/pull_metric_exporter_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_push_metric_exporter_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/push_metric_exporter_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_sampler_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_sampler_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/sampler_configuration.h"
 #include "opentelemetry/sdk/configuration/sampler_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_span_exporter_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_span_exporter_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration.h"
 #include "opentelemetry/sdk/configuration/span_exporter_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/extension_span_processor_configuration.h b/sdk/include/opentelemetry/sdk/configuration/extension_span_processor_configuration.h
@@ -6,10 +6,10 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/span_processor_configuration.h"
 #include "opentelemetry/sdk/configuration/span_processor_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/include_exclude_configuration.h b/sdk/include/opentelemetry/sdk/configuration/include_exclude_configuration.h
@@ -5,8 +5,8 @@
 
 #include <memory>
 
-#include "opentelemetry/sdk/configuration/string_array_configuration.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/sdk/configuration/string_array_configuration.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/integer_array_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/integer_array_attribute_value_configuration.h
@@ -6,9 +6,9 @@
 #include <cstddef>
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/integer_attribute_value_configuration.h
@@ -5,9 +5,9 @@
 
 #include <cstddef>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/last_value_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/last_value_aggregation_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h b/sdk/include/opentelemetry/sdk/configuration/meter_provider_configuration.h
@@ -6,9 +6,9 @@
 #include <memory>
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/metric_reader_configuration.h"
 #include "opentelemetry/sdk/configuration/view_configuration.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/resource_configuration.h b/sdk/include/opentelemetry/sdk/configuration/resource_configuration.h
@@ -6,9 +6,9 @@
 #include <memory>
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attributes_configuration.h"
 #include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/string_array_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/string_array_attribute_value_configuration.h
@@ -6,9 +6,9 @@
 #include <string>
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/string_attribute_value_configuration.h b/sdk/include/opentelemetry/sdk/configuration/string_attribute_value_configuration.h
@@ -5,9 +5,9 @@
 
 #include <string>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration.h"
 #include "opentelemetry/sdk/configuration/attribute_value_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/sum_aggregation_configuration.h b/sdk/include/opentelemetry/sdk/configuration/sum_aggregation_configuration.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration_visitor.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/view_configuration.h b/sdk/include/opentelemetry/sdk/configuration/view_configuration.h
@@ -5,9 +5,9 @@
 
 #include <memory>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/view_selector_configuration.h"
 #include "opentelemetry/sdk/configuration/view_stream_configuration.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/view_selector_configuration.h b/sdk/include/opentelemetry/sdk/configuration/view_selector_configuration.h
@@ -7,8 +7,8 @@
 #include <memory>
 #include <string>
 
-#include "opentelemetry/sdk/configuration/instrument_type.h"
 #include "opentelemetry/version.h"
+#include "opentelemetry/sdk/configuration/instrument_type.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/include/opentelemetry/sdk/configuration/view_stream_configuration.h b/sdk/include/opentelemetry/sdk/configuration/view_stream_configuration.h
@@ -7,9 +7,9 @@
 #include <string>
 #include <vector>
 
+#include "opentelemetry/version.h"
 #include "opentelemetry/sdk/configuration/aggregation_configuration.h"
 #include "opentelemetry/sdk/configuration/include_exclude_configuration.h"
-#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
diff --git a/sdk/test/logs/BUILD b/sdk/test/logs/BUILD
@@ -106,8 +106,8 @@ otel_cc_test(
         "logs",
         "test",
     ],
-    deps = [
+    deps = dll_deps([
         "//sdk/src/logs",
         "@googletest//:gtest_main",
-    ],
+    ]),
 )
