Include what you use, part 6

.iwyu.imp

@@ -19,6 +19,7 @@
   { "include": ["<gtest/gtest-param-test.h>", "private", "<gtest/gtest.h>", "public"] },
   { "include": ["<gtest/gtest_pred_impl.h>", "private", "<gtest/gtest.h>", "public"] },
   { "include": ["<gtest/gtest-typed-test.h>", "private", "<gtest/gtest.h>", "public"] },
+  { "include": ["<gtest/gtest-assertion-result.h>", "private", "<gtest/gtest.h>", "public"] },
 
   # We prefer to include <gmock/gmock.h> for simplicity
   { "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },

api/test/baggage/baggage_benchmark.cc

@@ -3,12 +3,12 @@
 
 #include <benchmark/benchmark.h>
 #include <stddef.h>
-#include <memory>
 #include <string>
 
 #include "opentelemetry/baggage/baggage.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry::baggage;
 namespace nostd = opentelemetry::nostd;

api/test/baggage/baggage_test.cc

@@ -9,6 +9,7 @@
 
 #include "opentelemetry/baggage/baggage.h"
 #include "opentelemetry/common/kv_properties.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 

api/test/baggage/propagation/baggage_propagator_test.cc

@@ -3,8 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <initializer_list>
 #include <map>
-#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ -14,8 +14,9 @@
 #include "opentelemetry/baggage/propagation/baggage_propagator.h"
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/nostd/function_ref.h"
+#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry;
 using namespace opentelemetry::baggage::propagation;

api/test/common/kv_properties_test.cc

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include <opentelemetry/common/kv_properties.h>
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
 
 // ------------------------- Entry class tests ---------------------------------
 

api/test/common/spinlock_benchmark.cc

@@ -2,9 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <benchmark/benchmark.h>
-#include <stdint.h>
 #include <algorithm>
 #include <atomic>
+#include <cstdint>
 #include <thread>
 #include <vector>
 

api/test/context/context_test.cc

@@ -8,7 +8,6 @@
 
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/context/context_value.h"
-#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/variant.h"
 

api/test/context/propagation/composite_propagator_test.cc

@@ -13,6 +13,7 @@
 #include "opentelemetry/context/propagation/composite_propagator.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"

api/test/context/runtime_context_test.cc

@@ -13,7 +13,6 @@
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/runtime_context.h"
-#include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/nostd/variant.h"

api/test/core/timestamp_test.cc

@@ -4,6 +4,7 @@
 #include <gtest/gtest.h>
 #include <stdlib.h>
 #include <chrono>
+#include <string>
 
 #include "opentelemetry/common/timestamp.h"
 

api/test/logs/logger_benchmark.cc

@@ -9,6 +9,7 @@
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include "opentelemetry/common/key_value_iterable_view.h"
@@ -18,7 +19,6 @@
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/logs/severity.h"
 #include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 
 using opentelemetry::logs::EventId;

api/test/logs/logger_test.cc

@@ -22,7 +22,6 @@
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/unique_ptr.h"
-#include "opentelemetry/nostd/utility.h"
 
 using opentelemetry::logs::EventId;
 using opentelemetry::logs::Logger;

api/test/logs/provider_test.cc

@@ -12,7 +12,6 @@
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
 
 using opentelemetry::logs::EventLogger;
 using opentelemetry::logs::EventLoggerProvider;

api/test/metrics/meter_provider_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 
-#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/noop.h"
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"

api/test/metrics/noop_sync_instrument_test.cc

@@ -6,6 +6,7 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "opentelemetry/context/context.h"
 #include "opentelemetry/metrics/noop.h"

api/test/nostd/function_ref_test.cc

@@ -1,9 +1,11 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+#include <string>
+
 #include "opentelemetry/nostd/function_ref.h"
 
-#include <gtest/gtest.h>
 using namespace opentelemetry::nostd;
 
 int Call(function_ref<int()> f)

api/test/nostd/shared_ptr_test.cc

@@ -4,6 +4,7 @@
 #include <gtest/gtest.h>
 #include <stddef.h>
 #include <algorithm>
+#include <string>
 #include <utility>
 #include <vector>
 

api/test/nostd/span_test.cc

@@ -7,6 +7,7 @@
 #include <array>
 #include <iterator>
 #include <list>
+#include <string>
 #include <type_traits>
 #include <vector>
 

api/test/nostd/unique_ptr_test.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <string>
 #include <type_traits>
 #include <utility>
 

api/test/nostd/utility_test.cc

@@ -3,6 +3,7 @@
 
 #include <gtest/gtest.h>
 #include <initializer_list>
+#include <string>
 #include <tuple>
 #include <type_traits>
 #include <vector>

api/test/nostd/variant_test.cc

@@ -3,10 +3,8 @@
 
 #include "opentelemetry/nostd/variant.h"
 
-#include <string>
-#include <type_traits>
-
 #include <gtest/gtest.h>
+#include <string>
 
 namespace nostd = opentelemetry::nostd;
 

api/test/plugin/dynamic_load_test.cc

@@ -5,6 +5,7 @@
 #include <string>
 
 #include "opentelemetry/plugin/dynamic_load.h"
+#include "opentelemetry/plugin/factory.h"
 
 TEST(LoadFactoryTest, FailureTest)
 {

api/test/singleton/component_a.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_b.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_c.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_d.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_e.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_f.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_g.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/component_h.cc

@@ -1,7 +1,6 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/trace/provider.h"
 #include "opentelemetry/trace/scope.h"

api/test/singleton/singleton_test.cc

@@ -20,7 +20,6 @@
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
-#include "opentelemetry/nostd/utility.h"
 #include "opentelemetry/trace/default_span.h"
 #include "opentelemetry/trace/noop.h"
 #include "opentelemetry/trace/provider.h"

api/test/trace/key_value_iterable_view_test.cc

@@ -10,9 +10,9 @@
 #include "opentelemetry/common/attribute_value.h"
 #include "opentelemetry/common/key_value_iterable.h"
 #include "opentelemetry/common/key_value_iterable_view.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/nostd/type_traits.h"
-#include "opentelemetry/nostd/utility.h"
 
 using namespace opentelemetry;
 

api/test/trace/noop_test.cc

@@ -10,7 +10,6 @@
 #include <vector>
 
 #include "opentelemetry/common/timestamp.h"
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/unique_ptr.h"

api/test/trace/propagation/b3_propagation_test.cc

@@ -9,7 +9,6 @@
 #include "util.h"
 
 #include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
 #include "opentelemetry/nostd/shared_ptr.h"

api/test/trace/propagation/detail/hex_test.cc

@@ -5,7 +5,6 @@
 #include <stdint.h>
 #include <string>
 
-#include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/trace/propagation/detail/hex.h"
 
 using namespace opentelemetry;

api/test/trace/propagation/http_text_format_test.cc

@@ -11,10 +11,10 @@
 #include "util.h"
 
 #include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/propagation/global_propagator.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"

api/test/trace/propagation/jaeger_propagation_test.cc

@@ -11,9 +11,9 @@
 #include "util.h"
 
 #include "opentelemetry/context/context.h"
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
 #include "opentelemetry/context/runtime_context.h"
+#include "opentelemetry/nostd/function_ref.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"
 #include "opentelemetry/nostd/string_view.h"

api/test/trace/provider_test.cc

@@ -6,7 +6,6 @@
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/string_view.h"
 #include "opentelemetry/trace/provider.h"
-#include "opentelemetry/trace/tracer.h"
 #include "opentelemetry/trace/tracer_provider.h"
 
 using opentelemetry::trace::Provider;

api/test/trace/scope_test.cc

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
+#include <string>
 
 #include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/runtime_context.h"

api/test/trace/span_benchmark.cc

@@ -4,7 +4,6 @@
 #include <benchmark/benchmark.h>
 #include <cstdint>
 
-#include "opentelemetry/context/context_value.h"
 #include "opentelemetry/context/runtime_context.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/nostd/span.h"

api/test/trace/span_context_test.cc

@@ -6,6 +6,7 @@
 #include "opentelemetry/trace/trace_id.h"
 
 #include <gtest/gtest.h>
+#include <string>
 
 using opentelemetry::trace::SpanContext;
 namespace trace_api = opentelemetry::trace;

api/test/trace/span_id_test.cc

@@ -3,11 +3,10 @@
 
 #include "opentelemetry/trace/span_id.h"
 
+#include <gtest/gtest.h>
 #include <cstring>
 #include <string>
 
-#include <gtest/gtest.h>
-
 namespace
 {