X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.cpp;h=8addb5edacabb5bd9ed2397ab81f276cf5b078fb;hp=9690115d66c56ca83b06f6adb6e92e888249ec00;hb=63c3462c3dbd028a08f7a9b504c45e178371248d;hpb=def9854df69838c3625360c725739ba865297187

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index 9690115d6..8addb5eda 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -6430,7 +6430,8 @@ static int handle_app_register_channel_notification(int sock,
 		auto app_context_fields = lsu::create_trace_fields_from_ust_ctl_fields(
 				*locked_registry_session, ust_ctl_context_fields.get(),
 				context_field_count,
-				lst::field_location::root::EVENT_RECORD_COMMON_CONTEXT);
+				lst::field_location::root::EVENT_RECORD_COMMON_CONTEXT,
+				lsu::ctl_field_quirks::UNDERSCORE_PREFIXED_VARIANT_TAG_MAPPINGS);
 
 		if (!ust_reg_chan.is_registered()) {
 			lst::type::cuptr event_context = app_context_fields.size() ?
@@ -6566,7 +6567,9 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, const char *na
 								*locked_registry, fields.get(),
 								nr_fields,
 								lst::field_location::root::
-										EVENT_RECORD_PAYLOAD),
+										EVENT_RECORD_PAYLOAD,
+								lsu::ctl_field_quirks::
+										UNDERSCORE_PREFIXED_VARIANT_TAG_MAPPINGS),
 						loglevel_value,
 						model_emf_uri.get() ?
 								nonstd::optional<std::string>(