Update gRPC, Spark, okHttp, metrics, and brave jars

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.2.4
+VERSION=1.2.5
 
 default: build
 

README.md

@@ -84,8 +84,8 @@ scrape_configs:
 
 The docker images are available via:
 ```bash
-$ docker pull pambrose/prometheus-proxy:1.2.4
-$ docker pull pambrose/prometheus-agent:1.2.4
+$ docker pull pambrose/prometheus-proxy:1.2.5
+$ docker pull pambrose/prometheus-agent:1.2.5
 ```
 
 Start the proxy and an agent in separate shells on your local machine:
@@ -94,14 +94,14 @@ Start the proxy and an agent in separate shells on your local machine:
 $ docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         -e HOSTNAME=${HOSTNAME} \
         -e METRICS_ENABLED=true \
-        pambrose/prometheus-proxy:1.2.4
+        pambrose/prometheus-proxy:1.2.5
 ```
 
 ```bash
 $ docker run --rm -p 8083:8083 -p 8093:8093 \
         -e HOSTNAME=${HOSTNAME} \
         -e AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.2.4
+        pambrose/prometheus-agent:1.2.5
 ```
 
 Using the config file [simple.conf](https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf),

bin/docker-agent.sh

@@ -3,4 +3,4 @@
 docker run --rm -p 8083:8083 -p 8093:8093 \
         -e HOSTNAME=${HOSTNAME} \
         -e AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.2.4
+        pambrose/prometheus-agent:1.2.5

bin/docker-proxy.sh

@@ -3,4 +3,4 @@
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         -e HOSTNAME=${HOSTNAME} \
         -e PROXY_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-proxy:1.2.4
+        pambrose/prometheus-proxy:1.2.5

etc/compose/proxy.yml

@@ -1,6 +1,6 @@
 prometheus-proxy:
   autoredeploy: true
-  image: 'pambrose/prometheus-proxy:1.2.4'
+  image: 'pambrose/prometheus-proxy:1.2.5'
   ports:
     - '8080:8080'
     - '8082:8082'

pom.xml

@@ -22,24 +22,24 @@
 
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-proxy</artifactId>
-    <version>1.2.4-SNAPSHOT</version>
+    <version>1.2.5-SNAPSHOT</version>
 
     <properties>
         <prometheus.version>0.1.0</prometheus.version>
         <jcommander.version>1.72</jcommander.version>
         <config.version>1.3.2</config.version>
-        <grpc.version>1.7.0</grpc.version>
-        <grpc.plugin.version>1.7.0</grpc.plugin.version>
+        <grpc.version>1.8.0</grpc.version>
+        <grpc.plugin.version>1.8.0</grpc.plugin.version>
         <protobuf.version>3.4.0</protobuf.version>
         <protobuf.plugin.version>0.5.0</protobuf.plugin.version>
         <guava.version>19.0</guava.version>
-        <spark.version>2.7.0</spark.version>
+        <spark.version>2.7.1</spark.version>
         <jetty.version>9.4.6.v20170531</jetty.version>
-        <okhttp.version>3.9.0</okhttp.version>
+        <okhttp.version>3.9.1</okhttp.version>
         <auto.version>1.5.2</auto.version>
         <grpc-prom.version>0.3.0</grpc-prom.version>
-        <metrics.version>4.0.0-alpha3</metrics.version>
-        <brave.version>4.9.1</brave.version>
+        <metrics.version>4.0.0-alpha4</metrics.version>
+        <brave.version>4.11.0</brave.version>
         <zipkin-reporter.version>1.1.2</zipkin-reporter.version>
 
         <logback.version>1.2.3</logback.version>

release.md

@@ -1,30 +1,20 @@
-# Release Creation Steps
+# Release Creation 
 
 1) Create branch
 
 2) Bump version in source  
 
 3) Modify code
 
-4) Verify tests run cleanly
- ```bash
- $ make tests
- ```
+4) Verify tests run cleanly: `make tests`
 
-5) Build distro
- ```bash
- $ make distro
- ```
+5) Build distro: `make distro`
 
 6) Check in branch and merge 
 
 7) Create release on github and upload target/prometheus-proxy.jar and  target/prometheus-agent.jar
 
-8) Build and push docker images
-```bash
-$ make docker-build
-$ make docker-push
-```
+8) Build and push docker images: `make docker-build docker-push`
 
 9) Update the *prometheus-proxy* and *prometheus-agent* repository descriptions on 
 the Docker hub with the latest version of *README.md*.

src/main/java/io/prometheus/package-info.java

@@ -14,7 +14,7 @@
  *  limitations under the License.
  */
 
-@VersionAnnotation(version = "1.2.4", date = "11/6/17")
+@VersionAnnotation(version = "1.2.5", date = "12/7/17")
 package io.prometheus;
 
 import io.prometheus.common.VersionAnnotation;

src/main/java/io/prometheus/proxy/ProxyHttpService.java

@@ -87,7 +87,7 @@ public void handle(Exception e, Request request, Response response) {
 
                     final Span span = this.tracer != null ? this.tracer.newTrace()
                                                                        .name("round-trip")
-                                                                       .tag("version", "1.2.4")
+                                                                       .tag("version", "1.2.5")
                                                                        .start()
                                                           : null;
                     try {