@fluidframework/shared-object-base 2.93.0 → 2.100.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluidframework/shared-object-base",
-  "version": "2.93.0",
+  "version": "2.100.0",
   "description": "Fluid base class for shared distributed data structures",
   "homepage": "https://fluidframework.com",
   "repository": {
@@ -69,31 +69,31 @@
     "temp-directory": "nyc/.nyc_output"
   },
   "dependencies": {
-    "@fluid-internal/client-utils": "~2.93.0",
-    "@fluidframework/container-definitions": "~2.93.0",
-    "@fluidframework/core-interfaces": "~2.93.0",
-    "@fluidframework/core-utils": "~2.93.0",
-    "@fluidframework/datastore": "~2.93.0",
-    "@fluidframework/datastore-definitions": "~2.93.0",
-    "@fluidframework/driver-definitions": "~2.93.0",
-    "@fluidframework/id-compressor": "~2.93.0",
-    "@fluidframework/runtime-definitions": "~2.93.0",
-    "@fluidframework/runtime-utils": "~2.93.0",
-    "@fluidframework/telemetry-utils": "~2.93.0",
+    "@fluid-internal/client-utils": "~2.100.0",
+    "@fluidframework/container-definitions": "~2.100.0",
+    "@fluidframework/core-interfaces": "~2.100.0",
+    "@fluidframework/core-utils": "~2.100.0",
+    "@fluidframework/datastore": "~2.100.0",
+    "@fluidframework/datastore-definitions": "~2.100.0",
+    "@fluidframework/driver-definitions": "~2.100.0",
+    "@fluidframework/id-compressor": "~2.100.0",
+    "@fluidframework/runtime-definitions": "~2.100.0",
+    "@fluidframework/runtime-utils": "~2.100.0",
+    "@fluidframework/telemetry-utils": "~2.100.0",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.2",
     "@biomejs/biome": "~2.4.5",
-    "@fluid-internal/mocha-test-setup": "~2.93.0",
-    "@fluid-private/test-pairwise-generator": "~2.93.0",
-    "@fluid-tools/benchmark": "^0.55.0",
-    "@fluid-tools/build-cli": "^0.64.0",
+    "@fluid-internal/mocha-test-setup": "~2.100.0",
+    "@fluid-private/test-pairwise-generator": "~2.100.0",
+    "@fluid-tools/benchmark": "^0.58.0",
+    "@fluid-tools/build-cli": "^0.65.0",
     "@fluidframework/build-common": "^2.0.3",
-    "@fluidframework/build-tools": "^0.64.0",
+    "@fluidframework/build-tools": "^0.65.0",
     "@fluidframework/eslint-config-fluid": "^9.0.0",
     "@fluidframework/shared-object-base-previous": "npm:@fluidframework/shared-object-base@2.92.0",
-    "@fluidframework/test-runtime-utils": "~2.93.0",
+    "@fluidframework/test-runtime-utils": "~2.100.0",
     "@microsoft/api-extractor": "7.58.1",
     "@types/mocha": "^10.0.10",
     "@types/node": "~22.19.17",

package/src/handle.ts

@@ -6,7 +6,7 @@
 import type { IFluidHandleInternal } from "@fluidframework/core-interfaces/internal";
 import { FluidObjectHandle } from "@fluidframework/datastore/internal";
 import type { IFluidDataStoreRuntime } from "@fluidframework/datastore-definitions/internal";
-import { isFluidHandle, asLegacyAlpha } from "@fluidframework/runtime-utils/internal";
+import { isFluidHandle } from "@fluidframework/runtime-utils/internal";
 
 import type { ISharedObject } from "./types.js";
 
@@ -123,7 +123,7 @@ export class SharedObjectHandle
 		// We don't bind handles in staging mode to defer the attachment of any new objects
 		// until we've exited staging mode. This way if we discard changes or a new handle is not present in the final
 		// committed state, we will never end up attaching the discarded object.
-		if (asLegacyAlpha(this.runtime).inStagingMode === true) {
+		if (this.runtime.inStagingMode === true) {
 			return;
 		}
 

package/src/packageVersion.ts

@@ -6,4 +6,4 @@
  */
 
 export const pkgName = "@fluidframework/shared-object-base";
-export const pkgVersion = "2.93.0";
+export const pkgVersion = "2.100.0";

package/src/sharedObject.ts

@@ -41,7 +41,6 @@ import {
 	type TelemetryContext,
 } from "@fluidframework/runtime-utils/internal";
 import {
-	type ITelemetryLoggerExt,
 	DataProcessingError,
 	EventEmitterWithErrorHandling,
 	type MonitoringContext,
@@ -52,7 +51,10 @@ import {
 	type ICustomData,
 	type IFluidErrorBase,
 	LoggingError,
+	extractTelemetryLoggerExt,
 } from "@fluidframework/telemetry-utils/internal";
+// eslint-disable-next-line import-x/no-internal-modules -- Needed to avoid specialized /internal ITelemetryLoggerExt
+import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/legacy";
 import { v4 as uuid } from "uuid";
 
 import { GCHandleVisitor } from "./gcHandleVisitor.js";
@@ -162,7 +164,7 @@ export abstract class SharedObjectCore<
 
 		this.handle = new SharedObjectHandle(this, id, runtime);
 
-		this.logger = createChildLogger({
+		const internalLogger = createChildLogger({
 			logger: runtime.logger,
 			properties: {
 				all: {
@@ -173,7 +175,8 @@ export abstract class SharedObjectCore<
 				},
 			},
 		});
-		this.mc = loggerToMonitoringContext(this.logger);
+		this.logger = internalLogger;
+		this.mc = loggerToMonitoringContext(internalLogger);
 
 		const { opProcessingHelper, callbacksHelper } = this.setUpSampledTelemetryHelpers();
 		this.opProcessingHelper = opProcessingHelper;
@@ -206,7 +209,7 @@ export abstract class SharedObjectCore<
 				eventName: "ddsOpProcessing",
 				category: "performance",
 			},
-			this.logger,
+			extractTelemetryLoggerExt(this.logger),
 			this.mc.config.getNumber("Fluid.SharedObject.OpProcessingTelemetrySampling") ?? 1000,
 			true,
 			new Map<string, ITelemetryBaseProperties>([
@@ -219,7 +222,7 @@ export abstract class SharedObjectCore<
 				eventName: "ddsEventCallbacks",
 				category: "performance",
 			},
-			this.logger,
+			extractTelemetryLoggerExt(this.logger),
 			this.mc.config.getNumber("Fluid.SharedObject.DdsCallbacksTelemetrySampling") ?? 1000,
 			true,
 		);

package/src/sharedObjectKernel.ts

@@ -23,7 +23,8 @@ import type {
 	IRuntimeMessageCollection,
 	MinimumVersionForCollab,
 } from "@fluidframework/runtime-definitions/internal";
-import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import type { TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
+import { extractTelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
 
 import type { IFluidSerializer } from "./serializer.js";
 import {
@@ -150,7 +151,7 @@ class SharedObjectFromKernel<
 			submitLocalMessage: (op, localOpMetadata) =>
 				this.submitLocalMessage(op, localOpMetadata),
 			eventEmitter: this,
-			logger: this.logger,
+			logger: extractTelemetryLoggerExt(this.logger),
 			idCompressor: runtime.idCompressor,
 			lastSequenceNumber: () => this.deltaManager.lastSequenceNumber,
 			initialSequenceNumber: this.deltaManager.initialSequenceNumber,
@@ -291,7 +292,7 @@ export interface KernelArgs {
 	/**
 	 * {@inheritdoc SharedObjectCore.logger}
 	 */
-	readonly logger: ITelemetryLoggerExt;
+	readonly logger: TelemetryLoggerExt;
 	/**
 	 * {@inheritdoc @fluidframework/datastore-definitions#IFluidDataStoreRuntime.idCompressor}
 	 */