Incorporate comments from @jobergum.

2 files changed, 2 insertions, 2 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
index e8fb05c5589..25bb7695a01 100644
--- a/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matchengine/matchengine.cpp
@@ -142,6 +142,7 @@ MatchEngine::performSearch(search::engine::SearchRequest::Source req,
     ret->setDistributionKey(_distributionKey);
     if (ret->request->trace().getLevel() > 0) {
         ret->request->trace().getRoot().setLong("distribution-key", _distributionKey);
+        ret->request->trace().addEvent(4, "Search completed !");
         search::fef::Properties & trace = ret->propertiesMap.lookupCreate("trace");
         vespalib::SmartBuffer output(4096);
         vespalib::slime::BinaryFormat::encode(ret->request->trace().getSlime(), output);
diff --git a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
index 5de014b4106..2442c041200 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/matcher.cpp
@@ -249,10 +249,10 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl
         }
         MatchToolsFactory::UP mtf = create_match_tools_factory(request, searchContext, attrContext,
                                                                metaStore, *feature_overrides);
+        traceQuery(6, request.trace(), mtf->query());
         if (!mtf->valid()) {
             reply->errorCode = ECODE_QUERY_PARSE_ERROR;
             reply->errorMessage = "query execution failed (invalid query)";
-            traceQuery(1, request.trace(), mtf->query());
             return reply;
         }
 
@@ -286,7 +286,6 @@ Matcher::match(const SearchRequest &request, vespalib::ThreadBundle &threadBundl
             sessionMgr.insert(std::move(session));
         }
         reply = std::move(result->_reply);
-        traceQuery(6, request.trace(), mtf->query());
 
         uint32_t numActiveLids = metaStore.getNumActiveLids();
         // note: this is actually totalSpace+1, since 0 is reserved