Update netty to 4.2.12

2026-03-26 20:03:35 +08:00
67 changed files with 232 additions and 1891 deletions
@@ -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

@@ -32,8 +32,8 @@ jobs:
          push: true
          pull: true
          tags: |
-            gitea.woggioni.net/woggioni/rbcs:latest
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
+            gitea.woggioni.net/woggioni/rbcs:vanilla
+            gitea.woggioni.net/woggioni/rbcs:vanilla-${{ steps.retrieve-version.outputs.VERSION }}
          target: release-vanilla
      -
        name: Build rbcs memcache Docker image
@@ -45,8 +45,10 @@ jobs:
          push: true
          pull: true
          tags: |
+            gitea.woggioni.net/woggioni/rbcs:latest
+            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
            gitea.woggioni.net/woggioni/rbcs:memcache
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-memcache
+            gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
          target: release-memcache
      -
        name: Build rbcs redis Docker image
@@ -58,22 +60,11 @@ jobs:
          push: true
          pull: true
          tags: |
+            gitea.woggioni.net/woggioni/rbcs:latest
+            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
            gitea.woggioni.net/woggioni/rbcs:redis
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-redis
+            gitea.woggioni.net/woggioni/rbcs:redis-${{ steps.retrieve-version.outputs.VERSION }}
          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
@@ -85,7 +76,7 @@ jobs:
          pull: true
          tags: |
            gitea.woggioni.net/woggioni/rbcs:native
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-native
+            gitea.woggioni.net/woggioni/rbcs:native-${{ steps.retrieve-version.outputs.VERSION }}
          target: release-native
      -
        name: Build rbcs jlink Docker image
@@ -98,7 +89,7 @@ jobs:
          pull: true
          tags: |
            gitea.woggioni.net/woggioni/rbcs:jlink
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}-jlink
+            gitea.woggioni.net/woggioni/rbcs:jlink-${{ steps.retrieve-version.outputs.VERSION }}-jlink
          target: release-jlink
      - name: Publish artifacts
        env:
@@ -4,7 +4,4 @@
 # Ignore Gradle build output directory
 build

-# Ignore JDTLS files
-.classpath
-.project
-.settings
+rbcs-cli/native-image/*.json
@@ -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>
@@ -1,69 +1,52 @@
 FROM eclipse-temurin:25-jre-alpine AS base-release
-RUN adduser -D rbcs
-USER rbcs
-ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
-WORKDIR /var/lib/rbcs
+RUN adduser -D luser
+USER luser
+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", "-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-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
-ADD logback.xml /etc/rbcs/logback.xml
-ENTRYPOINT ["java", "-jar", "/var/lib/rbcs/rbcs.jar"]
+WORKDIR /home/luser
+ADD logback.xml .
+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
-ADD logback.xml /etc/rbcs/logback.xml
-ENTRYPOINT ["java", "-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"]
+WORKDIR /home/luser
+ADD logback.xml .
+ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/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
 COPY --from=base-native /etc/rbcs /etc/rbcs
 COPY --from=base-native /var/lib/rbcs /var/lib/rbcs
-COPY --from=base-native /var/tmp/rbcs /var/tmp/rbcs
 ADD rbcs-cli.upx /usr/bin/rbcs-cli
-ADD logback.xml /etc/rbcs/logback.xml
+ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
 USER rbcs
 WORKDIR /var/lib/rbcs
-ENV RBCS_CONFIGURATION_DIR="/etc/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
-USER rbcs
-WORKDIR /var/lib/rbcs
-ADD logback.xml /etc/rbcs/logback.xml
-ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
+RUN adduser -u 1000 luser
+USER luser
+WORKDIR /home/luser
+ADD logback.xml .
+ENV JAVA_OPTS=-XX:-UseJVMCICompiler\ -Dlogback.configurationFile=logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC\ -XX:+ZGenerational
 ENTRYPOINT ["/usr/local/bin/rbcs-cli"]
@@ -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) {}
@@ -2,9 +2,9 @@ org.gradle.configuration-cache=false
 org.gradle.parallel=true
 org.gradle.caching=true

-rbcs.version = 0.5.1
+rbcs.version = 0.3.8

-lys.version = 2026.06.08
+lys.version = 2026.03.26

 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net
@@ -11,7 +11,6 @@ dependencies {
    api catalog.netty.buffer
    api catalog.netty.handler
    api catalog.netty.codec.http
-    api catalog.jetbrains.annotations
 }

 publishing {
@@ -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;
@@ -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
@@ -136,13 +136,6 @@ public class Configuration {
        TlsCertificateExtractor groupExtractor;
    }

-    @Value
-    public static class ForwardedClientCertificateAuthentication implements Authentication {
-        String headerName;
-        TlsCertificateExtractor userExtractor;
-        TlsCertificateExtractor groupExtractor;
-    }
-
    public interface Cache {
        CacheHandlerFactory materialize();
        String getNamespaceURI();
@@ -168,10 +161,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,
@@ -1,13 +0,0 @@
-package net.woggioni.rbcs.api;
-
-import org.jetbrains.annotations.NotNull;
-
-public interface SpanHandle {
-
-    void setAttribute(@NotNull String key, @NotNull String value);
-
-    void setAttribute(@NotNull String key, long value);
-
-    void setAttribute(@NotNull String key, boolean value);
-
-}
@@ -1,18 +0,0 @@
-package net.woggioni.rbcs.api;
-
-import io.netty.channel.ChannelHandler;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Map;
-
-public interface TelemetryController {
-    void initialize();
-    @NotNull ChannelHandler createHandler();
-
-    @Nullable SpanHandle startSpan(@NotNull String command);
-
-    void endSpan(@Nullable SpanHandle span);
-
-    void endSpan(@Nullable SpanHandle span, @NotNull Throwable error);
-}
@@ -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')

@@ -90,7 +92,7 @@ Provider<EnvelopeJarTask> envelopeJarTaskProvider = tasks.named(EnvelopePlugin.E
 tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfigurationTask) {
    toolchain {
        languageVersion = JavaLanguageVersion.of(25)
-        vendor = JvmVendorSpec.ORACLE
+        vendor = JvmVendorSpec.GRAAL_VM
    }
    mainClass = "net.woggioni.rbcs.cli.graal.GraalNativeImageConfiguration"
    classpath = project.files(
@@ -108,10 +110,10 @@ tasks.named(NativeImagePlugin.CONFIGURE_NATIVE_IMAGE_TASK_NAME, NativeImageConfi
 nativeImage {
    toolchain {
        languageVersion = JavaLanguageVersion.of(25)
-        vendor = JvmVendorSpec.ORACLE
+        vendor = JvmVendorSpec.GRAAL_VM
    }
    mainClass = mainClassName
-    //mainModule = mainModuleName
+//    mainModule = mainModuleName
    useMusl = true
    buildStaticImage = true
    linkAtBuildTime = false
@@ -119,7 +121,6 @@ nativeImage {
    compressExecutable = true
    compressionLevel = 6
    useLZMA = false
-    //verbose = true
 }

 Provider<UpxTask> upxTaskProvider = tasks.named(NativeImagePlugin.UPX_TASK_NAME, UpxTask) {
@@ -128,7 +129,7 @@ Provider<UpxTask> upxTaskProvider = tasks.named(NativeImagePlugin.UPX_TASK_NAME,
 Provider<JlinkTask> jlinkTaskProvider = tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
    toolchain {
        languageVersion = JavaLanguageVersion.of(25)
-        vendor = JvmVendorSpec.ORACLE
+        vendor = JvmVendorSpec.GRAAL_VM
    }

    mainClass = mainClassName
@@ -141,18 +142,14 @@ 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',
-//        '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'
+        'jdk.crypto.ec'
    ]
    compressionLevel = 2
    stripDebug = false
 }

 Provider<Tar> jlinkDistTarTaskProvider = tasks.named(JlinkPlugin.JLINK_DIST_TAR_TASK_NAME, Tar) {
+    exclude 'lib/libjvmcicompiler.so'
 }

 tasks.named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, ProcessResources) {
@@ -1,11 +1,2 @@
-Args=-O3 \
-   -march=x86-64-v3 \
-   --gc=serial \
-   --enable-url-protocols=jpms \
-   --pgo=conf/default.iprof \
-   --initialize-at-run-time=io.netty \
-   --initialize-at-build-time=net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory,net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory$JpmsHandler \
-   --trace-object-instantiation=ch.qos.logback.classic.Logger \
-   -H:+UnlockExperimentalVMOptions \
-   -H:+SharedArenaSupport
+Args=-O3 -march=x86-64-v2 --gc=serial --initialize-at-run-time=io.netty --enable-url-protocols=jpms -H:+UnlockExperimentalVMOptions -H:+SharedArenaSupport --initialize-at-build-time=net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory,net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory$JpmsHandler
 #-H:TraceClassInitialization=io.netty.handler.ssl.BouncyCastleAlpnSslUtils
@@ -7,8 +7,6 @@ import java.time.Duration
 import java.time.temporal.ChronoUnit
 import java.util.concurrent.ExecutionException
 import java.util.zip.Deflater
-import net.woggioni.rbcs.client.Configuration as ClientConfiguration
-import net.woggioni.rbcs.client.impl.Parser as ClientConfigurationParser
 import net.woggioni.jwo.NullOutputStream
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.api.Configuration.User
@@ -18,6 +16,8 @@ import net.woggioni.rbcs.cli.impl.commands.BenchmarkCommand
 import net.woggioni.rbcs.cli.impl.commands.GetCommand
 import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand
 import net.woggioni.rbcs.cli.impl.commands.PutCommand
+import net.woggioni.rbcs.client.Configuration as ClientConfiguration
+import net.woggioni.rbcs.client.impl.Parser as ClientConfigurationParser
 import net.woggioni.rbcs.common.HostAndPort
 import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
 import net.woggioni.rbcs.common.RBCS
@@ -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
@@ -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;
 }
@@ -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
@@ -12,7 +10,6 @@ import net.woggioni.rbcs.cli.impl.commands.HealthCheckCommand
 import net.woggioni.rbcs.cli.impl.commands.PasswordHashCommand
 import net.woggioni.rbcs.cli.impl.commands.PutCommand
 import net.woggioni.rbcs.cli.impl.commands.ServerCommand
-import net.woggioni.rbcs.common.RBCS.loadService
 import net.woggioni.rbcs.common.RbcsUrlStreamHandlerFactory
 import net.woggioni.rbcs.common.createLogger
 import picocli.CommandLine
@@ -64,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))
        }
    }
@@ -1,19 +1,5 @@
 package net.woggioni.rbcs.client

-import java.io.IOException
-import java.net.InetSocketAddress
-import java.net.URI
-import java.security.cert.X509Certificate
-import java.util.Base64
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeoutException
-import java.util.concurrent.atomic.AtomicInteger
-import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509ExtendedTrustManager
-import javax.net.ssl.X509TrustManager
-import kotlin.random.Random
-import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.bootstrap.Bootstrap
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.Unpooled
@@ -48,7 +34,20 @@ import io.netty.handler.timeout.IdleState
 import io.netty.handler.timeout.IdleStateEvent
 import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.concurrent.Future
+import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.util.concurrent.GenericFutureListener
+import java.io.IOException
+import java.net.InetSocketAddress
+import java.net.URI
+import java.security.cert.X509Certificate
+import java.util.Base64
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+import java.util.concurrent.atomic.AtomicInteger
+import javax.net.ssl.TrustManagerFactory
+import javax.net.ssl.X509TrustManager
+import kotlin.random.Random
 import net.woggioni.rbcs.api.CacheValueMetadata
 import net.woggioni.rbcs.common.RBCS.loadKeystore
 import net.woggioni.rbcs.common.createLogger
@@ -75,25 +74,13 @@ class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoC
                    )
                    profile.tlsTruststore?.let { trustStore ->
                        if (!trustStore.verifyServerCertificate) {
-                            trustManager(object : X509ExtendedTrustManager() {
+                            trustManager(object : X509TrustManager {
                                override fun checkClientTrusted(certChain: Array<out X509Certificate>, p1: String?) {
                                }

-                                override fun checkClientTrusted(certChain: Array<out X509Certificate>, p1: String?, socket: java.net.Socket) {
-                                }
-
-                                override fun checkClientTrusted(certChain: Array<out X509Certificate>, p1: String?, engine: javax.net.ssl.SSLEngine) {
-                                }
-
                                override fun checkServerTrusted(certChain: Array<out X509Certificate>, p1: String?) {
                                }

-                                override fun checkServerTrusted(certChain: Array<out X509Certificate>, p1: String?, socket: java.net.Socket) {
-                                }
-
-                                override fun checkServerTrusted(certChain: Array<out X509Certificate>, p1: String?, engine: javax.net.ssl.SSLEngine) {
-                                }
-
                                override fun getAcceptedIssuers() = null
                            })
                        } else {
@@ -1,10 +1,10 @@
 package net.woggioni.rbcs.client

+import io.netty.util.concurrent.EventExecutorGroup
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 import kotlin.math.pow
 import kotlin.random.Random
-import io.netty.util.concurrent.EventExecutorGroup

 sealed class OperationOutcome<T> {
    class Success<T>(val result: T) : OperationOutcome<T>()
@@ -1,10 +1,10 @@
 package net.woggioni.rbcs.client

+import io.netty.util.concurrent.DefaultEventExecutorGroup
+import io.netty.util.concurrent.EventExecutorGroup
 import java.util.concurrent.CompletableFuture
 import java.util.stream.Stream
 import kotlin.random.Random
-import io.netty.util.concurrent.DefaultEventExecutorGroup
-import io.netty.util.concurrent.EventExecutorGroup
 import net.woggioni.rbcs.common.contextLogger
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.extension.ExtensionContext
@@ -1,7 +1,7 @@
 package net.woggioni.rbcs.common

-import java.io.InputStream
 import io.netty.buffer.ByteBuf
+import java.io.InputStream

 class ByteBufInputStream(private val buf : ByteBuf) : InputStream() {
    override fun read(): Int {
@@ -1,7 +1,7 @@
 package net.woggioni.rbcs.common

-import java.io.OutputStream
 import io.netty.buffer.ByteBuf
+import java.io.OutputStream

 class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() {
    override fun write(b: Int) {
@@ -1,20 +1,18 @@
 package net.woggioni.rbcs.common

+import io.netty.channel.Channel
+import io.netty.channel.ChannelHandlerContext
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.logging.LogManager
-import io.netty.channel.Channel
-import io.netty.channel.ChannelHandlerContext
-import net.woggioni.jwo.LoggerController
 import org.slf4j.Logger
+import org.slf4j.LoggerFactory
 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() = lazyLogger(T::class.java)
-inline fun <reified T> createLogger() = lazyLogger(T::class.java)
+inline fun <reified T> T.contextLogger() = LoggerFactory.getLogger(T::class.java)
+inline fun <reified T> createLogger() = LoggerFactory.getLogger(T::class.java)

 inline fun Logger.traceParam(messageBuilder: () -> Pair<String, Array<Any>>) {
    if (isTraceEnabled) {
@@ -17,9 +17,7 @@ import java.security.cert.PKIXParameters
 import java.security.cert.PKIXRevocationChecker
 import java.security.cert.X509Certificate
 import java.util.EnumSet
-import java.util.ServiceLoader
 import javax.net.ssl.TrustManagerFactory
-import javax.net.ssl.X509ExtendedTrustManager
 import javax.net.ssl.X509TrustManager
 import net.woggioni.jwo.JWO
 import net.woggioni.jwo.Tuple2
@@ -125,7 +123,7 @@ object RBCS {
        return keystore
    }

-    fun getTrustManager(trustStore: KeyStore?, certificateRevocationEnabled: Boolean): X509ExtendedTrustManager {
+    fun getTrustManager(trustStore: KeyStore?, certificateRevocationEnabled: Boolean): X509TrustManager {
        return if (trustStore != null) {
            val certificateFactory = CertificateFactory.getInstance("X.509")
            val validator = CertPathValidator.getInstance("PKIX").apply {
@@ -137,7 +135,7 @@ object RBCS {
            val params = PKIXParameters(trustStore).apply {
                isRevocationEnabled = certificateRevocationEnabled
            }
-            object : X509ExtendedTrustManager() {
+            object : X509TrustManager {
                override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String) {
                    val clientCertificateChain = certificateFactory.generateCertPath(chain.toList())
                    try {
@@ -147,26 +145,10 @@ object RBCS {
                    }
                }

-                override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String, socket: java.net.Socket) {
-                    checkClientTrusted(chain, authType)
-                }
-
-                override fun checkClientTrusted(chain: Array<out X509Certificate>, authType: String, engine: javax.net.ssl.SSLEngine) {
-                    checkClientTrusted(chain, authType)
-                }
-
                override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String) {
                    throw NotImplementedError()
                }

-                override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String, socket: java.net.Socket) {
-                    checkServerTrusted(chain, authType)
-                }
-
-                override fun checkServerTrusted(chain: Array<out X509Certificate>, authType: String, engine: javax.net.ssl.SSLEngine) {
-                    checkServerTrusted(chain, authType)
-                }
-
                private val acceptedIssuers = trustStore.aliases().asSequence()
                    .filter(trustStore::isCertificateEntry)
                    .map(trustStore::getCertificate)
@@ -178,14 +160,8 @@ object RBCS {
            }
        } else {
            val trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())
-            trustManagerFactory.trustManagers.asSequence().filter { it is X509ExtendedTrustManager }
-                .single() as X509ExtendedTrustManager
+            trustManagerFactory.trustManagers.asSequence().filter { it is 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()
-    }
 }
@@ -16,13 +16,13 @@ import javax.xml.transform.stream.StreamResult
 import javax.xml.transform.stream.StreamSource
 import javax.xml.validation.Schema
 import javax.xml.validation.SchemaFactory
-import org.xml.sax.ErrorHandler as ErrHandler
 import net.woggioni.jwo.JWO
 import org.slf4j.event.Level
 import org.w3c.dom.Document
 import org.w3c.dom.Element
 import org.w3c.dom.Node
 import org.w3c.dom.NodeList
+import org.xml.sax.ErrorHandler as ErrHandler
 import org.xml.sax.SAXNotRecognizedException
 import org.xml.sax.SAXNotSupportedException
 import org.xml.sax.SAXParseException
@@ -1,5 +1,4 @@
 import net.woggioni.rbcs.api.CacheProvider;
-import net.woggioni.rbcs.api.TelemetryController;

 module net.woggioni.rbcs.server.memcache {
    requires net.woggioni.rbcs.common;
@@ -17,7 +16,5 @@ module net.woggioni.rbcs.server.memcache {

    provides CacheProvider with net.woggioni.rbcs.server.memcache.MemcacheCacheProvider;

-    uses TelemetryController;
-
    opens net.woggioni.rbcs.server.memcache.schema;
 }
@@ -1,15 +1,15 @@
 package net.woggioni.rbcs.server.memcache

-import java.time.Duration
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.atomic.AtomicInteger
-import java.util.concurrent.atomic.AtomicReference
 import io.netty.channel.ChannelFactory
 import io.netty.channel.EventLoopGroup
 import io.netty.channel.pool.FixedChannelPool
 import io.netty.channel.socket.DatagramChannel
 import io.netty.channel.socket.SocketChannel
+import java.time.Duration
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.concurrent.atomic.AtomicReference
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.CacheHandlerFactory
 import net.woggioni.rbcs.api.Configuration
@@ -1,26 +1,9 @@
 package net.woggioni.rbcs.server.memcache

-import java.io.ByteArrayOutputStream
-import java.io.ObjectInputStream
-import java.io.ObjectOutputStream
-import java.nio.ByteBuffer
-import java.nio.channels.Channels
-import java.nio.channels.FileChannel
-import java.nio.channels.ReadableByteChannel
-import java.nio.file.Files
-import java.nio.file.StandardOpenOption
-import java.net.InetSocketAddress
-import java.time.Duration
-import java.time.Instant
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.atomic.AtomicReference
-import java.util.zip.Deflater
-import java.util.zip.DeflaterOutputStream
-import java.util.zip.InflaterOutputStream
-import io.netty.channel.Channel as NettyChannel
 import io.netty.buffer.ByteBuf
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.CompositeByteBuf
+import io.netty.channel.Channel as NettyChannel
 import io.netty.channel.ChannelHandlerContext
 import io.netty.handler.codec.memcache.DefaultLastMemcacheContent
 import io.netty.handler.codec.memcache.DefaultMemcacheContent
@@ -30,6 +13,21 @@ import io.netty.handler.codec.memcache.binary.BinaryMemcacheOpcodes
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponse
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponseStatus
 import io.netty.handler.codec.memcache.binary.DefaultBinaryMemcacheRequest
+import java.io.ByteArrayOutputStream
+import java.io.ObjectInputStream
+import java.io.ObjectOutputStream
+import java.nio.ByteBuffer
+import java.nio.channels.Channels
+import java.nio.channels.FileChannel
+import java.nio.channels.ReadableByteChannel
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
+import java.time.Duration
+import java.time.Instant
+import java.util.concurrent.CompletableFuture
+import java.util.zip.Deflater
+import java.util.zip.DeflaterOutputStream
+import java.util.zip.InflaterOutputStream
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.CacheValueMetadata
 import net.woggioni.rbcs.api.exception.ContentTooLargeException
@@ -41,11 +39,8 @@ import net.woggioni.rbcs.api.message.CacheMessage.CachePutResponse
 import net.woggioni.rbcs.api.message.CacheMessage.CacheValueFoundResponse
 import net.woggioni.rbcs.api.message.CacheMessage.CacheValueNotFoundResponse
 import net.woggioni.rbcs.api.message.CacheMessage.LastCacheContent
-import net.woggioni.rbcs.api.SpanHandle
-import net.woggioni.rbcs.api.TelemetryController
 import net.woggioni.rbcs.common.ByteBufInputStream
 import net.woggioni.rbcs.common.ByteBufOutputStream
-import net.woggioni.rbcs.common.RBCS.loadService
 import net.woggioni.rbcs.common.RBCS.processCacheKey
 import net.woggioni.rbcs.common.RBCS.toIntOrNull
 import net.woggioni.rbcs.common.createLogger
@@ -75,10 +70,6 @@ class MemcacheCacheHandler(
        }
    }

-    private val telemetryController by lazy {
-        loadService(TelemetryController::class.java).firstOrNull()
-    }
-
    private interface InProgressRequest {

    }
@@ -162,9 +153,7 @@ class MemcacheCacheHandler(
        metadata: CacheValueMetadata,
        val digest: ByteBuf,
        val requestController: CompletableFuture<MemcacheRequestController>,
-        private val alloc: ByteBufAllocator,
-        val entryKey: String,
-        val memcacheSpanRef: AtomicReference<SpanHandle?>,
+        private val alloc: ByteBufAllocator
    ) : InProgressRequest {
        private var totalSize = 0
        private var tmpFile: FileChannel? = null
@@ -262,17 +251,6 @@ class MemcacheCacheHandler(
        val key = ctx.alloc().buffer().also {
            it.writeBytes(processCacheKey(msg.key, keyPrefix, digestAlgorithm))
        }
-        val memcacheSpan = telemetryController?.startSpan("GET")?.apply {
-            setAttribute("db.system", "memcache")
-            setAttribute("db.operation.name", "GET")
-            val remoteAddr = ctx.channel().remoteAddress()
-            if (remoteAddr is InetSocketAddress) {
-                remoteAddr.hostString?.let {
-                    setAttribute("server.address", it)
-                }
-                setAttribute("server.port", remoteAddr.port.toLong())
-            }
-        }
        val responseHandler = object : MemcacheResponseHandler {
            override fun responseReceived(response: BinaryMemcacheResponse) {
                val status = response.status()
@@ -288,15 +266,8 @@ class MemcacheCacheHandler(
                        log.debug(ctx) {
                            "Cache miss for key ${msg.key} on memcache"
                        }
-                        telemetryController?.endSpan(memcacheSpan)
                        sendMessageAndFlush(ctx, CacheValueNotFoundResponse(msg.key))
                    }
-
-                    else -> {
-                        val ex = MemcacheException(status)
-                        telemetryController?.endSpan(memcacheSpan, ex)
-                        this@MemcacheCacheHandler.exceptionCaught(ctx, ex)
-                    }
                }
            }

@@ -311,13 +282,11 @@ class MemcacheCacheHandler(
                    if (content is LastMemcacheContent) {
                        inProgressRequest = null
                        inProgressGetRequest.commit()
-                        telemetryController?.endSpan(memcacheSpan)
                    }
                }
            }

            override fun exceptionCaught(ex: Throwable) {
-                telemetryController?.endSpan(memcacheSpan, ex)
                (inProgressRequest as? InProgressGetRequest).let { inProgressGetRequest ->
                    inProgressGetRequest?.let {
                        inProgressRequest = null
@@ -343,7 +312,6 @@ class MemcacheCacheHandler(
        val key = ctx.alloc().buffer().also {
            it.writeBytes(processCacheKey(msg.key, keyPrefix, digestAlgorithm))
        }
-        val memcacheSpanRef = AtomicReference<SpanHandle?>(null)
        val responseHandler = object : MemcacheResponseHandler {
            override fun responseReceived(response: BinaryMemcacheResponse) {
                val status = response.status()
@@ -352,22 +320,16 @@ class MemcacheCacheHandler(
                        log.debug(ctx) {
                            "Inserted key ${msg.key} into memcache"
                        }
-                        telemetryController?.endSpan(memcacheSpanRef.get())
                        sendMessageAndFlush(ctx, CachePutResponse(msg.key))
                    }

-                    else -> {
-                        val ex = MemcacheException(status)
-                        telemetryController?.endSpan(memcacheSpanRef.get(), ex)
-                        this@MemcacheCacheHandler.exceptionCaught(ctx, ex)
-                    }
+                    else -> this@MemcacheCacheHandler.exceptionCaught(ctx, MemcacheException(status))
                }
            }

            override fun contentReceived(content: MemcacheContent) {}

            override fun exceptionCaught(ex: Throwable) {
-                telemetryController?.endSpan(memcacheSpanRef.get(), ex)
                this@MemcacheCacheHandler.exceptionCaught(ctx, ex)
            }
        }
@@ -377,7 +339,7 @@ class MemcacheCacheHandler(
                this@MemcacheCacheHandler.exceptionCaught(ctx, ex)
            }
        }
-        inProgressRequest = InProgressPutRequest(ctx.channel(), msg.metadata, key, requestController, ctx.alloc(), msg.key, memcacheSpanRef)
+        inProgressRequest = InProgressPutRequest(ctx.channel(), msg.metadata, key, requestController, ctx.alloc())
    }

    private fun handleCacheContent(ctx: ChannelHandlerContext, msg: CacheContent) {
@@ -400,41 +362,22 @@ class MemcacheCacheHandler(
        val request = inProgressRequest
        when (request) {
            is InProgressPutRequest -> {
-                val putRequest = request
                inProgressRequest = null
                log.trace(ctx) {
                    "Received last chunk of ${msg.content().readableBytes()} bytes for memcache"
                }
-                putRequest.write(msg.content())
-                val memcacheSpan = telemetryController?.startSpan("SET",
-                )?.apply {
-                    setAttribute("db.system", "memcache")
-                    setAttribute("db.operation.name", "SET")
-                    val remoteAddr = ctx.channel().remoteAddress()
-                    if (remoteAddr is InetSocketAddress) {
-                        remoteAddr.hostString?.let {
-                            setAttribute("server.address", it)
-                        }
-                        setAttribute("server.port", remoteAddr.port.toLong())
-                    }
-                }
-                putRequest.memcacheSpanRef.set(memcacheSpan)
-                val key = putRequest.digest.retainedDuplicate()
-                val (payloadSize, payloadSource) = putRequest.commit()
+                request.write(msg.content())
+                val key = request.digest.retainedDuplicate()
+                val (payloadSize, payloadSource) = request.commit()
                val extras = ctx.alloc().buffer(8, 8)
                extras.writeInt(0)
                extras.writeInt(encodeExpiry(maxAge))
-                val totalBodyLength = putRequest.digest.readableBytes() + extras.readableBytes() + payloadSize
+                val totalBodyLength = request.digest.readableBytes() + extras.readableBytes() + payloadSize
                log.trace(ctx) {
                    "Trying to send SET request to memcache"
                }
-                putRequest.requestController.whenComplete { requestController, ex ->
+                request.requestController.whenComplete { requestController, ex ->
                    if (ex == null) {
-                        val remoteAddr = requestController.channel.remoteAddress()
-                        if (remoteAddr is InetSocketAddress) {
-                            remoteAddr.hostString?.let { memcacheSpan?.setAttribute("server.address", it) }
-                            memcacheSpan?.setAttribute("server.port", remoteAddr.port.toLong())
-                        }
                        log.trace(ctx) {
                            "Sending SET request to memcache"
                        }
@@ -1,11 +1,6 @@
 package net.woggioni.rbcs.server.memcache.client


-import java.io.IOException
-import java.net.InetSocketAddress
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.ConcurrentHashMap
-import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.bootstrap.Bootstrap
 import io.netty.buffer.ByteBuf
 import io.netty.channel.Channel
@@ -25,7 +20,12 @@ import io.netty.handler.codec.memcache.MemcacheObject
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheClientCodec
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheRequest
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheResponse
+import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.util.concurrent.GenericFutureListener
+import java.io.IOException
+import java.net.InetSocketAddress
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ConcurrentHashMap
 import net.woggioni.rbcs.common.HostAndPort
 import net.woggioni.rbcs.common.createLogger
 import net.woggioni.rbcs.common.trace
@@ -147,8 +147,6 @@ class MemcacheClient(

                    channel.pipeline().addLast(handler)
                    response.complete(object : MemcacheRequestController {
-                        override val channel: Channel = channel
-
                        private var channelReleased = false

                        override fun sendRequest(request: BinaryMemcacheRequest) {
@@ -1,13 +1,10 @@
 package net.woggioni.rbcs.server.memcache.client

-import io.netty.channel.Channel
 import io.netty.handler.codec.memcache.MemcacheContent
 import io.netty.handler.codec.memcache.binary.BinaryMemcacheRequest

 interface MemcacheRequestController {

-    val channel: Channel
-
    fun sendRequest(request : BinaryMemcacheRequest)

    fun sendContent(content : MemcacheContent)
@@ -1,11 +1,11 @@
 package net.woggioni.rbcs.server.memcache.client

+import io.netty.buffer.ByteBufUtil
+import io.netty.buffer.Unpooled
 import java.io.ByteArrayInputStream
 import java.nio.ByteBuffer
 import java.nio.channels.Channels
 import kotlin.random.Random
-import io.netty.buffer.ByteBufUtil
-import io.netty.buffer.Unpooled
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test

@@ -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
-        }
-    }
-}
@@ -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;
-}
@@ -1,65 +0,0 @@
-package net.woggioni.rbcs.server.otel
-
-import io.netty.channel.ChannelHandler
-import io.opentelemetry.api.GlobalOpenTelemetry
-import io.opentelemetry.api.common.AttributeKey
-import io.opentelemetry.api.trace.SpanKind
-import io.opentelemetry.api.trace.StatusCode
-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.SpanHandle
-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>()
-
-    private val tracer by lazy {
-        GlobalOpenTelemetry.getTracer("net.woggioni.rbcs.server.redis", "0.5.0")
-    }
-
-    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()
-    }
-
-    override fun startSpan(name: String): SpanHandle {
-        val span = tracer.spanBuilder(name)
-            .setSpanKind(SpanKind.CLIENT)
-            .startSpan()
-        return OtelSpanHandle(span)
-    }
-
-    override fun endSpan(span: SpanHandle?) {
-        (span as? OtelSpanHandle)?.delegate?.end()
-    }
-
-    override fun endSpan(span: SpanHandle?, error: Throwable) {
-        val s = (span as? OtelSpanHandle)?.delegate ?: return
-        s.recordException(error)
-        s.setStatus(StatusCode.ERROR)
-        s.end()
-    }
-}
@@ -1,21 +0,0 @@
-package net.woggioni.rbcs.server.otel
-
-import io.opentelemetry.api.trace.Span
-import net.woggioni.rbcs.api.SpanHandle
-
-internal class OtelSpanHandle(
-    val delegate: Span,
-) : SpanHandle {
-
-    override fun setAttribute(key: String, value: String) {
-        delegate.setAttribute(key, value)
-    }
-
-    override fun setAttribute(key: String, value: Long) {
-        delegate.setAttribute(key, value)
-    }
-
-    override fun setAttribute(key: String, value: Boolean) {
-        delegate.setAttribute(key, value)
-    }
-}
@@ -1,5 +1,4 @@
 import net.woggioni.rbcs.api.CacheProvider;
-import net.woggioni.rbcs.api.TelemetryController;

 module net.woggioni.rbcs.server.redis {
    requires net.woggioni.rbcs.common;
@@ -17,7 +16,5 @@ module net.woggioni.rbcs.server.redis {

    provides CacheProvider with net.woggioni.rbcs.server.redis.RedisCacheProvider;

-    uses TelemetryController;
-
    opens net.woggioni.rbcs.server.redis.schema;
 }
@@ -1,15 +1,17 @@
 package net.woggioni.rbcs.server.redis

+import io.netty.channel.ChannelFactory
+import io.netty.channel.EventLoopGroup
+import io.netty.channel.pool.FixedChannelPool
+import io.netty.channel.socket.DatagramChannel
+import io.netty.channel.socket.SocketChannel
+
 import java.time.Duration
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.atomic.AtomicReference
-import io.netty.channel.ChannelFactory
-import io.netty.channel.EventLoopGroup
-import io.netty.channel.pool.FixedChannelPool
-import io.netty.channel.socket.DatagramChannel
-import io.netty.channel.socket.SocketChannel
+
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.CacheHandlerFactory
 import net.woggioni.rbcs.api.Configuration
@@ -1,9 +1,19 @@
 package net.woggioni.rbcs.server.redis

+import io.netty.buffer.ByteBuf
+import io.netty.buffer.ByteBufAllocator
+import io.netty.buffer.CompositeByteBuf
+import io.netty.channel.Channel as NettyChannel
+import io.netty.channel.ChannelHandlerContext
+import io.netty.handler.codec.redis.ArrayRedisMessage
+import io.netty.handler.codec.redis.ErrorRedisMessage
+import io.netty.handler.codec.redis.FullBulkStringRedisMessage
+import io.netty.handler.codec.redis.RedisMessage
+import io.netty.handler.codec.redis.SimpleStringRedisMessage
+
 import java.io.ByteArrayOutputStream
 import java.io.ObjectInputStream
 import java.io.ObjectOutputStream
-import java.net.InetSocketAddress
 import java.nio.ByteBuffer
 import java.nio.channels.Channels
 import java.nio.channels.FileChannel
@@ -15,16 +25,7 @@ import java.time.Duration
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.InflaterOutputStream
-import io.netty.channel.Channel as NettyChannel
-import io.netty.buffer.ByteBuf
-import io.netty.buffer.ByteBufAllocator
-import io.netty.buffer.CompositeByteBuf
-import io.netty.channel.ChannelHandlerContext
-import io.netty.handler.codec.redis.ArrayRedisMessage
-import io.netty.handler.codec.redis.ErrorRedisMessage
-import io.netty.handler.codec.redis.FullBulkStringRedisMessage
-import io.netty.handler.codec.redis.RedisMessage
-import io.netty.handler.codec.redis.SimpleStringRedisMessage
+
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.CacheValueMetadata
 import net.woggioni.rbcs.api.exception.ContentTooLargeException
@@ -36,10 +37,8 @@ import net.woggioni.rbcs.api.message.CacheMessage.CachePutResponse
 import net.woggioni.rbcs.api.message.CacheMessage.CacheValueFoundResponse
 import net.woggioni.rbcs.api.message.CacheMessage.CacheValueNotFoundResponse
 import net.woggioni.rbcs.api.message.CacheMessage.LastCacheContent
-import net.woggioni.rbcs.api.TelemetryController
 import net.woggioni.rbcs.common.ByteBufInputStream
 import net.woggioni.rbcs.common.ByteBufOutputStream
-import net.woggioni.rbcs.common.RBCS.loadService
 import net.woggioni.rbcs.common.RBCS.processCacheKey
 import net.woggioni.rbcs.common.RBCS.toIntOrNull
 import net.woggioni.rbcs.common.createLogger
@@ -63,10 +62,6 @@ class RedisCacheHandler(
        private val log = createLogger<RedisCacheHandler>()
    }

-    private val telemetryController by lazy {
-        loadService(TelemetryController::class.java).firstOrNull()
-    }
-
    private interface InProgressRequest

    private inner class InProgressGetRequest(
@@ -249,17 +244,6 @@ class RedisCacheHandler(
        }
        val keyBytes = processCacheKey(msg.key, keyPrefix, digestAlgorithm)
        val keyString = String(keyBytes, StandardCharsets.UTF_8)
-        val redisSpan = telemetryController?.startSpan("GET")?.apply {
-            setAttribute("db.system", "redis")
-            setAttribute("db.operation.name", "GET")
-            val remoteAddr = ctx.channel().remoteAddress()
-            if (remoteAddr is InetSocketAddress) {
-                remoteAddr.hostString?.let {
-                    setAttribute("server.address", it)
-                }
-                setAttribute("server.port", remoteAddr.port.toLong())
-            }
-        }
        val responseHandler = object : RedisResponseHandler {
            override fun responseReceived(response: RedisMessage) {
                when (response) {
@@ -268,13 +252,11 @@ class RedisCacheHandler(
                            log.debug(ctx) {
                                "Cache miss for key ${msg.key} on Redis"
                            }
-                            telemetryController?.endSpan(redisSpan)
                            sendMessageAndFlush(ctx, CacheValueNotFoundResponse(msg.key))
                        } else {
                            log.debug(ctx) {
                                "Cache hit for key ${msg.key} on Redis"
                            }
-                            telemetryController?.endSpan(redisSpan)
                            val getRequest = InProgressGetRequest(msg.key, ctx)
                            inProgressRequest = getRequest
                            getRequest.processResponse(response.content())
@@ -283,32 +265,25 @@ class RedisCacheHandler(
                    }

                    is ErrorRedisMessage -> {
-                        val ex = RedisException("Redis error for GET ${msg.key}: ${response.content()}")
-                        telemetryController?.endSpan(redisSpan, ex)
-                        this@RedisCacheHandler.exceptionCaught(ctx, ex)
+                        this@RedisCacheHandler.exceptionCaught(
+                            ctx, RedisException("Redis error for GET ${msg.key}: ${response.content()}")
+                        )
                    }

                    else -> {
                        log.warn(ctx) {
                            "Unexpected response type from Redis for key ${msg.key}: ${response.javaClass.name}"
                        }
-                        telemetryController?.endSpan(redisSpan)
                        sendMessageAndFlush(ctx, CacheValueNotFoundResponse(msg.key))
                    }
                }
            }

            override fun exceptionCaught(ex: Throwable) {
-                telemetryController?.endSpan(redisSpan, ex)
                this@RedisCacheHandler.exceptionCaught(ctx, ex)
            }
        }
        client.sendCommand(keyBytes, ctx.alloc(), responseHandler).thenAccept { channel ->
-            val remoteAddr = channel.remoteAddress()
-            if (remoteAddr is InetSocketAddress) {
-                remoteAddr.hostString?.let { redisSpan?.setAttribute("server.address", it) }
-                redisSpan?.setAttribute("server.port", remoteAddr.port.toLong())
-            }
            log.trace(ctx) {
                "Sending GET request for key ${msg.key} to Redis"
            }
@@ -369,18 +344,6 @@ class RedisCacheHandler(

                val expirySeconds = maxAge.toSeconds().toString()

-                val redisSpan = telemetryController?.startSpan("SET")?.apply {
-                    setAttribute("db.system", "redis")
-                    setAttribute("db.operation.name", "SET")
-                    val remoteAddr = ctx.channel().remoteAddress()
-                    if (remoteAddr is InetSocketAddress) {
-                        remoteAddr.hostString?.let {
-                            setAttribute("server.address", it)
-                        }
-                        setAttribute("server.port", remoteAddr.port.toLong())
-                    }
-                }
-
                val responseHandler = object : RedisResponseHandler {
                    override fun responseReceived(response: RedisMessage) {
                        when (response) {
@@ -388,37 +351,30 @@ class RedisCacheHandler(
                                log.debug(ctx) {
                                    "Inserted key ${request.keyString} into Redis"
                                }
-                                telemetryController?.endSpan(redisSpan)
                                sendMessageAndFlush(ctx, CachePutResponse(request.keyString))
                            }

                            is ErrorRedisMessage -> {
-                                val ex = RedisException("Redis error for SET ${request.keyString}: ${response.content()}")
-                                telemetryController?.endSpan(redisSpan, ex)
-                                this@RedisCacheHandler.exceptionCaught(ctx, ex)
+                                this@RedisCacheHandler.exceptionCaught(
+                                    ctx, RedisException("Redis error for SET ${request.keyString}: ${response.content()}")
+                                )
                            }

                            else -> {
-                                val ex = RedisException("Unexpected response for SET ${request.keyString}: ${response.javaClass.name}")
-                                telemetryController?.endSpan(redisSpan, ex)
-                                this@RedisCacheHandler.exceptionCaught(ctx, ex)
+                                this@RedisCacheHandler.exceptionCaught(
+                                    ctx, RedisException("Unexpected response for SET ${request.keyString}: ${response.javaClass.name}")
+                                )
                            }
                        }
                    }

                    override fun exceptionCaught(ex: Throwable) {
-                        telemetryController?.endSpan(redisSpan, ex)
                        this@RedisCacheHandler.exceptionCaught(ctx, ex)
                    }
                }

                // Use a ByteBuf key for server selection
                client.sendCommand(keyBytes, ctx.alloc(), responseHandler).thenAccept { channel ->
-                    val remoteAddr = channel.remoteAddress()
-                    if (remoteAddr is InetSocketAddress) {
-                        remoteAddr.hostString?.let { redisSpan?.setAttribute("server.address", it) }
-                        redisSpan?.setAttribute("server.port", remoteAddr.port.toLong())
-                    }
                    log.trace(ctx) {
                        "Sending SET request to Redis"
                    }
@@ -2,6 +2,7 @@ package net.woggioni.rbcs.server.redis

 import java.time.Duration
 import java.time.temporal.ChronoUnit
+
 import net.woggioni.rbcs.api.CacheProvider
 import net.woggioni.rbcs.api.exception.ConfigurationException
 import net.woggioni.rbcs.common.HostAndPort
@@ -9,6 +10,7 @@ import net.woggioni.rbcs.common.RBCS
 import net.woggioni.rbcs.common.Xml
 import net.woggioni.rbcs.common.Xml.Companion.asIterable
 import net.woggioni.rbcs.common.Xml.Companion.renderAttribute
+
 import org.w3c.dom.Document
 import org.w3c.dom.Element

@@ -1,11 +1,5 @@
 package net.woggioni.rbcs.server.redis.client

-import java.io.IOException
-import java.net.InetSocketAddress
-import java.nio.charset.StandardCharsets
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.ConcurrentHashMap
-import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.bootstrap.Bootstrap
 import io.netty.buffer.ByteBufAllocator
 import io.netty.buffer.Unpooled
@@ -28,7 +22,15 @@ import io.netty.handler.codec.redis.RedisBulkStringAggregator
 import io.netty.handler.codec.redis.RedisDecoder
 import io.netty.handler.codec.redis.RedisEncoder
 import io.netty.handler.codec.redis.RedisMessage
+import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.util.concurrent.GenericFutureListener
+
+import java.io.IOException
+import java.net.InetSocketAddress
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.ConcurrentHashMap
+
 import net.woggioni.rbcs.common.HostAndPort
 import net.woggioni.rbcs.common.createLogger
 import net.woggioni.rbcs.common.trace
@@ -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')
@@ -26,6 +26,5 @@ module net.woggioni.rbcs.server {


    uses CacheProvider;
-    uses net.woggioni.rbcs.api.TelemetryController;
    provides CacheProvider with FileSystemCacheProvider, InMemoryCacheProvider;
 }
@@ -1,23 +1,5 @@
 package net.woggioni.rbcs.server

-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 io.netty.bootstrap.ServerBootstrap
 import io.netty.buffer.ByteBuf
 import io.netty.channel.Channel
@@ -55,16 +37,32 @@ 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.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
@@ -151,68 +149,12 @@ 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) {
-                log.debug(ctx) {
-                    ex.message ?: "Error witch client certificate authentication"
-                }
+            } catch (es: SSLPeerUnverifiedException) {
                anonymousUserGroups?.let { AuthenticationResult(null, it) }
            }
        }
    }

-    @Sharable
-    private class ForwardedClientCertificateAuthenticator(
-        authorizer: Authorizer,
-        private val anonymousUserGroups: Set<Configuration.Group>?,
-        private val subjectDnUserExtractor: SubjectDnExtractor?,
-        private val subjectDnGroupExtractor: SubjectDnExtractor?,
-        private val headerName: String,
-        private val trustedProxyIPs: List<Cidr>,
-        private val users: Map<String, Configuration.User>,
-        private val groups: Map<String, Configuration.Group>,
-    ) : AbstractNettyHttpAuthenticator(authorizer) {
-
-        companion object {
-            private val log = createLogger<ForwardedClientCertificateAuthenticator>()
-        }
-
-        override fun authenticate(ctx: ChannelHandlerContext, req: HttpRequest): AuthenticationResult? {
-            val clientIp = ctx.channel().attr(clientIp).get()
-            if (clientIp == null || trustedProxyIPs.none { it.contains(clientIp.address) }) {
-                log.debug(ctx) {
-                    "Rejecting forwarded client certificate authentication from untrusted address: $clientIp"
-                }
-                return null
-            }
-            val subjectDn = req.headers()[headerName]
-                ?: return anonymousUserGroups?.let { AuthenticationResult(null, it) }
-            val ldapName = try {
-                LdapName(subjectDn)
-            } catch (_: Exception) {
-                log.debug(ctx) {
-                    "Invalid subject DN in header $headerName: $subjectDn"
-                }
-                return anonymousUserGroups?.let { AuthenticationResult(null, it) }
-            }
-            val user = subjectDnUserExtractor?.extract(ldapName)?.let { userName ->
-                users[userName] ?: throw RuntimeException("Failed to extract user '$userName'")
-            }
-            val group = subjectDnGroupExtractor?.extract(ldapName)?.let { groupName ->
-                groups[groupName] ?: throw RuntimeException("Failed to extract group '$groupName'")
-            }
-            val allGroups = ((user?.groups ?: emptySet()).asSequence() + sequenceOf(group).filterNotNull()).toSet()
-            return AuthenticationResult(user, allGroups)
-        }
-    }
-
-    private data class SubjectDnExtractor(val rdnType: String, val pattern: Pattern) {
-        fun extract(ldapName: LdapName): String? {
-            return ldapName.rdns.find { it.type == rdnType }
-                ?.let { pattern.matcher(it.value.toString()) }
-                ?.takeIf(Matcher::matches)?.group(1)
-        }
-    }
-
    @Sharable
    private class NettyHttpBasicAuthenticator(
        private val users: Map<String, Configuration.User>, authorizer: Authorizer
@@ -319,23 +261,6 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                )
            }

-            is Configuration.ForwardedClientCertificateAuthentication -> {
-                ForwardedClientCertificateAuthenticator(
-                    RoleAuthorizer(),
-                    cfg.users[""]?.groups,
-                    auth.userExtractor?.let { extractor ->
-                        SubjectDnExtractor(extractor.rdnType, Pattern.compile(extractor.pattern))
-                    },
-                    auth.groupExtractor?.let { extractor ->
-                        SubjectDnExtractor(extractor.rdnType, Pattern.compile(extractor.pattern))
-                    },
-                    auth.headerName,
-                    cfg.trustedProxyIPs,
-                    cfg.users,
-                    cfg.groups,
-                )
-            }
-
            else -> null
        }

@@ -354,7 +279,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                    }?.let {
                        pattern.matcher(it.value.toString())
                    }?.takeIf(Matcher::matches)?.group(1)
-                    cfg.users[userName] ?: throw RuntimeException("Failed to extract user")
+                    cfg.users[userName] ?: throw java.lang.RuntimeException("Failed to extract user")
                }
            }

@@ -368,7 +293,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                    }?.let {
                        pattern.matcher(it.value.toString())
                    }?.takeIf(Matcher::matches)?.group(1)
-                    cfg.groups[groupName] ?: throw RuntimeException("Failed to extract group")
+                    cfg.groups[groupName] ?: throw java.lang.RuntimeException("Failed to extract group")
                }
            }

@@ -433,10 +358,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))
@@ -1,6 +1,5 @@
 package net.woggioni.rbcs.server.auth

-import java.net.InetSocketAddress
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelFutureListener
 import io.netty.channel.ChannelHandlerContext
@@ -16,15 +15,12 @@ import io.netty.util.ReferenceCountUtil
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.api.Configuration.Group
 import net.woggioni.rbcs.api.Role
-import net.woggioni.rbcs.common.createLogger
-import net.woggioni.rbcs.common.debug
 import net.woggioni.rbcs.server.RemoteBuildCacheServer

+
 abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer) : ChannelInboundHandlerAdapter() {

    companion object {
-        private val log = createLogger<AbstractNettyHttpAuthenticator>()
-
        private val AUTHENTICATION_FAILED: FullHttpResponse = DefaultFullHttpResponse(
            HttpVersion.HTTP_1_1, HttpResponseStatus.UNAUTHORIZED, Unpooled.EMPTY_BUFFER
        ).apply {
@@ -57,18 +53,6 @@ abstract class AbstractNettyHttpAuthenticator(private val authorizer: Authorizer
                        result.groups.asSequence().flatMap { it.roles.asSequence() }
            ).toSet()
            val authorized = authorizer.authorize(roles, msg)
-            log.debug {
-                val authorizedMessage = if (authorized) {
-                    "Authorized"
-                } else {
-                    "Forbidden"
-                }
-                val clientAddress = ctx.channel().attr(RemoteBuildCacheServer.clientIp).get()
-                val roleString = "[" + roles.asSequence().map { "\"" + it + "\"" }.joinToString(", ") + "]"
-                result.user?.name?.takeUnless(String::isEmpty)?.let { username ->
-                    "$authorizedMessage ${msg.method()} request from user $username with address $clientAddress, granted roles $roleString"
-                } ?: "$authorizedMessage anonymous ${msg.method()} request with address $clientAddress, granted roles $roleString"
-            }
            if (authorized) {
                super.channelRead(ctx, msg)
            } else {
@@ -1,11 +1,11 @@
 package net.woggioni.rbcs.server.cache

-import java.nio.file.Path
-import java.time.Duration
 import io.netty.channel.ChannelFactory
 import io.netty.channel.EventLoopGroup
 import io.netty.channel.socket.DatagramChannel
 import io.netty.channel.socket.SocketChannel
+import java.nio.file.Path
+import java.time.Duration
 import net.woggioni.jwo.Application
 import net.woggioni.rbcs.api.CacheHandlerFactory
 import net.woggioni.rbcs.api.Configuration
@@ -1,14 +1,14 @@
 package net.woggioni.rbcs.server.cache

+import io.netty.buffer.ByteBuf
+import io.netty.channel.ChannelHandlerContext
+import io.netty.handler.codec.http.LastHttpContent
+import io.netty.handler.stream.ChunkedNioFile
 import java.nio.channels.Channels
 import java.util.Base64
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.InflaterInputStream
-import io.netty.buffer.ByteBuf
-import io.netty.channel.ChannelHandlerContext
-import io.netty.handler.codec.http.LastHttpContent
-import io.netty.handler.stream.ChunkedNioFile
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.message.CacheMessage
 import net.woggioni.rbcs.api.message.CacheMessage.CacheContent
@@ -1,10 +1,10 @@
 package net.woggioni.rbcs.server.cache

-import java.time.Duration
 import io.netty.channel.ChannelFactory
 import io.netty.channel.EventLoopGroup
 import io.netty.channel.socket.DatagramChannel
 import io.netty.channel.socket.SocketChannel
+import java.time.Duration
 import net.woggioni.rbcs.api.CacheHandlerFactory
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.common.RBCS
@@ -1,10 +1,10 @@
 package net.woggioni.rbcs.server.cache

+import io.netty.buffer.ByteBuf
+import io.netty.channel.ChannelHandlerContext
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.InflaterOutputStream
-import io.netty.buffer.ByteBuf
-import io.netty.channel.ChannelHandlerContext
 import net.woggioni.rbcs.api.CacheHandler
 import net.woggioni.rbcs.api.message.CacheMessage
 import net.woggioni.rbcs.api.message.CacheMessage.CacheContent
@@ -8,7 +8,6 @@ import net.woggioni.rbcs.api.Configuration.Authentication
 import net.woggioni.rbcs.api.Configuration.BasicAuthentication
 import net.woggioni.rbcs.api.Configuration.Cache
 import net.woggioni.rbcs.api.Configuration.ClientCertificateAuthentication
-import net.woggioni.rbcs.api.Configuration.ForwardedClientCertificateAuthentication
 import net.woggioni.rbcs.api.Configuration.Group
 import net.woggioni.rbcs.api.Configuration.KeyStore
 import net.woggioni.rbcs.api.Configuration.Tls
@@ -78,28 +77,6 @@ object Parser {
                                }
                                authentication = ClientCertificateAuthentication(tlsExtractorUser, tlsExtractorGroup)
                            }
-
-                            "forwarded-client-certificate" -> {
-                                val headerName = gchild.renderAttribute("header-name") ?: "X-Client-Cert-Subject-DN"
-                                var tlsExtractorUser: TlsCertificateExtractor? = null
-                                var tlsExtractorGroup: TlsCertificateExtractor? = null
-                                for (ggchild in gchild.asIterable()) {
-                                    when (ggchild.localName) {
-                                        "group-extractor" -> {
-                                            val attrName = ggchild.renderAttribute("attribute-name")
-                                            val pattern = ggchild.renderAttribute("pattern")
-                                            tlsExtractorGroup = TlsCertificateExtractor(attrName, pattern)
-                                        }
-
-                                        "user-extractor" -> {
-                                            val attrName = ggchild.renderAttribute("attribute-name")
-                                            val pattern = ggchild.renderAttribute("pattern")
-                                            tlsExtractorUser = TlsCertificateExtractor(attrName, pattern)
-                                        }
-                                    }
-                                }
-                                authentication = ForwardedClientCertificateAuthentication(headerName, tlsExtractorUser, tlsExtractorGroup)
-                            }
                        }
                    }
                }
@@ -344,14 +321,14 @@ object Parser {
                        roles = parseRoles(child)
                    }
                    "group-quota" -> {
-                        groupQuota = parseQuota(child)
+                        userQuota = parseQuota(child)
                    }
                    "user-quota" -> {
-                        userQuota = parseQuota(child)
+                        groupQuota = parseQuota(child)
                    }
                }
            }
-            groupName to Group(groupName, roles, groupQuota, userQuota)
+            groupName to Group(groupName, roles, userQuota, groupQuota)
        }.toMap()
        val users = knownUsersMap.map { (name, user) ->
            name to User(name, user.password, userGroups[name]?.mapNotNull { groups[it] }?.toSet() ?: emptySet(), user.quota)
@@ -165,23 +165,6 @@ object Serializer {
                                }
                            }
                        }
-                        is Configuration.ForwardedClientCertificateAuthentication -> {
-                            node("forwarded-client-certificate") {
-                                attr("header-name", authentication.headerName)
-                                authentication.groupExtractor?.let { extractor ->
-                                    node("group-extractor") {
-                                        attr("attribute-name", extractor.rdnType)
-                                        attr("pattern", extractor.pattern)
-                                    }
-                                }
-                                authentication.userExtractor?.let { extractor ->
-                                    node("user-extractor") {
-                                        attr("attribute-name", extractor.rdnType)
-                                        attr("pattern", extractor.pattern)
-                                    }
-                                }
-                            }
-                        }
                    }
                }
            }
@@ -1,9 +1,5 @@
 package net.woggioni.rbcs.server.exception

-import java.net.ConnectException
-import java.net.SocketException
-import javax.net.ssl.SSLException
-import javax.net.ssl.SSLPeerUnverifiedException
 import io.netty.buffer.Unpooled
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelFutureListener
@@ -17,6 +13,10 @@ import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpVersion
 import io.netty.handler.timeout.ReadTimeoutException
 import io.netty.handler.timeout.WriteTimeoutException
+import java.net.ConnectException
+import java.net.SocketException
+import javax.net.ssl.SSLException
+import javax.net.ssl.SSLPeerUnverifiedException
 import net.woggioni.rbcs.api.exception.CacheException
 import net.woggioni.rbcs.api.exception.ContentTooLargeException
 import net.woggioni.rbcs.common.contextLogger
@@ -74,7 +74,6 @@ object ExceptionHandler : ChannelDuplexHandler() {
            }

            is SSLPeerUnverifiedException -> {
-                log.debug(cause.message, cause)
                ctx.writeAndFlush(NOT_AUTHORIZED.retainedDuplicate())
                    .addListener(ChannelFutureListener.CLOSE_ON_FAILURE)
            }
@@ -1,10 +1,10 @@
 package net.woggioni.rbcs.server.handler

-import java.net.InetAddress
-import java.net.InetSocketAddress
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.SimpleChannelInboundHandler
 import io.netty.handler.codec.haproxy.HAProxyMessage
+import java.net.InetAddress
+import java.net.InetSocketAddress
 import net.woggioni.rbcs.common.Cidr
 import net.woggioni.rbcs.common.createLogger
 import net.woggioni.rbcs.common.trace
@@ -23,21 +23,23 @@ class ProxyProtocolHandler(private val trustedProxyIPs : List<Cidr>) : SimpleCha
    ) {
        val sourceAddress = ctx.channel().remoteAddress()
        if (sourceAddress is InetSocketAddress &&
-            (trustedProxyIPs.isEmpty() ||
-            trustedProxyIPs.any { it.contains(sourceAddress.address) }.also {
-                if(!it) {
+            trustedProxyIPs.isEmpty() ||
+            trustedProxyIPs.any { it.contains((sourceAddress as InetSocketAddress).address) }.also {
+                if(!it && log.isTraceEnabled) {
                    log.trace {
                        "Received a proxied connection request from $sourceAddress which is not a trusted proxy address, " +
                                "the proxy server address will be used instead"
                    }
                }
-            })) {
+            }) {
            val proxiedClientAddress = InetSocketAddress(
                InetAddress.ofLiteral(msg.sourceAddress()),
                msg.sourcePort()
            )
-            log.trace {
-                "Received proxied connection request from $sourceAddress forwarded for $proxiedClientAddress"
+            if(log.isTraceEnabled) {
+                log.trace {
+                    "Received proxied connection request from $sourceAddress forwarded for $proxiedClientAddress"
+                }
            }
            ctx.channel().attr(RemoteBuildCacheServer.clientIp).set(proxiedClientAddress)
        }
@@ -1,6 +1,5 @@
 package net.woggioni.rbcs.server.handler

-import java.nio.file.Path
 import io.netty.channel.ChannelDuplexHandler
 import io.netty.channel.ChannelHandler
 import io.netty.channel.ChannelHandlerContext
@@ -19,6 +18,7 @@ import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpUtil
 import io.netty.handler.codec.http.HttpVersion
 import io.netty.handler.codec.http.LastHttpContent
+import java.nio.file.Path
 import net.woggioni.rbcs.api.CacheValueMetadata
 import net.woggioni.rbcs.api.message.CacheMessage
 import net.woggioni.rbcs.api.message.CacheMessage.CacheContent
@@ -171,6 +171,7 @@ class ServerHandler(private val serverPrefix: Path, private val cacheHandlerSupp
                ctx.pipeline().addBefore(ExceptionHandler.NAME, null, cacheHandler)
                key.let(::CacheGetRequest)
                    .let(ctx::fireChannelRead)
+                    ?: ctx.channel().write(CacheValueNotFoundResponse(key))
            } else {
                cacheRequestInProgress = false
                log.warn(ctx) {
@@ -1,6 +1,5 @@
 package net.woggioni.rbcs.server.handler

-import java.nio.file.Path
 import io.netty.channel.ChannelHandler.Sharable
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInboundHandlerAdapter
@@ -11,6 +10,7 @@ import io.netty.handler.codec.http.HttpHeaderValues
 import io.netty.handler.codec.http.HttpRequest
 import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.LastHttpContent
+import java.nio.file.Path

@Sharable
 object TraceHandler : ChannelInboundHandlerAdapter() {
@@ -1,10 +1,5 @@
 package net.woggioni.rbcs.server.throttling

-import java.net.InetSocketAddress
-import java.time.Duration
-import java.time.temporal.ChronoUnit
-import java.util.ArrayDeque
-import java.util.concurrent.TimeUnit
 import io.netty.buffer.ByteBufHolder
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelInboundHandlerAdapter
@@ -15,6 +10,11 @@ import io.netty.handler.codec.http.HttpRequest
 import io.netty.handler.codec.http.HttpResponseStatus
 import io.netty.handler.codec.http.HttpVersion
 import io.netty.handler.codec.http.LastHttpContent
+import java.net.InetSocketAddress
+import java.time.Duration
+import java.time.temporal.ChronoUnit
+import java.util.ArrayDeque
+import java.util.concurrent.TimeUnit
 import net.woggioni.jwo.Bucket
 import net.woggioni.jwo.LongMath
 import net.woggioni.rbcs.api.Configuration
@@ -311,45 +311,6 @@
        </xs:sequence>
    </xs:complexType>

-    <xs:complexType name="forwardedClientCertificateAuthorizationType">
-        <xs:annotation>
-            <xs:documentation>
-                Authenticate clients based on a custom HTTP header containing the client TLS certificate
-                subject DN, forwarded by a reverse proxy that performs TLS termination. The proxy must be
-                listed in the trusted-proxies configuration for the header to be accepted.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:element name="group-extractor" type="rbcs:X500NameExtractorType" minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        A regex based extractor that will be used to determine which group the client belongs to,
-                        based on the X.500 name of the subject DN forwarded by the reverse proxy.
-                        When this is set RBAC works even if the user isn't listed in the &lt;users/&gt; section as
-                        the client will be assigned role solely based on the group he is found to belong to.
-                        Note that this does not allow for a client to be part of multiple groups.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-            <xs:element name="user-extractor" type="rbcs:X500NameExtractorType" minOccurs="0">
-                <xs:annotation>
-                    <xs:documentation>
-                        A regex based extractor that will be used to assign a user to a connected client,
-                        based on the X.500 name of the subject DN forwarded by the reverse proxy.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
-        </xs:sequence>
-        <xs:attribute name="header-name" type="xs:token">
-            <xs:annotation>
-                <xs:documentation>
-                    Name of the HTTP header containing the client certificate subject DN
-                    forwarded by the reverse proxy. Defaults to "X-Client-Cert-Subject-DN".
-                </xs:documentation>
-            </xs:annotation>
-        </xs:attribute>
-    </xs:complexType>
-
    <xs:complexType name="X500NameExtractorType">
        <xs:annotation>
            <xs:documentation>
@@ -419,15 +380,6 @@
                    </xs:documentation>
                </xs:annotation>
            </xs:element>
-            <xs:element name="forwarded-client-certificate" type="rbcs:forwardedClientCertificateAuthorizationType">
-                <xs:annotation>
-                    <xs:documentation>
-                        Enable forwarded client certificate authentication. Authenticates clients based on
-                        a custom HTTP header containing the client certificate subject DN, forwarded by a
-                        reverse proxy that performs TLS termination. Requires trusted-proxies to be configured.
-                    </xs:documentation>
-                </xs:annotation>
-            </xs:element>
            <xs:element name="none">
                <xs:annotation>
                    <xs:documentation>
@@ -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(
@@ -1,11 +1,11 @@
 package net.woggioni.rbcs.server.test

+import io.netty.handler.codec.http.HttpResponseStatus
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
 import java.time.Duration
 import java.time.temporal.ChronoUnit
-import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.api.Role
 import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
@@ -1,9 +1,9 @@
 package net.woggioni.rbcs.server.test

+import io.netty.handler.codec.http.HttpResponseStatus
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
-import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.common.PasswordSecurity.hashPassword
 import org.junit.jupiter.api.Assertions
@@ -1,9 +1,9 @@
 package net.woggioni.rbcs.server.test

+import io.netty.handler.codec.http.HttpResponseStatus
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
-import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.rbcs.api.Configuration
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Order
@@ -1,5 +1,6 @@
 package net.woggioni.rbcs.server.test

+import io.netty.handler.codec.http.HttpResponseStatus
 import java.net.URI
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
@@ -10,7 +11,6 @@ import java.time.temporal.ChronoUnit
 import java.util.Base64
 import java.util.zip.Deflater
 import kotlin.random.Random
-import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.common.RBCS.getFreePort
 import net.woggioni.rbcs.common.Xml
@@ -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(
@@ -1,9 +1,9 @@
 package net.woggioni.rbcs.server.test

+import io.netty.handler.codec.http.HttpResponseStatus
 import java.net.http.HttpClient
 import java.net.http.HttpRequest
 import java.net.http.HttpResponse
-import io.netty.handler.codec.http.HttpResponseStatus
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.api.Role
 import org.bouncycastle.asn1.x500.X500Name
@@ -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"
-             path="/my/custom/path">
+             xs:schemaLocation="urn:net.woggioni.rbcs.server jpms://net.woggioni.rbcs.server/net/woggioni/rbcs/server/schema/rbcs-server.xsd">
    <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"/>
@@ -1,5 +1,12 @@
 package net.woggioni.rbcs.servlet

+import jakarta.annotation.PreDestroy
+import jakarta.enterprise.context.ApplicationScoped
+import jakarta.inject.Inject
+import jakarta.servlet.annotation.WebServlet
+import jakarta.servlet.http.HttpServlet
+import jakarta.servlet.http.HttpServletRequest
+import jakarta.servlet.http.HttpServletResponse
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.nio.file.Path
@@ -10,13 +17,6 @@ import java.util.concurrent.PriorityBlockingQueue
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicLong
 import java.util.logging.Logger
-import jakarta.annotation.PreDestroy
-import jakarta.enterprise.context.ApplicationScoped
-import jakarta.inject.Inject
-import jakarta.servlet.annotation.WebServlet
-import jakarta.servlet.http.HttpServlet
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import net.woggioni.jwo.HttpClient.HttpStatus
 import net.woggioni.jwo.JWO

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