Repository navigation
Apply exclude filters when sending the PCF message to query queues #3231
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
atoulme
wants to merge
1
commit into
open-telemetry:main
Choose a base branch
from
atoulme:exclude_filters
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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(); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since you have changed this to a list and area already checking non-empty, you shouldn't be using an iterator here. You can just do |
||
| 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( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems goofy -- why can we only apply one? The
addFilterParameter()method is where the rubber meets the road, and that name suggests you can call it once. Then again, who knows how IBM designed this madness.Is there a reference somewhere that indicates only one filter?