v1.3.3

* Convert to Kotlin logging
* Update grpc jar
* Update kotlin and prometheus jars

.codebeatignore

@@ -0,0 +1 @@
+src/main/java/io/prometheus/common/ConfigVals.java

.mvn/wrapper/maven-wrapper.properties

@@ -1,16 +1,16 @@
 #
-#  Copyright 2017, Paul Ambrose All rights reserved.
-#  
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#  
-#      http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
+# Copyright © 2018 Paul Ambrose (pambrose@mac.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.3.2
+VERSION=1.3.3
 
 default: build
 

README.md

@@ -2,7 +2,9 @@
 
 [![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)
+[![codebeat badge](https://codebeat.co/badges/8dbe1dc6-628e-44a4-99f9-d468831ff0cc)](https://codebeat.co/projects/github-com-pambrose-prometheus-proxy-master)
 [![Code Climate](https://codeclimate.com/github/pambrose/prometheus-proxy/badges/gpa.svg)](https://codeclimate.com/github/pambrose/prometheus-proxy)
+[![Kotlin](https://img.shields.io/badge/%20language-Kotlin-red.svg)](https://kotlinlang.org/)
 [![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 
@@ -84,8 +86,8 @@ scrape_configs:
 
 The docker images are available via:
 ```bash
-$ docker pull pambrose/prometheus-proxy:1.3.2
-$ docker pull pambrose/prometheus-agent:1.3.2
+$ docker pull pambrose/prometheus-proxy:1.3.3
+$ docker pull pambrose/prometheus-agent:1.3.3
 ```
 
 Start the proxy and an agent in separate shells on your local machine:
@@ -94,14 +96,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.2
+        pambrose/prometheus-proxy:1.3.3
 ```
 
 ```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.2
+        pambrose/prometheus-agent:1.3.3
 ```
 
 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.3.2
+        pambrose/prometheus-agent:1.3.3

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.2
+        pambrose/prometheus-proxy:1.3.3

docs/release.md

@@ -6,16 +6,20 @@
 
 3) Modify code
 
-4) Verify tests run cleanly: `make tests`
+4) Verify tests run cleanly before merge with: `make tests`
 
-5) Build distro: `make distro`
+5) Check in branch and merge 
 
-6) Check in branch and merge 
+6) Go back to master
 
-7) Create release on github (https://github.com/pambrose/prometheus-proxy/releases) and 
+7) Verify tests run cleanly after merge with: `make tests`
+
+8) Build distro with: `make distro`
+
+9) 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`
+10) Build and push docker images with: `make docker-build docker-push`
 
-9) Update the *prometheus-proxy* and *prometheus-agent* repository descriptions 
+11) Update the *prometheus-proxy* and *prometheus-agent* repository descriptions 
 on Docker hub (https://hub.docker.com) with the latest version of *README.md*.

etc/compose/proxy.yml

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

logback/docker-logback.xml

@@ -1,17 +1,17 @@
 <!--
-  ~  Copyright 2017, Paul Ambrose All rights reserved.
+  ~ Copyright © 2018 Paul Ambrose (pambrose@mac.com)
   ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <configuration scan="true" scanPeriod="30 seconds">

pom.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~  Copyright 2017, Paul Ambrose All rights reserved.
+  ~ Copyright © 2018 Paul Ambrose (pambrose@mac.com)
   ~
-  ~  Licensed under the Apache License, Version 2.0 (the "License");
-  ~  you may not use this file except in compliance with the License.
-  ~  You may obtain a copy of the License at
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
   ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~     http://www.apache.org/licenses/LICENSE-2.0
   ~
-  ~  Unless required by applicable law or agreed to in writing, software
-  ~  distributed under the License is distributed on an "AS IS" BASIS,
-  ~  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~  See the License for the specific language governing permissions and
-  ~  limitations under the License.
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
   -->
 
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -22,30 +22,33 @@
 
     <groupId>io.prometheus</groupId>
     <artifactId>prometheus-proxy</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.3-SNAPSHOT</version>
 
     <properties>
-        <kotlin.version>1.2.10</kotlin.version>
-        <prometheus.version>0.1.0</prometheus.version>
+        <kotlin.version>1.2.21</kotlin.version>
+
+        <prometheus.version>0.2.0</prometheus.version>
         <jcommander.version>1.72</jcommander.version>
         <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.1</protobuf.plugin.version>
         <guava.version>19.0</guava.version>
+        <metrics.version>4.0.2</metrics.version>
+
+        <grpc.version>1.9.0</grpc.version>
+        <grpc.plugin.version>1.9.0</grpc.plugin.version>
+        <grpc.contrib.version>0.7.1</grpc.contrib.version>
+        <okhttp.version>3.9.1</okhttp.version>
+        <protobuf.version>3.5.1</protobuf.version>
+        <protobuf.plugin.version>0.5.1</protobuf.plugin.version>
+
         <spark.version>2.7.1</spark.version>
         <jetty.version>9.4.6.v20170531</jetty.version>
-        <okhttp.version>3.9.1</okhttp.version>
-        <grpc-prom.version>0.3.0</grpc-prom.version>
-        <metrics.version>4.0.0</metrics.version>
 
-        <brave.version>4.13.1</brave.version>
-        <zipkin-sender.version>2.2.2</zipkin-sender.version>
+        <brave.version>4.14.1</brave.version>
+        <zipkin-sender.version>2.3.1</zipkin-sender.version>
 
         <logback.version>1.2.3</logback.version>
         <slf4j.version>1.7.25</slf4j.version>
+        <kotlin.logging.version>1.5.3</kotlin.logging.version>
 
         <junit.version>4.12</junit.version>
         <assertj.version>3.9.0</assertj.version>
@@ -198,14 +201,6 @@
             <version>${okhttp.version}</version>
         </dependency>
 
-        <!-- Add back when they update their grpc lib - https://github.com/grpc-ecosystem/java-grpc-prometheus
-        <dependency>
-            <groupId>me.dinowernli</groupId>
-            <artifactId>java-grpc-prometheus</artifactId>
-            <version>${grpc-prom.version}</version>
-        </dependency>
-        -->
-
         <dependency>
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-sender-okhttp3</artifactId>
@@ -255,18 +250,26 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test-junit</artifactId>
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>io.github.microutils</groupId>
+            <artifactId>kotlin-logging</artifactId>
+            <version>${kotlin.logging.version}</version>
+        </dependency>
+
     </dependencies>
 
     <pluginRepositories>