Added mapping

open-telemetry · May 18, 2024 · cb4beee · cb4beee
1 parent e8b636a
commit cb4beee
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/iwyu.yml b/.github/workflows/iwyu.yml
@@ -11,7 +11,7 @@ jobs:
   iwyu:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: 'recursive'
 
@@ -33,9 +33,10 @@ jobs:
 
       - name: Prepare CMake
         run: |
+          TOPDIR=`pwd`
           mkdir build && cd build
           CC="clang" CXX="clang++" cmake \
-            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--verbose=1" \
+            -DCMAKE_CXX_INCLUDE_WHAT_YOU_USE="include-what-you-use;-w;-Xiwyu;--mapping_file=${TOPDIR}/.iwyu.imp;--verbose=1" \
             -DBUILD_TESTING=OFF \
             -DBUILD_W3CTRACECONTEXT_TEST=OFF \
             ..
@@ -45,7 +46,7 @@ jobs:
           cd build
           make -k 2>&1 | tee -a iwyu.log
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: success() || failure()
         with:
           name: Logs (include-what-you-use)

diff --git a/.iwyu.imp b/.iwyu.imp
@@ -0,0 +1,13 @@
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+# include-what-you-use mapping file
+
+[
+  # Work around for C++ STL
+  { "include": ["<bits/chrono.h>", "private", "<chrono>", "public"] },
+
+  # Local opentelemetry-cpp
+
+]
+
diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "opentelemetry/common/macros.h"
+#include "opentelemetry/common/macros.h" // IWYU pragma: export
 #include "opentelemetry/detail/preprocessor.h"
 
 #ifndef OPENTELEMETRY_ABI_VERSION_NO

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer.h b/sdk/include/opentelemetry/sdk/trace/tracer.h
@@ -26,15 +26,8 @@
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
-namespace resource
-{
-class Resource;
-}  // namespace resource
-
 namespace trace
 {
-class IdGenerator;
-class SpanProcessor;
 
 using namespace opentelemetry::sdk::instrumentationscope;
 

diff --git a/sdk/src/resource/resource.cc b/sdk/src/resource/resource.cc
@@ -3,6 +3,7 @@
 
 #include <unordered_map>
 #include <utility>
+#include <string>
 
 #include "opentelemetry/nostd/variant.h"
 #include "opentelemetry/sdk/resource/resource.h"