Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fork cljfmt linter so we get vertical alignment on maps and bindings #30

Closed
wants to merge 1 commit into from
Closed

Fork cljfmt linter so we get vertical alignment on maps and bindings #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dev/dev.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
[common-clj.config.in-memory-config :as imc]))

(def config
{:app-name :atlas
:http-port 9000
{:app-name :atlas
:http-port 9000
:known-hosts {:jaeger "https://prod-jaeger.nubank.com.br"}})

(def dev-system
Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
[com.stuartsierra/component.repl "0.2.0"]
[clj-kondo "2020.02.28-1"]]
:source-paths ["dev"]
:plugins [[lein-cljfmt "0.6.6"]
:plugins [[lucasmafra/lein-cljfmt "0.5.5"]
[lein-kibit "0.1.8"]
[lein-nsorg "0.3.0"]
[clj-kondo "2020.02.28-1"]]
Expand Down
4 changes: 2 additions & 2 deletions src/atlas/domain/sequence_diagram.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@
(s/defn duration-ms :- cs/PosInt
[trace :- s-jaeger/Trace]
(let [start-time (start-time trace)
end-time (->> trace :spans (map span->end-time) sort last)]
end-time (->> trace :spans (map span->end-time) sort last)]
(.toMillis (time/duration start-time end-time))))

(s/defn lifelines :- [s-sequence-diagram/Lifeline]
[trace :- s-jaeger/Trace]
(let [services (->> trace :processes (map process->lifeline))
topics (->> trace :spans (filter producer-span?) (map span->topic) (map topic->lifeline))]
topics (->> trace :spans (filter producer-span?) (map span->topic) (map topic->lifeline))]
(concat services topics)))

(s/defn execution-boxes :- [s-sequence-diagram/ExecutionBox]
Expand Down
136 changes: 68 additions & 68 deletions test/atlas/domain/sequence_diagram_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,76 +4,76 @@
[common-clj.clojure-test-helpers.core :refer [deftest]]))

(def trace
{:trace-id "1"
:spans [{:trace-id "1"
:span-id "1"
:process-id :p1
:operation-name "http.in GET /api/orders/1"
:start-time 1500000000000000
:duration 1000
:references []
:tags [{:key "span.kind"
:type "string"
:value "server"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}
{:trace-id "1"
:spans [{:trace-id "1"
:span-id "1"
:process-id :p1
:operation-name "http.in GET /api/orders/1"
:start-time 1500000000000000
:duration 1000
:references []
:tags [{:key "span.kind"
:type "string"
:value "server"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}

{:trace-id "1"
:span-id "2"
:process-id :p1
:operation-name "http.out GET /api/orders/1"
:start-time 1500000000100000
:duration 300
:references [{:ref-type :child-of
:trace-id "1"
:span-id "1"}]
:tags [{:key "span.kind"
:type "string"
:value "client"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}
{:trace-id "1"
:span-id "2"
:process-id :p1
:operation-name "http.out GET /api/orders/1"
:start-time 1500000000100000
:duration 300
:references [{:ref-type :child-of
:trace-id "1"
:span-id "1"}]
:tags [{:key "span.kind"
:type "string"
:value "client"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}

{:trace-id "1"
:span-id "3"
:process-id :p2
:operation-name "http.in GET /api/orders/1"
:start-time 1500000000200000
:duration 100
:references [{:ref-type :child-of
:trace-id "1"
:span-id "2"}]
:tags [{:key "span.kind"
:type "string"
:value "server"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}
{:trace-id "1"
:span-id "4"
:process-id :p2
:operation-name "kafka.out PROCESS_ORDER"
:start-time 1500000000250000
:duration 50
:references [{:ref-type :child-of
:trace-id "1"
:span-id "3"}]
:tags [{:key "span.kind"
:type "string"
:value "producer"}
{:key "message_bus.destination"
:type "string"
:value "PROCESS_ORDER"}]}]
{:trace-id "1"
:span-id "3"
:process-id :p2
:operation-name "http.in GET /api/orders/1"
:start-time 1500000000200000
:duration 100
:references [{:ref-type :child-of
:trace-id "1"
:span-id "2"}]
:tags [{:key "span.kind"
:type "string"
:value "server"}
{:key "http.method"
:type "string"
:value "GET"}
{:key "http.url"
:type "string"
:value "/api/orders/1"}]}
{:trace-id "1"
:span-id "4"
:process-id :p2
:operation-name "kafka.out PROCESS_ORDER"
:start-time 1500000000250000
:duration 50
:references [{:ref-type :child-of
:trace-id "1"
:span-id "3"}]
:tags [{:key "span.kind"
:type "string"
:value "producer"}
{:key "message_bus.destination"
:type "string"
:value "PROCESS_ORDER"}]}]

:processes {:p1 {:service-name "bff"}
:p2 {:service-name "orders"}}})
Expand Down
2 changes: 1 addition & 1 deletion test/flows/aux/init.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
[(second forms) (rest (rest forms))]
[[] forms])]
`(state-flow.cljtest/defflow ~name {:runner run!*
:init #(init! {})}
:init #(init! {})}
~@pre-conditions
~@flows)))
136 changes: 68 additions & 68 deletions test/flows/get_sequence_diagram.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,76 +5,76 @@
[state-flow.assertions.matcher-combinators :refer [match?]]))

(def jaeger-response
{"data" [{"traceID" "1"
"spans" [{"traceID" "1"
"spanID" "1"
"processID" "p1"
"operationName" "http.in GET /api/orders/1"
"startTime" 1500000000000000
"duration" 1000
"references" []
"tags" [{"key" "span.kind"
"type" "string"
"value" "server"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}
{"data" [{"traceID" "1"
"spans" [{"traceID" "1"
"spanID" "1"
"processID" "p1"
"operationName" "http.in GET /api/orders/1"
"startTime" 1500000000000000
"duration" 1000
"references" []
"tags" [{"key" "span.kind"
"type" "string"
"value" "server"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}

{"traceID" "1"
"spanID" "2"
"processID" "p1"
"operationName" "http.out GET /api/orders/1"
"startTime" 1500000000100000
"duration" 300
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "1"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "client"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}
{"traceID" "1"
"spanID" "2"
"processID" "p1"
"operationName" "http.out GET /api/orders/1"
"startTime" 1500000000100000
"duration" 300
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "1"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "client"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}

{"traceID" "1"
"spanID" "3"
"processID" "p2"
"operationName" "http.in GET /api/orders/1"
"startTime" 1500000000200000
"duration" 100
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "2"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "server"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}
{"traceID" "1"
"spanID" "4"
"processID" "p2"
"operationName" "kafka.out PROCESS_ORDER"
"startTime" 1500000000250000
"duration" 50
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "3"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "producer"}
{"key" "message_bus.destination"
"type" "string"
"value" "PROCESS_ORDER"}]}]
{"traceID" "1"
"spanID" "3"
"processID" "p2"
"operationName" "http.in GET /api/orders/1"
"startTime" 1500000000200000
"duration" 100
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "2"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "server"}
{"key" "http.method"
"type" "string"
"value" "GET"}
{"key" "http.url"
"type" "string"
"value" "/api/orders/1"}]}
{"traceID" "1"
"spanID" "4"
"processID" "p2"
"operationName" "kafka.out PROCESS_ORDER"
"startTime" 1500000000250000
"duration" 50
"references" [{"ref-type" "CHILD_OF"
"traceID" "1"
"spanID" "3"}]
"tags" [{"key" "span.kind"
"type" "string"
"value" "producer"}
{"key" "message_bus.destination"
"type" "string"
"value" "PROCESS_ORDER"}]}]

"processes" {"p1" {"serviceName" "bff"}
"p2" {"serviceName" "orders"}}}]})
Expand Down
8 changes: 4 additions & 4 deletions test/flows/get_trace_graph.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
[response (GET "/api/traces/1/graph")]

(match? {:status 200
:body {"graph" {"nodes" (m/in-any-order [{"service" "frontend"}
{"service" "orders"}])
"edges" [{"from" "frontend"
"to" "orders"}]}}}
:body {"graph" {"nodes" (m/in-any-order [{"service" "frontend"}
{"service" "orders"}])
"edges" [{"from" "frontend"
"to" "orders"}]}}}
response))
28 changes: 14 additions & 14 deletions test/flows/search_trace.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,19 @@
"end=1582769681000"))]

(match? {:status 200
:body {"traces" [{"trace_id" "trace-1"
"total_spans" 2
"duration_ms" 2001
"start_time" 1499999999999
"services" [{"name" "orders"
"number_of_spans" 2}]}
:body {"traces" [{"trace_id" "trace-1"
"total_spans" 2
"duration_ms" 2001
"start_time" 1499999999999
"services" [{"name" "orders"
"number_of_spans" 2}]}

{"trace_id" "trace-2"
"total_spans" 2
"duration_ms" 2005
"start_time" 1500000000000
"services" [{"name" "feed"
"number_of_spans" 1}
{"name" "orders"
"number_of_spans" 1}]}]}}
{"trace_id" "trace-2"
"total_spans" 2
"duration_ms" 2005
"start_time" 1500000000000
"services" [{"name" "feed"
"number_of_spans" 1}
{"name" "orders"
"number_of_spans" 1}]}]}}
response))