Add event message #47

MoonBow-1 · 2025-08-25T12:47:00Z

A smaller PR from #15, which brings the EventMessage related classes.

Tested using the JMeter test plan
Does not fix the setters that are used in HttpEventData

kortemik

will re-review once comments are fixed

src/main/java/com/teragrep/cfe_16/event/EventMessageStub.java

src/test/java/com/teragrep/cfe_16/event/EventMessageImplTest.java

src/test/java/com/teragrep/cfe_16/event/EventMessageStubTest.java

src/main/java/com/teragrep/cfe_16/EventManager.java

Laukkala

Only real issue I found was with the fact that Exceptions might not get logged if Response.body() is not called for some reason. Currently it seems that body() is being called eventually, but it might cause problems later on if another developer forgets to call it after receiving a Response. I would suggest separating the responsibility of writing to logs to another object, and leave the responsibility of generating the user-facing message as it is.

src/main/java/com/teragrep/cfe_16/response/Response.java

src/main/java/com/teragrep/cfe_16/response/ExceptionJsonResponse.java

Laukkala

With the changes to logging, this looks good to me once review comments from other reviewers have been resolved

src/main/java/com/teragrep/cfe_16/response/ExceptionJsonResponse.java

src/main/java/com/teragrep/cfe_16/response/ExceptionEvent.java

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java

src/main/java/com/teragrep/cfe_16/event/JsonEvent.java

src/main/java/com/teragrep/cfe_16/EventManager.java

src/main/java/com/teragrep/cfe_16/rest/HECRestController.java

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java

MoonBow-1 · 2025-09-10T13:45:46Z

I'll remove the HttpStatus fields from Responses tomorrow, and look into refactoring the contentType() method found in Response implementations, since now the application returns ResponseEntity<JsonNode> instead of String.

This is because of how Spring Boot handles response codes

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java

- Adds equalsVerifier to project dependencies

…l or not an JSON object - Does not throw an exception anymore

…an id field for it

- Now uses ExceptionEventContext for the data - toString() methods implemented for XForwarded* objects - equals() and hashCode() methods implemented for Xforwarded*Stubs

…nstead of IllegalStateException

…d catch it in HECServiceImpl.sendEvents

…nd there - Response code can now be set by each Response type - Integration Test tests that a failed request returns response code 400 and the correct response message and an id field - Status and Application types can be removed from the Response implementations

…ponseEntities - This has removed the status fields from all Response implementations - ResponseEntities contain the status code and content type

…ntMessage

- These requests are supposed to fail

src/main/java/com/teragrep/cfe_16/EventManager.java

src/main/java/com/teragrep/cfe_16/response/AcknowledgedJsonResponse.java

src/main/java/com/teragrep/cfe_16/response/ExceptionJsonResponse.java

src/main/java/com/teragrep/cfe_16/rest/HECRestController.java

src/main/java/com/teragrep/cfe_16/service/HECServiceImpl.java

eemhu · 2025-10-14T06:43:31Z

otherwise ok

…onNodeResponseEntity

…odeResponseEntity

MoonBow-1 requested a review from kortemik August 25, 2025 12:47

MoonBow-1 self-assigned this Aug 25, 2025

MoonBow-1 added the review label Aug 26, 2025

kortemik requested changes Aug 26, 2025

View reviewed changes

MoonBow-1 removed the review label Aug 27, 2025

Laukkala requested changes Aug 28, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/response/Response.java Outdated Show resolved Hide resolved

src/main/java/com/teragrep/cfe_16/response/ExceptionJsonResponse.java Outdated Show resolved Hide resolved

MoonBow-1 added the review label Sep 1, 2025

Laukkala approved these changes Sep 1, 2025

View reviewed changes

MoonBow-1 requested a review from kortemik September 1, 2025 06:55

kortemik requested changes Sep 5, 2025

View reviewed changes

kortemik requested a review from eemhu September 5, 2025 12:31

p000010u removed the review label Sep 5, 2025

kortemik reviewed Sep 8, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java Outdated Show resolved Hide resolved

MoonBow-1 mentioned this pull request Sep 10, 2025

Refactor RequestBodyCleaner #48

Open

kortemik requested changes Sep 12, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java Outdated Show resolved Hide resolved

MoonBow-1 added the review label Sep 15, 2025

kortemik requested changes Sep 24, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/event/JsonEventImpl.java Show resolved Hide resolved

MoonBow-1 added 12 commits September 25, 2025 16:59

Cherry-pick EventMessage objects fron fix-mocking branch

747eb28

Use EventMessage in EventManager

43ed183

Cherry-pick pom.xml and cfe-16-test-plan.jmx from fix-mocking branch

b4c11cc

Make variables final in EventMessageImpl

9a1eb5c

Make variables final in EventMessageStub

b4ebea9

Make variables final in JsonEventImpl

774df2c

Fix unit test names and add one test for JsonEventImpl

25f30de

Fix test server port in ServiceAndEventManagerIT

94d1339

Remove redundant code from EventManager.convertData

2e1dc7b

Fix broken test due to changed test server port

c844bc7

Fix hashCode and equals methods for EventMessageStub

9201189

Add equalsVerifier test to EventMessageStubTest

c6d1f26

- Adds equalsVerifier to project dependencies

MoonBow-1 added 14 commits September 25, 2025 17:00

Make JsonEventImpl.asPayloadJsonNode return an empty Node if it's nul…

8008353

…l or not an JSON object - Does not throw an exception anymore

Rename JsonEvent.asTimeNode() tp JsonEvent.asTimeJsonNode()

1e6861f

Remove chained method calls in EventManager.convertData

9a5fa93

Remove UUID from ExceptionJsonResponse.asJsonString message, and add …

c797c32

…an id field for it

Fix missing request field from ExceptionEvent

1c7d72c

Log additional information from ExceptionEvent.logException

62888c1

- Now uses ExceptionEventContext for the data - toString() methods implemented for XForwarded* objects - equals() and hashCode() methods implemented for Xforwarded*Stubs

Make JsonEventImpl.asPayloadJsonNode throw IllegalArgumentException i…

9948db9

…nstead of IllegalStateException

Make EventManager.convertData throw an Exception if parsing fails, an…

0b0cb50

…d catch it in HECServiceImpl.sendEvents

Status and application methods removed from Response and added to Res…

751a15c

…ponseEntities - This has removed the status fields from all Response implementations - ResponseEntities contain the status code and content type

Update Jmeter test plan

4263a47

Throw an Exception instead of returning Stub from JsonEventImpl.asEve…

49f8712

…ntMessage

Add integration test for events that are integers

b1abb1d

- These requests are supposed to fail

Add guard clause for JsonEvent.asTimeJsonNode

3ccdf30

MoonBow-1 force-pushed the add-event-message branch from 8c0a771 to 3ccdf30 Compare September 25, 2025 14:01

kortemik approved these changes Sep 25, 2025

View reviewed changes

eemhu reviewed Oct 13, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/EventManager.java Outdated Show resolved Hide resolved

eemhu reviewed Oct 13, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/response/AcknowledgedJsonResponse.java Outdated Show resolved Hide resolved

eemhu reviewed Oct 14, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/response/ExceptionJsonResponse.java Outdated Show resolved Hide resolved

eemhu reviewed Oct 14, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/rest/HECRestController.java Outdated Show resolved Hide resolved

eemhu reviewed Oct 14, 2025

View reviewed changes

src/main/java/com/teragrep/cfe_16/service/HECServiceImpl.java Outdated Show resolved Hide resolved

MoonBow-1 added 5 commits October 14, 2025 13:17

Use single return statement for EventManager.convertData

661e6e3

Use single return statement for HECServiceImpl.sendEvents

198283e

Specify MediaType for all HECRestController.sendEvents

c4428e6

Use exact object type for a variable in AcknowledgedJsonResponse.asJs…

acd93b9

…onNodeResponseEntity

Use exact object type for a variable in ExceptionJsonResponse.asJsonN…

66342aa

…odeResponseEntity

MoonBow-1 requested a review from eemhu October 14, 2025 10:24

eemhu approved these changes Oct 14, 2025

View reviewed changes

kortemik merged commit 8d70c2e into teragrep:master Nov 11, 2025
1 check passed

Add event message #47

Add event message #47

Uh oh!

Conversation

MoonBow-1 commented Aug 25, 2025

Uh oh!

kortemik left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Laukkala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Laukkala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MoonBow-1 commented Sep 10, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

eemhu commented Oct 14, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants