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

Merge main into aad #1729

Merged
merged 19 commits into from
Jun 8, 2021
Merged

Merge main into aad #1729

merged 19 commits into from
Jun 8, 2021

Conversation

trask
Copy link
Member

@trask trask commented Jun 7, 2021

Merged these commits:

git cherry-pick c499f8a3715d742ab861488d07b630e8f1415a8b #Support agentmain (#1687)git cherry-pick 08104bd2d61d40bc0037bf3d3cd93dc5cedac97f #Fix bug in initialising JFR integration when used with older Java 8 (#1692)
git cherry-pick 59bd6f52d8ef9b1b84096e5d3c45c5ae16c153ce #Use ProfilerEndpoint from connection string (#1694)
git cherry-pick 78d77ce163fe96a13a001c5ff387240557dea4fe #Add test to make sure no non-daemon threads (#1695)
git cherry-pick 5566977dceaee7b62f6b454218b426e63c61333b #Better EventHubs support (#1698)
git cherry-pick 27cfd4be001061ee35254633e4ef676229dda0cd #Reduce spammy error (#1701)
git cherry-pick 9fdc73e6cb6b8a47d28ebdddb580763068ff54b2 #Emit Profiler start/stop events (#1706)
git cherry-pick 0681283d10794e68513eec0f043c45dbbca7dabc #2.x SDK explicit operation id / operation parent id should take precedence (#1708)
git cherry-pick 0e92c0d5064d6872c6b413438881aca220f97229 #Release 3.1.1-BETA.2 (#1709)
git cherry-pick 02898af9be35e6fa1b62bf39662007ec1eb8d3b1 #Better Azure Service Bus support (#1710)
git cherry-pick 747c57d8746f74c6571d932f54cde5eca21053be #Use main as the default branch from now on (#1715)
git cherry-pick 5d6462a53846df9a119ca713c6aced915ad430e0 #Retry webflux tests 3 times when it's failing (#1712)
git cherry-pick 8d54a1bfe7a86eaa2e9ce493e4fd3c8aeb745891 #Update to latest OTel (#1719)
git cherry-pick ea2689e12548bd0d0e309c135ce1c1210728bd4e #Prepare 3.1.1-BETA.3 release (#1723)
git cherry-pick f9d0ef87340bafd036b2980b7b388a5fb7231d35 #Fix App Map display of unknown dependencies (#1716)
git cherry-pick 1697a8f830f4f2971c5e6523de2a7fd3298e8131 #Fix agent jar size (#1724)
git cherry-pick 1ff5d2545402a5ffccdeba78071e2cf93703c0ac #Add roleName to profile metadata (#1725)
git cherry-pick 6cb1274a79906edcdcfc9e747f0d9cb515930e88 #add a unique id for GC events so that events from a single JVM can be grouped (#1721)
git cherry-pick 76e97c816c3a520a1718282e355487d72b818607 #Fix 2.x interop of timestamps (#1726)
git cherry-pick 8c4d65e160c255a73ee96060f38758f1d5126457 #add logprocessor to agent (#1713)

This commit did not need merging (code no longer exists in aad branch):

git cherry-pick ee5a9e33d14659ed5387bbc231e05949f98482d4 #Fix typo in javadoc (#1704)

Did not merge these commits yet (@heyams):

git cherry-pick 9931364a730ea373076b2dda065689ca2453a331 #Statsbeat + smoke test (#1660)
git cherry-pick ec078d50ec8157a6a33bd272a48020ffe3630048 #Fix attach statsbeat duplicates when computer resumes from sleep (#1696)
git cherry-pick ca7b5c30e35b24b2bc95a9c350a99aacabd0b1f9 #Use envelope name as the telemetry name and reduce payload (#1700)
git cherry-pick 7a000d3767629a629ef140e4edeea01551330689 #Truncate exception telemetry's parsedStack when there is a deep stack trace exceeding 65536 bytes (#1702)
git cherry-pick 503842086f4672e7f973958f8c30e37bb4b497bd #Send instrumentation and feature as UTF-8 strings for Statsbeat (#1707)

trask and others added 19 commits June 7, 2021 15:39
…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>
Copy link
Contributor

@heyams heyams left a comment

Choose a reason for hiding this comment

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

👍 do i need to create a new work item for merging statsbeat to AAD?

@heyams heyams merged commit 4b730d0 into aad Jun 8, 2021
@heyams heyams deleted the trask/merge-main-into-aad branch June 8, 2021 01:03
@trask
Copy link
Member Author

trask commented Jun 8, 2021

do i need to create a new work item for merging statsbeat to AAD?

yes, that would be great

@trask trask mentioned this pull request Jun 18, 2021
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.

4 participants