metrics -> stats, TQuerySpan -> TOperationSpan, TQueryMetrics -> TOperationMetrics

Author: maladetska

cmake/external_libs.cmake

@@ -15,10 +15,7 @@ find_package(jwt-cpp REQUIRED)
 find_package(double-conversion REQUIRED)
 
 if (YDB_SDK_ENABLE_OTEL_METRICS OR YDB_SDK_ENABLE_OTEL_TRACE)
-  find_package(opentelemetry-cpp QUIET)
-  if (NOT opentelemetry-cpp_FOUND)
-    message(FATAL_ERROR "Dependency 'opentelemetry-cpp' was not found.")
-  endif()
+  find_package(opentelemetry-cpp REQUIRED)
 endif()
 
 # RapidJSON

include/ydb-cpp-sdk/client/driver/driver.h

@@ -172,7 +172,7 @@ class TDriverConfig {
     TDriverConfig& SetMetricRegistry(std::shared_ptr<NMetrics::IMetricRegistry> registry);
 
     //! Set external trace provider implementation.
-    TDriverConfig& SetTraceProvider(std::shared_ptr<NMetrics::ITraceProvider> provider);
+    TDriverConfig& SetTraceProvider(std::shared_ptr<NTrace::ITraceProvider> provider);
 
 private:
     class TImpl;

include/ydb-cpp-sdk/client/trace/trace.h

@@ -5,7 +5,7 @@
 #include <memory>
 #include <string>
 
-namespace NYdb::inline V3::NMetrics {
+namespace NYdb::inline V3::NTrace {
 
 enum class ESpanKind {
     INTERNAL,
@@ -36,4 +36,4 @@ class ITraceProvider {
     virtual std::shared_ptr<ITracer> GetTracer(const std::string& name) = 0;
 };
 
-} // namespace NYdb::NMetrics
+} // namespace NYdb::NTrace

plugins/trace/otel/include/ydb-cpp-sdk/open_telemetry/trace.h

@@ -4,13 +4,9 @@
 
 #include <opentelemetry/nostd/shared_ptr.h>
 
-namespace opentelemetry::trace {
-class TracerProvider;
-}
-
-namespace NYdb::inline V3::NMetrics {
+namespace NYdb::inline V3::NTrace {
 
 std::shared_ptr<ITraceProvider> CreateOtelTraceProvider(
     opentelemetry::nostd::shared_ptr<opentelemetry::trace::TracerProvider> tracerProvider);
 
-} // namespace NYdb::NMetrics
+} // namespace NYdb::NTrace

plugins/trace/otel/src/trace.cpp

@@ -4,7 +4,7 @@
 #include <opentelemetry/trace/tracer.h>
 #include <opentelemetry/trace/tracer_provider.h>
 
-namespace NYdb::inline V3::NMetrics {
+namespace NYdb::inline V3::NTrace {
 
 namespace {
 
@@ -94,4 +94,4 @@ std::shared_ptr<ITraceProvider> CreateOtelTraceProvider(
     return std::make_shared<TOtelTraceProvider>(std::move(tracerProvider));
 }
 
-} // namespace NYdb::NMetrics
+} // namespace NYdb::NTrace

src/client/driver/driver.cpp

@@ -54,7 +54,7 @@ class TDriverConfig::TImpl : public IConnectionsParams {
     const TLog& GetLog() const override { return Log; }
     std::shared_ptr<IExecutor> GetExecutor() const override { return Executor; }
     std::shared_ptr<NMetrics::IMetricRegistry> GetExternalMetricRegistry() const override { return MetricRegistry; }
-    std::shared_ptr<NMetrics::ITraceProvider> GetTraceProvider() const override { return TraceProvider; }
+    std::shared_ptr<NTrace::ITraceProvider> GetTraceProvider() const override { return TraceProvider; }
 
     std::string Endpoint;
     size_t NetworkThreadsNum = 2;
@@ -87,7 +87,7 @@ class TDriverConfig::TImpl : public IConnectionsParams {
     TLog Log; // Null by default.
     std::shared_ptr<IExecutor> Executor;
     std::shared_ptr<NMetrics::IMetricRegistry> MetricRegistry;
-    std::shared_ptr<NMetrics::ITraceProvider> TraceProvider;
+    std::shared_ptr<NTrace::ITraceProvider> TraceProvider;
 };
 
 TDriverConfig::TDriverConfig(const std::string& connectionString)
@@ -252,7 +252,7 @@ TDriverConfig& TDriverConfig::SetMetricRegistry(std::shared_ptr<NMetrics::IMetri
     return *this;
 }
 
-TDriverConfig& TDriverConfig::SetTraceProvider(std::shared_ptr<NMetrics::ITraceProvider> provider) {
+TDriverConfig& TDriverConfig::SetTraceProvider(std::shared_ptr<NTrace::ITraceProvider> provider) {
     Impl_->TraceProvider = std::move(provider);
     return *this;
 }

src/client/impl/CMakeLists.txt

@@ -1,5 +1,6 @@
 add_subdirectory(endpoints)
 add_subdirectory(executor)
 add_subdirectory(internal)
+add_subdirectory(observability)
 add_subdirectory(session)
 add_subdirectory(stats)

src/client/impl/internal/grpc_connections/grpc_connections.cpp

@@ -442,7 +442,7 @@ std::shared_ptr<NMetrics::IMetricRegistry> TGRpcConnectionsImpl::GetExternalMetr
     return MetricRegistry_;
 }
 
-std::shared_ptr<NMetrics::ITraceProvider> TGRpcConnectionsImpl::GetTraceProvider() const {
+std::shared_ptr<NTrace::ITraceProvider> TGRpcConnectionsImpl::GetTraceProvider() const {
     return TraceProvider_;
 }
 

src/client/impl/internal/grpc_connections/grpc_connections.h

@@ -20,9 +20,12 @@ namespace NYdb::inline V3 {
 
 namespace NMetrics {
     class IMetricRegistry;
-    class ITraceProvider;
 } // namespace NMetrics
 
+namespace NTrace {
+    class ITraceProvider;
+} // namespace NTrace
+
 constexpr TDeadline::Duration GRPC_KEEP_ALIVE_TIMEOUT_FOR_DISCOVERY = std::chrono::seconds(10);
 constexpr TDeadline::Duration INITIAL_DEFERRED_CALL_DELAY = std::chrono::milliseconds(10); // The delay before first deferred service call
 constexpr TDeadline::Duration GET_ENDPOINTS_TIMEOUT = std::chrono::seconds(10); // Time wait for ListEndpoints request, after this time we pass error to client
@@ -105,7 +108,7 @@ class TGRpcConnectionsImpl
             clientConfig.MaxOutboundMessageSize = MaxOutboundMessageSize_;
         }
 
-        clientConfig.LoadBalancingPolicy = GRpcLoadBalancingPolicy_;
+        clientConfig.LoadBalancingPolicy = GRpcLoadBalancingPolicy;
 
         if (dbState->DiscoveryMode != EDiscoveryMode::Off) {
             if (std::is_same<TService,Ydb::Discovery::V1::DiscoveryService>()
@@ -587,7 +590,7 @@ class TGRpcConnectionsImpl
     void RegisterExtension(IExtension* extension);
     void RegisterExtensionApi(IExtensionApi* api);
     std::shared_ptr<NMetrics::IMetricRegistry> GetExternalMetricRegistry() const;
-    std::shared_ptr<NMetrics::ITraceProvider> GetTraceProvider() const;
+    std::shared_ptr<NTrace::ITraceProvider> GetTraceProvider() const;
 
     void SetDiscoveryMutator(IDiscoveryMutatorApi::TMutatorCb&& cb);
     const TLog& GetLog() const override;
@@ -725,7 +728,7 @@ class TGRpcConnectionsImpl
     std::vector<std::unique_ptr<IExtension>> Extensions_;
     std::vector<std::unique_ptr<IExtensionApi>> ExtensionApis_;
     std::shared_ptr<NMetrics::IMetricRegistry> MetricRegistry_;
-    std::shared_ptr<NMetrics::ITraceProvider> TraceProvider_;
+    std::shared_ptr<NTrace::ITraceProvider> TraceProvider_;
 
     IDiscoveryMutatorApi::TMutatorCb DiscoveryMutatorCb;
 

src/client/impl/internal/grpc_connections/params.h

@@ -13,9 +13,12 @@ namespace NYdb::inline V3 {
 
 namespace NMetrics {
     class IMetricRegistry;
-    class ITraceProvider;
 } // namespace NMetrics
 
+namespace NTrace {
+    class ITraceProvider;
+} // namespace NTrace
+
 class IConnectionsParams {
 public:
     virtual ~IConnectionsParams() = default;
@@ -44,7 +47,7 @@ class IConnectionsParams {
     virtual uint64_t GetMaxMessageSize() const = 0;
     virtual std::shared_ptr<IExecutor> GetExecutor() const = 0;
     virtual std::shared_ptr<NMetrics::IMetricRegistry> GetExternalMetricRegistry() const = 0;
-    virtual std::shared_ptr<NMetrics::ITraceProvider> GetTraceProvider() const = 0;
+    virtual std::shared_ptr<NTrace::ITraceProvider> GetTraceProvider() const = 0;
 };
 
 } // namespace NYdb