Skip to content

Commit 39679a4

Browse files
[stacktrace] Remove analyze-stacktrace op
1 parent f0dc558 commit 39679a4

File tree

4 files changed

+2
-73
lines changed

4 files changed

+2
-73
lines changed

src/cider/nrepl/middleware/log.clj

+2-16
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
:added "0.32.0"}
55
(:require [cider.nrepl.middleware.inspect :as middleware.inspect]
66
[cider.nrepl.middleware.util.error-handling :refer [with-safe-transport]]
7-
[haystack.analyzer :as analyzer]
8-
[haystack.parser.clojure.throwable :as throwable]
97
[logjam.event :as event]
108
[logjam.framework :as framework]
119
[nrepl.middleware.print :as print]
1210
[nrepl.misc :refer [response-for]]
13-
[nrepl.transport :as transport]
14-
[orchard.inspect :as orchard.inspect])
11+
[nrepl.transport :as transport])
1512
(:import (java.io StringWriter)
1613
(java.util UUID)))
1714

@@ -38,7 +35,7 @@
3835
(defn- select-exception
3936
"Return the `exception` in a Bencode compatible format."
4037
[exception]
41-
(let [exception-map (throwable/Throwable->map exception)
38+
(let [exception-map (Throwable->map exception)
4239
strip-cause #(dissoc % :data :trace)]
4340
(cond-> (strip-cause exception-map)
4441
(seq (:via exception-map))
@@ -167,16 +164,6 @@
167164
(deref)
168165
(select-appender))}))
169166

170-
(defn analyze-stacktrace-reply
171-
"Show the stacktrace of a log event in the debugger."
172-
[{:keys [transport ::print/print-fn] :as msg}]
173-
(let [event (event msg)]
174-
(if-let [exception (:exception event)]
175-
(do (doseq [cause (analyzer/analyze exception print-fn)]
176-
(transport/send transport (response-for msg cause)))
177-
(transport/send transport (response-for msg :status :done)))
178-
(transport/send transport (response-for msg :status :no-error)))))
179-
180167
(defn exceptions-reply
181168
"Return the exceptions and their frequencies for the given framework and appender."
182169
[msg]
@@ -272,7 +259,6 @@
272259
(with-safe-transport handler msg
273260
"cider/log-add-appender" add-appender-reply
274261
"cider/log-add-consumer" add-consumer-reply
275-
"cider/log-analyze-stacktrace" analyze-stacktrace-reply
276262
"cider/log-clear-appender" clear-appender-reply
277263
"cider/log-exceptions" exceptions-reply
278264
"cider/log-format-event" format-event-reply

src/cider/nrepl/middleware/stacktrace.clj

-19
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
[cider.nrepl.middleware.util.nrepl :refer [notify-client]]
66
[clojure.string :as str]
77
[haystack.analyzer :as analyzer]
8-
[haystack.parser :as parser]
98
[nrepl.middleware.print :as print]
109
[cider.nrepl.middleware.inspect :as middleware.inspect]
1110
[nrepl.misc :refer [response-for]]
@@ -46,23 +45,6 @@
4645
(no-error msg))
4746
(done msg))
4847

49-
;; Analyze stacktrace
50-
51-
(defn- analyze-stacktrace
52-
"Parse and analyze the `stacktrace`."
53-
[{:keys [stacktrace] :as msg}]
54-
(if-let [analysis (some-> stacktrace parser/parse analyzer/analyze)]
55-
(send-analysis msg analysis)
56-
(no-error msg)))
57-
58-
(defn- handle-analyze-stacktrace-op
59-
"Handle the analyze stacktrace op."
60-
[{:keys [stacktrace] :as msg}]
61-
(if (not (str/blank? stacktrace))
62-
(analyze-stacktrace msg)
63-
(no-error msg))
64-
(done msg))
65-
6648
;; Stacktrace
6749

6850
(defn- handle-stacktrace-op
@@ -93,5 +75,4 @@
9375
(case op
9476
"analyze-last-stacktrace" (handle-analyze-last-stacktrace-op msg)
9577
"inspect-last-exception" (handle-inspect-last-exception-op msg)
96-
"analyze-stacktrace" (handle-analyze-stacktrace-op msg)
9778
"stacktrace" (handle-stacktrace-op msg)))

test/clj/cider/nrepl/middleware/log_test.clj

-20
Original file line numberDiff line numberDiff line change
@@ -111,26 +111,6 @@
111111
;; TODO: How to receive the async log event?
112112
)))
113113

114-
(deftest test-analyze-stacktrace
115-
(with-each-framework [framework (frameworks)]
116-
(with-appender [framework appender]
117-
(framework/log framework {:message "a-1" :exception (ex-info "BOOM" {:some (Object.)})})
118-
(let [events (search-events framework appender {})]
119-
(is (= 1 (count events)))
120-
(let [event (first events)]
121-
(is (uuid-str? (:id event)))
122-
(is (string? (:level event)))
123-
(is (string? (:logger event)))
124-
(is (= "a-1" (:message event)))
125-
(is (int? (:timestamp event)))
126-
(let [response (session/message {:op "cider/log-analyze-stacktrace"
127-
:framework (:id framework)
128-
:appender (:id appender)
129-
:event (:id event)})]
130-
(is (= #{"done"} (:status response)))
131-
(is (every? #(set/subset? #{:type :flags} (set (keys %)))
132-
(:stacktrace response)))))))))
133-
134114
(deftest test-clear
135115
(with-each-framework [framework (frameworks)]
136116
(with-appender [framework appender]

test/clj/cider/nrepl/middleware/stacktrace_test.clj

-18
Original file line numberDiff line numberDiff line change
@@ -63,21 +63,3 @@
6363
(let [response (session/message {:op "analyze-last-stacktrace"})]
6464
(testing "returns done and no-error status"
6565
(is (= #{"done" "no-error"} (:status response)))))))
66-
67-
;; Analyze stacktrace op
68-
69-
(deftest analyze-stacktrace-test
70-
(testing "stacktrace op with stacktrace parameter"
71-
(let [response (session/message {:op "analyze-stacktrace" "stacktrace" (pr-str (ex-info "BOOM" {:boom :data}))})]
72-
(testing "returns the exception class"
73-
(is (= "clojure.lang.ExceptionInfo" (:class response))))
74-
(testing "returns the exception message"
75-
(is (= "BOOM" (:message response))))
76-
(testing "returns done status"
77-
(is (= #{"done"} (:status response)))))))
78-
79-
(deftest analyze-stacktrace-invalid-test
80-
(testing "stacktrace op with invalid stacktrace parameter"
81-
(let [response (session/message {:op "analyze-stacktrace" "stacktrace" "invalid"})]
82-
(testing "returns done and no-error status"
83-
(is (= #{"done" "no-error"} (:status response)))))))

0 commit comments

Comments
 (0)