1 files changed, 19 insertions, 7 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
index 4cced8d7923..f6e158cf04a 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/QueryProperties.java
@@ -11,6 +11,7 @@ import com.yahoo.search.query.Presentation;
 import com.yahoo.search.query.Properties;
 import com.yahoo.search.query.Ranking;
 import com.yahoo.search.query.Select;
+import com.yahoo.search.query.Trace;
 import com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry;
 import com.yahoo.search.query.profile.types.ConversionContext;
 import com.yahoo.search.query.profile.types.FieldDescription;
@@ -132,11 +133,16 @@ public class QueryProperties extends Properties {
             } else if (key.size() == 3 && key.get(1).equals(Presentation.FORMAT)) {
                 if (key.last().equals(Presentation.TENSORS)) return query.getPresentation().getTensorShortForm();
             }
-        } else if (key.size() == 1) {
+        }
+        else if (key.size() == 2 && key.first().equals(Trace.TRACE)) {
+            if (key.last().equals(Trace.LEVEL)) return query.getTrace().getLevel();
+            if (key.last().equals(Trace.EXPLAIN_LEVEL)) return query.getTrace().getExplainLevel();
+            if (key.last().equals(Trace.TIMESTAMPS)) return query.getTrace().getTimestamps();
+            if (key.last().equals(Trace.QUERY)) return query.getTrace().getQuery();
+        }
+        else if (key.size() == 1) {
             if (key.equals(Query.HITS)) return query.getHits();
             if (key.equals(Query.OFFSET)) return query.getOffset();
-            if (key.equals(Query.TRACE_LEVEL)) return query.getTraceLevel();
-            if (key.equals(Query.EXPLAIN_LEVEL)) return query.getExplainLevel();
             if (key.equals(Query.TIMEOUT)) return query.getTimeout();
             if (key.equals(Query.NO_CACHE)) return query.getNoCache();
             if (key.equals(Query.GROUPING_SESSION_CACHE)) return query.getGroupingSessionCache();
@@ -301,6 +307,16 @@ public class QueryProperties extends Properties {
                 else
                     throwIllegalParameter(key.last(), Presentation.PRESENTATION);
             }
+            else if (key.size() == 2 && key.first().equals(Trace.TRACE)) {
+                if (key.last().equals(Trace.LEVEL))
+                    query.getTrace().setLevel(asInteger(value, 0));
+                if (key.last().equals(Trace.EXPLAIN_LEVEL))
+                    query.getTrace().setExplainLevel(asInteger(value, 0));
+                if (key.last().equals(Trace.TIMESTAMPS))
+                    query.getTrace().setTimestamps(asBoolean(value, false));
+                if (key.last().equals(Trace.QUERY))
+                    query.getTrace().setQuery(asBoolean(value, true));
+            }
             else if (key.first().equals(Select.SELECT)) {
                 if (key.size() == 1) {
                     query.getSelect().setGroupingExpressionString(asString(value, ""));
@@ -322,10 +338,6 @@ public class QueryProperties extends Properties {
                     query.setHits(asInteger(value,10));
                 else if (key.equals(Query.OFFSET))
                     query.setOffset(asInteger(value,0));
-                else if (key.equals(Query.TRACE_LEVEL))
-                    query.setTraceLevel(asInteger(value,0));
-                else if (key.equals(Query.EXPLAIN_LEVEL))
-                    query.setExplainLevel(asInteger(value,0));
                 else if (key.equals(Query.TIMEOUT))
                     query.setTimeout(value.toString());
                 else if (key.equals(Query.NO_CACHE))