root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x 

Closes gh-30125
This commit is contained in:
Moritz Halbritter 2022-03-09 12:10:05 +01:00
parent 069c328075 e84e5174be
commit 16f069ef47
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/prometheus/PrometheusScrapeEndpoint.java
View File

@ -42,8 +42,12 @@ import org.springframework.lang.Nullable;
@WebEndpoint(id = "prometheus") @WebEndpoint(id = "prometheus")
public class PrometheusScrapeEndpoint { public class PrometheusScrapeEndpoint {
private static final int METRICS_SCRAPE_CHARS_EXTRA = 1024;
private final CollectorRegistry collectorRegistry; private final CollectorRegistry collectorRegistry;
private volatile int nextMetricsScrapeSize = 16;
public PrometheusScrapeEndpoint(CollectorRegistry collectorRegistry) { public PrometheusScrapeEndpoint(CollectorRegistry collectorRegistry) {
this.collectorRegistry = collectorRegistry; this.collectorRegistry = collectorRegistry;
} }
@ -51,12 +55,16 @@ public class PrometheusScrapeEndpoint {
@ReadOperation(producesFrom = TextOutputFormat.class) @ReadOperation(producesFrom = TextOutputFormat.class)
public WebEndpointResponse<String> scrape(TextOutputFormat format, @Nullable Set<String> includedNames) { public WebEndpointResponse<String> scrape(TextOutputFormat format, @Nullable Set<String> includedNames) {
try { try {
Writer writer = new StringWriter(); Writer writer = new StringWriter(this.nextMetricsScrapeSize);
Enumeration<MetricFamilySamples> samples = (includedNames != null) Enumeration<MetricFamilySamples> samples = (includedNames != null)
? this.collectorRegistry.filteredMetricFamilySamples(includedNames) ? this.collectorRegistry.filteredMetricFamilySamples(includedNames)
: this.collectorRegistry.metricFamilySamples(); : this.collectorRegistry.metricFamilySamples();
format.write(writer, samples); format.write(writer, samples);
return new WebEndpointResponse<>(writer.toString(), format);
String scrapePage = writer.toString();
this.nextMetricsScrapeSize = scrapePage.length() + METRICS_SCRAPE_CHARS_EXTRA;
return new WebEndpointResponse<>(scrapePage, format);
} }
catch (IOException ex) { catch (IOException ex) {
// This actually never happens since StringWriter doesn't throw an IOException // This actually never happens since StringWriter doesn't throw an IOException