addressed comments from @wbpcode

Signed-off-by: Rohit Agrawal <rohit.agrawal@databricks.com>
envoyproxy · Jan 8, 2025 · bacb67b · bacb67b
1 parent 75fd4c8
commit bacb67b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/source/common/router/config_impl.cc b/source/common/router/config_impl.cc
@@ -493,7 +493,7 @@ ShadowPolicyImpl::ShadowPolicyImpl(const RequestMirrorPolicy& config, absl::Stat
   // inherit the parent's sampling decision. This prevents oversampling when runtime sampling is
   // disabled.
   if (config.has_trace_sampled()) {
-    trace_sampled_ = absl::optional<bool>(config.trace_sampled().value());
+    trace_sampled_ = config.trace_sampled().value();
   } else {
     // If the shadow policy does not specify trace_sampled, we will inherit the parent's sampling
     // decision.

diff --git a/source/common/router/router.cc b/source/common/router/router.cc
@@ -442,10 +442,6 @@ void Filter::chargeUpstreamCode(Http::Code code, Upstream::HostDescriptionOptCon
   chargeUpstreamCode(response_status_code, *fake_response_headers, upstream_host, dropped);
 }
 
-absl::optional<bool> getSampleValueFromShadowPolicy(const ShadowPolicy& shadow_policy) {
-  return shadow_policy.traceSampled();
-}
-
 Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers, bool end_stream) {
   downstream_headers_ = &headers;
 
@@ -804,7 +800,7 @@ Http::FilterHeadersStatus Filter::decodeHeaders(Http::RequestHeaderMap& headers,
               .setTimeout(timeout_.global_timeout_)
               .setParentSpan(callbacks_->activeSpan())
               .setChildSpanName("mirror")
-              .setSampled(getSampleValueFromShadowPolicy(shadow_policy))
+              .setSampled(shadow_policy.traceSampled())
               .setIsShadow(true)
               .setIsShadowSuffixDisabled(shadow_policy.disableShadowHostSuffixAppend())
               .setBufferAccount(callbacks_->account())
@@ -1072,7 +1068,7 @@ void Filter::maybeDoShadowing() {
                        .setTimeout(timeout_.global_timeout_)
                        .setParentSpan(callbacks_->activeSpan())
                        .setChildSpanName("mirror")
-                       .setSampled(getSampleValueFromShadowPolicy(shadow_policy))
+                       .setSampled(shadow_policy.traceSampled())
                        .setIsShadow(true)
                        .setIsShadowSuffixDisabled(shadow_policy.disableShadowHostSuffixAppend());
     options.setFilterConfig(config_);