model: introduce APMEvent; Batch is now []model.APMEvent #5613
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Introduce APMEvent, a sort of discriminated union of all
possible APM event types.
In the future we will define module types in protobuf and
generate the Go code. The APMEvent type will evolve to map
directly to the Elasticsearch docs we produce, along these
lines:
```
message APMEvent {
google.protobuf.Timestamp timestamp = 1;
Event event = 2;
Trace trace = 3;
Transaction transaction = 4;
Span span = 5;
Metricset metricset = 6;
Parent parent = 7;
Agent agent = 8;
Client client = 9;
Cloud cloud = 10;
Container container = 11;
Host host = 12;
Kubernetes kubernetes = 13;
map<string, LabelValue> labels = 14;
Process process = 15;
Service service = 16;
Session session = 17;
User user = 18;
UserAgent user_agent = 19;
HTTP http = 20;
URL url = 21;
Child child = 22;
Error error = 23;
}
```
When we do that, we'll be moving common fields (e.g. service details,
labels) to APMEvent, and out of the specific event objects.
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
Order of events changed: they're once again reported in the order received.
|
/test |
stuartnelson3
approved these changes
Jul 6, 2021
mergify bot
pushed a commit
that referenced
this pull request
Jul 7, 2021
* model: introduce APMEvent; Batch is now []APMEvent
Introduce APMEvent, a sort of discriminated union of all
possible APM event types.
In the future we will define module types in protobuf and
generate the Go code. The APMEvent type will evolve to map
directly to the Elasticsearch docs we produce, along these
lines:
```
message APMEvent {
google.protobuf.Timestamp timestamp = 1;
Event event = 2;
Trace trace = 3;
Transaction transaction = 4;
Span span = 5;
Metricset metricset = 6;
Parent parent = 7;
Agent agent = 8;
Client client = 9;
Cloud cloud = 10;
Container container = 11;
Host host = 12;
Kubernetes kubernetes = 13;
map<string, LabelValue> labels = 14;
Process process = 15;
Service service = 16;
Session session = 17;
User user = 18;
UserAgent user_agent = 19;
HTTP http = 20;
URL url = 21;
Child child = 22;
Error error = 23;
}
```
When we do that, we'll be moving common fields (e.g. service details,
labels) to APMEvent, and out of the specific event objects.
* Adapt code to model.Batch changes
* Update approvals
Order of events changed: they're once again reported in the order received.
(cherry picked from commit 0661ad0)
axw
added a commit
that referenced
this pull request
Jul 7, 2021
* model: introduce APMEvent; Batch is now []APMEvent
Introduce APMEvent, a sort of discriminated union of all
possible APM event types.
In the future we will define module types in protobuf and
generate the Go code. The APMEvent type will evolve to map
directly to the Elasticsearch docs we produce, along these
lines:
```
message APMEvent {
google.protobuf.Timestamp timestamp = 1;
Event event = 2;
Trace trace = 3;
Transaction transaction = 4;
Span span = 5;
Metricset metricset = 6;
Parent parent = 7;
Agent agent = 8;
Client client = 9;
Cloud cloud = 10;
Container container = 11;
Host host = 12;
Kubernetes kubernetes = 13;
map<string, LabelValue> labels = 14;
Process process = 15;
Service service = 16;
Session session = 17;
User user = 18;
UserAgent user_agent = 19;
HTTP http = 20;
URL url = 21;
Child child = 22;
Error error = 23;
}
```
When we do that, we'll be moving common fields (e.g. service details,
labels) to APMEvent, and out of the specific event objects.
* Adapt code to model.Batch changes
* Update approvals
Order of events changed: they're once again reported in the order received.
(cherry picked from commit 0661ad0)
Co-authored-by: Andrew Wilkins <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
Introduce model.APMEvent, a sort of discriminated union of all possible APM event types. In the future I intend to define model types in protobuf and generate the Go code. The APMEvent type will evolve to map directly to the Elasticsearch docs we produce, along these lines:
When we do that, we'll be moving common fields (e.g. service details, labels) to APMEvent, and out of the specific event objects. By moving common fields to this top-level type, we'll be able to generate code for encoding to Beats events.
How to test these changes
N/A, non-functional change.
Related issues
#4120
#4410
#3565