From 7e252e4fa81b6b39811552994be32fd67458d28c Mon Sep 17 00:00:00 2001 From: Zhiyuan Liang Date: Mon, 4 Nov 2024 17:04:14 +0800 Subject: [PATCH] Revert "add requestTracingOptions (#114)" This reverts commit e4421ec3f68889b8ff04c0c206f8edab2a984281. --- src/AzureAppConfigurationImpl.ts | 2 +- src/AzureAppConfigurationOptions.ts | 6 ------ src/requestTracing/RequestTracingOptions.ts | 12 ------------ test/requestTracing.test.ts | 14 -------------- 4 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/requestTracing/RequestTracingOptions.ts diff --git a/src/AzureAppConfigurationImpl.ts b/src/AzureAppConfigurationImpl.ts index 3d5bc211..1bbf0779 100644 --- a/src/AzureAppConfigurationImpl.ts +++ b/src/AzureAppConfigurationImpl.ts @@ -63,7 +63,7 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration { this.#options = options; // Enable request tracing if not opt-out - this.#requestTracingEnabled = options?.requestTracingOptions?.enabled ?? requestTracingEnabled(); + this.#requestTracingEnabled = requestTracingEnabled(); if (options?.trimKeyPrefixes) { this.#sortedTrimKeyPrefixes = [...options.trimKeyPrefixes].sort((a, b) => b.localeCompare(a)); diff --git a/src/AzureAppConfigurationOptions.ts b/src/AzureAppConfigurationOptions.ts index a9df321d..f88ad67c 100644 --- a/src/AzureAppConfigurationOptions.ts +++ b/src/AzureAppConfigurationOptions.ts @@ -6,7 +6,6 @@ import { KeyVaultOptions } from "./keyvault/KeyVaultOptions.js"; import { RefreshOptions } from "./RefreshOptions.js"; import { SettingSelector } from "./types.js"; import { FeatureFlagOptions } from "./featureManagement/FeatureFlagOptions.js"; -import { RequestTracingOptions } from "./requestTracing/RequestTracingOptions.js"; export const MaxRetries = 2; export const MaxRetryDelayInMs = 60000; @@ -48,9 +47,4 @@ export interface AzureAppConfigurationOptions { * Specifies options used to configure feature flags. */ featureFlagOptions?: FeatureFlagOptions; - - /** - * Specifies options used to configure request tracing. - */ - requestTracingOptions?: RequestTracingOptions; } diff --git a/src/requestTracing/RequestTracingOptions.ts b/src/requestTracing/RequestTracingOptions.ts deleted file mode 100644 index 016da0cd..00000000 --- a/src/requestTracing/RequestTracingOptions.ts +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -/** - * Options used to configure request tracing. - */ -export interface RequestTracingOptions { - /** - * Specifies whether request tracing is enabled. - */ - enabled: boolean; -} diff --git a/test/requestTracing.test.ts b/test/requestTracing.test.ts index a08ffa8b..d4e7edcf 100644 --- a/test/requestTracing.test.ts +++ b/test/requestTracing.test.ts @@ -122,20 +122,6 @@ describe("request tracing", function () { delete process.env.AZURE_APP_CONFIGURATION_TRACING_DISABLED; }); - it("should disable request tracing by RequestTracingOptions", async () => { - try { - await load(createMockedConnectionString(fakeEndpoint), { - clientOptions, - requestTracingOptions: { - enabled: false - } - }); - } catch (e) { /* empty */ } - expect(headerPolicy.headers).not.undefined; - const correlationContext = headerPolicy.headers.get("Correlation-Context"); - expect(correlationContext).undefined; - }); - it("should have request type in correlation-context header when refresh is enabled", async () => { mockAppConfigurationClientListConfigurationSettings([{ key: "app.settings.fontColor",