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

Backporting Transition to JSON logging to V1 #1802

Merged
merged 17 commits into from
May 24, 2021
Merged

Conversation

davidmrdavid
Copy link
Contributor

Tackles: #1733
Backports: #1721

Issue describing the changes in this PR

resolves #1733

release_notes.md Outdated Show resolved Hide resolved
@davidmrdavid davidmrdavid marked this pull request as ready for review April 27, 2021 23:45
@davidmrdavid davidmrdavid requested review from ConnorMcMahon, cgillum, amdeel and bachuv and removed request for ConnorMcMahon and cgillum April 27, 2021 23:45
@davidmrdavid
Copy link
Contributor Author

This still needs E2E testing, but I'll complete that prior to a merge

@davidmrdavid
Copy link
Contributor Author

I seem to recall E2E testing this, but it's been a while, so I can do it again. Still, I'd appreciate a conditional approval :)

Copy link
Contributor

@ConnorMcMahon ConnorMcMahon left a comment

Choose a reason for hiding this comment

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

I think we want to filter out the old ones like we do in dev, but double check the version of DurableTask.Core to see if it is the version that has both event sources.

@cgillum
Copy link
Member

cgillum commented May 14, 2021

I'm not sure if this has been covered already in other PR comments, but I noticed that the v1 branch points to an old version of DurableTask.AzureStorage:

<PackageReference Include="Microsoft.Azure.DurableTask.AzureStorage" Version="1.7.7" />

Can we update this to point to the latest (currently 1.8.5)?

@ConnorMcMahon
Copy link
Contributor

@davidmrdavid, we ready to do final validation on this with 1.8.5 of DurableTask.AzureStorage now that #1838 was merged?

@davidmrdavid
Copy link
Contributor Author

@ConnorMcMahon, yes but I'll need to pull in some changes and re-push. I'm responding to feedback in a different PR, but I'll get back to this shortly, I'll send you a re-review request once this PR is ready to be validated once more.

Copy link
Member

@cgillum cgillum left a comment

Choose a reason for hiding this comment

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

No blockers from me - but it's probably best to get a final sign-off from Connor. Just a few small nits than you can ignore plus a question.

"Pid",
"Tid",
};
List<string> keys = json.Properties().Select(p => p.Name).ToList();
Copy link
Member

Choose a reason for hiding this comment

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

nit: HashSet<string> would be more appropriate than List<string>. That or just do json.TryGetValue(expectedKey, out _) and avoid the extra data structure altogether.

file.Add(streamReader.ReadLine());
}

return file.ToArray();
Copy link
Member

Choose a reason for hiding this comment

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

nit: This isn't important for test code, but it would be more efficient just to return file rather than call ToArray() on it (which copies all the elements).

"ProviderName",
"TaskName",
"EventId",
"EventTimestamp",
Copy link
Member

Choose a reason for hiding this comment

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

Probably out of scope for this PR, but with this change (or with changes that preceded it) will we get fractional seconds just like we do with Windows? Not being able to properly sort by timestamps has been killing me when doing debugging on Linux. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah yes, that's killing me as well. Unfortunately, the answer is no, and I explain more about why in here: #1843

Let's use that issue to track and discuss this work-item :)

Copy link
Contributor

@ConnorMcMahon ConnorMcMahon left a comment

Choose a reason for hiding this comment

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

Chris raised some valid minor critiques, other than that, ready to merge.

@davidmrdavid
Copy link
Contributor Author

@cgillum, thank you for your suggestions. I've applied them here, and also in V2 via this PR: #1844

@davidmrdavid
Copy link
Contributor Author

Just e2e tested this again and it works. Merging!

@davidmrdavid davidmrdavid merged commit d9e882e into v1 May 24, 2021
@davidmrdavid davidmrdavid deleted the dajusto/backport-logs branch May 24, 2021 21:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants