Skip to content

Commit d41b99c

Browse files
author
Sina Kashipazha
committed
Moved to commons.lang3 as a default string lib.
1 parent 7a897d3 commit d41b99c

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import com.cloud.storage.Volume;
6161
import com.cloud.storage.VolumeVO;
6262
import com.cloud.storage.dao.VolumeDao;
63-
import com.cloud.utils.StringUtils;
63+
import org.apache.commons.lang3.StringUtils;
6464
import com.cloud.utils.Ternary;
6565
import com.cloud.utils.component.Manager;
6666
import com.cloud.utils.component.ManagerBase;
@@ -536,7 +536,7 @@ public ItemHost(final String zn, final String zu, final String st, int cnt, fina
536536

537537
@Override
538538
public String toMetricsString() {
539-
if (! Strings.isNullOrEmpty(hosttags)) {
539+
if (StringUtils.isNotEmpty(hosttags)) {
540540
name = "cloudstack_hosts_total_by_tag";
541541
return String.format("%s{zone=\"%s\",filter=\"%s\",tags=\"%s\"} %d", name, zoneName, state, hosttags, total);
542542
}
@@ -573,7 +573,7 @@ public ItemVMCore(final String zn, final String zu, final String hn, final Strin
573573
@Override
574574
public String toMetricsString() {
575575
if (StringUtils.isAllEmpty(hostName, ip)) {
576-
if (Strings.isNullOrEmpty(hosttags)) {
576+
if (StringUtils.isEmpty(hosttags)) {
577577
return String.format("%s{zone=\"%s\",filter=\"%s\"} %d", name, zoneName, filter, core);
578578
} else {
579579
name = "cloudstack_host_vms_cores_total_by_tag";
@@ -613,7 +613,7 @@ public ItemHostCpu(final String zn, final String zu, final String hn, final Stri
613613
@Override
614614
public String toMetricsString() {
615615
if (StringUtils.isAllEmpty(hostName, ip)) {
616-
if (Strings.isNullOrEmpty(hosttags)) {
616+
if (StringUtils.isEmpty(hosttags)) {
617617
return String.format("%s{zone=\"%s\",filter=\"%s\"} %.2f", name, zoneName, filter, mhertz);
618618
} else {
619619
name = "cloudstack_host_cpu_usage_mhz_total_by_tag";
@@ -653,7 +653,7 @@ public ItemHostMemory(final String zn, final String zu, final String hn, final S
653653
@Override
654654
public String toMetricsString() {
655655
if (StringUtils.isAllEmpty(hostName, ip)) {
656-
if (Strings.isNullOrEmpty(hosttags)) {
656+
if (StringUtils.isEmpty(hosttags)) {
657657
return String.format("%s{zone=\"%s\",filter=\"%s\"} %.2f", name, zoneName, filter, miBytes);
658658
} else {
659659
name = "cloudstack_host_memory_usage_mibs_total_by_tag";

0 commit comments

Comments
 (0)