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.

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

move event code up a level #4381

Merged
merged 3 commits into from
Dec 1, 2021
Merged

move event code up a level #4381

merged 3 commits into from
Dec 1, 2021

Conversation

nathaniel-may
Copy link
Contributor

Description

code was previously under data. but I think it makes more sense at the top level.

Checklist

  • I have signed the CLA
  • I have run this code in development and it appears to resolve the stated issue
  • This PR includes tests, or tests are not required/relevant for this PR
  • I have updated the CHANGELOG.md and added information about my change

@cla-bot cla-bot bot added the cla:yes label Dec 1, 2021
@nathaniel-may nathaniel-may requested review from emmyoop, jtcohen6, leahwicz, iknox-fa and gshank and removed request for emmyoop December 1, 2021 21:03
@emmyoop
Copy link
Member

emmyoop commented Dec 1, 2021

This makes a lot of sense but do we want to also pull out the NodeInfo from data as well? Not sure there's value in duplicating it.

@nathaniel-may
Copy link
Contributor Author

@emmyoop I'm only seeing node info once at the top level already. Where are you seeing it duplicated?

example from a run I just did:

{
  "code": "Z042",
  "data": {},
  "invocation_id": "05a5ac50-eb4d-44ea-9928-7c2a67396788",
  "level": "debug",
  "log_version": 1,
  "msg": "Flushing usage events",
  "node_info": {},
  "pid": 48311,
  "thread_name": "MainThread",
  "ts": "2021-12-01T16:11:30.643316",
  "type": "log_line"
}

@emmyoop
Copy link
Member

emmyoop commented Dec 1, 2021

report_node_data ends up in data which is what we use to build node_info. You'll only see it for events with non empty node_info.

I should have said we should skip report_node_data in data.

@nathaniel-may
Copy link
Contributor Author

Ahh I see. I just added the ignore for it.

Copy link
Member

@emmyoop emmyoop left a comment

Choose a reason for hiding this comment

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

Look good!

@nathaniel-may nathaniel-may merged commit 41ed976 into main Dec 1, 2021
@nathaniel-may nathaniel-may deleted the nate/move-code-up branch December 1, 2021 22:30
leahwicz pushed a commit that referenced this pull request Dec 2, 2021
move event code up a level plus minor fixes
leahwicz added a commit that referenced this pull request Dec 2, 2021
move event code up a level plus minor fixes

Co-authored-by: Nathaniel May <[email protected]>
iknox-fa pushed a commit that referenced this pull request Feb 8, 2022
move event code up a level plus minor fixes

automatic commit by git-black, original commits:
  41ed976
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants