Ensure that metrics are registered when the metricsPoll starts.

google · Oct 18, 2021 · 3f29a02 · 3f29a02
1 parent 95926c2
commit 3f29a02
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Source/santad/SNTApplication.m b/Source/santad/SNTApplication.m
@@ -179,11 +179,6 @@ - (instancetype)init {
     if (!_execController) return nil;
 
     if ([configurator exportMetrics]) {
-        SNTRegisterCoreMetrics();
-
-        _metricsConnection = [SNTXPCMetricServiceInterface configuredConnection];
-        [_metricsConnection resume];
-
         [self startMetricsPoll];
     }
 
@@ -312,7 +307,14 @@ dispatch_source_t CreateDispatchTimer(uint64_t interval,
  */
 - (void)startMetricsPoll {
     LOGI(@"starting to export metrics every 30s");
-
+    static dispatch_once_t registerMetrics;
+    dispatch_once(&registerMetrics, ^{
+        _metricsConnection = [SNTXPCMetricServiceInterface configuredConnection];
+        [_metricsConnection resume];
+
+        SNTRegisterCoreMetrics();
+    });
+
     void (^exportMetricsBlock)(void) = ^{
         [[_metricsConnection remoteObjectProxy] exportForMonitoring: [_metricSet export]];
      };