feat core: remove legacy Tracer component

apolukhin · apolukhin · commit 0b432f096424 · 2026-02-13T16:41:46.000+03:00
Tests: протестировано CI
commit_hash:0dee8c2f5cedccd6d902489acc5f08f557011446
diff --git a/.mapping.json b/.mapping.json
@@ -1148,7 +1148,7 @@
   "core/include/userver/testsuite/testpoint_control.hpp":"taxi/uservices/userver/core/include/userver/testsuite/testpoint_control.hpp",
   "core/include/userver/testsuite/testsuite_support.hpp":"taxi/uservices/userver/core/include/userver/testsuite/testsuite_support.hpp",
   "core/include/userver/tracing/any_value.hpp":"taxi/uservices/userver/core/include/userver/tracing/any_value.hpp",
-  "core/include/userver/tracing/component.hpp":"taxi/uservices/userver/core/include/userver/tracing/component.hpp",
+  "core/include/userver/tracing/fwd.hpp":"taxi/uservices/userver/core/include/userver/tracing/fwd.hpp",
   "core/include/userver/tracing/in_place_span.hpp":"taxi/uservices/userver/core/include/userver/tracing/in_place_span.hpp",
   "core/include/userver/tracing/manager.hpp":"taxi/uservices/userver/core/include/userver/tracing/manager.hpp",
   "core/include/userver/tracing/manager_component.hpp":"taxi/uservices/userver/core/include/userver/tracing/manager_component.hpp",
@@ -1160,7 +1160,6 @@
   "core/include/userver/tracing/tag_scope.hpp":"taxi/uservices/userver/core/include/userver/tracing/tag_scope.hpp",
   "core/include/userver/tracing/tags.hpp":"taxi/uservices/userver/core/include/userver/tracing/tags.hpp",
   "core/include/userver/tracing/tracer.hpp":"taxi/uservices/userver/core/include/userver/tracing/tracer.hpp",
-  "core/include/userver/tracing/tracer_fwd.hpp":"taxi/uservices/userver/core/include/userver/tracing/tracer_fwd.hpp",
   "core/include/userver/tracing/tracing.hpp":"taxi/uservices/userver/core/include/userver/tracing/tracing.hpp",
   "core/include/userver/utils/async.hpp":"taxi/uservices/userver/core/include/userver/utils/async.hpp",
   "core/include/userver/utils/cpu_relax.hpp":"taxi/uservices/userver/core/include/userver/utils/cpu_relax.hpp",
@@ -2043,8 +2042,6 @@
   "core/src/testsuite/testsuite_support.cpp":"taxi/uservices/userver/core/src/testsuite/testsuite_support.cpp",
   "core/src/testsuite/testsuite_support.yaml":"taxi/uservices/userver/core/src/testsuite/testsuite_support.yaml",
   "core/src/tracing/any_value.cpp":"taxi/uservices/userver/core/src/tracing/any_value.cpp",
-  "core/src/tracing/component.cpp":"taxi/uservices/userver/core/src/tracing/component.cpp",
-  "core/src/tracing/component.yaml":"taxi/uservices/userver/core/src/tracing/component.yaml",
   "core/src/tracing/in_place_span.cpp":"taxi/uservices/userver/core/src/tracing/in_place_span.cpp",
   "core/src/tracing/manager.cpp":"taxi/uservices/userver/core/src/tracing/manager.cpp",
   "core/src/tracing/manager_component.cpp":"taxi/uservices/userver/core/src/tracing/manager_component.cpp",
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -147,7 +147,6 @@ list(
     src/storages/secdist/component.yaml
     src/storages/secdist/provider_component.yaml
     src/testsuite/testsuite_support.yaml
-    src/tracing/component.yaml
     src/tracing/manager_component.yaml
     src/utils/statistics/system_statistics_collector.yaml
 )
diff --git a/core/functional_tests/tracing/static_config.yaml b/core/functional_tests/tracing/static_config.yaml
@@ -32,9 +32,6 @@ components_manager:
                     level: debug
                     overflow_behavior: discard
 
-        tracer:
-            service-name: http-tracing-test
-
         tracing-manager-locator:
             incoming-format: ['taxi', 'yandex', 'b3-alternative', 'opentelemetry']
             new-requests-format: ['taxi', 'yandex', 'b3-alternative', 'opentelemetry']
diff --git a/core/include/userver/components/minimal_component_list.hpp b/core/include/userver/components/minimal_component_list.hpp
@@ -11,13 +11,11 @@ namespace components {
 
 /// @ingroup userver_components
 ///
-/// @brief Returns a list of components to do basic logging, component
-/// initialization and configuration.
+/// @brief Returns a list of components to do basic logging, component initialization and configuration.
 ///
 /// The list contains:
 /// * os_signals::ProcessorComponent
 /// * components::Logging
-/// * components::Tracer
 /// * components::ManagerControllerComponent
 /// * components::StatisticsStorage
 /// * components::DynamicConfig
diff --git a/core/include/userver/tracing/component.hpp b/core/include/userver/tracing/component.hpp
diff --git a/core/include/userver/tracing/fwd.hpp b/core/include/userver/tracing/fwd.hpp
@@ -1,15 +1,18 @@
 #pragma once
 
-#include <memory>
+/// @file userver/tracing/fwd.hpp
+/// @brief Forward declarations of the tracing types.
 
 USERVER_NAMESPACE_BEGIN
 
 namespace tracing {
 
 enum class ReferenceType { kChild, kReference };
 
-class Tracer;
-using TracerPtr = std::shared_ptr<Tracer>;
+class SpanBuilder;
+struct SpanEvent;
+class Span;
+class AnyValue;
 
 }  // namespace tracing
 
diff --git a/core/include/userver/tracing/span.hpp b/core/include/userver/tracing/span.hpp
@@ -8,8 +8,8 @@
 
 #include <userver/logging/log.hpp>
 #include <userver/logging/log_extra.hpp>
+#include <userver/tracing/fwd.hpp>
 #include <userver/tracing/scope_time.hpp>
-#include <userver/tracing/tracer_fwd.hpp>
 #include <userver/utils/impl/internal_tag.hpp>
 #include <userver/utils/impl/source_location.hpp>
 
@@ -21,9 +21,6 @@ class TracePlugin;
 
 namespace tracing {
 
-class SpanBuilder;
-struct SpanEvent;
-
 /// @brief Measures the execution time of the current code block, links it with
 /// the parent tracing::Spans and stores that info in the log.
 ///
diff --git a/core/include/userver/tracing/tracer.hpp b/core/include/userver/tracing/tracer.hpp
@@ -1,57 +1,21 @@
 #pragma once
 
-#include <memory>
-
-#include <userver/rcu/fwd.hpp>
-#include <userver/tracing/span.hpp>
-#include <userver/tracing/tracer_fwd.hpp>
+#include <string>
 
 #include <dynamic_config/variables/USERVER_NO_LOG_SPANS.hpp>
 
 USERVER_NAMESPACE_BEGIN
 
-/// Opentracing support
+/// Tracing support via @ref tracing::Span
 namespace tracing {
 
 using NoLogSpans = ::dynamic_config::userver_no_log_spans::VariableType;
 
+/// Sets the global configuration for disabling logging some of the @ref tracing::Span.
 void SetNoLogSpans(NoLogSpans&& spans);
-bool IsNoLogSpan(const std::string& name);
-NoLogSpans CopyNoLogSpans();
-
-// For legacy opentracing support only.
-class Tracer final {
-public:
-    static void SetTracer(Tracer&& tracer);
-
-    static rcu::ReadablePtr<Tracer, rcu::ExclusiveRcuTraits> ReadTracer();
-
-    static Tracer CopyCurrentTracer();
-
-    Tracer(std::string_view service_name)
-        : service_name_(service_name)
-    {}
 
-    // Only works if legacy opentracing is set up.
-    const std::string& GetServiceName() const;
-
-private:
-    std::string service_name_;
-};
-
-// For tests and benchmarks only!
-class TracerCleanupScope final {
-public:
-    TracerCleanupScope();
-
-    TracerCleanupScope(TracerCleanupScope&&) = delete;
-    TracerCleanupScope& operator=(TracerCleanupScope&&) = delete;
-    ~TracerCleanupScope();
-
-private:
-    Tracer old_tracer_;
-    NoLogSpans old_no_log_spans_;
-};
+/// Returns true iff the @ref tracing::Span with `name` is not logged.
+bool IsNoLogSpan(const std::string& name);
 
 }  // namespace tracing
 
diff --git a/core/src/cache/cache_update_trait_impl.cpp b/core/src/cache/cache_update_trait_impl.cpp
@@ -9,7 +9,7 @@
 #include <userver/engine/task/cancel.hpp>
 #include <userver/logging/log.hpp>
 #include <userver/testsuite/cache_control.hpp>
-#include <userver/tracing/tracer.hpp>
+#include <userver/tracing/span.hpp>
 #include <userver/utils/algo.hpp>
 #include <userver/utils/assert.hpp>
 #include <userver/utils/async.hpp>
diff --git a/core/src/clients/dns/component_test.cpp b/core/src/clients/dns/component_test.cpp
@@ -6,7 +6,6 @@
 #include <userver/components/statistics_storage.hpp>
 #include <userver/logging/component.hpp>
 #include <userver/os_signals/component.hpp>
-#include <userver/tracing/component.hpp>
 
 #include <components/component_list_test.hpp>
 
@@ -50,7 +49,6 @@ TEST_F(DnsClient, InvalidComponentConfig) {
         components::ComponentList()
             .Append<clients::dns::Component>()
             .Append<components::Logging>()
-            .Append<components::Tracer>()
             .Append<components::StatisticsStorage>()
             .Append<os_signals::ProcessorComponent>();
     UEXPECT_THROW_MSG(
diff --git a/core/src/components/common_component_list_test.cpp b/core/src/components/common_component_list_test.cpp
@@ -174,12 +174,6 @@ constexpr std::string_view kStaticConfig = R"(
           file_path: '@stdout'
           overflow_behavior: discard
 # /// [Sample logging component config]
-# /// [Sample tracer component config]
-# yaml
-    tracer:
-        service-name: config-service
-        tracer: native
-# /// [Sample tracer component config]
 # /// [Sample statistics storage component config]
 # yaml
     statistics-storage:
diff --git a/core/src/components/common_server_component_list_test.cpp b/core/src/components/common_server_component_list_test.cpp
@@ -58,8 +58,6 @@ constexpr std::string_view kStaticConfig = R"(
           level: $log_level
           message_queue_size: 4  # small, to test queue overflows
           overflow_behavior: $overflow_behavior
-    tracer:
-        service-name: config-service
     dynamic-config:
       updates-enabled: true
       fs-cache-path: $dynamic-config-cache-path
diff --git a/core/src/components/component_context_component_info.cpp b/core/src/components/component_context_component_info.cpp
@@ -6,7 +6,7 @@
 
 #include <userver/components/component_context.hpp>
 #include <userver/logging/log.hpp>
-#include <userver/tracing/tracer.hpp>
+#include <userver/tracing/span.hpp>
 #include <userver/utils/string_literal.hpp>
 
 USERVER_NAMESPACE_BEGIN
diff --git a/core/src/components/component_list_test.hpp b/core/src/components/component_list_test.hpp
@@ -57,7 +57,6 @@ std::string MergeYaml(std::string_view source, std::string_view patch);
 
 class ComponentList : public ::testing::Test {
     tests::impl::DefaultLoggerGuardTest default_logger_guard_;
-    tracing::TracerCleanupScope tracer_scope_;
 };
 
 USERVER_NAMESPACE_END
diff --git a/core/src/components/config_not_required_test.cpp b/core/src/components/config_not_required_test.cpp
@@ -6,7 +6,6 @@
 #include <userver/components/statistics_storage.hpp>
 #include <userver/logging/component.hpp>
 #include <userver/os_signals/component.hpp>
-#include <userver/tracing/component.hpp>
 #include <userver/utils/algo.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
 
@@ -78,7 +77,6 @@ components::ComponentList MakeComponentList() {
         .Append<os_signals::ProcessorComponent>()
         .Append<components::StatisticsStorage>()
         .Append<components::Logging>()
-        .Append<components::Tracer>()
         .Append<ConfigNotRequiredComponent>();
 }
 
diff --git a/core/src/components/loggable_component_base.cpp b/core/src/components/loggable_component_base.cpp
@@ -2,7 +2,6 @@
 
 #include <userver/components/component.hpp>
 #include <userver/logging/component.hpp>
-#include <userver/tracing/component.hpp>
 #include <userver/yaml_config/schema.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -11,15 +10,11 @@ namespace components {
 
 ComponentBase::ComponentBase(const ComponentConfig&, const ComponentContext& component_context) {
     component_context.FindComponent<Logging>();
-    component_context.FindComponent<Tracer>();
 }
 
 yaml_config::Schema ComponentBase::GetStaticConfigSchema() {
     auto schema = RawComponentBase::GetStaticConfigSchema();
-    schema.UpdateDescription(
-        "Base class for all application components, it depends on "
-        "components::Logger and optionally components::Tracer."
-    );
+    schema.UpdateDescription("Base class for all application components, it depends on components::Logger.");
     return schema;
 }
 
diff --git a/core/src/components/manager_config_test.cpp b/core/src/components/manager_config_test.cpp
@@ -149,8 +149,6 @@ constexpr char kConfig[] = R"(
       path: /tests/control
       method: POST
       task_processor: main-task-processor
-    tracer:
-      tracer: native
     worker-cleanup-inactive-users:
       cleanup-inactive-users-period: $cleanup_inactive_users_period
       task_processor: bg-task-processor
@@ -217,7 +215,7 @@ TEST(ManagerConfig, Basic) {
 
     EXPECT_EQ(mc.task_processors.size(), 5);
 
-    ASSERT_EQ(mc.components.size(), 29);
+    ASSERT_EQ(mc.components.size(), 28);
 
     EXPECT_TRUE(std::any_of(mc.components.begin(), mc.components.end(), [](const auto& conf) {
         return conf.Name() == "api-firebase";
diff --git a/core/src/components/minimal_component_list.cpp b/core/src/components/minimal_component_list.cpp
@@ -5,7 +5,6 @@
 #include <userver/dynamic_config/storage/component.hpp>
 #include <userver/logging/component.hpp>
 #include <userver/os_signals/component.hpp>
-#include <userver/tracing/component.hpp>
 #include <userver/tracing/manager_component.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -16,7 +15,6 @@ ComponentList MinimalComponentList() {
     return components::ComponentList()
         .Append<os_signals::ProcessorComponent>()
         .Append<components::Logging>()
-        .Append<components::Tracer>()
         .Append<components::ManagerControllerComponent>()
         .Append<components::StatisticsStorage>()
         .Append<components::DynamicConfig>()
diff --git a/core/src/components/state_test.cpp b/core/src/components/state_test.cpp
@@ -8,7 +8,6 @@
 #include <userver/components/statistics_storage.hpp>
 #include <userver/logging/component.hpp>
 #include <userver/os_signals/component.hpp>
-#include <userver/tracing/component.hpp>
 #include <userver/utils/algo.hpp>
 #include <userver/yaml_config/merge_schemas.hpp>
 
@@ -199,7 +198,6 @@ components::ComponentList MakeComponentList() {
         .Append<os_signals::ProcessorComponent>()
         .Append<components::StatisticsStorage>()
         .Append<components::Logging>()
-        .Append<components::Tracer>()
         // Make sure that order in list does not affect HasDependencyOn
         .Append<Component2>()
         .Append<Component1>()
diff --git a/core/src/logging/component_test.cpp b/core/src/logging/component_test.cpp
@@ -14,7 +14,6 @@
 #include <userver/fs/blocking/write.hpp>
 #include <userver/logging/log.hpp>
 #include <userver/os_signals/component.hpp>
-#include <userver/tracing/component.hpp>
 #include <userver/utest/utest.hpp>
 
 USERVER_NAMESPACE_BEGIN
@@ -98,8 +97,6 @@ constexpr std::string_view kTwoLoggersConfig = R"(
         custom:
           file_path: $custom-logger-path
           format: tskv
-    tracer:
-      service-name: test-service
     two-loggers:
 )";
 
@@ -112,7 +109,6 @@ components::ComponentList MakeTwoLoggersComponentList() {
     return components::ComponentList()
         .Append<os_signals::ProcessorComponent>()
         .Append<components::Logging>()
-        .Append<components::Tracer>()
         .Append<components::StatisticsStorage>()
         .Append<TwoLoggersComponent>();
 }
diff --git a/core/src/testsuite/cache_control_test.cpp b/core/src/testsuite/cache_control_test.cpp
diff --git a/core/src/tracing/component.cpp b/core/src/tracing/component.cpp
diff --git a/core/src/tracing/component.yaml b/core/src/tracing/component.yaml
diff --git a/core/src/tracing/span_test.cpp b/core/src/tracing/span_test.cpp
diff --git a/core/src/tracing/tracer.cpp b/core/src/tracing/tracer.cpp
diff --git a/core/src/tracing/tracing_benchmark.cpp b/core/src/tracing/tracing_benchmark.cpp

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ list(`
`147`	`147`	`src/storages/secdist/component.yaml`
`148`	`148`	`src/storages/secdist/provider_component.yaml`
`149`	`149`	`src/testsuite/testsuite_support.yaml`
`150`		`- src/tracing/component.yaml`
`151`	`150`	`src/tracing/manager_component.yaml`
`152`	`151`	`src/utils/statistics/system_statistics_collector.yaml`
`153`	`152`	`)`