Add connections and unmonitored hosts to stats in JSON format

Author: Michel Zimmer

Dockerfile

@@ -12,10 +12,10 @@ LABEL org.opencontainers.image.vendor="neuland – Büro für Informatik GmbH"
 LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.title="bandwhichd-server"
 LABEL org.opencontainers.image.description="bandwhichd server collecting measurements and calculating statistics"
-LABEL org.opencontainers.image.version="0.6.0-rc7"
+LABEL org.opencontainers.image.version="0.6.0-rc8"
 USER guest
 ENTRYPOINT ["/opt/java/openjdk/bin/java"]
 CMD ["-jar", "/opt/bandwhichd-server.jar"]
 EXPOSE 8080
 STOPSIGNAL SIGTERM
-COPY --from=build --chown=root:root /tmp/bandwhichd-server/target/scala-3.1.3/bandwhichd-server-assembly-0.6.0-rc7.jar /opt/bandwhichd-server.jar
+COPY --from=build --chown=root:root /tmp/bandwhichd-server/target/scala-3.1.3/bandwhichd-server-assembly-0.6.0-rc8.jar /opt/bandwhichd-server.jar

build.sbt

@@ -2,7 +2,7 @@ lazy val root = (project in file("."))
   .settings(
     organization := "de.neuland-bfi",
     name := "bandwhichd-server",
-    version := "0.6.0-rc7",
+    version := "0.6.0-rc8",
     scalaVersion := "3.1.3",
     Compile / scalaSource := baseDirectory.value / "src" / "main" / "scala",
     Test / scalaSource := baseDirectory.value / "src" / "test" / "scala",
@@ -22,12 +22,12 @@ lazy val root = (project in file("."))
         val oldStrategy = (ThisBuild / assemblyMergeStrategy).value
         oldStrategy(path)
     },
-    libraryDependencies += "co.fs2" %% "fs2-core" % "3.2.8",
-    libraryDependencies += "co.fs2" %% "fs2-reactive-streams" % "3.2.8",
+    libraryDependencies += "co.fs2" %% "fs2-core" % "3.2.12",
+    libraryDependencies += "co.fs2" %% "fs2-reactive-streams" % "3.2.12",
     libraryDependencies += "com.comcast" %% "ip4s-core" % "3.1.3",
     libraryDependencies += "com.comcast" %% "ip4s-test-kit" % "3.1.3" % "test",
     libraryDependencies += "com.datastax.oss" % "java-driver-core" % "4.14.1",
-    libraryDependencies += "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.8" % "test",
+    libraryDependencies += "com.dimafeng" %% "testcontainers-scala-scalatest" % "0.40.10" % "test",
     libraryDependencies += "io.circe" %% "circe-core" % "0.14.2",
     libraryDependencies += "io.circe" %% "circe-parser" % "0.14.2",
     libraryDependencies += "org.http4s" %% "http4s-circe" % "1.0.0-M32",
@@ -36,8 +36,8 @@ lazy val root = (project in file("."))
     libraryDependencies += "org.http4s" %% "http4s-ember-server" % "1.0.0-M32",
     libraryDependencies += "org.scalatest" %% "scalatest" % "3.2.12" % "test",
     libraryDependencies += "org.scalatestplus" %% "scalacheck-1-16" % "3.2.12.0" % "test",
-    libraryDependencies += "org.slf4j" % "slf4j-simple" % "1.7.36" % "runtime",
-    libraryDependencies += "org.typelevel" %% "cats-effect" % "3.3.12",
+    libraryDependencies += "org.slf4j" % "slf4j-simple" % "2.0.0" % "runtime",
+    libraryDependencies += "org.typelevel" %% "cats-effect" % "3.3.14",
     libraryDependencies += "org.typelevel" %% "cats-effect-testing-scalatest" % "1.4.0" % "test",
-    libraryDependencies += "org.typelevel" %% "log4cats-slf4j" % "2.3.2"
+    libraryDependencies += "org.typelevel" %% "log4cats-slf4j" % "2.4.0"
   )

src/main/scala/de/neuland/bandwhichd/server/adapter/in/v1/stats/StatsCodecs.scala

@@ -19,9 +19,25 @@ object StatsCodecs {
                   monitoredHost.additionalHostnames.map(additionalHostname =>
                     Json.fromString(additionalHostname.toString)
                   )
-                )
+                ),
+                "connections" -> stats
+                  .connectionsFor(monitoredHost.hostId)
+                  .fold(Json.obj())(hostIdsToConnections => {
+                    Json.fromFields(
+                      hostIdsToConnections.map[(String, Json)]((hostId, _) => {
+                        hostId.uuid.toString -> Json.obj()
+                      })
+                    )
+                  })
               )
             )
+        ),
+        "unmonitoredHosts" -> Json.fromFields(
+          stats.unidentifiedRemoteHosts.map(unidentifiedRemoteHost => {
+            unidentifiedRemoteHost.hostId.uuid.toString -> Json.obj(
+              "host" -> Json.fromString(unidentifiedRemoteHost.host.toString)
+            )
+          })
         )
       )
 

src/main/scala/de/neuland/bandwhichd/server/domain/stats/Stats.scala

@@ -31,6 +31,13 @@ class Stats[L <: HostId, H <: AnyHost[L], R <: HostId] private (
       }
     }.toSet
 
+  def connectionsFor(hostId: L): Option[Map[R, Stats.Connection]] =
+    bundles
+      .get(hostId)
+      .map(bundle =>
+        bundle.connections.view.mapValues(_ => Stats.Connection()).toMap
+      )
+
   def dropBefore(timestamp: Timing.Timestamp): Stats[L, H, R] =
     new Stats(
       bundles
@@ -186,6 +193,8 @@ object Stats {
       stats.hosts ++ stats.unidentifiedRemoteHosts
   }
 
+  case class Connection()
+
   private[Stats] case class Bundle[L <: HostId, H <: AnyHost[L], R <: HostId](
       host: H,
       lastSeenAt: Timing.Timestamp,

src/test/scala/de/neuland/bandwhichd/server/BandwhichdServerApiV1Spec.scala

@@ -299,7 +299,16 @@ class BandwhichdServerApiV1Spec
           "hosts" -> obj(
             "c414c2da-714c-4b68-b97e-3f31e18053d2" -> obj(
               "hostname" -> fromString("some-host.example.com"),
-              "additional_hostnames" -> arr()
+              "additional_hostnames" -> arr(),
+              "connections" -> obj(
+                "c414c2da-714c-4b68-b97e-3f31e18053d2" -> obj(),
+                "959619ee-30a2-3bc8-9b79-4384b5f3f05d" -> obj()
+              )
+            )
+          ),
+          "unmonitoredHosts" -> obj(
+            "959619ee-30a2-3bc8-9b79-4384b5f3f05d" -> obj(
+              "host" -> fromString("192.168.10.34")
             )
           )
         )