TMF: Add host ID to CTF traces' properties

Change-Id: Ic329c52abbef4c48c87b0c60aaac899007240924
Signed-off-by: Geneviève Bastien <gbastien+lttng@versatic.net>
Reviewed-on: https://git.eclipse.org/r/29881
Tested-by: Hudson CI
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

diff --git a/org.eclipse.linuxtools.tmf.ctf.core.tests/src/org/eclipse/linuxtools/tmf/ctf/core/tests/CtfTmfTraceTest.java b/org.eclipse.linuxtools.tmf.ctf.core.tests/src/org/eclipse/linuxtools/tmf/ctf/core/tests/CtfTmfTraceTest.java
index 6d2c204487a6b8a6c3511474a586a6ce617a8719..795fd6ecd28b9472b2aa4fdc11b63986576b8d4b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ctf.core.tests/src/org/eclipse/linuxtools/tmf/ctf/core/tests/CtfTmfTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.ctf.core.tests/src/org/eclipse/linuxtools/tmf/ctf/core/tests/CtfTmfTraceTest.java
@@ -227,12 +227,12 @@ public class CtfTmfTraceTest {
     }
 
     /**
-     * Run the int getNbEnvVars() method test.
+     * Run the getTraceProperties() method test.
      */
     @Test
-    public void testGetNbEnvVars() {
+    public void testGetTraceProperties() {
         int result = fixture.getTraceProperties().size();
-        assertEquals(8, result);
+        assertEquals(9, result);
     }
 
     /**

diff --git a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfTrace.java b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfTrace.java
index 2566ff3c595ebed77c6b6270d55057f6b87be9e9..5c0fcc672f653969c18258673f70edc4bc0b8eaa 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfTrace.java
+++ b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/CtfTmfTrace.java
@@ -17,6 +17,7 @@ package org.eclipse.linuxtools.tmf.ctf.core;
 import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -358,7 +359,10 @@ public class CtfTmfTrace extends TmfTrace
      */
     @Override
     public Map<String, String> getTraceProperties() {
-        return fTrace.getEnvironment();
+        Map<String, String> properties = new HashMap<>();
+        properties.putAll(fTrace.getEnvironment());
+        properties.put(Messages.CtfTmfTrace_HostID, getHostId());
+        return properties;
     }
 
     // -------------------------------------------

diff --git a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/Messages.java b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/Messages.java
index 96460f1ef3d0aea0e3185406739f3acf113b15bc..0401ace838b0fe5c2b43fcaf70e8a40a2448a2bb 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/Messages.java
+++ b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/Messages.java
@@ -27,6 +27,13 @@ public class Messages extends NLS {
      * @since 2.1*/
     public static String CtfTmfTrace_BufferOverflowErrorMessage;
 
+    /**
+     * Text for host ID
+     *
+     * @since 3.1
+     */
+    public static String CtfTmfTrace_HostID;
+
     /** Major version number not set */
     public static String CtfTmfTrace_MajorNotSet;
 

diff --git a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/messages.properties b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/messages.properties
index 7769d7c89a817e5cca7cee66877179a967229aeb..14d393b2dbc73b0d31805073fe7413cf5a92b37b 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/messages.properties
+++ b/org.eclipse.linuxtools.tmf.ctf.core/src/org/eclipse/linuxtools/tmf/ctf/core/messages.properties
@@ -11,6 +11,7 @@
 ###############################################################################
 
 CtfTmfTrace_BufferOverflowErrorMessage=Buffer overflow exception, trace is malformed
+CtfTmfTrace_HostID=host ID
 CtfTmfTrace_MajorNotSet=Major version number not set
 CtfTmfTrace_ReadingError=Reading error
 CtfTmfTrace_NoEvent=Trace has no events