Simplify application log prefix in configserver

2 files changed, 4 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index 21db290d5e8..2f7b397cbd9 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -467,12 +467,7 @@ public class TenantRepository {
      */
     public static String logPre(ApplicationId app) {
         if (DEFAULT_TENANT.equals(app.tenant())) return "";
-        StringBuilder ret = new StringBuilder()
-                .append(logPre(app.tenant()))
-                .append("app:" + app.application().value())
-                .append(":" + app.instance().value())
-                .append(" ");
-        return ret.toString();
+        return "app:" + app.toFullString() + " ";
     }
 
     /**
@@ -483,10 +478,7 @@ public class TenantRepository {
      */
     public static String logPre(TenantName tenant) {
         if (DEFAULT_TENANT.equals(tenant)) return "";
-        StringBuilder ret = new StringBuilder()
-                .append("tenant:" + tenant.value())
-                .append(" ");
-        return ret.toString();
+        return "tenant:" + tenant.value() + " ";
     }
 
     private void stateChanged(CuratorFramework framework, ConnectionState connectionState) {
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
index 2cf4d7e7b69..e8dc08d4e8d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/ApplicationRepositoryTest.java
@@ -615,7 +615,7 @@ public class ApplicationRepositoryTest {
 
         applicationRepository.prepare(sessionId2, prepareParams());
         exceptionRule.expect(ActivationConflictException.class);
-        exceptionRule.expectMessage(containsString("tenant:test1 app:testapp:default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)"));
+        exceptionRule.expectMessage(containsString("app:test1.testapp.default Cannot activate session 3 because the currently active session (4) has changed since session 3 was created (was 2 at creation time)"));
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId2, timeoutBudget, false);
     }
 
@@ -629,7 +629,7 @@ public class ApplicationRepositoryTest {
         applicationRepository.prepare(sessionId, prepareParams());
 
         exceptionRule.expect(IllegalArgumentException.class);
-        exceptionRule.expectMessage(containsString("tenant:test1 app:testapp:default Session 2 is already active"));
+        exceptionRule.expectMessage(containsString("app:test1.testapp.default Session 2 is already active"));
         applicationRepository.activate(applicationRepository.getTenant(applicationId()), sessionId, timeoutBudget, false);
     }