Skip to content

Commit 1e70990

Browse files
gregturngregturn
committed
Tune metrics
1 parent 4f5e127 commit 1e70990

File tree

12 files changed

+96
-108
lines changed
  • 10/part1/images/src/main/java/com/greglturnquist/learningspringboot/images
  • 5/part2/src/main/java/com/greglturnquist/learningspringboot
  • 6
  • 7
    • part1/images/src/main/java/com/greglturnquist/learningspringboot/images
    • part2/images/src/main/java/com/greglturnquist/learningspringboot/images
    • part3/images/src/main/java/com/greglturnquist/learningspringboot/images
  • 8
    • part1/images/src/main/java/com/greglturnquist/learningspringboot/images
    • part2/images/src/main/java/com/greglturnquist/learningspringboot/images
    • part3/images/src/main/java/com/greglturnquist/learningspringboot/images
  • 9/part1/images/src/main/java/com/greglturnquist/learningspringboot/images

12 files changed

+96
-108
lines changed

‎10/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,14 @@ public Mono<Void> createImage(Flux<FilePart> files,
9999
})
100100
.log("createImage-newfile")
101101
.flatMap(file::transferTo)
102-
.log("createImage-copy");
103-
104-
Mono<Void> countFile = Mono.fromRunnable(() -> {
105-
meterRegistry
106-
.summary("files.uploaded.bytes")
107-
.record(file.headers().getContentLength());
108-
});
109-
110-
return Mono.when(saveDatabaseImage, copyFile, countFile)
102+
.log("createImage-copy")
103+
.then(Mono.fromRunnable(() ->
104+
meterRegistry
105+
.summary("files.uploaded.bytes")
106+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
107+
));
108+
109+
return Mono.when(saveDatabaseImage, copyFile)
111110
.log("createImage-when");
112111
})
113112
.log("createImage-flatMap")

‎5/part2/src/main/java/com/greglturnquist/learningspringboot/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎6/part1/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎6/part2/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎6/part3/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎7/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎7/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎7/part3/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎8/part1/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

‎8/part2/images/src/main/java/com/greglturnquist/learningspringboot/images/ImageService.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,14 @@ public Mono<Void> createImage(Flux<FilePart> files) {
9494
})
9595
.log("createImage-newfile")
9696
.flatMap(file::transferTo)
97-
.log("createImage-copy");
98-
99-
Mono<Void> countFile = Mono.fromRunnable(() -> {
100-
meterRegistry
101-
.summary("files.uploaded.bytes")
102-
.record(file.headers().getContentLength());
103-
});
104-
105-
return Mono.when(saveDatabaseImage, copyFile, countFile)
97+
.log("createImage-copy")
98+
.then(Mono.fromRunnable(() ->
99+
meterRegistry
100+
.summary("files.uploaded.bytes")
101+
.record(Paths.get(UPLOAD_ROOT, file.filename()).toFile().length())
102+
));
103+
104+
return Mono.when(saveDatabaseImage, copyFile)
106105
.log("createImage-when");
107106
})
108107
.log("createImage-flatMap")

0 commit comments

Comments
 (0)