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

FileLoadException: Add Profiler fix #671

Merged
merged 25 commits into from
Mar 11, 2020
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4bd29d9
Add flag managed_profiler_unsafe_to_instrument_domain_neutral to let …
zacharycmontoya Feb 25, 2020
5eaf18f
Instrument System.Web.Compilation.BuildManager.InvokePreStartInitMeth…
zacharycmontoya Feb 26, 2020
443b16f
Create a new `Datadog.Trace.ClrProfiler.Managed.Utilities` project th…
zacharycmontoya Feb 27, 2020
0f73238
Update the GenerateIntegrationDefinitions to be able to take in multi…
zacharycmontoya Feb 27, 2020
06bde92
Move ClrNames and TypeExtensions helpers from Datadog.Trace.ClrProfil…
zacharycmontoya Feb 27, 2020
2577d35
Refactor existing InterceptMethod attributes to explicitly list a Tar…
zacharycmontoya Feb 27, 2020
9fcc2f2
Generate a new enum that specifies what action the profiler should ta…
zacharycmontoya Feb 27, 2020
2da4f18
Move AspNet integration entrypoint to a new assembly Datadog.Trace.Cl…
zacharycmontoya Mar 4, 2020
eccb0a3
Rename base profiler assembly to Datadog.Trace.ClrProfiler.Managed.Core.
zacharycmontoya Mar 4, 2020
6c8df33
Revert TargetMethod requirement in GenerateIntegrationDefinitions.
zacharycmontoya Mar 4, 2020
45ec908
Reduce the diff.
zacharycmontoya Mar 4, 2020
0325e3a
Remove references to InsertLast action.
zacharycmontoya Mar 4, 2020
28a0f4c
Add another check to ensure InsertFirst methods have a void return type.
zacharycmontoya Mar 4, 2020
bd2bf34
Always set managed_profiler_unsafe_to_instrument_domain_neutral to fa…
zacharycmontoya Mar 5, 2020
7d2169b
Full stop, do not instrument domain-neutral assemblies. This will cur…
zacharycmontoya Mar 6, 2020
2f73ab5
Revert InterceptMethodAttribute changes in WebRequestIntegration.cs
zacharycmontoya Mar 6, 2020
37c8830
For the new projects, set IsPackable=false
zacharycmontoya Mar 6, 2020
4813e83
Improve integration checks on InsertFirst methods.
zacharycmontoya Mar 7, 2020
9562479
Add GetWrapperMethodRef so both types of method replacement calls can…
zacharycmontoya Mar 7, 2020
0e2074e
Re-order helper methods for hopefully a nicer looking diff
zacharycmontoya Mar 7, 2020
bf885dd
Fix unit-tests build break
zacharycmontoya Mar 9, 2020
834533a
Fix rebase for integrations.json
zacharycmontoya Mar 9, 2020
53c7d30
Fix native unit test build.
zacharycmontoya Mar 9, 2020
4ace566
Refactoring, documentation update, and PrepareRelease updates to acco…
zacharycmontoya Mar 9, 2020
d3c5fd8
Refactor SetAllVersions.cs and lock Datadog.Trace.AspNet.Loader and D…
zacharycmontoya Mar 11, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add another check to ensure InsertFirst methods have a void return type.
  • Loading branch information
zacharycmontoya committed Mar 9, 2020
commit 28a0f4ce87ce4a16338d77d0ff94624df07c0398
7 changes: 7 additions & 0 deletions tools/PrepareRelease/GenerateIntegrationDefinitions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,13 @@ private static string GetMethodSignature(MethodInfo method, MethodReplacementAct
$"Method {method.DeclaringType.FullName}.{method.Name}() does not meet parameter requirements. " +
"Currently, methods that are not doing replacements must have zero parameters.");
}
else if (methodReplacementActionType != MethodReplacementActionType.ReplaceTargetMethod &&
returnType != typeof(void))
{
throw new Exception(
$"Method {method.DeclaringType.FullName}.{method.Name}() does not meet return type requirements. " +
"Currently, methods that are not doing replacements must have a void return type.");
}

var signatureHelper = SignatureHelper.GetMethodSigHelper(method.CallingConvention, returnType);
signatureHelper.AddArguments(parameters, requiredCustomModifiers: null, optionalCustomModifiers: null);
Expand Down