Merge pull request #39 from Cubxity/dev/0.3.x

UnifiedMetrics 0.3.2

Author: Cubxity

.github/assets/dmc.png

@@ -17,7 +17,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew shadowJar --no-daemon
+        run: ./gradlew assemble --no-daemon
       - name: Set variables
         id: vars
         run: echo ::set-output name=version::${GITHUB_REF#refs/*\/dev/}
@@ -29,4 +29,4 @@ jobs:
           title: "Development Build (${{ steps.vars.outputs.version }})"
           files: |
             api/build/libs/*.jar
-            platforms/*/build/libs/*.jar
+            platforms/*/build/libs/*(.jar|!(*-dev.jar))

.github/assets/grafana.png

@@ -17,7 +17,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew shadowJar --no-daemon
+        run: ./gradlew assemble --no-daemon
       - name: Set variables
         id: vars
         run: echo ::set-output name=version::${GITHUB_REF#refs/tags/v}
@@ -28,4 +28,4 @@ jobs:
           title: "UnifiedMetrics ${{ steps.vars.outputs.version }}"
           files: |
             api/build/libs/*.jar
-            platforms/*/build/libs/*.jar
+            platforms/*/build/libs/*(.jar|!(*-dev.jar))

.github/workflows/preview.yml

@@ -9,11 +9,7 @@ UnifiedMetrics is a fully-featured free and open-source metrics collection plugi
 licensed under [GNU LGPLv3](COPYING.LESSER).
 
 ![Grafana Dashboard](.github/assets/grafana.png)
-<p align="center">
-    <a href="https://snapshot.raintank.io/dashboard/snapshot/i0Btqtz01e4DkmW3N89y61wc5tIMJZKm">
-        Click here for preview!
-    </a>
-</p>
+*This is a custom-made dashboard, which is not public, yet.*
 
 ## Features
 
@@ -28,6 +24,7 @@ licensed under [GNU LGPLv3](COPYING.LESSER).
 **Server:**
 
 - 1.8+ Spigot servers *(includes Spigot-based forks)*
+- 1.16+ Fabric servers
 - Minestom
 - Velocity
 - BungeeCord
@@ -90,13 +87,13 @@ $ git clone https://github.com/Cubxity/UnifiedMetrics && cd UnifiedMetrics
 Open a terminal in the cloned directory and run the following command. The following command will build all subprojects.
 
 ```bash
-$ ./gradlew shadowJar
+$ ./gradlew assemble
 ```
 
 To build a specific subproject, you can prefix it with the subproject path. For example:
 
 ```bash
-$ `./gradlew :unifiedmetrics-platform-bukkit:shadowJar`
+$ `./gradlew :unifiedmetrics-platform-bukkit:assemble`
 ```
 
 The output artifacts can be found in `subproject/build/libs`.
@@ -115,6 +112,10 @@ val api = UnifiedMetricsProvider.get()
 
 ## Special Thanks
 
+UnifiedMetrics is a proud partner of DedicatedMC! Get your Raw Power Hosting today with **15% OFF** using code `UnifiedMetrics`!
+
+[![DedicatedMC Logo](.github/assets/dmc.png)](https://dedimc.promo/UnifiedMetrics)
+
 YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET
 applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/),
 [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/),

.github/workflows/release.yml

@@ -19,6 +19,7 @@ package dev.cubxity.plugins.metrics.api.metric.collector
 
 import dev.cubxity.plugins.metrics.api.metric.data.Metric
 
+const val NANOSECONDS_PER_MILLISECOND: Double = 1E6
 const val NANOSECONDS_PER_SECOND: Double = 1E9
 const val MILLISECONDS_PER_SECOND: Double = 1E3
 

README.md

@@ -21,6 +21,7 @@ sealed class PlatformType(val name: String) {
     // Server implementations
     object Bukkit : PlatformType("Bukkit")
     object Minestom : PlatformType("Minestom")
+    object Fabric : PlatformType("Fabric")
 
     // Proxies
     object Velocity : PlatformType("Velocity")

api/src/main/kotlin/dev/cubxity/plugins/metrics/api/metric/collector/Collector.kt

@@ -28,7 +28,7 @@ plugins {
 allprojects {
     group = "dev.cubxity.plugins"
     description = "Fully featured metrics collector agent for Minecraft servers."
-    version = "0.3.1"
+    version = "0.3.2"
 
     repositories {
         mavenCentral()
@@ -45,4 +45,9 @@ subprojects {
             freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn")
         }
     }
+    afterEvaluate {
+        tasks.findByName("shadowJar")?.also {
+            tasks.named("assemble") { dependsOn(it) }
+        }
+    }
 }

api/src/main/kotlin/dev/cubxity/plugins/metrics/api/platform/PlatformType.kt

@@ -39,29 +39,30 @@ enum class PrometheusMode {
 @Serializable
 data class PrometheusHttpConfig(
     val host: String = "0.0.0.0",
-    val port: Int = 9100
+    val port: Int = 9100,
+    val authentication: AuthenticationConfig = AuthenticationConfig()
 )
 
 @Serializable
 data class PushGatewayConfig(
     val job: String = "unifiedmetrics",
     val url: String = "http://pushgateway:9091",
-    val authentication: PushGatewayAuthenticationConfig = PushGatewayAuthenticationConfig(),
+    val authentication: AuthenticationConfig = AuthenticationConfig(),
     val interval: Long = 10
 )
 
 @Serializable
-data class PushGatewayAuthenticationConfig(
-    val scheme: PushGatewayAuthenticationScheme = PushGatewayAuthenticationScheme.Basic,
-    val username: String = "username",
-    val password: String = "password"
-)
-
-@Serializable
-enum class PushGatewayAuthenticationScheme {
+enum class AuthenticationScheme {
     @SerialName("NONE")
     None,
 
     @SerialName("BASIC")
     Basic
-}
+}
+
+@Serializable
+data class AuthenticationConfig(
+    val scheme: AuthenticationScheme = AuthenticationScheme.None,
+    val username: String = "username",
+    val password: String = "password"
+)

build.gradle.kts

@@ -17,25 +17,48 @@
 
 package dev.cubxity.plugins.metrics.prometheus.exporter
 
+import com.sun.net.httpserver.BasicAuthenticator
 import dev.cubxity.plugins.metrics.api.UnifiedMetrics
 import dev.cubxity.plugins.metrics.prometheus.PrometheusMetricsDriver
 import dev.cubxity.plugins.metrics.prometheus.collector.UnifiedMetricsCollector
+import dev.cubxity.plugins.metrics.prometheus.config.AuthenticationScheme
 import io.prometheus.client.CollectorRegistry
 import io.prometheus.client.exporter.HTTPServer
-import java.net.InetSocketAddress
 
-class PrometheusHTTPExporter(private val api: UnifiedMetrics, private val driver: PrometheusMetricsDriver) : PrometheusExporter {
+class PrometheusHTTPExporter(
+    private val api: UnifiedMetrics,
+    private val driver: PrometheusMetricsDriver
+) : PrometheusExporter {
     private var server: HTTPServer? = null
 
     override fun initialize() {
         val registry = CollectorRegistry()
         registry.register(UnifiedMetricsCollector(api))
 
-        server = HTTPServer(InetSocketAddress(driver.config.http.host, driver.config.http.port), registry)
+        server = HTTPServer.Builder()
+            .withHostname(driver.config.http.host)
+            .withPort(driver.config.http.port)
+            .withRegistry(registry)
+            .apply {
+                with(driver.config.http.authentication) {
+                    if (scheme == AuthenticationScheme.Basic) {
+                        withAuthenticator(Authenticator(username, password))
+                    }
+                }
+            }
+            .build()
     }
 
     override fun close() {
         server?.close()
         server = null
     }
+
+    private class Authenticator(
+        private val username: String,
+        private val password: String
+    ) : BasicAuthenticator("unifiedmetrics") {
+        override fun checkCredentials(username: String?, password: String?): Boolean =
+            this.username == username && this.password == password
+    }
 }