From 94292d81a1d72e329091d0a4be86f5b6c7fc7add Mon Sep 17 00:00:00 2001 From: Tong Chen <114451900+chentong7@users.noreply.github.com> Date: Fri, 4 Oct 2024 22:29:03 +0000 Subject: [PATCH] update PR --- .../appInsightsCustomBenchmarkHandler.ts | 2 +- .../appInsightsExecutionTimeTestHandler.ts | 21 +++++++++++-------- .../appInsightsMemoryUsageTestHandler.ts | 16 +++++++------- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/tools/telemetry-generator/src/handlers/appInsightsCustomBenchmarkHandler.ts b/tools/telemetry-generator/src/handlers/appInsightsCustomBenchmarkHandler.ts index 9729195d0a83..36ec176f91ba 100644 --- a/tools/telemetry-generator/src/handlers/appInsightsCustomBenchmarkHandler.ts +++ b/tools/telemetry-generator/src/handlers/appInsightsCustomBenchmarkHandler.ts @@ -35,7 +35,7 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v }, }); } catch (error) { - console.error(`failed to emit metric ${customDataName}`, error); + console.error(`failed to emit metric '${customDataName}'`, error); } } } diff --git a/tools/telemetry-generator/src/handlers/appInsightsExecutionTimeTestHandler.ts b/tools/telemetry-generator/src/handlers/appInsightsExecutionTimeTestHandler.ts index 22b8d40d8e09..340c22b09452 100644 --- a/tools/telemetry-generator/src/handlers/appInsightsExecutionTimeTestHandler.ts +++ b/tools/telemetry-generator/src/handlers/appInsightsExecutionTimeTestHandler.ts @@ -15,12 +15,12 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v const arithmeticMeanMetricName = `${fileData.suiteName}_${testData.benchmarkName}_arithmeticMean`; try { const value = testData.customData["Period (ns/op)"]; - if (isNaN(value)) { - console.error(`skipping metric ${arithmeticMeanMetricName} with value ${value} as it is not a number`); + if (Number.isNaN(Number.parseFloat(value))) { + console.error(`skipping metric '${arithmeticMeanMetricName}' with value '${value}' as it is not a number`); continue; } console.log( - `emitting metric ${arithmeticMeanMetricName} with value ${value}`, + `emitting metric '${arithmeticMeanMetricName}' with value '${value}'`, ); telemetryClient.trackMetric({ name: arithmeticMeanMetricName, @@ -38,18 +38,21 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v }, }); } catch (error) { - console.error(`failed to emit metric ${arithmeticMeanMetricName}`, error); + console.error(`failed to emit metric '${arithmeticMeanMetricName}'`, error); } const marginOfErrorMetricName = `${fileData.suiteName}_${testData.benchmarkName}_marginOfError`; try { - const value = testData.customData["Margin of Error"]; - if (isNaN(value)) { - console.error(`skipping metric ${marginOfErrorMetricName} with value ${value} as it is not a number`); + let value = testData.customData["Margin of Error"]; + value = value.replace('±', ''); + const parsedValue = Number.parseFloat(value); + + if (Number.isNaN(Number.parseFloat(parsedValue))) { + console.error(`skipping metric '${marginOfErrorMetricName}' with value '${value}' as it is not a number`); continue; } console.log( - `emitting metric ${arithmeticMeanMetricName} with value ${value}`, + `emitting metric '${arithmeticMeanMetricName}' with value '${value}'`, ); telemetryClient.trackMetric({ name: marginOfErrorMetricName, @@ -66,7 +69,7 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v }, }); } catch (error) { - console.error(`failed to emit metric ${marginOfErrorMetricName}`, error); + console.error(`failed to emit metric '${marginOfErrorMetricName}'`, error); } } }; diff --git a/tools/telemetry-generator/src/handlers/appInsightsMemoryUsageTestHandler.ts b/tools/telemetry-generator/src/handlers/appInsightsMemoryUsageTestHandler.ts index 84f62305945b..787d4748e21a 100644 --- a/tools/telemetry-generator/src/handlers/appInsightsMemoryUsageTestHandler.ts +++ b/tools/telemetry-generator/src/handlers/appInsightsMemoryUsageTestHandler.ts @@ -15,12 +15,12 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v const heapUsedAvgMetricName = `${fileData.suiteName}_${testData.benchmarkName}_heapUsedAvg`; try { const value = testData.customData["Heap Used Avg"]; - if (isNaN(value)) { - console.error(`skipping metric ${heapUsedAvgMetricName} with value ${value} as it is not a number`); + if (Number.isNaN(Number.parseFloat(value))) { + console.error(`skipping metric '${heapUsedAvgMetricName}' with value '${value}' as it is not a number`); continue; } console.log( - `emitting metric ${heapUsedAvgMetricName} with value ${value}`, + `emitting metric '${heapUsedAvgMetricName}' with value '${value}'`, ); telemetryClient.trackMetric({ name: heapUsedAvgMetricName, @@ -37,18 +37,18 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v }, }); } catch (error) { - console.error(`failed to emit metric ${heapUsedAvgMetricName}`, error); + console.error(`failed to emit metric '${heapUsedAvgMetricName}'`, error); } const heapUsedStdDevMetricName = `${fileData.suiteName}_${testData.benchmarkName}_heapUsedStdDev`; try { const value = testData.customData["Heap Used StdDev"]; - if (isNaN(value)) { - console.error(`skipping metric ${heapUsedStdDevMetricName} with value ${value} as it is not a number`); + if (Number.isNaN(Number.parseFloat(value))) { + console.error(`skipping metric '${heapUsedStdDevMetricName}' with value '${value}' as it is not a number`); continue; } console.log( - `emitting metric ${heapUsedStdDevMetricName} with value ${value}`, + `emitting metric '${heapUsedStdDevMetricName}' with value '${value}'`, ); telemetryClient.trackMetric({ name: heapUsedStdDevMetricName, @@ -65,7 +65,7 @@ module.exports = function handler(fileData, telemetryClient: TelemetryClient): v }, }); } catch (error) { - console.error(`failed to emit metric ${heapUsedStdDevMetricName}`, error); + console.error(`failed to emit metric '${heapUsedStdDevMetricName}'`, error); } } };