Updates to use the autoconfig in java-metrics repo

Author: objectiser

simple/accountmgr/pom.xml

@@ -24,9 +24,9 @@
 		<java.version>1.8</java.version>
 
 		<jaeger.version>0.20.6</jaeger.version>
-		<java-metrics.version>0.1.1</java-metrics.version>
+		<java-metrics.version>0.1.3</java-metrics.version>
 		<prometheus.version>0.0.23</prometheus.version>
-		<opentracing-contrib-springweb.version>0.0.6</opentracing-contrib-springweb.version>
+		<opentracing-contrib-springweb.version>0.0.7</opentracing-contrib-springweb.version>
 	</properties>
 
 	<dependencies>
@@ -40,43 +40,34 @@
 			<artifactId>opentracing-spring-web-autoconfigure</artifactId>
 			<version>${opentracing-contrib-springweb.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.opentracing.contrib</groupId>
+			<artifactId>opentracing-metrics-prometheus-spring-autoconfigure</artifactId>
+			<version>${java-metrics.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.uber.jaeger</groupId>
 			<artifactId>jaeger-tracerresolver</artifactId>
 			<version>${jaeger.version}</version>
 		</dependency>
 
-		<!-- Hotspot JVM metrics -->
 		<dependency>
 		     <groupId>io.prometheus</groupId>
 		     <artifactId>simpleclient_hotspot</artifactId>
 		     <version>${prometheus.version}</version>
 		</dependency>
-		<!-- Exposition servlet -->
 		<dependency>
 		     <groupId>io.prometheus</groupId>
 		     <artifactId>simpleclient_servlet</artifactId>
 		     <version>${prometheus.version}</version>
 		</dependency>
-		<!-- The client -->
 		<dependency>
 		     <groupId>io.prometheus</groupId>
 		     <artifactId>simpleclient</artifactId>
 		     <version>${prometheus.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>io.opentracing.contrib</groupId>
-			<artifactId>opentracing-metrics</artifactId>
-			<version>${java-metrics.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.opentracing.contrib</groupId>
-			<artifactId>opentracing-metrics-prometheus</artifactId>
-			<version>${java-metrics.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

simple/accountmgr/src/main/java/com/example/accountmgr/MetricsConfiguration.java

@@ -0,0 +1,24 @@
+package com.example.accountmgr;
+
+import org.springframework.context.annotation.Bean;
+
+import io.opentracing.contrib.metrics.MetricLabel;
+import io.opentracing.contrib.metrics.label.BaggageMetricLabel;
+import io.opentracing.contrib.metrics.label.ConstMetricLabel;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MetricsConfiguration {
+
+    @Bean
+    public MetricLabel transactionLabel() {
+        return new BaggageMetricLabel("transaction", "n/a");
+    }
+
+    @Bean
+    public MetricLabel versionLabel() {
+        return new ConstMetricLabel("version", System.getenv("VERSION"));
+    }
+
+}

simple/accountmgr/src/main/java/com/example/accountmgr/PrometheusConfiguration.java

@@ -1,7 +1,6 @@
 package com.example.accountmgr;
 
 import org.springframework.context.annotation.Bean;
-import io.opentracing.contrib.metrics.prometheus.*;
 import java.util.regex.Pattern;
 
 import org.springframework.context.annotation.Configuration;
@@ -11,12 +10,7 @@ public class TracerConfiguration implements javax.servlet.ServletContextListener
 
 	@Bean
 	public io.opentracing.Tracer tracer() {
-		return io.opentracing.contrib.metrics.Metrics.decorate(
-			io.opentracing.contrib.tracerresolver.TracerResolver.resolveTracer(),
-			PrometheusMetricsReporter.newMetricsReporter()
-				.withBaggageLabel("transaction","n/a")
-				.withConstLabel("version", System.getenv("VERSION"))
-				.build());
+		return io.opentracing.contrib.tracerresolver.TracerResolver.resolveTracer();
 	}
 
 	@Override

simple/accountmgr/src/main/java/com/example/accountmgr/TracerConfiguration.java

@@ -26,7 +26,8 @@
 		<jaeger.version>0.20.6</jaeger.version>
 		<java-metrics.version>0.1.1</java-metrics.version>
 		<prometheus.version>0.0.23</prometheus.version>
-		<opentracing-contrib-springweb.version>0.0.6</opentracing-contrib-springweb.version>
+		<opentracing-contrib-springweb.version>0.0.7</opentracing-contrib-springweb.version>
+		<version.opentracing.contrib.opentracing-metrics>0.1.3</version.opentracing.contrib.opentracing-metrics>
 	</properties>
 
 	<dependencies>
@@ -40,6 +41,11 @@
 			<artifactId>opentracing-spring-web-autoconfigure</artifactId>
 			<version>${opentracing-contrib-springweb.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>io.opentracing.contrib</groupId>
+			<artifactId>opentracing-metrics-prometheus-spring-autoconfigure</artifactId>
+			<version>${version.opentracing.contrib.opentracing-metrics}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.uber.jaeger</groupId>
@@ -66,17 +72,6 @@
 		     <version>${prometheus.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>io.opentracing.contrib</groupId>
-			<artifactId>opentracing-metrics</artifactId>
-			<version>${java-metrics.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.opentracing.contrib</groupId>
-			<artifactId>opentracing-metrics-prometheus</artifactId>
-			<version>${java-metrics.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>

simple/ordermgr/pom.xml

@@ -0,0 +1,24 @@
+package com.example.ordermgr;
+
+import org.springframework.context.annotation.Bean;
+
+import io.opentracing.contrib.metrics.MetricLabel;
+import io.opentracing.contrib.metrics.label.BaggageMetricLabel;
+import io.opentracing.contrib.metrics.label.ConstMetricLabel;
+
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class MetricsConfiguration {
+
+    @Bean
+    public MetricLabel transactionLabel() {
+        return new BaggageMetricLabel("transaction", "n/a");
+    }
+
+    @Bean
+    public MetricLabel versionLabel() {
+        return new ConstMetricLabel("version", System.getenv("VERSION"));
+    }
+
+}

simple/ordermgr/src/main/java/com/example/ordermgr/MetricsConfiguration.java

@@ -1,7 +1,6 @@
 package com.example.ordermgr;
 
 import org.springframework.context.annotation.Bean;
-import io.opentracing.contrib.metrics.prometheus.*;
 import java.util.regex.Pattern;
 
 import org.springframework.context.annotation.Configuration;
@@ -11,12 +10,7 @@ public class TracerConfiguration implements javax.servlet.ServletContextListener
 
 	@Bean
 	public io.opentracing.Tracer tracer() {
-		return io.opentracing.contrib.metrics.Metrics.decorate(
-			io.opentracing.contrib.tracerresolver.TracerResolver.resolveTracer(),
-			PrometheusMetricsReporter.newMetricsReporter()
-				.withBaggageLabel("transaction","n/a")
-				.withConstLabel("version", System.getenv("VERSION"))
-				.build());
+		return io.opentracing.contrib.tracerresolver.TracerResolver.resolveTracer();
 	}
 
 	@Override

simple/ordermgr/src/main/java/com/example/ordermgr/PrometheusConfiguration.java

@@ -30,6 +30,8 @@ spec:
             value: "version=${VERSION}"
           - name: ACCOUNTMGR_URL
             value: "http://accountmgr:8080"
+          - name: OPENTRACING_METRICS_EXPORTER_HTTP_PATH
+            value: "/metrics"
 ---
 kind: Service
 apiVersion: v1
@@ -90,6 +92,8 @@ spec:
             value: "true"
           - name: JAEGER_TAGS
             value: "version=${VERSION}"
+          - name: OPENTRACING_METRICS_EXPORTER_HTTP_PATH
+            value: "/metrics"
 ---
 kind: Service
 apiVersion: v1