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

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index 3f39b02e4..8addb5eda 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -6429,7 +6429,9 @@ static int handle_app_register_channel_notification(int sock,
 	try {
 		auto app_context_fields = lsu::create_trace_fields_from_ust_ctl_fields(
 				*locked_registry_session, ust_ctl_context_fields.get(),
-				context_field_count);
+				context_field_count,
+				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() ?
@@ -6563,12 +6565,16 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, const char *na
 				channel.add_event(sobjd, cobjd, name, signature.get(),
 						lsu::create_trace_fields_from_ust_ctl_fields(
 								*locked_registry, fields.get(),
-								nr_fields),
+								nr_fields,
+								lst::field_location::root::
+										EVENT_RECORD_PAYLOAD,
+								lsu::ctl_field_quirks::
+										UNDERSCORE_PREFIXED_VARIANT_TAG_MAPPINGS),
 						loglevel_value,
 						model_emf_uri.get() ?
 								nonstd::optional<std::string>(
 										model_emf_uri.get()) :
-								      nonstd::nullopt,
+								nonstd::nullopt,
 						ua_sess->buffer_type, *app, event_id);
 				ret_code = 0;
 			} catch (const std::exception& ex) {