Follow new naming in GHC.Stats. Fixes #29.

GHC commit
	  24e6594cc7890babe69b8ba122d171affabad2d1
changed a lot of the stats names.

Until now, EKG stuck to the old names, which can be very confusing;
especially since some names were clearly misleading and have been
renamed in GHC consequentially.

This commit changes all names to the new names (provided we're
on base >= 4.10; the #ifdef for even older base versions remains
unchanged).

This change may break some users that rely on the old names,
so a new major release should be made.

Author: nh2

Diff for: System/Metrics.hs

@@ -332,9 +332,6 @@ createDistribution name store = do
 -- function.
 
 #if MIN_VERSION_base(4,10,0)
--- | Convert nanoseconds to milliseconds.
-nsToMs :: Int64 -> Int64
-nsToMs s = round (realToFrac s / (1000000.0 :: Double))
 #else
 -- | Convert seconds to milliseconds.
 sToMs :: Double -> Int64
@@ -424,32 +421,50 @@ registerGcMetrics store =
     registerGroup
 #if MIN_VERSION_base(4,10,0)
     (M.fromList
-     [ ("rts.gc.bytes_allocated"          , Counter . fromIntegral . Stats.allocated_bytes)
-     , ("rts.gc.num_gcs"                  , Counter . fromIntegral . Stats.gcs)
-     , ("rts.gc.num_bytes_usage_samples"  , Counter . fromIntegral . Stats.major_gcs)
-     , ("rts.gc.cumulative_bytes_used"    , Counter . fromIntegral . Stats.cumulative_live_bytes)
-     , ("rts.gc.bytes_copied"             , Counter . fromIntegral . Stats.copied_bytes)
+     -- We order them the same way as they are in GHC.Stats for easy comparison.
+     [ ("rts.gcs"                                  , Counter . fromIntegral . Stats.gcs)
+     , ("rts.major_gcs"                            , Counter . fromIntegral . Stats.major_gcs)
+     , ("rts.allocated_bytes"                      , Counter . fromIntegral . Stats.allocated_bytes)
+     , ("rts.max_live_bytes"                       , Gauge . fromIntegral . Stats.max_live_bytes)
+     , ("rts.max_large_objects_bytes"              , Gauge . fromIntegral . Stats.max_large_objects_bytes)
+     , ("rts.max_compact_bytes"                    , Gauge . fromIntegral . Stats.max_compact_bytes)
+     , ("rts.max_slop_bytes"                       , Gauge . fromIntegral . Stats.max_slop_bytes)
+     , ("rts.max_mem_in_use_bytes"                 , Gauge . fromIntegral . Stats.max_mem_in_use_bytes)
+     , ("rts.cumulative_live_bytes"                , Counter . fromIntegral . Stats.cumulative_live_bytes)
+     , ("rts.copied_bytes"                         , Counter . fromIntegral . Stats.copied_bytes)
+     , ("rts.par_copied_bytes"                     , Gauge . fromIntegral . Stats.par_copied_bytes)
+     , ("rts.cumulative_par_max_copied_bytes"      , Gauge . fromIntegral . Stats.cumulative_par_max_copied_bytes)
+#if MIN_VERSION_base(4,11,0)
+     , ("rts.cumulative_par_balanced_copied_bytes" , Gauge . fromIntegral . Stats.cumulative_par_balanced_copied_bytes)
+#endif
 #if MIN_VERSION_base(4,12,0)
-     , ("rts.gc.init_cpu_ms"              , Counter . nsToMs . Stats.init_cpu_ns)
-     , ("rts.gc.init_wall_ms"             , Counter . nsToMs . Stats.init_elapsed_ns)
+     , ("rts.init_cpu_ns"                          , Counter . Stats.init_cpu_ns)
+     , ("rts.init_elapsed_ns"                      , Counter . Stats.init_elapsed_ns)
 #endif
-     , ("rts.gc.mutator_cpu_ms"           , Counter . nsToMs . Stats.mutator_cpu_ns)
-     , ("rts.gc.mutator_wall_ms"          , Counter . nsToMs . Stats.mutator_elapsed_ns)
-     , ("rts.gc.gc_cpu_ms"                , Counter . nsToMs . Stats.gc_cpu_ns)
-     , ("rts.gc.gc_wall_ms"               , Counter . nsToMs . Stats.gc_elapsed_ns)
-     , ("rts.gc.cpu_ms"                   , Counter . nsToMs . Stats.cpu_ns)
-     , ("rts.gc.wall_ms"                  , Counter . nsToMs . Stats.elapsed_ns)
-     , ("rts.gc.max_bytes_used"           , Gauge . fromIntegral . Stats.max_live_bytes)
-     , ("rts.gc.current_bytes_used"       , Gauge . fromIntegral . Stats.gcdetails_live_bytes . Stats.gc)
-     , ("rts.gc.current_bytes_slop"       , Gauge . fromIntegral . Stats.gcdetails_slop_bytes . Stats.gc)
-     , ("rts.gc.max_bytes_slop"           , Gauge . fromIntegral . Stats.max_slop_bytes)
-     , ("rts.gc.peak_megabytes_allocated" , Gauge . fromIntegral . (`quot` (1024*1024)) . Stats.max_mem_in_use_bytes)
-     , ("rts.gc.par_tot_bytes_copied"     , Gauge . fromIntegral . Stats.par_copied_bytes)
-     , ("rts.gc.par_avg_bytes_copied"     , Gauge . fromIntegral . Stats.par_copied_bytes)
-     , ("rts.gc.par_max_bytes_copied"     , Gauge . fromIntegral . Stats.cumulative_par_max_copied_bytes)
+     , ("rts.mutator_cpu_ns"                       , Counter . Stats.mutator_cpu_ns)
+     , ("rts.mutator_elapsed_ns"                   , Counter . Stats.mutator_elapsed_ns)
+     , ("rts.gc_cpu_ns"                            , Counter . Stats.gc_cpu_ns)
+     , ("rts.gc_elapsed_ns"                        , Counter . Stats.gc_elapsed_ns)
+     , ("rts.cpu_ns"                               , Counter . Stats.cpu_ns)
+     , ("rts.elapsed_ns"                           , Counter . Stats.elapsed_ns)
+     -- GCDetails
+     , ("rts.gc.gen"                               , Gauge . fromIntegral . Stats.gcdetails_gen . Stats.gc)
+     , ("rts.gc.threads"                           , Gauge . fromIntegral . Stats.gcdetails_threads . Stats.gc)
+     , ("rts.gc.allocated_bytes"                   , Gauge . fromIntegral . Stats.gcdetails_allocated_bytes . Stats.gc)
+     , ("rts.gc.live_bytes"                        , Gauge . fromIntegral . Stats.gcdetails_live_bytes . Stats.gc)
+     , ("rts.gc.large_objects_bytes"               , Gauge . fromIntegral . Stats.gcdetails_large_objects_bytes . Stats.gc)
+     , ("rts.gc.compact_bytes"                     , Gauge . fromIntegral . Stats.gcdetails_compact_bytes . Stats.gc)
+     , ("rts.gc.slop_bytes"                        , Gauge . fromIntegral . Stats.gcdetails_slop_bytes . Stats.gc)
+     , ("rts.gc.mem_in_use_bytes"                  , Gauge . fromIntegral . Stats.gcdetails_mem_in_use_bytes . Stats.gc)
+     , ("rts.gc.copied_bytes"                      , Gauge . fromIntegral . Stats.gcdetails_copied_bytes . Stats.gc)
+     , ("rts.gc.par_max_copied_bytes"              , Gauge . fromIntegral . Stats.gcdetails_par_max_copied_bytes . Stats.gc)
+     , ("rts.gc.sync_elapsed_ns"                   , Gauge . fromIntegral . Stats.gcdetails_sync_elapsed_ns . Stats.gc)
+     , ("rts.gc.cpu_ns"                            , Gauge . fromIntegral . Stats.gcdetails_cpu_ns . Stats.gc)
+     , ("rts.gc.elapsed_ns"                        , Gauge . fromIntegral . Stats.gcdetails_elapsed_ns . Stats.gc)
      ])
     getRTSStats
 #else
+    -- Pre base-4.10 we have the names from before GHC commit 24e6594cc7890babe69b8ba122d171affabad2d1.
     (M.fromList
      [ ("rts.gc.bytes_allocated"          , Counter . Stats.bytesAllocated)
      , ("rts.gc.num_gcs"                  , Counter . Stats.numGcs)