The application context type is not present when using babeltrace2 as of
today. This change might get reversed as needed in the future if the
omission of the type was an error on the reader side. For now remove
the type from the lookup and validate based on value only.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
* Java 1.8
* [Apache Maven](https://maven.apache.org/) 3.0+
* A recent version of [LTTng-Tools](https://lttng.org/download/)
* Java 1.8
* [Apache Maven](https://maven.apache.org/) 3.0+
* A recent version of [LTTng-Tools](https://lttng.org/download/)
-* A recent version of [Babeltrace](http://www.efficios.com/babeltrace)
+* A recent version of [Babeltrace 2.x](http://www.efficios.com/babeltrace)
* A git branch or version of LTTng-UST you want to test
For example, on Ubuntu you can use the
* A git branch or version of LTTng-UST you want to test
For example, on Ubuntu you can use the
sudo apt-add-repository ppa:lttng/ppa
sudo apt-get update
sudo apt-add-repository ppa:lttng/ppa
sudo apt-get update
- sudo apt-get install lttng-tools babeltrace maven openjdk-8-jre
+ sudo apt-get install lttng-tools babeltrace2 maven openjdk-8-jre
Also make sure `mvn -version` reports a `Java version: 1.8` or higher. If it
does not, you may need to set your `JAVA_HOME` accordingly.
Also make sure `mvn -version` reports a `Java version: 1.8` or higher. If it
does not, you may need to set your `JAVA_HOME` accordingly.
assertFalse(output.isEmpty());
/* Test that context name is there but value is not */
assertFalse(output.isEmpty());
/* Test that context name is there but value is not */
- testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ none = { } } }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ { } } }");
/* Test that context name + value are present */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
/* Test that context name + value are present */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
+ "{ \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
/* Test that only retriever-name-2 is present, with no value */
testContextNotPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME);
/* Test that only retriever-name-2 is present, with no value */
testContextNotPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME);
- testContextPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME, "{ none = { } } }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME, "{ { } } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
/* Test that only retriever-name-1 is present, name + value */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
/* Test that only retriever-name-1 is present, name + value */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
+ "{ \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
testContextNotPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME);
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
testContextNotPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME);
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
/* Test that both contexts are present, but only retriever-1's has a value */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
/* Test that both contexts are present, but only retriever-1's has a value */
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
- testContextPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME, "{ none = { } } }");
+ "{ \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_2, CONTEXT_NAME, "{ { } } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.NULL_RETRIEVER));
List<String> output = enableContextAndTrace();
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.NULL_RETRIEVER));
List<String> output = enableContextAndTrace();
- testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ none = { } } }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ { } } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ int32 = " + ContextInfoRetrieverStubs.INTEGER_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.INTEGER_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ int64 = " + ContextInfoRetrieverStubs.LONG_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.LONG_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ double = " + ContextInfoRetrieverStubs.DOUBLE_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.DOUBLE_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.CHARACTER_VALUE + "\" } }");
+ "{ \"" + ContextInfoRetrieverStubs.CHARACTER_VALUE + "\" } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ float = " + ContextInfoRetrieverStubs.FLOAT_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.FLOAT_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ int8 = " + ContextInfoRetrieverStubs.BYTE_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.BYTE_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ int16 = " + ContextInfoRetrieverStubs.SHORT_VALUE + " } }");
+ "{ " + ContextInfoRetrieverStubs.SHORT_VALUE + " } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.BOOLEAN_TRUE_RETRIEVER));
List<String> output = enableContextAndTrace();
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.BOOLEAN_TRUE_RETRIEVER));
List<String> output = enableContextAndTrace();
- testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ int8 = 1 } }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ 1 } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.BOOLEAN_FALSE_RETRIEVER));
List<String> output = enableContextAndTrace();
assertTrue(cim.registerContextInfoRetriever(RETRIEVER_NAME_1, ContextInfoRetrieverStubs.BOOLEAN_FALSE_RETRIEVER));
List<String> output = enableContextAndTrace();
- testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ int8 = 0 } }");
+ testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME, "{ 0 } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" } }");
+ "{ \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
List<String> output = enableContextAndTrace();
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.OBJECT_VALUE.toString() + "\" } }");
+ "{ \"" + ContextInfoRetrieverStubs.OBJECT_VALUE.toString() + "\" } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertFalse(output.isEmpty());
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
assertFalse(output.isEmpty());
testContextPresentInTrace(output, RETRIEVER_NAME_1, CONTEXT_NAME,
- "{ string = \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" } }");
+ "{ \"" + ContextInfoRetrieverStubs.STRING_VALUE + "\" } }");
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
assertTrue(cim.unregisterContextInfoRetriever(RETRIEVER_NAME_1));
}
String traceRetriverName = RETRIEVER_NAME.replace('.', '_');
String traceContextName = CONTEXT_NAME.replace('.', '_');
String traceRetriverName = RETRIEVER_NAME.replace('.', '_');
String traceContextName = CONTEXT_NAME.replace('.', '_');
- String expectedString = "_app_" + traceRetriverName + "_" + traceContextName + " = { string = \"" + CONTEXT_VALUE + "\" } }";
+ String expectedString = "_app_" + traceRetriverName + "_" + traceContextName + " = { \"" + CONTEXT_VALUE + "\" } }";
output.forEach(line -> assertTrue(line.contains(expectedString)));
}
output.forEach(line -> assertTrue(line.contains(expectedString)));
}