Merge main into aad#1729
Merged
Merged
Conversation
…dence (#1708) * Support explicit operation id/parentId from 2.x * Test
* Prepare for a new beta release * Fix a typo * Reword Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> * Hide super advanced feature. Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Retry webflux 3 times when it's failing * print stack trace when the final retry fails * Reword Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com> Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
* Update OTel * Suppress 2.x request name handler * Remove retry * Suppress CDS Profile endpoint warning in smoke tests * Bump timeout to avoid sporadic failures
* Fix App Map display of unknown dependencies * Add net peer mapping to target also * Add clarifying comment
* Fix agent jar size * Bump version
* Fix 2.x interop of timestamps * Add smoke test * Bump version
* add logprocessor to agent * comments addressed, added smoketest for log processor, fixed bug in telemetryprocessorOpenTelemetryConfigurer * StringBuffer -> StringBuilder * addressing comments * removed lognames, fixed smoke test * replace name with body in log processor, address comments Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
heyams
approved these changes
Jun 8, 2021
heyams
left a comment
Contributor
There was a problem hiding this comment.
👍 do i need to create a new work item for merging statsbeat to AAD?
Member
Author
yes, that would be great |
Merged
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.
Merged these commits:
This commit did not need merging (code no longer exists in aad branch):
Did not merge these commits yet (@heyams):