Skip to content

Add replica count tracing #141

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

Merged
merged 6 commits into from
Dec 13, 2024
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
175 changes: 88 additions & 87 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions src/AzureAppConfigurationImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import {
} from "./featureManagement/constants.js";
import { AzureKeyVaultKeyValueAdapter } from "./keyvault/AzureKeyVaultKeyValueAdapter.js";
import { RefreshTimer } from "./refresh/RefreshTimer.js";
import { getConfigurationSettingWithTrace, listConfigurationSettingsWithTrace, requestTracingEnabled } from "./requestTracing/utils.js";
import { RequestTracingOptions, getConfigurationSettingWithTrace, listConfigurationSettingsWithTrace, requestTracingEnabled } from "./requestTracing/utils.js";
import { KeyFilter, LabelFilter, SettingSelector } from "./types.js";
import { ConfigurationClientManager } from "./ConfigurationClientManager.js";

Expand Down Expand Up @@ -197,11 +197,12 @@ export class AzureAppConfigurationImpl implements AzureAppConfiguration {
return this.#featureFlagEnabled && !!this.#options?.featureFlagOptions?.refresh?.enabled;
}

get #requestTraceOptions() {
get #requestTraceOptions(): RequestTracingOptions {
return {
requestTracingEnabled: this.#requestTracingEnabled,
initialLoadCompleted: this.#isInitialLoadCompleted,
enabled: this.#requestTracingEnabled,
appConfigOptions: this.#options,
initialLoadCompleted: this.#isInitialLoadCompleted,
replicaCount: this.#clientManager.getReplicaCount(),
isFailoverRequest: this.#isFailoverRequest
};
}
Expand Down
10 changes: 8 additions & 2 deletions src/ConfigurationClientManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,9 @@ export class ConfigurationClientManager {
#clientOptions: AppConfigurationClientOptions | undefined;
#appConfigOptions: AzureAppConfigurationOptions | undefined;
#validDomain: string;
#staticClients: ConfigurationClientWrapper[];
#staticClients: ConfigurationClientWrapper[]; // there should always be only one static client
#dynamicClients: ConfigurationClientWrapper[];
#replicaCount: number = 0;
#lastFallbackClientRefreshTime: number = 0;
#lastFallbackClientRefreshAttempt: number = 0;

Expand Down Expand Up @@ -96,7 +97,11 @@ export class ConfigurationClientManager {
this.#isFailoverable = true;
}

async getClients() : Promise<ConfigurationClientWrapper[]> {
getReplicaCount(): number {
return this.#replicaCount;
}

async getClients(): Promise<ConfigurationClientWrapper[]> {
if (!this.#isFailoverable) {
return this.#staticClients;
}
Expand Down Expand Up @@ -161,6 +166,7 @@ export class ConfigurationClientManager {

this.#dynamicClients = newDynamicClients;
this.#lastFallbackClientRefreshTime = Date.now();
this.#replicaCount = this.#dynamicClients.length;
}

/**
Expand Down
10 changes: 7 additions & 3 deletions src/requestTracing/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,20 @@ export const CONTAINER_APP_ENV_VAR = "CONTAINER_APP_NAME";
export const KUBERNETES_ENV_VAR = "KUBERNETES_PORT";
export const SERVICE_FABRIC_ENV_VAR = "Fabric_NodeName"; // See: https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-environment-variables-reference

// Request Type
// Request type
export const REQUEST_TYPE_KEY = "RequestType";
export enum RequestType {
STARTUP = "Startup",
WATCH = "Watch"
}

export const FEATURES_KEY = "Features";
// Replica count
export const REPLICA_COUNT_KEY = "ReplicaCount";

// Tag names
export const FAILOVER_REQUEST_TAG = "Failover";
export const KEY_VAULT_CONFIGURED_TAG = "UsesKeyVault";
export const FAILOVER_REQUEST_TAG = "Failover";

// Compact feature tags
export const FEATURES_KEY = "Features";
export const LOAD_BALANCE_CONFIGURED_TAG = "LB";
Loading
Loading