Merge pull request #138 from test-results-reporter/25-support-influxd…

…b-v2-as-target feat: use influxdb-lite to support v2
test-results-reporter · Oct 23, 2023 · 6957ba1 · 6957ba1
2 parents ba65102 + b19c377
commit 6957ba1
Show file tree

Hide file tree

Showing 8 changed files with 1,950 additions and 810 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "test-results-reporter",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "description": "Publish test results to Microsoft Teams, Google Chat, Slack and InfluxDB",
   "main": "src/index.js",
   "types": "./src/index.d.ts",
@@ -48,8 +48,7 @@
   "dependencies": {
     "async-retry": "^1.3.3",
     "dotenv": "^14.3.2",
-    "influxdb-v1": "^1.0.4",
-    "influxdb-v2": "^1.0.0",
+    "influxdb-lite": "^1.0.0",
     "performance-results-parser": "latest",
     "phin-retry": "^1.0.3",
     "pretty-ms": "^7.0.1",

diff --git a/src/helpers/constants.js b/src/helpers/constants.js
@@ -17,7 +17,6 @@ const TARGET = Object.freeze({
   CUSTOM: 'custom',
   DELAY: 'delay',
   INFLUX: 'influx',
-  INFLUX2: 'influx2'
 });
 
 const EXTENSION = Object.freeze({

diff --git a/src/index.d.ts b/src/index.d.ts
@@ -169,9 +169,14 @@ export interface ChatInputs extends TargetInputs { }
 
 export interface InfluxDBTargetInputs {
   url: string;
+  version?: string;
   db: string;
   username?: string;
   password?: string;
+  org?: string;
+  bucket?: string;
+  precision?: string;
+  token?: string;
   measurement_perf_run?: string;
   measurement_perf_transaction?: string;
   measurement_test_run?: string;

diff --git a/src/targets/index.js b/src/targets/index.js
@@ -4,7 +4,6 @@ const chat = require('./chat');
 const custom = require('./custom');
 const delay = require('./delay');
 const influx = require('./influx');
-const influx2 = require('./influx2');
 const { TARGET } = require('../helpers/constants');
 const { checkCondition } = require('../helpers/helper');
 
@@ -22,8 +21,6 @@ function getTargetRunner(target) {
       return delay;
     case TARGET.INFLUX:
       return influx;
-    case TARGET.INFLUX2:
-      return influx2;
     default:
       return require(target.name);
   }

diff --git a/src/targets/influx.js b/src/targets/influx.js
@@ -1,4 +1,4 @@
-const influx_v1 = require('influxdb-v1');
+const influx = require('influxdb-lite');
 const Metric = require('performance-results-parser/src/models/Metric');
 const PerformanceTestResult = require('performance-results-parser/src/models/PerformanceTestResult');
 const Transaction = require('performance-results-parser/src/models/Transaction');
@@ -18,12 +18,16 @@ const { STATUS } = require('../helpers/constants');
 async function run({ result, target }) {
   target.inputs = Object.assign({}, default_inputs, target.inputs);
   const metrics = getMetrics({ result, target });
-  await influx_v1.write(
+  await influx.write(
     {
       url: target.inputs.url,
+      version: target.inputs.version,
       db: target.inputs.db,
       username: target.inputs.username,
       password: target.inputs.password,
+      org: target.inputs.org,
+      bucket: target.inputs.bucket,
+      token: target.inputs.token,
     },
     metrics
   );
@@ -178,9 +182,13 @@ function getTestCaseInfluxMetric({ result, target }) {
 
 const default_inputs = {
   url: '',
+  version: 'v1',
   db: '',
   username: '',
   password: '',
+  org: '',
+  bucket: '',
+  token: '',
   measurement_perf_run: 'PerfRun',
   measurement_perf_transaction: 'PerfTransaction',
   measurement_test_run: 'TestRun',

diff --git a/src/targets/influx2.js b/src/targets/influx2.js
diff --git a/test/targets.influx2.spec.js b/test/targets.influx2.spec.js
@@ -12,15 +12,14 @@ describe('targets - influx2 - performance', () => {
           {
             "targets": [
               {
-                "name": "influx2",
+                "name": "influx",
                 "inputs": {
-                  "host": "localhost",
-                  "port": 9393,
-                  "protocol": "http",
+                  "url": "http://localhost:9393",
+                  "version": "v2",
                   "token": "testtoken",
                   "org": "testorg",
                   "bucket": "testbucket",
-                  "precision": "ns"
+                  "precision": "ns",
                 }
               }
             ],
@@ -47,11 +46,10 @@ describe('targets - influx2 - performance', () => {
           {
             "targets": [
               {
-                "name": "influx2",
+                "name": "influx",
                 "inputs": {
-                  "host": "localhost",
-                  "port": 9393,
-                  "protocol": "http",
+                  "url": "http://localhost:9393",
+                  "version": "v2",
                   "token": "testtoken",
                   "org": "testorg",
                   "bucket": "testbucket",
@@ -98,15 +96,14 @@ describe('targets - influx2 - functional', () => {
           {
             "targets": [
               {
-                "name": "influx2",
+                "name": "influx",
                 "inputs": {
-                  "host": "localhost",
-                  "port": 9393,
-                  "protocol": "http",
+                  "url": "http://localhost:9393",
+                  "version": "v2",
                   "token": "testtoken",
                   "org": "testorg",
                   "bucket": "testbucket",
-                  "precision": "ns"
+                  "precision": "ns",
                 }
               }
             ],
@@ -133,11 +130,10 @@ describe('targets - influx2 - functional', () => {
           {
             "targets": [
               {
-                "name": "influx2",
+                "name": "influx",
                 "inputs": {
-                  "host": "localhost",
-                  "port": 9393,
-                  "protocol": "http",
+                  "url": "http://localhost:9393",
+                  "version": "v2",
                   "token": "testtoken",
                   "org": "testorg",
                   "bucket": "testbucket",