Merge branch 'master' of https://github.com/ExpediaDotCom/haystack-agent

Author: Ashish

deployment/terraform/main.tf

@@ -27,6 +27,11 @@ data "template_file" "config_data" {
     aws_region = "${var.haystack-agent["blobs_aws_region"]}"
     blobs_service_port = "${var.blobs_service_port}"
     spans_service_port = "${var.spans_service_port}"
+    enable_spans = "${var.haystack-agent["enable_spans"]}"
+    enable_ossblobs = "${var.haystack-agent["enable_ossblobs"]}"
+    enable_pitchfork = "${var.haystack-agent["enable_pitchfork"]}"
+    use_sts_arn = "${var.haystack-agent["use_sts_arn"]}"
+    sts_arn_role = "${var.haystack-agent["sts_arn_role"]}"
   }
 }
 

deployment/terraform/templates/haystack-agent.conf

@@ -1,6 +1,6 @@
 agents {
   spans {
-    enabled = true
+    enabled = "${enable_spans}"
     port = "${spans_service_port}"
     dispatchers {
       kafka {
@@ -12,7 +12,7 @@ agents {
     }
   }
   ossblobs {
-    enabled = true
+    enabled = "${enable_ossblobs}"
     port = "${blobs_service_port}"
     max.blob.size.in.kb = 512
     dispatchers {
@@ -24,6 +24,30 @@ agents {
         retry.count = 1
         bucket.name = "${aws_bucket_name}"
         region = "${aws_region}"
+        use.sts.arn = "${use_sts_arn}"
+        sts.arn.role = "${sts_arn_role}"
+      }
+    }
+  }
+
+  pitchfork {
+    enabled = "${enable_pitchfork}"
+    port = 9411
+    http.threads {
+      max = 16
+      min = 2
+    }
+    idle.timeout.ms = 60000
+    stop.timeout.ms = 30000
+    accept.null.timestamps = false
+    max.timestamp.drift.sec = -1
+
+    dispatchers {
+      kafka {
+        bootstrap.servers = "kafkasvc:9092"
+        producer.topic = "proto-spans"
+        buffer.memory = 1048576
+        retries = 2
       }
     }
   }

pom.xml

@@ -73,11 +73,11 @@
         <jackson.version>2.9.9.2</jackson.version>
         <jackson-dataformat.version>2.9.9</jackson-dataformat.version>
         <commons-lang.version>3.4</commons-lang.version>
-        <grpc.version>1.7.0</grpc.version>
+        <grpc.version>1.9.0</grpc.version>
         <metrics-core.version>3.2.5</metrics-core.version>
         <jaxb.version>2.3.0</jaxb.version>
         <javax.activation.version>1.1.1</javax.activation.version>
-        <blobs.version>1.0.2</blobs.version>
+        <blobs.version>1.0.3</blobs.version>
 
         <jetty.version>9.4.18.v20190429</jetty.version>
         <zipkin2.version>2.15.0</zipkin2.version>