refactor(server): split ktor config into separate files #1816
Conversation
| import io.github.typesafegithub.workflows.actionbindinggenerator.domain.ActionCoords | ||
| import io.ktor.http.Parameters | ||
|
|
||
| fun ActionCoords( |
There was a problem hiding this comment.
Used both in artifact and metadata
| val nameAndPath = parameters["name"]!!.split("__") | ||
| val name = nameAndPath.first() | ||
| val path = nameAndPath.drop(1).joinToString("/").takeUnless { it.isBlank() } | ||
| val version = if (extractVersion) parameters["version"]!! else "irrelevant" |
There was a problem hiding this comment.
This was the only difference between the two constructions of ActionCoords
|
|
||
| val bindingsCache = Cache.Builder<ActionCoords, ArtifactResult>().expireAfterWrite(1.hours).build() | ||
|
|
||
| fun Routing.artifactRoute() { |
There was a problem hiding this comment.
Extracted from the main file, with minor 'flavor' changes. No functionality should have changed
| get("/metrics") { | ||
| call.respondText(prometheusRegistry.scrape()) | ||
| } |
There was a problem hiding this comment.
Required for prometheus to get the metrics
|
|
||
| private val deliverOnRefreshRoute = System.getenv("GWKT_DELIVER_ON_REFRESH").toBoolean() | ||
| suspend fun ApplicationCall.respondNotFound() = respondText("Not found", status = HttpStatusCode.NotFound) |
There was a problem hiding this comment.
Function used both in artifact and metadata. Couldn't find a better place to put it
| import io.ktor.server.routing.get | ||
| import io.ktor.server.routing.route | ||
|
|
||
| fun Routing.metadataRoute() { |
There was a problem hiding this comment.
Extracted from the main file, with minor 'flavor' changes. No functionality should have changed
There was a problem hiding this comment.
Completely removed and replaced with Micrometer
LeoColman
force-pushed
the
leocolman-patch
branch
from
2a168e8 to
d31c621
Compare
| metadata(refresh = true) | ||
| } | ||
| } | ||
| routing { |
There was a problem hiding this comment.
Thanks for the PR 😄 This one mixes several kinds of changes (also unrelated to what you're after originally, so switching to Micrometer), so let's take it bit by bit.
The first change I propose to put into a separate PR is moving ktor-related routes and plugins config into separate file(s). I've always wanted to do it, especially when the endpoints got a bit more complicated, but somehow didn't get there. Let's put into a separate PR that just does this refactor and nothing else, so that it's easy to review and minimizes risk of regressions.
Once we have that merged, let's see what's left in this PR, probably will need to extract some more. Alternatively, I'm totally fine if you cannot afford iterating this way, and just want to use Micrometer - then, please jsut send a PR that introduces minimal changes to achieve it, without any larger refactors to not blur the diff.
LeoColman
force-pushed
the
leocolman-patch
branch
from
d31c621 to
907804d
Compare
jit-binding-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/Main.kt
Outdated
Show resolved
Hide resolved
...r/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/OpenTelemetryConfig.kt
Outdated
Show resolved
Hide resolved
...g-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ActionCoords.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ArtifactRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ArtifactRoute.kt
Outdated
Show resolved
Hide resolved
...-server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ArtifactRoute.kt
Outdated
Show resolved
Hide resolved
LeoColman
force-pushed
the
leocolman-patch
branch
2 times, most recently
from
8b76824 to
0c9d461
Compare
...server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/MetadataRoutes.kt
Outdated
Show resolved
Hide resolved
LeoColman
force-pushed
the
leocolman-patch
branch
from
0c9d461 to
81402fd
Compare
...server/src/main/kotlin/io/github/typesafegithub/workflows/jitbindingserver/ArtifactRoutes.kt
Outdated
Show resolved
Hide resolved
…rkflows/jitbindingserver/ArtifactRoutes.kt
krzema12
changed the title
This PR prepares the ground to add metrics by refactoring the code to enhance metric-attachment-points.