review feedback: add log msg, remove timeout adjustment

samohte · samohte · commit 535d99b7932c · 2024-03-18T10:17:29.000+01:00
Signed-off-by: thomas.ebner &lt;thomas.ebner@dynatrace.com&gt;
diff --git a/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_provider.cc b/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_provider.cc
@@ -29,16 +29,6 @@ bool reEnableTimer(Http::Code response_code) {
   }
 }
 
-std::chrono::milliseconds getTimeout(envoy::config::core::v3::HttpUri& http_uri) {
-  auto timeout =
-      std::chrono::milliseconds(DurationUtil::durationToMilliseconds(http_uri.timeout()));
-  // we want to ensure that we don't have more than one pending request
-  if (timeout > (TIMER_INTERVAL / 2)) {
-    timeout = (TIMER_INTERVAL / 2);
-  }
-  return timeout;
-}
-
 } // namespace
 
 SamplerConfigProviderImpl::SamplerConfigProviderImpl(
@@ -47,7 +37,7 @@ SamplerConfigProviderImpl::SamplerConfigProviderImpl(
     : cluster_manager_(context.serverFactoryContext().clusterManager()),
       http_uri_(config.http_uri()),
       authorization_header_value_(absl::StrCat("Api-Token ", config.token())),
-      sampler_config_(config.root_spans_per_minute()), timeout_(getTimeout(http_uri_)) {
+      sampler_config_(config.root_spans_per_minute()) {
 
   timer_ = context.serverFactoryContext().mainThreadDispatcher().createTimer([this]() -> void {
     const auto thread_local_cluster = cluster_manager_.getThreadLocalCluster(http_uri_.cluster());
@@ -60,7 +50,9 @@ SamplerConfigProviderImpl::SamplerConfigProviderImpl(
       message->headers().setReference(Http::CustomHeaders::get().Authorization,
                                       authorization_header_value_);
       active_request_ = thread_local_cluster->httpAsyncClient().send(
-          std::move(message), *this, Http::AsyncClient::RequestOptions().setTimeout(timeout_));
+          std::move(message), *this,
+          Http::AsyncClient::RequestOptions().setTimeout(std::chrono::milliseconds(
+              DurationUtil::durationToMilliseconds(http_uri_.timeout()))));
     }
   });
 
@@ -92,6 +84,8 @@ void SamplerConfigProviderImpl::onSuccess(const Http::AsyncClient::Request& /*re
 
   if (json_valid || reEnableTimer(static_cast<Http::Code>(response_code))) {
     timer_->enableTimer(std::chrono::seconds(TIMER_INTERVAL));
+  } else {
+    ENVOY_LOG(error, "Stopped to query sampling configuration from Dynatrace.");
   }
 }
 
diff --git a/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_provider.h b/source/extensions/tracers/opentelemetry/samplers/dynatrace/sampler_config_provider.h
@@ -68,7 +68,6 @@ class SamplerConfigProviderImpl : public SamplerConfigProvider,
   const std::string authorization_header_value_;
   Http::AsyncClient::Request* active_request_{};
   SamplerConfig sampler_config_;
-  const std::chrono::milliseconds timeout_;
 };
 
 using SamplerConfigProviderPtr = std::unique_ptr<SamplerConfigProvider>;
