diff --git a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm index 3d84a8fea22571..53500caed103b8 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm +++ b/src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm @@ -84,7 +84,11 @@ static NSString * const kErrorSessionKeystoreInit = @"Init failure while initializing session keystore"; static bool sExitHandlerRegistered = false; -static void ShutdownOnExit() { [[MTRDeviceControllerFactory sharedInstance] stopControllerFactory]; } +static void ShutdownOnExit() +{ + MTR_LOG_INFO("ShutdownOnExit invoked on exit"); + [[MTRDeviceControllerFactory sharedInstance] stopControllerFactory]; +} @interface MTRDeviceControllerFactory () { MTRServerEndpoint * _otaProviderEndpoint; @@ -323,6 +327,8 @@ - (void)cleanupInitObjects - (void)cleanupStartupObjects { + MTR_LOG_INFO("Cleaning startup objects in controller factory"); + // Make sure the deinit order here is the reverse of the init order in // startControllerFactory: _certificationDeclarationCertificates = nil; @@ -562,7 +568,7 @@ - (void)stopControllerFactory [_controllers[0] shutdown]; } - MTR_LOG_DEBUG("Shutting down the Matter controller factory"); + MTR_LOG_INFO("Shutting down the Matter controller factory"); _controllerFactory->Shutdown(); [self cleanupStartupObjects]; diff --git a/src/darwin/Framework/CHIP/MTRFramework.mm b/src/darwin/Framework/CHIP/MTRFramework.mm index 3eff8a1b8dbfc3..e6a0e672955be3 100644 --- a/src/darwin/Framework/CHIP/MTRFramework.mm +++ b/src/darwin/Framework/CHIP/MTRFramework.mm @@ -15,7 +15,6 @@ */ #import "MTRFramework.h" -#import "MTRMetricsCollector.h" #include #include @@ -35,8 +34,5 @@ void MTRFrameworkInit() // Suppress CHIP logging until we actually need it for redirection // (see MTRSetLogCallback()). Logging to os_log is always enabled. chip::Logging::SetLogFilter(chip::Logging::kLogCategory_None); - - // Startup metrics collection and tracing framework - StartupMetricsCollection(); }); }