SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Task Monitoring Demo to Boot 2.3.1, SpringCloud Hoxton.SR6 and Prometheus RSocket 0.11.0

Browse Source
This commit is contained in:
Christian Tzolov
2020-07-20 14:46:51 +02:00
parent 3fb87c19b9
commit d88a3fc6ec
2 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
View File

@@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.1.RELEASE</version> <version>2.3.1.RELEASE</version> <!-- RS RC7 -->
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>com.example.task</groupId> <groupId>com.example.task</groupId>
@@ -16,9 +16,8 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-cloud.version>Hoxton.RC1</spring-cloud.version> <spring-cloud.version>Hoxton.SR6</spring-cloud.version>
<spring-cloud-task.version>2.2.0.RC1</spring-cloud-task.version> <prometheus-rsocket-spring.version>0.11.0</prometheus-rsocket-spring.version>
<prometheus-rsocket-spring.version>0.9.0</prometheus-rsocket-spring.version>
</properties> </properties>
<dependencies> <dependencies>
@@ -52,22 +51,6 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-task</artifactId> <artifactId>spring-cloud-starter-task</artifactId>
<version>${spring-cloud-task.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-core</artifactId>
<version>${spring-cloud-task.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-batch</artifactId>
<version>${spring-cloud-task.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-task-stream</artifactId>
<version>${spring-cloud-task.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@@ -117,12 +100,19 @@
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>io.micrometer</groupId>
<artifactId>spring-cloud-task-dependencies</artifactId> <artifactId>micrometer-bom</artifactId>
<version>${spring-cloud-task.version}</version> <version>1.5.2</version>
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-task-dependencies</artifactId>-->
<!-- <version>${spring-cloud-task.version}</version>-->
<!-- <type>pom</type>-->
<!-- <scope>import</scope>-->
<!-- </dependency>-->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
@@ -135,7 +125,7 @@
<plugin> <plugin>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>0.31.0</version> <version>0.33.0</version>
<configuration> <configuration>
<images> <images>
<image> <image>

8
monitoring-samples/task-apps/task-demo-metrics-prometheus/src/main/java/com/example/task/taskdemometrics/TaskDemoMetricsApplication.java
View File

@@ -48,9 +48,13 @@ public class TaskDemoMetricsApplication {
public Step step1() { public Step step1() {
return this.stepBuilderFactory.get("step1") return this.stepBuilderFactory.get("step1")
.<Integer, Integer>chunk(10) .<Integer, Integer>chunk(10)
.reader(new ListItemReader<>(IntStream.rangeClosed(0, this.random.nextInt(10000)) .reader(new ListItemReader<>(IntStream.rangeClosed(0, this.random.nextInt(100))
.boxed().collect(Collectors.toList()))) .boxed().collect(Collectors.toList())))
.writer(list -> list.forEach(System.out::println)).build(); .writer(list -> list.forEach(e -> {
if ((e % 100) == 0) {
System.out.println(e);
}
})).build();
} }
@Bean @Bean