@fluidframework/test-utils 2.0.0-internal.5.3.2 → 2.0.0-internal.6.0.0

package/src/testObjectProvider.ts

@@ -29,7 +29,7 @@ import {
 } from "@fluidframework/driver-definitions";
 import { ITestDriver, TestDriverTypes } from "@fluidframework/test-driver-definitions";
 import { v4 as uuid } from "uuid";
-import { ChildLogger, MultiSinkLogger, TelemetryLogger } from "@fluidframework/telemetry-utils";
+import { createChildLogger, createMultiSinkLogger } from "@fluidframework/telemetry-utils";
 import { LoaderContainerTracker } from "./loaderContainerTracker";
 import { fluidEntryPoint, LocalCodeLoader } from "./localCodeLoader";
 import { createAndAttachContainer } from "./localLoader";
@@ -160,7 +160,7 @@ function getDocumentIdStrategy(type?: TestDriverTypes): IDocumentIdStrategy {
  * At any point you call reportAndClearTrackedEvents which will provide all unexpected errors, and
  * any expected events that have not occurred.
  */
-export class EventAndErrorTrackingLogger extends TelemetryLogger {
+export class EventAndErrorTrackingLogger implements ITelemetryBaseLogger {
 	/**
 	 * Even if these error events are logged, tests should still be allowed to pass
 	 * Additionally, if downgrade is true, then log as generic (e.g. to avoid polluting the e2e test logs)
@@ -175,9 +175,7 @@ export class EventAndErrorTrackingLogger extends TelemetryLogger {
 		{ eventName: "fluid:telemetry:OpPerf:OpRoundtripTime" },
 	];
 
-	constructor(private readonly baseLogger: ITelemetryBaseLogger) {
-		super();
-	}
+	constructor(private readonly baseLogger: ITelemetryBaseLogger) {}
 
 	private readonly expectedEvents: (
 		| { index: number; event: ITelemetryGenericEvent | undefined }
@@ -277,12 +275,15 @@ export class TestObjectProvider implements ITestObjectProvider {
 	get logger(): EventAndErrorTrackingLogger {
 		if (this._logger === undefined) {
 			this._logger = new EventAndErrorTrackingLogger(
-				ChildLogger.create(getTestLogger?.(), undefined, {
-					all: {
-						driverType: this.driver.type,
-						driverEndpointName: this.driver.endpointName,
-						driverTenantName: this.driver.tenantName,
-						driverUserIndex: this.driver.userIndex,
+				createChildLogger({
+					logger: getTestLogger?.(),
+					properties: {
+						all: {
+							driverType: this.driver.type,
+							driverEndpointName: this.driver.endpointName,
+							driverTenantName: this.driver.tenantName,
+							driverUserIndex: this.driver.userIndex,
+						},
 					},
 				}),
 			);
@@ -332,15 +333,13 @@ export class TestObjectProvider implements ITestObjectProvider {
 		packageEntries: Iterable<[IFluidCodeDetails, fluidEntryPoint]>,
 		loaderProps?: Partial<ILoaderProps>,
 	) {
-		const multiSinkLogger = new MultiSinkLogger();
-		multiSinkLogger.addLogger(this.logger);
-		if (loaderProps?.logger !== undefined) {
-			multiSinkLogger.addLogger(loaderProps.logger);
-		}
+		const logger = createMultiSinkLogger({
+			loggers: [this.logger, loaderProps?.logger],
+		});
 
 		const loader = new this.LoaderConstructor({
 			...loaderProps,
-			logger: multiSinkLogger,
+			logger,
 			codeLoader: loaderProps?.codeLoader ?? new LocalCodeLoader(packageEntries),
 			urlResolver: loaderProps?.urlResolver ?? this.urlResolver,
 			documentServiceFactory: