forked from woggioni/rbcs
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
bfce91905f
|
|||
|
ab2a06e810
|
|||
|
1d938b7ea3
|
@@ -58,6 +58,18 @@ jobs:
|
|||||||
tags: |
|
tags: |
|
||||||
gitea.woggioni.net/woggioni/rbcs:dev-redis
|
gitea.woggioni.net/woggioni/rbcs:dev-redis
|
||||||
target: release-redis
|
target: release-redis
|
||||||
|
-
|
||||||
|
name: Build rbcs full Docker image
|
||||||
|
uses: docker/build-push-action@v5.3.0
|
||||||
|
with:
|
||||||
|
builder: "multiplatform-builder"
|
||||||
|
context: "docker/build/docker"
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
pull: true
|
||||||
|
tags: |
|
||||||
|
gitea.woggioni.net/woggioni/rbcs:dev-full
|
||||||
|
target: release-full
|
||||||
-
|
-
|
||||||
name: Build rbcs native Docker image
|
name: Build rbcs native Docker image
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
|
|||||||
@@ -61,6 +61,19 @@ jobs:
|
|||||||
gitea.woggioni.net/woggioni/rbcs:redis
|
gitea.woggioni.net/woggioni/rbcs:redis
|
||||||
gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-redis
|
gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-redis
|
||||||
target: release-redis
|
target: release-redis
|
||||||
|
-
|
||||||
|
name: Build rbcs full Docker image
|
||||||
|
uses: docker/build-push-action@v5.3.0
|
||||||
|
with:
|
||||||
|
builder: "multiplatform-builder"
|
||||||
|
context: "docker/build/docker"
|
||||||
|
platforms: linux/amd64,linux/arm64
|
||||||
|
push: true
|
||||||
|
pull: true
|
||||||
|
tags: |
|
||||||
|
gitea.woggioni.net/woggioni/rbcs:full
|
||||||
|
gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-full
|
||||||
|
target: release-full
|
||||||
-
|
-
|
||||||
name: Build rbcs native Docker image
|
name: Build rbcs native Docker image
|
||||||
uses: docker/build-push-action@v5.3.0
|
uses: docker/build-push-action@v5.3.0
|
||||||
|
|||||||
5
.gitignore
vendored
5
.gitignore
vendored
@@ -5,3 +5,8 @@
|
|||||||
build
|
build
|
||||||
|
|
||||||
rbcs-cli/native-image/*.json
|
rbcs-cli/native-image/*.json
|
||||||
|
|
||||||
|
# Ignore JDTLS files
|
||||||
|
.classpath
|
||||||
|
.project
|
||||||
|
.settings
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ Configures TLS encryption.
|
|||||||
<rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:rbcs="urn:net.woggioni.rbcs.server"
|
xmlns:rbcs="urn:net.woggioni.rbcs.server"
|
||||||
xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs-server.xsd"
|
xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs-server.xsd"
|
||||||
|
path="/my/custom/path"
|
||||||
>
|
>
|
||||||
<bind host="0.0.0.0" port="8080" incoming-connections-backlog-size="1024" proxy-protocol="true">
|
<bind host="0.0.0.0" port="8080" incoming-connections-backlog-size="1024" proxy-protocol="true">
|
||||||
<trusted-proxies>
|
<trusted-proxies>
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ FROM base-release AS release-vanilla
|
|||||||
ADD rbcs-cli-envelope-*.jar rbcs.jar
|
ADD rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
ADD logback.xml /etc/rbcs/logback.xml
|
ADD logback.xml /etc/rbcs/logback.xml
|
||||||
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
||||||
ENTRYPOINT ["java", "-Dlogback.configurationFile=/etc/rbcs/logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
ENV JDK_JAVA_OPTIONS=-Dlogback.configurationFile=/etc/rbcs/logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC
|
||||||
|
ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
||||||
|
|
||||||
FROM base-release AS release-memcache
|
FROM base-release AS release-memcache
|
||||||
ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
|
ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
@@ -16,8 +17,7 @@ WORKDIR /var/lib/rbcs/plugins
|
|||||||
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
|
||||||
WORKDIR /var/lib/rbcs
|
WORKDIR /var/lib/rbcs
|
||||||
ADD logback.xml /etc/rbcs/logback.xml
|
ADD logback.xml /etc/rbcs/logback.xml
|
||||||
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
||||||
ENTRYPOINT ["java", "-Dlogback.configurationFile=/etc/rbcs/logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
|
||||||
|
|
||||||
FROM base-release AS release-redis
|
FROM base-release AS release-redis
|
||||||
ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
|
ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
@@ -26,8 +26,19 @@ WORKDIR /var/lib/rbcs/plugins
|
|||||||
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-redis*.tar
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-redis*.tar
|
||||||
WORKDIR /var/lib/rbcs
|
WORKDIR /var/lib/rbcs
|
||||||
ADD logback.xml /etc/rbcs/logback.xml
|
ADD logback.xml /etc/rbcs/logback.xml
|
||||||
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
||||||
ENTRYPOINT ["java", "-Dlogback.configurationFile=/etc/rbcs/logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
|
||||||
|
FROM base-release AS release-full
|
||||||
|
ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
|
||||||
|
RUN mkdir plugins
|
||||||
|
WORKDIR /var/lib/rbcs/plugins
|
||||||
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
|
||||||
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-redis*.tar
|
||||||
|
RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-otel*.tar
|
||||||
|
WORKDIR /var/lib/rbcs
|
||||||
|
ADD logback.xml /etc/rbcs/logback.xml
|
||||||
|
ENV OTEL_SDK_DISABLED="true"
|
||||||
|
ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
|
||||||
|
|
||||||
FROM busybox:musl AS base-native
|
FROM busybox:musl AS base-native
|
||||||
RUN mkdir -p /var/lib/rbcs /var/tmp/rbcs /etc/rbcs
|
RUN mkdir -p /var/lib/rbcs /var/tmp/rbcs /etc/rbcs
|
||||||
@@ -54,5 +65,5 @@ USER rbcs
|
|||||||
WORKDIR /var/lib/rbcs
|
WORKDIR /var/lib/rbcs
|
||||||
ADD logback.xml /etc/rbcs/logback.xml
|
ADD logback.xml /etc/rbcs/logback.xml
|
||||||
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
|
||||||
ENV JAVA_OPTS=-XX:-UseJVMCICompiler\ -Dlogback.configurationFile=/etc/rbcs/logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC
|
ENV JDK_JAVA_OPTIONS=-XX:-UseJVMCICompiler\ -Dlogback.configurationFile=/etc/rbcs/logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC
|
||||||
ENTRYPOINT ["/usr/local/bin/rbcs-cli"]
|
ENTRYPOINT ["/usr/local/bin/rbcs-cli"]
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ dependencies {
|
|||||||
docker project(path: ':rbcs-cli', configuration: 'release')
|
docker project(path: ':rbcs-cli', configuration: 'release')
|
||||||
docker project(path: ':rbcs-server-memcache', configuration: 'release')
|
docker project(path: ':rbcs-server-memcache', configuration: 'release')
|
||||||
docker project(path: ':rbcs-server-redis', configuration: 'release')
|
docker project(path: ':rbcs-server-redis', configuration: 'release')
|
||||||
|
docker project(path: ':rbcs-server-otel', configuration: 'release')
|
||||||
}
|
}
|
||||||
|
|
||||||
Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
|
Provider<Task> cleanTaskProvider = tasks.named(BasePlugin.CLEAN_TASK_NAME) {}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ org.gradle.caching=true
|
|||||||
|
|
||||||
rbcs.version = 0.5.0
|
rbcs.version = 0.5.0
|
||||||
|
|
||||||
lys.version = 2026.03.26
|
lys.version = 2026.04.29
|
||||||
|
|
||||||
gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
|
gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
|
||||||
docker.registry.url=gitea.woggioni.net
|
docker.registry.url=gitea.woggioni.net
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ dependencies {
|
|||||||
api catalog.netty.buffer
|
api catalog.netty.buffer
|
||||||
api catalog.netty.handler
|
api catalog.netty.handler
|
||||||
api catalog.netty.codec.http
|
api catalog.netty.codec.http
|
||||||
|
api catalog.jetbrains.annotations
|
||||||
}
|
}
|
||||||
|
|
||||||
publishing {
|
publishing {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ module net.woggioni.rbcs.api {
|
|||||||
requires io.netty.buffer;
|
requires io.netty.buffer;
|
||||||
requires org.slf4j;
|
requires org.slf4j;
|
||||||
requires java.xml;
|
requires java.xml;
|
||||||
|
requires org.jetbrains.annotations;
|
||||||
|
|
||||||
exports net.woggioni.rbcs.api;
|
exports net.woggioni.rbcs.api;
|
||||||
exports net.woggioni.rbcs.api.exception;
|
exports net.woggioni.rbcs.api.exception;
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ import java.util.stream.Collectors;
|
|||||||
public class Configuration {
|
public class Configuration {
|
||||||
String host;
|
String host;
|
||||||
int port;
|
int port;
|
||||||
|
String serverPath;
|
||||||
boolean proxyProtocolEnabled;
|
boolean proxyProtocolEnabled;
|
||||||
List<Cidr> trustedProxyIPs;
|
List<Cidr> trustedProxyIPs;
|
||||||
int incomingConnectionsBacklogSize;
|
int incomingConnectionsBacklogSize;
|
||||||
String serverPath;
|
|
||||||
@NonNull
|
@NonNull
|
||||||
EventExecutor eventExecutor;
|
EventExecutor eventExecutor;
|
||||||
@NonNull
|
@NonNull
|
||||||
@@ -168,10 +168,10 @@ public class Configuration {
|
|||||||
return new Configuration(
|
return new Configuration(
|
||||||
host,
|
host,
|
||||||
port,
|
port,
|
||||||
|
serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
|
||||||
proxyProtocolEnabled,
|
proxyProtocolEnabled,
|
||||||
trustedProxyIPs,
|
trustedProxyIPs,
|
||||||
incomingConnectionsBacklogSize,
|
incomingConnectionsBacklogSize,
|
||||||
serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
|
|
||||||
eventExecutor,
|
eventExecutor,
|
||||||
rateLimiter,
|
rateLimiter,
|
||||||
connection,
|
connection,
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
package net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
import io.netty.channel.ChannelHandler;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
|
public interface TelemetryController {
|
||||||
|
void initialize();
|
||||||
|
@NotNull ChannelHandler createHandler();
|
||||||
|
}
|
||||||
@@ -30,7 +30,6 @@ configurations {
|
|||||||
transitive = false
|
transitive = false
|
||||||
canBeConsumed = true
|
canBeConsumed = true
|
||||||
canBeResolved = true
|
canBeResolved = true
|
||||||
visible = true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
configureNativeImageImplementation {
|
configureNativeImageImplementation {
|
||||||
@@ -51,6 +50,7 @@ dependencies {
|
|||||||
configureNativeImageImplementation project
|
configureNativeImageImplementation project
|
||||||
configureNativeImageImplementation project(':rbcs-server-memcache')
|
configureNativeImageImplementation project(':rbcs-server-memcache')
|
||||||
configureNativeImageImplementation project(':rbcs-server-redis')
|
configureNativeImageImplementation project(':rbcs-server-redis')
|
||||||
|
// configureNativeImageImplementation project(':rbcs-server-otel')
|
||||||
|
|
||||||
implementation catalog.jwo
|
implementation catalog.jwo
|
||||||
implementation catalog.slf4j.api
|
implementation catalog.slf4j.api
|
||||||
@@ -59,9 +59,7 @@ dependencies {
|
|||||||
implementation project(':rbcs-client')
|
implementation project(':rbcs-client')
|
||||||
implementation project(':rbcs-server')
|
implementation project(':rbcs-server')
|
||||||
|
|
||||||
// runtimeOnly catalog.slf4j.jdk14
|
|
||||||
runtimeOnly catalog.logback.classic
|
runtimeOnly catalog.logback.classic
|
||||||
// runtimeOnly catalog.slf4j.simple
|
|
||||||
nativeImage project(':rbcs-server-memcache')
|
nativeImage project(':rbcs-server-memcache')
|
||||||
nativeImage project(':rbcs-server-redis')
|
nativeImage project(':rbcs-server-redis')
|
||||||
|
|
||||||
@@ -142,7 +140,12 @@ Provider<JlinkTask> jlinkTaskProvider = tasks.named(JlinkPlugin.JLINK_TASK_NAME,
|
|||||||
'net.woggioni.rbcs.server.memcache',
|
'net.woggioni.rbcs.server.memcache',
|
||||||
'net.woggioni.rbcs.server.redis',
|
'net.woggioni.rbcs.server.redis',
|
||||||
'ch.qos.logback.classic',
|
'ch.qos.logback.classic',
|
||||||
'jdk.crypto.ec'
|
'jdk.crypto.ec',
|
||||||
|
// 'io.opentelemetry.api',
|
||||||
|
// 'io.opentelemetry.instrumentation.netty_4_1',
|
||||||
|
// 'io.opentelemetry.sdk.autoconfigure',
|
||||||
|
// 'io.opentelemetry.instrumentation.logback_appender_1_0',
|
||||||
|
// 'io.opentelemetry.extension.trace.propagation'
|
||||||
]
|
]
|
||||||
compressionLevel = 2
|
compressionLevel = 2
|
||||||
stripDebug = false
|
stripDebug = false
|
||||||
|
|||||||
@@ -120,10 +120,10 @@ object GraalNativeImageConfiguration {
|
|||||||
val serverConfiguration = Configuration(
|
val serverConfiguration = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
serverPort,
|
serverPort,
|
||||||
|
null,
|
||||||
false,
|
false,
|
||||||
emptyList(),
|
emptyList(),
|
||||||
100,
|
100,
|
||||||
null,
|
|
||||||
Configuration.EventExecutor(true),
|
Configuration.EventExecutor(true),
|
||||||
Configuration.RateLimiter(
|
Configuration.RateLimiter(
|
||||||
false, 0x100000, 10
|
false, 0x100000, 10
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
module net.woggioni.rbcs.cli {
|
module net.woggioni.rbcs.cli {
|
||||||
requires org.slf4j;
|
requires org.slf4j;
|
||||||
|
requires net.woggioni.jwo;
|
||||||
requires net.woggioni.rbcs.server;
|
requires net.woggioni.rbcs.server;
|
||||||
requires info.picocli;
|
requires info.picocli;
|
||||||
requires net.woggioni.rbcs.common;
|
requires net.woggioni.rbcs.common;
|
||||||
requires net.woggioni.rbcs.client;
|
requires net.woggioni.rbcs.client;
|
||||||
requires kotlin.stdlib;
|
requires kotlin.stdlib;
|
||||||
requires net.woggioni.jwo;
|
|
||||||
requires net.woggioni.rbcs.api;
|
requires net.woggioni.rbcs.api;
|
||||||
|
|
||||||
exports net.woggioni.rbcs.cli.impl.converters to info.picocli;
|
exports net.woggioni.rbcs.cli.impl.converters to info.picocli;
|
||||||
@@ -14,4 +14,6 @@ module net.woggioni.rbcs.cli {
|
|||||||
opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common;
|
opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common;
|
||||||
|
|
||||||
exports net.woggioni.rbcs.cli;
|
exports net.woggioni.rbcs.cli;
|
||||||
|
|
||||||
|
uses net.woggioni.rbcs.api.TelemetryController;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
package net.woggioni.rbcs.cli
|
package net.woggioni.rbcs.cli
|
||||||
|
|
||||||
import net.woggioni.jwo.Application
|
import net.woggioni.jwo.Application
|
||||||
|
import net.woggioni.jwo.LoggerController
|
||||||
|
import net.woggioni.rbcs.api.TelemetryController
|
||||||
import net.woggioni.rbcs.cli.impl.AbstractVersionProvider
|
import net.woggioni.rbcs.cli.impl.AbstractVersionProvider
|
||||||
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
import net.woggioni.rbcs.cli.impl.RbcsCommand
|
||||||
import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
|
import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
|
||||||
@@ -14,6 +16,8 @@ import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory
|
|||||||
import net.woggioni.rbcs.common.createLogger
|
import net.woggioni.rbcs.common.createLogger
|
||||||
import picocli.CommandLine
|
import picocli.CommandLine
|
||||||
import picocli.CommandLine.Model.CommandSpec
|
import picocli.CommandLine.Model.CommandSpec
|
||||||
|
import java.util.ServiceLoader
|
||||||
|
import net.woggioni.rbcs.common.RBCS.loadService
|
||||||
|
|
||||||
|
|
||||||
@CommandLine.Command(
|
@CommandLine.Command(
|
||||||
@@ -61,6 +65,10 @@ class RemoteBuildCacheServerCli : RbcsCommand() {
|
|||||||
|
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
fun main(vararg args: String) {
|
fun main(vararg args: String) {
|
||||||
|
loadService(TelemetryController::class.java)
|
||||||
|
.firstOrNull()
|
||||||
|
?.initialize()
|
||||||
|
LoggerController.initializeLoggers()
|
||||||
System.exit(createCommandLine().execute(*args))
|
System.exit(createCommandLine().execute(*args))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package net.woggioni.rbcs.common
|
|||||||
|
|
||||||
import io.netty.channel.Channel
|
import io.netty.channel.Channel
|
||||||
import io.netty.channel.ChannelHandlerContext
|
import io.netty.channel.ChannelHandlerContext
|
||||||
|
import net.woggioni.jwo.LoggerController
|
||||||
import java.nio.file.Files
|
import java.nio.file.Files
|
||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.util.logging.LogManager
|
import java.util.logging.LogManager
|
||||||
@@ -11,8 +12,10 @@ import org.slf4j.MDC
|
|||||||
import org.slf4j.event.Level
|
import org.slf4j.event.Level
|
||||||
import org.slf4j.spi.LoggingEventBuilder
|
import org.slf4j.spi.LoggingEventBuilder
|
||||||
|
|
||||||
inline fun <reified T> T.contextLogger() = LoggerFactory.getLogger(T::class.java)
|
fun <T> lazyLogger(cls: Class<T>) = LoggerController.lazyLogger(cls)
|
||||||
inline fun <reified T> createLogger() = LoggerFactory.getLogger(T::class.java)
|
|
||||||
|
inline fun <reified T> T.contextLogger() = lazyLogger(T::class.java)
|
||||||
|
inline fun <reified T> createLogger() = lazyLogger(T::class.java)
|
||||||
|
|
||||||
inline fun Logger.traceParam(messageBuilder: () -> Pair<String, Array<Any>>) {
|
inline fun Logger.traceParam(messageBuilder: () -> Pair<String, Array<Any>>) {
|
||||||
if (isTraceEnabled) {
|
if (isTraceEnabled) {
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package net.woggioni.rbcs.common
|
package net.woggioni.rbcs.common
|
||||||
|
|
||||||
|
import net.woggioni.jwo.JWO
|
||||||
|
import net.woggioni.jwo.Tuple2
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.net.InetAddress
|
import java.net.InetAddress
|
||||||
import java.net.ServerSocket
|
import java.net.ServerSocket
|
||||||
@@ -9,18 +11,10 @@ import java.nio.file.Files
|
|||||||
import java.nio.file.Path
|
import java.nio.file.Path
|
||||||
import java.security.KeyStore
|
import java.security.KeyStore
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
import java.security.cert.CertPathValidator
|
import java.security.cert.*
|
||||||
import java.security.cert.CertPathValidatorException
|
import java.util.*
|
||||||
import java.security.cert.CertificateException
|
|
||||||
import java.security.cert.CertificateFactory
|
|
||||||
import java.security.cert.PKIXParameters
|
|
||||||
import java.security.cert.PKIXRevocationChecker
|
|
||||||
import java.security.cert.X509Certificate
|
|
||||||
import java.util.EnumSet
|
|
||||||
import javax.net.ssl.TrustManagerFactory
|
import javax.net.ssl.TrustManagerFactory
|
||||||
import javax.net.ssl.X509TrustManager
|
import javax.net.ssl.X509TrustManager
|
||||||
import net.woggioni.jwo.JWO
|
|
||||||
import net.woggioni.jwo.Tuple2
|
|
||||||
|
|
||||||
object RBCS {
|
object RBCS {
|
||||||
fun String.toUrl(): URL = URL.of(URI(this), null)
|
fun String.toUrl(): URL = URL.of(URI(this), null)
|
||||||
@@ -164,4 +158,10 @@ object RBCS {
|
|||||||
.single() as X509TrustManager
|
.single() as X509TrustManager
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
inline fun <T, reified U> U.loadService(serviceClass : Class<T>): Sequence<T> {
|
||||||
|
return (U::class.java.module.layer?.let { layer ->
|
||||||
|
ServiceLoader.load(layer, serviceClass)
|
||||||
|
} ?: ServiceLoader.load(serviceClass)).asSequence()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
81
rbcs-server-otel/build.gradle
Normal file
81
rbcs-server-otel/build.gradle
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
plugins {
|
||||||
|
id 'java-library'
|
||||||
|
id 'maven-publish'
|
||||||
|
alias catalog.plugins.kotlin.jvm
|
||||||
|
}
|
||||||
|
|
||||||
|
configurations {
|
||||||
|
|
||||||
|
bundle {
|
||||||
|
canBeResolved = false
|
||||||
|
canBeConsumed = false
|
||||||
|
transitive = true
|
||||||
|
}
|
||||||
|
|
||||||
|
filteredBundle {
|
||||||
|
canBeResolved = true
|
||||||
|
canBeConsumed = false
|
||||||
|
transitive = true
|
||||||
|
|
||||||
|
extendsFrom bundle
|
||||||
|
|
||||||
|
resolutionStrategy {
|
||||||
|
dependencies {
|
||||||
|
exclude group: 'org.slf4j', module: 'slf4j-api'
|
||||||
|
exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
|
||||||
|
exclude group: 'org.jetbrains', module: 'annotations'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
release {
|
||||||
|
transitive = false
|
||||||
|
canBeConsumed = true
|
||||||
|
canBeResolved = true
|
||||||
|
}
|
||||||
|
|
||||||
|
compileOnly {
|
||||||
|
extendsFrom bundle
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compileOnly project(':rbcs-common')
|
||||||
|
compileOnly project(':rbcs-api')
|
||||||
|
|
||||||
|
compileOnly catalog.netty.transport
|
||||||
|
compileOnly catalog.slf4j.api
|
||||||
|
compileOnly catalog.kotlin.stdlib.jdk8
|
||||||
|
compileOnly catalog.logback.core
|
||||||
|
compileOnly catalog.logback.classic
|
||||||
|
|
||||||
|
bundle catalog.opentelemetry.netty.'4'.'1'
|
||||||
|
bundle catalog.opentelemetry.sdk.extension.autoconfigure
|
||||||
|
bundle catalog.opentelemetry.logback.appender.'1'.'0'
|
||||||
|
bundle catalog.opentelemetry.logback.mdc.'1'.'0'
|
||||||
|
bundle catalog.opentelemetry.extension.trace.propagators
|
||||||
|
bundle catalog.opentelemetry.exporter.otlp
|
||||||
|
bundle catalog.opentelemetry.runtime.telemetry
|
||||||
|
}
|
||||||
|
|
||||||
|
Provider<Tar> bundleTask = tasks.register("bundle", Tar) {
|
||||||
|
from(tasks.named(JavaPlugin.JAR_TASK_NAME))
|
||||||
|
from(configurations.filteredBundle)
|
||||||
|
group = BasePlugin.BUILD_GROUP
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named(BasePlugin.ASSEMBLE_TASK_NAME) {
|
||||||
|
dependsOn(bundleTask)
|
||||||
|
}
|
||||||
|
|
||||||
|
artifacts {
|
||||||
|
release(bundleTask)
|
||||||
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
maven(MavenPublication) {
|
||||||
|
artifact bundleTask
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
20
rbcs-server-otel/src/main/java/module-info.java
Normal file
20
rbcs-server-otel/src/main/java/module-info.java
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
module net.woggioni.rbcs.server.otel {
|
||||||
|
requires net.woggioni.rbcs.common;
|
||||||
|
requires kotlin.stdlib;
|
||||||
|
requires io.netty.transport;
|
||||||
|
requires io.netty.common;
|
||||||
|
requires io.netty.buffer;
|
||||||
|
requires org.slf4j;
|
||||||
|
|
||||||
|
requires ch.qos.logback.core;
|
||||||
|
requires ch.qos.logback.classic;
|
||||||
|
requires io.opentelemetry.api;
|
||||||
|
requires io.opentelemetry.sdk.autoconfigure;
|
||||||
|
requires io.opentelemetry.instrumentation.runtime_telemetry;
|
||||||
|
requires io.opentelemetry.instrumentation.netty_4_1;
|
||||||
|
requires io.opentelemetry.instrumentation.logback_appender_1_0;
|
||||||
|
requires io.opentelemetry.extension.trace.propagation;
|
||||||
|
requires net.woggioni.rbcs.api;
|
||||||
|
|
||||||
|
provides net.woggioni.rbcs.api.TelemetryController with net.woggioni.rbcs.server.otel.OtelController;
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
package net.woggioni.rbcs.server.otel
|
||||||
|
|
||||||
|
import io.netty.channel.ChannelHandler
|
||||||
|
import io.opentelemetry.api.GlobalOpenTelemetry
|
||||||
|
import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender
|
||||||
|
import io.opentelemetry.instrumentation.netty.v4_1.NettyServerTelemetry
|
||||||
|
import io.opentelemetry.instrumentation.runtimetelemetry.RuntimeTelemetry
|
||||||
|
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk
|
||||||
|
import net.woggioni.rbcs.api.TelemetryController
|
||||||
|
import net.woggioni.rbcs.common.createLogger
|
||||||
|
import net.woggioni.rbcs.common.info
|
||||||
|
|
||||||
|
class OtelController : TelemetryController {
|
||||||
|
|
||||||
|
private val log = createLogger<OtelController>()
|
||||||
|
|
||||||
|
override fun initialize() {
|
||||||
|
log.info { "Initializing OpenTelemetry SDK with auto-configuration" }
|
||||||
|
|
||||||
|
val sdk = AutoConfiguredOpenTelemetrySdk.builder()
|
||||||
|
.setResultAsGlobal()
|
||||||
|
.build()
|
||||||
|
.openTelemetrySdk
|
||||||
|
RuntimeTelemetry.create(sdk)
|
||||||
|
|
||||||
|
runCatching {
|
||||||
|
OpenTelemetryAppender.install(sdk)
|
||||||
|
log.info { "OpenTelemetry logback appender installed" }
|
||||||
|
}.onFailure { ex ->
|
||||||
|
val msg = ex.localizedMessage ?: ex.javaClass.name
|
||||||
|
log.info { "Failed to install OpenTelemetry logback appender: $msg" }
|
||||||
|
}
|
||||||
|
log.info { "OpenTelemetry SDK initialized successfully" }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun createHandler(): ChannelHandler {
|
||||||
|
return NettyServerTelemetry.create(GlobalOpenTelemetry.get()).createCombinedHandler()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,6 +13,11 @@ dependencies {
|
|||||||
implementation catalog.netty.buffer
|
implementation catalog.netty.buffer
|
||||||
implementation catalog.netty.transport
|
implementation catalog.netty.transport
|
||||||
implementation catalog.netty.codec.haproxy
|
implementation catalog.netty.codec.haproxy
|
||||||
|
compileOnly catalog.opentelemetry.netty['4']['1']
|
||||||
|
compileOnly catalog.opentelemetry.sdk.extension.autoconfigure
|
||||||
|
compileOnly catalog.opentelemetry.logback.appender['1']['0']
|
||||||
|
compileOnly catalog.opentelemetry.extension.trace.propagators
|
||||||
|
compileOnly catalog.logback.classic
|
||||||
|
|
||||||
api project(':rbcs-common')
|
api project(':rbcs-common')
|
||||||
api project(':rbcs-api')
|
api project(':rbcs-api')
|
||||||
|
|||||||
@@ -26,5 +26,6 @@ module net.woggioni.rbcs.server {
|
|||||||
|
|
||||||
|
|
||||||
uses CacheProvider;
|
uses CacheProvider;
|
||||||
|
uses net.woggioni.rbcs.api.TelemetryController;
|
||||||
provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;
|
provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;
|
||||||
}
|
}
|
||||||
@@ -2,16 +2,8 @@ package net.woggioni.rbcs.server
|
|||||||
|
|
||||||
import io.netty.bootstrap.ServerBootstrap
|
import io.netty.bootstrap.ServerBootstrap
|
||||||
import io.netty.buffer.ByteBuf
|
import io.netty.buffer.ByteBuf
|
||||||
import io.netty.channel.Channel
|
import io.netty.channel.*
|
||||||
import io.netty.channel.ChannelFactory
|
|
||||||
import io.netty.channel.ChannelFuture
|
|
||||||
import io.netty.channel.ChannelHandler.Sharable
|
import io.netty.channel.ChannelHandler.Sharable
|
||||||
import io.netty.channel.ChannelHandlerContext
|
|
||||||
import io.netty.channel.ChannelInboundHandlerAdapter
|
|
||||||
import io.netty.channel.ChannelInitializer
|
|
||||||
import io.netty.channel.ChannelOption
|
|
||||||
import io.netty.channel.ChannelPromise
|
|
||||||
import io.netty.channel.MultiThreadIoEventLoopGroup
|
|
||||||
import io.netty.channel.nio.NioIoHandler
|
import io.netty.channel.nio.NioIoHandler
|
||||||
import io.netty.channel.socket.DatagramChannel
|
import io.netty.channel.socket.DatagramChannel
|
||||||
import io.netty.channel.socket.ServerSocketChannel
|
import io.netty.channel.socket.ServerSocketChannel
|
||||||
@@ -21,12 +13,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel
|
|||||||
import io.netty.channel.socket.nio.NioSocketChannel
|
import io.netty.channel.socket.nio.NioSocketChannel
|
||||||
import io.netty.handler.codec.compression.CompressionOptions
|
import io.netty.handler.codec.compression.CompressionOptions
|
||||||
import io.netty.handler.codec.haproxy.HAProxyMessageDecoder
|
import io.netty.handler.codec.haproxy.HAProxyMessageDecoder
|
||||||
import io.netty.handler.codec.http.DefaultHttpContent
|
import io.netty.handler.codec.http.*
|
||||||
import io.netty.handler.codec.http.HttpContentCompressor
|
|
||||||
import io.netty.handler.codec.http.HttpDecoderConfig
|
|
||||||
import io.netty.handler.codec.http.HttpHeaderNames
|
|
||||||
import io.netty.handler.codec.http.HttpRequest
|
|
||||||
import io.netty.handler.codec.http.HttpServerCodec
|
|
||||||
import io.netty.handler.ssl.ClientAuth
|
import io.netty.handler.ssl.ClientAuth
|
||||||
import io.netty.handler.ssl.SslContext
|
import io.netty.handler.ssl.SslContext
|
||||||
import io.netty.handler.ssl.SslContextBuilder
|
import io.netty.handler.ssl.SslContextBuilder
|
||||||
@@ -37,37 +24,17 @@ import io.netty.handler.timeout.IdleStateEvent
|
|||||||
import io.netty.handler.timeout.IdleStateHandler
|
import io.netty.handler.timeout.IdleStateHandler
|
||||||
import io.netty.util.AttributeKey
|
import io.netty.util.AttributeKey
|
||||||
import io.netty.util.concurrent.EventExecutorGroup
|
import io.netty.util.concurrent.EventExecutorGroup
|
||||||
import java.io.OutputStream
|
|
||||||
import java.net.InetSocketAddress
|
|
||||||
import java.nio.file.Files
|
|
||||||
import java.nio.file.Path
|
|
||||||
import java.security.PrivateKey
|
|
||||||
import java.security.cert.X509Certificate
|
|
||||||
import java.time.Duration
|
|
||||||
import java.time.Instant
|
|
||||||
import java.util.Arrays
|
|
||||||
import java.util.Base64
|
|
||||||
import java.util.concurrent.CompletableFuture
|
|
||||||
import java.util.concurrent.Future
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
import java.util.concurrent.TimeoutException
|
|
||||||
import java.util.regex.Matcher
|
|
||||||
import java.util.regex.Pattern
|
|
||||||
import javax.naming.ldap.LdapName
|
|
||||||
import javax.net.ssl.SSLPeerUnverifiedException
|
|
||||||
import net.woggioni.rbcs.api.AsyncCloseable
|
import net.woggioni.rbcs.api.AsyncCloseable
|
||||||
import net.woggioni.rbcs.api.Configuration
|
import net.woggioni.rbcs.api.Configuration
|
||||||
|
import net.woggioni.rbcs.api.TelemetryController
|
||||||
import net.woggioni.rbcs.api.exception.ConfigurationException
|
import net.woggioni.rbcs.api.exception.ConfigurationException
|
||||||
import net.woggioni.rbcs.common.Cidr
|
import net.woggioni.rbcs.common.*
|
||||||
import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash
|
import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash
|
||||||
import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
|
import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
|
||||||
import net.woggioni.rbcs.common.RBCS.getTrustManager
|
import net.woggioni.rbcs.common.RBCS.getTrustManager
|
||||||
import net.woggioni.rbcs.common.RBCS.loadKeystore
|
import net.woggioni.rbcs.common.RBCS.loadKeystore
|
||||||
|
import net.woggioni.rbcs.common.RBCS.loadService
|
||||||
import net.woggioni.rbcs.common.RBCS.toUrl
|
import net.woggioni.rbcs.common.RBCS.toUrl
|
||||||
import net.woggioni.rbcs.common.Xml
|
|
||||||
import net.woggioni.rbcs.common.createLogger
|
|
||||||
import net.woggioni.rbcs.common.debug
|
|
||||||
import net.woggioni.rbcs.common.info
|
|
||||||
import net.woggioni.rbcs.server.auth.AbstractNettyHttpAuthenticator
|
import net.woggioni.rbcs.server.auth.AbstractNettyHttpAuthenticator
|
||||||
import net.woggioni.rbcs.server.auth.Authorizer
|
import net.woggioni.rbcs.server.auth.Authorizer
|
||||||
import net.woggioni.rbcs.server.auth.RoleAuthorizer
|
import net.woggioni.rbcs.server.auth.RoleAuthorizer
|
||||||
@@ -80,6 +47,23 @@ import net.woggioni.rbcs.server.handler.ReadTriggerDuplexHandler
|
|||||||
import net.woggioni.rbcs.server.handler.ServerHandler
|
import net.woggioni.rbcs.server.handler.ServerHandler
|
||||||
import net.woggioni.rbcs.server.throttling.BucketManager
|
import net.woggioni.rbcs.server.throttling.BucketManager
|
||||||
import net.woggioni.rbcs.server.throttling.ThrottlingHandler
|
import net.woggioni.rbcs.server.throttling.ThrottlingHandler
|
||||||
|
import java.io.OutputStream
|
||||||
|
import java.net.InetSocketAddress
|
||||||
|
import java.nio.file.Files
|
||||||
|
import java.nio.file.Path
|
||||||
|
import java.security.PrivateKey
|
||||||
|
import java.security.cert.X509Certificate
|
||||||
|
import java.time.Duration
|
||||||
|
import java.time.Instant
|
||||||
|
import java.util.*
|
||||||
|
import java.util.concurrent.CompletableFuture
|
||||||
|
import java.util.concurrent.Future
|
||||||
|
import java.util.concurrent.TimeUnit
|
||||||
|
import java.util.concurrent.TimeoutException
|
||||||
|
import java.util.regex.Matcher
|
||||||
|
import java.util.regex.Pattern
|
||||||
|
import javax.naming.ldap.LdapName
|
||||||
|
import javax.net.ssl.SSLPeerUnverifiedException
|
||||||
|
|
||||||
class RemoteBuildCacheServer(private val cfg: Configuration) {
|
class RemoteBuildCacheServer(private val cfg: Configuration) {
|
||||||
|
|
||||||
@@ -431,6 +415,10 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
|
|||||||
maxChunkSize = cfg.connection.chunkSize
|
maxChunkSize = cfg.connection.chunkSize
|
||||||
}
|
}
|
||||||
pipeline.addLast(HttpServerCodec(httpDecoderConfig))
|
pipeline.addLast(HttpServerCodec(httpDecoderConfig))
|
||||||
|
loadService(TelemetryController::class.java)
|
||||||
|
.firstOrNull()
|
||||||
|
?.createHandler()
|
||||||
|
?.let { pipeline.addLast(it) }
|
||||||
pipeline.addLast(ReadTriggerDuplexHandler.NAME, ReadTriggerDuplexHandler())
|
pipeline.addLast(ReadTriggerDuplexHandler.NAME, ReadTriggerDuplexHandler())
|
||||||
pipeline.addLast(MaxRequestSizeHandler.NAME, MaxRequestSizeHandler(cfg.connection.maxRequestSize))
|
pipeline.addLast(MaxRequestSizeHandler.NAME, MaxRequestSizeHandler(cfg.connection.maxRequestSize))
|
||||||
pipeline.addLast(HttpChunkContentCompressor(1024))
|
pipeline.addLast(HttpChunkContentCompressor(1024))
|
||||||
|
|||||||
@@ -140,11 +140,10 @@ abstract class AbstractTlsServerTest : AbstractServerTest() {
|
|||||||
cfg = Configuration(
|
cfg = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
getFreePort(),
|
getFreePort(),
|
||||||
|
serverPath,
|
||||||
false,
|
false,
|
||||||
emptyList(),
|
emptyList(),
|
||||||
|
|
||||||
100,
|
100,
|
||||||
serverPath,
|
|
||||||
Configuration.EventExecutor(false),
|
Configuration.EventExecutor(false),
|
||||||
Configuration.RateLimiter(true, 0x100000, 50),
|
Configuration.RateLimiter(true, 0x100000, 50),
|
||||||
Configuration.Connection(
|
Configuration.Connection(
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ class NoAuthServerTest : AbstractServerTest() {
|
|||||||
cfg = Configuration(
|
cfg = Configuration(
|
||||||
"127.0.0.1",
|
"127.0.0.1",
|
||||||
getFreePort(),
|
getFreePort(),
|
||||||
|
serverPath,
|
||||||
false,
|
false,
|
||||||
emptyList(),
|
emptyList(),
|
||||||
100,
|
100,
|
||||||
serverPath,
|
|
||||||
Configuration.EventExecutor(false),
|
Configuration.EventExecutor(false),
|
||||||
Configuration.RateLimiter(true, 0x100000, 50),
|
Configuration.RateLimiter(true, 0x100000, 50),
|
||||||
Configuration.Connection(
|
Configuration.Connection(
|
||||||
|
|||||||
@@ -1,7 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
<rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xmlns:rbcs="urn:net.woggioni.rbcs.server"
|
xmlns:rbcs="urn:net.woggioni.rbcs.server"
|
||||||
xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs-server.xsd">
|
xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs-server.xsd"
|
||||||
|
path="/my/custom/path">
|
||||||
<bind host="127.0.0.1" port="11443" incoming-connections-backlog-size="22" proxy-protocol="true">
|
<bind host="127.0.0.1" port="11443" incoming-connections-backlog-size="22" proxy-protocol="true">
|
||||||
<trusted-proxies>
|
<trusted-proxies>
|
||||||
<allow cidr="192.168.0.11/32"/>
|
<allow cidr="192.168.0.11/32"/>
|
||||||
|
|||||||
@@ -33,4 +33,5 @@ include 'rbcs-cli'
|
|||||||
include 'rbcs-client'
|
include 'rbcs-client'
|
||||||
include 'rbcs-server'
|
include 'rbcs-server'
|
||||||
include 'rbcs-servlet'
|
include 'rbcs-servlet'
|
||||||
|
include 'rbcs-server-otel'
|
||||||
include 'docker'
|
include 'docker'
|
||||||
|
|||||||
Reference in New Issue
Block a user