Merge pull request #67 from ExpediaDotCom/pitchfork-gzip

 enable gzip config by default for pitchfork

Author: Kapil Rastogi

agent-providers/span/src/main/java/com/expedia/www/haystack/agent/pitchfork/service/config/HttpConfig.java

@@ -90,7 +90,7 @@ public static HttpConfig from(Config config) {
         final int idleTimeout = config.hasPath(IDLE_TIMEOUT_MILLIS_CONFIG_KEY) ? config.getInt(IDLE_TIMEOUT_MILLIS_CONFIG_KEY) : 60000;
         final int stopTimeout = config.hasPath(STOP_TIMEOUT_MILLIS_CONFIG_KEY) ? config.getInt(STOP_TIMEOUT_MILLIS_CONFIG_KEY) : 30000;
         final int gzipBufferSize = config.hasPath(GZIP_BUFFER_SIZE) ? config.getInt(GZIP_BUFFER_SIZE) : 16384;
-        final boolean gzipEnabled = config.hasPath(GZIP_ENABLED_KEY) && config.getBoolean(GZIP_ENABLED_KEY);
+        final boolean gzipEnabled = !config.hasPath(GZIP_ENABLED_KEY) || config.getBoolean(GZIP_ENABLED_KEY); // default is true
         return new HttpConfig(port, minThreads, maxThreads, idleTimeout, stopTimeout, gzipEnabled, gzipBufferSize);
     }
 }

agent-providers/span/src/test/scala/com/expedia/www/haystack/agent/pitchfork/HttpConfigSpec.scala

@@ -11,15 +11,15 @@ import scala.collection.JavaConverters._
 
 class HttpConfigSpec extends FunSpec with Matchers with EasyMockSugar {
   describe("Http configuration provider") {
-    it("should return gzip enabled as true if provided and its value is 'true'") {
-      val config = ConfigFactory.parseMap(Map("port" -> 9115, "http.threads.min" -> 2, "http.threads.max" -> 4, "gzip.enabled" -> true).asJava)
+    it("should return gzip enabled as false if provided and its value is 'false'") {
+      val config = ConfigFactory.parseMap(Map("port" -> 9115, "http.threads.min" -> 2, "http.threads.max" -> 4, "gzip.enabled" -> false).asJava)
       val httpConfig = HttpConfig.from(config)
-      httpConfig.isGzipEnabled should equal (true)
+      httpConfig.isGzipEnabled should equal (false)
     }
-    it("should return gzip enabled as false if not provided")  {
+    it("should return gzip enabled as true if not provided")  {
       val config = ConfigFactory.parseMap(Map("port" -> 9115, "http.threads.min" -> 2, "http.threads.max" -> 4).asJava)
       val httpConfig = HttpConfig.from(config)
-      httpConfig.isGzipEnabled should equal (false)
+      httpConfig.isGzipEnabled should equal (true)
     }
     it("should return gzip buffer as 16Kb if not provided")  {
       val config = ConfigFactory.parseMap(Map("port" -> 9115, "http.threads.min" -> 2, "http.threads.max" -> 4).asJava)

docker/default.conf

@@ -37,6 +37,7 @@ agents {
        max = 16
        min = 2
     }
+    gzip.enabled = true
     idle.timeout.ms = 60000
     stop.timeout.ms = 30000
     accept.null.timestamps = false
@@ -51,4 +52,4 @@ agents {
       }
     }
   }
-}
+}