@fluidframework/datastore 2.0.0-internal.4.4.0 → 2.0.0-internal.5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/datastore",
-  "version": "2.0.0-internal.4.4.0",
+  "version": "2.0.0-internal.5.0.0",
   "description": "Fluid data store implementation",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -37,18 +37,17 @@
   "dependencies": {
     "@fluidframework/common-definitions": "^0.20.1",
     "@fluidframework/common-utils": "^1.1.1",
-    "@fluidframework/container-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/container-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/core-interfaces": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/datastore-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/driver-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/driver-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/garbage-collector": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/container-definitions": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/container-utils": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/core-interfaces": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/datastore-definitions": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/driver-definitions": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/driver-utils": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
     "@fluidframework/protocol-base": "^0.1039.1000",
     "@fluidframework/protocol-definitions": "^1.1.0",
-    "@fluidframework/runtime-definitions": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/runtime-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/telemetry-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/runtime-definitions": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/runtime-utils": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/telemetry-utils": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
     "lodash": "^4.17.21",
     "uuid": "^8.3.1"
   },
@@ -58,8 +57,8 @@
     "@fluidframework/build-tools": "^0.17.0",
     "@fluidframework/datastore-previous": "npm:@fluidframework/datastore@2.0.0-internal.4.1.0",
     "@fluidframework/eslint-config-fluid": "^2.0.0",
-    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
-    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.4.4.0 <2.0.0-internal.4.5.0",
+    "@fluidframework/mocha-test-setup": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
+    "@fluidframework/test-runtime-utils": ">=2.0.0-internal.5.0.0 <2.0.0-internal.5.1.0",
     "@microsoft/api-extractor": "^7.34.4",
     "@types/mocha": "^9.1.1",
     "@types/node": "^14.18.38",

package/src/channelContext.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt, TelemetryDataTag } from "@fluidframework/telemetry-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 import {
 	IChannel,
@@ -24,7 +24,6 @@ import {
 import { addBlobToSummary } from "@fluidframework/runtime-utils";
 import { DataCorruptionError } from "@fluidframework/container-utils";
 import { readAndParse } from "@fluidframework/driver-utils";
-import { TelemetryDataTag } from "@fluidframework/telemetry-utils";
 import { ChannelStorageService } from "./channelStorageService";
 import { ChannelDeltaConnection } from "./channelDeltaConnection";
 import { ISharedObjectRegistry } from "./dataStoreRuntime";
@@ -77,7 +76,7 @@ export function createChannelServiceEndpoints(
 	dirtyFn: () => void,
 	addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,
 	storageService: IDocumentStorageService,
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	tree?: ISnapshotTree,
 	extraBlobs?: Map<string, ArrayBufferLike>,
 ): ChannelServiceEndpoints {
@@ -188,7 +187,7 @@ export async function loadChannel(
 	attributes: IChannelAttributes,
 	factory: IChannelFactory,
 	services: ChannelServiceEndpoints,
-	logger: ITelemetryLogger,
+	logger: ITelemetryLoggerExt,
 	channelId: string,
 ): Promise<IChannel> {
 	// Compare snapshot version to collaborative object version

package/src/channelStorageService.ts

@@ -7,7 +7,7 @@ import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { IChannelStorageService } from "@fluidframework/datastore-definitions";
 import { getNormalizedObjectStoragePathParts } from "@fluidframework/runtime-utils";
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 
 export class ChannelStorageService implements IChannelStorageService {
 	private static flattenTree(
@@ -31,7 +31,7 @@ export class ChannelStorageService implements IChannelStorageService {
 	constructor(
 		private readonly tree: ISnapshotTree | undefined,
 		private readonly storage: Pick<IDocumentStorageService, "readBlob">,
-		private readonly logger: ITelemetryLogger,
+		private readonly logger: ITelemetryLoggerExt,
 		private readonly extraBlobs?: Map<string, ArrayBufferLike>,
 	) {
 		this.flattenedTree = {};

package/src/dataStoreRuntime.ts

@@ -3,7 +3,16 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import {
+	ITelemetryLoggerExt,
+	ChildLogger,
+	generateStack,
+	LoggingError,
+	loggerToMonitoringContext,
+	MonitoringContext,
+	raiseConnectedEvent,
+	TelemetryDataTag,
+} from "@fluidframework/telemetry-utils";
 import {
 	FluidObject,
 	IFluidHandle,
@@ -25,15 +34,6 @@ import {
 	TypedEventEmitter,
 	unreachableCase,
 } from "@fluidframework/common-utils";
-import {
-	ChildLogger,
-	generateStack,
-	LoggingError,
-	loggerToMonitoringContext,
-	MonitoringContext,
-	raiseConnectedEvent,
-	TelemetryDataTag,
-} from "@fluidframework/telemetry-utils";
 import { buildSnapshotTree } from "@fluidframework/driver-utils";
 import {
 	IClientDetails,
@@ -206,7 +206,7 @@ export class FluidDataStoreRuntime
 	private readonly quorum: IQuorumClients;
 	private readonly audience: IAudience;
 	private readonly mc: MonitoringContext;
-	public get logger(): ITelemetryLogger {
+	public get logger(): ITelemetryLoggerExt {
 		return this.mc.logger;
 	}
 

package/src/localChannelContext.ts

@@ -5,7 +5,7 @@
 
 // eslint-disable-next-line import/no-internal-modules
 import cloneDeep from "lodash/cloneDeep";
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
+import { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils";
 import { IDocumentStorageService } from "@fluidframework/driver-definitions";
 import { ISequencedDocumentMessage, ISnapshotTree } from "@fluidframework/protocol-definitions";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
@@ -176,7 +176,7 @@ export class RehydratedLocalChannelContext extends LocalChannelContextBase {
 		runtime: IFluidDataStoreRuntime,
 		dataStoreContext: IFluidDataStoreContext,
 		storageService: IDocumentStorageService,
-		logger: ITelemetryLogger,
+		logger: ITelemetryLoggerExt,
 		submitFn: (content: any, localOpMetadata: unknown) => void,
 		dirtyFn: (address: string) => void,
 		addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,
@@ -289,7 +289,7 @@ export class LocalChannelContext extends LocalChannelContextBase {
 		runtime: IFluidDataStoreRuntime,
 		dataStoreContext: IFluidDataStoreContext,
 		storageService: IDocumentStorageService,
-		logger: ITelemetryLogger,
+		logger: ITelemetryLoggerExt,
 		submitFn: (content: any, localOpMetadata: unknown) => void,
 		dirtyFn: (address: string) => void,
 		addedGCOutboundReferenceFn: (srcHandle: IFluidHandle, outboundHandle: IFluidHandle) => void,

package/src/remoteChannelContext.ts

@@ -3,7 +3,6 @@
  * Licensed under the MIT License.
  */
 
-import { ITelemetryLogger } from "@fluidframework/common-definitions";
 import { LazyPromise, assert } from "@fluidframework/common-utils";
 import { IFluidHandle } from "@fluidframework/core-interfaces";
 import { IChannel, IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions";
@@ -19,7 +18,11 @@ import {
 	ISummarizerNodeWithGC,
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
-import { ChildLogger, ThresholdCounter } from "@fluidframework/telemetry-utils";
+import {
+	ChildLogger,
+	ITelemetryLoggerExt,
+	ThresholdCounter,
+} from "@fluidframework/telemetry-utils";
 import {
 	ChannelServiceEndpoints,
 	createChannelServiceEndpoints,
@@ -37,7 +40,7 @@ export class RemoteChannelContext implements IChannelContext {
 	private channel: IChannel | undefined;
 	private readonly services: ChannelServiceEndpoints;
 	private readonly summarizerNode: ISummarizerNodeWithGC;
-	private readonly subLogger: ITelemetryLogger;
+	private readonly subLogger: ITelemetryLoggerExt;
 	private readonly thresholdOpsCounter: ThresholdCounter;
 	private static readonly pendingOpsCountThreshold = 1000;