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

Log tracing #652

Merged
merged 4 commits into from
Aug 23, 2023
Merged

Log tracing #652

merged 4 commits into from
Aug 23, 2023

Conversation

swalchemist
Copy link
Contributor

Log tracing - this changes the UAA log format used in a bosh uaa deployment to include a trace ID and span ID, and adjusts the tests to match.

This should be merged after cloudfoundry/uaa#2446 in order for the tests to pass. See that PR for details about the feature.

[#185000950]

@cf-gitbot
Copy link

We have created an issue in Pivotal Tracker to manage this:

https://www.pivotaltracker.com/story/show/185849184

The labels on this github issue will be updated when the story is started.

@swalchemist swalchemist changed the title 185000950 trace logs Log tracing Aug 17, 2023
@bruce-ricard
Copy link
Contributor

bruce-ricard commented Aug 17, 2023

Do we want to have a separate UAA repo PR for the source code changes, rather than reviewing them from here through the submodule? I find it a bit awkward.

I was the one who bumped the submodule in the uaa-release feature branch, though it was for ease of developer use while working on it, not necessarily for the PR.

edit: I think that we should make a separate commit: it's essentially impossible to comment on the UAA changes.

@swalchemist
Copy link
Contributor Author

Do we want to have a separate UAA repo PR for the source code changes, rather than reviewing them from here through the submodule? I find it a bit awkward.

There is a separate PR for UAA - cloudfoundry/uaa#2446. Committing the submodule change here was probably not helpful, and we shouldn't review specific uaa changes in a uaa-release PR anyway.

@bruce-ricard
Copy link
Contributor

I removed the UAA change from this PR. We now need to merge the UAA one before we merge this one.

scripts/create-dev-release.sh Outdated Show resolved Hide resolved
Copy link
Contributor

@Tallicia Tallicia left a comment

Choose a reason for hiding this comment

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

These commits look extraneous to the PR feature request.

@hsinn0 hsinn0 self-requested a review August 22, 2023 19:51
@swalchemist swalchemist force-pushed the 185000950-trace-logs branch from 5f6b115 to 763d465 Compare August 22, 2023 21:41
@swalchemist
Copy link
Contributor Author

I have removed a giant mess of unnecessary commits from this branch. I'm not aware of any actual code change that this causes, but I'm not sure that nothing changed.

DescribeTable("UAA log format", func(
uaaLogFormat string,
optFiles ...string,
) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd rather not see this kind of reformatting as part of the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hmmm, interesting. For Go, the reformatting is usually automatic and something that's very difficult to suppress. So the code this was changed probably wasn't changed with an IDE.

Copy link
Contributor

Choose a reason for hiding this comment

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

If it's coming from the IDE, and they aren't intended line changes, they can can be unselected.

func getFingerPrint(certdata []byte) (
string,
error,
) {
Copy link
Contributor

Choose a reason for hiding this comment

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

The same. I'd rather not see this kind of reformatting as part of the PR.

@hsinn0 hsinn0 self-requested a review August 23, 2023 00:52
swalchemist and others added 4 commits August 23, 2023 07:56
    * The traceId and spanId are populated by the Brave library.

Co-authored-by: Bruce Ricard <[email protected]>
* Necessary after the test was fixed so that the regex no longer slurps both [] pairs.
Odd that the log4j pattern must be repeated in so many places.
Trying to fix test failure in CI: "./uaa-release_test.go:48:3: undefined: Expect".
@Tallicia Tallicia force-pushed the 185000950-trace-logs branch from 7664adf to 78dabb6 Compare August 23, 2023 12:56
@Tallicia Tallicia merged commit 821c9f1 into develop Aug 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Development

Successfully merging this pull request may close these issues.

6 participants