Make sample rate mandatory. Validate in config model

2 files changed, 6 insertions, 3 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
index 571b1c67960..7062370537e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java
@@ -41,6 +41,11 @@ public class HostedSslConnectorFactory extends ConnectorFactory {
         this.remoteAddressHeaders = List.copyOf(builder.remoteAddressHeaders);
         this.remotePortHeaders = List.copyOf(builder.remotePortHeaders);
         this.knownServerNames = Collections.unmodifiableSet(new TreeSet<>(builder.knownServerNames));
+        builder.requestPrefixForLoggingContent.forEach(prefix -> {
+            var regex = "^.*:[0|1](\\.\\d+)?$";
+            if (!prefix.matches(regex))
+                throw new IllegalArgumentException("Invalid prefix '%s, must match regex '%s'".formatted(prefix, regex));
+        });
         this.requestPrefixForLoggingContent = Collections.unmodifiableSet(new TreeSet<>(builder.requestPrefixForLoggingContent));
     }
 
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
index 0e740ffd4c5..3b1db55defd 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/AccessLoggingRequestHandler.java
@@ -78,9 +78,7 @@ public class AccessLoggingRequestHandler extends AbstractRequestHandler implemen
                 .toList();
         this.samplingRate = contentPathPrefixes.stream()
                 .map(s -> {
-                    var separatorIndex = s.lastIndexOf(':');
-                    if (separatorIndex == -1) return 1D;
-                    return Double.parseDouble(s.substring(separatorIndex + 1));
+                    return Double.parseDouble(s.substring(s.lastIndexOf(':') + 1));
                 })
                 .toList();
     }