Skip to content

Commit 69cdde9

Browse files
HazATHazAT
authored
feat: Tracing setup (#12952)
* feat: Fronted tracing setup * ref: Remove tracing middleware * feat: Add trace context * feat: Update sdk dependecies * fix: Mock getCurrentHub
1 parent 0e009b9 commit 69cdde9

File tree

11 files changed

+69
-132
lines changed

11 files changed

+69
-132
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"@babel/preset-env": "^7.0.0",
1919
"@babel/preset-react": "^7.0.0",
2020
"@babel/runtime": "^7.0.0",
21-
"@sentry/browser": "5.0.8",
22-
"@sentry/integrations": "^5.0.8",
21+
"@sentry/browser": "5.2.0-beta.0",
22+
"@sentry/integrations": "5.2.0-beta.0",
2323
"algoliasearch": "^3.32.0",
2424
"babel-core": "^7.0.0-bridge.0",
2525
"babel-loader": "^8.0.0",

‎requirements-base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ requests-oauthlib==0.3.3
5757
requests[security]>=2.20.0,<2.21.0
5858
selenium==3.141.0
5959
semaphore>=0.4.32,<0.5.0
60-
sentry-sdk>=0.7.0
60+
sentry-sdk>=0.7.14
6161
setproctitle>=1.1.7,<1.2.0
6262
simplejson>=3.2.0,<3.9.0
6363
six>=1.10.0,<1.11.0

‎src/sentry/conf/server.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ def env(key, default='', type=None):
236236
# TODO(dcramer): kill this once we verify its safe
237237
# 'sentry.middleware.social_auth.SentrySocialAuthExceptionMiddleware',
238238
'django.contrib.messages.middleware.MessageMiddleware',
239-
'sentry.middleware.tracing.SentryTracingMiddleware',
240239
'sentry.debug.middleware.DebugMiddleware',
241240
)
242241

‎src/sentry/interfaces/contexts.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,16 @@ class MonitorContextType(ContextType):
168168
}
169169

170170

171+
@contexttype
172+
class TraceContextType(ContextType):
173+
type = 'trace'
174+
indexed_fields = {
175+
'': u'{trace_id}',
176+
'span': u'{span_id}',
177+
'ctx': u'{trace_id}-{span_id}',
178+
}
179+
180+
171181
class Contexts(Interface):
172182
"""
173183
This interface stores context specific information.

‎src/sentry/middleware/tracing.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎src/sentry/static/sentry/app/api.jsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {openSudo, redirectToProject} from 'app/actionCreators/modal';
1212
import {uniqueId} from 'app/utils/guid';
1313
import GroupActions from 'app/actions/groupActions';
1414
import createRequestError from 'app/utils/requestError/createRequestError';
15-
import * as tracing from 'app/utils/tracing';
1615

1716
export class Request {
1817
constructor(xhr) {
@@ -208,8 +207,6 @@ export class Client {
208207
contentType: 'application/json',
209208
headers: {
210209
Accept: 'application/json; charset=utf-8',
211-
'X-Transaction-ID': tracing.getTransactionId(),
212-
'X-Span-ID': tracing.getSpanId(),
213210
},
214211
success: (...args) => {
215212
const [resp] = args || [];

‎src/sentry/static/sentry/app/index.js

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,12 @@ import * as ReactEmotion from 'react-emotion';
2020
import Reflux from 'reflux';
2121
import * as Router from 'react-router';
2222
import * as Sentry from '@sentry/browser';
23-
import {ExtraErrorData} from '@sentry/integrations';
23+
import {ExtraErrorData, Tracing} from '@sentry/integrations';
2424
import createReactClass from 'create-react-class';
2525
import jQuery from 'jquery';
2626
import moment from 'moment';
2727

2828
import {metric} from 'app/utils/analytics';
29-
import * as tracing from 'app/utils/tracing';
3029
import ConfigStore from 'app/stores/configStore';
3130
import Main from 'app/main';
3231
import ajaxCsrfSetup from 'app/utils/ajaxCsrfSetup';
@@ -38,7 +37,13 @@ import plugins from 'app/plugins';
3837
// window.__SENTRY__OPTIONS will be emmited by sdk-config.html before loading this script
3938
Sentry.init({
4039
...window.__SENTRY__OPTIONS,
41-
integrations: [new ExtraErrorData()],
40+
integrations: [
41+
new ExtraErrorData(),
42+
new Tracing({
43+
tracingOrigins: ['localhost', 'sentry.io', /^\//],
44+
autoStartOnDomReady: false,
45+
}),
46+
],
4247
});
4348

4449
Sentry.configureScope(scope => {
@@ -48,14 +53,6 @@ Sentry.configureScope(scope => {
4853
if (window.__SENTRY__VERSION) {
4954
scope.setTag('sentry_version', window.__SENTRY__VERSION);
5055
}
51-
52-
// There's no setTransaction API *yet*, so we have to be explicit here
53-
scope.addEventProcessor(event => {
54-
return {
55-
...event,
56-
transaction: tracing.getRoute(),
57-
};
58-
});
5956
});
6057

6158
function __raven_deprecated() {

‎src/sentry/static/sentry/app/utils/tracing.jsx

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎src/sentry/static/sentry/app/views/app.jsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import React from 'react';
77
import Reflux from 'reflux';
88
import createReactClass from 'create-react-class';
99
import keydown from 'react-keydown';
10+
import {getCurrentHub} from '@sentry/browser';
11+
import {Tracing} from '@sentry/integrations';
1012

1113
import {openCommandPalette} from 'app/actionCreators/modal';
1214
import {t} from 'app/locale';
@@ -25,7 +27,6 @@ import NewsletterConsent from 'app/views/newsletterConsent';
2527
import OrganizationsStore from 'app/stores/organizationsStore';
2628
import theme from 'app/utils/theme';
2729
import getRouteStringFromRoutes from 'app/utils/getRouteStringFromRoutes';
28-
import * as tracing from 'app/utils/tracing';
2930

3031
function getAlertTypeForProblem(problem) {
3132
switch (problem.severity) {
@@ -157,12 +158,8 @@ const App = createReactClass({
157158
},
158159

159160
updateTracing() {
160-
tracing.startTransaction();
161-
162161
const route = getRouteStringFromRoutes(this.props.routes);
163-
if (route) {
164-
tracing.setRoute(route);
165-
}
162+
Tracing.startTrace(getCurrentHub(), route);
166163
},
167164

168165
onConfigStoreChange(config) {

‎tests/js/setup.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ jest.mock('@sentry/browser', () => {
110110
captureException: jest.fn(),
111111
showReportDialog: jest.fn(),
112112
lastEventId: jest.fn(),
113+
getCurrentHub: jest.spyOn(SentryBrowser, 'getCurrentHub'),
113114
withScope: jest.spyOn(SentryBrowser, 'withScope'),
114115
};
115116
});

‎yarn.lock

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,64 +1130,65 @@
11301130
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
11311131
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
11321132

1133-
"@sentry/browser@5.0.8":
1134-
version "5.0.8"
1135-
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.0.8.tgz#12350d1e1d0881eb4641f44ffa8ddcefb2b03217"
1136-
integrity sha512-hMV3mF8R3YZ0IhkjdYMSNdPfC2XbImCL88Mqxkc53KPGMes/8psPd40aWChRcMw0qJIovgezAdn41oxMH8XimQ==
1137-
dependencies:
1138-
"@sentry/core" "5.0.8"
1139-
"@sentry/types" "5.0.6"
1140-
"@sentry/utils" "5.0.8"
1133+
"@sentry/browser@5.2.0-beta.0":
1134+
version "5.2.0-beta.0"
1135+
resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-5.2.0-beta.0.tgz#8c2f54cdf946dd535d51e95c4272cd8df76cfc61"
1136+
integrity sha512-GkpXX32CsSrSQAZPYAEpWRb3U2uCAvHNpgfnWEBq0tshneYa4MG3SAGawit4F+CloIeLuFoqnjRGsEmDCZn++g==
1137+
dependencies:
1138+
"@sentry/core" "5.2.0-beta.0"
1139+
"@sentry/types" "5.2.0-beta.0"
1140+
"@sentry/utils" "5.2.0-beta.0"
11411141
tslib "^1.9.3"
11421142

1143-
"@sentry/core@5.0.8":
1144-
version "5.0.8"
1145-
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.0.8.tgz#8a05f1c024cda726b4cabeb2e56c5a6e3857e475"
1146-
integrity sha512-LGTPMx4PqSOCUiUjHZ45kwealcqAnHgUZonnIv8pcqd1NmY5oOUAhI/rO60Yj9Ij6TVaSHppWpYHI7Wt9Ot6kQ==
1143+
"@sentry/core@5.2.0-beta.0":
1144+
version "5.2.0-beta.0"
1145+
resolved "https://registry.yarnpkg.com/@sentry/core/-/core-5.2.0-beta.0.tgz#c0c03b6ab1899090aceeadd1b71ab8e7694700dd"
1146+
integrity sha512-B8FU9MpAXQCFPv/7wLJc+hvBbhqTab1/0e+o0Estpnv2m45p0k1OZN3ruReuGNlv8md8y5Un7OSjbRq46YE48A==
11471147
dependencies:
1148-
"@sentry/hub" "5.0.8"
1149-
"@sentry/minimal" "5.0.8"
1150-
"@sentry/types" "5.0.6"
1151-
"@sentry/utils" "5.0.8"
1148+
"@sentry/hub" "5.2.0-beta.0"
1149+
"@sentry/minimal" "5.2.0-beta.0"
1150+
"@sentry/types" "5.2.0-beta.0"
1151+
"@sentry/utils" "5.2.0-beta.0"
11521152
tslib "^1.9.3"
11531153

1154-
"@sentry/hub@5.0.8":
1155-
version "5.0.8"
1156-
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.0.8.tgz#9a229c4afee0b59a238b7c804d20369e7d3346b2"
1157-
integrity sha512-a9+hnYO42Rpdk7lrxk3dhmZYfOGMDEq2WP2blNiKIU2efI6CQ3G9Ka/6WzVOXSgV3rY+4zx60vHUhNkQVgsbsg==
1154+
"@sentry/hub@5.2.0-beta.0":
1155+
version "5.2.0-beta.0"
1156+
resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-5.2.0-beta.0.tgz#20b88a772a1538ce304e5ffa435a18dd513b4ef2"
1157+
integrity sha512-KHBP6tMxkmse3gvza0Uw0cs2QvtJErH8rhcbmUVP+J4PKYaSaCdFAyt4zZcO9QTZSXOUUxZNK4zyvu9U9hTsqw==
11581158
dependencies:
1159-
"@sentry/types" "5.0.6"
1160-
"@sentry/utils" "5.0.8"
1159+
"@sentry/types" "5.2.0-beta.0"
1160+
"@sentry/utils" "5.2.0-beta.0"
11611161
tslib "^1.9.3"
11621162

1163-
"@sentry/integrations@^5.0.8":
1164-
version "5.0.8"
1165-
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.0.8.tgz#9322520827ad4014b4501e44501a3e6db22d26aa"
1166-
integrity sha512-qpk31GZtT9kIGUY1X5rV9dgTsefxjFjxJPdwWUlVpmgNYbcGGJJqnqnTCsBL2oKA3T/VHAbEP2rcE33HGiuEKA==
1163+
"@sentry/integrations@5.2.0-beta.0":
1164+
version "5.2.0-beta.0"
1165+
resolved "https://registry.yarnpkg.com/@sentry/integrations/-/integrations-5.2.0-beta.0.tgz#e3f4909b97ec7c16d80062d86c2cbe92ede3ced3"
1166+
integrity sha512-0WdWLeYuBL0Q+Y9oAC1Rz1AYtlPYiiRTKY1gda3pLp8jAO54U14c5Bj0VYipATg4t107BvWvn4/SKx0f1S/1fw==
11671167
dependencies:
1168-
"@sentry/types" "5.0.6"
1169-
"@sentry/utils" "5.0.8"
1168+
"@sentry/types" "5.2.0-beta.0"
1169+
"@sentry/utils" "5.2.0-beta.0"
1170+
tslib "^1.9.3"
11701171

1171-
"@sentry/minimal@5.0.8":
1172-
version "5.0.8"
1173-
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.0.8.tgz#21a6521dfbc02d098ae604813e90d945fec6c820"
1174-
integrity sha512-MP5bFuqC0xMWT9LTkX0rkX1Xxlj3G4zKdhF8rxwM9YLZUUmS5vvNs/AiPGaEAlw8i9C+0TBTcvQt3va2qVVEHA==
1172+
"@sentry/minimal@5.2.0-beta.0":
1173+
version "5.2.0-beta.0"
1174+
resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-5.2.0-beta.0.tgz#2b3cde2adc9114e9488cb06749162060abdbe11b"
1175+
integrity sha512-vsdr4h4X2Pe7VnQ05nB7Nz3b7QkAOA+68bNPwWDWstd4QWjlSyuav8gQrert/rVOmU7C5leps4mT655d82PjYA==
11751176
dependencies:
1176-
"@sentry/hub" "5.0.8"
1177-
"@sentry/types" "5.0.6"
1177+
"@sentry/hub" "5.2.0-beta.0"
1178+
"@sentry/types" "5.2.0-beta.0"
11781179
tslib "^1.9.3"
11791180

1180-
"@sentry/types@5.0.6":
1181-
version "5.0.6"
1182-
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.0.6.tgz#df1b318977e5308741049cc4f35986cf8255115f"
1183-
integrity sha512-EJYzjfnTfTQgqR3p6dSvIVZe0xe2Jz+tSmvuPABf7VoCmrFtEYkMCSf5IshMHeebmXUS5prrPSCAgVcIrJC+Bw==
1181+
"@sentry/types@5.2.0-beta.0":
1182+
version "5.2.0-beta.0"
1183+
resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.2.0-beta.0.tgz#c40d157a39850e715b5494094eac6317bcfb43e6"
1184+
integrity sha512-JB1nCQbzTGuZDH3jX7CMkd8OgRtAYl1wViTsc/ZMgpDqDjSJZvJzD+FEnW4H9AzPjcdNP7t9+VMwSJRNDDh7xg==
11841185

1185-
"@sentry/utils@5.0.8":
1186-
version "5.0.8"
1187-
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.0.8.tgz#3dcc95b84fef1a862236c9950c257322817bf0da"
1188-
integrity sha512-NZUVl3i2Rm5WKgPEb0DSPYTMQsCxdbZXOiOEq2/9Ee1bY29VTzmjM08KZTYI8+ZiUJwB2l3y/nvNGkqlEoXQCg==
1186+
"@sentry/utils@5.2.0-beta.0":
1187+
version "5.2.0-beta.0"
1188+
resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.2.0-beta.0.tgz#1faaf2239e74af0f62509430df3124c0ecfa74a7"
1189+
integrity sha512-D87a+s4qG/9kBTikN4Oodh3sEXXV9AVHKQEEpOpNqVzBaLjDcJVhwO7lGIgGj03BqqHTd+inFMxed7wU3tbXsw==
11891190
dependencies:
1190-
"@sentry/types" "5.0.6"
1191+
"@sentry/types" "5.2.0-beta.0"
11911192
tslib "^1.9.3"
11921193

11931194
"@storybook/addon-a11y@^4.1.3":

0 commit comments

Comments
 (0)