add tests to main test suite, add global async profiler info collector

codex-storage · Nov 6, 2023 · acbd13b · acbd13b
1 parent 1b2ff0e
commit acbd13b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/codex/utils/asyncprofiler/metricscollector.nim b/codex/utils/asyncprofiler/metricscollector.nim
@@ -8,7 +8,7 @@ import metrics
 
 when defined(metrics):
   type
-    ProfilerInfo* = ref object of Gauge
+    AsyncProfilerInfo* = ref object of Gauge
       perfSampler: PerfSampler
       k: int
 
@@ -17,14 +17,14 @@ when defined(metrics):
     ProfilerMetric = (SrcLoc, OverallMetrics)
 
   proc newCollector*(
-    ProfilerInfo: typedesc,
+    AsyncProfilerInfo: typedesc,
     name: string,
     help: string,
     perfSampler: PerfSampler,
     k: int = 10,
     registry: Registry = defaultRegistry,
-  ): ProfilerInfo =
-    result = ProfilerInfo.newCollector(
+  ): AsyncProfilerInfo =
+    result = AsyncProfilerInfo.newCollector(
       name = name, help = help, registry = registry)
     result.perfSampler = perfSampler
     result.k = k
@@ -33,7 +33,7 @@ when defined(metrics):
     float64 = duration.nanoseconds.float64
 
   proc collectSlowestProcs(
-    self: ProfilerInfo,
+    self: AsyncProfilerInfo,
     profilerMetrics: seq[ProfilerMetric],
     prometheusMetrics: var Metrics,
     timestampMillis: int64,
@@ -82,7 +82,7 @@ when defined(metrics):
         "max_single_exec_time", metrics.maxSingleTime, prometheusMetrics)
 
   proc collectOutlierMetrics(
-    self: ProfilerInfo,
+    self: AsyncProfilerInfo,
     profilerMetrics: seq[ProfilerMetric],
     prometheusMetrics: var Metrics,
     timestampMillis: int64,
@@ -112,13 +112,12 @@ when defined(metrics):
       timestamp: timestampMillis,
     ))
 
-  method collect*(self: ProfilerInfo): Metrics =
+  method collect*(self: AsyncProfilerInfo): Metrics =
     let now = times.getTime().toMilliseconds()
 
     var prometheusMetrics = Metrics()
     prometheusMetrics[@[]] = newSeq[Metric]()
 
-    # Samples the underlying metrics and orders pairs by total execution time.
     var currentMetrics = self.
       perfSampler().
       pairs.
@@ -140,3 +139,7 @@ when defined(metrics):
 
     prometheusMetrics
 
+  var asyncProfilerInfo* {.global.} = AsyncProfilerInfo.newCollector(
+    "async_profiler_info", "Async profiler info",
+    perfSampler = getFutureSummaryMetrics
+  )
diff --git a/tests/codex/testutils.nim b/tests/codex/testutils.nim
@@ -5,5 +5,6 @@ import ./utils/testasyncstatemachine
 import ./utils/testtimer
 import ./utils/testthen
 import ./utils/testtrackedfutures
+import ./utils/testasyncprofiler
 
 {.warning[UnusedImport]: off.}
diff --git a/tests/codex/utils/asyncprofiler/testmetricscollector.nim b/tests/codex/utils/asyncprofiler/testmetricscollector.nim
@@ -52,7 +52,7 @@ checksuite "asyncprofiler metrics collector":
 
   test "should keep track of basic worst-case exec time stats":
     var registry = newRegistry()
-    var collector = ProfilerInfo.newCollector(
+    var collector = AsyncProfilerInfo.newCollector(
       name = "profiling_metrics",
       help = "Metrics from the profiler",
       registry = registry,
@@ -64,7 +64,7 @@ checksuite "asyncprofiler metrics collector":
 
   test "should create labeled series for the k slowest procs in terms of totalExecTime":
     var registry = newRegistry()
-    var collector = ProfilerInfo.newCollector(
+    var collector = AsyncProfilerInfo.newCollector(
       name = "profiling_metrics",
       help = "Metrics from the profiler",
       registry = registry,

diff --git a/tests/codex/utils/testasyncprofiler.nim b/tests/codex/utils/testasyncprofiler.nim
@@ -0,0 +1,4 @@
+import ./asyncprofiler/testserialization
+import ./asyncprofiler/testmetricscollector
+
+{.warning[UnusedImport]: off.}