diff --git a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ExcludeFilters.java b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ExcludeFilters.java index 862edd30a..451823373 100644 --- a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ExcludeFilters.java +++ b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ExcludeFilters.java @@ -6,16 +6,17 @@ package io.opentelemetry.ibm.mq.config; import io.opentelemetry.ibm.mq.metricscollector.FilterType; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.HashSet; +import java.util.List; import java.util.Set; /** A jackson databind class used for config. */ public final class ExcludeFilters { private String type = "UNKNOWN"; - private Set values = new HashSet<>(); + private List values = new ArrayList<>(); public String getType() { return type; @@ -25,12 +26,12 @@ public void setType(String type) { this.type = type; } - public Set getValues() { - return Collections.unmodifiableSet(values); + public List getValues() { + return Collections.unmodifiableList(values); } public void setValues(Set values) { - this.values = new HashSet<>(values); + this.values = new ArrayList<>(values); } public static boolean isExcluded(String resourceName, Collection excludeFilters) { diff --git a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ResourceFilters.java b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ResourceFilters.java index 2d8579786..adeebc250 100644 --- a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ResourceFilters.java +++ b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/config/ResourceFilters.java @@ -5,14 +5,16 @@ package io.opentelemetry.ibm.mq.config; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; /** Include and exclude filters for IBM MQ resource names. */ public final class ResourceFilters { private Set include = new HashSet<>(); - private Set exclude = new HashSet<>(); + private List exclude = new ArrayList<>(); public Set getInclude() { return include; @@ -22,11 +24,11 @@ public void setInclude(Set include) { this.include = include; } - public Set getExclude() { + public List getExclude() { return exclude; } - public void setExclude(Set exclude) { + public void setExclude(List exclude) { this.exclude = exclude; } } diff --git a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/InquireQCmdCollector.java b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/InquireQCmdCollector.java index 16164b46d..5bdd16019 100644 --- a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/InquireQCmdCollector.java +++ b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/InquireQCmdCollector.java @@ -8,6 +8,7 @@ import com.ibm.mq.constants.CMQC; import com.ibm.mq.constants.CMQCFC; import com.ibm.mq.headers.pcf.PCFMessage; +import io.opentelemetry.ibm.mq.config.ExcludeFilters; import java.util.Arrays; import java.util.Set; import java.util.function.Consumer; @@ -55,6 +56,44 @@ public void accept(MetricsCollectorContext context) { PCFMessage request = new PCFMessage(CMQCFC.MQCMD_INQUIRE_Q); request.addParameter(CMQC.MQCA_Q_NAME, queueGenericName); request.addParameter(CMQC.MQIA_Q_TYPE, CMQC.MQQT_ALL); + + // take the first filter, and apply it, as we can only apply one filter. + if (!context.getQueueExcludeFilters().isEmpty()) { + ExcludeFilters filter = context.getQueueExcludeFilters().iterator().next(); + if ((!filter.getValues().isEmpty()) + && (FilterType.valueOf(filter.getType()) != FilterType.NONE)) { + + String value = filter.getValues().get(0); + int op = 0; + switch (FilterType.valueOf(filter.getType())) { + case STARTSWITH: + op = CMQCFC.MQCFOP_NOT_LIKE; + break; + case EQUALS: + op = CMQCFC.MQCFOP_NOT_EQUAL; + break; + case ENDSWITH: + op = CMQCFC.MQCFOP_NOT_LIKE; + if (!value.startsWith("*")) { + value = "*" + value; + } + break; + case CONTAINS: + op = CMQCFC.MQCFOP_NOT_LIKE; + if (!value.startsWith("*")) { + value = "*" + value; + } + if (!value.endsWith("*")) { + value += "*"; + } + break; + case NONE: + logger.warn("Invalid type of filter {}", filter.getType()); + continue; + } + request.addFilterParameter(CMQC.MQCA_Q_NAME, op, value); + } + } request.addParameter(CMQCFC.MQIACF_Q_ATTRS, ATTRIBUTES); queueBuddy.processPcfRequestAndPublishQMetrics( diff --git a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MessageFilter.java b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MessageFilter.java index 531c217b0..74f788850 100644 --- a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MessageFilter.java +++ b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MessageFilter.java @@ -11,9 +11,7 @@ import io.opentelemetry.ibm.mq.config.ExcludeFilters; import java.util.ArrayList; import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,15 +51,15 @@ public List filter(List messages) throws PCFException { static class MessageFilterBuilder { private final String kind; - private Set filters = new HashSet<>(); + private List filters = new ArrayList<>(); public MessageFilterBuilder(String kind) { this.kind = kind; } @CanIgnoreReturnValue - public MessageFilterBuilder excluding(Set filters) { - this.filters = new HashSet<>(filters); + public MessageFilterBuilder excluding(List filters) { + this.filters = new ArrayList<>(filters); return this; } diff --git a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MetricsCollectorContext.java b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MetricsCollectorContext.java index dab85748e..31e82c702 100644 --- a/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MetricsCollectorContext.java +++ b/ibm-mq-metrics/src/main/java/io/opentelemetry/ibm/mq/metricscollector/MetricsCollectorContext.java @@ -49,7 +49,7 @@ Set getChannelIncludeFilterNames() { return queueManager.getChannelFilters().getInclude(); } - Set getChannelExcludeFilters() { + List getChannelExcludeFilters() { return queueManager.getChannelFilters().getExclude(); } @@ -57,7 +57,7 @@ Set getListenerIncludeFilterNames() { return queueManager.getListenerFilters().getInclude(); } - Set getListenerExcludeFilters() { + List getListenerExcludeFilters() { return queueManager.getListenerFilters().getExclude(); } @@ -65,7 +65,7 @@ Set getTopicIncludeFilterNames() { return queueManager.getTopicFilters().getInclude(); } - Set getTopicExcludeFilters() { + List getTopicExcludeFilters() { return queueManager.getTopicFilters().getExclude(); } @@ -73,7 +73,7 @@ Set getQueueIncludeFilterNames() { return queueManager.getQueueFilters().getInclude(); } - Set getQueueExcludeFilters() { + List getQueueExcludeFilters() { return queueManager.getQueueFilters().getExclude(); }