Allow ElasticApmStartupHook to work with System.Diagnostics.DiagnosticSource 4 and 5 #1138
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
This commit updates the pack and publish build functions to pack and publish all releasable artifacts.
…cSource 4 and 5 This commit updates the startup hook implementation to allow it to work with applications that are compiled against either System.Diagnostics.DiagnosticSource 4 or 5. Introduce a `UseDiagnosticSourceFour` MSBuild property to Elastic.Apm to conditionally reference System.Diagnostics.DiagnosticSource 4.x.x or 5.x.x. The build agent-zip task uses the property to compile Elastic.Apm against both System.Diagnostics.DiagnosticSource 4.x.x and 5.x.x, and package both into the startup hook zip file. Split the startup hook agent assembly and dependency loading into its own assembly, Elastic.Apm.StartupHook.Loader, compiled against Elastic.Apm, allowing different versions to be compiled for different referenced System.Diagnostics.DiagnosticSource versions. ElasticApmStartupHook now determines if a version of System.Diagnostics.DiagnosticSource is already loaded, using this to determine which version of Elastic.Apm.StartupHook.Loader to load and invoke.
Codecov Report
@@ Coverage Diff @@
## master #1138 +/- ##
===========================================
+ Coverage 49.83% 79.55% +29.71%
===========================================
Files 155 160 +5
Lines 6188 6543 +355
===========================================
+ Hits 3084 5205 +2121
+ Misses 3104 1338 -1766
Continue to review full report at Codecov.
|
💔 Tests Failed
Expand to view the summary
Build stats
Test stats 🧪
Test errors
Expand to view the tests failures
|
|
run tests |
This commit updates the build project pack target to build nuget packages and the zip file for startup hooks. The CI linux scripts are updated to use the build project pack target, requiring them to look in one directory for nuget packages, and allowing them to artifact the zip file.
Remove addition of JunitXml.TestLogger. Added through Directory.Build.props
Without this causes a FileLoadException. Looks to be related to coverlet-coverage/coverlet#449
|
run tests |
Hangs on CI - last successful runs did not build with Release configuration, so trying this.
|
The build target
A similar approach would help with #1073 |
gregkalapos
approved these changes
Jan 20, 2021
|
Will merge this in and follow up with a PR with automated tests. Manually tested with ASP.NET Core 3.1 and ASP.NET 5 |
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.
This commit updates the startup hook implementation to allow it to work with applications that are compiled against either
System.Diagnostics.DiagnosticSource4 or 5.Introduce a
UseDiagnosticSourceFourMSBuild property to Elastic.Apm to conditionally referenceSystem.Diagnostics.DiagnosticSource4.x.x or 5.x.x. The build agent-zip task uses the property to compile Elastic.Apm against both System.Diagnostics.DiagnosticSource 4.x.x and 5.x.x, and package both into the startup hook zip file.Split the startup hook agent assembly and dependency loading into its own assembly,
Elastic.Apm.StartupHook.Loader, compiled against Elastic.Apm, allowing different versions to be compiled for different referencedSystem.Diagnostics.DiagnosticSourceversions.ElasticApmStartupHooknow determines if a version ofSystem.Diagnostics.DiagnosticSourceis already loaded, using this to determine which version ofElastic.Apm.StartupHook.Loaderto load and invoke.Update the build project
packtarget to build nuget packages and the zip file for startup hooks, and update CI linux scripts to use the build projectpacktarget. This change requires the CI scripts to look in one directory for nuget packages, and allows artifacting the zip file.Closes #1072
Closes #1134