Release 1.3.2

* Convert to more Kotlin idioms * Add AtomicDelegates * Add DSLs for gRPC, Guava, Jetty, Metrics, OkHttp, Spark, Thread, and Zipkin
pambrose · Jan 3, 2018 · cc16cc4 · cc16cc4
1 parent 2e5ab02
commit cc16cc4
Show file tree

Hide file tree

Showing 62 changed files with 1,912 additions and 1,399 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.1
+VERSION=1.3.2
 
 default: build
 
@@ -33,8 +33,8 @@ sonar:
 
 distro: build
 	mkdir target/distro
-	mv target/proxy-jar-with-dependencies.jar target/distro/prometheus-proxy.jar
-	mv target/agent-jar-with-dependencies.jar target/distro/prometheus-agent.jar
+	mv target/prometheus-proxy-jar-with-dependencies.jar target/distro/prometheus-proxy.jar
+	mv target/prometheus-agent-jar-with-dependencies.jar target/distro/prometheus-agent.jar
 
 site:
 	./mvnw site

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.org/pambrose/prometheus-proxy.svg?branch=master)](https://travis-ci.org/pambrose/prometheus-proxy)
 [![Coverage Status](https://coveralls.io/repos/github/pambrose/prometheus-proxy/badge.svg?branch=master)](https://coveralls.io/github/pambrose/prometheus-proxy?branch=master)
 [![Code Climate](https://codeclimate.com/github/pambrose/prometheus-proxy/badges/gpa.svg)](https://codeclimate.com/github/pambrose/prometheus-proxy)
-
+[![Dependency Status](https://www.versioneye.com/user/projects/5a4c7a110fb24f0536e5b92f/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/5a4c7a110fb24f0536e5b92f)
 
 [Prometheus](https://prometheus.io) is an excellent systems monitoring and alerting toolkit, which uses a pull model for 
 collecting metrics. The pull model is problematic when a Prometheus server and its metrics endpoints are separated 
@@ -84,8 +84,8 @@ scrape_configs:
 
 The docker images are available via:
 ```bash
-$ docker pull pambrose/prometheus-proxy:1.3.1
-$ docker pull pambrose/prometheus-agent:1.3.1
+$ docker pull pambrose/prometheus-proxy:1.3.2
+$ docker pull pambrose/prometheus-agent:1.3.2
 ```
 
 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.3.1
+        pambrose/prometheus-proxy:1.3.2
 ```
 
 ```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.3.1
+        pambrose/prometheus-agent:1.3.2
 ```
 
 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
@@ -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.3.1
+        pambrose/prometheus-agent:1.3.2
diff --git 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.3.1
+        pambrose/prometheus-proxy:1.3.2
diff --git a/docs/release.md b/docs/release.md
@@ -12,9 +12,10 @@
 
 6) Check in branch and merge 
 
-7) Create release on github and upload target/distro/prometheus-proxy.jar and  target/distro/prometheus-agent.jar
+7) Create release on github (https://github.com/pambrose/prometheus-proxy/releases) and 
+upload the *target/distro/prometheus-proxy.jar* and  *target/distro/prometheus-agent.jar* files.
 
 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*.
+9) Update the *prometheus-proxy* and *prometheus-agent* repository descriptions 
+on Docker hub (https://hub.docker.com) with the latest version of *README.md*.
diff --git a/etc/compose/proxy.yml b/etc/compose/proxy.yml
@@ -1,6 +1,6 @@
 prometheus-proxy:
   autoredeploy: true
-  image: 'pambrose/prometheus-proxy:1.3.1'
+  image: 'pambrose/prometheus-proxy:1.3.2'
   ports:
     - '8080:8080'
     - '8082:8082'

diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-proxy</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.2-SNAPSHOT</version>
 
     <properties>
         <kotlin.version>1.2.10</kotlin.version>
@@ -31,8 +31,9 @@
         <config.version>1.3.2</config.version>
         <grpc.version>1.8.0</grpc.version>
         <grpc.plugin.version>1.8.0</grpc.plugin.version>
+        <grpc.contrib.version>0.7.0</grpc.contrib.version>
         <protobuf.version>3.4.0</protobuf.version>
-        <protobuf.plugin.version>0.5.0</protobuf.plugin.version>
+        <protobuf.plugin.version>0.5.1</protobuf.plugin.version>
         <guava.version>19.0</guava.version>
         <spark.version>2.7.1</spark.version>
         <jetty.version>9.4.6.v20170531</jetty.version>
@@ -47,12 +48,12 @@
         <slf4j.version>1.7.25</slf4j.version>
 
         <junit.version>4.12</junit.version>
-        <assertj.version>3.8.0</assertj.version>
+        <assertj.version>3.9.0</assertj.version>
         <assertj.maven.version>2.0.0</assertj.maven.version>
 
-        <assembly.version>2.6</assembly.version>
-        <maven.compiler.version>3.6.1</maven.compiler.version>
-        <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <maven.assembly.version>2.6</maven.assembly.version>
+        <maven.compiler.version>3.7.0</maven.compiler.version>
+        <maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
         <appassembler.version>1.10</appassembler.version>
 
         <maven.version>3.5.0</maven.version>
@@ -185,6 +186,12 @@
             <version>${grpc.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.salesforce.servicelibs</groupId>
+            <artifactId>grpc-contrib</artifactId>
+            <version>${grpc.contrib.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
@@ -387,7 +394,7 @@
 
             <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>${maven-jar-plugin.version}</version>
+                <version>${maven.jar.plugin.version}</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -439,7 +446,7 @@
 
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${assembly.version}</version>
+                <version>${maven.assembly.version}</version>
                 <executions>
                     <execution>
                         <id>proxy</id>
@@ -449,7 +456,7 @@
                         <phase>package</phase>
 
                         <configuration>
-                            <finalName>proxy</finalName>
+                            <finalName>prometheus-proxy</finalName>
                             <descriptorRefs>
                                 <descriptorRef>jar-with-dependencies</descriptorRef>
                             </descriptorRefs>
@@ -470,7 +477,7 @@
                         <phase>package</phase>
 
                         <configuration>
-                            <finalName>agent</finalName>
+                            <finalName>prometheus-agent</finalName>
                             <descriptorRefs>
                                 <descriptorRef>jar-with-dependencies</descriptorRef>
                             </descriptorRefs>