-
Notifications
You must be signed in to change notification settings - Fork 100
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
Upstream 26.04.21 #142
Upstream 26.04.21 #142
Conversation
Actually build the profiler in release mode. The changes in open-telemetry#1356 attempted to do this, but placed the build configuration changes into the display name of the tasks, not the actual command. Bump OpenTracing from 0.12.0 to 0.12.1 in /src/Datadog.Trace.OpenTracing (open-telemetry#1385) Bumps [OpenTracing](https://github.com/opentracing/opentracing-csharp) from 0.12.0 to 0.12.1. - [Release notes](https://github.com/opentracing/opentracing-csharp/releases) - [Commits](opentracing/opentracing-csharp@0.12.0...0.12.1) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Update dependabot all in one go (open-telemetry#1387) - For Datadog.Trace, allow all dependencies. For other projects, only allow direct dependencies. This cuts down on noise since all other projects go through Datadog.Trace - For Datadog.Trace and Datadog.Trace.ClrProfiler.Managed, add packages that should be ignored Update dependabot to manually ignore dependencies (open-telemetry#1399) Copy/paste the Datadog.Trace.csproj ignored dependencies everywhere, since Datadog.Trace triggers issues everywhere. While potentially noisier than a small "allow" list, this will raise PR's if we ever add new packages which is better than not raising PR's. Stop calling Environment.Exit in tests (open-telemetry#1400) Add symbols to MSI (open-telemetry#1364) * Add symbols to MSI * Update the PrepareRelease tool Include the job attempt number in integration test log uploads (open-telemetry#1403) This is the only pipeline that publishes whether the pipeline succeeds or fails, so it's the only job vulnerable to duplicate artifacts Update dependabot to ignore the MessagePack vendored dependency (open-telemetry#1404) Add additional test for ContainerID parsing (open-telemetry#1405) Python recently had an issue with container ID parsing in DataDog/dd-trace-py#2314. This adds the problematic ID to our test suite to ensure we are not affected Check agent version only once (open-telemetry#1406) Fixes the CMake version 3.19.8 in CMakeLists (open-telemetry#1407) Revert "ProcessExit event handler improvements (#1332)" (open-telemetry#1410) This reverts commit 0aaa30e. Include symbols in Linux packages (open-telemetry#1365) Generate nuget symbols package (open-telemetry#1401) * Generate nuget symbols package * Enable source-link * Enable deterministic builds delete log file (open-telemetry#1408) Bump version to 1.26.0 (open-telemetry#1411) * Bump version to 1.26.0 Update NuGet packages in integration tests, under existing instrumentation version ranges (open-telemetry#1412) Re-enable AspNet integration tests in CI (open-telemetry#1414) Runs the AspNet tests added by DataDog/dd-trace-dotnet#1288 . Currently, this only tests the `AspNetMvc` and `AspNetWebApi2` integrations because the `AspNet` integration is not yet enabled via automatic instrumentation. The tests are run in the Windows IIS runs for the following reasons: - Restoring the projects and publishing can be grouped into the existing `samples-iis.sln` solution - Instrumenting IIS and IIS Express requires the Datadog.Trace assemblies to be in the GAC - Adding the AspNet CI applications to `samples-iis.sln`, which we are already properly restoring and publishing in the Windows IIS jobs - Removing some compile-time references to `Datadog.Trace.dll` and `Datadog.Trace.ClrProfiler.Managed.dll` with lookups via reflection. This is used so the site can give us a clear indicator whether automatic instrumentation is running - Miscellaneous change: Stop Visual Studio from auto-generating a `launchSettings.json` for the Datadog.Trace.IntegrationTests project Fix links in CHANGELOG (open-telemetry#1417) Serialize tags/metrics in a single pass (open-telemetry#1416) Ducktype reverse proxy (open-telemetry#1402) * Add support for reverse proxy/ducktyping. * Fixes ducktyping for non visible types. * Changes ReverseProxyTests * Enables tests on NET451, and adds a new test using public types. Changes based on the review. * Apply suggestions from code review Co-authored-by: Zach Montoya <zach.montoya@datadoghq.com> * Apply suggestions from code review Co-authored-by: Kevin Gosse <krix33@gmail.com> * Changes based on the review. Co-authored-by: Zach Montoya <zach.montoya@datadoghq.com> Co-authored-by: Kevin Gosse <krix33@gmail.com> Fix git parser on really big pack files (>2GB) (open-telemetry#1413) * Fix git parser on really big pack files. > 2GB * Fix parser on big object size. * changes based in the comments. * Fixes. * Apply suggestions from code review Co-authored-by: Andrew Lock <andrew.lock@datadoghq.com> Co-authored-by: Andrew Lock <andrew.lock@datadoghq.com> Enable endpoint routing in aspnetcore benchmark (open-telemetry#1418) Reinstate the consolidated multi-stage build pipeline (open-telemetry#1363) Re-incorporate the unified build pipeline and ensure that the main pipelines can successfully run in parallel. The main difference between the two is that, for Linux builds, the managed assets are no longer being copied during the Profiler step but instead during the package step. Thus, the only changes in this PR that affects shared scripts are new conditional blocks that check a new `UNIFIED_PIPELINE` environment variable to determine in which step to copy the managed assets. Notes: - Reverts the "revert" PR DataDog/dd-trace-dotnet#1335 - Adds the NuGet config change from DataDog/dd-trace-dotnet#1353, which assumes the change will be taken don't throw or log exceptions in TryDuckCast methods (open-telemetry#1422) Bump version to 1.26.1 (open-telemetry#1424) * Bump version to 1.26.1 * Update Changelog Fix build issue when building MSI from the command line without the TracerHomeDirectory argument (open-telemetry#1423)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM - Let's wait on CI completion to see any errors.
@@ -2,12 +2,12 @@ | |||
<PropertyGroup> | |||
<BuildInParallel Condition="'$(BuildInParallel)' == ''">true</BuildInParallel> | |||
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration> | |||
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)src\bin\tracer-home</TracerHomeDirectory> | |||
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)src\bin\windows-tracer-home</TracerHomeDirectory> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dszmigielski keep an eye if these will affect the PR to generate the build artifacts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It should not, but I will test it after this one is merged.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The packages
build should be fine because it sets the TracerHomeDirectory
property itself, but I had to issue a bug fix for local builds if you don't set it: DataDog/dd-trace-dotnet@1acaff0
IIRC this is a flaky test - kicked it again to be safe:
|
Another failure but a different one this time, since 2 runs we got 2 different failures I'm considering both results of flaky tests. I will merge the change.
|
Actually build profiler in release mode (#1362)
Actually build the profiler in release mode. The changes in #1356 attempted to do this, but placed the build configuration changes into the display name of the tasks, not the actual command.
Bump OpenTracing from 0.12.0 to 0.12.1 in /src/Datadog.Trace.OpenTracing (#1385)
Bumps OpenTracing from 0.12.0 to 0.12.1.
Signed-off-by: dependabot[bot] support@github.com
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update dependabot all in one go (#1387)
Update dependabot to manually ignore dependencies (#1399)
Copy/paste the Datadog.Trace.csproj ignored dependencies everywhere, since Datadog.Trace triggers issues everywhere. While potentially noisier than a small "allow" list, this will raise PR's if we ever add new packages which is better than not raising PR's.
Stop calling Environment.Exit in tests (#1400)
Add symbols to MSI (#1364)
Include the job attempt number in integration test log uploads (#1403)
This is the only pipeline that publishes whether the pipeline succeeds or fails, so it's the only job vulnerable to duplicate artifacts
Update dependabot to ignore the MessagePack vendored dependency (#1404)
Add additional test for ContainerID parsing (#1405)
Python recently had an issue with container ID parsing in DataDog/dd-trace-py#2314. This adds the problematic ID to our test suite to ensure we are not affected
Check agent version only once (#1406)
Fixes the CMake version 3.19.8 in CMakeLists (#1407)
Revert "ProcessExit event handler improvements (#1332)" (#1410)
This reverts commit 0aaa30e.
Include symbols in Linux packages (#1365)
Generate nuget symbols package (#1401)
delete log file (#1408)
Bump version to 1.26.0 (#1411)
Update NuGet packages in integration tests, under existing instrumentation version ranges (#1412)
Re-enable AspNet integration tests in CI (#1414)
Runs the AspNet tests added by DataDog/dd-trace-dotnet#1288 . Currently, this only tests the
AspNetMvc
andAspNetWebApi2
integrations because theAspNet
integration is not yet enabled via automatic instrumentation.The tests are run in the Windows IIS runs for the following reasons:
Restoring the projects and publishing can be grouped into the existing
samples-iis.sln
solutionInstrumenting IIS and IIS Express requires the Datadog.Trace assemblies to be in the GAC
Adding the AspNet CI applications to
samples-iis.sln
, which we are already properly restoring and publishing in the Windows IIS jobsRemoving some compile-time references to
Datadog.Trace.dll
andDatadog.Trace.ClrProfiler.Managed.dll
with lookups via reflection. This is used so the site can give us a clear indicator whether automatic instrumentation is runningMiscellaneous change: Stop Visual Studio from auto-generating a
launchSettings.json
for the Datadog.Trace.IntegrationTests projectFix links in CHANGELOG (#1417)
Serialize tags/metrics in a single pass (#1416)
Ducktype reverse proxy (#1402)
Add support for reverse proxy/ducktyping.
Fixes ducktyping for non visible types.
Changes ReverseProxyTests
Enables tests on NET451, and adds a new test using public types.
Changes based on the review.
Apply suggestions from code review
Co-authored-by: Zach Montoya zach.montoya@datadoghq.com
Co-authored-by: Kevin Gosse krix33@gmail.com
Co-authored-by: Zach Montoya zach.montoya@datadoghq.com
Co-authored-by: Kevin Gosse krix33@gmail.com
Fix git parser on really big pack files (>2GB) (#1413)
Fix git parser on really big pack files. > 2GB
Fix parser on big object size.
changes based in the comments.
Fixes.
Apply suggestions from code review
Co-authored-by: Andrew Lock andrew.lock@datadoghq.com
Co-authored-by: Andrew Lock andrew.lock@datadoghq.com
Enable endpoint routing in aspnetcore benchmark (#1418)
Reinstate the consolidated multi-stage build pipeline (#1363)
Re-incorporate the unified build pipeline and ensure that the main pipelines can successfully run in parallel. The main difference between the two is that, for Linux builds, the managed assets are no longer being copied during the Profiler step but instead during the package step. Thus, the only changes in this PR that affects shared scripts are new conditional blocks that check a new
UNIFIED_PIPELINE
environment variable to determine in which step to copy the managed assets.Notes:
don't throw or log exceptions in TryDuckCast methods (#1422)
Bump version to 1.26.1 (#1424)
Bump version to 1.26.1
Update Changelog
Fix build issue when building MSI from the command line without the TracerHomeDirectory argument (#1423)