Merge branch 'master' into revert-20366-revert-20350-hmusum/config-subscription-refactoring-part-5

5 files changed, 35 insertions, 53 deletions

diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
index 0c4ac005bb6..fdfaf8b72fd 100644
--- a/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
+++ b/config/src/main/java/com/yahoo/config/subscription/impl/JRTConfigRequester.java
@@ -70,7 +70,7 @@ public class JRTConfigRequester implements RequestWaiter {
         this.connectionPool = connectionPool;
         this.timingValues = timingValues;
         // Adjust so that we wait 1 second with logging warning in case there are some errors just when starting up
-        timeForLastLogWarning = Instant.now().minus(delayBetweenWarnings.plus(Duration.ofSeconds(1)));
+        timeForLastLogWarning = Instant.now().minus(delayBetweenWarnings.plus(Duration.ofSeconds(5)));
     }
 
     /**
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
index 983113ab2bf..3dc0f7188e3 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstancePayloadTest.java
@@ -71,13 +71,10 @@ public class ConfigInstancePayloadTest {
                         intArr(310).intArr(311)).
 
                 rootStruct(new RootStruct.Builder().
-                        inner0(new RootStruct.Inner0.Builder().
-                                index(11)).
+                        inner0(b -> b.index(11)).
                         inner1(new RootStruct.Inner1.Builder().
                                 index(12)).
-                        innerArr(new RootStruct.InnerArr.Builder().
-                                boolVal(true).
-                                stringVal("deep")).
+                        innerArr(b -> b.boolVal(true).stringVal("deep")).
                         innerArr(new RootStruct.InnerArr.Builder().
                                 boolVal(false).
                                 stringVal("blue a=\"escaped\""))).
@@ -89,32 +86,29 @@ public class ConfigInstancePayloadTest {
                         enumval(Myarray.Enumval.INNER).
                         refval(":parent:").
                         fileVal("file0").
-                        anotherarray(new Myarray.Anotherarray.Builder().
-                                foo(7)).
+                        anotherarray(b -> b.foo(7)).
                         myStruct(new Myarray.MyStruct.Builder().
                                 a(1).
                                 b(2))).
 
-                myarray(new Myarray.Builder().
+                myarray(b -> b.
                         intval(5).
                         enumval(Myarray.Enumval.INNER).
                         refval(":parent:").
                         fileVal("file1").
-                        anotherarray(new Myarray.Anotherarray.Builder().
-                                foo(1).
-                                foo(2)).
-                        myStruct(new Myarray.MyStruct.Builder().
-                                a(-1).
-                                b(-2))).
+                        anotherarray(bb -> bb.foo(1).foo(2)).
+                        myStruct(bb -> bb.
+                                 a(-1).
+                                 b(-2))).
 
                 myStructMap("one", new MyStructMap.Builder().
                         myInt(1).
                         myString("bull").
                         myIntDef(2).
                         myStringDef("bear").
-                        anotherMap("anotherOne", new MyStructMap.AnotherMap.Builder().
-                                anInt(3).
-                                anIntDef(4)));
+                        anotherMap("anotherOne", b -> b.
+                                   anInt(3).
+                                   anIntDef(4)));
     }
 
     @Test
diff --git a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
index dabfbffef98..aaf6782a6ff 100644
--- a/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
+++ b/config/src/test/java/com/yahoo/config/subscription/ConfigInstanceUtilTest.java
@@ -32,15 +32,12 @@ public class ConfigInstanceUtilTest {
                 .int_val(-1)
                 .intarr(0)
                 .doublearr(0.0)
-                .basicStruct(new FunctionTestConfig.BasicStruct.Builder()
-                        .bar(-1)
-                        .intArr(0))
-                .myarray(new FunctionTestConfig.Myarray.Builder()
+                .basicStruct(b -> b.bar(-1).intArr(0))
+                .myarray(b -> b
                         .intval(-1)
                         .refval("")
                         .fileVal("")
-                        .myStruct(new FunctionTestConfig.Myarray.MyStruct.Builder()
-                                .a(0)
+                        .myStruct(bb -> bb.a(0)
                         ));
 
         ConfigInstanceUtil.setValues(destination, source);
@@ -105,47 +102,34 @@ public class ConfigInstanceUtilTest {
                 refarr(Arrays.asList(":parent:", ":parent", "parent:")).  // test collection based setter
                 fileArr("bin").
 
-                basicStruct(new FunctionTestConfig.BasicStruct.Builder().
+                basicStruct(b -> b.
                         foo("basicFoo").
                         bar(3).
                         intArr(310).intArr(311)).
 
-                rootStruct(new FunctionTestConfig.RootStruct.Builder().
-                        inner0(new FunctionTestConfig.RootStruct.Inner0.Builder().
-                                index(11)).
-                        inner1(new FunctionTestConfig.RootStruct.Inner1.Builder().
-                                index(12)).
-                        innerArr(new FunctionTestConfig.RootStruct.InnerArr.Builder().
-                                boolVal(true).
-                                stringVal("deep")).
-                        innerArr(new FunctionTestConfig.RootStruct.InnerArr.Builder().
-                                boolVal(false).
-                                stringVal("blue a=\"escaped\""))).
-
-                myarray(new FunctionTestConfig.Myarray.Builder().
+                rootStruct(b -> b.
+                        inner0(bb -> bb.index(11)).
+                        inner1(bb -> bb.index(12)).
+                        innerArr(bb -> bb.boolVal(true).stringVal("deep")).
+                        innerArr(bb -> bb.boolVal(false).stringVal("blue a=\"escaped\""))).
+
+                myarray(b -> b.
                         intval(-5).
                         stringval("baah").
                         stringval("yikes").
                         enumval(Myarray.Enumval.INNER).
                         refval(":parent:").
                         fileVal("file0").
-                        anotherarray(new FunctionTestConfig.Myarray.Anotherarray.Builder().
-                                foo(7)).
-                        myStruct(new FunctionTestConfig.Myarray.MyStruct.Builder().
-                                a(1).
-                                b(2))).
+                        anotherarray(bb -> bb.foo(7)).
+                        myStruct(bb -> bb.a(1).b(2))).
 
-                myarray(new FunctionTestConfig.Myarray.Builder().
+                myarray(b -> b.
                         intval(5).
                         enumval(Myarray.Enumval.INNER).
                         refval(":parent:").
                         fileVal("file1").
-                        anotherarray(new FunctionTestConfig.Myarray.Anotherarray.Builder().
-                                foo(1).
-                                foo(2)).
-                        myStruct(new FunctionTestConfig.Myarray.MyStruct.Builder().
-                                a(-1).
-                                b(-2)));
+                        anotherarray(bb -> bb.foo(1).foo(2)).
+                        myStruct(bb -> bb.a(-1).b(-2)));
 
     }
 
diff --git a/config/src/vespa/config/helper/configfetcher.cpp b/config/src/vespa/config/helper/configfetcher.cpp
index 7a6f806c6ff..d85308bbcbb 100644
--- a/config/src/vespa/config/helper/configfetcher.cpp
+++ b/config/src/vespa/config/helper/configfetcher.cpp
@@ -9,9 +9,11 @@ LOG_SETUP(".config.helper.configfetcher");
 
 namespace config {
 
+VESPA_THREAD_STACK_TAG(config_fetcher_thread);
+
 ConfigFetcher::ConfigFetcher(const IConfigContext::SP & context)
     : _poller(context),
-      _thread(std::make_unique<vespalib::Thread>(_poller)),
+      _thread(std::make_unique<vespalib::Thread>(_poller, config_fetcher_thread)),
       _closed(false),
       _started(false)
 {
@@ -19,7 +21,7 @@ ConfigFetcher::ConfigFetcher(const IConfigContext::SP & context)
 
 ConfigFetcher::ConfigFetcher(const SourceSpec & spec)
     : _poller(std::make_shared<ConfigContext>(spec)),
-      _thread(std::make_unique<vespalib::Thread>(_poller)),
+      _thread(std::make_unique<vespalib::Thread>(_poller, config_fetcher_thread)),
       _closed(false),
       _started(false)
 {
diff --git a/config/src/vespa/config/retriever/simpleconfigurer.cpp b/config/src/vespa/config/retriever/simpleconfigurer.cpp
index 74022cfd6a3..5059b9997f5 100644
--- a/config/src/vespa/config/retriever/simpleconfigurer.cpp
+++ b/config/src/vespa/config/retriever/simpleconfigurer.cpp
@@ -8,10 +8,12 @@ LOG_SETUP(".config.retriever.simpleconfigurer");
 
 namespace config {
 
+VESPA_THREAD_STACK_TAG(simple_configurer_thread);
+
 SimpleConfigurer::SimpleConfigurer(SimpleConfigRetriever::UP retriever, SimpleConfigurable * const configurable)
     : _retriever(std::move(retriever)),
       _configurable(configurable),
-      _thread(*this),
+      _thread(*this, simple_configurer_thread),
       _started(false)
 {
     assert(_retriever);