Include unended spans in rageshakes

By turning the RageshakeSpanExporter into a SpanProcessor, it can now be notified of spans as soon as they're started.

src/analytics/RageshakeSpanProcessor.ts

@@ -1,10 +1,10 @@
 import { Attributes } from "@opentelemetry/api";
+import { hrTimeToMilliseconds } from "@opentelemetry/core";
 import {
-  ExportResult,
+  SpanProcessor,
-  ExportResultCode,
+  ReadableSpan,
-  hrTimeToMilliseconds,
+  Span,
-} from "@opentelemetry/core";
+} from "@opentelemetry/sdk-trace-base";
-import { SpanExporter, ReadableSpan } from "@opentelemetry/sdk-trace-base";
 
 const dumpAttributes = (attr: Attributes) =>
   Object.entries(attr).map(([key, value]) => ({
@@ -17,21 +17,22 @@ const dumpAttributes = (attr: Attributes) =>
  * Exports spans on demand to the Jaeger JSON format, which can be attached to
  * rageshakes and loaded into analysis tools like Jaeger and Stalk.
  */
-export class RageshakeSpanExporter implements SpanExporter {
+export class RageshakeSpanProcessor implements SpanProcessor {
   private readonly spans: ReadableSpan[] = [];
 
-  export(
+  async forceFlush(): Promise<void> {}
-    spans: ReadableSpan[],
+
-    resultCallback: (result: ExportResult) => void
+  onStart(span: Span): void {
-  ): void {
+    this.spans.push(span);
-    this.spans.push(...spans);
-    resultCallback({ code: ExportResultCode.SUCCESS });
   }
 
+  onEnd(): void {}
+
   /**
    * Dumps the spans collected so far as Jaeger-compatible JSON.
    */
   public dump(): string {
+    const now = Date.now();
     const traces = new Map<string, ReadableSpan[]>();
 
     // Organize spans by their trace IDs
@@ -69,6 +70,12 @@ export class RageshakeSpanExporter implements SpanExporter {
         processes,
         spans: spans.map((span) => {
           const ctx = span.spanContext();
+          const startTime = hrTimeToMilliseconds(span.startTime);
+          // If the span has not yet ended, pretend that it ends now
+          const duration =
+            span.duration[0] === -1
+              ? now - startTime
+              : hrTimeToMilliseconds(span.duration);
 
           return {
             traceID: traceId,
@@ -76,8 +83,8 @@ export class RageshakeSpanExporter implements SpanExporter {
             operationName: span.name,
             processID: processId,
             warnings: null,
-            startTime: hrTimeToMilliseconds(span.startTime),
+            startTime,
-            duration: hrTimeToMilliseconds(span.duration),
+            duration,
             references:
               span.parentSpanId === undefined
                 ? []

src/otel/otel.ts

@@ -28,7 +28,7 @@ import { logger } from "matrix-js-sdk/src/logger";
 import { PosthogSpanExporter } from "../analytics/OtelPosthogExporter";
 import { Anonymity } from "../analytics/PosthogAnalytics";
 import { Config } from "../config/Config";
-import { RageshakeSpanExporter } from "../analytics/RageshakeSpanExporter";
+import { RageshakeSpanProcessor } from "../analytics/RageshakeSpanProcessor";
 
 const SERVICE_NAME = "element-call";
 
@@ -39,7 +39,7 @@ export class ElementCallOpenTelemetry {
   private _tracer: Tracer;
   private _anonymity: Anonymity;
   private otlpExporter: OTLPTraceExporter;
-  public readonly rageshakeExporter?: RageshakeSpanExporter;
+  public readonly rageshakeProcessor?: RageshakeSpanProcessor;
 
   static globalInit(): void {
     const config = Config.get();
@@ -89,11 +89,8 @@ export class ElementCallOpenTelemetry {
     }
 
     if (rageshakeUrl) {
-      logger.info("Enabling rageshake collector");
+      this.rageshakeProcessor = new RageshakeSpanProcessor();
-      this.rageshakeExporter = new RageshakeSpanExporter();
+      this._provider.addSpanProcessor(this.rageshakeProcessor);
-      this._provider.addSpanProcessor(
-        new SimpleSpanProcessor(this.rageshakeExporter)
-      );
     }
 
     const consoleExporter = new ConsoleSpanExporter();

src/settings/submit-rageshake.ts

@@ -248,7 +248,7 @@ export function useSubmitRageshake(): {
 
           body.append(
             "file",
-            gzip(ElementCallOpenTelemetry.instance.rageshakeExporter!.dump()),
+            gzip(ElementCallOpenTelemetry.instance.rageshakeProcessor!.dump()),
             "traces.json"
           );