From 690f8aa64eaa5016ef0685daca3f050bd70086ca Mon Sep 17 00:00:00 2001
From: Jazz Turner-Baggs <473256+jazzz@users.noreply.github.com>
Date: Tue, 2 Jun 2026 20:59:33 -0700
Subject: [PATCH] Add more logging

---
 core/core_client/src/conversation/group_v2.rs | 1 +
 core/core_client/src/inbox_v2.rs              | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/core/core_client/src/conversation/group_v2.rs b/core/core_client/src/conversation/group_v2.rs
index 6392f02..16b2b38 100644
--- a/core/core_client/src/conversation/group_v2.rs
+++ b/core/core_client/src/conversation/group_v2.rs
@@ -429,6 +429,7 @@ impl<S> BaseGroupConvo<S> for GroupV2Convo
 where
     S: ExternalServices,
 {
+    #[instrument(name = "groupv2.add_member", skip_all, fields(user_id = %service_ctx.identity_provider.friendly_name()))]
     fn add_member(
         &mut self,
         service_ctx: &mut ServiceContext<S>,
diff --git a/core/core_client/src/inbox_v2.rs b/core/core_client/src/inbox_v2.rs
index b8a081a..ae1311b 100644
--- a/core/core_client/src/inbox_v2.rs
+++ b/core/core_client/src/inbox_v2.rs
@@ -13,6 +13,8 @@ use openmls_traits::signatures::SignerError;
 use prost::{Message, Oneof};
 use storage::ChatStore;
 use storage::ConversationMeta;
+use tracing::info;
+use tracing::instrument;
 
 use crate::AccountId;
 use crate::AddressedEnvelope;
@@ -291,6 +293,7 @@ impl<CS: ChatStore> InboxV2<CS> {
 }
 
 impl<CS: ChatStore> InboxV2<CS> {
+    #[instrument(name = "inboxv2.handle_frame", skip_all, fields(user_id = %service_ctx.identity_provider.friendly_name()))]
     pub fn handle_frame<S: ExternalServices>(
         &self,
         service_ctx: &mut ServiceContext<S>,
@@ -312,6 +315,7 @@ impl<CS: ChatStore> InboxV2<CS> {
                 Ok(Some(Box::new(self.handle_heavy_invite(service_ctx, inv)?)))
             }
             InviteType::GroupV2(welcome_bytes) => {
+                info!("Process WelcomeMessage");
                 let mut convo = self
                     .pending_demls
                     .borrow_mut()