Cherry-pick fixes for Java tracer release 1.63.1#7221
Closed
sarahchen6 wants to merge 2 commits into
Closed
Conversation
Contributor
|
|
Contributor
🎉 All green!🧪 All tests passed 🔗 Commit SHA: d285fce | Docs | Datadog PR Page | Give us feedback! |
Contributor
Author
|
1.63.2 has been released! |
This file contains hidden or 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
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
Fix
dd-trace-javarelease1.63.2.dd-trace-javapinssystem-testson release branches so that subsequent patch releases are made off of the samesystem-testsSHA that the corresponding minor was made off of. For the1.63.0minor release, we pinned thesystem-testsSHA to520d79a6eb2522aa90f62d1bae705337f3967d90in DataDog/dd-trace-java#11519.However, between release
1.63.0and1.63.1, failures were introduced and their fixes were made after the pinned SHA. This PR cherry-picks the fixes to the previously pinned SHA so that we can make the1.63.2release.Changes
Cherry-pick fixes made in #7218 and #7122 onto SHA
520d79a6eb2522aa90f62d1bae705337f3967d90.Workflow
🚀 Once your PR is reviewed and the CI green, you can merge it!
🛟 #apm-shared-testing 🛟
Reviewer checklist
tests/ormanifests/is modified ? I have the approval from R&P teambuild-XXX-imagelabel is present