From b44d2d59caf0f0ca284b6f032f40150442e7e425 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 21 Oct 2024 08:55:34 +0200 Subject: [PATCH 1/2] Change default value of FORWARD_ALL_LOG_LEVELS to true --- .../src/main/java/com/yahoo/config/model/api/ModelContext.java | 2 +- flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java index 8675b679239..ce9869001ac 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java @@ -122,7 +122,7 @@ interface FeatureFlags { @ModelFeatureFlag(owners = {"vekterli"}) default boolean enforceStrictlyIncreasingClusterStateVersions() { return false; } @ModelFeatureFlag(owners = {"vekterli"}) default boolean distributionConfigFromClusterController() { return false; } @ModelFeatureFlag(owners = {"arnej"}) default boolean useLegacyWandQueryParsing() { return true; } - @ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return false; } + @ModelFeatureFlag(owners = {"hmusum"}) default boolean forwardAllLogLevels() { return true; } } /** Warning: As elsewhere in this package, do not make backwards incompatible changes that will break old config models! */ diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java index 2e2d053d244..a433e3b63e2 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -495,7 +495,7 @@ public class PermanentFlags { "Takes effect on next iteration of UserManagementMaintainer"); public static final UnboundBooleanFlag FORWARD_ALL_LOG_LEVELS = defineFeatureFlag( - "forward-all-log-levels", false, + "forward-all-log-levels", true, "Forward all log levels from nodes to logserver (debug and spam levels will be forwarded only if this flag is enabled)", "Takes effect at redeployment"); From c0b6c202cfdf883194980d13f969fd4035a5fc0e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 21 Oct 2024 09:37:27 +0200 Subject: [PATCH 2/2] Forward all log levels only when hosted --- .../src/main/java/com/yahoo/vespa/model/admin/Admin.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java index 85ddd42ab22..aa4143a89f1 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/Admin.java @@ -197,6 +197,7 @@ public ZooKeepersConfigProvider getZooKeepersConfigProvider() { } public void getConfig(LogdConfig.Builder builder) { + var forwardAllLogLevels = isHostedVespa && featureFlags.forwardAllLogLevels(); if (logserver == null) { builder.logserver(new LogdConfig.Logserver.Builder().use(false)); } @@ -206,8 +207,8 @@ public void getConfig(LogdConfig.Builder builder) { host(logserver.getHostName()). rpcport(logserver.getRelativePort(0))) .loglevel(new LogdConfig.Loglevel.Builder(). - debug(new LogdConfig.Loglevel.Debug.Builder().forward(featureFlags.forwardAllLogLevels())). - spam(new LogdConfig.Loglevel.Spam.Builder().forward(featureFlags.forwardAllLogLevels()))); + debug(new LogdConfig.Loglevel.Debug.Builder().forward(forwardAllLogLevels)). + spam(new LogdConfig.Loglevel.Spam.Builder().forward(forwardAllLogLevels))); } }