Merge pull request #16567 from vespa-engine/freva/split-application-components-to-dirs

Use directories for application components in remote logs

2 files changed, 7 insertions, 7 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
index ad8782704dc..19ec8c0e283 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfo.java
@@ -73,7 +73,7 @@ public class SyncFileInfo {
         StringBuilder sb = new StringBuilder(100);
 
         if (app == null) sb.append("infrastructure");
-        else sb.append(app.tenant().value()).append('.').append(app.application().value()).append('.').append(app.instance().value());
+        else sb.append(app.tenant().value()).append('/').append(app.application().value()).append('/').append(app.instance().value());
 
         sb.append('/');
         for (char c: hostName.value().toCharArray()) {
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
index 9bca907983e..e32fc8e5355 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/maintenance/sync/SyncFileInfoTest.java
@@ -22,7 +22,7 @@ public class SyncFileInfoTest {
     private static final FileSystem fileSystem = TestFileSystem.create();
 
     private static final String bucket = "logs-region-acdf21";
-    private static final ApplicationId application = ApplicationId.from("tenant", "application", "instance");
+    private static final ApplicationId application = ApplicationId.from("ten", "app", "ins");
     private static final HostName hostname = HostName.from("h12352a.env.region-1.vespa.domain.example");
     private static final Path accessLogPath1 = fileSystem.getPath("/opt/vespa/logs/qrs/access.log.20210211");
     private static final Path accessLogPath2 = fileSystem.getPath("/opt/vespa/logs/qrs/access.log.20210212.zst");
@@ -36,15 +36,15 @@ public class SyncFileInfoTest {
     @Test
     public void tenant_log() {
         assertTenantSyncFileInfo(accessLogPath1, null, null);
-        assertTenantSyncFileInfo(accessLogPath2, "tenant.application.instance/h12352a/logs/access/access.log.20210212.zst", NONE);
-        assertTenantSyncFileInfo(accessLogPath3, "tenant.application.instance/h12352a/logs/access/access-json.log.20210213.zst", NONE);
-        assertTenantSyncFileInfo(accessLogPath4, "tenant.application.instance/h12352a/logs/access/JsonAccessLog.default.20210214.zst", NONE);
+        assertTenantSyncFileInfo(accessLogPath2, "ten/app/ins/h12352a/logs/access/access.log.20210212.zst", NONE);
+        assertTenantSyncFileInfo(accessLogPath3, "ten/app/ins/h12352a/logs/access/access-json.log.20210213.zst", NONE);
+        assertTenantSyncFileInfo(accessLogPath4, "ten/app/ins/h12352a/logs/access/JsonAccessLog.default.20210214.zst", NONE);
 
         assertTenantSyncFileInfo(connectionLogPath1, null, null);
-        assertTenantSyncFileInfo(connectionLogPath2, "tenant.application.instance/h12352a/logs/connection/ConnectionLog.default.20210212.zst", NONE);
+        assertTenantSyncFileInfo(connectionLogPath2, "ten/app/ins/h12352a/logs/connection/ConnectionLog.default.20210212.zst", NONE);
 
         assertTenantSyncFileInfo(vespaLogPath1, null, null);
-        assertTenantSyncFileInfo(vespaLogPath2, "tenant.application.instance/h12352a/logs/vespa/vespa.log-2021-02-12.zst", ZSTD);
+        assertTenantSyncFileInfo(vespaLogPath2, "ten/app/ins/h12352a/logs/vespa/vespa.log-2021-02-12.zst", ZSTD);
     }
 
     @Test