From 2a00ad2117b6093beda968d83002437dee8d9ac9 Mon Sep 17 00:00:00 2001 From: thc1006 <84045975+thc1006@users.noreply.github.com> Date: Tue, 19 May 2026 00:14:30 +0800 Subject: [PATCH] [CODE HEALTH] Remove unused alias declarations Eliminate 29 misc-unused-alias-decls warnings flagged by clang-tidy v22 across 27 files in examples, exporters, sdk, and tests. The dominant pattern was a file-scope `namespace nostd = opentelemetry::nostd;` declaration never referenced via the file-scope alias path (uses of `nostd::` resolved through OPENTELEMETRY_BEGIN_NAMESPACE namespace nesting instead). Also remove 4 unused type-alias `using M = std::map;` declarations in storage tests, observed by Copilot review. clang-tidy does not flag these (misc-unused-alias-decls targets only namespace aliases, not type aliases), but they are genuinely dead code in the same spirit and the same files this PR already touches. Also remove 9 now-unused #include directives that IWYU flagged as a consequence of the alias removals: when an alias like `namespace http_client = opentelemetry::ext::http::client;` is removed, the include that brought the namespace into scope is no longer needed. Same logic for several `opentelemetry/common/attribute_value.h` includes that supported `namespace common = opentelemetry::common;` aliases, and `` after removing the unused `using M = ...` from async_metric_storage_test.cc. No behavior change. Removed declarations were genuinely unused. clang-format auto-collapsed adjacent orphan alignment whitespace where removing a line left aligned siblings. Ratchet: * abiv1-preview warning_limit lowered from 418 to 389 * abiv2-preview warning_limit lowered from 424 to 395 A 30th misc-unused-alias-decls site at exporters/otlp/src/otlp_populate_attribute_utils.cc:30 is intentionally not touched in this PR to avoid conflicting with the in-flight #4090. It can be cleaned up in a trivial follow-up after #4090 lands. Part of #2053 Signed-off-by: thc1006 <84045975+thc1006@users.noreply.github.com> --- .github/workflows/clang-tidy.yaml | 4 ++-- CHANGELOG.md | 3 +++ api/test/trace/tracer_test.cc | 2 -- examples/metrics_simple/metrics_ostream.cc | 2 -- examples/otlp/file_log_main.cc | 1 - examples/otlp/file_main.cc | 1 - examples/otlp/file_metric_main.cc | 2 -- examples/otlp/grpc_log_main.cc | 1 - examples/otlp/grpc_main.cc | 1 - examples/otlp/grpc_metric_main.cc | 2 -- examples/otlp/http_log_main.cc | 1 - examples/otlp/http_main.cc | 1 - examples/otlp/http_metric_main.cc | 2 -- examples/prometheus/main.cc | 2 -- examples/simple/main.cc | 1 - examples/zipkin/main.cc | 1 - exporters/elasticsearch/src/es_log_record_exporter.cc | 1 - exporters/ostream/test/ostream_metric_test.cc | 1 - exporters/otlp/src/otlp_recordable.cc | 2 -- exporters/otlp/test/otlp_recordable_test.cc | 2 -- exporters/prometheus/src/collector.cc | 2 -- exporters/prometheus/test/collector_test.cc | 4 ---- exporters/zipkin/src/zipkin_exporter_factory.cc | 3 --- sdk/src/logs/logger.cc | 1 - sdk/test/metrics/async_metric_storage_test.cc | 4 ---- sdk/test/metrics/sync_metric_storage_counter_test.cc | 2 -- sdk/test/metrics/sync_metric_storage_gauge_test.cc | 1 - sdk/test/metrics/sync_metric_storage_histogram_test.cc | 2 -- sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc | 2 -- 29 files changed, 5 insertions(+), 49 deletions(-) diff --git a/.github/workflows/clang-tidy.yaml b/.github/workflows/clang-tidy.yaml index 838ffaba39..19ec7f1573 100644 --- a/.github/workflows/clang-tidy.yaml +++ b/.github/workflows/clang-tidy.yaml @@ -17,9 +17,9 @@ jobs: matrix: include: - cmake_options: all-options-abiv1-preview - warning_limit: 418 + warning_limit: 389 - cmake_options: all-options-abiv2-preview - warning_limit: 424 + warning_limit: 395 env: CC: /usr/bin/clang-22 CXX: /usr/bin/clang++-22 diff --git a/CHANGELOG.md b/CHANGELOG.md index 061782d28c..e57d7fa70b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ Increment the: * [CODE HEALTH] Fix IWYU Clang22 warnings [#4083](https://github.com/open-telemetry/opentelemetry-cpp/pull/4083) +* [CODE HEALTH] Remove unused alias declarations + [#4091](https://github.com/open-telemetry/opentelemetry-cpp/pull/4091) + ## [1.27.0] 2026-05-13 * [RELEASE] Bump main branch to 1.27.0-dev diff --git a/api/test/trace/tracer_test.cc b/api/test/trace/tracer_test.cc index c859381213..a5265984f5 100644 --- a/api/test/trace/tracer_test.cc +++ b/api/test/trace/tracer_test.cc @@ -4,7 +4,6 @@ #include #include -#include "opentelemetry/context/context_value.h" #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/trace/noop.h" #include "opentelemetry/trace/scope.h" @@ -14,7 +13,6 @@ namespace trace_api = opentelemetry::trace; namespace nostd = opentelemetry::nostd; -namespace context = opentelemetry::context; TEST(TracerTest, GetCurrentSpan) { diff --git a/examples/metrics_simple/metrics_ostream.cc b/examples/metrics_simple/metrics_ostream.cc index d305ffd52d..46a775d32f 100644 --- a/examples/metrics_simple/metrics_ostream.cc +++ b/examples/metrics_simple/metrics_ostream.cc @@ -8,7 +8,6 @@ #include #include -#include "opentelemetry/common/attribute_value.h" #include "opentelemetry/exporters/ostream/metric_exporter_factory.h" #include "opentelemetry/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h" @@ -36,7 +35,6 @@ #endif namespace metrics_sdk = opentelemetry::sdk::metrics; -namespace common = opentelemetry::common; namespace exportermetrics = opentelemetry::exporter::metrics; namespace metrics_api = opentelemetry::metrics; diff --git a/examples/otlp/file_log_main.cc b/examples/otlp/file_log_main.cc index c5c7987bf2..253bf37381 100644 --- a/examples/otlp/file_log_main.cc +++ b/examples/otlp/file_log_main.cc @@ -33,7 +33,6 @@ # include "logs_foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace nostd = opentelemetry::nostd; namespace otlp = opentelemetry::exporter::otlp; namespace logs_sdk = opentelemetry::sdk::logs; diff --git a/examples/otlp/file_main.cc b/examples/otlp/file_main.cc index 62000dc18a..1d69f64efa 100644 --- a/examples/otlp/file_main.cc +++ b/examples/otlp/file_main.cc @@ -22,7 +22,6 @@ # include "foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace trace_sdk = opentelemetry::sdk::trace; namespace otlp = opentelemetry::exporter::otlp; diff --git a/examples/otlp/file_metric_main.cc b/examples/otlp/file_metric_main.cc index 98a5411599..96aef81051 100644 --- a/examples/otlp/file_metric_main.cc +++ b/examples/otlp/file_metric_main.cc @@ -7,7 +7,6 @@ #include #include -#include "opentelemetry/common/attribute_value.h" #include "opentelemetry/exporters/otlp/otlp_file_client_options.h" #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_factory.h" #include "opentelemetry/exporters/otlp/otlp_file_metric_exporter_options.h" @@ -29,7 +28,6 @@ #endif namespace metrics_sdk = opentelemetry::sdk::metrics; -namespace common = opentelemetry::common; namespace metrics_api = opentelemetry::metrics; namespace otlp_exporter = opentelemetry::exporter::otlp; diff --git a/examples/otlp/grpc_log_main.cc b/examples/otlp/grpc_log_main.cc index 48fc767e4b..bd7d7fa894 100644 --- a/examples/otlp/grpc_log_main.cc +++ b/examples/otlp/grpc_log_main.cc @@ -31,7 +31,6 @@ # include "logs_foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace nostd = opentelemetry::nostd; namespace otlp = opentelemetry::exporter::otlp; namespace logs_sdk = opentelemetry::sdk::logs; diff --git a/examples/otlp/grpc_main.cc b/examples/otlp/grpc_main.cc index 47e92c3294..10fde09b76 100644 --- a/examples/otlp/grpc_main.cc +++ b/examples/otlp/grpc_main.cc @@ -21,7 +21,6 @@ # include "foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace trace_sdk = opentelemetry::sdk::trace; namespace otlp = opentelemetry::exporter::otlp; diff --git a/examples/otlp/grpc_metric_main.cc b/examples/otlp/grpc_metric_main.cc index 31e72c44ac..15bf9755eb 100644 --- a/examples/otlp/grpc_metric_main.cc +++ b/examples/otlp/grpc_metric_main.cc @@ -8,7 +8,6 @@ #include #include -#include "opentelemetry/common/attribute_value.h" #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_factory.h" #include "opentelemetry/exporters/otlp/otlp_grpc_metric_exporter_options.h" #include "opentelemetry/metrics/meter_provider.h" @@ -37,7 +36,6 @@ #endif namespace metric_sdk = opentelemetry::sdk::metrics; -namespace common = opentelemetry::common; namespace metrics_api = opentelemetry::metrics; namespace otlp_exporter = opentelemetry::exporter::otlp; diff --git a/examples/otlp/http_log_main.cc b/examples/otlp/http_log_main.cc index ad96d6b02c..7cc6a0bb4e 100644 --- a/examples/otlp/http_log_main.cc +++ b/examples/otlp/http_log_main.cc @@ -34,7 +34,6 @@ # include "logs_foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace otlp = opentelemetry::exporter::otlp; namespace logs_sdk = opentelemetry::sdk::logs; namespace logs = opentelemetry::logs; diff --git a/examples/otlp/http_main.cc b/examples/otlp/http_main.cc index a76a00e188..66b612e3e8 100644 --- a/examples/otlp/http_main.cc +++ b/examples/otlp/http_main.cc @@ -23,7 +23,6 @@ # include "foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace trace_sdk = opentelemetry::sdk::trace; namespace otlp = opentelemetry::exporter::otlp; diff --git a/examples/otlp/http_metric_main.cc b/examples/otlp/http_metric_main.cc index 7e0040e3c3..59527d4514 100644 --- a/examples/otlp/http_metric_main.cc +++ b/examples/otlp/http_metric_main.cc @@ -7,7 +7,6 @@ #include #include -#include "opentelemetry/common/attribute_value.h" #include "opentelemetry/exporters/otlp/otlp_http.h" #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_factory.h" #include "opentelemetry/exporters/otlp/otlp_http_metric_exporter_options.h" @@ -30,7 +29,6 @@ #endif namespace metrics_sdk = opentelemetry::sdk::metrics; -namespace common = opentelemetry::common; namespace metrics_api = opentelemetry::metrics; namespace otlp_exporter = opentelemetry::exporter::otlp; diff --git a/examples/prometheus/main.cc b/examples/prometheus/main.cc index 0f82394e8e..221304e49c 100644 --- a/examples/prometheus/main.cc +++ b/examples/prometheus/main.cc @@ -7,7 +7,6 @@ #include #include -#include "opentelemetry/common/attribute_value.h" #include "opentelemetry/exporters/prometheus/exporter_factory.h" #include "opentelemetry/exporters/prometheus/exporter_options.h" #include "opentelemetry/metrics/meter_provider.h" @@ -30,7 +29,6 @@ #endif namespace metrics_sdk = opentelemetry::sdk::metrics; -namespace common = opentelemetry::common; namespace metrics_exporter = opentelemetry::exporter::metrics; namespace metrics_api = opentelemetry::metrics; diff --git a/examples/simple/main.cc b/examples/simple/main.cc index f0341a946d..90b2c88579 100644 --- a/examples/simple/main.cc +++ b/examples/simple/main.cc @@ -19,7 +19,6 @@ # include "foo_library/foo_library.h" #endif -namespace trace_api = opentelemetry::trace; namespace trace_sdk = opentelemetry::sdk::trace; namespace trace_exporter = opentelemetry::exporter::trace; diff --git a/examples/zipkin/main.cc b/examples/zipkin/main.cc index 909c52fb69..1f7f0060c0 100644 --- a/examples/zipkin/main.cc +++ b/examples/zipkin/main.cc @@ -22,7 +22,6 @@ # include "foo_library/foo_library.h" #endif -namespace trace = opentelemetry::trace; namespace trace_sdk = opentelemetry::sdk::trace; namespace zipkin = opentelemetry::exporter::zipkin; namespace resource = opentelemetry::sdk::resource; diff --git a/exporters/elasticsearch/src/es_log_record_exporter.cc b/exporters/elasticsearch/src/es_log_record_exporter.cc index 1f2417d354..fcfaa6252e 100644 --- a/exporters/elasticsearch/src/es_log_record_exporter.cc +++ b/exporters/elasticsearch/src/es_log_record_exporter.cc @@ -32,7 +32,6 @@ # include "opentelemetry/common/timestamp.h" #endif -namespace nostd = opentelemetry::nostd; namespace sdklogs = opentelemetry::sdk::logs; namespace http_client = opentelemetry::ext::http::client; diff --git a/exporters/ostream/test/ostream_metric_test.cc b/exporters/ostream/test/ostream_metric_test.cc index 4fbccc25d3..d7108869d4 100644 --- a/exporters/ostream/test/ostream_metric_test.cc +++ b/exporters/ostream/test/ostream_metric_test.cc @@ -25,7 +25,6 @@ #include "opentelemetry/sdk/version/version.h" namespace metric_sdk = opentelemetry::sdk::metrics; -namespace nostd = opentelemetry::nostd; namespace exportermetrics = opentelemetry::exporter::metrics; TEST(OStreamMetricsExporter, Shutdown) diff --git a/exporters/otlp/src/otlp_recordable.cc b/exporters/otlp/src/otlp_recordable.cc index 6520703283..9270e17383 100644 --- a/exporters/otlp/src/otlp_recordable.cc +++ b/exporters/otlp/src/otlp_recordable.cc @@ -31,8 +31,6 @@ #include "opentelemetry/exporters/otlp/protobuf_include_suffix.h" // IWYU pragma: keep // clang-format on -namespace nostd = opentelemetry::nostd; - OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/otlp/test/otlp_recordable_test.cc b/exporters/otlp/test/otlp_recordable_test.cc index 99fd99ad09..a695b41f1e 100644 --- a/exporters/otlp/test/otlp_recordable_test.cc +++ b/exporters/otlp/test/otlp_recordable_test.cc @@ -57,8 +57,6 @@ namespace trace_sdk = opentelemetry::sdk::trace; namespace resource = opentelemetry::sdk::resource; namespace proto = opentelemetry::proto; -namespace trace_sdk_2 = opentelemetry::sdk::trace; - TEST(OtlpRecordable, SetIdentity) { constexpr uint8_t trace_id_buf[] = {1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8}; diff --git a/exporters/prometheus/src/collector.cc b/exporters/prometheus/src/collector.cc index a081f31a0d..45fbff179e 100644 --- a/exporters/prometheus/src/collector.cc +++ b/exporters/prometheus/src/collector.cc @@ -13,8 +13,6 @@ #include "opentelemetry/sdk/metrics/metric_reader.h" #include "opentelemetry/version.h" -namespace metric_sdk = opentelemetry::sdk::metrics; - OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/exporters/prometheus/test/collector_test.cc b/exporters/prometheus/test/collector_test.cc index da938793f5..20c3070cec 100644 --- a/exporters/prometheus/test/collector_test.cc +++ b/exporters/prometheus/test/collector_test.cc @@ -10,7 +10,6 @@ #include #include "opentelemetry/exporters/prometheus/collector.h" -#include "opentelemetry/metrics/meter_provider.h" #include "opentelemetry/sdk/metrics/export/metric_producer.h" #include "opentelemetry/sdk/metrics/instruments.h" #include "opentelemetry/sdk/metrics/metric_reader.h" @@ -20,9 +19,6 @@ using namespace prometheus_test; using opentelemetry::exporter::metrics::PrometheusCollector; using opentelemetry::sdk::metrics::MetricProducer; using opentelemetry::sdk::metrics::ResourceMetrics; -namespace metric_api = opentelemetry::metrics; -namespace metric_sdk = opentelemetry::sdk::metrics; -namespace metric_exporter = opentelemetry::exporter::metrics; class MockMetricProducer : public MetricProducer { diff --git a/exporters/zipkin/src/zipkin_exporter_factory.cc b/exporters/zipkin/src/zipkin_exporter_factory.cc index edacb79842..aaa8173cc4 100644 --- a/exporters/zipkin/src/zipkin_exporter_factory.cc +++ b/exporters/zipkin/src/zipkin_exporter_factory.cc @@ -4,11 +4,8 @@ #include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h" #include "opentelemetry/exporters/zipkin/zipkin_exporter.h" #include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h" -#include "opentelemetry/ext/http/client/http_client.h" #include "opentelemetry/version.h" -namespace http_client = opentelemetry::ext::http::client; - OPENTELEMETRY_BEGIN_NAMESPACE namespace exporter { diff --git a/sdk/src/logs/logger.cc b/sdk/src/logs/logger.cc index 3706ee1351..8b7062db4a 100644 --- a/sdk/src/logs/logger.cc +++ b/sdk/src/logs/logger.cc @@ -39,7 +39,6 @@ namespace sdk namespace logs { namespace trace_api = opentelemetry::trace; -namespace common = opentelemetry::common; namespace context = opentelemetry::context; namespace nostd = opentelemetry::nostd; diff --git a/sdk/test/metrics/async_metric_storage_test.cc b/sdk/test/metrics/async_metric_storage_test.cc index eb86bab067..4de1a95c4f 100644 --- a/sdk/test/metrics/async_metric_storage_test.cc +++ b/sdk/test/metrics/async_metric_storage_test.cc @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -37,9 +36,6 @@ using namespace opentelemetry::sdk::metrics; using namespace opentelemetry::sdk::instrumentationscope; using namespace opentelemetry::sdk::resource; using namespace opentelemetry::common; -namespace nostd = opentelemetry::nostd; - -using M = std::map; class WritableMetricStorageTestFixture : public ::testing::TestWithParam {}; diff --git a/sdk/test/metrics/sync_metric_storage_counter_test.cc b/sdk/test/metrics/sync_metric_storage_counter_test.cc index 6215e108c8..87cd6557de 100644 --- a/sdk/test/metrics/sync_metric_storage_counter_test.cc +++ b/sdk/test/metrics/sync_metric_storage_counter_test.cc @@ -33,8 +33,6 @@ using namespace opentelemetry::sdk::metrics; using namespace opentelemetry::common; -using M = std::map; -namespace nostd = opentelemetry::nostd; class WritableMetricStorageTestFixture : public ::testing::TestWithParam {}; diff --git a/sdk/test/metrics/sync_metric_storage_gauge_test.cc b/sdk/test/metrics/sync_metric_storage_gauge_test.cc index 60a4f86d1a..13a52f2738 100644 --- a/sdk/test/metrics/sync_metric_storage_gauge_test.cc +++ b/sdk/test/metrics/sync_metric_storage_gauge_test.cc @@ -35,7 +35,6 @@ using namespace opentelemetry::sdk::metrics; using namespace opentelemetry::common; -namespace nostd = opentelemetry::nostd; class WritableMetricStorageTestFixture : public ::testing::TestWithParam {}; diff --git a/sdk/test/metrics/sync_metric_storage_histogram_test.cc b/sdk/test/metrics/sync_metric_storage_histogram_test.cc index 799b847548..c89d4b3b22 100644 --- a/sdk/test/metrics/sync_metric_storage_histogram_test.cc +++ b/sdk/test/metrics/sync_metric_storage_histogram_test.cc @@ -34,8 +34,6 @@ using namespace opentelemetry::sdk::metrics; using namespace opentelemetry::common; -using M = std::map; -namespace nostd = opentelemetry::nostd; class WritableMetricStorageHistogramTestFixture : public ::testing::TestWithParam diff --git a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc index 4e62a27183..6880f96473 100644 --- a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc +++ b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc @@ -33,8 +33,6 @@ using namespace opentelemetry::sdk::metrics; using namespace opentelemetry::common; -using M = std::map; -namespace nostd = opentelemetry::nostd; class WritableMetricStorageTestFixture : public ::testing::TestWithParam {};