Skip to content

WIP: Updates to use the autoconfig in java-metrics repo #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
objectiser wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Updates to use the autoconfig in java-metrics repo #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0968c5
Updates to use the autoconfig in java-metrics repo
objectiser Jul 28, 2017
326d83f
update
objectiser Aug 14, 2017
1c01725
update
objectiser Aug 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions simple/accountmgr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<prometheus.version>0.0.23</prometheus.version>
<opentracing-contrib-springweb.version>0.0.6</opentracing-contrib-springweb.version>
<opentracing-contrib-springweb.version>0.0.9-SNAPSHOT</opentracing-contrib-springweb.version>
<opentracing-contrib-opentracing-metrics.version>0.1.4-SNAPSHOT</opentracing-contrib-opentracing-metrics.version>
</properties>

<dependencies>
Expand All @@ -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>${opentracing-contrib-opentracing-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>
Expand Down
24 changes: 24 additions & 0 deletions simple/accountmgr/src/main/java/com/example/accountmgr/MetricsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"));
}

}
26 changes: 0 additions & 26 deletions simple/accountmgr/src/main/java/com/example/accountmgr/PrometheusConfiguration.java
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions simple/accountmgr/src/main/java/com/example/accountmgr/TracerConfiguration.java
View file
Open in desktop

This file was deleted.

19 changes: 7 additions & 12 deletions simple/ordermgr/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.9-SNAPSHOT</opentracing-contrib-springweb.version>
<opentracing-contrib-opentracing-metrics.version>0.1.4-SNAPSHOT</opentracing-contrib-opentracing-metrics.version>
</properties>

<dependencies>
Expand All @@ -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>${opentracing-contrib-opentracing-metrics.version}</version>
</dependency>

<dependency>
<groupId>com.uber.jaeger</groupId>
Expand All @@ -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>
Expand Down
24 changes: 24 additions & 0 deletions simple/ordermgr/src/main/java/com/example/ordermgr/MetricsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"));
}

}
26 changes: 0 additions & 26 deletions simple/ordermgr/src/main/java/com/example/ordermgr/PrometheusConfiguration.java
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions simple/ordermgr/src/main/java/com/example/ordermgr/TracerConfiguration.java
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions simple/services-kubernetes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down