Skip to content

Commit

Permalink
Merge pull request #452 from modelix/experiment/monitoring
Browse files Browse the repository at this point in the history
MODELIX-720 Add ktor Micrometer monitoring endpoint
  • Loading branch information
nkoester authored Jan 30, 2024
2 parents 2dd4605 + d0d0958 commit 6ab3772
Show file tree
Hide file tree
Showing 15 changed files with 1,946 additions and 27 deletions.
11 changes: 0 additions & 11 deletions bulk-model-sync-gradle-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@ kotlin {
jvmToolchain(11)
}

tasks.register("runModelServer", JavaExec::class) {
group = "modelix"

description = "Launches a model-server instance to be used as a target for the test. " +
"This task will block and is intended to be run in a separate process, apart from the actual test execution."

classpath = sourceSets["main"].runtimeClasspath
mainClass.set("org.modelix.model.server.Main")
args("-inmemory", "-port", "28309")
}

val repoDir = project.layout.buildDirectory.dir("test-repo").get().asFile

val copyTestRepo by tasks.registering(Sync::class) {
Expand Down
6 changes: 5 additions & 1 deletion bulk-model-sync-gradle-test/ci.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/sh

set -e
set -x

cd "$(dirname "$0")"

Expand All @@ -19,9 +20,12 @@ if [ "${CI}" != "true" ]; then
}
fi

./gradlew runModelServer --console=plain &
cd ..
./gradlew :model-server:run --console=plain --args="-inmemory -port 28309" &
MODEL_SERVER_PID=$!

cd "$(dirname "$0")"

curl -X GET --retry 30 --retry-connrefused --retry-delay 1 http://localhost:28309/health

./gradlew runSyncTestPush --console=plain --stacktrace
Expand Down
Binary file added docs/global/modules/core/images/metrics.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 6ab3772

Please sign in to comment.