Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Add ability to granualarly filter events #364

Merged
merged 31 commits into from
Nov 8, 2023
Merged

Add ability to granualarly filter events #364

merged 31 commits into from
Nov 8, 2023

Conversation

sarah-witt
Copy link
Collaborator

What does this PR do?

continuing #353 to support filtering events by event name in addition to filtering by category

Description of the Change

Alternate Designs

Possible Drawbacks

Verification Process

Additional Notes

Release Notes

Review checklist (to be filled by reviewers)

  • Feature or bug fix MUST have appropriate tests (unit, integration, etc...)
  • PR title must be written as a CHANGELOG entry (see why)
  • Files changes must correspond to the primary purpose of the PR as described in the title (small unrelated changes should have their own PR)
  • PR must have one changelog/ label attached. If applicable it should have the backward-incompatible label attached.
  • PR should not have do-not-merge/ label attached.
  • If Applicable, issue must have kind/ and severity/ labels attached at least.

dawitgirm and others added 21 commits June 28, 2023 14:55
@dawitgirm
removed posix-api dependency from pom
70f7165
@dawitgirm
added plugin side filtering functionality and unit test cases
cfa6fd9
@dawitgirm
mainly UI changes and event naming changed
aab6fda
@dawitgirm
added environment variable tests
810c25d
@dawitgirm
removed config changed event, added conflicting fig checks and tests
53a9cd8
@dawitgirm @sarah-witt
Update src/main/java/org/datadog/jenkins/plugins/datadog/DatadogUtili…
7235d92 
…ties.java

Co-authored-by: Sarah Witt <[email protected]>
@dawitgirm @sarah-witt
Update src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGloba…
f6d56c3 
…lConfiguration.java

Co-authored-by: Sarah Witt <[email protected]>
@dawitgirm @sarah-witt
Update src/test/java/org/datadog/jenkins/plugins/datadog/DatadogGloba…
e2da5da 
…lConfigurationTest.java

Co-authored-by: Sarah Witt <[email protected]>
@dawitgirm @sarah-witt
Update src/main/java/org/datadog/jenkins/plugins/datadog/DatadogGloba…
a996fc5 
…lConfiguration.java

Co-authored-by: Sarah Witt <[email protected]>
@dawitgirm
changed naming of utilities check to send event method
d74f9d7
@dawitgirm
removed previously deprecated config change getters and setters
ca2f58f
@dawitgirm
removed event name from class and checking event send method uses nam…
8e80bb1 
…e string rather than event
@dawitgirm
moved inclusion list creation to datadog utilities and adjusted tests…
b2512c7 
… for env variable conflicts
@dawitgirm
renamed config check method in global config
eac0059
@dawitgirm
updated documentation
2921d24
@sarah-witt
Remove explicit check for overlapping filters
16dfed1
@sarah-witt
Resolve conflicts
701d54d
@sarah-witt
Merge branch 'master' into dawit/filter-events
446462b
@sarah-witt
Fix tests to assert error message rather than exception
cf786b2
@sarah-witt
Merge branch 'master' into dawit/filter-events
6b5dda7
@sarah-witt
Update spacing
1eb8e2b
@github-actions github-actions bot added the documentation Documentation related changes label Sep 8, 2023
@sarah-witt sarah-witt marked this pull request as ready for review September 8, 2023 14:16
brett0000FF
brett0000FF approved these changes Sep 8, 2023
View reviewed changes
Copy link
Contributor

@brett0000FF brett0000FF left a comment

Choose a reason for hiding this comment

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

Looks good! I just left a few minor suggestions.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
NouemanKHAL
NouemanKHAL reviewed Sep 8, 2023
View reviewed changes
.gitignore
Comment on lines +11 to +12
docker-compose.yaml
/.vscode/
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is there any specific reason to explicitly ignore these two files?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

the testing documentation recommends creating a docker-compose.yaml file so excluding it from git will prevent unintentional commits with this file, and vscode is a common editor and is ignored in other projects

@NouemanKHAL
Copy link
Collaborator

Looks good overall!
small nit: it would be good to have add a sort of eventName attribute to the classes in order to have something like DatadogUtilities.shouldSendEvent(this.eventName).

@sarah-witt
Copy link
Collaborator Author

sarah-witt commented Sep 8, 2023 •
edited
Loading

small nit: it would be good to have add a sort of eventName attribute to the classes in order to have something like DatadogUtilities.shouldSendEvent(this.eventName).

@NouemanKHAL Good point, we thought about this but then decided it was better to be able to check the event name before creating the event. What do you think of creating static variable for event name in the classes and that way we can still have the property tied to the class but not need to create an instance first? Also while investigating this I found a bug with the shouldSendEvent logic so I fixed that!

@sarah-witt @NouemanKHAL
Update src/main/resources/org/datadog/jenkins/plugins/datadog/Datadog…
4aa491b 
…GlobalConfiguration/config.jelly

Co-authored-by: NouemanKHAL <[email protected]>
@NouemanKHAL
Copy link
Collaborator

@sarah-witt Great! And yes making it static would be perfect 👌

@sarah-witt sarah-witt merged commit 77642c6 into master Nov 8, 2023
15 checks passed
@sarah-witt sarah-witt deleted the sarah/add-event-filters branch November 8, 2023 15:07
@sarah-witt sarah-witt added the changelog/Added Added features results into a minor version bump label Nov 10, 2023
@sarah-witt sarah-witt mentioned this pull request Nov 15, 2023
Merged
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NouemanKHAL NouemanKHAL NouemanKHAL left review comments

@jose-manuel-almaza jose-manuel-almaza jose-manuel-almaza approved these changes

@brett0000FF brett0000FF brett0000FF approved these changes

Assignees
No one assigned
Labels
changelog/Added Added features results into a minor version bump documentation Documentation related changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sarah-witt @NouemanKHAL @brett0000FF @jose-manuel-almaza @dawitgirm