SpringCloud/stream-applications
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Micrometer tracing

Browse Source 
* Add Micrometer Tracing libs

Adds the required dependencies for Micrometer Tracing w/ the
Brave bridge reporting to Wavefront or Zipkin.

Resolves #553

* Add convenience script for build all w/o tests

* Update to Prometheus Rsocket 2.0.0-M1

* Remove prometheus-rsocket-client dependency

It is already brought in transitively via prometheus-rsocket-spring.

* Disable tracing for Wavefront and Zipkin by default
This commit is contained in:
Chris Bono
2024-09-04 13:02:25 -05:00
committed by GitHub
parent 935b0564bc
commit 726d7cd021
3 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.adoc
View File

@@ -148,6 +148,14 @@ This will build and test / integration test all the modules.
./full-build-test.sh
....
==== Boil the Ocean (sans tests)
This will build all the modules (including apps) but skip tests.
....
./full-build-no-test.sh
....
==== Core
This will build the core functionality and all functions.

52
applications/stream-applications-core/pom.xml
View File

@@ -18,7 +18,7 @@
<properties>
<stream-apps-core.version>5.0.1-SNAPSHOT</stream-apps-core.version>
<java-functions.version>5.0.1-SNAPSHOT</java-functions.version>
<prometheus-rsocket.version>1.5.2</prometheus-rsocket.version>
<prometheus-rsocket.version>2.0.0-M1</prometheus-rsocket.version>
<spring-cloud-dataflow-apps-generator-plugin.version>1.0.14</spring-cloud-dataflow-apps-generator-plugin.version>
<spring-cloud-dataflow-apps-docs-plugin.version>1.0.14</spring-cloud-dataflow-apps-docs-plugin.version>
<spring-cloud-dataflow-apps-metadata-plugin.version>1.0.14</spring-cloud-dataflow-apps-metadata-plugin.version>
@@ -144,28 +144,34 @@
<!-- Disable all meter repositories by default. -->
<management.wavefront.metrics.export.enabled>false</management.wavefront.metrics.export.enabled>
<management.influx.metrics.export.enabled>false</management.influx.metrics.export.enabled>
<management.datadog.metrics.export.enabled>false</management.datadog.metrics.export.enabled>
<management.prometheus.metrics.export.enabled>false</management.prometheus.metrics.export.enabled>
<!-- rsocket proxy still on SB2.7.x naming convention -->
<management.metrics.export.prometheus.rsocket.enabled>false</management.metrics.export.prometheus.rsocket.enabled>
<!-- Add SCDF stream metrics tags. -->
<management.datadog.metrics.export.enabled>false</management.datadog.metrics.export.enabled>
<management.prometheus.metrics.export.enabled>false</management.prometheus.metrics.export.enabled>
<management.prometheus.metrics.export.rsocket.enabled>false</management.prometheus.metrics.export.rsocket.enabled>
<!-- Add SCDF stream metrics tags. -->
<management.metrics.tags.stream.name>"${spring.cloud.dataflow.stream.name:unknown}"</management.metrics.tags.stream.name>
<management.metrics.tags.application.name>"${spring.cloud.dataflow.stream.app.label:unknown}"</management.metrics.tags.application.name>
<management.metrics.tags.application.type>"${spring.cloud.dataflow.stream.app.type:unknown}"</management.metrics.tags.application.type>
<management.metrics.tags.instance.index>"${spring.cloud.stream.instanceIndex:0}"</management.metrics.tags.instance.index>
<management.metrics.tags.application.guid>"${spring.cloud.application.guid:unknown}"</management.metrics.tags.application.guid>
<!-- Wavefront Tracing -->
<wavefront.application.name>"${spring.cloud.dataflow.stream.name:unknown}</wavefront.application.name>
<wavefront.application.service>${spring.cloud.dataflow.stream.app.label:unknown}-${spring.cloud.dataflow.stream.app.type:unknown}"</wavefront.application.service>
<!-- Disable Tracing and all Tracing exporters -->
<management.tracing.enabled>false</management.tracing.enabled>
<management.tracing.sampling.probability>1.0</management.tracing.sampling.probability>
<management.zipkin.tracing.enabled>false</management.zipkin.tracing.enabled>
<management.wavefront.tracing.enabled>false</management.wavefront.tracing.enabled>
</properties>
<metadata>
<mavenPluginVersion>${spring-cloud-dataflow-apps-metadata-plugin.version}</mavenPluginVersion>
</metadata>
<maven>
<dependencyManagement>
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>${prometheus-rsocket.version}</version>
</dependency>
<!-- Temporarily override SC-Fn dependency by giving it the highest precedence since 2020.0.5 release of spring-cloud will not take place until December -->
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -214,17 +220,33 @@
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<artifactId>micrometer-registry-prometheus-simpleclient</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>${prometheus-rsocket.version}</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-wavefront</artifactId>
</dependency>
<!-- Tracing -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-tracing-bridge-brave</artifactId>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-sender-urlconnection</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-tracing-reporter-wavefront</artifactId>
</dependency>
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>

5
full-build-no-test.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/usr/bin/env bash
SCDIR=$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")
SCDIR=$(realpath $SCDIR)
$SCDIR/build-core.sh "-T 0.5C install -Psnapshot -P-integration -DskipTests"
$SCDIR/build-folder.sh ./applications/processor,./applications/sink,./applications/source,./applications/stream-applications-integration-tests,stream-applications-release-train "-T 0.5C install -Psnapshot -P-integration -DskipTests"