Merge auto-instrumentation code into Datadog.Trace.dll#1443
Merged
Conversation
9e63ba9 to
f3af087
Compare
3466b98 to
7aaf656
Compare
bddf4cc to
04fed8f
Compare
47597bd to
6ca8424
Compare
a90dd38 to
3f0a59d
Compare
lucaspimentel
commented
May 26, 2021
66c2e90 to
07bef5a
Compare
4f2fa21 to
915b6dc
Compare
zacharycmontoya
approved these changes
Jul 28, 2021
zacharycmontoya
left a comment
Contributor
There was a problem hiding this comment.
LGTM! Left a couple of comments
…d.Core, Datadog.Trace.AspNet, and Datadog.Trace.Ci.Shared into Datadog.Trace
Co-authored-by: Andrew Lock <andrew.lock@datadoghq.com>
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
4 participants
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.
I recommend looking at this PR one commit at a time. They are batched into big changes: move files, delete files, upgrade projects and pipelines, fix regressions, add tests, etc)
Goals
internalAPIs from becoming breaking changes when applications mix different versions of the installers and nuget packagesinternalAPIsChanges
Merge the following projects into the
Datadog.Traceproject:Datadog.Trace.ClrProfiler.ManagedDatadog.Trace.ClrProfiler.Managed.CoreDatadog.Trace.AspNet(note: we are leaving an emptyDatadog.Trace.AspNet.dllwith type-forwarding for backwards compatibility)Datadog.Trace.Ci.SharedThis PR moves all code files below, while keeping the same namespaces to avoid changing type names.
src/Datadog.Trace.ClrProfiler.Managedsrc/Datadog.Trace/ClrProfilerDatadog.Trace.ClrProfilersrc/Datadog.Trace.ClrProfiler.Managed.Coresrc/Datadog.Trace/ClrProfilerDatadog.Trace.ClrProfilersrc/Datadog.Trace.AspNetsrc/Datadog.Trace/AspNetDatadog.Trace.AspNetsrc/Datadog.Trace.Ci.Sharedsrc/Datadog.Trace/CiDatadog.Trace.CiOther changes to fix regressions caused by changes in this PR:
GenerateIntegrationDefinitions: ignore types that cannot be loaded. In particular,TracingHttpModuleinherits fromIHttpModule, which is not available to the nuke builds because they run onnet5.0. (8ff2bd9)Datadog.Trace.dllfrom native C++ code (6aa89f9)Test results
I added some test apps and script to
/test/test-applications/regression/MismatchedTracerVersions(link). The scripts can build multiple tracer versions with a single command, and run one of the apps by loading the specific tracer home version and nuget version.For test results, see testing_results.md.
master, since this PR's branch was deleted/tracerfolder