updates

Author: mattfysh

.npmrc

@@ -0,0 +1 @@
+@unwebio:registry=https://npm.pkg.github.com

packages/hub/.npmrc

@@ -0,0 +1 @@
+@unwebio:registry=https://npm.pkg.github.com

packages/hub/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "@sentry/hub",
+  "name": "@unwebio/sentry-hub",
   "version": "6.16.1",
   "description": "Sentry hub which handles global state managment.",
-  "repository": "git://github.com/getsentry/sentry-javascript.git",
-  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/hub",
+  "repository": "git://github.com/unwebio/sentry-javascript.git",
+  "homepage": "https://github.com/unwebio/sentry-javascript/tree/master/packages/hub",
   "author": "Sentry",
   "license": "BSD-3-Clause",
   "engines": {
@@ -13,7 +13,7 @@
   "module": "esm/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted"
   },
   "dependencies": {
     "@sentry/types": "6.16.1",

packages/hub/src/hub.ts

@@ -580,7 +580,8 @@ export function getActiveDomain(): DomainAsCarrier | undefined {
 function getHubFromActiveDomain(registry: Carrier): Hub {
   try {
     const sentry = getMainCarrier().__SENTRY__;
-    const activeDomain = sentry && sentry.extensions && sentry.extensions.domain && sentry.extensions.domain.active;
+    const domainModule = sentry && sentry.extensions && sentry.extensions.domain
+    const activeDomain = domainModule && domainModule.active;
 
     // If there's no active domain, just return global hub
     if (!activeDomain) {
@@ -589,7 +590,9 @@ function getHubFromActiveDomain(registry: Carrier): Hub {
 
     // If there's no hub on current domain, or it's an old API, assign a new one
     if (!hasHubOnCarrier(activeDomain) || getHubFromCarrier(activeDomain).isOlderThan(API_VERSION)) {
-      const registryHubTopStack = getHubFromCarrier(registry).getStackTop();
+      const stack: any[] = domainModule?._stack
+      const parentCarrier = stack[stack.length - 2] || registry
+      const registryHubTopStack = getHubFromCarrier(parentCarrier).getStackTop();
       setHubOnCarrier(activeDomain, new Hub(registryHubTopStack.client, Scope.clone(registryHubTopStack.scope)));
     }
 

packages/node/.npmrc

@@ -0,0 +1 @@
+@unwebio:registry=https://npm.pkg.github.com

packages/node/package.json

@@ -1,9 +1,9 @@
 {
-  "name": "@sentry/node",
+  "name": "@unwebio/sentry-node",
   "version": "6.16.1",
   "description": "Official Sentry SDK for Node.js",
-  "repository": "git://github.com/getsentry/sentry-javascript.git",
-  "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/node",
+  "repository": "git://github.com/unwebio/sentry-javascript.git",
+  "homepage": "https://github.com/unwebio/sentry-javascript/tree/master/packages/node",
   "author": "Sentry",
   "license": "BSD-3-Clause",
   "engines": {
@@ -13,11 +13,11 @@
   "module": "esm/index.js",
   "types": "dist/index.d.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "restricted"
   },
   "dependencies": {
     "@sentry/core": "6.16.1",
-    "@sentry/hub": "6.16.1",
+    "@unwebio/sentry-hub": "6.16.1",
     "@sentry/tracing": "6.16.1",
     "@sentry/types": "6.16.1",
     "@sentry/utils": "6.16.1",

packages/node/src/integrations/http.ts

@@ -117,11 +117,13 @@ function _createWrappedRequestMethodFactory(
             op: 'http.client',
           });
 
-          const sentryTraceHeader = span.toTraceparent();
-          logger.log(
-            `[Tracing] Adding sentry-trace header ${sentryTraceHeader} to outgoing request to ${requestUrl}: `,
-          );
-          requestOptions.headers = { ...requestOptions.headers, 'sentry-trace': sentryTraceHeader };
+          if (!requestOptions.stripTracingHeader) {
+            const sentryTraceHeader = span.toTraceparent();
+            logger.log(
+              `[Tracing] Adding sentry-trace header ${sentryTraceHeader} to outgoing request to ${requestUrl}: `,
+            );
+            requestOptions.headers = { ...requestOptions.headers, 'sentry-trace': sentryTraceHeader };
+          }
         }
       }
 
@@ -139,7 +141,17 @@ function _createWrappedRequestMethodFactory(
               span.setHttpStatus(res.statusCode);
             }
             span.description = cleanSpanDescription(span.description, requestOptions, req);
-            span.finish();
+
+            res.once('end', () => {
+              span?.finish()
+            })
+
+            res.once('error', () => {
+              if (breadcrumbsEnabled) {
+                addRequestBreadcrumb('response_error', requestUrl, req);
+              }
+              span?.finish()
+            })
           }
         })
         .once('error', function(this: http.ClientRequest): void {

packages/node/src/integrations/utils/http.ts

@@ -73,7 +73,9 @@ export function cleanSpanDescription(
 }
 
 // the node types are missing a few properties which node's `urlToOptions` function spits out
-export type RequestOptions = http.RequestOptions & { hash?: string; search?: string; pathname?: string; href?: string };
+export type RequestOptions = http.RequestOptions
+  & { hash?: string; search?: string; pathname?: string; href?: string }
+  & { stripTracingHeader?: boolean };
 type RequestCallback = (response: http.IncomingMessage) => void;
 export type RequestMethodArgs =
   | [RequestOptions | string | URL, RequestCallback?]