Merge v1.20 into v1.x #1444
Merged
Merge v1.20 into v1.x #1444
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
…or logs (#1428) * Track servers by host:port instead of serverConnectionId The server's connection ID is unique within the context of a single server and is only reported by MongoDB 4.2+. It should not be used to uniquely identify a server. This reverts recent changes from 50d1db7. * Rename connectionId and add extra fields to EventCollector logs This renames connectionId to server, to avoid ambiguity with serverConnectionId. Additional fields have also been added to the output. Since PHPC 1.19, database name is available on all APM events.
|
Note: the CI failures here are related to #1427, which introduced flaky failures when disabling fail points. |
alcaeus
approved these changes
Sep 24, 2024
|
@jmikola there were a few other flaky tests on evergreen. I kicked the jobs to restart them so we can merge this before releasing. |
Merged
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.
Merge new changes from v1.20 into v1.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v1.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.