Merge commit '97277d5888b7b80debdfd5bd626473d446a17715'

Author: jenkins

.travis.yml

@@ -8,7 +8,7 @@ git:
   quiet: true
 
 env:
-  - JAVA_OPTS="-DSKIP_FLAKY=true -Dsbt.log.noformat=true"
+  - JAVA_OPTS="-Dsbt.log.noformat=true"
 
 # These directories are cached to S3 at the end of the build
 cache:
@@ -28,7 +28,7 @@ scala:
   - 2.12.8
 
 jdk:
-  - oraclejdk8
+  - openjdk8
 
 notifications:
   slack:

CHANGELOG.rst

@@ -7,6 +7,45 @@ Note that ``RB_ID=#`` and ``PHAB_ID=#`` correspond to associated message in comm
 Unreleased
 ----------
 
+19.9.0
+------
+
+Added
+~~~~~
+
+* finatra-kafka:  Add `withConfig` method variant which takes a `Map[String, String]`
+                  to allow for more complex configurations ``PHAB_ID=D354389``
+
+Changed
+~~~~~~~
+
+* finatra: Remove commons-lang as a dependency and replace it with alternatives from stdlib 
+           when possible. ``PHAB_ID=D354013``
+
+* inject-server: Changed `c.t.inject.server.InMemoryStatsReceiverUtility` to show the expected and
+  actual values as part of the error message when metric values do not match. ``PHAB_ID=D360470``
+  
+* finatra-kafka-streams: Improve StaticPartitioning error message ``PHAB_ID=D351368``
+
+Fixed
+~~~~~
+
+* finatra-http:  Support Http 405 response code, improve routing performance for non-constant route
+                 ``PHAB_ID=D278146``
+
+* inject-app: Update `c.t.inject.app.App` to only recurse through modules once. We currently
+  call `TwitterModule#modules` more than once in reading flags and parsing the list of modules
+  over which to create the injector. When `TwitterModule#modules` is a function that inlines the
+  instantiation of new modules we can end up creating multiple instances causing issues with the 
+  list of flags defined in the application. This is especially true in instances of `TwitterModule` 
+  implemented in Java as there is no way to implement the trait `TwitterModule#modules` method as a 
+  eagerly evaluated value. We also don't provide an ergonomic method for Java users to define 
+  dependent modules like we do in apps and servers via `App#javaModules`. Thus we also add a 
+  `TwitterModule#javaModules` function which expresses a better API for Java users. ``PHAB_ID=D349587``
+
+Closed
+~~~~~~
+
 19.8.0
 ------
 
@@ -21,9 +60,9 @@ Added
 * finatra-jackson: Add the ability to specify `fields` in the `MethodValidation` annotation.
   ``PHAB_ID=D338079``
 
-
 Changed
 ~~~~~~~
+* finatra-kafka: Make KafkaConsumerConfig config public from FinagleKafkaConsumerBuilder. ``PHAB_ID=D362058``
 
 * inject-thrift-client: make ThriftClientModuleTrait extend StackClientModuleTrait for symmetry
   with other protocol client modules. ``PHAB_ID=D342710``

benchmarks/src/test/scala/BUILD

@@ -9,7 +9,6 @@ junit_tests(
         "3rdparty/jvm/com/google/inject/extensions:guice-assistedinject",
         "3rdparty/jvm/com/google/inject/extensions:guice-multibindings",
         "3rdparty/jvm/com/google/inject/extensions:guice-testlib",
-        "3rdparty/jvm/commons-lang",
         "3rdparty/jvm/joda-time",
         "3rdparty/jvm/net/codingwell:scala-guice",
         "3rdparty/jvm/org/openjdk/jmh:jmh-core",

benchmarks/src/test/scala/com/twitter/finatra/http/benchmarks/RouteBenchmark.scala

@@ -12,9 +12,7 @@ import scala.reflect.classTag
  * ./sbt 'project benchmarks' 'jmh:run RouteBenchmark'
  */
 @State(Scope.Thread)
-class RouteBenchmark
-  extends StdBenchAnnotations
-  with HttpBenchmark {
+class RouteBenchmark extends StdBenchAnnotations with HttpBenchmark {
 
   val route = Route(
     name = "groups",
@@ -57,17 +55,22 @@ class RouteBenchmark
 
   @Benchmark
   def testRoute(): Option[Future[Response]] = {
-    route.handle(postGroupsRequest, postGroupsPath, bypassFilters = false)
+    route.handle(request = postGroupsRequest, routeParams = Map.empty, bypassFilters = false)
   }
 
   @Benchmark
   def testRouteWithPathParams(): Option[Future[Response]] = {
-    routeWithPathParams.handle(postGroups123Request, postGroups123Path, bypassFilters = false)
+    routeWithPathParams.handle(
+      request = postGroups123Request,
+      routeParams = Map("id" -> "123"),
+      bypassFilters = false)
   }
 
   @Benchmark
   def testRouteWithUrlEncodedPathParams(): Option[Future[Response]] = {
-    routeWithPathParams.handle(postGroupsUrlEncodedRequest,
-      postGroupsUrlEncodedPath, bypassFilters = false)
+    routeWithPathParams.handle(
+      request = postGroupsUrlEncodedRequest,
+      routeParams = Map.empty,
+      bypassFilters = false)
   }
 }

benchmarks/src/test/scala/com/twitter/finatra/http/benchmarks/RoutingServiceBenchmark.scala

@@ -12,24 +12,38 @@ import scala.reflect.classTag
  * ./sbt 'project benchmarks' 'jmh:run RoutingServiceBenchmark'
  */
 @State(Scope.Thread)
-class RoutingServiceBenchmark
-  extends StdBenchAnnotations
-  with HttpBenchmark {
+class RoutingServiceBenchmark extends StdBenchAnnotations with HttpBenchmark {
 
   val routes: Seq[Route] = Seq(
-    route("/groups/"),
-    route("/groups/:id"),
-    route("/tasks/"),
-    route("/tasks/:id"),
-    route("/foo/"),
-    route("/foo/:id"),
-    route("/users/"),
-    route("/users/:id")
+    route("/groups/verified/vip/top10/"),
+    route("/groups/verified/vip/top10/:id"),
+    route("/tasks/easy/top10/:id"),
+    route("/tasks/starter/top10/:id"),
+    route("/users/test/temp/top10/"),
+    route("/users/test/temp/top10/:id"),
+    route("/groups/vip/top10/"),
+    route("/groups/vip/top10/:id"),
+    route("/groups/vip/top10/:id/:name"),
+    route("/foo/bar/baz/top10/"),
+    route("/foo/bar/baz/:id"),
+    route("/foo/baz/baz/:name"),
+    route("/groups/verified/vip/top5/"),
+    route("/groups/verified/vip/top5/:id"),
+    route("/tasks/easy/top5/:id"),
+    route("/tasks/starter/top5/:id"),
+    route("/users/test/temp/top5/"),
+    route("/users/test/temp/top5/:id"),
+    route("/groups/vip/top5/"),
+    route("/groups/vip/top5/:id"),
+    route("/groups/vip/top5/:id/:name"),
+    route("/foo/bar/baz/top5/"),
+    route("/foo/bar/baz/top5/:id"),
+    route("/foo/baz/baz/top5/:name")
   )
 
   val routingService: RoutingService = new RoutingService(routes)
-  val getRequest1: Request = Request("/users/")
-  val getRequest2: Request = Request("/users/123")
+  val getRequest1: Request = Request("/foo/bar/baz/top5/")
+  val getRequest2: Request = Request("/groups/vip/top5/123/jack")
 
   @Benchmark
   def timeOldLastConstant(): Future[Response] = {

build.sbt

@@ -4,14 +4,14 @@ import scoverage.ScoverageKeys
 concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)
 
 // All Twitter library releases are date versioned as YY.MM.patch
-val releaseVersion = "19.8.0"
+val releaseVersion = "19.9.0"
 
 lazy val buildSettings = Seq(
   version := releaseVersion,
   scalaVersion := "2.12.8",
   crossScalaVersions := Seq("2.11.12", "2.12.8"),
   scalaModuleInfo := scalaModuleInfo.value.map(_.withOverrideScalaVersion(true)),
-  fork in Test := true,
+  fork in Test := true, // We have to fork to get the JavaOptions
   javaOptions in Test ++= travisTestJavaOptions
 )
 
@@ -23,13 +23,29 @@ lazy val noPublishSettings = Seq(
   publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo")))
 )
 
+def gcJavaOptions: Seq[String] = {
+  Seq(
+    "-XX:+UseParNewGC",
+    "-XX:+UseConcMarkSweepGC",
+    "-XX:+CMSParallelRemarkEnabled",
+    "-XX:+CMSClassUnloadingEnabled",
+    "-XX:ReservedCodeCacheSize=128m",
+    "-XX:SurvivorRatio=128",
+    "-XX:MaxTenuringThreshold=0",
+    "-Xss8M",
+    "-Xms512M",
+    "-Xmx2G"
+  )
+}
+
 def travisTestJavaOptions: Seq[String] = {
   // When building on travis-ci, we want to suppress logging to error level only.
+  // https://docs.travis-ci.com/user/environment-variables/#default-environment-variables
   val travisBuild = sys.env.getOrElse("TRAVIS", "false").toBoolean
   if (travisBuild) {
     Seq(
       "-DSKIP_FLAKY=true",
-      "-Dsbt.log.noformat=true",
+      "-DSKIP_FLAKY_TRAVIS=true",
       "-Dorg.slf4j.simpleLogger.defaultLogLevel=error",
       "-Dcom.twitter.inject.test.logging.disabled",
       // Needed to avoid cryptic EOFException crashes in forked tests
@@ -107,6 +123,12 @@ lazy val baseSettings = Seq(
   scalaCompilerOptions,
   javacOptions in (Compile, compile) ++= Seq("-source", "1.8", "-target", "1.8", "-Xlint:unchecked"),
   javacOptions in doc ++= Seq("-source", "1.8"),
+  javaOptions ++= Seq(
+    "-Djava.net.preferIPv4Stack=true",
+    "-XX:+AggressiveOpts",
+    "-server"
+  ),
+  javaOptions ++= gcJavaOptions,
   // -a: print stack traces for failing asserts
   testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-v"),
   // broken in 2.12 due to: https://issues.scala-lang.org/browse/SI-10134
@@ -517,8 +539,7 @@ lazy val injectUtils = (project in file("inject/inject-utils"))
     moduleName := "inject-utils",
     libraryDependencies ++= Seq(
       "com.twitter" %% "finagle-core" % versions.twLibVersion,
-      "com.twitter" %% "util-core" % versions.twLibVersion,
-      "commons-lang" % "commons-lang" % versions.commonsLang
+      "com.twitter" %% "util-core" % versions.twLibVersion
     )
   ).dependsOn(
     injectCore % "test->test;compile->compile")

doc/src/sphinx/exts/includecode.py

@@ -53,7 +53,7 @@ def run(self):
         encoding = self.options.get('encoding', env.config.source_encoding)
         codec_info = codecs.lookup(encoding)
         try:
-            f = codecs.StreamReaderWriter(open(fn, 'U'),
+            f = codecs.StreamReaderWriter(open(fn, 'Ub'),
                     codec_info[2], codec_info[3], 'strict')
             lines = f.readlines()
             f.close()