From 678659495dbb521028452db72e783ad93b3f7a97 Mon Sep 17 00:00:00 2001
From: Krishnan Prashanth <kprashanth@nvidia.com>
Date: Mon, 30 Sep 2024 23:26:27 -0700
Subject: [PATCH] moving trace_manager_ check to function call instead of
 inside StartTrace

---
 src/http_server.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/http_server.cc b/src/http_server.cc
index be6dd4f4ea..b27197e539 100644
--- a/src/http_server.cc
+++ b/src/http_server.cc
@@ -3129,10 +3129,6 @@ HTTPAPIServer::StartTrace(
     TRITONSERVER_InferenceTrace** triton_trace)
 {
 #ifdef TRITON_ENABLE_TRACING
-  if (trace_manager_ == nullptr) {
-    return nullptr;
-  }
-
   HttpTextMapCarrier carrier(req->headers_in);
   auto start_options =
       trace_manager_->GetTraceStartOptions(carrier, model_name);
@@ -3242,8 +3238,11 @@ HTTPAPIServer::HandleGenerate(
 
   // If tracing is enabled see if this request should be traced.
   TRITONSERVER_InferenceTrace* triton_trace = nullptr;
-  std::shared_ptr<TraceManager::Trace> trace =
-      StartTrace(req, model_name, &triton_trace);
+  std::shared_ptr<TraceManager::Trace> trace;
+  if (trace_manager_) {
+    // If tracing is enabled see if this request should be traced.
+    trace = StartTrace(req, model_name, &triton_trace);
+  }
 
   std::map<std::string, triton::common::TritonJson::Value> input_metadata;
   triton::common::TritonJson::Value meta_data_root;