Bump (#62)

* push * dashboards fixed * v8 * bump build versions * cache bump * scoverage disabled for 2.12 Co-authored-by: timure <[email protected]>
jacum · Apr 11, 2021 · c4c9de2 · c4c9de2
1 parent b86f535
commit c4c9de2
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 99 deletions.
diff --git a/README.md b/README.md
@@ -106,8 +106,8 @@ Sensors' bundled dashboards will be imported.
 ```
 libraryDependencies ++= 
   Seq(
-     "nl.pragmasoft.sensors" %% "sensors-core" % "0.1.0",
-     "nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.1.0"
+     "nl.pragmasoft.sensors" %% "sensors-core" % "0.1.1",
+     "nl.pragmasoft.sensors" %% "sensors-cassandra" % "0.1.1"
   )
 ```
 

diff --git a/azure-build.yaml b/azure-build.yaml
@@ -15,7 +15,7 @@ variables:
   - name: IVY_HOME
     value: $(Pipeline.Workspace)/.ivy2
   - name: CACHE_RUN_ID
-    value: "201009"
+    value: "210411"
 
 steps:
 
@@ -33,7 +33,7 @@ steps:
 
   - task: JavaToolInstaller@0
     inputs:
-      versionSpec: '11'
+      versionSpec: '8'
       jdkArchitectureOption: 'x64'
       jdkSourceOption: 'PreInstalled'
       cleanDestinationDirectory: false
@@ -43,13 +43,15 @@ steps:
     inputs:
       targetType: 'inline'
       script: |
-        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.12; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
+        # coverage disabled due to https://github.com/scoverage/sbt-scoverage/issues/319
+        # sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
+        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; test; "
       failOnStderr: false
 
   - task: Bash@3
     displayName: 'Building and testing 2.13'
     inputs:
       targetType: 'inline'
       script: |
-        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.4; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
+        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.5; clean; coverage; test; coverageReport" && bash <(curl -s https://codecov.io/bash)
       failOnStderr: false
diff --git a/azure-release.yaml b/azure-release.yaml
@@ -36,8 +36,8 @@ steps:
         git config --global user.email "tim@@pragmasoft.nl"
         git config --global user.name "Azure Devops release pipeline"
 
-        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.12; test"
-        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.4; test"
+        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.12.13; test"
+        sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "++2.13.5; test"
         sbt -Divy.home=${IVY_HOME} -Dsbt.ivy.home=${IVY_HOME} "release with-defaults"
 
         rm -rf $(secring.secureFilePath)

diff --git a/build.sbt b/build.sbt
@@ -4,8 +4,8 @@ import sbt.file
 
 val commonSettings = Defaults.coreDefaultSettings ++ Seq(
   organization := "nl.pragmasoft.sensors",
-  crossScalaVersions := Seq("2.13.4", "2.12.13"),
-  scalaVersion :=  "2.13.4",
+  crossScalaVersions := Seq("2.13.5", "2.12.13"),
+  scalaVersion :=  "2.13.5",
   testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"),
   parallelExecution in Test := false,
   Test / fork := true,
@@ -82,3 +82,4 @@ lazy val `app` = project.in(file("examples/app"))
 lazy val `root` =  project.in(file("."))
   .aggregate(app, `sensors-core`, `sensors-cassandra`)
   .settings(commonSettings ++ noPublishSettings)
+  .settings(name := "Akka Sensors")
diff --git a/examples/app/src/main/resources/application.conf b/examples/app/src/main/resources/application.conf
@@ -78,7 +78,6 @@ akka {
     cassandra {
 
       session-provider = "akka.sensors.cassandra.InstrumentedCassandraSessionProvider"
-      session-provider-config = "sensors-cassandra-session-provider"
 
       session-dispatcher = "akka.persistence.cassandra.default-dispatcher"
       datastax-java-driver-config = "datastax-java-driver"
@@ -158,18 +157,13 @@ akka {
   }
 }
 
-sensors-cassandra-session-provider {
-  profile = "akka-persistence-cassandra-profile"
-  username = "admin"
-  password = "admin"
-  local-datacenter = "datacenter1"
-  contact-points = "localhost"
-  port = 9042
-}
-
-
 datastax-java-driver {
-  load-balancing-policy.local-datacenter = "datacenter1"
+  basic {
+    username = "admin"
+    password = "admin"
+    contact-points = ["localhost"]
+    load-balancing-policy.local-datacenter = "datacenter1"
+  }
   advanced.metrics {
     session.enabled = [ connected-nodes, cql-requests,  bytes-sent, bytes-received,  cql-client-timeouts  ]
   }

diff --git a/examples/app/src/main/scala/nl/pragmasoft/app/Main.scala b/examples/app/src/main/scala/nl/pragmasoft/app/Main.scala
@@ -22,14 +22,14 @@ object Main extends IOApp with LazyLogging {
 
     val mainResource: Resource[IO, Server[IO]] =
       for {
-        _ <- Resource.liftF(IO.async[Unit] { callback =>
+        _ <- Resource.eval(IO.async[Unit] { callback =>
           Cluster(system).registerOnMemberUp {
             logger.info("Akka cluster is now up")
             callback(Right(()))
           }
         })
         _ <- MetricService.resource(
-          InetSocketAddress.createUnresolved("0.0.0.0", 8081)
+          InetSocketAddress.createUnresolved("0.0.0.0", 9095)
         )
         apiService <- ApiService.resource(
           InetSocketAddress.createUnresolved("0.0.0.0", 8080),

diff --git a/examples/observability/docker-compose.yml b/examples/observability/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   app:
     image: app:latest
-    ports: ["8080:8080", "8081:8081"]
+    ports: ["8080:8080", "9095:9095"]
     networks: [observability]
 
   prometheus:

diff --git a/examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/cassandra.json b/examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/cassandra.json
@@ -24,7 +24,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -128,7 +128,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -237,7 +237,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -349,7 +349,7 @@
           "text": "Sensors",
           "value": "Sensors"
         },
-        "datasource": "Prometheus-local",
+        "datasource": "Prometheus-Local",
         "definition": "label_values(jvm_info,job)",
         "error": null,
         "hide": 0,

diff --git a/examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/dispatchers.json b/examples/observability/grafana/plugins/sensors-prometheus-app/dashboards/dispatchers.json
@@ -24,7 +24,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -127,7 +127,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -230,7 +230,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -333,7 +333,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -449,7 +449,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -553,7 +553,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
-      "datasource": "Prometheus-local",
+      "datasource": "Prometheus-Local",
       "description": "",
       "editable": true,
       "error": false,
@@ -673,7 +673,7 @@
           "text": "Sensors",
           "value": "Sensors"
         },
-        "datasource": "Prometheus-local",
+        "datasource": "Prometheus-Local",
         "definition": "label_values(jvm_info,job)",
         "error": null,
         "hide": 0,