@fluidframework/container-runtime 2.0.0-dev-rc.5.0.0.271717 → 2.0.0-dev-rc.5.0.0.272251

package/lib/containerRuntime.js

@@ -13,7 +13,7 @@ import { FlushMode, FlushModeExperimental, channelsTreeName, gcTreeKey, } from "
 import { GCDataBuilder, RequestParser, TelemetryContext, addBlobToSummary, addSummarizeResultToSummary, calculateStats, create404Response, exceptionToResponse, responseToException, seqFromTree, } from "@fluidframework/runtime-utils/internal";
 import { DataCorruptionError, DataProcessingError, GenericError, LoggingError, PerformanceEvent, 
 // eslint-disable-next-line import/no-deprecated
-TaggedLoggerAdapter, UsageError, createChildLogger, createChildMonitoringContext, createSampledLogger, loggerToMonitoringContext, raiseConnectedEvent, wrapError, } from "@fluidframework/telemetry-utils/internal";
+TaggedLoggerAdapter, UsageError, createChildLogger, createChildMonitoringContext, createSampledLogger, loggerToMonitoringContext, raiseConnectedEvent, wrapError, tagCodeArtifacts, } from "@fluidframework/telemetry-utils/internal";
 import { v4 as uuid } from "uuid";
 import { BindBatchTracker } from "./batchTracker.js";
 import { BlobManager } from "./blobManager.js";
@@ -769,7 +769,10 @@ export class ContainerRuntime extends TypedEventEmitter {
                 snapshotTree: snapshot,
             };
         }
-        this.channelCollection = new ChannelCollection(snapshot, parentContext, this.mc.logger, (props) => this.garbageCollector.nodeUpdated(props), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap), async (runtime) => provideEntryPoint);
+        this.channelCollection = new ChannelCollection(snapshot, parentContext, this.mc.logger, (props) => this.garbageCollector.nodeUpdated({
+            ...props,
+            timestampMs: props.timestampMs ?? this.getCurrentReferenceTimestampMs(),
+        }), (path) => this.garbageCollector.isNodeDeleted(path), new Map(dataStoreAliasMap), async (runtime) => provideEntryPoint);
         this.blobManager = new BlobManager({
             routeContext: this.handleContext,
             snapshot: blobManagerSnapshot,
@@ -785,6 +788,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             blobRequested: (blobPath) => this.garbageCollector.nodeUpdated({
                 node: { type: "Blob", path: blobPath },
                 reason: "Loaded",
+                timestampMs: this.getCurrentReferenceTimestampMs(),
             }),
             isBlobDeleted: (blobPath) => this.garbageCollector.isNodeDeleted(blobPath),
             runtime: this,
@@ -1565,7 +1569,7 @@ export class ContainerRuntime extends TypedEventEmitter {
                 }
                 break;
             case ContainerMessageType.GC:
-                this.garbageCollector.processMessage(messageWithContext.message, local);
+                this.garbageCollector.processMessage(messageWithContext.message, messageWithContext.message.timestamp, local);
                 break;
             case ContainerMessageType.ChunkedOp:
                 // From observability POV, we should not exppse the rest of the system (including "op" events on object) to these messages.
@@ -1749,6 +1753,7 @@ export class ContainerRuntime extends TypedEventEmitter {
             node: { type: "DataStore", path: `/${internalId}` },
             reason: "Loaded",
             packagePath: context.packagePath,
+            timestampMs: this.getCurrentReferenceTimestampMs(),
         });
         return channel.entryPoint;
     }
@@ -2056,9 +2061,25 @@ export class ContainerRuntime extends TypedEventEmitter {
      * all references added in the system.
      * @param fromPath - The absolute path of the node that added the reference.
      * @param toPath - The absolute path of the outbound node that is referenced.
+     * @param messageTimestampMs - The timestamp of the message that added the reference.
      */
-    addedGCOutboundRoute(fromPath, toPath) {
-        this.garbageCollector.addedOutboundReference(fromPath, toPath);
+    addedGCOutboundRoute(fromPath, toPath, messageTimestampMs) {
+        // This is always called when processing an op so messageTimestampMs should exist. Due to back-compat
+        // across the data store runtime / container runtime boundary, this may be undefined and if so, get
+        // the timestamp from the last processed message which should exist.
+        // If a timestamp doesn't exist, log so we can learn about these cases and return.
+        const timestampMs = messageTimestampMs ?? this.getCurrentReferenceTimestampMs();
+        if (timestampMs === undefined) {
+            this.mc.logger.sendTelemetryEvent({
+                eventName: "NoTimestampInGCOutboundRoute",
+                ...tagCodeArtifacts({
+                    id: toPath,
+                    fromId: fromPath,
+                }),
+            });
+            return;
+        }
+        this.garbageCollector.addedOutboundReference(fromPath, toPath, timestampMs);
     }
     /**
      * Generates the summary tree, uploads it to storage, and then submits the summarize op.