Skip to content

Don't send sentry_timestamp in the header. #28

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

Merged
merged 2 commits into from
Dec 14, 2019
Merged

Don't send sentry_timestamp in the header. #28

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06a1e9a
Don't send sentry_timestamp in the header.
15joeybloom Dec 13, 2019
4bbab48
Send sentry_timestamp in the header as a UNIX timestamp
15joeybloom Dec 13, 2019
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
Prev Previous commit
Send sentry_timestamp in the header as a UNIX timestamp
  • Loading branch information
@15joeybloom
15joeybloom committed Dec 13, 2019
commit 4bbab4829f37c7eefa5e5b486688d81e28c53a3d
10 changes: 6 additions & 4 deletions src/raven_clj/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,19 @@
uri project-id))

(defn make-sentry-header
[key secret]
[ts key secret]
(->> ["Sentry sentry_version=2.0"
(format "sentry_client=%s" sentry-client)
(format "sentry_timestamp=%d" ts)
(format "sentry_key=%s" key)
(when secret
(format "sentry_secret=%s" secret))]
(remove nil?)
(string/join ", ")))

(defn send-packet [{:keys [uri project-id key secret] :as packet-info}]
(defn send-packet [{:keys [ts uri project-id key secret] :as packet-info}]
(let [url (make-sentry-url uri project-id)
header (make-sentry-header key secret)
header (make-sentry-header ts key secret)
body (dissoc packet-info :ts :uri :project-id :key :secret)]
(http/post url
{:throw-exceptions false
Expand Down Expand Up @@ -66,7 +67,8 @@
(merge (parse-dsn dsn)
{:level "error"
:platform "clojure"
:server_name (.getHostName (InetAddress/getLocalHost))}
:server_name (.getHostName (InetAddress/getLocalHost))
:ts (.getTime (Date.))}
event-info
{:event_id (generate-uuid)})))

Expand Down
20 changes: 13 additions & 7 deletions test/raven_clj/core_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,34 +20,40 @@

(deftest test-make-sentry-header
(testing "sentry header"
(let [key "b70a31b3510c4cf793964a185cfe1fd0"
(let [ts (.getTime (Date.))
key "b70a31b3510c4cf793964a185cfe1fd0"
secret "b7d80b520139450f903720eb7991bf3d"
client-version (version)
hdr (make-sentry-header key secret)]
hdr (make-sentry-header ts key secret)]

(is (.contains hdr "sentry_version=2.0")
"includes sentry version")
(is (.contains hdr (str "sentry_client=raven-clj/" client-version))
"includes client version")
(is (.contains hdr (format "sentry_timestamp=%d" ts))
"includes timestamp")
(is (.contains hdr (str "sentry_key=" key))
"includes key")
(is (.contains hdr (str "sentry_secret=" secret))
"includes secret")
(is (= hdr (format "Sentry sentry_version=2.0, sentry_client=raven-clj/%s, sentry_key=%s, sentry_secret=%s" client-version key secret)))))
(is (= hdr (format "Sentry sentry_version=2.0, sentry_client=raven-clj/%s, sentry_timestamp=%d, sentry_key=%s, sentry_secret=%s" client-version ts key secret)))))

(testing "sentry header without secret"
(let [key "b70a31b3510c4cf793964a185cfe1fd0"
(let [ts (.getTime (Date.))
key "b70a31b3510c4cf793964a185cfe1fd0"
secret nil
client-version (version)
hdr (make-sentry-header key secret)]
hdr (make-sentry-header ts key secret)]

(is (.contains hdr "sentry_version=2.0")
"includes sentry version")
(is (.contains hdr (str "sentry_client=raven-clj/" client-version))
"includes client version")
(is (.contains hdr (format "sentry_timestamp=%d" ts))
"includes timestamp")
(is (.contains hdr (str "sentry_key=" key))
"includes key")
(is (= hdr (format "Sentry sentry_version=2.0, sentry_client=raven-clj/%s, sentry_key=%s" client-version key secret))))))
(is (= hdr (format "Sentry sentry_version=2.0, sentry_client=raven-clj/%s, sentry_timestamp=%d, sentry_key=%s" client-version ts key))))))

(deftest test-send-packet
(testing "send-packet"
Expand All @@ -56,7 +62,7 @@
:secret "secret"
:uri "uri"
:project-id "project-id"
:ts "ts"}]
:ts 123456789}]
(with-redefs [http/post (fn [url opts]
(reset! actual-opts opts))]
(send-packet packet)
Expand Down