feat httpclient, grpc client: add span tags for service map

commit_hash:e869d778a6d23b1f39eb4718d7e8df5b016be0a2

Author: segoon

core/include/userver/clients/http/plugin.hpp

@@ -11,6 +11,10 @@
 
 USERVER_NAMESPACE_BEGIN
 
+namespace tracing {
+class Span;
+}
+
 namespace clients::http {
 
 class RequestState;
@@ -51,7 +55,7 @@ class Plugin {
 
     /// @brief The hook is called just after the "external" Span is created.
     ///        You might want to add custom tags from the hook.
-    virtual void HookCreateSpan(PluginRequest& request) = 0;
+    virtual void HookCreateSpan(PluginRequest& request, tracing::Span& span) = 0;
 
     /// @brief The hook is called after the HTTP response is received or the
     ///        timeout is passed.
@@ -72,7 +76,7 @@ class PluginPipeline final {
 
     void HookPerformRequest(RequestState& request);
 
-    void HookCreateSpan(RequestState& request);
+    void HookCreateSpan(RequestState& request, tracing::Span& span);
 
     void HookOnCompleted(RequestState& request, Response& response);
 

core/src/clients/http/plugin.cpp

@@ -38,11 +38,11 @@ namespace impl {
 
 PluginPipeline::PluginPipeline(const std::vector<utils::NotNull<Plugin*>>& plugins) : plugins_(plugins) {}
 
-void PluginPipeline::HookCreateSpan(RequestState& request_state) {
+void PluginPipeline::HookCreateSpan(RequestState& request_state, tracing::Span& span) {
     PluginRequest req(request_state);
 
     for (const auto& plugin : plugins_) {
-        plugin->HookCreateSpan(req);
+        plugin->HookCreateSpan(req, span);
     }
 }
 

core/src/clients/http/plugins/headers_propagator/plugin.cpp

@@ -15,7 +15,7 @@ Plugin::Plugin() : clients::http::Plugin(kName) {}
 
 void Plugin::HookPerformRequest(PluginRequest&) {}
 
-void Plugin::HookCreateSpan(PluginRequest& request) {
+void Plugin::HookCreateSpan(PluginRequest& request, tracing::Span&) {
     for (const auto& [name, value] : server::request::GetPropagatedHeaders()) {
         request.SetHeader(name, value);
     }

core/src/clients/http/plugins/headers_propagator/plugin.hpp

@@ -12,7 +12,7 @@ class Plugin final : public http::Plugin {
 
     void HookPerformRequest(PluginRequest&) override;
 
-    void HookCreateSpan(PluginRequest&) override;
+    void HookCreateSpan(PluginRequest&, tracing::Span& span) override;
 
     void HookOnCompleted(PluginRequest&, Response&) override;
 

core/src/clients/http/plugins/yandex_tracing/plugin.cpp

@@ -2,6 +2,7 @@
 
 #include <userver/clients/http/response.hpp>
 #include <userver/logging/log.hpp>
+#include <userver/tracing/span.hpp>
 #include <userver/utils/algo.hpp>
 
 #include <userver/http/common_headers.hpp>
@@ -18,13 +19,15 @@ constexpr USERVER_NAMESPACE::http::headers::PredefinedHeader kYaTracingHeaders[]
 };
 
 const std::string kName = "yandex-tracing";
+const std::string kTypeTag = "type";
+const std::string kTypeRequest = "request";
 }  // namespace
 
 Plugin::Plugin() : http::Plugin(kName) {}
 
 void Plugin::HookPerformRequest(PluginRequest&) {}
 
-void Plugin::HookCreateSpan(PluginRequest&) {}
+void Plugin::HookCreateSpan(PluginRequest&, tracing::Span& span) { span.AddNonInheritableTag(kTypeTag, kTypeRequest); }
 
 void Plugin::HookOnCompleted(PluginRequest&, Response& response) {
     const auto& headers = response.headers();

core/src/clients/http/plugins/yandex_tracing/plugin.hpp

@@ -12,7 +12,7 @@ class Plugin final : public http::Plugin {
 
     void HookPerformRequest(PluginRequest& request) override;
 
-    void HookCreateSpan(PluginRequest& request) override;
+    void HookCreateSpan(PluginRequest& request, tracing::Span& span) override;
 
     void HookOnCompleted(PluginRequest& request, Response& response) override;
 };

core/src/clients/http/request_state.cpp

@@ -974,7 +974,7 @@ void RequestState::StartNewSpan(utils::impl::SourceLocation location) {
     auto request_editable_instance = GetEditableRequestInstance();
 
     tracing_manager_->FillRequestWithTracingContext(span, request_editable_instance);
-    plugin_pipeline_.HookCreateSpan(*this);
+    plugin_pipeline_.HookCreateSpan(*this, span);
     span.AddTag(tracing::kHttpUrl, GetLoggedOriginalUrl());
     span.AddTag(tracing::kMaxAttempts, retry_.retries);
 

grpc/src/ugrpc/client/middlewares/log/middleware.cpp

@@ -44,6 +44,7 @@ void Middleware::PreStartCall(MiddlewareCallContext& context) const {
     span.SetLocalLogLevel(settings_.log_level);
 
     span.AddTag("meta_type", std::string{context.GetCallName()});
+    span.AddTag("type", "request");
 
     if (!IsSingleRequest(context.GetCallKind())) {
         SpanLogger{context.GetSpan(), settings_.log_level}.Log(