Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated summarizeProtocolTree option #23319

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
10 changes: 5 additions & 5 deletions packages/loader/container-loader/src/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
isFluidCodeDetails,
IDeltaManager,
ReadOnlyInfo,
ILoaderOptions,
type ILoader,
} from "@fluidframework/container-definitions/internal";
import {
Expand Down Expand Up @@ -124,7 +125,7 @@ import {
} from "./contracts.js";
import { DeltaManager, IConnectionArgs } from "./deltaManager.js";
// eslint-disable-next-line import/no-deprecated
import { IDetachedBlobStorage, ILoaderOptions, RelativeLoader } from "./loader.js";
import { IDetachedBlobStorage, RelativeLoader } from "./loader.js";
import {
serializeMemoryDetachedBlobStorage,
createMemoryDetachedBlobStorage,
Expand Down Expand Up @@ -221,7 +222,6 @@ export interface IContainerCreateProps {
* A property bag of options used by various layers
* to control features
*/
// eslint-disable-next-line import/no-deprecated
readonly options: ILoaderOptions;

/**
Expand Down Expand Up @@ -990,9 +990,9 @@ export class Container
: combineAppAndProtocolSummary(summaryTree, this.captureProtocolSummary());

// Whether the combined summary tree has been forced on by either the supportedFeatures flag by the service or the the loader option or the monitoring context
const enableSummarizeProtocolTree =
this.mc.config.getBoolean("Fluid.Container.summarizeProtocolTree2") ??
options.summarizeProtocolTree;
const enableSummarizeProtocolTree = this.mc.config.getBoolean(
"Fluid.Container.summarizeProtocolTree2",
);

this.detachedBlobStorage =
detachedBlobStorage ??
Expand Down
1 change: 0 additions & 1 deletion packages/loader/container-loader/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ export {
ICodeDetailsLoader,
IDetachedBlobStorage,
IFluidModuleWithDetails,
ILoaderOptions,
ILoaderProps,
ILoaderServices,
Loader,
Expand Down
17 changes: 1 addition & 16 deletions packages/loader/container-loader/src/loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
IFluidModule,
IHostLoader,
ILoader,
ILoaderOptions as ILoaderOptions1,
ILoaderOptions,
IProvideFluidCodeDetailsComparer,
LoaderHeader,
} from "@fluidframework/container-definitions/internal";
Expand Down Expand Up @@ -90,21 +90,6 @@ export class RelativeLoader implements ILoader {
}
}

/**
* @legacy
* @alpha
* @deprecated Use {@link @fluidframework/container-definitions#ILoaderOptions} instead
*/
export interface ILoaderOptions extends ILoaderOptions1 {
/**
*
* @deprecated No longer needed or used (initially introduced to test single-commit summaries).
* Driver layer can enable single-commit summaries via document service policies if needed.
* ADO #9098: To remove declaration and usage from code.
*/
summarizeProtocolTree?: boolean;
}

/**
* @deprecated IFluidModuleWithDetails interface is moved to
* {@link @fluidframework/container-definitions#IFluidModuleWithDetails}
Expand Down
5 changes: 1 addition & 4 deletions packages/test/test-service-load/src/optionsMatrix.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import {
generatePairwiseOptions,
numberCases,
} from "@fluid-private/test-pairwise-generator";
// eslint-disable-next-line import/no-deprecated
import { ILoaderOptions } from "@fluidframework/container-loader/internal";
import { ILoaderOptions } from "@fluidframework/container-definitions/internal";
import {
CompressionAlgorithms,
IContainerRuntimeOptions,
Expand All @@ -23,7 +22,6 @@ import { LoggingError } from "@fluidframework/telemetry-utils/internal";

import type { OptionOverride, TestConfiguration } from "./testConfigFile.js";

// eslint-disable-next-line import/no-deprecated
interface ILoaderOptionsExperimental extends ILoaderOptions {
enableOfflineSnapshotRefresh?: boolean;
snapshotRefreshTimeoutMs?: number;
Expand All @@ -34,7 +32,6 @@ const loaderOptionsMatrix: OptionsMatrix<ILoaderOptionsExperimental> = {
client: [undefined],
provideScopeLoader: booleanCases,
maxClientLeaveWaitTime: numberCases,
summarizeProtocolTree: [undefined],
enableOfflineLoad: booleanCases,
enableOfflineSnapshotRefresh: booleanCases,
snapshotRefreshTimeoutMs: [undefined, 60 * 5 * 1000 /* 5min */],
Expand Down
2 changes: 1 addition & 1 deletion packages/tools/replay-tool/src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { strict } from "assert";
import fs from "fs";

import { IContainer } from "@fluidframework/container-definitions/internal";
import { ILoaderOptions, Loader } from "@fluidframework/container-loader/internal";
import { ILoaderOptions, Loader } from "@fluidframework/container-definitions/internal";
import {
ContainerRuntime,
IContainerRuntimeOptions,
Expand Down
Loading