From 35c3f04a7c51d9caa26cd0421497594dac1f303e Mon Sep 17 00:00:00 2001 From: Paul Ambrose Date: Thu, 7 Dec 2017 10:36:27 -0800 Subject: [PATCH] Update gRPC, Spark, okHttp, metrics, and brave jars --- Makefile | 2 +- README.md | 8 ++++---- bin/docker-agent.sh | 2 +- bin/docker-proxy.sh | 2 +- etc/compose/proxy.yml | 2 +- pom.xml | 14 +++++++------- release.md | 18 ++++-------------- src/main/java/io/prometheus/package-info.java | 2 +- .../io/prometheus/proxy/ProxyHttpService.java | 2 +- 9 files changed, 21 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 605f5437..0c1cecfb 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION=1.2.4 +VERSION=1.2.5 default: build diff --git a/README.md b/README.md index fa0c0243..9200cc8b 100644 --- a/README.md +++ b/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), diff --git a/bin/docker-agent.sh b/bin/docker-agent.sh index b010608f..51e80d48 100755 --- a/bin/docker-agent.sh +++ b/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 \ No newline at end of file + pambrose/prometheus-agent:1.2.5 \ No newline at end of file diff --git a/bin/docker-proxy.sh b/bin/docker-proxy.sh index 176f9d82..c0557a15 100755 --- a/bin/docker-proxy.sh +++ b/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 \ No newline at end of file + pambrose/prometheus-proxy:1.2.5 \ No newline at end of file diff --git a/etc/compose/proxy.yml b/etc/compose/proxy.yml index eb133fa0..b19b3718 100644 --- a/etc/compose/proxy.yml +++ b/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' diff --git a/pom.xml b/pom.xml index db0afc3c..1490d487 100644 --- a/pom.xml +++ b/pom.xml @@ -22,24 +22,24 @@ io.prometheus prometheus-proxy - 1.2.4-SNAPSHOT + 1.2.5-SNAPSHOT 0.1.0 1.72 1.3.2 - 1.7.0 - 1.7.0 + 1.8.0 + 1.8.0 3.4.0 0.5.0 19.0 - 2.7.0 + 2.7.1 9.4.6.v20170531 - 3.9.0 + 3.9.1 1.5.2 0.3.0 - 4.0.0-alpha3 - 4.9.1 + 4.0.0-alpha4 + 4.11.0 1.1.2 1.2.3 diff --git a/release.md b/release.md index 49eb37ac..45bc2b77 100644 --- a/release.md +++ b/release.md @@ -1,4 +1,4 @@ -# Release Creation Steps +# Release Creation 1) Create branch @@ -6,25 +6,15 @@ 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*. \ No newline at end of file diff --git a/src/main/java/io/prometheus/package-info.java b/src/main/java/io/prometheus/package-info.java index c5df9afd..cc27e905 100644 --- a/src/main/java/io/prometheus/package-info.java +++ b/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; \ No newline at end of file diff --git a/src/main/java/io/prometheus/proxy/ProxyHttpService.java b/src/main/java/io/prometheus/proxy/ProxyHttpService.java index bd36ec49..1e87dade 100644 --- a/src/main/java/io/prometheus/proxy/ProxyHttpService.java +++ b/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 {