ref: Change getActivitySpan to not check hub

AbhiPrasad · AbhiPrasad · commit fe9061248f5d · 2020-06-17T10:12:51.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 - [gatsby] feat: Add @sentry/gatsby package (#2652)
 - [core] ref: Rename `whitelistUrls/blacklistUrls` to `allowUrls/denyUrls`
 - [react] ref: Refactor Profiler to account for update and render (#2677)
+- [tracing] feat: Add ability to get span from activity using `getActivitySpan` (#2677)
 
 ## 5.17.0
 
diff --git a/packages/apm/src/integrations/tracing.ts b/packages/apm/src/integrations/tracing.ts
@@ -879,14 +879,9 @@ export class Tracing implements Integration {
     if (!id) {
       return undefined;
     }
-    if (Tracing._getCurrentHub) {
-      const hub = Tracing._getCurrentHub();
-      if (hub) {
-        const activity = Tracing._activities[id];
-        if (activity) {
-          return activity.span;
-        }
-      }
+    const activity = Tracing._activities[id];
+    if (activity) {
+      return activity.span;
     }
     return undefined;
   }

Original file line number	Diff line number	Diff line change
`@@ -879,14 +879,9 @@ export class Tracing implements Integration {`
`879`	`879`	`if (!id) {`
`880`	`880`	`return undefined;`
`881`	`881`	`}`
`882`		`- if (Tracing._getCurrentHub) {`
`883`		`- const hub = Tracing._getCurrentHub();`
`884`		`- if (hub) {`
`885`		`- const activity = Tracing._activities[id];`
`886`		`- if (activity) {`
`887`		`- return activity.span;`
`888`		`- }`
`889`		`- }`
	`882`	`+ const activity = Tracing._activities[id];`
	`883`	`+ if (activity) {`
	`884`	`+ return activity.span;`
`890`	`885`	`}`
`891`	`886`	`return undefined;`
`892`	`887`	`}`