@fluidframework/datastore 2.0.0-internal.5.3.2 → 2.0.0-internal.5.4.0

package/src/dataStoreRuntime.ts

@@ -5,13 +5,12 @@
 
 import {
 	ITelemetryLoggerExt,
-	ChildLogger,
 	generateStack,
 	LoggingError,
-	loggerToMonitoringContext,
 	MonitoringContext,
 	raiseConnectedEvent,
-	TelemetryDataTag,
+	createChildMonitoringContext,
+	tagCodeArtifacts,
 } from "@fluidframework/telemetry-utils";
 import {
 	FluidObject,
@@ -63,7 +62,6 @@ import {
 	exceptionToResponse,
 	GCDataBuilder,
 	requestFluidObject,
-	packagePathToTelemetryProperty,
 	unpackChildNodesUsedRoutes,
 } from "@fluidframework/runtime-utils";
 import {
@@ -251,11 +249,13 @@ export class FluidDataStoreRuntime
 			0x30e /* Id cannot contain slashes. DataStoreContext should have validated this. */,
 		);
 
-		this.mc = loggerToMonitoringContext(
-			ChildLogger.create(dataStoreContext.logger, "FluidDataStoreRuntime", {
+		this.mc = createChildMonitoringContext({
+			logger: dataStoreContext.logger,
+			namespace: "FluidDataStoreRuntime",
+			properties: {
 				all: { dataStoreId: uuid() },
-			}),
-		);
+			},
+		});
 
 		this.id = dataStoreContext.id;
 		this.options = dataStoreContext.options;
@@ -578,10 +578,13 @@ export class FluidDataStoreRuntime
 		return this.audience;
 	}
 
-	public async uploadBlob(blob: ArrayBufferLike): Promise<IFluidHandle<ArrayBufferLike>> {
+	public async uploadBlob(
+		blob: ArrayBufferLike,
+		signal?: AbortSignal,
+	): Promise<IFluidHandle<ArrayBufferLike>> {
 		this.verifyNotClosed();
 
-		return this.dataStoreContext.uploadBlob(blob);
+		return this.dataStoreContext.uploadBlob(blob, signal);
 	}
 
 	public process(message: ISequencedDocumentMessage, local: boolean, localOpMetadata: unknown) {
@@ -1098,18 +1101,12 @@ export class FluidDataStoreRuntime
 		// in the summarizer and the data will help us plan this.
 		this.mc.logger.sendTelemetryEvent({
 			eventName,
-			channelType,
-			channelId: {
-				value: channelId,
-				tag: TelemetryDataTag.CodeArtifact,
-			},
-			fluidDataStoreId: {
-				value: this.id,
-				tag: TelemetryDataTag.CodeArtifact,
-			},
-			fluidDataStorePackagePath: packagePathToTelemetryProperty(
-				this.dataStoreContext.packagePath,
-			),
+			...tagCodeArtifacts({
+				channelType,
+				channelId,
+				fluidDataStoreId: this.id,
+				fluidDataStorePackagePath: this.dataStoreContext.packagePath.join("/"),
+			}),
 			stack: generateStack(),
 		});
 		this.localChangesTelemetryCount--;

package/src/remoteChannelContext.ts

@@ -20,7 +20,7 @@ import {
 	ITelemetryContext,
 } from "@fluidframework/runtime-definitions";
 import {
-	ChildLogger,
+	createChildLogger,
 	ITelemetryLoggerExt,
 	ThresholdCounter,
 } from "@fluidframework/telemetry-utils";
@@ -61,7 +61,10 @@ export class RemoteChannelContext implements IChannelContext {
 	) {
 		assert(!this.id.includes("/"), 0x310 /* Channel context ID cannot contain slashes */);
 
-		this.subLogger = ChildLogger.create(runtime.logger, "RemoteChannelContext");
+		this.subLogger = createChildLogger({
+			logger: runtime.logger,
+			namespace: "RemoteChannelContext",
+		});
 
 		this.services = createChannelServiceEndpoints(
 			dataStoreContext.connected,