Skip to content

Commit c05d5d6

Browse files
vandonrvandonr
committed
Merge branch 'vandonr/process' into vandonr/process2
2 parents b5aa028 + 2d21dd6 commit c05d5d6

File tree

226 files changed

+8358
-2476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+8358
-2476
lines changed

‎.azure-pipelines/noop-pipeline.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pr:
77

88
# Global variables
99
variables:
10-
dotnetCoreSdkLatestVersion: 10.0.100-rc.1.25451.107
10+
dotnetCoreSdkLatestVersion: 10.0.100-rc.2.25502.107
1111
OriginalCommitId: $[coalesce(variables['System.PullRequest.SourceCommitId'], variables['Build.SourceVersion'])] # required by update-github-status
1212
TargetBranch: $[variables['System.PullRequest.TargetBranch']]
1313

‎.azure-pipelines/ultimate-pipeline.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@ schedules:
6363
# Global variables
6464
variables:
6565
buildConfiguration: Release
66-
dotnetCoreSdkLatestVersion: 10.0.100-rc.1.25451.107
66+
dotnetCoreSdkLatestVersion: 10.0.100-rc.2.25502.107
6767
# This is required until we're out of rc.
6868
# After GA we can do a find and replace and get rid of this
69-
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.1
69+
dotnetCoreSdkLatestVersionShort: 10.0.100-rc.2
7070
nativeBuildDotnetSdkVersion: 7.0.306
7171
# These are the Managed DevOps pool names we use
7272
linuxTasksPool: azure-managed-linux-tasks
73-
linuxX64SmokePool: azure-managed-linux-smoke-2
74-
linuxX64Pool: azure-managed-linux-x64-2
75-
linuxArm64Pool: azure-managed-linux-arm64-1
76-
windowsX64Pool: azure-managed-windows-x64-2
73+
linuxX64SmokePool: azure-managed-linux-smoke
74+
linuxX64Pool: azure-managed-linux-x64-1
75+
linuxArm64Pool: azure-managed-linux-arm64-2
76+
windowsX64Pool: azure-managed-windows-x64-1
7777

7878
relativeArtifacts: /tracer/src/bin/artifacts
7979
monitoringHome: $(System.DefaultWorkingDirectory)/shared/bin/monitoring-home

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"context": "../tracer/build/_build",
88
"build": {
99
"args": {
10-
"DOTNETSDK_VERSION": "10.0.100-rc.1.25451.107"
10+
"DOTNETSDK_VERSION": "10.0.100-rc.2.25502.107"
1111
}
1212
},
1313
// Allow access to host machine

‎.github/actions/run-in-docker/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ runs:
1717
shell: bash
1818
run: |
1919
docker build \
20-
--build-arg DOTNETSDK_VERSION=10.0.100-rc.1.25451.107 \
20+
--build-arg DOTNETSDK_VERSION=10.0.100-rc.2.25502.107 \
2121
--tag dd-trace-dotnet/${{ inputs.baseImage }}-builder \
2222
--target builder \
2323
--file "${GITHUB_WORKSPACE}/tracer/build/_build/docker/${{ inputs.baseImage }}.dockerfile" \

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
profiler:
1515
name: Analyze Profiler
1616
runs-on: ubuntu-latest
17+
# Temporarily disabled
18+
if: false
1719
permissions:
1820
actions: read
1921
contents: read
@@ -90,6 +92,8 @@ jobs:
9092
tracer:
9193
name: Analyze Tracer
9294
runs-on: ubuntu-latest
95+
# Temporarily disabled
96+
if: false
9397
permissions:
9498
actions: read
9599
contents: read

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ build:
3737
-e AWS_NETWORKING=true `
3838
-e SIGN_WINDOWS=true `
3939
-e NUGET_CERT_REVOCATION_MODE=offline `
40-
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc1 `
40+
registry.ddbuild.io/images/mirror/datadog/dd-trace-dotnet-docker-build:dotnet10-rc2 `
4141
Info Clean BuildTracerHome BuildProfilerHome BuildNativeLoader BuildDdDotnet PublishFleetInstaller PackageTracerHome ZipSymbols SignDlls SignMsi DownloadWinSsiTelemetryForwarder
4242
- mkdir artifacts-out
4343
- xcopy /e/s build-out\${CI_JOB_ID}\*.* artifacts-out

‎.gitlab/benchmarks/dsm-throughput.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
22
DSM_THROUGHPUT_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dd-trace-dotnet-dsm
3-
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-6
3+
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-7
44

55
stages:
66
- check-azure-pipeline

‎.gitlab/benchmarks/macrobenchmarks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ stages:
1313
- benchmarks-win
1414

1515
variables:
16-
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-6
16+
MACROBENCHMARKS_CI_IMAGE: 486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/benchmarking-platform:dotnet-throughput-7
1717

1818
check_azure_pipeline:
1919
stage: check-azure-pipeline

‎Datadog.Trace.Samples.g.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureServiceBus.APM
385385
EndProject
386386
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.AzureServiceBus", "tracer\test\test-applications\integrations\Samples.DataStreams.AzureServiceBus\Samples.DataStreams.AzureServiceBus.csproj", "{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}"
387387
EndProject
388+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventHubs", "tracer\test\test-applications\integrations\Samples.AzureEventHubs\Samples.AzureEventHubs.csproj", "{BC44A41F-1BED-4438-9F66-0EA5607906D7}"
389+
EndProject
388390
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AWS.DynamoDBv2", "tracer\test\test-applications\integrations\Samples.AWS.DynamoDBv2\Samples.AWS.DynamoDBv2.csproj", "{D59C5649-BE0E-4A33-B868-B652D8614534}"
389391
EndProject
390392
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Amazon.Lambda.RuntimeSupport", "tracer\test\test-applications\integrations\Samples.Amazon.Lambda.RuntimeSupport\Samples.Amazon.Lambda.RuntimeSupport.csproj", "{18A6904A-5AFD-4816-AC3F-9F5E433720B5}"
@@ -1211,6 +1213,7 @@ Global
12111213
{BC44A41F-1BED-4438-9F66-0EA5607906D5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12121214
{BC44A41F-1BED-4438-9F66-0EA5607906D6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12131215
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
1216+
{BC44A41F-1BED-4438-9F66-0EA5607906D7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12141217
{D59C5649-BE0E-4A33-B868-B652D8614534} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12151218
{18A6904A-5AFD-4816-AC3F-9F5E433720B5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
12161219
{23EA38E3-0BF1-40DF-A52D-C34EA2FB3F26} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}

‎Datadog.Trace.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureServiceBus.APM
531531
EndProject
532532
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.DataStreams.AzureServiceBus", "tracer\test\test-applications\integrations\Samples.DataStreams.AzureServiceBus\Samples.DataStreams.AzureServiceBus.csproj", "{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E}"
533533
EndProject
534+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.AzureEventHubs", "tracer\test\test-applications\integrations\Samples.AzureEventHubs\Samples.AzureEventHubs.csproj", "{BC44A41F-1BED-4438-9F66-0EA5607906D7}"
535+
EndProject
534536
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tools.dd_dotnet", "tracer\src\Datadog.Trace.Tools.dd_dotnet\Datadog.Trace.Tools.dd_dotnet.csproj", "{B28A33A4-C694-4514-BC30-2680605B0B3D}"
535537
EndProject
536538
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datadog.Trace.Tools.dd_dotnet.ArtifactTests", "tracer\test\Datadog.Trace.Tools.dd_dotnet.ArtifactTests\Datadog.Trace.Tools.dd_dotnet.ArtifactTests.csproj", "{604CE6F2-9E90-4D0B-91CB-EBA06880A7D7}"
@@ -1697,6 +1699,7 @@ Global
16971699
{BC44A41F-1BED-4438-9F66-0EA5607906D5} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
16981700
{BC44A41F-1BED-4438-9F66-0EA5607906D6} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
16991701
{56DE0D44-E9E5-48DA-BAEA-2934B1E28D4E} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
1702+
{BC44A41F-1BED-4438-9F66-0EA5607906D7} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
17001703
{B28A33A4-C694-4514-BC30-2680605B0B3D} = {9E5F0022-0A50-40BF-AC6A-C3078585ECAB}
17011704
{604CE6F2-9E90-4D0B-91CB-EBA06880A7D7} = {8CEC2042-F11C-49F5-A674-2355793B600A}
17021705
{A9632530-0FB8-4156-BD3C-DD432527768E} = {8CEC2042-F11C-49F5-A674-2355793B600A}

0 commit comments

Comments
 (0)