@dxos/tracing 0.1.56-next.a63ce79 → 0.1.56

package/src/trace-sender.ts

@@ -3,31 +3,22 @@
 //
 
 import { Stream } from '@dxos/codec-protobuf';
+import { LogEntry } from '@dxos/protocols/proto/dxos/client/services';
 import { StreamTraceEvent, TracingService } from '@dxos/protocols/proto/dxos/tracing';
 
 import { TraceProcessor, TraceSubscription } from './trace-processor';
 
-const FLUSH_INTERVAL = 1_000;
-
 export class TraceSender implements TracingService {
   constructor(private _traceProcessor: TraceProcessor) {}
 
   streamTrace(request: void): Stream<StreamTraceEvent> {
     return new Stream(({ ctx, next }) => {
-      const subscription: TraceSubscription = {
-        dirtyResources: new Set(),
-        dirtySpans: new Set(),
-      };
-      this._traceProcessor.subscriptions.add(subscription);
-      ctx.onDispose(() => {
-        this._traceProcessor.subscriptions.delete(subscription);
-      });
-
-      const flushEvents = (resources: Set<number> | null, spans: Set<number> | null) => {
+      const flushEvents = (resources: Set<number> | null, spans: Set<number> | null, logs: LogEntry[] | null) => {
         const event: StreamTraceEvent = {
           resourceAdded: [],
           resourceRemoved: [],
           spanAdded: [],
+          logAdded: [],
         };
 
         if (resources) {
@@ -58,21 +49,40 @@ export class TraceSender implements TracingService {
           }
         }
 
+        if (logs) {
+          for (const log of logs) {
+            event.logAdded!.push({ log });
+          }
+        } else {
+          for (const log of this._traceProcessor.logs) {
+            event.logAdded!.push({ log });
+          }
+        }
+
         if (event.resourceAdded!.length > 0 || event.resourceRemoved!.length > 0 || event.spanAdded!.length > 0) {
           next(event);
         }
       };
 
-      flushEvents(null, null);
-
-      const timer = setInterval(() => {
-        flushEvents(subscription.dirtyResources, subscription.dirtySpans);
+      const flush = () => {
+        flushEvents(subscription.dirtyResources, subscription.dirtySpans, subscription.newLogs);
         subscription.dirtyResources.clear();
         subscription.dirtySpans.clear();
-      }, FLUSH_INTERVAL);
+        subscription.newLogs.length = 0;
+      };
+
+      const subscription: TraceSubscription = {
+        flush,
+        dirtyResources: new Set(),
+        dirtySpans: new Set(),
+        newLogs: [],
+      };
+      this._traceProcessor.subscriptions.add(subscription);
       ctx.onDispose(() => {
-        clearInterval(timer);
+        this._traceProcessor.subscriptions.delete(subscription);
       });
+
+      flushEvents(null, null, null);
     });
   }
 }