Skip to content

Commit 3e51ff9

Browse files
committed
fix: include foo_library header instead of suppressing lint
Addresses review feedback on #3985. The clang-tidy misc-use-internal-linkage warning for foo_library() was triggered because the .cc files did not include their own header, so clang-tidy could not see the external declaration. Including the header is the right fix and lets the NOLINTNEXTLINE suppressions be removed. Uses the same BAZEL_BUILD vs CMake include path split already used by every example main file that calls foo_library(). Signed-off-by: Mateen Anjum <mateenali66@gmail.com>
1 parent 0e8546f commit 3e51ff9

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

examples/common/foo_library/foo_library.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
#include "opentelemetry/trace/tracer.h"
99
#include "opentelemetry/trace/tracer_provider.h"
1010

11+
#ifdef BAZEL_BUILD
12+
# include "examples/common/foo_library/foo_library.h"
13+
#else
14+
# include "foo_library/foo_library.h"
15+
#endif
16+
1117
namespace trace = opentelemetry::trace;
1218
namespace nostd = opentelemetry::nostd;
1319

@@ -33,7 +39,6 @@ void f2()
3339
}
3440
} // namespace
3541

36-
// NOLINTNEXTLINE(misc-use-internal-linkage)
3742
void foo_library()
3843
{
3944
auto scoped_span = trace::Scope(get_tracer()->StartSpan("library"));

examples/common/logs_foo_library/foo_library.cc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
#include "opentelemetry/trace/tracer.h"
1414
#include "opentelemetry/trace/tracer_provider.h"
1515

16+
#ifdef BAZEL_BUILD
17+
# include "examples/common/logs_foo_library/foo_library.h"
18+
#else
19+
# include "logs_foo_library/foo_library.h"
20+
#endif
21+
1622
namespace logs = opentelemetry::logs;
1723
namespace trace = opentelemetry::trace;
1824

@@ -31,7 +37,6 @@ opentelemetry::nostd::shared_ptr<logs::Logger> get_logger()
3137
}
3238
} // namespace
3339

34-
// NOLINTNEXTLINE(misc-use-internal-linkage)
3540
void foo_library()
3641
{
3742
auto span = get_tracer()->StartSpan("span 1");

0 commit comments

Comments
 (0)