Infer trace_config from the context

Author: psx95

sdk/include/opentelemetry/sdk/trace/tracer.h

@@ -37,8 +37,7 @@ class Tracer final : public opentelemetry::trace::Tracer,
   /** Construct a new Tracer with the given context pipeline. */
   explicit Tracer(std::shared_ptr<TracerContext> context,
                   std::unique_ptr<InstrumentationScope> instrumentation_scope =
-                      InstrumentationScope::Create(""),
-                  TracerConfig tracer_config = TracerConfig::Default()) noexcept;
+                      InstrumentationScope::Create("")) noexcept;
 
   nostd::shared_ptr<opentelemetry::trace::Span> StartSpan(
       nostd::string_view name,
@@ -106,9 +105,9 @@ class Tracer final : public opentelemetry::trace::Tracer,
 private:
   // order of declaration is important here - instrumentation scope should destroy after
   // tracer-context.
+  std::unique_ptr<TracerConfig> tracer_config_;
   std::shared_ptr<InstrumentationScope> instrumentation_scope_;
   std::shared_ptr<TracerContext> context_;
-  TracerConfig tracer_config_;
   static const std::shared_ptr<opentelemetry::trace::NoopTracer> kNoopTracer;
 };
 }  // namespace trace

sdk/include/opentelemetry/sdk/trace/tracer_provider.h

@@ -123,9 +123,6 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
   std::vector<std::shared_ptr<Tracer>> tracers_;
   std::shared_ptr<TracerContext> context_;
   std::mutex lock_;
-
-  // private helper to get TracerConfig from InstrumentationScope using tracer configurator.
-  TracerConfig GetTracerConfig(const InstrumentationScope &instrumentation_scope) const;
 };
 }  // namespace trace
 }  // namespace sdk

sdk/src/trace/tracer.cc

@@ -41,12 +41,12 @@ const std::shared_ptr<opentelemetry::trace::NoopTracer> Tracer::kNoopTracer =
     std::make_shared<opentelemetry::trace::NoopTracer>();
 
 Tracer::Tracer(std::shared_ptr<TracerContext> context,
-               std::unique_ptr<InstrumentationScope> instrumentation_scope,
-               TracerConfig tracer_config) noexcept
-    : instrumentation_scope_{std::move(instrumentation_scope)},
-      context_{std::move(context)},
-      tracer_config_(tracer_config)
-{}
+               std::unique_ptr<InstrumentationScope> instrumentation_scope) noexcept
+    : instrumentation_scope_{std::move(instrumentation_scope)}, context_{std::move(context)}
+{
+  tracer_config_ =
+      std::make_unique<TracerConfig>(context_->GetTracerConfigurator()(*instrumentation_scope_));
+}
 
 nostd::shared_ptr<opentelemetry::trace::Span> Tracer::StartSpan(
     nostd::string_view name,
@@ -57,7 +57,7 @@ nostd::shared_ptr<opentelemetry::trace::Span> Tracer::StartSpan(
   opentelemetry::trace::SpanContext parent_context = GetCurrentSpan()->GetContext();
   if (nostd::holds_alternative<opentelemetry::trace::SpanContext>(options.parent))
   {
-    if (!tracer_config_.IsEnabled())
+    if (!tracer_config_->IsEnabled())
     {
       return kNoopTracer->StartSpan(name, attributes, links, options);
     }

sdk/src/trace/tracer_provider.cc

@@ -119,11 +119,8 @@ nostd::shared_ptr<trace_api::Tracer> TracerProvider::GetTracer(
   instrumentationscope::InstrumentationScopeAttributes attrs_map(attributes);
   auto scope =
       instrumentationscope::InstrumentationScope::Create(name, version, schema_url, attrs_map);
-  const instrumentationscope::InstrumentationScope &scope_reference =
-      instrumentationscope::InstrumentationScope(*scope);
 
-  auto tracer = std::shared_ptr<Tracer>(
-      new Tracer(context_, std::move(scope), GetTracerConfig(scope_reference)));
+  auto tracer = std::shared_ptr<Tracer>(new Tracer(context_, std::move(scope)));
   tracers_.push_back(tracer);
   return nostd::shared_ptr<trace_api::Tracer>{tracer};
 }
@@ -147,13 +144,6 @@ bool TracerProvider::ForceFlush(std::chrono::microseconds timeout) noexcept
 {
   return context_->ForceFlush(timeout);
 }
-
-TracerConfig TracerProvider::GetTracerConfig(
-    const InstrumentationScope &instrumentation_scope) const
-{
-  return context_->GetTracerConfigurator()(instrumentation_scope);
-}
-
 }  // namespace trace
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE