cdsap · cdsap · Sep 14, 2023 · Sep 13, 2023 · Sep 14, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -22,10 +22,15 @@ jobs:
           name: assemble
           command: ./gradlew assemble
       - run:
-          name: test
+           name: test plugins
+           command: |
+             java --version
+             ./gradlew collectUnitTest  --stacktrace --info
+      - run:
+          name: test libs
           command: |
             java --version
-            ./gradlew collectUnitTest  --stacktrace --info
+            ./gradlew collectUnitTestLibs  --stacktrace --info
       - run:
           name: build sample
           command: |

diff --git a/README.md b/README.md
@@ -15,7 +15,6 @@ Current available plugins:
 | standard      | Contains all the available publishers listed below                   |
 | base          | Talaiot core functionality with Json, Output and Timeline publishers |
 | elasticsearch | Talaiot core functionality with Elasticsearch publisher              |
-| graph         | Talaiot core functionality with Graph publisher                      |
 | influxdb      | Talaiot core functionality with Influxdb publisher                   |
 | influxdb2     | Talaiot core functionality with Influxdb2 (Flux) publisher           |
 | pushgateway   | Talaiot core functionality with Pushgateway publisher                |
@@ -103,7 +102,6 @@ Each plugin is deployed to the Gradle Plugin Portal using thee following convent
 |----------------|-----------------------------------------|
 | base           | io.github.cdsap.talaiot.plugin.base           |
 | elasticsearch  | io.github.cdsap.talaiot.plugin.elasticsearch  |
-| graph          | io.github.cdsap.talaiot.plugin.graph          |
 | influxdb       | io.github.cdsap.talaiot.plugin.influxdb       |
 | pushgateway    | io.github.cdsap.talaiot.plugin.pushgateway    |
 | rethinkdb      | io.github.cdsap.talaiot.plugin.rehinkdb       |
@@ -214,7 +212,7 @@ talaiot {
 Read more about it in the [Metrics wiki page](https://github.com/cdsap/Talaiot/wiki/Metrics).
 
 ### Filters
-For every measurement done, Talaiot can filter the tasks tracked to be published. These filters don't apply to GraphPublishers:
+For every measurement done, Talaiot can filter the tasks tracked to be published.
 
 
  | Property             |      Description                                                                             |
@@ -373,31 +371,6 @@ influxDbPublisher {
 }
 ```
 
-#### TaskDependencyGraphPublisher
-Talaiot will generate the Task Dependency Graph in the specific format specified in the configuration
-
-
-| Property      |      Description                                                                                 |
-|---------------|--------------------------------------------------------------------------------------------------|
-| ignoreWhen    | Configuration to ignore the execution of the publisher                                           |
-| html          | Export the task dependency graph in Html format with support of [vis.js](http://visjs.org/)      |
-| gexf          | Export the task dependency graph in [gexf format](https://gephi.org/gexf/format/)                |
-| dot           | Export the task dependency graph in png format. See [Graphviz](https://graphviz.gitlab.io/) |
-
-This new category of publishers does not require constantly evaluating the builds, that's why there is an extra
-parameter configuration in the Publisher to ignore the execution unless there is some property enabled. Typical use case is
-use this publisher and collect the files on CI.
-
-The output will be found `"${project.rootDir}/talaiot`:
-
-![](resources/output_graph_publisher.png)
-
-Example:
-
-![](resources/graph_example_plaid.png)
-
-Included in: `io.github.cdsap.talaiot` and `io.github.cdsap.talaiot.plugin.graph` plugins.
-
 #### PushGatewayPublisher
 Talaiot will send to the PushGateway server defined in the configuration the values collected during the execution.
 

diff --git a/buildSrc/src/main/kotlin/io/github/cdsap/talaiot/buildplugins/TalaiotKotlinLibPlugin.kt b/buildSrc/src/main/kotlin/io/github/cdsap/talaiot/buildplugins/TalaiotKotlinLibPlugin.kt
@@ -41,7 +41,7 @@ class TalaiotKotlinLibPlugin : Plugin<Project> {
             val extension = extensions.getByType<BaseConfiguration>()
             setProjectVersion(extension.version)
             setProjectGroup(extension.group, Type.LIBRARY)
-            collectUnitTest()
+            collectUnitTestLibs()
             setUpPublishing(Type.LIBRARY)
             setUpSigning("TalaiotLib")
         }

diff --git a/buildSrc/src/main/kotlin/io/github/cdsap/talaiot/buildplugins/UnitTestExtensions.kt b/buildSrc/src/main/kotlin/io/github/cdsap/talaiot/buildplugins/UnitTestExtensions.kt
@@ -23,11 +23,30 @@ fun Project.collectUnitTest() = this.run {
         val pr = this
         testTask.configure(closureOf<TestReport> {
             group = "Verification"
-            description = "Collect all tests"
+            description = "Collect plugin tests"
 
             val testTask = pr.tasks.find { it.name == "test" }
             testTask?.let { reportOn(testTask) }
             destinationDir = file("${rootProject.buildDir}/reports/tests")
         })
 
-}
+}
+
+fun Project.collectUnitTestLibs() = this.run {
+    val testTask = if (rootProject.tasks.findByPath("collectUnitTestLibs") == null) {
+        rootProject.tasks.create("collectUnitTestLibs", TestReport::class) {
+        }
+    } else {
+        rootProject.tasks["collectUnitTestLibs"]
+    }
+    val pr = this
+    testTask.configure(closureOf<TestReport> {
+        group = "Verification"
+        description = "Collect tests libs modules"
+
+        val testTask = pr.tasks.find { it.name == "test" }
+        testTask?.let { reportOn(testTask) }
+        destinationDir = file("${rootProject.buildDir}/reports/tests")
+    })
+
+}
diff --git a/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/TalaiotBuildService.kt b/library/core/talaiot/src/main/kotlin/io/github/cdsap/talaiot/TalaiotBuildService.kt
@@ -9,7 +9,6 @@ import org.gradle.api.services.BuildService
 import org.gradle.api.services.BuildServiceParameters
 import org.gradle.tooling.events.FinishEvent
 import org.gradle.tooling.events.OperationCompletionListener
-import java.util.concurrent.Executors
 
 /**
  * Tracks information of the tasks executed duting the build.
@@ -49,19 +48,16 @@ abstract class TalaiotBuildService :
 
     override fun close() {
 
-        val executor = Executors.newSingleThreadExecutor()
         val end = System.currentTimeMillis()
 
-        executor.execute {
-            parameters.publisher.get().publish(
-                taskLengthList = taskLengthList,
-                start = start,
-                configuraionMs = configurationTime,
-                end = end,
-                duration = end - start,
-                success = taskLengthList.none { it.state == TaskMessageState.FAILED }
-            )
-        }
+        parameters.publisher.get().publish(
+            taskLengthList = taskLengthList,
+            start = start,
+            configuraionMs = configurationTime,
+            end = end,
+            duration = end - start,
+            success = taskLengthList.none { it.state == TaskMessageState.FAILED }
+        )
     }
 
     override fun onFinish(event: FinishEvent?) {

diff --git a/...gins/talaiot-standard/src/test/kotlin/io/github/cdsap/talaiot/DefaultConfigurationSpec.kt b/...gins/talaiot-standard/src/test/kotlin/io/github/cdsap/talaiot/DefaultConfigurationSpec.kt
@@ -46,7 +46,7 @@ class DefaultConfigurationSpec : StringSpec({
                 .withPluginClasspath()
                 .withGradleVersion(version)
                 .build()
-            Thread.sleep(2000)
+            Thread.sleep(5000)
             val reportFile = File(testProjectDir.getRoot(), "build/reports/talaiot/json/data.json")
             val report = Gson().fromJson(reportFile.readText(), ExecutionReport::class.java)
 

diff --git a/...gins/talaiot-standard/src/test/kotlin/io/github/cdsap/talaiot/OutputPublisherBuildTest.kt b/...gins/talaiot-standard/src/test/kotlin/io/github/cdsap/talaiot/OutputPublisherBuildTest.kt
@@ -31,7 +31,6 @@ class OutputPublisherBuildTest : BehaviorSpec({
                 .withArguments("assemble")
                 .withPluginClasspath()
                 .build()
-            Thread.sleep(2000)
 
             then("logs are shown in the output with the shrugged") {
                 assert(result.output.contains("OutputPublisher"))

diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists