@loadstrike/loadstrike-sdk 1.0.21401 → 1.0.22301

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OtelCollectorReportingSinkOptions = exports.OtelCollectorReportingSink = exports.InfluxDbReportingSinkOptions = exports.InfluxDbReportingSink = exports.GrafanaLokiReportingSinkOptions = exports.GrafanaLokiReportingSink = exports.DatadogReportingSinkOptions = exports.DatadogReportingSink = exports.HttpAuthOptions = exports.HttpOAuth2ClientCredentialsOptions = exports.PushDiffusionEndpointDefinition = exports.DelegateStreamEndpointDefinition = exports.AzureEventHubsEndpointDefinition = exports.RedisStreamsEndpointDefinition = exports.NatsEndpointDefinition = exports.RabbitMqEndpointDefinition = exports.KafkaSaslOptions = exports.KafkaEndpointDefinition = exports.HttpEndpointDefinition = exports.TrafficEndpointDefinition = exports.EndpointAdapterFactory = exports.TrackingFieldSelector = exports.TrackingPayloadBuilder = exports.RedisCorrelationStore = exports.RedisCorrelationStoreOptions = exports.InMemoryCorrelationStore = exports.CrossPlatformTrackingRuntime = exports.CorrelationStoreConfiguration = exports.LoadStrikeThreshold = exports.LoadStrikeStep = exports.LoadStrikeGauge = exports.LoadStrikeCounter = exports.LoadStrikeMetric = exports.LoadStrikeSimulation = exports.LoadStrikeScenario = exports.LoadStrikeRunner = exports.LoadStrikeOperationType = exports.LoadStrikeScenarioOperation = exports.LoadStrikeLogLevel = exports.LoadStrikeResponse = exports.LoadStrikeReportFormat = exports.LoadStrikeNodeType = exports.LoadStrikePluginDataTable = exports.LoadStrikePluginData = exports.LoadStrikeContext = exports.ScenarioTrackingExtensions = exports.CrossPlatformScenarioConfigurator = exports.LoadStrikeAutopilotReadiness = exports.LoadStrikeAutopilotResult = exports.LoadStrikeAutopilot = void 0;
-exports.TimescaleDbReportingSinkOptions = exports.TimescaleDbReportingSink = exports.SplunkReportingSinkOptions = exports.SplunkReportingSink = void 0;
+exports.InfluxDbReportingSinkOptions = exports.InfluxDbReportingSink = exports.GrafanaLokiReportingSinkOptions = exports.GrafanaLokiReportingSink = exports.DatadogReportingSinkOptions = exports.DatadogReportingSink = exports.HttpAuthOptions = exports.HttpOAuth2ClientCredentialsOptions = exports.PushDiffusionEndpointDefinition = exports.DelegateStreamEndpointDefinition = exports.AzureEventHubsEndpointDefinition = exports.RedisStreamsEndpointDefinition = exports.NatsEndpointDefinition = exports.RabbitMqEndpointDefinition = exports.KafkaSaslOptions = exports.KafkaEndpointDefinition = exports.HttpEndpointDefinition = exports.TrafficEndpointDefinition = exports.LOADSTRIKE_TRACE_ID_TRACKING_FIELD = exports.LOADSTRIKE_TRACE_ID_HEADER = exports.EndpointAdapterFactory = exports.TrackingFieldSelector = exports.TrackingPayloadBuilder = exports.RedisCorrelationStore = exports.RedisCorrelationStoreOptions = exports.InMemoryCorrelationStore = exports.CrossPlatformTrackingRuntime = exports.CorrelationStoreConfiguration = exports.LoadStrikeThreshold = exports.LoadStrikeStep = exports.LoadStrikeGauge = exports.LoadStrikeCounter = exports.LoadStrikeMetric = exports.LoadStrikeSimulation = exports.LoadStrikeScenario = exports.LoadStrikeRunner = exports.LoadStrikeOperationType = exports.LoadStrikeScenarioOperation = exports.LoadStrikeLogLevel = exports.LoadStrikeResponse = exports.LoadStrikeReportFormat = exports.LoadStrikeNodeType = exports.LoadStrikePluginDataTable = exports.LoadStrikePluginData = exports.LoadStrikeContext = exports.ScenarioTrackingExtensions = exports.CrossPlatformScenarioConfigurator = exports.LoadStrikeAutopilotReadiness = exports.LoadStrikeAutopilotResult = exports.LoadStrikeAutopilot = void 0;
+exports.TimescaleDbReportingSinkOptions = exports.TimescaleDbReportingSink = exports.SplunkReportingSinkOptions = exports.SplunkReportingSink = exports.OtelCollectorReportingSinkOptions = exports.OtelCollectorReportingSink = void 0;
 var autopilot_js_1 = require("./autopilot.js");
 Object.defineProperty(exports, "LoadStrikeAutopilot", { enumerable: true, get: function () { return autopilot_js_1.LoadStrikeAutopilot; } });
 Object.defineProperty(exports, "LoadStrikeAutopilotResult", { enumerable: true, get: function () { return autopilot_js_1.LoadStrikeAutopilotResult; } });
@@ -37,6 +37,8 @@ Object.defineProperty(exports, "TrackingPayloadBuilder", { enumerable: true, get
 Object.defineProperty(exports, "TrackingFieldSelector", { enumerable: true, get: function () { return correlation_js_1.TrackingFieldSelector; } });
 var transports_js_1 = require("./transports.js");
 Object.defineProperty(exports, "EndpointAdapterFactory", { enumerable: true, get: function () { return transports_js_1.EndpointAdapterFactory; } });
+Object.defineProperty(exports, "LOADSTRIKE_TRACE_ID_HEADER", { enumerable: true, get: function () { return transports_js_1.LOADSTRIKE_TRACE_ID_HEADER; } });
+Object.defineProperty(exports, "LOADSTRIKE_TRACE_ID_TRACKING_FIELD", { enumerable: true, get: function () { return transports_js_1.LOADSTRIKE_TRACE_ID_TRACKING_FIELD; } });
 Object.defineProperty(exports, "TrafficEndpointDefinition", { enumerable: true, get: function () { return transports_js_1.TrafficEndpointDefinition; } });
 Object.defineProperty(exports, "HttpEndpointDefinition", { enumerable: true, get: function () { return transports_js_1.HttpEndpointDefinition; } });
 Object.defineProperty(exports, "KafkaEndpointDefinition", { enumerable: true, get: function () { return transports_js_1.KafkaEndpointDefinition; } });

package/dist/cjs/local.js

@@ -850,10 +850,11 @@ async function evaluateScenarioOutcome(scenario, requestCount, context) {
     if (!Object.keys(sourceSpec).length) {
         return { requestCount, okCount: requestCount, failCount: 0 };
     }
-    const sourceEndpoint = mapEndpointSpec(sourceSpec);
+    const useLoadStrikeTraceIdHeader = toBoolean(pickValue(tracking, "UseLoadStrikeTraceIdHeader", "useLoadStrikeTraceIdHeader"), false);
+    const sourceEndpoint = mapEndpointSpec(sourceSpec, useLoadStrikeTraceIdHeader);
     const destinationSpec = asRecord(tracking.Destination);
     const hasDestination = Object.keys(destinationSpec).length > 0;
-    const destinationEndpoint = hasDestination ? mapEndpointSpec(destinationSpec) : null;
+    const destinationEndpoint = hasDestination ? mapEndpointSpec(destinationSpec, useLoadStrikeTraceIdHeader) : null;
     validateTrackingConfiguration(tracking, sourceEndpoint, destinationEndpoint);
     const sourceAdapter = transports_js_1.EndpointAdapterFactory.create(sourceEndpoint);
     const destinationAdapter = destinationEndpoint ? transports_js_1.EndpointAdapterFactory.create(destinationEndpoint) : null;
@@ -1109,7 +1110,7 @@ function inferLegacyHttpResponseSourceValue(value) {
             return undefined;
     }
 }
-function mapEndpointSpec(spec) {
+function mapEndpointSpec(spec, useLoadStrikeTraceIdHeader = false) {
     const pollIntervalOverride = pickValue(spec, "PollIntervalMs", "pollIntervalMs");
     const pollIntervalSeconds = pickValue(spec, "PollIntervalSeconds", "pollIntervalSeconds", "PollInterval");
     const pollIntervalMs = pollIntervalOverride != null && String(pollIntervalOverride).trim() !== ""
@@ -1142,7 +1143,7 @@ function mapEndpointSpec(spec) {
         kind: stringOrDefault(pickValue(spec, "Kind", "kind"), "DelegateStream"),
         mode: stringOrDefault(pickValue(spec, "Mode", "mode"), "Produce"),
         name: stringOrDefault(pickValue(spec, "Name", "name"), "endpoint"),
-        trackingField: readTrackingSelectorValue(pickValue(spec, "TrackingField", "trackingField"), "header:x-correlation-id"),
+        trackingField: readTrackingSelectorValue(pickValue(spec, "TrackingField", "trackingField"), useLoadStrikeTraceIdHeader ? transports_js_1.LOADSTRIKE_TRACE_ID_TRACKING_FIELD : "header:x-correlation-id"),
         gatherByField: readOptionalTrackingSelectorValue(pickValue(spec, "GatherByField", "gatherByField")),
         autoGenerateTrackingIdWhenMissing: toBoolean(pickValue(spec, "AutoGenerateTrackingIdWhenMissing", "autoGenerateTrackingIdWhenMissing"), true),
         pollIntervalMs,
@@ -1242,10 +1243,13 @@ function normalizePayload(payload, endpoint, index) {
         return normalized;
     }
     const existing = readTrackingId(normalized, selector);
-    if (existing || !endpoint.autoGenerateTrackingIdWhenMissing) {
+    const endpointMode = String(endpoint.mode ?? "Produce").trim().toLowerCase();
+    if (existing || endpointMode === "consume" || !endpoint.autoGenerateTrackingIdWhenMissing) {
         return normalized;
     }
-    const generated = `${endpoint.name}-auto-${index + 1}`;
+    const generated = selector.toLowerCase() === transports_js_1.LOADSTRIKE_TRACE_ID_TRACKING_FIELD
+        ? (0, node_crypto_1.randomUUID)()
+        : `${endpoint.name}-auto-${index + 1}`;
     if (selector.toLowerCase().startsWith("header:")) {
         const headerName = selector.slice("header:".length).trim();
         if (headerName) {

package/dist/cjs/reporting.js

@@ -51,6 +51,61 @@ function reportValue(source, ...keys) {
     }
     return undefined;
 }
+function reportDurationValue(source) {
+    return reportValue(source, "durationMs", "DurationMs", "duration", "Duration");
+}
+function reportBytesValue(source) {
+    return reportValue(source, "allBytes", "AllBytes", "totalBytes", "TotalBytes");
+}
+function reportTotalBytes(nodeStats, scenarios) {
+    const totalBytes = asInt(reportBytesValue(nodeStats));
+    if (totalBytes !== 0) {
+        return totalBytes;
+    }
+    return scenarios.reduce((sum, scenario) => sum + asInt(reportBytesValue(scenario)), 0);
+}
+function reportRequestCountValue(source) {
+    return asInt(reportValue(source, "allRequestCount", "AllRequestCount", "requestCount", "RequestCount"));
+}
+function reportOkCountValue(source) {
+    return asInt(reportValue(source, "allOkCount", "AllOkCount", "okCount", "OkCount"));
+}
+function reportFailCountValue(source) {
+    return asInt(reportValue(source, "allFailCount", "AllFailCount", "failCount", "FailCount"));
+}
+function reportTotalRequestCount(nodeStats, scenarios) {
+    const total = reportRequestCountValue(nodeStats);
+    return total !== 0 || scenarios.length === 0
+        ? total
+        : scenarios.reduce((sum, scenario) => sum + reportRequestCountValue(scenario), 0);
+}
+function reportTotalOkCount(nodeStats, scenarios) {
+    const total = reportOkCountValue(nodeStats);
+    return total !== 0 || scenarios.length === 0
+        ? total
+        : scenarios.reduce((sum, scenario) => sum + reportOkCountValue(scenario), 0);
+}
+function reportTotalFailCount(nodeStats, scenarios) {
+    const total = reportFailCountValue(nodeStats);
+    return total !== 0 || scenarios.length === 0
+        ? total
+        : scenarios.reduce((sum, scenario) => sum + reportFailCountValue(scenario), 0);
+}
+function reportScenarios(nodeStats) {
+    return sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"));
+}
+function reportSteps(scenario) {
+    return sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"));
+}
+function reportThresholds(nodeStats) {
+    return reportArray(nodeStats, "thresholds", "Thresholds", "thresholdResults", "ThresholdResults");
+}
+function reportMetrics(nodeStats) {
+    return reportObject(nodeStats, "metrics", "Metrics", "metricStats", "MetricStats");
+}
+function reportMetricName(source) {
+    return asString(reportValue(source, "metricName", "MetricName", "name", "Name"));
+}
 function reportObject(source, ...keys) {
     const value = reportValue(source, ...keys);
     return value && typeof value === "object" && !Array.isArray(value)
@@ -84,6 +139,16 @@ function asFloat(value) {
     const parsed = Number.parseFloat(asString(value));
     return Number.isFinite(parsed) ? parsed : 0;
 }
+function asBool(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return value !== 0;
+    }
+    const normalized = asString(value).trim().toLowerCase();
+    return normalized === "1" || normalized === "true" || normalized === "yes" || normalized === "y" || normalized === "on";
+}
 function formatCellValue(value) {
     if (value == null) {
         return "";
@@ -303,7 +368,7 @@ function buildDotnetTableHtml(rows, wrapInCard = true) {
     appendReportLine(parts, "<table>");
     appendReportLine(parts, "<thead><tr>");
     for (const header of headers) {
-        appendReportLine(parts, `<th>${escapeHtml(header)}</th>`);
+        appendReportLine(parts, `<th>${escapeHtml(formatReportTableHeader(header))}</th>`);
     }
     appendReportLine(parts, "</tr></thead><tbody>");
     for (const row of rows) {
@@ -319,6 +384,14 @@ function buildDotnetTableHtml(rows, wrapInCard = true) {
     }
     return parts.join("");
 }
+function formatReportTableHeader(header) {
+    if (header === "LatencyStdDev") {
+        return "LatencyStdDev (ms)";
+    }
+    return header.endsWith("Ms") && header.length > "Ms".length
+        ? `${header.slice(0, -"Ms".length)} (ms)`
+        : header;
+}
 function buildFailedStatusRows(scenarios) {
     const rows = [];
     for (const scenario of scenarios) {
@@ -341,7 +414,7 @@ function buildFailedStatusRows(scenarios) {
                 IsError: isError
             });
         }
-        for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+        for (const step of reportSteps(scenario)) {
             const stepName = asString(reportValue(step, "stepName", "StepName"));
             const stepFail = reportObject(step, "fail", "Fail");
             for (const code of reportArray(stepFail, "statusCodes", "StatusCodes")) {
@@ -593,6 +666,65 @@ function buildMeasurementRow(scope, scenarioName, stepName, resultName, measurem
         BytesStdDev: formatReportNumber(reportValue(dataTransfer, "stdDev", "StdDev"))
     };
 }
+function pushMeasurementRowIfData(rows, scope, scenarioName, stepName, resultName, measurement) {
+    if (hasMeasurementData(measurement)) {
+        rows.push(buildMeasurementRow(scope, scenarioName, stepName, resultName, measurement));
+    }
+}
+function hasMeasurementData(measurement) {
+    if (Object.keys(measurement).length === 0) {
+        return false;
+    }
+    const request = reportObject(measurement, "request", "Request");
+    if (asInt(reportValue(request, "count", "Count")) !== 0 ||
+        asInt(reportValue(request, "percent", "Percent")) !== 0 ||
+        asFloat(reportValue(request, "rps", "RPS")) !== 0) {
+        return true;
+    }
+    const latency = reportObject(measurement, "latency", "Latency");
+    const latencyKeys = [
+        ["minMs", "MinMs"],
+        ["meanMs", "MeanMs"],
+        ["percent50", "Percent50"],
+        ["percent75", "Percent75"],
+        ["percent95", "Percent95"],
+        ["percent99", "Percent99"],
+        ["maxMs", "MaxMs"],
+        ["stdDev", "StdDev"]
+    ];
+    if (latencyKeys.some(([camelKey, pascalKey]) => asFloat(reportValue(latency, camelKey, pascalKey)) !== 0)) {
+        return true;
+    }
+    const latencyCount = reportObject(latency, "latencyCount", "LatencyCount");
+    const latencyCountKeys = [
+        ["lessOrEq800", "LessOrEq800"],
+        ["more800Less1200", "More800Less1200"],
+        ["moreOrEq1200", "MoreOrEq1200"]
+    ];
+    if (latencyCountKeys.some(([camelKey, pascalKey]) => asInt(reportValue(latencyCount, camelKey, pascalKey)) !== 0)) {
+        return true;
+    }
+    const dataTransfer = reportObject(measurement, "dataTransfer", "DataTransfer");
+    const dataTransferKeys = [
+        ["allBytes", "AllBytes"],
+        ["minBytes", "MinBytes"],
+        ["meanBytes", "MeanBytes"],
+        ["percent50", "Percent50"],
+        ["percent75", "Percent75"],
+        ["percent95", "Percent95"],
+        ["percent99", "Percent99"],
+        ["maxBytes", "MaxBytes"],
+        ["stdDev", "StdDev"]
+    ];
+    if (dataTransferKeys.some(([camelKey, pascalKey]) => asFloat(reportValue(dataTransfer, camelKey, pascalKey)) !== 0)) {
+        return true;
+    }
+    return reportArray(measurement, "statusCodes", "StatusCodes").some((code) => asInt(reportValue(code, "count", "Count")) !== 0 ||
+        asInt(reportValue(code, "percent", "Percent")) !== 0 ||
+        asBool(reportValue(code, "isError", "IsError")) ||
+        asString(reportValue(code, "statusCode", "StatusCode")).trim().length > 0 ||
+        asString(reportValue(code, "message", "Message")).trim().length > 0);
+}
 function appendChartCard(parts, id, title) {
     appendReportLine(parts, `<div class="chart-card"><h3>${escapeHtml(title)}</h3><canvas id="${escapeHtml(id)}" class="chart-canvas"></canvas></div>`);
 }
@@ -611,24 +743,27 @@ function hasNonEmptyHints(plugin) {
     return reportArray(plugin, "hints", "Hints").some((hint) => asString(hint).trim().length > 0);
 }
 function buildDotnetScenarioRows(nodeStats) {
-    return sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats")).map((scenario) => ({
-        Scenario: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
-        Simulation: asString(reportValue(reportObject(scenario, "loadSimulationStats", "LoadSimulationStats"), "simulationName", "SimulationName")),
-        SimulationValue: asInt(reportValue(reportObject(scenario, "loadSimulationStats", "LoadSimulationStats"), "value", "Value")),
-        Requests: asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")),
-        OK: asInt(reportValue(scenario, "allOkCount", "AllOkCount")),
-        FAIL: asInt(reportValue(scenario, "allFailCount", "AllFailCount")),
-        Duration: formatDotnetTimeSpan(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs")),
-        RPS: formatReportNumber(reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs")) <= 0 ? 0 : asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")) / reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs"))),
-        LatencyP95Ms: formatReportNumber(Math.max(asFloat(reportValue(reportObject(reportObject(scenario, "ok", "Ok"), "latency", "Latency"), "percent95", "Percent95")), asFloat(reportValue(reportObject(reportObject(scenario, "fail", "Fail"), "latency", "Latency"), "percent95", "Percent95")))),
-        LatencyP99Ms: formatReportNumber(Math.max(asFloat(reportValue(reportObject(reportObject(scenario, "ok", "Ok"), "latency", "Latency"), "percent99", "Percent99")), asFloat(reportValue(reportObject(reportObject(scenario, "fail", "Fail"), "latency", "Latency"), "percent99", "Percent99")))),
-        CurrentOperation: asString(reportValue(scenario, "currentOperation", "CurrentOperation"))
-    }));
+    return reportScenarios(nodeStats).map((scenario) => {
+        const requestCount = reportRequestCountValue(scenario);
+        return {
+            Scenario: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
+            Simulation: asString(reportValue(reportObject(scenario, "loadSimulationStats", "LoadSimulationStats"), "simulationName", "SimulationName")),
+            SimulationValue: asInt(reportValue(reportObject(scenario, "loadSimulationStats", "LoadSimulationStats"), "value", "Value")),
+            Requests: requestCount,
+            OK: reportOkCountValue(scenario),
+            FAIL: reportFailCountValue(scenario),
+            Duration: formatDotnetTimeSpan(reportDurationValue(scenario)),
+            RPS: formatReportNumber(reportDurationSeconds(reportDurationValue(scenario)) <= 0 ? 0 : requestCount / reportDurationSeconds(reportDurationValue(scenario))),
+            LatencyP95Ms: formatReportNumber(Math.max(asFloat(reportValue(reportObject(reportObject(scenario, "ok", "Ok"), "latency", "Latency"), "percent95", "Percent95")), asFloat(reportValue(reportObject(reportObject(scenario, "fail", "Fail"), "latency", "Latency"), "percent95", "Percent95")))),
+            LatencyP99Ms: formatReportNumber(Math.max(asFloat(reportValue(reportObject(reportObject(scenario, "ok", "Ok"), "latency", "Latency"), "percent99", "Percent99")), asFloat(reportValue(reportObject(reportObject(scenario, "fail", "Fail"), "latency", "Latency"), "percent99", "Percent99")))),
+            CurrentOperation: asString(reportValue(scenario, "currentOperation", "CurrentOperation"))
+        };
+    });
 }
 function buildDotnetStepRows(nodeStats) {
     const rows = [];
-    for (const scenario of sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"))) {
-        for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+    for (const scenario of reportScenarios(nodeStats)) {
+        for (const step of reportSteps(scenario)) {
             rows.push({
                 Scenario: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
                 Step: asString(reportValue(step, "stepName", "StepName")),
@@ -646,28 +781,28 @@ function buildDotnetStepRows(nodeStats) {
 }
 function buildDotnetScenarioMeasurementRows(nodeStats) {
     const rows = [];
-    for (const scenario of sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"))) {
+    for (const scenario of reportScenarios(nodeStats)) {
         const scenarioName = asString(reportValue(scenario, "scenarioName", "ScenarioName"));
-        rows.push(buildMeasurementRow("Scenario", scenarioName, "", "OK", reportObject(scenario, "ok", "Ok")));
-        rows.push(buildMeasurementRow("Scenario", scenarioName, "", "FAIL", reportObject(scenario, "fail", "Fail")));
+        pushMeasurementRowIfData(rows, "Scenario", scenarioName, "", "OK", reportObject(scenario, "ok", "Ok"));
+        pushMeasurementRowIfData(rows, "Scenario", scenarioName, "", "FAIL", reportObject(scenario, "fail", "Fail"));
     }
     return rows;
 }
 function buildDotnetStepMeasurementRows(nodeStats) {
     const rows = [];
-    for (const scenario of sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"))) {
+    for (const scenario of reportScenarios(nodeStats)) {
         const scenarioName = asString(reportValue(scenario, "scenarioName", "ScenarioName"));
-        for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+        for (const step of reportSteps(scenario)) {
             const stepName = asString(reportValue(step, "stepName", "StepName"));
-            rows.push(buildMeasurementRow("Step", scenarioName, stepName, "OK", reportObject(step, "ok", "Ok")));
-            rows.push(buildMeasurementRow("Step", scenarioName, stepName, "FAIL", reportObject(step, "fail", "Fail")));
+            pushMeasurementRowIfData(rows, "Step", scenarioName, stepName, "OK", reportObject(step, "ok", "Ok"));
+            pushMeasurementRowIfData(rows, "Step", scenarioName, stepName, "FAIL", reportObject(step, "fail", "Fail"));
         }
     }
     return rows;
 }
 function buildDotnetStatusCodeRows(nodeStats) {
     const rows = [];
-    for (const scenario of sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"))) {
+    for (const scenario of reportScenarios(nodeStats)) {
         const scenarioName = asString(reportValue(scenario, "scenarioName", "ScenarioName"));
         for (const code of reportArray(reportObject(scenario, "ok", "Ok"), "statusCodes", "StatusCodes")) {
             rows.push({ Scope: "Scenario", Scenario: scenarioName, Step: "", Result: "OK", StatusCode: asString(reportValue(code, "statusCode", "StatusCode")), Message: asString(reportValue(code, "message", "Message")), Count: asInt(reportValue(code, "count", "Count")), Percent: asInt(reportValue(code, "percent", "Percent")), IsError: Boolean(reportValue(code, "isError", "IsError")) });
@@ -675,7 +810,7 @@ function buildDotnetStatusCodeRows(nodeStats) {
         for (const code of reportArray(reportObject(scenario, "fail", "Fail"), "statusCodes", "StatusCodes")) {
             rows.push({ Scope: "Scenario", Scenario: scenarioName, Step: "", Result: "FAIL", StatusCode: asString(reportValue(code, "statusCode", "StatusCode")), Message: asString(reportValue(code, "message", "Message")), Count: asInt(reportValue(code, "count", "Count")), Percent: asInt(reportValue(code, "percent", "Percent")), IsError: Boolean(reportValue(code, "isError", "IsError")) });
         }
-        for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+        for (const step of reportSteps(scenario)) {
             const stepName = asString(reportValue(step, "stepName", "StepName"));
             for (const code of reportArray(reportObject(step, "ok", "Ok"), "statusCodes", "StatusCodes")) {
                 rows.push({ Scope: "Step", Scenario: scenarioName, Step: stepName, Result: "OK", StatusCode: asString(reportValue(code, "statusCode", "StatusCode")), Message: asString(reportValue(code, "message", "Message")), Count: asInt(reportValue(code, "count", "Count")), Percent: asInt(reportValue(code, "percent", "Percent")), IsError: Boolean(reportValue(code, "isError", "IsError")) });
@@ -688,7 +823,7 @@ function buildDotnetStatusCodeRows(nodeStats) {
     return rows;
 }
 function buildDotnetThresholdRows(nodeStats) {
-    return reportArray(nodeStats, "thresholds", "Thresholds").map((threshold) => ({
+    return reportThresholds(nodeStats).map((threshold) => ({
         Scenario: asString(reportValue(threshold, "scenarioName", "ScenarioName")),
         Step: asString(reportValue(threshold, "stepName", "StepName")),
         Check: asString(reportValue(threshold, "checkExpression", "CheckExpression")),
@@ -698,13 +833,13 @@ function buildDotnetThresholdRows(nodeStats) {
     }));
 }
 function buildDotnetMetricRows(nodeStats) {
-    const metrics = reportObject(nodeStats, "metrics", "Metrics");
+    const metrics = reportMetrics(nodeStats);
     const rows = [];
     for (const counter of reportArray(metrics, "counters", "Counters")) {
         rows.push({
             Type: "Counter",
             Scenario: asString(reportValue(counter, "scenarioName", "ScenarioName")),
-            Name: asString(reportValue(counter, "metricName", "MetricName")),
+            Name: reportMetricName(counter),
             Unit: asString(reportValue(counter, "unitOfMeasure", "UnitOfMeasure")),
             Value: asInt(reportValue(counter, "value", "Value"))
         });
@@ -713,7 +848,7 @@ function buildDotnetMetricRows(nodeStats) {
         rows.push({
             Type: "Gauge",
             Scenario: asString(reportValue(gauge, "scenarioName", "ScenarioName")),
-            Name: asString(reportValue(gauge, "metricName", "MetricName")),
+            Name: reportMetricName(gauge),
             Unit: asString(reportValue(gauge, "unitOfMeasure", "UnitOfMeasure")),
             Value: formatReportNumber(reportValue(gauge, "value", "Value"))
         });
@@ -738,15 +873,15 @@ function buildDotnetStatusCodeClassChart(scenarios) {
     ].filter((entry) => entry.value > 0);
 }
 function buildDotnetChartData(nodeStats) {
-    const scenarios = sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"));
+    const scenarios = reportScenarios(nodeStats);
     return {
         overallOutcome: [
-            { label: "OK", value: asInt(reportValue(nodeStats, "allOkCount", "AllOkCount")), color: "#18a957" },
-            { label: "FAIL", value: asInt(reportValue(nodeStats, "allFailCount", "AllFailCount")), color: "#d14343" }
+            { label: "OK", value: reportTotalOkCount(nodeStats, scenarios), color: "#18a957" },
+            { label: "FAIL", value: reportTotalFailCount(nodeStats, scenarios), color: "#d14343" }
         ],
         scenarioRequests: scenarios.map((scenario) => ({
             label: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
-            value: asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")),
+            value: reportRequestCountValue(scenario),
             color: "#3b82f6"
         })),
         scenarioP95Latency: scenarios.map((scenario) => ({
@@ -756,21 +891,21 @@ function buildDotnetChartData(nodeStats) {
         })),
         scenarioRps: scenarios.map((scenario) => ({
             label: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
-            value: reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs")) <= 0
+            value: reportDurationSeconds(reportDurationValue(scenario)) <= 0
                 ? 0
-                : asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")) / reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs")),
+                : reportRequestCountValue(scenario) / reportDurationSeconds(reportDurationValue(scenario)),
             color: "#10b981"
         })),
         scenarioFailRate: scenarios.map((scenario) => ({
             label: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
-            value: asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")) <= 0
+            value: reportRequestCountValue(scenario) <= 0
                 ? 0
-                : (asInt(reportValue(scenario, "allFailCount", "AllFailCount")) * 100 / asInt(reportValue(scenario, "allRequestCount", "AllRequestCount"))),
+                : (reportFailCountValue(scenario) * 100 / reportRequestCountValue(scenario)),
             color: "#ef4444"
         })),
         scenarioBytes: scenarios.map((scenario) => ({
             label: asString(reportValue(scenario, "scenarioName", "ScenarioName")),
-            value: asInt(reportValue(scenario, "allBytes", "AllBytes")),
+            value: asInt(reportBytesValue(scenario)),
             color: "#0ea5e9"
         })),
         statusCodeClasses: buildDotnetStatusCodeClassChart(scenarios),
@@ -786,21 +921,24 @@ function buildDotnetChartData(nodeStats) {
     };
 }
 function buildDotnetSummaryHtml(nodeStats) {
-    const scenarios = sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"));
-    const successRate = asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount")) <= 0
+    const scenarios = reportScenarios(nodeStats);
+    const allRequests = reportTotalRequestCount(nodeStats, scenarios);
+    const allOk = reportTotalOkCount(nodeStats, scenarios);
+    const allFail = reportTotalFailCount(nodeStats, scenarios);
+    const successRate = allRequests <= 0
         ? 0
-        : (asInt(reportValue(nodeStats, "allOkCount", "AllOkCount")) * 100 / asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount")));
-    const failRate = asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount")) <= 0
+        : (allOk * 100 / allRequests);
+    const failRate = allRequests <= 0
         ? 0
-        : (asInt(reportValue(nodeStats, "allFailCount", "AllFailCount")) * 100 / asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount")));
-    const overallRps = reportDurationSeconds(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs")) <= 0
+        : (allFail * 100 / allRequests);
+    const overallRps = reportDurationSeconds(reportDurationValue(nodeStats)) <= 0
         ? 0
-        : asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount")) / reportDurationSeconds(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs"));
+        : allRequests / reportDurationSeconds(reportDurationValue(nodeStats));
     const topScenario = scenarios.reduce((winner, scenario) => {
         if (!winner) {
             return scenario;
         }
-        return asInt(reportValue(scenario, "allRequestCount", "AllRequestCount")) > asInt(reportValue(winner, "allRequestCount", "AllRequestCount"))
+        return reportRequestCountValue(scenario) > reportRequestCountValue(winner)
             ? scenario
             : winner;
     }, undefined);
@@ -811,14 +949,15 @@ function buildDotnetSummaryHtml(nodeStats) {
     const chartData = buildDotnetChartData(nodeStats);
     const testInfo = reportObject(nodeStats, "testInfo", "TestInfo");
     const nodeInfo = reportObject(nodeStats, "nodeInfo", "NodeInfo");
+    const totalBytes = reportTotalBytes(nodeStats, scenarios);
     const parts = [];
     appendReportLine(parts, "<div class=\"card-grid\">");
-    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Total Requests</div><div class="stat-value">${asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount"))}</div></div>`);
-    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Success</div><div class="stat-value value-ok">${asInt(reportValue(nodeStats, "allOkCount", "AllOkCount"))} (${formatDotnetPercent(successRate)}%)</div></div>`);
-    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Fail</div><div class="stat-value value-fail">${asInt(reportValue(nodeStats, "allFailCount", "AllFailCount"))} (${formatDotnetPercent(failRate)}%)</div></div>`);
+    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Total Requests</div><div class="stat-value">${allRequests}</div></div>`);
+    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Success</div><div class="stat-value value-ok">${allOk} (${formatDotnetPercent(successRate)}%)</div></div>`);
+    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Fail</div><div class="stat-value value-fail">${allFail} (${formatDotnetPercent(failRate)}%)</div></div>`);
     appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Overall RPS</div><div class="stat-value">${formatReportNumber(overallRps)}</div></div>`);
-    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Duration</div><div class="stat-value">${escapeHtml(formatDotnetTimeSpan(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs")))}</div></div>`);
-    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Total Bytes</div><div class="stat-value">${asInt(reportValue(nodeStats, "allBytes", "AllBytes"))}</div></div>`);
+    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Duration</div><div class="stat-value">${escapeHtml(formatDotnetTimeSpan(reportDurationValue(nodeStats)))}</div></div>`);
+    appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Total Bytes</div><div class="stat-value">${totalBytes}</div></div>`);
     appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Top Scenario</div><div class="stat-value">${escapeHtml(topScenario ? reportValue(topScenario, "scenarioName", "ScenarioName") : "n/a")}</div></div>`);
     appendReportLine(parts, `<div class="stat-card"><div class="stat-label">Node</div><div class="stat-value">${loadStrikeNodeTypeTag(reportValue(nodeInfo, "nodeType", "NodeType"))}</div></div>`);
     appendReportLine(parts, "</div>");
@@ -893,7 +1032,7 @@ function buildDotnetStatusCodeHtml(nodeStats) {
     return buildDotnetTableHtml(buildDotnetStatusCodeRows(nodeStats));
 }
 function buildDotnetFailedResponseHtml(nodeStats) {
-    const failedStatusRows = buildFailedStatusRows(sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats")));
+    const failedStatusRows = buildFailedStatusRows(reportScenarios(nodeStats));
     const failedEventRows = buildFailedEventRows(reportArray(nodeStats, "pluginsData", "PluginsData"));
     return buildDotnetFailedResponseContent(failedStatusRows, failedEventRows);
 }
@@ -984,7 +1123,7 @@ function buildDotnetHtmlTabs(nodeStats) {
     if (statusCodeRows.length) {
         tabs.push(["status-codes", "Status Codes", buildDotnetTableHtml(statusCodeRows)]);
     }
-    const failedStatusRows = buildFailedStatusRows(sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats")));
+    const failedStatusRows = buildFailedStatusRows(reportScenarios(nodeStats));
     const failedEventRows = buildFailedEventRows(reportArray(nodeStats, "pluginsData", "PluginsData"));
     if (failedStatusRows.length || failedEventRows.length) {
         tabs.push(["failed-responses", "Failed Responses", buildDotnetFailedResponseContent(failedStatusRows, failedEventRows)]);
@@ -1042,7 +1181,7 @@ function buildDotnetHtmlTabs(nodeStats) {
  * Exposes the build dotnet txt report operation. Use this when interacting with the SDK through this surface.
  */
 function buildDotnetTxtReport(nodeStats) {
-    const scenarios = sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"));
+    const scenarios = reportScenarios(nodeStats);
     const testInfo = reportObject(nodeStats, "testInfo", "TestInfo");
     const nodeInfo = reportObject(nodeStats, "nodeInfo", "NodeInfo");
     const lines = [
@@ -1050,25 +1189,25 @@ function buildDotnetTxtReport(nodeStats) {
         `TestName: ${asString(reportValue(testInfo, "testName", "TestName"))}`,
         `SessionId: ${asString(reportValue(testInfo, "sessionId", "SessionId"))}`,
         `NodeType: ${loadStrikeNodeTypeTag(reportValue(nodeInfo, "nodeType", "NodeType"))}`,
-        `Duration: ${formatDotnetTimeSpan(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs"))}`,
-        `Requests: ${asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount"))}  OK: ${asInt(reportValue(nodeStats, "allOkCount", "AllOkCount"))}  FAIL: ${asInt(reportValue(nodeStats, "allFailCount", "AllFailCount"))}`,
+        `Duration: ${formatDotnetTimeSpan(reportDurationValue(nodeStats))}`,
+        `Requests: ${reportTotalRequestCount(nodeStats, scenarios)}  OK: ${reportTotalOkCount(nodeStats, scenarios)}  FAIL: ${reportTotalFailCount(nodeStats, scenarios)}`,
         "",
         "Scenarios:"
     ];
     for (const scenario of scenarios) {
-        lines.push(`- ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))}: req=${asInt(reportValue(scenario, "allRequestCount", "AllRequestCount"))} ok=${asInt(reportValue(scenario, "allOkCount", "AllOkCount"))} fail=${asInt(reportValue(scenario, "allFailCount", "AllFailCount"))} duration=${formatDotnetTimeSpan(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs"))}`);
+        lines.push(`- ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))}: req=${reportRequestCountValue(scenario)} ok=${reportOkCountValue(scenario)} fail=${reportFailCountValue(scenario)} duration=${formatDotnetTimeSpan(reportDurationValue(scenario))}`);
     }
-    if (scenarios.some((scenario) => reportArray(scenario, "stepStats", "StepStats").length > 0)) {
+    if (scenarios.some((scenario) => reportSteps(scenario).length > 0)) {
         lines.push("", "Steps:");
         for (const scenario of scenarios) {
-            for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+            for (const step of reportSteps(scenario)) {
                 const ok = asInt(reportValue(reportObject(reportObject(step, "ok", "Ok"), "request", "Request"), "count", "Count"));
                 const fail = asInt(reportValue(reportObject(reportObject(step, "fail", "Fail"), "request", "Request"), "count", "Count"));
                 lines.push(`- ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))}.${asString(reportValue(step, "stepName", "StepName"))}: req=${ok + fail} ok=${ok} fail=${fail}`);
             }
         }
     }
-    const thresholds = reportArray(nodeStats, "thresholds", "Thresholds");
+    const thresholds = reportThresholds(nodeStats);
     if (thresholds.length) {
         lines.push("", "Thresholds:");
         for (const threshold of thresholds) {
@@ -1092,10 +1231,10 @@ function buildDotnetTxtReport(nodeStats) {
  */
 function buildDotnetCsvReport(nodeStats) {
     const lines = ["ScenarioName,Requests,Ok,Fail,DurationSeconds,Rps"];
-    for (const scenario of sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"))) {
-        const durationSeconds = reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs"));
-        const requests = asInt(reportValue(scenario, "allRequestCount", "AllRequestCount"));
-        lines.push(`${escapeCsv(reportValue(scenario, "scenarioName", "ScenarioName"))},${requests},${asInt(reportValue(scenario, "allOkCount", "AllOkCount"))},${asInt(reportValue(scenario, "allFailCount", "AllFailCount"))},${formatReportNumber(durationSeconds)},${formatReportNumber(durationSeconds <= 0 ? 0 : requests / durationSeconds)}`);
+    for (const scenario of reportScenarios(nodeStats)) {
+        const durationSeconds = reportDurationSeconds(reportDurationValue(scenario));
+        const requests = reportRequestCountValue(scenario);
+        lines.push(`${escapeCsv(reportValue(scenario, "scenarioName", "ScenarioName"))},${requests},${reportOkCountValue(scenario)},${reportFailCountValue(scenario)},${formatReportNumber(durationSeconds)},${formatReportNumber(durationSeconds <= 0 ? 0 : requests / durationSeconds)}`);
     }
     return reportLines(lines);
 }
@@ -1103,16 +1242,16 @@ function buildDotnetCsvReport(nodeStats) {
  * Exposes the build dotnet markdown report operation. Use this when interacting with the SDK through this surface.
  */
 function buildDotnetMarkdownReport(nodeStats) {
-    const scenarios = sortBySortIndex(reportArray(nodeStats, "scenarioStats", "ScenarioStats"));
+    const scenarios = reportScenarios(nodeStats);
     const testInfo = reportObject(nodeStats, "testInfo", "TestInfo");
     const lines = [
         `# ${asString(reportValue(testInfo, "testSuite", "TestSuite"))} / ${asString(reportValue(testInfo, "testName", "TestName"))}`,
         "",
         `- Session: \`${asString(reportValue(testInfo, "sessionId", "SessionId"))}\``,
-        `- Duration: \`${formatDotnetTimeSpan(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs"))}\``,
-        `- Total Requests: \`${asInt(reportValue(nodeStats, "allRequestCount", "AllRequestCount"))}\``,
-        `- OK: \`${asInt(reportValue(nodeStats, "allOkCount", "AllOkCount"))}\``,
-        `- FAIL: \`${asInt(reportValue(nodeStats, "allFailCount", "AllFailCount"))}\``,
+        `- Duration: \`${formatDotnetTimeSpan(reportDurationValue(nodeStats))}\``,
+        `- Total Requests: \`${reportTotalRequestCount(nodeStats, scenarios)}\``,
+        `- OK: \`${reportTotalOkCount(nodeStats, scenarios)}\``,
+        `- FAIL: \`${reportTotalFailCount(nodeStats, scenarios)}\``,
         "",
         "## Scenarios",
         "",
@@ -1120,19 +1259,19 @@ function buildDotnetMarkdownReport(nodeStats) {
         "|---|---:|---:|---:|---:|"
     ];
     for (const scenario of scenarios) {
-        lines.push(`| ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))} | ${asInt(reportValue(scenario, "allRequestCount", "AllRequestCount"))} | ${asInt(reportValue(scenario, "allOkCount", "AllOkCount"))} | ${asInt(reportValue(scenario, "allFailCount", "AllFailCount"))} | ${formatReportNumber(reportDurationSeconds(reportValue(scenario, "duration", "Duration", "durationMs", "DurationMs")))}s |`);
+        lines.push(`| ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))} | ${reportRequestCountValue(scenario)} | ${reportOkCountValue(scenario)} | ${reportFailCountValue(scenario)} | ${formatReportNumber(reportDurationSeconds(reportDurationValue(scenario)))}s |`);
     }
-    if (scenarios.some((scenario) => reportArray(scenario, "stepStats", "StepStats").length > 0)) {
+    if (scenarios.some((scenario) => reportSteps(scenario).length > 0)) {
         lines.push("", "## Steps", "", "| Scenario | Step | Requests | OK | FAIL |", "|---|---|---:|---:|---:|");
         for (const scenario of scenarios) {
-            for (const step of sortBySortIndex(reportArray(scenario, "stepStats", "StepStats"))) {
+            for (const step of reportSteps(scenario)) {
                 const ok = asInt(reportValue(reportObject(reportObject(step, "ok", "Ok"), "request", "Request"), "count", "Count"));
                 const fail = asInt(reportValue(reportObject(reportObject(step, "fail", "Fail"), "request", "Request"), "count", "Count"));
                 lines.push(`| ${asString(reportValue(scenario, "scenarioName", "ScenarioName"))} | ${asString(reportValue(step, "stepName", "StepName"))} | ${ok + fail} | ${ok} | ${fail} |`);
             }
         }
     }
-    const thresholds = reportArray(nodeStats, "thresholds", "Thresholds");
+    const thresholds = reportThresholds(nodeStats);
     if (thresholds.length) {
         lines.push("", "## Thresholds", "", "| Scenario | Step | Check | Failed | Errors | Exception |", "|---|---|---|---:|---:|---|");
         for (const threshold of thresholds) {
@@ -1268,7 +1407,7 @@ if(btns.length>0){show(btns[0].dataset.tab);}renderAllCharts();initPanePan();win
         .split("__TEST_SUITE__").join(escapeHtml(reportValue(testInfo, "testSuite", "TestSuite")))
         .split("__TEST_NAME__").join(escapeHtml(reportValue(testInfo, "testName", "TestName")))
         .split("__SESSION_ID__").join(escapeHtml(reportValue(testInfo, "sessionId", "SessionId")))
-        .split("__DURATION__").join(escapeHtml(formatDotnetTimeSpan(reportValue(nodeStats, "duration", "Duration", "durationMs", "DurationMs"))))
+        .split("__DURATION__").join(escapeHtml(formatDotnetTimeSpan(reportDurationValue(nodeStats))))
         .split("__BUTTONS__").join(buttonsHtml)
         .split("__SECTIONS__").join(sectionsHtml)
         .split("__CHART_DATA__").join(chartDataJson)