Commit 8011155f authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch 'dz-integrated-error-tracking-expose-dsn' into 'master'

Add sentry_dsn to error tracking API

See merge request gitlab-org/gitlab!68767
parents 0c88cb3b fd1e2db1
...@@ -96,12 +96,14 @@ Example response: ...@@ -96,12 +96,14 @@ Example response:
{ {
"id": 1, "id": 1,
"active": true, "active": true,
"public_key": "glet_aa77551d849c083f76d0bc545ed053a3" "public_key": "glet_aa77551d849c083f76d0bc545ed053a3",
"sentry_dsn": "https://glet_aa77551d849c083f76d0bc545ed053a3@gitlab.example.com/api/v4/error_tracking/collector/5"
}, },
{ {
"id": 3, "id": 3,
"active": true, "active": true,
"public_key": "glet_0ff98b1d849c083f76d0bc545ed053a3" "public_key": "glet_0ff98b1d849c083f76d0bc545ed053a3",
"sentry_dsn": "https://glet_0ff98b1d849c083f76d0bc545ed053a3@gitlab.example.com/api/v4/error_tracking/collector/5"
} }
] ]
``` ```
...@@ -129,7 +131,8 @@ Example response: ...@@ -129,7 +131,8 @@ Example response:
{ {
"id": 3, "id": 3,
"active": true, "active": true,
"public_key": "glet_0ff98b1d849c083f76d0bc545ed053a3" "public_key": "glet_0ff98b1d849c083f76d0bc545ed053a3",
"sentry_dsn": "https://glet_0ff98b1d849c083f76d0bc545ed053a3@gitlab.example.com/api/v4/error_tracking/collector/5"
} }
``` ```
......
...@@ -15,6 +15,7 @@ module API ...@@ -15,6 +15,7 @@ module API
expose :id expose :id
expose :active expose :active
expose :public_key expose :public_key
expose :sentry_dsn
end end
end end
end end
......
...@@ -63,6 +63,7 @@ RSpec.describe API::ErrorTrackingClientKeys do ...@@ -63,6 +63,7 @@ RSpec.describe API::ErrorTrackingClientKeys do
expect(json_response['id']).to eq(new_key.id) expect(json_response['id']).to eq(new_key.id)
expect(json_response['public_key']).to eq(new_key.public_key) expect(json_response['public_key']).to eq(new_key.public_key)
expect(json_response['sentry_dsn']).to eq(new_key.sentry_dsn)
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment