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.

Sign up for GitHub

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

Pull upstream changes #415

Merged
merged 67 commits into from
Mar 9, 2022
Merged

Pull upstream changes #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
03bafc2
Upstream sync 6989e88ce638ba1e4ee1b178d70e692a3a5499dd..afb96387b2b9c…
lachmatt Mar 1, 2022
1d82119
Changes DuckType to bypass ToString method to the target instance (#2…
tonyredondo Feb 14, 2022
4bf5224
Revert ci_library.language tag to language (as other integrations) (#…
tonyredondo Feb 14, 2022
42fd156
[CIApp] - Ensure the Origin tag value on the public SpanContext .ctor…
tonyredondo Feb 14, 2022
dd6528b
Setup Github Actions for the profiler CI (#2415)
gleocadie Feb 14, 2022
2498e23
update PR template (#2429)
lucaspimentel Feb 14, 2022
38fd86d
AOT improvements (#2428)
tonyredondo Feb 14, 2022
fc905d5
Update `.vsconfig` (#2407)
robertpi Feb 15, 2022
f972366
Reduce test flakiness caused by TcpPortProvider.GetOpenPort (#2438)
OmerRaviv Feb 15, 2022
fd2589f
Add Auth header to HttpClient that downloads Azure DevOps build artif…
shurivich Feb 15, 2022
a9a252c
Fix MongoDB integration when BsonDocument throws an exception (#2435)
tonyredondo Feb 15, 2022
0d169aa
Move EnumNgenModuleMethodsInliningThisMethod call from the background…
tonyredondo Feb 16, 2022
14121a5
Add regression tests for running in partial trust environments (#2338)
zacharycmontoya Feb 16, 2022
34c241b
Update protobuf version to 3.19.4 (#2443)
gleocadie Feb 16, 2022
8847771
Disable sending telemetry by default (#2431)
andrewlock Feb 16, 2022
94590bf
Adding more info on instrumenting specific methods (#2441)
anna-git Feb 16, 2022
7ec0c78
Trigger deployment to the reliability environment (#2362)
pierotibou Feb 16, 2022
1fb6fd7
Add IIS checks to the CLI (#2416)
kevingosse Feb 16, 2022
2843d15
Revert "Reduce test flakiness caused by TcpPortProvider.GetOpenPort (…
andrewlock Feb 16, 2022
f094ca3
Update the http.status_code on root-level aspnet.request spans after …
zacharycmontoya Feb 16, 2022
5b8f79f
[Doc] Describe the best scenarios to upgrade from v1 to v2 (#2417)
pierotibou Feb 16, 2022
51eec5e
Refactorings to avoid merge conflicts with the Live Debugger (#2452)
GreenMatan Feb 17, 2022
1cc326b
[Test Package Versions Bump] Updating package versions (#2444)
github-actions[bot] Feb 17, 2022
6886444
Add a warning to the CLI when a version conflict is detected (#2448)
kevingosse Feb 17, 2022
8a05139
Log a message when the process is killed (#2456)
kevingosse Feb 17, 2022
2a0510c
Update GraphQL and Security ASP.NET Core tests to reduce flakiness (#…
andrewlock Feb 17, 2022
f2b0ace
add support for trace-level tags (vertical propagation) (#2432)
lucaspimentel Feb 17, 2022
1a967f6
New tags useful for throughput testing (#2439)
robertpi Feb 17, 2022
7c144be
Replace [Fact] and [Theory] with [SkippableFact] and [SkippableTheory…
andrewlock Feb 18, 2022
112dcf8
Fix incorrect timeout in BatchingSinkTests (#2462)
andrewlock Feb 18, 2022
987c6bb
Fix missing `http.status_code` tag on ASP.NET Core spans with errors …
andrewlock Feb 18, 2022
517ad51
Enable telemetry in AAS by default (#2454)
andrewlock Feb 18, 2022
60eed5c
Refactor no-op pipeline to not use so many hosts (#2467)
andrewlock Feb 18, 2022
9b77ef4
Fix typos in code coverage report generator (#2468)
andrewlock Feb 18, 2022
0ce8cc7
Add support for aspnetcore sites hosted out of process (#2450)
kevingosse Feb 18, 2022
7213b9d
Increase coverage in mongodb integration tests (#2469)
andrewlock Feb 18, 2022
754628d
Refactor all EnumNgenModuleMethodsInliningThisMethod call sites (#2470)
tonyredondo Feb 18, 2022
327863e
Disable runtime metrics tests for netcoreapp 3.1 (#2457)
kevingosse Feb 18, 2022
95cfcaa
Make IntegrationRegistry and DD_LOGS_DIRECT_SUBMISSION_INTEGRATIONS c…
andrewlock Feb 21, 2022
44ee025
Support cleaning filenames in http-client + aspnet (#2471)
andrewlock Feb 21, 2022
28803aa
Always set response header tags in ASP.NET Core (#2480)
andrewlock Feb 21, 2022
4f0ddd0
Add proper spdlog-based logging to NativeLoader (#2481)
OmerRaviv Feb 21, 2022
b21f742
Revert "Add proper spdlog-based logging to NativeLoader (#2481)" (#2485)
andrewlock Feb 22, 2022
8fd19d3
[Version Bump] 2.5.0 (#2488)
github-actions[bot] Feb 22, 2022
7f65635
Improve error handling in CLI (#2463)
kevingosse Feb 22, 2022
a5520cc
Use mermaid for flow chart (#2476)
andrewlock Feb 22, 2022
c3185d5
Add proper spdlog-based logging to NativeLoader (#2481) (#2489)
andrewlock Feb 22, 2022
7113503
Increase Redis test matrix (#2472)
andrewlock Feb 23, 2022
52a91a7
Ignore common test failures (#2477)
andrewlock Feb 23, 2022
7d4e51c
Ensure the native loader works with 3rd party dispatcher (e.g.: Contr…
gleocadie Feb 23, 2022
10086e1
Remove TODO from stylecop.json (#2490)
kevingosse Feb 23, 2022
efe4570
Fix typo in docker-compose.yml that is causing CI failure in resolvin…
OmerRaviv Feb 23, 2022
eb70112
Add `ExpandRouteTemplatesEnabled` setting for ASP.NET Core (#2496)
andrewlock Feb 24, 2022
c80e098
Shared Loader - Add support for more rewriting points (#2487)
tonyredondo Feb 24, 2022
df07557
Fix variable name to something meaningful (#2504)
tonyredondo Feb 25, 2022
f6b41c7
Add clarification to automatic instrumentation docs (#2473)
andrewlock Feb 25, 2022
bbf72ad
Adapt verify files and tests to remove appsec enable blocking tests (…
anna-git Feb 25, 2022
373132f
redundant docs removal, verification files update, redundant scripts/…
lachmatt Mar 4, 2022
2fa1927
doc new configuration key
lachmatt Mar 4, 2022
e617777
Merge branch 'main' into pull-upstream-changes
lachmatt Mar 4, 2022
1d969b3
Merge branch 'main' into pull-upstream-changes
Kielek Mar 8, 2022
5854b9e
skip failing runner tests
Kielek Mar 8, 2022
f07183b
Merge branch 'main' into pull-upstream-changes
Kielek Mar 8, 2022
eb3762a
SignalFx distribution requiers more permisions
Kielek Mar 8, 2022
d36942b
disable appdomain test
Kielek Mar 8, 2022
50b33f5
fix lib name and public token
Kielek Mar 9, 2022
2200ea3
adjust log paths
Kielek Mar 9, 2022
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
29 changes: 2 additions & 27 deletions .vsconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"version": "1.0",
"components": [
"Microsoft.VisualStudio.Component.ClassDesigner",
"Microsoft.VisualStudio.Component.GraphDocument",
"Microsoft.VisualStudio.Component.CoreEditor",
"Microsoft.VisualStudio.Workload.CoreEditor",
"Microsoft.Net.Component.4.8.SDK",
Expand Down Expand Up @@ -39,48 +37,25 @@
"Microsoft.VisualStudio.Component.FSharp.WebTemplates",
"Microsoft.VisualStudio.Component.DockerTools",
"Microsoft.NetCore.Component.Web",
"Microsoft.VisualStudio.Component.WebDeploy",
"Microsoft.VisualStudio.Component.AppInsights.Tools",
"Microsoft.VisualStudio.Component.Web",
"Microsoft.Net.Component.4.8.TargetingPack",
"Microsoft.Net.ComponentGroup.4.8.DeveloperTools",
"Microsoft.VisualStudio.Component.AspNet45",
"Microsoft.VisualStudio.Component.AspNet",
"Component.Microsoft.VisualStudio.Web.AzureFunctions",
"Microsoft.VisualStudio.ComponentGroup.AzureFunctions",
"Microsoft.VisualStudio.ComponentGroup.Web.CloudTools",
"Microsoft.VisualStudio.Component.DiagnosticTools",
"Microsoft.VisualStudio.Component.EntityFramework",
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
"Component.Microsoft.VisualStudio.LiveShare",
"Microsoft.VisualStudio.Component.WslDebugging",
"Microsoft.VisualStudio.Component.IntelliCode",
"Microsoft.Net.Component.4.6.2.TargetingPack",
"Microsoft.Net.Component.4.7.TargetingPack",
"Microsoft.VisualStudio.Workload.NetWeb",
"Microsoft.VisualStudio.Component.VC.CoreIde",
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
"Microsoft.VisualStudio.Component.Windows10SDK.19041",
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
"Microsoft.ComponentGroup.Blend",
"Microsoft.VisualStudio.Component.FSharp.Desktop",
"Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
"Microsoft.VisualStudio.Workload.ManagedDesktop",
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
"Microsoft.VisualStudio.Component.VC.CLI.Support",
"Microsoft.VisualStudio.Component.Windows10SDK.18362",
"Microsoft.VisualStudio.Workload.NativeDesktop",
"Microsoft.VisualStudio.Component.VC.Tools.ARM",
"Microsoft.Net.ComponentGroup.TargetingPacks.Common",
"Microsoft.Net.Component.4.6.TargetingPack",
"Microsoft.VisualStudio.Component.Git",
"Microsoft.VisualStudio.Component.LinqToSql",
"Microsoft.NetCore.Component.Runtime.3.1",
"Microsoft.NetCore.Component.Runtime.5.0",
"Microsoft.Net.Component.4.6.1.TargetingPack",
"Microsoft.Net.Component.4.6.2.SDK",
"Microsoft.Net.Component.4.7.SDK"
"Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64",
"Microsoft.Net.Component.4.6.1.TargetingPack"
]
}
3 changes: 3 additions & 0 deletions Datadog.Trace.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tools.Runner.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Telemetry", "tracer\test\test-applications\integrations\Samples.Telemetry\Samples.Telemetry.csproj", "{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sandbox.AutomaticInstrumentation", "tracer\test\test-applications\regression\Sandbox.AutomaticInstrumentation\Sandbox.AutomaticInstrumentation.csproj", "{10619BA2-AED1-482A-8570-BB7C7B83DDDC}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
tracer\test\test-applications\Samples.Shared\Samples.Shared.projitems*{24d3e547-8897-4111-baa2-b92f50cc13d4}*SharedItemsImports = 5
Expand Down Expand Up @@ -2438,6 +2440,7 @@ Global
{887AC8BA-35A6-4646-BF9A-59357155805E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{595BB494-CD26-4A51-8E5B-009219E3F2AE} = {8CEC2042-F11C-49F5-A674-2355793B600A}
{2D1FF937-3237-4A1B-9C6C-82FA5E22CAD7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{10619BA2-AED1-482A-8570-BB7C7B83DDDC} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ services:
- framework=${framework:-netcoreapp3.1}
- baseImage=${baseImage:-debian}
- TestAllPackageVersions=${TestAllPackageVersions:-true}
- IncludeMinorPackageVersions=${IncludeMinorPackageVersions:-false}0
- IncludeMinorPackageVersions=${IncludeMinorPackageVersions:-false}
- Verify_DisableClipboard=true
- DiffEngine_Disabled=true
- SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN:-1}
Expand Down
Loading