test

.gitea/workflows/build-dev.yaml

@@ -32,7 +32,7 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:dev-vanilla
+            gitea.woggioni.net/woggioni/rbcs:vanilla-dev
           target: release-vanilla
       -
         name: Build rbcs memcache Docker image
@@ -44,7 +44,7 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:dev-memcache
+            gitea.woggioni.net/woggioni/rbcs:memcache-dev
           target: release-memcache
       -
         name: Build rbcs redis Docker image
@@ -56,20 +56,8 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:dev-redis
+            gitea.woggioni.net/woggioni/rbcs:redis-dev
           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
         uses: docker/build-push-action@v5.3.0
@@ -80,7 +68,7 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:dev-native
+            gitea.woggioni.net/woggioni/rbcs:native-dev
           target: release-native
       -
         name: Build rbcs jlink Docker image
@@ -92,6 +80,6 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:dev-jlink
+            gitea.woggioni.net/woggioni/rbcs:jlink-dev
           target: release-jlink
 

.gitea/workflows/build.yaml

@@ -61,19 +61,6 @@ jobs:
             gitea.woggioni.net/woggioni/rbcs:redis
             gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-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
         uses: docker/build-push-action@v5.3.0

.gitignore

@@ -5,8 +5,3 @@
 build
 
 rbcs-cli/native-image/*.json
-
-# Ignore JDTLS files
-.classpath
-.project
-.settings

doc/server_configuration.md

@@ -139,7 +139,6 @@ Configures TLS encryption.
 <rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
              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"
-             path="/my/custom/path"
 >
     <bind host="0.0.0.0" port="8080" incoming-connections-backlog-size="1024" proxy-protocol="true">
         <trusted-proxies>

docker/Dockerfile

@@ -1,49 +1,33 @@
 FROM eclipse-temurin:25-jre-alpine AS base-release
-RUN adduser -D rbcs
+RUN adduser -D luser
-USER rbcs
+USER luser
-WORKDIR /var/lib/rbcs
+WORKDIR /home/luser
 
 FROM base-release AS release-vanilla
 ADD rbcs-cli-envelope-*.jar rbcs.jar
-ADD logback.xml /etc/rbcs/logback.xml
+ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar"]
-ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
-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
-ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
+ADD --chown=luser:luser rbcs-cli-envelope-*.jar rbcs.jar
 RUN mkdir plugins
-WORKDIR /var/lib/rbcs/plugins
+WORKDIR /home/luser/plugins
 RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-memcache*.tar
-WORKDIR /var/lib/rbcs
+WORKDIR /home/luser
-ADD logback.xml /etc/rbcs/logback.xml
+ADD logback.xml .
-ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
+ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar"]
 
 FROM base-release AS release-redis
-ADD --chown=rbcs:rbcs rbcs-cli-envelope-*.jar rbcs.jar
+ADD --chown=luser:luser rbcs-cli-envelope-*.jar rbcs.jar
 RUN mkdir plugins
-WORKDIR /var/lib/rbcs/plugins
+WORKDIR /home/luser/plugins
 RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-server-redis*.tar
-WORKDIR /var/lib/rbcs
+WORKDIR /home/luser
-ADD logback.xml /etc/rbcs/logback.xml
+ADD logback.xml .
-ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
+ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/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
-RUN mkdir -p /var/lib/rbcs /var/tmp/rbcs /etc/rbcs
+RUN mkdir -p /var/lib/rbcs /etc/rbcs
 RUN adduser -D -u 1000 rbcs -h /var/lib/rbcs
-RUN chown rbcs:rbcs /var/tmp/rbcs
 
 FROM scratch AS release-native
 COPY --from=base-native /etc/passwd /etc/passwd
@@ -53,17 +37,16 @@ ADD rbcs-cli.upx /usr/bin/rbcs-cli
 ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
 USER rbcs
 WORKDIR /var/lib/rbcs
-ENTRYPOINT ["/usr/bin/rbcs-cli", "-XX:MaximumHeapSizePercent=70", "-Dio.netty.tmpdir=/var/tmp/rbcs", "-Dlogback.configurationFile=/etc/rbcs/logback.xml"]
+ENTRYPOINT ["/usr/bin/rbcs-cli", "-XX:MaximumHeapSizePercent=70"]
 
 FROM debian:12-slim AS release-jlink
 RUN mkdir -p /usr/share/java/rbcs
 RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-cli*.tar -C /usr/share/java/rbcs
 RUN chmod 755 /usr/share/java/rbcs/bin/*
 ADD --chmod=755 rbcs-cli.sh /usr/local/bin/rbcs-cli
-RUN adduser -u 1000 rbcs
+RUN adduser -u 1000 luser
-USER rbcs
+USER luser
-WORKDIR /var/lib/rbcs
+WORKDIR /home/luser
-ADD logback.xml /etc/rbcs/logback.xml
+ADD logback.xml .
-ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
+ENV JAVA_OPTS=-XX:-UseJVMCICompiler\ -Dlogback.configurationFile=logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC\ -XX:+ZGenerational
-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"]

docker/build.gradle

@@ -21,7 +21,6 @@ dependencies {
     docker project(path: ':rbcs-cli', configuration: 'release')
     docker project(path: ':rbcs-server-memcache', 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) {}

gradle.properties

@@ -2,9 +2,9 @@ org.gradle.configuration-cache=false
 org.gradle.parallel=true
 org.gradle.caching=true
 
-rbcs.version = 0.5.0
+rbcs.version = 0.4.0
 
-lys.version = 2026.04.29
+lys.version = 2026.03.26
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net

rbcs-api/build.gradle

@@ -11,7 +11,6 @@ dependencies {
     api catalog.netty.buffer
     api catalog.netty.handler
     api catalog.netty.codec.http
-    api catalog.jetbrains.annotations
 }
 
 publishing {

rbcs-api/src/main/java/module-info.java

@@ -8,7 +8,7 @@ module net.woggioni.rbcs.api {
     requires io.netty.buffer;
     requires org.slf4j;
     requires java.xml;
-    requires org.jetbrains.annotations;
+
 
     exports net.woggioni.rbcs.api;
     exports net.woggioni.rbcs.api.exception;

rbcs-api/src/main/java/net/woggioni/rbcs/api/Configuration.java

@@ -18,10 +18,10 @@ import java.util.stream.Collectors;
 public class Configuration {
     String host;
     int port;
-    String serverPath;
     boolean proxyProtocolEnabled;
     List<Cidr> trustedProxyIPs;
     int incomingConnectionsBacklogSize;
+    String serverPath;
     @NonNull
     EventExecutor eventExecutor;
     @NonNull
@@ -168,10 +168,10 @@ public class Configuration {
         return new Configuration(
                 host,
                 port,
-                serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
                 proxyProtocolEnabled,
                 trustedProxyIPs,
                 incomingConnectionsBacklogSize,
+                serverPath != null && !serverPath.isEmpty() && !serverPath.equals("/") ? serverPath : null,
                 eventExecutor,
                 rateLimiter,
                 connection,

rbcs-api/src/main/java/net/woggioni/rbcs/api/TelemetryController.java

@@ -1,9 +0,0 @@
-package net.woggioni.rbcs.api;
-
-import io.netty.channel.ChannelHandler;
-import org.jetbrains.annotations.NotNull;
-
-public interface TelemetryController {
-    void initialize();
-    @NotNull ChannelHandler createHandler();
-}

rbcs-cli/build.gradle

@@ -30,6 +30,7 @@ configurations {
         transitive = false
         canBeConsumed = true
         canBeResolved = true
+        visible = true
     }
 
     configureNativeImageImplementation {
@@ -50,7 +51,6 @@ dependencies {
     configureNativeImageImplementation project
     configureNativeImageImplementation project(':rbcs-server-memcache')
     configureNativeImageImplementation project(':rbcs-server-redis')
-//    configureNativeImageImplementation project(':rbcs-server-otel')
 
     implementation catalog.jwo
     implementation catalog.slf4j.api
@@ -59,7 +59,9 @@ dependencies {
     implementation project(':rbcs-client')
     implementation project(':rbcs-server')
 
+//    runtimeOnly catalog.slf4j.jdk14
     runtimeOnly catalog.logback.classic
+//    runtimeOnly catalog.slf4j.simple
     nativeImage project(':rbcs-server-memcache')
     nativeImage project(':rbcs-server-redis')
 
@@ -140,12 +142,7 @@ Provider<JlinkTask> jlinkTaskProvider = tasks.named(JlinkPlugin.JLINK_TASK_NAME,
         'net.woggioni.rbcs.server.memcache',
         'net.woggioni.rbcs.server.redis',
         '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
     stripDebug = false

rbcs-cli/src/configureNativeImage/kotlin/net/woggioni/rbcs/cli/graal/GraalNativeImageConfiguration.kt

@@ -120,10 +120,10 @@ object GraalNativeImageConfiguration {
             val serverConfiguration = Configuration(
                 "127.0.0.1",
                 serverPort,
-                null,
                 false,
                 emptyList(),
                 100,
+                null,
                 Configuration.EventExecutor(true),
                 Configuration.RateLimiter(
                     false, 0x100000, 10

rbcs-cli/src/main/java/module-info.java

@@ -1,11 +1,11 @@
 module net.woggioni.rbcs.cli {
     requires org.slf4j;
-    requires net.woggioni.jwo;
     requires net.woggioni.rbcs.server;
     requires info.picocli;
     requires net.woggioni.rbcs.common;
     requires net.woggioni.rbcs.client;
     requires kotlin.stdlib;
+    requires net.woggioni.jwo;
     requires net.woggioni.rbcs.api;
 
     exports net.woggioni.rbcs.cli.impl.converters to info.picocli;
@@ -14,6 +14,4 @@ module net.woggioni.rbcs.cli {
     opens net.woggioni.rbcs.cli to info.picocli, net.woggioni.rbcs.common;
 
     exports net.woggioni.rbcs.cli;
-
-    uses net.woggioni.rbcs.api.TelemetryController;
 }

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/RemoteBuildCacheServerCli.kt

@@ -1,8 +1,6 @@
 package net.woggioni.rbcs.cli
 
 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.RbcsCommand
 import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
@@ -16,8 +14,6 @@ import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory
 import net.woggioni.rbcs.common.createLogger
 import picocli.CommandLine
 import picocli.CommandLine.Model.CommandSpec
-import java.util.ServiceLoader
-import net.woggioni.rbcs.common.RBCS.loadService
 
 
 @CommandLine.Command(
@@ -65,10 +61,6 @@ class RemoteBuildCacheServerCli : RbcsCommand() {
 
         @JvmStatic
         fun main(vararg args: String) {
-            loadService(TelemetryController::class.java)
-                .firstOrNull()
-                ?.initialize()
-            LoggerController.initializeLoggers()
             System.exit(createCommandLine().execute(*args))
         }
     }

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/Logging.kt

@@ -2,7 +2,6 @@ package net.woggioni.rbcs.common
 
 import io.netty.channel.Channel
 import io.netty.channel.ChannelHandlerContext
-import net.woggioni.jwo.LoggerController
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.logging.LogManager
@@ -12,10 +11,8 @@ import org.slf4j.MDC
 import org.slf4j.event.Level
 import org.slf4j.spi.LoggingEventBuilder
 
-fun <T> lazyLogger(cls: Class<T>) = LoggerController.lazyLogger(cls)
+inline fun <reified T> T.contextLogger() = LoggerFactory.getLogger(T::class.java)
-
+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>>) {
     if (isTraceEnabled) {

rbcs-common/src/main/kotlin/net/woggioni/rbcs/common/RBCS.kt

@@ -1,7 +1,5 @@
 package net.woggioni.rbcs.common
 
-import net.woggioni.jwo.JWO
-import net.woggioni.jwo.Tuple2
 import java.io.IOException
 import java.net.InetAddress
 import java.net.ServerSocket
@@ -11,10 +9,18 @@ import java.nio.file.Files
 import java.nio.file.Path
 import java.security.KeyStore
 import java.security.MessageDigest
-import java.security.cert.*
+import java.security.cert.CertPathValidator
-import java.util.*
+import java.security.cert.CertPathValidatorException
+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.X509TrustManager
+import net.woggioni.jwo.JWO
+import net.woggioni.jwo.Tuple2
 
 object RBCS {
     fun String.toUrl(): URL = URL.of(URI(this), null)
@@ -158,10 +164,4 @@ object RBCS {
                 .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()
-    }
 }

rbcs-server-otel/build.gradle

@@ -1,81 +0,0 @@
-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
-        }
-    }
-}

rbcs-server-otel/src/main/java/module-info.java

@@ -1,20 +0,0 @@
-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;
-}

rbcs-server-otel/src/main/kotlin/net/woggioni/rbcs/server/otel/OtelController.kt

@@ -1,39 +0,0 @@
-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()
-    }
-}

rbcs-server/build.gradle

@@ -13,11 +13,6 @@ dependencies {
     implementation catalog.netty.buffer
     implementation catalog.netty.transport
     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-api')

rbcs-server/src/main/java/module-info.java

@@ -26,6 +26,5 @@ module net.woggioni.rbcs.server {
 
 
     uses CacheProvider;
-    uses net.woggioni.rbcs.api.TelemetryController;
     provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;
 }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt

@@ -2,8 +2,16 @@ package net.woggioni.rbcs.server
 
 import io.netty.bootstrap.ServerBootstrap
 import io.netty.buffer.ByteBuf
-import io.netty.channel.*
+import io.netty.channel.Channel
+import io.netty.channel.ChannelFactory
+import io.netty.channel.ChannelFuture
 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.socket.DatagramChannel
 import io.netty.channel.socket.ServerSocketChannel
@@ -13,7 +21,12 @@ import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.channel.socket.nio.NioSocketChannel
 import io.netty.handler.codec.compression.CompressionOptions
 import io.netty.handler.codec.haproxy.HAProxyMessageDecoder
-import io.netty.handler.codec.http.*
+import io.netty.handler.codec.http.DefaultHttpContent
+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.SslContext
 import io.netty.handler.ssl.SslContextBuilder
@@ -24,17 +37,37 @@ import io.netty.handler.timeout.IdleStateEvent
 import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.AttributeKey
 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.Configuration
-import net.woggioni.rbcs.api.TelemetryController
 import net.woggioni.rbcs.api.exception.ConfigurationException
-import net.woggioni.rbcs.common.*
+import net.woggioni.rbcs.common.Cidr
 import net.woggioni.rbcs.common.PasswordSecurity.decodePasswordHash
 import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
 import net.woggioni.rbcs.common.RBCS.getTrustManager
 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.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.Authorizer
 import net.woggioni.rbcs.server.auth.RoleAuthorizer
@@ -47,23 +80,6 @@ import net.woggioni.rbcs.server.handler.ReadTriggerDuplexHandler
 import net.woggioni.rbcs.server.handler.ServerHandler
 import net.woggioni.rbcs.server.throttling.BucketManager
 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) {
 
@@ -133,10 +149,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                         ((user?.groups ?: emptySet()).asSequence() + sequenceOf(group).filterNotNull()).toSet()
                     AuthenticationResult(user, allGroups)
                 } ?: anonymousUserGroups?.let { AuthenticationResult(null, it) }
-            } catch (ex: SSLPeerUnverifiedException) {
+            } catch (es: SSLPeerUnverifiedException) {
-                log.debug(ctx) {
-                    ex.message ?: "Error witch client certificate authentication"
-                }
                 anonymousUserGroups?.let { AuthenticationResult(null, it) }
             }
         }
@@ -415,10 +428,6 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                 maxChunkSize = cfg.connection.chunkSize
             }
             pipeline.addLast(HttpServerCodec(httpDecoderConfig))
-            loadService(TelemetryController::class.java)
-                .firstOrNull()
-                ?.createHandler()
-                ?.let { pipeline.addLast(it) }
             pipeline.addLast(ReadTriggerDuplexHandler.NAME, ReadTriggerDuplexHandler())
             pipeline.addLast(MaxRequestSizeHandler.NAME, MaxRequestSizeHandler(cfg.connection.maxRequestSize))
             pipeline.addLast(HttpChunkContentCompressor(1024))

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/auth/Authenticator.kt

@@ -56,14 +56,14 @@ abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer
                         result.groups.asSequence().flatMap { it.roles.asSequence() }
             ).toSet()
             val authorized = authorizer.authorize(roles, msg)
-            if(log.isDebugEnabled) {
+            if(log.isTraceEnabled) {
                 val authorizedMessage = if(authorized) { "Authorized" } else { "Forbidden" }
                 val clientAddress = ctx.channel().attr<InetSocketAddress>(RemoteBuildCacheServer.clientIp).get()
                 val roleString = "[" + roles.asSequence().map { "\"" + it + "\""}.joinToString(", ") + "]"
-                result.user?.name?.takeUnless(String::isEmpty)?.let { username ->
+                result.user?.let { user ->
-                    log.debug("$authorizedMessage ${msg.method()} request from user $username with address $clientAddress, granted roles $roleString")
+                    log.trace("$authorizedMessage ${msg.method()} request from user $user with address $clientAddress, granted roles $roleString")
                 } ?: {
-                    log.debug("$authorizedMessage anonymous ${msg.method()} request with address $clientAddress, granted roles $roleString")
+                    log.trace("$authorizedMessage anonymous ${msg.method()} request with address $clientAddress, granted roles $roleString")
                 }
             }
             if (authorized) {

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/exception/ExceptionHandler.kt

@@ -22,7 +22,6 @@ import net.woggioni.rbcs.api.exception.ContentTooLargeException
 import net.woggioni.rbcs.common.contextLogger
 import net.woggioni.rbcs.common.debug
 import net.woggioni.rbcs.common.log
-import net.woggioni.rbcs.server.RemoteBuildCacheServer
 import org.slf4j.event.Level
 import org.slf4j.spi.LoggingEventBuilder
 
@@ -60,38 +59,27 @@ object ExceptionHandler : ChannelDuplexHandler() {
     override fun exceptionCaught(ctx: ChannelHandlerContext, cause: Throwable) {
         when (cause) {
             is DecoderException -> {
-                if(log.isDebugEnabled) {
+                log.debug(cause.message, cause)
-                    log.debug(cause.message, cause)
-                }
                 ctx.close()
             }
 
             is ConnectException -> {
-                if(log.isErrorEnabled) {
+                log.error(cause.message, cause)
-                    log.error(cause.message, cause)
-                }
                 ctx.writeAndFlush(SERVER_ERROR.retainedDuplicate())
             }
 
             is SocketException -> {
-                if(log.isDebugEnabled) {
+                log.debug(cause.message, cause)
-                    log.debug(cause.message, cause)
-                }
                 ctx.close()
             }
 
             is SSLPeerUnverifiedException -> {
-                if(log.isDebugEnabled) {
-                    log.debug(cause.message, cause)
-                }
                 ctx.writeAndFlush(NOT_AUTHORIZED.retainedDuplicate())
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }
 
             is SSLException -> {
-                if(log.isDebugEnabled) {
+                log.debug(cause.message, cause)
-                    log.debug(cause.message, cause)
-                }
                 ctx.close()
             }
 
@@ -120,17 +108,13 @@ object ExceptionHandler : ChannelDuplexHandler() {
             }
 
             is CacheException -> {
-                if(log.isErrorEnabled) {
+                log.error(cause.message, cause)
-                    log.error(cause.message, cause)
-                }
                 ctx.writeAndFlush(NOT_AVAILABLE.retainedDuplicate())
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }
 
             else -> {
-                if(log.isErrorEnabled) {
+                log.error(cause.message, cause)
-                    log.error(cause.message, cause)
-                }
                 ctx.writeAndFlush(SERVER_ERROR.retainedDuplicate())
                     .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
             }

rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/AbstractTlsServerTest.kt

@@ -140,10 +140,11 @@ abstract class AbstractTlsServerTest : AbstractServerTest() {
         cfg = Configuration(
             "127.0.0.1",
             getFreePort(),
-            serverPath,
             false,
             emptyList(),
+
             100,
+            serverPath,
             Configuration.EventExecutor(false),
             Configuration.RateLimiter(true, 0x100000, 50),
             Configuration.Connection(

rbcs-server/src/test/kotlin/net/woggioni/rbcs/server/test/NoAuthServerTest.kt

@@ -34,10 +34,10 @@ class NoAuthServerTest : AbstractServerTest() {
         cfg = Configuration(
             "127.0.0.1",
             getFreePort(),
-            serverPath,
             false,
             emptyList(),
             100,
+            serverPath,
             Configuration.EventExecutor(false),
             Configuration.RateLimiter(true, 0x100000, 50),
             Configuration.Connection(

rbcs-server/src/test/resources/net/woggioni/rbcs/server/test/valid/rbcs-default.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <rbcs:server xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
              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">
         <trusted-proxies>
             <allow cidr="192.168.0.11/32"/>

settings.gradle

@@ -33,5 +33,4 @@ include 'rbcs-cli'
 include 'rbcs-client'
 include 'rbcs-server'
 include 'rbcs-servlet'
-include 'rbcs-server-otel'
 include 'docker'