Skip to content

Commit

Permalink
Upstream 26.04.21 (#142)
Browse files Browse the repository at this point in the history
* Catchup to upstream

* 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](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 (#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 (#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)

* Add symbols to MSI
* Update the PrepareRelease tool

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)

* Generate nuget symbols package
* Enable source-link
* Enable deterministic builds

delete log file (#1408)

Bump version to 1.26.0 (#1411)

* Bump version to 1.26.0

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` 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 (#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>

* 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) (#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:
- 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 (#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)

* tracer merge fix

* fix versions

* remove arm64 builds

* fix assembly naming

Co-authored-by: Zach Montoya <zach.montoya@datadoghq.com>
  • Loading branch information
RassK and zacharycmontoya authored Apr 27, 2021
1 parent 65a4ab1 commit e8c6df6
Show file tree
Hide file tree
Showing 94 changed files with 2,856 additions and 1,122 deletions.
5 changes: 4 additions & 1 deletion .azure-pipelines/crank.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,13 @@ jobs:
arguments: /nowarn:netsdk1138
projects: |
src/Datadog.Trace.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
- script: |
sudo apt-get update
sudo apt-get install -y llvm clang
sudo apt-get remove -y cmake
curl -L -o /tmp/cmake.sh https://github.com/Kitware/CMake/releases/download/v3.19.8/cmake-3.19.8-Linux-x86_64.sh
sudo sh /tmp/cmake.sh --prefix=/usr/local --exclude-subdir --skip-license
displayName: install_dependencies
- script: |
Expand Down
6 changes: 3 additions & 3 deletions .azure-pipelines/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
dockerComposeCommand: run -e TestAllPackageVersions=true -e buildConfiguration=$(buildConfiguration) -e publishTargetFramework=$(publishTargetFramework) IntegrationTests

- publish: build_data
artifact: $(Agent.JobName)_profiler-logs
artifact: $(Agent.JobName)_profiler-logs-$(System.JobAttempt)
condition: succeededOrFailed()

- task: PublishTestResults@2
Expand Down Expand Up @@ -237,7 +237,7 @@ jobs:
dockerComposeCommand: run -e TestAllPackageVersions=true -e buildConfiguration=$(buildConfiguration) IntegrationTests.Alpine.Core50

- publish: build_data
artifact: $(Agent.JobName)_profiler-logs
artifact: $(Agent.JobName)_profiler-logs-$(System.JobAttempt)
condition: succeededOrFailed()

- task: PublishTestResults@2
Expand Down Expand Up @@ -459,7 +459,7 @@ jobs:
inputs:
solution: test/test-applications/aspnet/samples-iis.sln
configuration: '$(buildConfiguration)'
msbuildArguments: '/p:DeployOnBuild=true /p:PublishProfile=FolderProfile.pubxml'
msbuildArguments: '/p:DeployOnBuild=true /p:PublishProfile=$(System.DefaultWorkingDirectory)/test/test-applications/aspnet/PublishProfiles/FolderProfile.pubxml'
maximumCpuCount: true

- task: DockerCompose@0
Expand Down
16 changes: 8 additions & 8 deletions .azure-pipelines/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,16 +116,16 @@ stages:
arguments: --configuration $(buildConfiguration) --framework netcoreapp3.1 --output $(tracerHome)/netcoreapp3.1

- task: DockerCompose@0
displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) Profiler
displayName: docker-compose run Profiler
inputs:
containerregistrytype: Container Registry
dockerComposeCommand: run Profiler
dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) Profiler

- task: DockerCompose@0
displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) package
displayName: docker-compose run package
inputs:
containerregistrytype: Container Registry
dockerComposeCommand: run package
dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) package

- publish: deploy/linux
artifact: linux-packages
Expand Down Expand Up @@ -170,16 +170,16 @@ stages:
arguments: --configuration $(buildConfiguration) --framework netcoreapp3.1 --output $(tracerHome)/netcoreapp3.1

- task: DockerCompose@0
displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) Profiler.Alpine
displayName: docker-compose run Profiler.Alpine
inputs:
containerregistrytype: Container Registry
dockerComposeCommand: run Profiler.Alpine
dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) Profiler.Alpine

- task: DockerCompose@0
displayName: docker-compose run -e buildConfiguration=$(buildConfiguration) package.alpine
displayName: docker-compose run package.alpine
inputs:
containerregistrytype: Container Registry
dockerComposeCommand: run package.alpine
dockerComposeCommand: run -e buildConfiguration=$(buildConfiguration) package.alpine

- publish: deploy/linux
artifact: linux-alpine-packages
Expand Down
25 changes: 25 additions & 0 deletions .azure-pipelines/steps/install-dotnet-sdks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
steps:
- task: UseDotNet@2
displayName: install dotnet core sdk 2.1
inputs:
packageType: sdk
version: 2.1.x

- task: UseDotNet@2
displayName: install dotnet core sdk 3.0
inputs:
packageType: sdk
version: 3.0.x

- task: UseDotNet@2
displayName: install dotnet core sdk 3.1
inputs:
packageType: sdk
version: 3.1.x

- task: UseDotNet@2
displayName: install dotnet core sdk 5
inputs:
packageType: sdk
version: $(dotnetCoreSdk5Version)
includePreviewVersions: true
24 changes: 24 additions & 0 deletions .azure-pipelines/steps/install-dotnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
steps:
- task: UseDotNet@2
displayName: install dotnet core runtime 2.1
inputs:
packageType: runtime
version: 2.1.x

- task: UseDotNet@2
displayName: install dotnet core runtime 3.0
inputs:
packageType: runtime
version: 3.0.x

- task: UseDotNet@2
displayName: install dotnet core runtime 3.1
inputs:
packageType: runtime
version: 3.1.x

- task: UseDotNet@2
displayName: install dotnet core sdk 5.0
inputs:
packageType: sdk
version: $(dotnetCoreSdk5Version)
Loading

0 comments on commit e8c6df6

Please sign in to comment.