From 4fe9875ab6fd8d7345468e8a53243b4580b40919 Mon Sep 17 00:00:00 2001 From: blueww Date: Mon, 11 Nov 2024 16:20:13 +0800 Subject: [PATCH] temp change for develop options --- AzuriteConfig | 1 - package-lock.json | 76 ++++++++++++++++++++--------------------- src/common/Telemetry.ts | 24 +++++++------ 3 files changed, 52 insertions(+), 49 deletions(-) delete mode 100644 AzuriteConfig diff --git a/AzuriteConfig b/AzuriteConfig deleted file mode 100644 index 0aef8f817..000000000 --- a/AzuriteConfig +++ /dev/null @@ -1 +0,0 @@ -ae2f0534-73cc-4b19-b990-ceb853d2771f \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 363922818..51f3105fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3639,27 +3639,6 @@ "url": "https://github.com/chalk/strip-ansi?sponsor=1" } }, - "node_modules/cls-hooked": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", - "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", - "dependencies": { - "async-hook-jl": "^1.7.6", - "emitter-listener": "^1.0.1", - "semver": "^5.4.1" - }, - "engines": { - "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1" - } - }, - "node_modules/cls-hooked/node_modules/semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "bin": { - "semver": "bin/semver" - } - }, "node_modules/cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -3692,6 +3671,27 @@ "node": ">=8" } }, + "node_modules/cls-hooked": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", + "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", + "dependencies": { + "async-hook-jl": "^1.7.6", + "emitter-listener": "^1.0.1", + "semver": "^5.4.1" + }, + "engines": { + "node": "^4.7 || >=6.9 || >=7.3 || >=8.2.1" + } + }, + "node_modules/cls-hooked/node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", @@ -13592,23 +13592,6 @@ } } }, - "cls-hooked": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", - "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", - "requires": { - "async-hook-jl": "^1.7.6", - "emitter-listener": "^1.0.1", - "semver": "^5.4.1" - }, - "dependencies": { - "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" - } - } - }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -13637,6 +13620,23 @@ } } }, + "cls-hooked": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/cls-hooked/-/cls-hooked-4.2.2.tgz", + "integrity": "sha512-J4Xj5f5wq/4jAvcdgoGsL3G103BtWpZrMo8NEinRltN+xpTZdI+M38pyQqhuFU/P792xkMFvnKSf+Lm81U1bxw==", + "requires": { + "async-hook-jl": "^1.7.6", + "emitter-listener": "^1.0.1", + "semver": "^5.4.1" + }, + "dependencies": { + "semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==" + } + } + }, "color": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", diff --git a/src/common/Telemetry.ts b/src/common/Telemetry.ts index 79c20c857..ed0ba4709 100644 --- a/src/common/Telemetry.ts +++ b/src/common/Telemetry.ts @@ -92,7 +92,7 @@ export class AzuriteTelemetryClient { const ConnectionString = 'InstrumentationKey=feb4ae36-1db7-4808-abaa-e0b94996d665;IngestionEndpoint=https://eastus2-3.in.applicationinsights.azure.com/;LiveEndpoint=https://eastus2.livediagnostics.monitor.azure.com/;ApplicationId=9af871a3-75b5-417c-8a2f-7f2eb1ba6a6c'; // disable default logging - var appConfig = AzuriteTelemetryClient.appInsights.setup(ConnectionString); + let appConfig = AzuriteTelemetryClient.appInsights.setup(ConnectionString); appConfig.setAutoCollectRequests(false) .setAutoCollectPerformance(false) .setAutoCollectExceptions(false) @@ -102,7 +102,7 @@ export class AzuriteTelemetryClient { .setAutoCollectConsole(false); // Remove some default telemetry item in the telemetry envelope - var telemetryClient = new AzuriteTelemetryClient.appInsights.TelemetryClient(ConnectionString); + let telemetryClient = new AzuriteTelemetryClient.appInsights.TelemetryClient(ConnectionString); telemetryClient.addTelemetryProcessor(AzuriteTelemetryClient.removeRoleInstance); //appInsights.start(); @@ -115,8 +115,12 @@ export class AzuriteTelemetryClient { telemetryClient.config.samplingPercentage = samplingPercentage??100; // For development only, make your telemetry to be sent as soon as it's collected. - appConfig.setInternalLogging(true, true); - //telemetryClient.config.maxBatchSize = maxBatchSize??0; + // Enable AppInsight log, should enable in develoipment only + // appConfig.setInternalLogging(true, true); + if (maxBatchSize !== undefined) + { + telemetryClient.config.maxBatchSize = maxBatchSize??0; + } return telemetryClient; } @@ -273,9 +277,9 @@ export class AzuriteTelemetryClient { { instanceID: AzuriteTelemetryClient.instanceID, sessionID: AzuriteTelemetryClient.sessionID, - blobRegCount: AzuriteTelemetryClient._totalBlobRequestCount, - queueRegCount: AzuriteTelemetryClient._totalQueueRequestCount, - tableRegCount: AzuriteTelemetryClient._totalTableRequestCount, + blobRequest: AzuriteTelemetryClient._totalBlobRequestCount, + queueRequest: AzuriteTelemetryClient._totalQueueRequestCount, + tableRequest: AzuriteTelemetryClient._totalTableRequestCount, } }); } @@ -329,7 +333,7 @@ export class AzuriteTelemetryClient { } else{ - var data = fs.readFileSync(configFilePath, 'utf8'); + let data = fs.readFileSync(configFilePath, 'utf8'); instaceID = data.toString(); if(instaceID === "") { @@ -366,11 +370,11 @@ export class AzuriteTelemetryClient { { if (sigQuery !== undefined) { - auth = "Sas"; + return "Sas"; } else { - auth = "Anonymous"; + return "Anonymous"; } } return auth;