Bump Finch to 0.23 (#3992)

* Bump Finch to 0.23

* Alter a merge strategy so N4 timer is used

frameworks/Scala/finch/README.md

@@ -1,30 +1,20 @@
-#finch Benchmarking Test
+# Finch Benchmark
 
-### JSON Encoding Test
+Implements two endpoints:
 
-* [JSON test source](src/main/scala/example/Main.scala)
+ - `GET /plaintext`
+ - `GET /json`
 
-### Plaintext Test
+## Run Locally (using `sbt`)
 
-* [JSON test source](src/main/scala/example/Main.scala)
+```
+$ sbt assembly
+$ java -jar target/scala-2.12/finch-benchmark.jar
+```
 
-## Infrastructure Software Versions
-The tests were run with:
-
-* [Java Oracle 1.8.0_25](http://www.oracle.com/technetwork/java/javase)
-* [finch 0.7.0](https://github.com/finagle/finch)
-
-## Test URLs
-### JSON Encoding Test
-
-http://localhost:9000/json
-
-### Plaintext Test
-
-http://localhost:9000/plaintext
-
-## How to run
-sbt 'oneJar'
-
-`java -jar target/scala-2.12/*finch*one-jar.jar`
+## Test Locally (using `httpie`)
 
+```
+$ http :9000/plaintext
+$ http :9000/json
+```

frameworks/Scala/finch/build.sbt

@@ -1,15 +1,17 @@
-name := """techempower-benchmarks-finch"""
-
-version := "0.22.0"
+lazy val finchVersion = "0.23.0"
 
+name := """techempower-benchmarks-finch"""
+version := finchVersion
 scalaVersion := "2.12.5"
 
 libraryDependencies ++= Seq(
-  "com.github.finagle" %% "finch-core" % "0.22.0",
-  "com.github.finagle" %% "finch-circe" % "0.22.0"
+  "com.github.finagle" %% "finch-arrows-core" % finchVersion,
+  "com.github.finagle" %% "finch-arrows-circe" % finchVersion
 )
 
+assemblyJarName in assembly := "finch-benchmark.jar"
 assemblyMergeStrategy in assembly := {
- case PathList("META-INF", xs @ _*) => MergeStrategy.discard
- case x => MergeStrategy.first
+ case PathList("META-INF", "services", _*) => MergeStrategy.last
+ case PathList("META-INF", _*) => MergeStrategy.discard
+ case _ => MergeStrategy.first
 }

frameworks/Scala/finch/finch.dockerfile

@@ -4,4 +4,4 @@ COPY project project
 COPY src src
 COPY build.sbt build.sbt
 RUN sbt assembly -batch
-CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dio.netty.recycler.maxCapacityPerThread=0", "-Dcom.twitter.finagle.tracing.enabled=false", "-Dio.netty.leakDetection.level=disabled", "-jar", "target/scala-2.12/techempower-benchmarks-finch-assembly-0.22.0.jar"]
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:+AggressiveOpts", "-Dio.netty.recycler.maxCapacityPerThread=0", "-Dcom.twitter.finagle.tracing.enabled=false", "-Dio.netty.leakDetection.level=disabled", "-jar", "target/scala-2.12/finch-benchmark.jar"]