Development (#24)

 Updated influxdb-client-java to -> 3.2.0 and gradle version to -> 7.0

Author: mderevyankoaqa

.idea/misc.xml

@@ -1,66 +1,65 @@
-apply plugin: 'java'
-apply plugin: 'eclipse'
+plugins {
+    id 'com.github.johnrengelman.shadow' version "7.0.0"
+    id 'java'
+    id 'project-report'
+    id 'idea'
+}
+
+repositories {
+    mavenCentral()
+            {
+
+                mavenCentral()
+            }
+}
 
 sourceCompatibility = 11
-version = '1.1'
+version = '1.2'
 def title = 'JMeterInfluxDBListener'
 def archiveName = 'jmeter-plugin-influxdb2-listener'
 
-repositories {
-
-	mavenCentral()
-}
 
 // There's a bug in JMeter leaving extra metadata right now. This is a workaround.
-class JMeterRule implements ComponentMetadataRule {
-	void execute(ComponentMetadataContext context) {
-		context.details.allVariants {
-			withDependencies {
-				removeAll { it.group == "org.apache.jmeter" && it.name == "bom" }
-			}
-		}
-	}
-}
+    class JMeterRule implements ComponentMetadataRule {
+        void execute(ComponentMetadataContext context) {
+            context.details.allVariants {
+                withDependencies {
+                    removeAll { it.group == "org.apache.jmeter" && it.name == "bom" }
+                }
+            }
+        }
+    }
 
-dependencies {
-	implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: '5.4.1'
-	implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_java', version: '5.4.1'
-	implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_components', version: '5.4.1'
-	implementation group: 'org.apache.jmeter', name: 'jorphan', version: '5.4.1'
-	implementation group: 'com.influxdb', name: 'influxdb-client-java', version: '2.0.0'
-	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
+    dependencies {
+        implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_core', version: '5.4.1'
+        implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_java', version: '5.4.1'
+        implementation group: 'org.apache.jmeter', name: 'ApacheJMeter_components', version: '5.4.1'
+        implementation group: 'org.apache.jmeter', name: 'jorphan', version: '5.4.1'
+        implementation group: 'com.influxdb', name: 'influxdb-client-java', version: '3.2.0'
+        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 
-	components {
-		withModule("org.apache.jmeter:ApacheJMeter_core", JMeterRule)
-		withModule("org.apache.jmeter:ApacheJMeter_java", JMeterRule)
-		withModule("org.apache.jmeter:ApacheJMeter_components", JMeterRule)
-		withModule("org.apache.jmeter:jorphan", JMeterRule)
-		withModule("org.apache.jmeter:ApacheJMeter", JMeterRule)
-	}
-}
 
-jar {
-	manifest {
-		attributes 'Implementation-Title': title,
-				'Implementation-Version': archiveVersion,
-				'Main-Class': 'org.md.jmeter.influxdb.visualizer.JMeterInfluxDBBackendListenerClient'
-	}
-}
+        components {
+            withModule("org.apache.jmeter:ApacheJMeter_core", JMeterRule)
+            withModule("org.apache.jmeter:ApacheJMeter_java", JMeterRule)
+            withModule("org.apache.jmeter:ApacheJMeter_components", JMeterRule)
+            withModule("org.apache.jmeter:jorphan", JMeterRule)
+            withModule("org.apache.jmeter:ApacheJMeter", JMeterRule)
+        }
+    }
 
-task fatJar(type: Jar) {
-	manifest.from jar.manifest
-
-	archiveBaseName = archiveName
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+jar {
 
-	from {
-		configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-		configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
+        manifest {
+        attributes 'Implementation-Title': title,
+                   'Implementation-Version': archiveVersion,
+                   'Main-Class': 'org.md.jmeter.influxdb.visualizer.JMeterInfluxDBBackendListenerClient'
+    }
+}
 
-	} {
-		exclude "META-INF/*.SF"
-		exclude "META-INF/*.DSA"
-		exclude "META-INF/*.RSA"
-	}
-	with jar
+shadowJar {
+    archiveBaseName.set(archiveName)
+    manifest {
+        inheritFrom project.tasks.jar.manifest
+    }
 }

.idea/workspace.xml

@@ -1,5 +1,5 @@
 #Fri Apr 17 22:39:55 EEST 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists

build.gradle

@@ -35,11 +35,23 @@ public InfluxDatabaseClient(BackendListenerContext context, Logger logger) {
      */
     public void setupInfluxClient() {
 
-        this.influxDB = InfluxDBClientFactory.
-                create(this.influxDBConfig.getInfluxDBURL(),
-                        this.influxDBConfig.getInfluxToken().toCharArray(),
-                        this.influxDBConfig.getInfluxOrganization(),
-                        this.influxDBConfig.getInfluxBucket());
+        LOGGER.info("InfluxDBClientFactory is going to use the following properties:");
+        LOGGER.info("URL --> " + this.influxDBConfig.getInfluxDBURL());
+        LOGGER.info("Token --> " + this.influxDBConfig.getInfluxToken());
+        LOGGER.info("Organization --> " + this.influxDBConfig.getInfluxOrganization());
+        LOGGER.info("Bucket --> " + this.influxDBConfig.getInfluxBucket());
+
+        try {
+            this.influxDB = InfluxDBClientFactory.
+                    create(this.influxDBConfig.getInfluxDBURL(),
+                            this.influxDBConfig.getInfluxToken().toCharArray(),
+                            this.influxDBConfig.getInfluxOrganization(),
+                            this.influxDBConfig.getInfluxBucket());
+        }
+        catch (Exception e)
+        {
+            LOGGER.error("Failed to create client", e);
+        }
     }
 
     /**
@@ -49,15 +61,10 @@ public void setupInfluxClient() {
     public void write(Point point) {
 
         // Write by Data Point
-        try (WriteApi writeApi = this.influxDB.getWriteApi()) {
+       try (WriteApi writeApi = this.influxDB.makeWriteApi()) {
 
             writeApi.writePoint(point);
         }
-
-        catch (Exception e)
-        {
-            LOGGER.error("Failed writing to influx", e);
-        }
     }
 
     public void close()