merged from upstream

Author: malkia

.github/workflows/iwyu.yml

@@ -62,7 +62,16 @@ jobs:
 
       - name: count warnings
         run: |
+          set +e
           cd build
-          COUNT=`grep -c "Warning:" iwyu.log`
-          echo "include-what-you-use reported ${COUNT} warning(s)"
-
+          readonly WARNING_COUNT=`grep -c "include-what-you-use reported diagnostics:" iwyu.log`
+          echo "include-what-you-use reported ${WARNING_COUNT} warning(s)"
+          # Acceptable limit, to decrease over time down to 0
+          readonly WARNING_LIMIT=10
+          # FAIL the build if WARNING_COUNT > WARNING_LIMIT
+          if [ $WARNING_COUNT -gt $WARNING_LIMIT ] ; then
+            exit 1
+          # WARN in annotations if WARNING_COUNT > 0
+          elif [ $WARNING_COUNT -gt 0 ] ; then
+            echo "::warning::include-what-you-use reported ${WARNING_COUNT} warning(s)"
+          fi

.iwyu.imp

@@ -6,6 +6,10 @@
 [
   # Work around for C++ STL
   { "include": ["<bits/chrono.h>", "private", "<chrono>", "public"] },
+  { "include": ["<bits/std_abs.h>", "private", "<cstdlib>", "public"] },
+  { "include": ["<ext/alloc_traits.h>", "private", "<memory>", "public"] },
+  { "include": ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
+  { "include": ["<bits/types/struct_FILE.h>", "private", "<stdio.h>", "public"] },
 
   # Local opentelemetry-cpp style
 
@@ -14,6 +18,7 @@
   { "include": ["<gtest/gtest-test-part.h>", "private", "<gtest/gtest.h>", "public"] },
   { "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"] },
 
   # We prefer to include <gmock/gmock.h> for simplicity
   { "include": ["<gmock/gmock-function-mocker.h>", "private", "<gmock/gmock.h>", "public"] },

api/include/opentelemetry/nostd/variant.h

@@ -54,6 +54,19 @@ OPENTELEMETRY_END_NAMESPACE
 #  ifdef HAVE_ABSEIL
 #    include "absl/types/variant.h"
 #  else
+#    include "opentelemetry/nostd/internal/absl/base/options.h"
+
+namespace absl
+{
+namespace OTABSL_OPTION_NAMESPACE_NAME
+{
+template <class T>
+struct variant_size;
+template <typename... Ts>
+class variant;
+}  // namespace OTABSL_OPTION_NAMESPACE_NAME
+}  // namespace absl
+
 #    include "opentelemetry/nostd/internal/absl/types/variant.h"
 #  endif
 

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

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <gtest/gtest.h>
-#include <opentelemetry/trace/propagation/b3_propagator.h>
-#include <string>
+#include <stddef.h>
+#include <ostream>
+#include <vector>
 
 #include "opentelemetry/nostd/string_view.h"
+#include "opentelemetry/trace/propagation/detail/string.h"
 
 using namespace opentelemetry;
 

exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_data.h

@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <stddef.h>
 #include <map>
 #include <memory>
 #include <string>
@@ -11,15 +12,10 @@
 #include "opentelemetry/version.h"
 #include "opentelemetry/exporters/memory/in_memory_data.h"
 #include "opentelemetry/sdk/metrics/data/metric_data.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-struct ResourceMetrics;
-}
-}  // namespace sdk
 namespace exporter
 {
 namespace memory

exporters/memory/include/opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h

@@ -6,21 +6,16 @@
 #include <memory>
 
 #include "opentelemetry/version.h"
+#include "opentelemetry/exporters/memory/in_memory_metric_data.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace metrics
-{
-class PushMetricExporter;
-}  // namespace metrics
-}  // namespace sdk
 namespace exporter
 {
 namespace memory
 {
-class InMemoryMetricData;
 
 /// A factory for InMemoryMetricExporter
 class OPENTELEMETRY_EXPORT InMemoryMetricExporterFactory

exporters/memory/src/in_memory_metric_data.cc

@@ -1,9 +1,22 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <stddef.h>
+#include <map>
+#include <memory>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <vector>
+
+#include "opentelemetry/exporters/memory/in_memory_data.h"
 #include "opentelemetry/exporters/memory/in_memory_metric_data.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter

exporters/memory/src/in_memory_metric_exporter_factory.cc

@@ -1,11 +1,18 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
+#include <atomic>
+#include <chrono>
+#include <memory>
+
 #include "opentelemetry/exporters/memory/in_memory_metric_data.h"
+#include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter

exporters/memory/test/in_memory_metric_data_test.cc

@@ -1,15 +1,23 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+#include <algorithm>
+#include <map>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include "opentelemetry/exporters/memory/in_memory_metric_data.h"
+#include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
+#include "opentelemetry/sdk/metrics/data/point_data.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
+#include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/resource/resource.h"
 
-#include <gtest/gtest.h>
-
-#include <vector>
-
 using opentelemetry::exporter::memory::CircularBufferInMemoryMetricData;
 using opentelemetry::exporter::memory::SimpleAggregateInMemoryMetricData;
 using opentelemetry::sdk::metrics::MetricData;

exporters/memory/test/in_memory_metric_exporter_test.cc

@@ -1,15 +1,18 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include <gtest/gtest.h>
+#include <memory>
+#include <vector>
+
 #include "opentelemetry/exporters/memory/in_memory_metric_data.h"
 #include "opentelemetry/exporters/memory/in_memory_metric_exporter_factory.h"
+#include "opentelemetry/sdk/common/exporter_utils.h"
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
 #include "opentelemetry/sdk/resource/resource.h"
 
-#include <gtest/gtest.h>
-
 using opentelemetry::exporter::memory::CircularBufferInMemoryMetricData;
 using opentelemetry::exporter::memory::InMemoryMetricExporterFactory;
 using opentelemetry::sdk::common::ExportResult;