Wire the trace object through.

2 files changed, 7 insertions, 1 deletions

diff --git a/searchlib/src/vespa/searchlib/engine/request.cpp b/searchlib/src/vespa/searchlib/engine/request.cpp
index 28cbbae64b8..fd4a46ccc43 100644
--- a/searchlib/src/vespa/searchlib/engine/request.cpp
+++ b/searchlib/src/vespa/searchlib/engine/request.cpp
@@ -14,7 +14,8 @@ Request::Request(const fastos::TimeStamp &start_time)
       location(),
       propertiesMap(),
       stackItems(0),
-      stackDump()
+      stackDump(),
+      _trace(start_time)
 {
 }
 
diff --git a/searchlib/src/vespa/searchlib/engine/request.h b/searchlib/src/vespa/searchlib/engine/request.h
index 58c71cd8458..21087d4eff0 100644
--- a/searchlib/src/vespa/searchlib/engine/request.h
+++ b/searchlib/src/vespa/searchlib/engine/request.h
@@ -12,6 +12,8 @@ class Request
 {
 public:
     Request(const fastos::TimeStamp &start_time);
+    Request(const Request &) = delete;
+    Request & operator =(const Request &) = delete;
     virtual ~Request();
     void setTimeout(const fastos::TimeStamp & timeout);
     fastos::TimeStamp getStartTime() const { return _startTime; }
@@ -30,6 +32,7 @@ public:
     uint32_t getTraceLevel() const { return _traceLevel; }
     Request & setTraceLevel(uint32_t traceLevel) { _traceLevel = traceLevel; return *this; }
 
+    Trace & trace() { return _trace; }
 private:
     const fastos::TimeStamp _startTime;
     fastos::TimeStamp       _timeOfDoom;
@@ -42,6 +45,8 @@ public:
     PropertiesMap      propertiesMap;
     uint32_t           stackItems;
     std::vector<char>  stackDump;
+private:
+    mutable Trace      _trace;
 };
 
 }