er det kult med versjonsummeret i manifestet?

navikt · Nov 25, 2024 · 73fdf9f · 73fdf9f
1 parent 42fdc22
commit 73fdf9f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -80,6 +80,15 @@ subprojects {
     }
 
     tasks {
+        withType<Jar> {
+            manifest {
+                attributes(mapOf(
+                    "Implementation-Title" to project.name,
+                    "Implementation-Version" to project.version
+                ))
+            }
+        }
+
         withType<Test> {
             useJUnitPlatform()
             testLogging {

diff --git a/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt b/naisful-app/src/main/kotlin/com/github/navikt/tbd_libs/naisful/NaisfulApp.kt
@@ -18,12 +18,10 @@ import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import io.ktor.util.*
+import io.micrometer.core.instrument.MultiGauge
+import io.micrometer.core.instrument.Tags
 import io.micrometer.core.instrument.Timer
-import io.micrometer.core.instrument.binder.jvm.ClassLoaderMetrics
-import io.micrometer.core.instrument.binder.jvm.JvmGcMetrics
-import io.micrometer.core.instrument.binder.jvm.JvmInfoMetrics
-import io.micrometer.core.instrument.binder.jvm.JvmMemoryMetrics
-import io.micrometer.core.instrument.binder.jvm.JvmThreadMetrics
+import io.micrometer.core.instrument.binder.jvm.*
 import io.micrometer.core.instrument.binder.logging.LogbackMetrics
 import io.micrometer.core.instrument.binder.system.ProcessorMetrics
 import io.micrometer.prometheusmetrics.PrometheusMeterRegistry
@@ -204,6 +202,18 @@ fun Application.standardApiModule(
         }
     }
 
+    with(meterRegistry) {
+        val pkg = this.javaClass.`package`
+        val vendor = pkg?.implementationVendor ?: "unknown"
+        val version = pkg?.implementationVersion ?: "unknown"
+        MultiGauge.builder("naisful.info")
+            .description("Naisful version info")
+            .tag("vendor", vendor)
+            .tag("version", version)
+            .register(this)
+            .register(listOf(MultiGauge.Row.of(Tags.of(emptyList()), 1)))
+    }
+
     val readyToggle = AtomicBoolean(false)
     monitor.subscribe(ApplicationStarted) {
         readyToggle.set(true)