[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/nifi/pull/2397


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[mattyb149]

Github user mattyb149 commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161257145
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -235,6 +251,32 @@ private boolean isFilteringEnabled() {
 
 for (ProvenanceEventRecord provenanceEventRecord : 
provenanceEvents) {
 final String componentId = 
provenanceEventRecord.getComponentId();
+if (!componentIdsExclude.isEmpty()) {
+if (componentIdsExclude.contains(componentId)) {
+continue;
+}
+// If we aren't excluding it based on component ID, 
let's see if this component has a parent process group IDs
+// that is being excluded
+if (componentMapHolder == null) {
+continue;
+}
+final String processGroupId = 
componentMapHolder.getProcessGroupId(componentId, 
provenanceEventRecord.getComponentType());
+if (StringUtils.isEmpty(processGroupId)) {
+continue;
--- End diff --

Good point, this is a copy-paste error, will remove.


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[mattyb149]

Github user mattyb149 commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161256592
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -256,9 +297,15 @@ private boolean isFilteringEnabled() {
 }
 }
 }
+if (!eventTypesExclude.isEmpty() && 
eventTypesExclude.contains(provenanceEventRecord.getEventType())) {
+continue;
--- End diff --

Yes that's a good point, I just co-located them with their inclusionary 
counterparts. Will move them to the top.


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[mattyb149]

Github user mattyb149 commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161256398
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -89,16 +94,26 @@ public void setComponentTypeRegex(final String 
componentTypeRegex) {
 }
 }
 
-public void addTargetEventType(final ProvenanceEventType... types) {
-for (ProvenanceEventType type : types) {
-eventTypes.add(type);
+public void setComponentTypeRegexExclude(final String 
componentTypeRegex) {
+if (!StringUtils.isBlank(componentTypeRegex)) {
+this.componentTypeRegexExclude = 
Pattern.compile(componentTypeRegex);
 }
 }
 
+public void addTargetEventType(final ProvenanceEventType... types) {
+eventTypes.addAll(Arrays.asList(types));
--- End diff --

Nope, I think that was the original code, it only shows up as a diff here 
because I added a method before it. Will change it to use Collections for 
consistency.


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[ijokarumawak]

Github user ijokarumawak commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161131114
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -89,16 +94,26 @@ public void setComponentTypeRegex(final String 
componentTypeRegex) {
 }
 }
 
-public void addTargetEventType(final ProvenanceEventType... types) {
-for (ProvenanceEventType type : types) {
-eventTypes.add(type);
+public void setComponentTypeRegexExclude(final String 
componentTypeRegex) {
+if (!StringUtils.isBlank(componentTypeRegex)) {
+this.componentTypeRegexExclude = 
Pattern.compile(componentTypeRegex);
 }
 }
 
+public void addTargetEventType(final ProvenanceEventType... types) {
+eventTypes.addAll(Arrays.asList(types));
--- End diff --

Trivial, but is there any reason to not use `Collections.addAll` here, as 
addTargetEventTypeExclude does?


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[ijokarumawak]

Github user ijokarumawak commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161132714
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -256,9 +297,15 @@ private boolean isFilteringEnabled() {
 }
 }
 }
+if (!eventTypesExclude.isEmpty() && 
eventTypesExclude.contains(provenanceEventRecord.getEventType())) {
+continue;
--- End diff --

These two, `eventTypesExclude` and `eventTypes` are the most 
computationally cheap conditions. So, these should be done at the beginning, 
before checking ProcessGroup hierarchies. How do you think?


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[ijokarumawak]

Github user ijokarumawak commented on a diff in the pull request:

https://github.com/apache/nifi/pull/2397#discussion_r161131729
  
--- Diff: 
nifi-nar-bundles/nifi-extension-utils/nifi-reporting-utils/src/main/java/org/apache/nifi/reporting/util/provenance/ProvenanceEventConsumer.java
 ---
@@ -235,6 +251,32 @@ private boolean isFilteringEnabled() {
 
 for (ProvenanceEventRecord provenanceEventRecord : 
provenanceEvents) {
 final String componentId = 
provenanceEventRecord.getComponentId();
+if (!componentIdsExclude.isEmpty()) {
+if (componentIdsExclude.contains(componentId)) {
+continue;
+}
+// If we aren't excluding it based on component ID, 
let's see if this component has a parent process group IDs
+// that is being excluded
+if (componentMapHolder == null) {
+continue;
+}
+final String processGroupId = 
componentMapHolder.getProcessGroupId(componentId, 
provenanceEventRecord.getComponentType());
+if (StringUtils.isEmpty(processGroupId)) {
+continue;
--- End diff --

Do we want to skip events if processGroupId is not found for one? We 
probably better to apply the exclude rule if a processGroupId is known, 
different from inclusion rules. Unknown should NOT be filtered out by exclusion 
rules IMO.


---

[GitHub] nifi pull request #2397: NIFI-4768: Add exclusion filters to S2SProvenanceRe...

[mattyb149]

GitHub user mattyb149 opened a pull request:

https://github.com/apache/nifi/pull/2397

NIFI-4768: Add exclusion filters to S2SProvenanceReportingTask

Thank you for submitting a contribution to Apache NiFi.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

### For all changes:
- [x] Is there a JIRA ticket associated with this PR? Is it referenced 
 in the commit message?

- [x] Does your PR title start with NIFI- where  is the JIRA number 
you are trying to resolve? Pay particular attention to the hyphen "-" character.

- [x] Has your PR been rebased against the latest commit within the target 
branch (typically master)?

- [x] Is your initial contribution a single, squashed commit?

### For code changes:
- [x] Have you ensured that the full suite of tests is executed via mvn 
-Pcontrib-check clean install at the root nifi folder?
- [x] Have you written or updated unit tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies 
licensed in a way that is compatible for inclusion under [ASF 
2.0](http://www.apache.org/legal/resolved.html#category-a)? 
- [ ] If applicable, have you updated the LICENSE file, including the main 
LICENSE file under nifi-assembly?
- [ ] If applicable, have you updated the NOTICE file, including the main 
NOTICE file found under nifi-assembly?
- [ ] If adding new Properties, have you added .displayName in addition to 
.name (programmatic access) for each of the new properties?

### For documentation related changes:
- [x] Have you ensured that format looks appropriate for the output in 
which it is rendered?

### Note:
Please ensure that once the PR is submitted, you check travis-ci for build 
issues and submit an update to your PR as soon as possible.


You can merge this pull request into a Git repository by running:

$ git pull https://github.com/mattyb149/nifi NIFI-4768

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/nifi/pull/2397.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #2397


commit 559c33e50cee3dc5e96b8dcb030a9f8464f3db18
Author: Matthew Burgess 
Date:   2018-01-11T20:00:03Z

NIFI-4768: Add exclusion filters to S2SProvenanceReportingTask




---