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

Merge pull request #6379 from Adrian Cole 

* gh-6379:
  Improves metrics performance by not guarding map.get
This commit is contained in:
Andy Wilkinson 2016-07-13 08:56:56 +01:00
parent 0792d43a93 38e3b39d3b
commit 8319291efd
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/buffer/BufferCounterService.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -58,8 +58,9 @@ public class BufferCounterService implements CounterService {
} }
private String wrap(String metricName) { private String wrap(String metricName) {
if (this.names.containsKey(metricName)) { String cached = this.names.get(metricName);
return this.names.get(metricName); if (cached != null) {
return cached;
} }
if (metricName.startsWith("counter") || metricName.startsWith("meter")) { if (metricName.startsWith("counter") || metricName.startsWith("meter")) {
return metricName; return metricName;

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/dropwizard/DropwizardMetricServices.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -128,8 +128,9 @@ public class DropwizardMetricServices implements CounterService, GaugeService {
} }
private String wrapName(String metricName, String prefix) { private String wrapName(String metricName, String prefix) {
if (this.names.containsKey(metricName)) { String cached = this.names.get(metricName);
return this.names.get(metricName); if (cached != null) {
return cached;
} }
if (metricName.startsWith(prefix)) { if (metricName.startsWith(prefix)) {
return metricName; return metricName;

7
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/writer/DefaultCounterService.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -55,8 +55,9 @@ public class DefaultCounterService implements CounterService {
} }
private String wrap(String metricName) { private String wrap(String metricName) {
if (this.names.containsKey(metricName)) { String cached = this.names.get(metricName);
return this.names.get(metricName); if (cached != null) {
return cached;
} }
if (metricName.startsWith("counter.") || metricName.startsWith("meter.")) { if (metricName.startsWith("counter.") || metricName.startsWith("meter.")) {
return metricName; return metricName;