[BMQ]: Fix leaking internal headers in bmqa_mocksession

Also fixes an incorrect change that marked bmqt as a private package

Signed-off-by: Taylor Foxhall <[email protected]>

src/groups/bmq/CMakeLists.txt

@@ -49,10 +49,10 @@ set(BMQ_PRIVATE_PACKAGES
   bmqst
   bmqstm
   bmqsys
-  bmqt
   bmqtsk
   bmqtst
   bmqu
+  bmqvt
 )
 target_bmq_style_uor( bmq PRIVATE_PACKAGES ${BMQ_PRIVATE_PACKAGES} )
 

src/groups/bmq/bmqa/bmqa_mocksession.cpp

@@ -36,6 +36,7 @@
 #include <bmqp_protocol.h>
 #include <bmqp_protocolutil.h>
 #include <bmqp_pusheventbuilder.h>
+#include <bmqst_statcontext.h>
 #include <bmqsys_time.h>
 #include <bmqt_messageguid.h>
 #include <bmqt_uri.h>
@@ -742,7 +743,7 @@ void MockSession::initializeStats()
     start.setLevel(0).setIndex(0);
     end.setLevel(0).setIndex(1);
     bmqimp::QueueStatsUtil::initializeStats(d_queuesStats_sp.get(),
-                                            &d_rootStatContext,
+                                            d_rootStatContext_mp.get(),
                                             start,
                                             end,
                                             d_allocator_p);
@@ -961,8 +962,9 @@ MockSession::MockSession(const bmqt::SessionOptions& options,
                                bslma::Default::allocator(allocator)),
                        bslma::Default::allocator(allocator))
 , d_postedEvents(bslma::Default::allocator(allocator))
-, d_rootStatContext(bmqst::StatContextConfiguration("MockSession", allocator),
-                    allocator)
+, d_rootStatContext_mp(bslma::ManagedPtrUtil::makeManaged<bmqst::StatContext>(
+      bmqst::StatContextConfiguration("MockSession", allocator),
+      allocator))
 , d_queuesStats_sp(new(*bslma::Default::allocator(allocator))
                        bmqimp::Stat(bslma::Default::allocator(allocator)),
                    bslma::Default::allocator(allocator))
@@ -1004,8 +1006,9 @@ MockSession::MockSession(bslma::ManagedPtr<SessionEventHandler> eventHandler,
                                bslma::Default::allocator(allocator)),
                        bslma::Default::allocator(allocator))
 , d_postedEvents(bslma::Default::allocator(allocator))
-, d_rootStatContext(bmqst::StatContextConfiguration("MockSession", allocator),
-                    allocator)
+, d_rootStatContext_mp(bslma::ManagedPtrUtil::makeManaged<bmqst::StatContext>(
+      bmqst::StatContextConfiguration("MockSession", allocator),
+      allocator))
 , d_queuesStats_sp(new(*bslma::Default::allocator(allocator))
                        bmqimp::Stat(bslma::Default::allocator(allocator)),
                    bslma::Default::allocator(allocator))

src/groups/bmq/bmqa/bmqa_mocksession.h

@@ -548,7 +548,6 @@
 #include <bmqa_openqueuestatus.h>
 #include <bmqa_queueid.h>
 #include <bmqa_session.h>  // for 'bmqa::SessionEventHandler'
-#include <bmqst_statcontext.h>
 #include <bmqt_queueoptions.h>
 #include <bmqt_sessionoptions.h>
 
@@ -586,6 +585,9 @@ class MessageCorrelationIdContainer;
 namespace bmqimp {
 struct Stat;
 }
+namespace bmqst {
+class StatContext;
+}
 
 namespace bmqa {
 
@@ -1040,7 +1042,7 @@ class MockSession : public AbstractSession {
     mutable bslmt::Mutex d_mutex;
 
     /// Top level stat context for this mocked Session.
-    bmqst::StatContext d_rootStatContext;
+    bslma::ManagedPtr<bmqst::StatContext> d_rootStatContext_mp;
 
     /// Stats for all queues
     StatImplSp d_queuesStats_sp;