1.8.7

* Upgrade jars

Makefile

@@ -1,4 +1,4 @@
-VERSION=1.8.6
+VERSION=1.8.7
 
 default: compile
 
@@ -63,4 +63,4 @@ refresh:
 	./gradlew --refresh-dependencies
 
 upgrade-wrapper:
-	./gradlew wrapper --gradle-version=6.6.1 --distribution-type=bin
+	./gradlew wrapper --gradle-version=6.7.1 --distribution-type=bin

README.md

@@ -100,8 +100,8 @@ scrape_configs:
 
 The docker images are available via:
 ```bash
-docker pull pambrose/prometheus-proxy:1.8.6
-docker pull pambrose/prometheus-agent:1.8.6
+docker pull pambrose/prometheus-proxy:1.8.7
+docker pull pambrose/prometheus-agent:1.8.7
 ```
 
 Start a proxy container with:
@@ -110,15 +110,15 @@ Start a proxy container with:
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
         --env ADMIN_ENABLED=true \
         --env METRICS_ENABLED=true \
-        pambrose/prometheus-proxy:1.8.6
+        pambrose/prometheus-proxy:1.8.7
 ```
 
 Start an agent container with:
 
 ```bash
 docker run --rm -p 8083:8083 -p 8093:8093 \
         --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-        pambrose/prometheus-agent:1.8.6
+        pambrose/prometheus-agent:1.8.7
 ```
 
 Using the config file [simple.conf](https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf),
@@ -134,7 +134,7 @@ is in your current directory, run an agent container with:
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/prom-agent.conf,target=/app/prom-agent.conf \
     --env AGENT_CONFIG=prom-agent.conf \
-    pambrose/prometheus-agent:1.8.6
+    pambrose/prometheus-agent:1.8.7
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure 
@@ -255,15 +255,15 @@ docker run --rm -p 8082:8082 -p 8092:8092 -p 50440:50440 -p 8080:8080 \
     --env PROXY_CONFIG=tls-no-mutual-auth.conf \
     --env ADMIN_ENABLED=true \
     --env METRICS_ENABLED=true \
-    pambrose/prometheus-proxy:1.8.6
+    pambrose/prometheus-proxy:1.8.7
 
 docker run --rm -p 8083:8083 -p 8093:8093 \
     --mount type=bind,source="$(pwd)"/testing/certs,target=/app/testing/certs \
     --mount type=bind,source="$(pwd)"/examples/tls-no-mutual-auth.conf,target=/app/tls-no-mutual-auth.conf \
     --env AGENT_CONFIG=tls-no-mutual-auth.conf \
     --env PROXY_HOSTNAME=mymachine.lan:50440 \
     --name docker-agent \
-    pambrose/prometheus-agent:1.8.6
+    pambrose/prometheus-agent:1.8.7
 ```
 
 **Note:** The `WORKDIR` of the proxy and agent images is `/app`, so make sure 

bin/docker-agent.sh

@@ -3,4 +3,4 @@
 docker run --rm -p 8083:8083 -p 8093:8093 \
   --env AGENT_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
   --env PROXY_HOSTNAME=mymachine.lan \
-  pambrose/prometheus-agent:1.8.6
+  pambrose/prometheus-agent:1.8.7

bin/docker-proxy.sh

@@ -2,4 +2,4 @@
 
 docker run --rm -p 8082:8082 -p 8092:8092 -p 50051:50051 -p 8080:8080 \
   --env PROXY_CONFIG='https://raw.githubusercontent.com/pambrose/prometheus-proxy/master/examples/simple.conf' \
-  pambrose/prometheus-proxy:1.8.6
+  pambrose/prometheus-proxy:1.8.7

build.gradle

@@ -2,15 +2,15 @@ plugins {
     id 'idea'
     id 'java'
     id 'org.jetbrains.kotlin.jvm' version '1.4.10'
-    id 'com.google.protobuf' version '0.8.13'
-    id "com.github.ben-manes.versions" version '0.33.0'
+    id 'com.google.protobuf' version '0.8.14'
+    id "com.github.ben-manes.versions" version '0.36.0'
     id 'com.github.johnrengelman.shadow' version '6.1.0'
     id 'jacoco'
     id 'com.github.kt3k.coveralls' version '2.10.2'
 }
 
 group = 'io.prometheus'
-version = '1.8.6'
+version = '1.8.7'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -153,6 +153,10 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
+//java {
+//    withSourcesJar()
+//}
+
 artifacts {
     archives sourcesJar
 //archives javadocJar
@@ -205,6 +209,8 @@ task proxyJar(type: Jar, dependsOn: shadowJar) {
 test {
     useJUnitPlatform()
 
+    finalizedBy jacocoTestReport
+
     testLogging {
         events "passed", "skipped", "failed", "standardOut", "standardError"
         exceptionFormat "full"

etc/compose/proxy.yml

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

gradle.properties

@@ -6,20 +6,20 @@ org.gradle.parallel=true
 org.gradle.caching=true
 org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 annotation_version=1.3.2
-coroutines_version=1.3.9
-dropwizard_version=4.1.12.1
-gengrpc_version=0.2.0
-grpc_version=1.32.1
+coroutines_version=1.4.2
+dropwizard_version=4.1.16
+gengrpc_version=0.2.1
+grpc_version=1.34.0
 jcommander_version=1.78
 jetty_version=9.4.32.v20200930
 junit_version=5.7.0
-kluent_version=1.61
-ktor_version=1.4.1
+kluent_version=1.64
+ktor_version=1.4.2
 logback_version=1.2.3
 logging_version=2.0.3
 prometheus_version=0.9.0
 protoc_version=3.12.4
 slf4j_version=1.7.30
-typesafe_version=1.4.0
-utils_version=1.4.0
-zipkin_version=5.12.6
+typesafe_version=1.4.1
+utils_version=1.5.0
+zipkin_version=5.12.7

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -0,0 +1,9 @@
+jdk:
+  - openjdk11
+#before_install:
+#  - ./custom_setup.sh
+#install:
+#  - echo "Running a custom install command"
+#  - ./gradlew clean build -xtest publish publishToMavenLocal
+#env:
+#  MYVAR: "custom environment variable"

src/main/kotlin/io/prometheus/Agent.kt

@@ -50,7 +50,7 @@ import kotlin.time.TimeSource.Monotonic
 import kotlin.time.milliseconds
 import kotlin.time.seconds
 
-@Version(version = "1.8.6", date = "10/8/20")
+@Version(version = "1.8.7", date = "12/4/20")
 class Agent(val options: AgentOptions,
             inProcessServerName: String = "",
             testMode: Boolean = false,

src/main/kotlin/io/prometheus/Proxy.kt

@@ -45,7 +45,7 @@ import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import kotlin.time.milliseconds
 
-@Version(version = "1.8.6", date = "10/8/20")
+@Version(version = "1.8.7", date = "12/4/20")
 class Proxy(val options: ProxyOptions,
             proxyHttpPort: Int = options.proxyHttpPort,
             inProcessServerName: String = "",