@grafana/k6-test-builder 0.8.14 → 0.8.16

package/dist/index.d.ts

@@ -2,9 +2,19 @@ import { FocusEventHandler, AnchorHTMLAttributes, ReactNode, ElementType, ReactE
 import { InvalidArchiveError } from "har-to-k6";
 import { ThemeOptions } from "@material-ui/core/styles/createTheme";
 import { GrafanaTheme2 } from "@grafana/data";
+interface VUhBreakdown {
+    base_total_vuh: number;
+    protocol_vuh: number;
+    browser_vuh: number;
+    reduction_rate: number | null;
+    reduction_rate_breakdown: {
+        volume: number;
+        local_run: number;
+    } | null;
+}
 interface VuhStats {
     vuh_usage: number | undefined;
-    vuh_reduction_rate: number | undefined;
+    vuh_breakdown: VUhBreakdown;
 }
 interface Metadata {
     vuh: VuhStats;

package/dist/index.js

@@ -216,7 +216,7 @@ const $924f96bd0d5c630d$export$cc0ae9a5c96bcd6f = ()=>/*#__PURE__*/ (0, $gkIgo$r
 const $1c4cc247633c6592$var$LOGGER_ENABLE_KEY = '__test_builder_logger_enabled__';
 const $1c4cc247633c6592$var$K6_VERBOSE_LOGS = '_k6_verbose_logs_';
 function $1c4cc247633c6592$var$isEnabled() {
-    return true;
+    return process.env.TARGET !== 'prod' || sessionStorage.getItem($1c4cc247633c6592$var$LOGGER_ENABLE_KEY);
 }
 function $1c4cc247633c6592$var$isVerboseEnabled() {
     return !!sessionStorage.getItem($1c4cc247633c6592$var$K6_VERBOSE_LOGS) || !!sessionStorage.getItem($1c4cc247633c6592$var$LOGGER_ENABLE_KEY);
@@ -2531,16 +2531,16 @@ function $bd3480c18d26920e$var$_toPrimitive(t, r) {
     return ("string" === r ? String : Number)(t);
 }
 class $bd3480c18d26920e$export$4e14bd654b94b4e9 {
-    /**
-   * Decides if this instance is serialized as undefined or not
-   * @private
-   */ constructor(postData, headers){
+    constructor(postData, headers){
         $bd3480c18d26920e$var$_defineProperty(this, "mimeType", 'text/plain');
         $bd3480c18d26920e$var$_defineProperty(this, "comment", '');
         $bd3480c18d26920e$var$_defineProperty(this, "text", void 0);
         $bd3480c18d26920e$var$_defineProperty(this, "params", void 0);
         $bd3480c18d26920e$var$_defineProperty(this, "decoded", void 0);
-        $bd3480c18d26920e$var$_defineProperty(this, "isUndefined", false);
+        /**
+     * Decides if this instance is serialized as undefined or not
+     * @private
+     */ $bd3480c18d26920e$var$_defineProperty(this, "isUndefined", false);
         if (!postData || !headers || !postData.type) throw new TypeError('PostDataNode could not be created. Invalid arguments.');
         switch(postData.type){
             case 'text':
@@ -4186,11 +4186,11 @@ class $09bbc5e14b02adac$export$3fb97e8df001f5f7 extends SyntaxError {
     }
 }
 class $09bbc5e14b02adac$export$dbf96015a8a67c16 {
-    // @ts-ignore
     constructor(id, scenarios, loadZones, thresholds, apm = []){
         $09bbc5e14b02adac$var$_defineProperty(this, $09bbc5e14b02adac$var$ID, null);
         $09bbc5e14b02adac$var$_defineProperty(this, $09bbc5e14b02adac$var$ARCHIVES, []);
         $09bbc5e14b02adac$var$_defineProperty(this, $09bbc5e14b02adac$var$SCRIPTS, []);
+        // @ts-ignore
         $09bbc5e14b02adac$var$_defineProperty(this, $09bbc5e14b02adac$var$BASE_OPTIONS, void 0);
         this.id = id;
         this.baseOptions = $09bbc5e14b02adac$export$dbf96015a8a67c16.createLogOptions(loadZones, thresholds, apm);
@@ -15691,19 +15691,19 @@ const $723b70ee4d7f62e8$export$1ae172e61ce3735b = /*#__PURE__*/ (0, $gkIgo$react
 
 
 
-const $4e99116d1d1b712a$export$f4f5234705b8ee7d = ({ vuh: vuh })=>{
-    const { vuh_usage: vuh_usage = 0, vuh_reduction_rate: vuh_reduction_rate = 0 } = vuh || {};
-    const original = (0, $4bac6ee95b8c8b72$export$24567f54a9be5ab9)(vuh_usage / (1 - vuh_reduction_rate));
-    const discounted = (0, $4bac6ee95b8c8b72$export$24567f54a9be5ab9)(vuh_usage);
-    const reduction = (0, $4bac6ee95b8c8b72$export$c37640da124effef)(vuh_reduction_rate);
-    const reductionText = reduction > 0 ? `; however, you were billed ${discounted} VUh due to a ${reduction}% discount applied based on the size of the test.` : '. This test run was not eligible for any discounts.';
+const $4e99116d1d1b712a$var$VUH_THRESHOLD = 100;
+const $4e99116d1d1b712a$export$f4f5234705b8ee7d = ({ vuh_breakdown: vuh_breakdown, vuh_usage: vuh_usage = 0 })=>{
+    const { base_total_vuh: base_total_vuh = 0, reduction_rate: reduction_rate = 0 } = vuh_breakdown;
+    const original = (0, $4bac6ee95b8c8b72$export$24567f54a9be5ab9)(base_total_vuh);
+    const reduced = (0, $4bac6ee95b8c8b72$export$24567f54a9be5ab9)(vuh_usage);
+    const percentage = reduction_rate !== null && reduction_rate !== void 0 ? reduction_rate : 0;
+    const costText = $4e99116d1d1b712a$export$f1b66467ef7e1dfd(original);
+    const reductionText = $4e99116d1d1b712a$export$753b48ee12fd002c(reduced, percentage);
     return /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsxs)($4e99116d1d1b712a$var$Container, {
         children: [
             /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsxs)("span", {
                 children: [
-                    "Your test utilized ",
-                    original,
-                    " Virtual User Hours (VUh)",
+                    costText,
                     reductionText
                 ]
             }),
@@ -15714,6 +15714,12 @@ const $4e99116d1d1b712a$export$f4f5234705b8ee7d = ({ vuh: vuh })=>{
         ]
     });
 };
+const $4e99116d1d1b712a$export$f1b66467ef7e1dfd = (value)=>{
+    return `Your test is estimated to consume ${value} Virtual User Hours (VUh)`;
+};
+const $4e99116d1d1b712a$export$753b48ee12fd002c = (value = 0, percentage = 0)=>{
+    return percentage > 0 ? `, but you will only be charged for ${value} VUh. Tests consuming more than ${$4e99116d1d1b712a$var$VUH_THRESHOLD} VUh receive volume reductions based on test size.` : `. Tests consuming less than ${$4e99116d1d1b712a$var$VUH_THRESHOLD} Vuh are not eligible for volume reductions.`;
+};
 const $4e99116d1d1b712a$var$Container = /*#__PURE__*/ (0, ($parcel$interopDefault($gkIgo$styledcomponents))).div.withConfig({
     displayName: "VUhTooltipContent__Container",
     componentId: "sc-1lz5zhl-0"
@@ -15739,7 +15745,7 @@ const $420b9b2911eb0b31$export$692b9323eea6a0ee = ()=>{
     if (!(vuh !== null && vuh !== void 0 && vuh.vuh_usage)) return null;
     return /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsx)((0, $gkIgo$materialuicore.Tooltip), {
         title: /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsx)((0, $4e99116d1d1b712a$export$f4f5234705b8ee7d), {
-            vuh: vuh
+            ...vuh
         }),
         interactive: true,
         children: /*#__PURE__*/ (0, $gkIgo$reactjsxruntime.jsxs)((0, $7091d48bbccc61e3$export$eb2fcfdbd7ba97d4), {

package/dist/module.js

@@ -192,7 +192,7 @@ const $a80b21e889559c22$export$cc0ae9a5c96bcd6f = ()=>/*#__PURE__*/ (0, $b7VBt$j
 const $77857f570335d7ae$var$LOGGER_ENABLE_KEY = '__test_builder_logger_enabled__';
 const $77857f570335d7ae$var$K6_VERBOSE_LOGS = '_k6_verbose_logs_';
 function $77857f570335d7ae$var$isEnabled() {
-    return true;
+    return process.env.TARGET !== 'prod' || sessionStorage.getItem($77857f570335d7ae$var$LOGGER_ENABLE_KEY);
 }
 function $77857f570335d7ae$var$isVerboseEnabled() {
     return !!sessionStorage.getItem($77857f570335d7ae$var$K6_VERBOSE_LOGS) || !!sessionStorage.getItem($77857f570335d7ae$var$LOGGER_ENABLE_KEY);
@@ -2507,16 +2507,16 @@ function $f4684ac194011611$var$_toPrimitive(t, r) {
     return ("string" === r ? String : Number)(t);
 }
 class $f4684ac194011611$export$4e14bd654b94b4e9 {
-    /**
-   * Decides if this instance is serialized as undefined or not
-   * @private
-   */ constructor(postData, headers){
+    constructor(postData, headers){
         $f4684ac194011611$var$_defineProperty(this, "mimeType", 'text/plain');
         $f4684ac194011611$var$_defineProperty(this, "comment", '');
         $f4684ac194011611$var$_defineProperty(this, "text", void 0);
         $f4684ac194011611$var$_defineProperty(this, "params", void 0);
         $f4684ac194011611$var$_defineProperty(this, "decoded", void 0);
-        $f4684ac194011611$var$_defineProperty(this, "isUndefined", false);
+        /**
+     * Decides if this instance is serialized as undefined or not
+     * @private
+     */ $f4684ac194011611$var$_defineProperty(this, "isUndefined", false);
         if (!postData || !headers || !postData.type) throw new TypeError('PostDataNode could not be created. Invalid arguments.');
         switch(postData.type){
             case 'text':
@@ -4162,11 +4162,11 @@ class $d875af20a6533bde$export$3fb97e8df001f5f7 extends SyntaxError {
     }
 }
 class $d875af20a6533bde$export$dbf96015a8a67c16 {
-    // @ts-ignore
     constructor(id, scenarios, loadZones, thresholds, apm = []){
         $d875af20a6533bde$var$_defineProperty(this, $d875af20a6533bde$var$ID, null);
         $d875af20a6533bde$var$_defineProperty(this, $d875af20a6533bde$var$ARCHIVES, []);
         $d875af20a6533bde$var$_defineProperty(this, $d875af20a6533bde$var$SCRIPTS, []);
+        // @ts-ignore
         $d875af20a6533bde$var$_defineProperty(this, $d875af20a6533bde$var$BASE_OPTIONS, void 0);
         this.id = id;
         this.baseOptions = $d875af20a6533bde$export$dbf96015a8a67c16.createLogOptions(loadZones, thresholds, apm);
@@ -15667,19 +15667,19 @@ const $f90e6ac18264291c$export$1ae172e61ce3735b = /*#__PURE__*/ (0, $b7VBt$forwa
 
 
 
-const $7c10312fad43a1ee$export$f4f5234705b8ee7d = ({ vuh: vuh })=>{
-    const { vuh_usage: vuh_usage = 0, vuh_reduction_rate: vuh_reduction_rate = 0 } = vuh || {};
-    const original = (0, $f54872b9dc7588c3$export$24567f54a9be5ab9)(vuh_usage / (1 - vuh_reduction_rate));
-    const discounted = (0, $f54872b9dc7588c3$export$24567f54a9be5ab9)(vuh_usage);
-    const reduction = (0, $f54872b9dc7588c3$export$c37640da124effef)(vuh_reduction_rate);
-    const reductionText = reduction > 0 ? `; however, you were billed ${discounted} VUh due to a ${reduction}% discount applied based on the size of the test.` : '. This test run was not eligible for any discounts.';
+const $7c10312fad43a1ee$var$VUH_THRESHOLD = 100;
+const $7c10312fad43a1ee$export$f4f5234705b8ee7d = ({ vuh_breakdown: vuh_breakdown, vuh_usage: vuh_usage = 0 })=>{
+    const { base_total_vuh: base_total_vuh = 0, reduction_rate: reduction_rate = 0 } = vuh_breakdown;
+    const original = (0, $f54872b9dc7588c3$export$24567f54a9be5ab9)(base_total_vuh);
+    const reduced = (0, $f54872b9dc7588c3$export$24567f54a9be5ab9)(vuh_usage);
+    const percentage = reduction_rate !== null && reduction_rate !== void 0 ? reduction_rate : 0;
+    const costText = $7c10312fad43a1ee$export$f1b66467ef7e1dfd(original);
+    const reductionText = $7c10312fad43a1ee$export$753b48ee12fd002c(reduced, percentage);
     return /*#__PURE__*/ (0, $b7VBt$jsxs)($7c10312fad43a1ee$var$Container, {
         children: [
             /*#__PURE__*/ (0, $b7VBt$jsxs)("span", {
                 children: [
-                    "Your test utilized ",
-                    original,
-                    " Virtual User Hours (VUh)",
+                    costText,
                     reductionText
                 ]
             }),
@@ -15690,6 +15690,12 @@ const $7c10312fad43a1ee$export$f4f5234705b8ee7d = ({ vuh: vuh })=>{
         ]
     });
 };
+const $7c10312fad43a1ee$export$f1b66467ef7e1dfd = (value)=>{
+    return `Your test is estimated to consume ${value} Virtual User Hours (VUh)`;
+};
+const $7c10312fad43a1ee$export$753b48ee12fd002c = (value = 0, percentage = 0)=>{
+    return percentage > 0 ? `, but you will only be charged for ${value} VUh. Tests consuming more than ${$7c10312fad43a1ee$var$VUH_THRESHOLD} VUh receive volume reductions based on test size.` : `. Tests consuming less than ${$7c10312fad43a1ee$var$VUH_THRESHOLD} Vuh are not eligible for volume reductions.`;
+};
 const $7c10312fad43a1ee$var$Container = /*#__PURE__*/ (0, $b7VBt$styledcomponents).div.withConfig({
     displayName: "VUhTooltipContent__Container",
     componentId: "sc-1lz5zhl-0"
@@ -15715,7 +15721,7 @@ const $d8f115728c3a4b86$export$692b9323eea6a0ee = ()=>{
     if (!(vuh !== null && vuh !== void 0 && vuh.vuh_usage)) return null;
     return /*#__PURE__*/ (0, $b7VBt$jsx)((0, $b7VBt$Tooltip), {
         title: /*#__PURE__*/ (0, $b7VBt$jsx)((0, $7c10312fad43a1ee$export$f4f5234705b8ee7d), {
-            vuh: vuh
+            ...vuh
         }),
         interactive: true,
         children: /*#__PURE__*/ (0, $b7VBt$jsxs)((0, $9d9ef6b1aa606543$export$eb2fcfdbd7ba97d4), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafana/k6-test-builder",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "license": "AGPL-3.0",
   "main": "dist/index.js",
   "module": "dist/module.js",