Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions experimental/dds/tree/src/Checkout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { IDisposable, IErrorEvent, ITelemetryBaseProperties } from '@fluidframework/core-interfaces';
import { assert } from '@fluidframework/core-utils/internal';
import {
ITelemetryLoggerExt,
TelemetryLoggerExt,
EventEmitterWithErrorHandling,
createChildLogger,
} from '@fluidframework/telemetry-utils/internal';
Expand Down Expand Up @@ -121,7 +121,7 @@ export abstract class Checkout extends EventEmitterWithErrorHandling<ICheckoutEv
*/
private currentEdit?: GenericTransaction;

private readonly logger: ITelemetryLoggerExt;
private readonly logger: TelemetryLoggerExt;

public disposed: boolean = false;

Expand Down
4 changes: 2 additions & 2 deletions experimental/dds/tree/src/EditLog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { TypedEventEmitter } from '@fluid-internal/client-utils';
import type { IEvent } from '@fluidframework/core-interfaces';
import { assert, compareArrays } from '@fluidframework/core-utils/internal';
import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
import { TelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
import { BTree } from '@tylerbu/sorted-btree-es6';

import type { ChangeCompressor } from './ChangeCompression.js';
Expand Down Expand Up @@ -265,7 +265,7 @@ export class EditLog<TChange = unknown> extends TypedEventEmitter<IEditLogEvents
*/
public constructor(
summary: EditLogSummary<TChange, EditHandle<TChange>> = { editIds: [], editChunks: [] },
private readonly logger?: ITelemetryLoggerExt,
private readonly logger?: TelemetryLoggerExt,
editAddedHandlers: readonly EditAddedHandler<TChange>[] = [],
private readonly targetLength = Infinity,
private readonly evictionFrequency = targetLength * 2,
Expand Down
4 changes: 2 additions & 2 deletions experimental/dds/tree/src/HistoryEditFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { assert } from '@fluidframework/core-utils/internal';
import { ITelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';
import { TelemetryLoggerExt } from '@fluidframework/telemetry-utils/internal';

import { StablePlace } from './ChangeTypes.js';
import { fail } from './Common.js';
Expand Down Expand Up @@ -53,7 +53,7 @@ export enum HistoryEditFactoryEvents {
export function revert(
changes: readonly ChangeInternal[],
before: RevisionView,
logger?: ITelemetryLoggerExt,
logger?: TelemetryLoggerExt,
emit?: (event: string, ...args: any[]) => void
): ChangeInternal[] | undefined {
const result: ChangeInternal[] = [];
Expand Down
4 changes: 2 additions & 2 deletions experimental/dds/tree/src/id-compressor/IdCompressor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { ITelemetryBaseLogger } from '@fluidframework/core-interfaces';
import { assert } from '@fluidframework/core-utils/internal';
import { ITelemetryLoggerExt, createChildLogger } from '@fluidframework/telemetry-utils/internal';
import { TelemetryLoggerExt, createChildLogger } from '@fluidframework/telemetry-utils/internal';
import { BTree } from '@tylerbu/sorted-btree-es6';
// eslint-disable-next-line import-x/no-internal-modules
import { diffAgainst } from '@tylerbu/sorted-btree-es6/extended/diffAgainst';
Expand Down Expand Up @@ -385,7 +385,7 @@ export class IdCompressor {
compareFiniteNumbers
);

private readonly logger: ITelemetryLoggerExt;
private readonly logger: TelemetryLoggerExt;

/**
* @param localSessionId - the `IdCompressor`'s current local session ID.
Expand Down
4 changes: 2 additions & 2 deletions packages/dds/merge-tree/src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/
import { toDeltaManagerInternal } from "@fluidframework/runtime-utils/internal";
import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
LoggingError,
UsageError,
} from "@fluidframework/telemetry-utils/internal";
Expand Down Expand Up @@ -193,7 +193,7 @@ export class Client extends TypedEventEmitter<IClientEvents> {
*/
constructor(
public readonly specToSegment: (spec: IJSONSegment) => ISegment,
public readonly logger: ITelemetryLoggerExt,
public readonly logger: TelemetryLoggerExt,
options?: IMergeTreeOptionsInternal & PropertySet,
private readonly getMinInFlightRefSeq: () => number | undefined = (): undefined =>
undefined,
Expand Down
8 changes: 4 additions & 4 deletions packages/dds/merge-tree/src/snapshotChunks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import type { IFluidHandle } from "@fluidframework/core-interfaces";
import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
import type { TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";

import type { SerializedAttributionCollection } from "./attributionCollection.js";
import type { IJSONSegment } from "./ops.js";
Expand Down Expand Up @@ -85,7 +85,7 @@ export function hasMergeInfo(
export function serializeAsMinSupportedVersion(
path: string,
chunk: VersionedMergeTreeChunk,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
options: PropertySet | undefined,
serializer: IFluidSerializer,
bind: IFluidHandle,
Expand Down Expand Up @@ -141,7 +141,7 @@ export function serializeAsMinSupportedVersion(
export function serializeAsMaxSupportedVersion(
path: string,
chunk: VersionedMergeTreeChunk,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
options: PropertySet | undefined,
serializer: IFluidSerializer,
bind: IFluidHandle,
Expand All @@ -153,7 +153,7 @@ export function serializeAsMaxSupportedVersion(
export function toLatestVersion(
path: string,
chunk: VersionedMergeTreeChunk,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
options: PropertySet | undefined,
): MergeTreeChunkV1 {
switch (chunk.version) {
Expand Down
6 changes: 3 additions & 3 deletions packages/dds/merge-tree/src/snapshotLoader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import type {
import type { ISequencedDocumentMessage } from "@fluidframework/driver-definitions/internal";
import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
UsageError,
createChildLogger,
} from "@fluidframework/telemetry-utils/internal";
Expand Down Expand Up @@ -43,14 +43,14 @@ import type { RemoveOperationStamp } from "./stamps.js";
import * as opstampUtils from "./stamps.js";

export class SnapshotLoader {
private readonly logger: ITelemetryLoggerExt;
private readonly logger: TelemetryLoggerExt;

constructor(
private readonly runtime: IFluidDataStoreRuntime,

private readonly client: Client,
private readonly mergeTree: MergeTree,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
private readonly serializer: IFluidSerializer,
) {
this.logger = createChildLogger({ logger, namespace: "SnapshotLoader" });
Expand Down
10 changes: 5 additions & 5 deletions packages/dds/merge-tree/src/snapshotV1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
createChildLogger,
} from "@fluidframework/telemetry-utils/internal";

Expand Down Expand Up @@ -52,12 +52,12 @@ export class SnapshotV1 {
private readonly segments: JsonSegmentSpecs[];
private readonly segmentLengths: number[];
private readonly attributionCollections: IAttributionCollection<AttributionKey>[];
private readonly logger: ITelemetryLoggerExt;
private readonly logger: TelemetryLoggerExt;
private readonly chunkSize: number;

constructor(
public mergeTree: MergeTree,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
private readonly getLongClientId: (id: number) => string,
public filename?: string,
public onCompletion?: () => void,
Expand Down Expand Up @@ -367,7 +367,7 @@ export class SnapshotV1 {
public static async loadChunk(
storage: IChannelStorageService,
path: string,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
options: PropertySet | undefined,
serializer?: IFluidSerializer,
): Promise<MergeTreeChunkV1> {
Expand All @@ -379,7 +379,7 @@ export class SnapshotV1 {
public static processChunk(
path: string,
chunk: string,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
options: PropertySet | undefined,
serializer?: IFluidSerializer,
): MergeTreeChunkV1 {
Expand Down
6 changes: 3 additions & 3 deletions packages/dds/merge-tree/src/snapshotlegacy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import type { ISummaryTreeWithStats } from "@fluidframework/runtime-definitions/
import { SummaryTreeBuilder } from "@fluidframework/runtime-utils/internal";
import type { IFluidSerializer } from "@fluidframework/shared-object-base/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
createChildLogger,
} from "@fluidframework/telemetry-utils/internal";

Expand Down Expand Up @@ -57,12 +57,12 @@ export class SnapshotLegacy {
private header: SnapshotHeader | undefined;
private seq: number | undefined;
private segments: ISegmentPrivate[] | undefined;
private readonly logger: ITelemetryLoggerExt;
private readonly logger: TelemetryLoggerExt;
private readonly chunkSize: number;

constructor(
public mergeTree: MergeTree,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
public filename?: string,
public onCompletion?: () => void,
) {
Expand Down
4 changes: 2 additions & 2 deletions packages/dds/tree/src/shared-tree-core/editManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { assert, fail } from "@fluidframework/core-utils/internal";
import type { SessionId } from "@fluidframework/id-compressor";
import {
TelemetryEventBatcher,
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
} from "@fluidframework/telemetry-utils/internal";
import { BTree } from "@tylerbu/sorted-btree-es6";

Expand Down Expand Up @@ -123,7 +123,7 @@ export class EditManager<
public readonly localSessionId: SessionId,
private readonly mintRevisionTag: () => RevisionTag,
private readonly onSharedBranchCreated?: (branchId: BranchId) => void,
logger?: ITelemetryLoggerExt,
logger?: TelemetryLoggerExt,
) {
this.trunkBase = {
revision: rootRevision,
Expand Down
7 changes: 2 additions & 5 deletions packages/dds/tree/src/shared-tree/sharedTree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ import type {
IFluidSerializer,
SharedKernel,
} from "@fluidframework/shared-object-base/internal";
import {
UsageError,
type ITelemetryLoggerExt,
} from "@fluidframework/telemetry-utils/internal";
import { UsageError, type TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";

import {
type CodecTree,
Expand Down Expand Up @@ -201,7 +198,7 @@ export class SharedTreeKernel
submitLocalMessage: (content: unknown, localOpMetadata?: unknown) => void,
lastSequenceNumber: () => number | undefined,
initialSequenceNumber: number,
private readonly logger: ITelemetryLoggerExt | undefined,
private readonly logger: TelemetryLoggerExt | undefined,
idCompressor: IIdCompressor,
optionsParam: SharedTreeOptionsInternal,
) {
Expand Down
9 changes: 3 additions & 6 deletions packages/dds/tree/src/shared-tree/treeCheckout.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@ import type { IFluidHandle, Listenable } from "@fluidframework/core-interfaces/i
import { assert, unreachableCase, fail } from "@fluidframework/core-utils/internal";
import type { IIdCompressor, SessionId } from "@fluidframework/id-compressor";
import { isStableId } from "@fluidframework/id-compressor/internal";
import {
UsageError,
type ITelemetryLoggerExt,
} from "@fluidframework/telemetry-utils/internal";
import { UsageError, type TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";

import {
FluidClientVersion,
Expand Down Expand Up @@ -309,7 +306,7 @@ export function createTreeCheckout(
fieldBatchCodec?: FieldBatchCodec;
removedRoots?: DetachedFieldIndex;
chunkCompressionStrategy?: TreeCompressionStrategy;
logger?: ITelemetryLoggerExt;
logger?: TelemetryLoggerExt;
breaker?: Breakable;
disposeForksAfterTransaction?: boolean;
codecOptions?: Partial<CodecWriteOptions>;
Expand Down Expand Up @@ -528,7 +525,7 @@ export class TreeCheckout implements ITreeCheckout {
idCompressor,
),
/** Optional logger for telemetry. */
private readonly logger?: ITelemetryLoggerExt,
private readonly logger?: TelemetryLoggerExt,
public readonly breaker: Breakable = new Breakable("TreeCheckout"),
public readonly disposeForksAfterTransaction = true,
) {
Expand Down
10 changes: 5 additions & 5 deletions packages/drivers/odsp-driver/src/createFile/createFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
type IOdspUrlParts,
} from "@fluidframework/odsp-driver-definitions/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
loggerToMonitoringContext,
PerformanceEvent,
} from "@fluidframework/telemetry-utils/internal";
Expand Down Expand Up @@ -55,7 +55,7 @@ const isInvalidFileName = (fileName: string): boolean => {
export async function createNewFluidFile(
getAuthHeader: InstrumentedStorageTokenFetcher,
newFileInfo: INewFileInfo,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
createNewSummary: ISummaryTree | undefined,
epochTracker: EpochTracker,
fileEntry: IFileEntry,
Expand Down Expand Up @@ -204,7 +204,7 @@ function encodeFilePath(path: string | undefined): string {
export async function createNewEmptyFluidFile(
getAuthHeader: InstrumentedStorageTokenFetcher,
newFileInfo: INewFileInfo,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
epochTracker: EpochTracker,
): Promise<{ itemId: string; fileName: string }> {
const filePath = encodeFilePath(newFileInfo.filePath);
Expand Down Expand Up @@ -272,7 +272,7 @@ export async function renameEmptyFluidFile(
getAuthHeader: InstrumentedStorageTokenFetcher,
odspParts: IOdspUrlParts,
requestedFileName: string,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
epochTracker: EpochTracker,
): Promise<IRenameFileResponse> {
const initialUrl = `${getApiRoot(new URL(odspParts.siteUrl))}/drives/${
Expand Down Expand Up @@ -332,7 +332,7 @@ export async function renameEmptyFluidFile(
export async function createNewFluidFileFromSummary(
getAuthHeader: InstrumentedStorageTokenFetcher,
newFileInfo: INewFileInfo,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
createNewSummary: ISummaryTree,
epochTracker: EpochTracker,
forceAccessTokenViaAuthorizationHeader: boolean,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
InstrumentedStorageTokenFetcher,
} from "@fluidframework/odsp-driver-definitions/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
loggerToMonitoringContext,
} from "@fluidframework/telemetry-utils/internal";

Expand Down Expand Up @@ -46,7 +46,7 @@ import {
export async function createNewContainerOnExistingFile(
getAuthHeader: InstrumentedStorageTokenFetcher,
fileInfo: IExistingFileInfo,
logger: ITelemetryLoggerExt,
logger: TelemetryLoggerExt,
createNewSummary: ISummaryTree | undefined,
epochTracker: EpochTracker,
fileEntry: IFileEntry,
Expand Down
4 changes: 2 additions & 2 deletions packages/drivers/odsp-driver/src/createFile/createNewUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from "@fluidframework/driver-utils/internal";
import type { InstrumentedStorageTokenFetcher } from "@fluidframework/odsp-driver-definitions/internal";
import {
type ITelemetryLoggerExt,
type TelemetryLoggerExt,
PerformanceEvent,
} from "@fluidframework/telemetry-utils/internal";
import { v4 as uuid } from "uuid";
Expand Down Expand Up @@ -205,7 +205,7 @@ function convertSummaryToSnapshotTreeForCreateNew(summary: ISummaryTree): IOdspS
export async function createNewFluidContainerCore<T>(args: {
containerSnapshot: IOdspSummaryPayload;
getAuthHeader: InstrumentedStorageTokenFetcher;
logger: ITelemetryLoggerExt;
logger: TelemetryLoggerExt;
initialUrl: string;
forceAccessTokenViaAuthorizationHeader: boolean;
epochTracker: EpochTracker;
Expand Down
4 changes: 2 additions & 2 deletions packages/drivers/odsp-driver/src/createFile/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Licensed under the MIT License.
*/

import type { ITelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";
import type { TelemetryLoggerExt } from "@fluidframework/telemetry-utils/internal";

export async function useCreateNewModule<T = void>(
odspLogger: ITelemetryLoggerExt,
odspLogger: TelemetryLoggerExt,
func: (
// eslint-disable-next-line @typescript-eslint/consistent-type-imports
m: typeof import("./createNewModule.js") /* webpackChunkName: "createNewModule" */,
Expand Down
Loading
Loading