You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2021/02/08 19:32:59 UTC
[GitHub] [nifi] turcsanyip opened a new pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
turcsanyip opened a new pull request #4813:
URL: https://github.com/apache/nifi/pull/4813
…irectory level logging of [hd]fs_path entities to Atlas
https://issues.apache.org/jira/browse/NIFI-8030
Thank you for submitting a contribution to Apache NiFi.
Please provide a short description of the PR here:
#### Description of PR
_Enables X functionality; fixes bug NIFI-YYYY._
In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:
### For all changes:
- [ ] Is there a JIRA ticket associated with this PR? Is it referenced
in the commit message?
- [ ] Does your PR title start with **NIFI-XXXX** where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically `main`)?
- [ ] Is your initial contribution a single, squashed commit? _Additional commits in response to PR reviewer feedback should be made on this branch and pushed to allow change tracking. Do not `squash` or use `--force` when pushing to allow for clean monitoring of changes._
### For code changes:
- [ ] Have you ensured that the full suite of tests is executed via `mvn -Pcontrib-check clean install` at the root `nifi` folder?
- [ ] Have you written or updated unit tests to verify your changes?
- [ ] Have you verified that the full build is successful on JDK 8?
- [ ] Have you verified that the full build is successful on JDK 11?
- [ ] 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:
- [ ] 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 GitHub Actions CI for build issues and submit an update to your PR as soon as possible.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] Lehel44 commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
Lehel44 commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r572898255
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/StandardAnalysisContext.java
##########
@@ -37,13 +37,15 @@
private final NamespaceResolver namespaceResolver;
private final ProvenanceRepository provenanceRepository;
private final String awsS3ModelVersion;
+ private final FilesystemPathsLevel filesystemPathsLevel;
public StandardAnalysisContext(NiFiFlow nifiFlow, NamespaceResolver namespaceResolver,
- ProvenanceRepository provenanceRepository, String awsS3ModelVersion) {
Review comment:
I think the arguments could be final.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] turcsanyip commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
turcsanyip commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r580266652
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/FilesystemPathsLevel.java
##########
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.atlas.provenance;
+
+public enum FilesystemPathsLevel {
+ File, Directory
Review comment:
done
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/FilePath.java
##########
@@ -56,11 +59,18 @@ public DataSetRefs analyze(AnalysisContext context, ProvenanceEventRecord event)
final String hostname = StringUtils.isEmpty(uriHost) ? InetAddress.getLocalHost().getHostName() : uriHost;
namespace = context.getNamespaceResolver().fromHostNames(hostname);
} catch (UnknownHostException e) {
- logger.warn("Failed to get localhost name due to " + e, e);
+ LOGGER.warn("Failed to get localhost name due to " + e, e);
return null;
}
- final String path = uri.getPath();
+ final String path;
+ if (context.getFilesystemPathsLevel() == FilesystemPathsLevel.Directory) {
+ final String dirPath = StringUtils.substringBeforeLast(uri.getPath(), PATH_SEPARATOR);
+ path = dirPath.isEmpty() ? PATH_SEPARATOR : dirPath;
+ } else {
+ path = uri.getPath();
+ }
+
ref.set(ATTR_NAME, path);
ref.set(ATTR_PATH, path);
Review comment:
done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] Lehel44 commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
Lehel44 commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r572867030
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/FilesystemPathsLevel.java
##########
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.nifi.atlas.provenance;
+
+public enum FilesystemPathsLevel {
+ File, Directory
Review comment:
Could you please rename the constants to be uppercase?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] Lehel44 commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
Lehel44 commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r572870168
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/FilePath.java
##########
@@ -56,11 +59,18 @@ public DataSetRefs analyze(AnalysisContext context, ProvenanceEventRecord event)
final String hostname = StringUtils.isEmpty(uriHost) ? InetAddress.getLocalHost().getHostName() : uriHost;
namespace = context.getNamespaceResolver().fromHostNames(hostname);
} catch (UnknownHostException e) {
- logger.warn("Failed to get localhost name due to " + e, e);
+ LOGGER.warn("Failed to get localhost name due to " + e, e);
return null;
}
- final String path = uri.getPath();
+ final String path;
+ if (context.getFilesystemPathsLevel() == FilesystemPathsLevel.Directory) {
+ final String dirPath = StringUtils.substringBeforeLast(uri.getPath(), PATH_SEPARATOR);
+ path = dirPath.isEmpty() ? PATH_SEPARATOR : dirPath;
+ } else {
+ path = uri.getPath();
+ }
+
ref.set(ATTR_NAME, path);
ref.set(ATTR_PATH, path);
Review comment:
What do you think of extracting these lines to a separate method? The scode fragment is duplicated in HDFSParth:52-61.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] asfgit closed pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #4813:
URL: https://github.com/apache/nifi/pull/4813
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] pvillard31 commented on pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
pvillard31 commented on pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#issuecomment-785941402
+1, merged to main, thanks @turcsanyip and @Lehel44 !
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] Lehel44 commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
Lehel44 commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r572870168
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/FilePath.java
##########
@@ -56,11 +59,18 @@ public DataSetRefs analyze(AnalysisContext context, ProvenanceEventRecord event)
final String hostname = StringUtils.isEmpty(uriHost) ? InetAddress.getLocalHost().getHostName() : uriHost;
namespace = context.getNamespaceResolver().fromHostNames(hostname);
} catch (UnknownHostException e) {
- logger.warn("Failed to get localhost name due to " + e, e);
+ LOGGER.warn("Failed to get localhost name due to " + e, e);
return null;
}
- final String path = uri.getPath();
+ final String path;
+ if (context.getFilesystemPathsLevel() == FilesystemPathsLevel.Directory) {
+ final String dirPath = StringUtils.substringBeforeLast(uri.getPath(), PATH_SEPARATOR);
+ path = dirPath.isEmpty() ? PATH_SEPARATOR : dirPath;
+ } else {
+ path = uri.getPath();
+ }
+
ref.set(ATTR_NAME, path);
ref.set(ATTR_PATH, path);
Review comment:
What do you think of extracting these lines to a separate method? This code fragment is duplicated in HDFSParth:52-61.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] turcsanyip commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
turcsanyip commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r580302386
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/StandardAnalysisContext.java
##########
@@ -37,13 +37,15 @@
private final NamespaceResolver namespaceResolver;
private final ProvenanceRepository provenanceRepository;
private final String awsS3ModelVersion;
+ private final FilesystemPathsLevel filesystemPathsLevel;
public StandardAnalysisContext(NiFiFlow nifiFlow, NamespaceResolver namespaceResolver,
- ProvenanceRepository provenanceRepository, String awsS3ModelVersion) {
Review comment:
In general, I do not prefer using `final` for local variables and parameters. All these variables should be final in most cases and IDEs can mark it automatically if a variable is used in a non final way.
For existing codes I follow the existing pattern in the class/method and only add `final` if it is already used there.
This parameter list does not use `final`-s so I would not add it for the new param either.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [nifi] Lehel44 commented on a change in pull request #4813: NIFI-8030: Added property to ReportLineageToAtlas to configure file/d…
Posted by GitBox <gi...@apache.org>.
Lehel44 commented on a change in pull request #4813:
URL: https://github.com/apache/nifi/pull/4813#discussion_r572870168
##########
File path: nifi-nar-bundles/nifi-atlas-bundle/nifi-atlas-reporting-task/src/main/java/org/apache/nifi/atlas/provenance/analyzer/FilePath.java
##########
@@ -56,11 +59,18 @@ public DataSetRefs analyze(AnalysisContext context, ProvenanceEventRecord event)
final String hostname = StringUtils.isEmpty(uriHost) ? InetAddress.getLocalHost().getHostName() : uriHost;
namespace = context.getNamespaceResolver().fromHostNames(hostname);
} catch (UnknownHostException e) {
- logger.warn("Failed to get localhost name due to " + e, e);
+ LOGGER.warn("Failed to get localhost name due to " + e, e);
return null;
}
- final String path = uri.getPath();
+ final String path;
+ if (context.getFilesystemPathsLevel() == FilesystemPathsLevel.Directory) {
+ final String dirPath = StringUtils.substringBeforeLast(uri.getPath(), PATH_SEPARATOR);
+ path = dirPath.isEmpty() ? PATH_SEPARATOR : dirPath;
+ } else {
+ path = uri.getPath();
+ }
+
ref.set(ATTR_NAME, path);
ref.set(ATTR_PATH, path);
Review comment:
What do you think of extracting these lines to a separate method? This code fragment is duplicated in HDFSPath:52-61.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org