Merge pull request #718 from open-telemetry/main

[CODE HEALTH] Fix clang-tidy misc-use-internal-linkage warnings (open-telemetry#3918)

Author: malkia

.github/workflows/clang-tidy.yaml

@@ -17,9 +17,9 @@ jobs:
       matrix:
         include:
           - cmake_options: all-options-abiv1-preview
-            warning_limit: 490
+            warning_limit: 330
           - cmake_options: all-options-abiv2-preview
-            warning_limit: 492
+            warning_limit: 332
     env:
       CC: /usr/bin/clang-18
       CXX: /usr/bin/clang++-18

CHANGELOG.md

@@ -39,6 +39,9 @@ Increment the:
 * [EXAMPLES] Deprecated semantic conventions used
   [#3905](https://github.com/open-telemetry/opentelemetry-cpp/pull/3905)
 
+* [CODE HEALTH] Fix clang-tidy misc-use-internal-linkage warnings
+  [#3600](https://github.com/open-telemetry/opentelemetry-cpp/pull/3600)
+
 Important changes:
 
 * [BUILD] Revisit EventLogger deprecation

api/test/baggage/baggage_test.cc

@@ -15,7 +15,7 @@
 
 using namespace opentelemetry::baggage;
 
-std::string header_with_custom_entries(size_t num_entries)
+static std::string header_with_custom_entries(size_t num_entries)
 {
   std::string header;
   for (size_t i = 0; i < num_entries; i++)
@@ -31,7 +31,7 @@ std::string header_with_custom_entries(size_t num_entries)
   return header;
 }
 
-std::string header_with_custom_size(size_t key_value_size, size_t num_entries)
+static std::string header_with_custom_size(size_t key_value_size, size_t num_entries)
 {
   std::string header = "";
   for (size_t i = 0; i < num_entries; i++)

api/test/nostd/function_ref_test.cc

@@ -8,12 +8,12 @@
 
 using namespace opentelemetry::nostd;
 
-int Call(function_ref<int()> f)
+static int Call(function_ref<int()> f)
 {
   return f();
 }
 
-int Return3()
+static int Return3()
 {
   return 3;
 }

api/test/singleton/singleton_test.cc

@@ -32,7 +32,7 @@
 
 using namespace opentelemetry;
 
-void do_something()
+static void do_something()
 {
   do_something_in_a();
   do_something_in_b();
@@ -108,33 +108,33 @@ void do_something()
 #  endif
 }
 
-int span_a_lib_count   = 0;
-int span_a_f1_count    = 0;
-int span_a_f2_count    = 0;
-int span_b_lib_count   = 0;
-int span_b_f1_count    = 0;
-int span_b_f2_count    = 0;
-int span_c_lib_count   = 0;
-int span_c_f1_count    = 0;
-int span_c_f2_count    = 0;
-int span_d_lib_count   = 0;
-int span_d_f1_count    = 0;
-int span_d_f2_count    = 0;
-int span_e_lib_count   = 0;
-int span_e_f1_count    = 0;
-int span_e_f2_count    = 0;
-int span_f_lib_count   = 0;
-int span_f_f1_count    = 0;
-int span_f_f2_count    = 0;
-int span_g_lib_count   = 0;
-int span_g_f1_count    = 0;
-int span_g_f2_count    = 0;
-int span_h_lib_count   = 0;
-int span_h_f1_count    = 0;
-int span_h_f2_count    = 0;
-int unknown_span_count = 0;
-
-void reset_counts()
+static int span_a_lib_count   = 0;
+static int span_a_f1_count    = 0;
+static int span_a_f2_count    = 0;
+static int span_b_lib_count   = 0;
+static int span_b_f1_count    = 0;
+static int span_b_f2_count    = 0;
+static int span_c_lib_count   = 0;
+static int span_c_f1_count    = 0;
+static int span_c_f2_count    = 0;
+static int span_d_lib_count   = 0;
+static int span_d_f1_count    = 0;
+static int span_d_f2_count    = 0;
+static int span_e_lib_count   = 0;
+static int span_e_f1_count    = 0;
+static int span_e_f2_count    = 0;
+static int span_f_lib_count   = 0;
+static int span_f_f1_count    = 0;
+static int span_f_f2_count    = 0;
+static int span_g_lib_count   = 0;
+static int span_g_f1_count    = 0;
+static int span_g_f2_count    = 0;
+static int span_h_lib_count   = 0;
+static int span_h_f1_count    = 0;
+static int span_h_f2_count    = 0;
+static int unknown_span_count = 0;
+
+static void reset_counts()
 {
   span_a_lib_count   = 0;
   span_a_f1_count    = 0;
@@ -328,7 +328,7 @@ class MyTracerProvider : public trace::TracerProvider
 #endif
 };
 
-void setup_otel()
+static void setup_otel()
 {
   std::shared_ptr<opentelemetry::trace::TracerProvider> provider = MyTracerProvider::Create();
 
@@ -340,7 +340,7 @@ void setup_otel()
   trace_api::Provider::SetTracerProvider(provider);
 }
 
-void cleanup_otel()
+static void cleanup_otel()
 {
   std::shared_ptr<opentelemetry::trace::TracerProvider> provider(
       new opentelemetry::trace::NoopTracerProvider());

exporters/ostream/src/metric_exporter.cc

@@ -76,7 +76,7 @@ namespace metrics
 {
 
 template <typename Container>
-inline void printVec(std::ostream &os, Container &vec)
+static inline void printVec(std::ostream &os, Container &vec)
 {
   using T = typename std::decay<decltype(*vec.begin())>::type;
   os << '[';

exporters/ostream/src/span_exporter.cc

@@ -40,7 +40,7 @@ namespace exporter
 namespace trace
 {
 
-std::ostream &operator<<(std::ostream &os, trace_api::SpanKind span_kind)
+static std::ostream &operator<<(std::ostream &os, trace_api::SpanKind span_kind)
 {
   switch (span_kind)
   {

exporters/otlp/test/otlp_http_exporter_test.cc

@@ -58,8 +58,8 @@ static nostd::span<T, N> MakeSpan(T (&array)[N])
   return nostd::span<T, N>(array);
 }
 
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
+static OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
+                                                       bool async_mode)
 {
   std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
   OtlpHttpExporterOptions options;

exporters/otlp/test/otlp_http_log_record_exporter_test.cc

@@ -53,8 +53,8 @@ static nostd::span<T, N> MakeSpan(T (&array)[N])
   return nostd::span<T, N>(array);
 }
 
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
+static OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
+                                                       bool async_mode)
 {
   std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
   OtlpHttpLogRecordExporterOptions options;

exporters/otlp/test/otlp_http_metric_exporter_test.cc

@@ -72,8 +72,8 @@ static IntegerType JsonToInteger(nlohmann::json value)
   return value.get<IntegerType>();
 }
 
-OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
-                                                bool async_mode)
+static OtlpHttpClientOptions MakeOtlpHttpClientOptions(HttpRequestContentType content_type,
+                                                       bool async_mode)
 {
   std::shared_ptr<opentelemetry::sdk::common::ThreadInstrumentation> not_instrumented;
   OtlpHttpMetricExporterOptions options;