Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/com/walmartlabs/lacinia.clj
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@
(resolve/resolve-as {:errors validation-errors})

:else
(executor/execute-query (assoc context constants/parsed-query-key prepared
::tracing/validation {:start-offset start-offset
:duration (tracing/duration start-nanos)}))))
(executor/execute-query (assoc context constants/parsed-query-key (assoc prepared
::tracing/validation {:start-offset start-offset
:duration (tracing/duration start-nanos)})))))

(defn execute-parsed-query
"Prepares a query, by applying query variables to it, resulting in a prepared
Expand Down
2 changes: 1 addition & 1 deletion src/com/walmartlabs/lacinia/executor.clj
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@
*resolver-tracing
(tracing/inject-tracing timing-start
(::tracing/parsing parsed-query)
(::tracing/validation context)
(::tracing/validation parsed-query)
@*resolver-tracing)
errors (assoc :errors (distinct errors))
warnings (assoc-in [:extensions :warnings] (distinct warnings))))))))
Expand Down
10 changes: 10 additions & 0 deletions test/com/walmartlabs/lacinia/tracing_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,13 @@
(let [durations (->> (get-in result [:extensions :tracing :execution :resolvers])
(mapv :duration))]
(is (= 6 (count durations)))))))

(deftest parsing-and-validation-timings-are-non-nil
;; Regression test for https://github.com/walmartlabs/lacinia/issues/448
(let [result (q "{ root(delay: 5) { simple }}" enable-timing)
{:keys [parsing validation]} (get-in result [:extensions :tracing])]
(reporting result
(is (some? (:startOffset parsing)) "parsing startOffset should not be nil")
(is (pos? (:duration parsing)) "parsing duration should be positive")
(is (some? (:startOffset validation)) "validation startOffset should not be nil")
(is (pos? (:duration validation)) "validation duration should be positive"))))