Skip to content

fix: tracing integration build #2083

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 1 commit into from
May 24, 2019
Merged

fix: tracing integration build #2083

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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 5.3.1

- [integrations] fix: Tracing integration CDN build.

## 5.3.0

- [browser] fix: Remove `use_strict` from `@sentry/browser`
Expand Down
17 changes: 9 additions & 8 deletions packages/integrations/src/tracing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { consoleSandbox, fill, getGlobalObject, isMatchingPattern, supportsNativ

/** JSDoc */
interface TracingOptions {
tracingOrigins: Array<string | RegExp>;
tracingOrigins?: Array<string | RegExp>;
traceXHR?: boolean;
traceFetch?: boolean;
autoStartOnDomReady?: boolean;
Expand Down Expand Up @@ -35,7 +35,7 @@ export class Tracing implements Integration {
*
* @param _options TracingOptions
*/
public constructor(private readonly _options: TracingOptions) {
public constructor(private readonly _options: TracingOptions = {}) {
if (!Array.isArray(_options.tracingOrigins) || _options.tracingOrigins.length === 0) {
consoleSandbox(() => {
const defaultTracingOrigins = ['localhost', /^\//];
Expand Down Expand Up @@ -88,7 +88,7 @@ export class Tracing implements Integration {
* JSDoc
*/
private _traceXHR(getCurrentHub: () => Hub): void {
if (!('XMLHttpRequest' in global)) {
if (!('XMLHttpRequest' in getGlobalObject<Window>())) {
return;
}

Expand Down Expand Up @@ -116,11 +116,12 @@ export class Tracing implements Integration {
function(this: XMLHttpRequest, ...args: any[]): void {
// @ts-ignore
const self = getCurrentHub().getIntegration(Tracing);
if (self && self._xhrUrl) {
if (self && self._xhrUrl && self._options.tracingOrigins) {
const url = self._xhrUrl;
const headers = getCurrentHub().traceHeaders();
// tslint:disable-next-line: prefer-for-of
const isWhitelisted = self._options.tracingOrigins.some((origin: string | RegExp) =>
isMatchingPattern(self._xhrUrl, origin),
isMatchingPattern(url, origin),
);

if (isWhitelisted && this.setRequestHeader) {
Expand Down Expand Up @@ -148,12 +149,12 @@ export class Tracing implements Integration {
return function(...args: any[]): void {
// @ts-ignore
const self = getCurrentHub().getIntegration(Tracing);
if (self) {
if (self && self._options.tracingOrigins) {
const url = args[0] as string;
const options = args[1] as { [key: string]: any };

let whiteListed = false;
self._options.tracingOrigins.forEach((whiteListUrl: string) => {
self._options.tracingOrigins.forEach((whiteListUrl: string | RegExp) => {
if (!whiteListed) {
whiteListed = isMatchingPattern(url, whiteListUrl);
}
Expand All @@ -171,7 +172,7 @@ export class Tracing implements Integration {
}
}
// tslint:disable-next-line: no-unsafe-any
return originalFetch.apply(global, args);
return originalFetch.apply(getGlobalObject<Window>(), args);
};
});
// tslint:enable: only-arrow-functions
Expand Down