Skip to content
This repository was archived by the owner on Aug 20, 2025. It is now read-only.

Conversation

@justinleet
Copy link
Contributor

@justinleet justinleet commented Nov 11, 2019

Contributor Comments

Came out of debugging #1554, and was worth pulling out separately.

I had to add in elasticsearch-rest-high-level-client to metron-elasticsearch-storm since it seems that it was coming from metron-integration-test and indexing and REST both failed to deal with ES properly otherwise.

This seems to reduce the size of metron-elasticsearch-storm jar by ~20M.

Pull Request Checklist

Thank you for submitting a contribution to Apache Metron.
Please refer to our Development Guidelines for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines for complete smoke testing guides.

In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:

For all changes:

  • Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.
  • Does your PR title start with METRON-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 master)?

For code changes:

  • Have you included steps to reproduce the behavior or problem that is being changed or addressed?

  • Have you included steps or a guide to how the change may be verified and tested manually?

  • Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:

    mvn -q clean integration-test install && dev-utilities/build-utils/verify_licenses.sh 
    
  • Have you written or updated unit tests and or integration 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?

  • Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via site-book/target/site/index.html:

    cd site-book
    mvn site
    
  • Have you ensured that any documentation diagrams have been updated, along with their source files, using draw.io? See Metron Development Guidelines for instructions.

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.
It is also recommended that travis-ci is set up for your personal repository such that your branches are built there before submitting a pull request.

@justinleet justinleet mentioned this pull request Nov 11, 2019
11 tasks
@justinleet
Copy link
Contributor Author

Example of jar contents before and after

The resulting jar from this PR, which produces no results:

jar -tf metron-elasticsearch-storm-0.7.2-uber-shaded.jar| grep 'mockito'

From master:

jar -tf metron-elasticsearch-storm-0.7.2-uber-master.jar | grep 'mockito' | head -n 10
org/mockito/
org/mockito/AdditionalAnswers.class
org/mockito/AdditionalAnswers.java
org/mockito/AdditionalMatchers.class
org/mockito/AdditionalMatchers.java
org/mockito/Answers.class
org/mockito/Answers.java
org/mockito/ArgumentCaptor.class
org/mockito/ArgumentCaptor.java
org/mockito/ArgumentMatcher.class

@justinleet
Copy link
Contributor Author

<artifactId>elasticsearch-shaded</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's going on here - were we sneaking in the ES client dep via a transitive dep from the integration tests?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind - I dove into the code before reading your comments ;)

@mmiklavc
Copy link
Contributor

Looks reasonable to me @justinleet, thanks for the fix! +1 by inspection.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants