finagle-stats, finagle-stats-core: bump to 2.13

Problem

No cross-build for finagle-stats 2.13 and finagle-stats-core 2.13

Solution

include 2.13 in finagle-stats and finagle-stats-core cross versions.

Signed-off-by: Yufan Gong <yufang@twitter.com>

Differential Revision: https://phabricator.twitter.biz/D421449

CHANGELOG.rst

@@ -16,6 +16,10 @@ New Features
   and server.  Off by default, clients and servers must be configured to negotiate.
   ``PHAB_ID=D414638``
 
+* finagle-stats: Enables cross-build for 2.13.0. ``PHAB_ID=D421449``
+
+* finagle-stats-core: Enables cross-build for 2.13.0. ``PHAB_ID=D421449``
+
 19.12.0
 -------
 

build.sbt

@@ -457,7 +457,8 @@ lazy val finagleStatsCore = Project(
   id = "finagle-stats-core",
   base = file("finagle-stats-core")
 ).settings(
-  sharedSettings
+  sharedSettings,
+  withTwoThirteen
 ).settings(
   name := "finagle-stats-core",
   libraryDependencies ++= Seq(
@@ -481,7 +482,8 @@ lazy val finagleStats = Project(
   id = "finagle-stats",
   base = file("finagle-stats")
 ).settings(
-  sharedSettings
+  sharedSettings,
+  withTwoThirteen
 ).settings(
   name := "finagle-stats"
 ).dependsOn(

finagle-stats-core/src/main/scala/com/twitter/finagle/stats/JsonExporter.scala

@@ -203,7 +203,7 @@ class JsonExporter(metrics: MetricsView, verbose: Tunable[String], timer: Timer)
 
   def filterSample(sample: collection.Map[String, Number]): collection.Map[String, Number] =
     statsFilterRegex match {
-      case Some(regex) => sample.filterKeys(!regex.pattern.matcher(_).matches)
+      case Some(regex) => sample.filterKeys(!regex.pattern.matcher(_).matches).toMap
       case None => sample
     }
 
@@ -212,11 +212,12 @@ class JsonExporter(metrics: MetricsView, verbose: Tunable[String], timer: Timer)
     verbose: Option[String => Boolean]
   ): collection.Map[String, A] = verbose match {
     case Some(pattern) =>
-      sample.filterKeys(
-        name => metrics.verbosity.get(name) != Verbosity.Debug || pattern(name)
-      )
+      sample
+        .filterKeys(
+          name => metrics.verbosity.get(name) != Verbosity.Debug || pattern(name)
+        ).toMap
 
     case None =>
-      sample.filterKeys(name => metrics.verbosity.get(name) != Verbosity.Debug)
+      sample.filterKeys(name => metrics.verbosity.get(name) != Verbosity.Debug).toMap
   }
 }