feat: Add data before finish span

HazAT · HazAT · commit 707e622cb99d · 2019-11-20T09:56:52.000+01:00
diff --git a/packages/hub/src/span.ts b/packages/hub/src/span.ts
@@ -210,49 +210,39 @@ export class Span implements SpanInterface, SpanContext {
   }
 
   /**
-   * Sets the tag attribute on the current span
-   * @param key Tag key
-   * @param value Tag value
+   * @inheritDoc
    */
   public setTag(key: string, value: string): this {
     this.tags = { ...this.tags, [key]: value };
     return this;
   }
 
   /**
-   * Sets the data attribute on the current span
-   * @param key Data key
-   * @param value Data value
+   * @inheritDoc
    */
   public setData(key: string, value: any): this {
     this.data = { ...this.data, [key]: value };
     return this;
   }
 
   /**
-   * Sets the data attribute on the current span
-   * @param key Data key
-   * @param value Data value
+   * @inheritDoc
    */
   public setFailure(): this {
     this.setTag('status', 'failure');
     return this;
   }
 
   /**
-   * Sets the data attribute on the current span
-   * @param key Data key
-   * @param value Data value
+   * @inheritDoc
    */
   public setSuccess(): this {
     this.setTag('status', 'success');
     return this;
   }
 
   /**
-   * Sets the data attribute on the current span
-   * @param key Data key
-   * @param value Data value
+   * @inheritDoc
    */
   public isSuccess(): boolean {
     return this.tags.status !== 'failure';
diff --git a/packages/integrations/src/transactionactivity.ts b/packages/integrations/src/transactionactivity.ts
@@ -214,16 +214,22 @@ export class TransactionActivity implements Integration {
   /**
    * Removes activity and finishes the span in case there is one
    */
-  public static popActivity(id: number): void {
+  public static popActivity(id: number, spanData?: { [key: string]: any }): void {
     if (!TransactionActivity._isEnabled()) {
       // Tracing is not enabled
       return;
     }
 
     const activity = TransactionActivity._activities[id];
     if (activity) {
-      if (activity.span) {
-        activity.span.finish();
+      const span = activity.span;
+      if (span) {
+        if (spanData) {
+          Object.keys(spanData).forEach((key: string) => {
+            span.setData(key, spanData[key]);
+          });
+        }
+        span.finish();
       }
       // tslint:disable-next-line: no-dynamic-delete
       delete TransactionActivity._activities[id];
@@ -247,7 +253,7 @@ export class TransactionActivity implements Integration {
 function xhrCallback(handlerData: { [key: string]: any }): void {
   // tslint:disable: no-unsafe-any
   if (handlerData.requestComplete && handlerData.xhr.__sentry_xhr_activity_id__) {
-    TransactionActivity.popActivity(handlerData.xhr.__sentry_xhr_activity_id__);
+    TransactionActivity.popActivity(handlerData.xhr.__sentry_xhr_activity_id__, handlerData.xhr.__sentry_xhr__);
     return;
   }
   // We only capture complete, non-sentry requests
diff --git a/packages/types/src/span.ts b/packages/types/src/span.ts
@@ -8,6 +8,41 @@ export interface Span {
   getTraceContext(): object;
   /** Convert the object to JSON */
   toJSON(): object;
+
+  /**
+   * Sets the tag attribute on the current span
+   * @param key Tag key
+   * @param value Tag value
+   */
+  setTag(key: string, value: string): this;
+
+  /**
+   * Sets the data attribute on the current span
+   * @param key Data key
+   * @param value Data value
+   */
+  setData(key: string, value: any): this;
+
+  /**
+   * Sets the data attribute on the current span
+   * @param key Data key
+   * @param value Data value
+   */
+  setFailure(): this;
+
+  /**
+   * Sets the data attribute on the current span
+   * @param key Data key
+   * @param value Data value
+   */
+  setSuccess(): this;
+
+  /**
+   * Sets the data attribute on the current span
+   * @param key Data key
+   * @param value Data value
+   */
+  isSuccess(): boolean;
 }
 
 /** Interface holder all properties that can be set on a Span on creation. */
