Skip to content

Commit

Permalink
Merge branch 'master' into ganeshnj/feature/datapipeline-bindings
Browse files Browse the repository at this point in the history
  • Loading branch information
ajgajg1134 authored Jan 9, 2025
2 parents 067753f + cb4647c commit d88b1f3
Show file tree
Hide file tree
Showing 274 changed files with 5,616 additions and 4,430 deletions.
44 changes: 23 additions & 21 deletions .azure-pipelines/ultimate-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ variables:
DD_COLLECTOR_CPU_USAGE: true
# If we're doing an SSI run, set the indicator, the rest need to be set in the stage
IS_SSI_RUN: $[ or(eq(variables['Build.CronSchedule.DisplayName'], 'Daily SSI Run'), eq(variables['force_ssi_run'], 'true')) ]
ToolVersion: 3.8.0
ToolVersion: 3.9.0

# Declare the datadog agent as a resource to be used as a pipeline service
resources:
Expand Down Expand Up @@ -1339,7 +1339,7 @@ stages:

- stage: unit_tests_windows
condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
dependsOn: [build_windows_tracer, merge_commit_id]
dependsOn: [build_windows_tracer, merge_commit_id, generate_variables]
variables:
targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
Expand All @@ -1353,6 +1353,8 @@ stages:

- job: managed
timeoutInMinutes: 60 #default value
strategy:
matrix: $[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_windows_matrix'] ]
steps:
- template: steps/clone-repo.yml
parameters:
Expand All @@ -1361,7 +1363,7 @@ stages:
- template: steps/install-dotnet.yml
- template: steps/restore-working-directory.yml

- script: tracer\build.cmd BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)
- script: tracer\build.cmd BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Build and Test
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
Expand All @@ -1380,7 +1382,7 @@ stages:

- stage: unit_tests_macos
condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
dependsOn: [build_macos, merge_commit_id]
dependsOn: [build_macos, merge_commit_id, generate_variables]
variables:
targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
Expand All @@ -1390,6 +1392,9 @@ stages:
jobs: [managed]

- job: managed
strategy:
matrix:
$[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_macos_matrix'] ]
timeoutInMinutes: 90
pool:
vmImage: macos-13
Expand All @@ -1410,7 +1415,7 @@ stages:
artifact: build-macos-native_tracer
path: $(monitoringHome)

- script: ./tracer/build.sh BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)
- script: ./tracer/build.sh BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Build and Test
retryCountOnTaskFailure: 1
env:
Expand All @@ -1430,7 +1435,7 @@ stages:

- stage: unit_tests_linux
condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
dependsOn: [build_linux_tracer, build_linux_profiler, merge_commit_id]
dependsOn: [build_linux_tracer, build_linux_profiler, merge_commit_id, generate_variables]
variables:
targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
Expand All @@ -1443,12 +1448,7 @@ stages:
timeoutInMinutes: 60 #default value
strategy:
matrix:
x64:
baseImage: debian
artifactSuffix: linux-x64
alpine:
baseImage: alpine
artifactSuffix: linux-musl-x64
$[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_linux_x64_matrix'] ]
pool:
name: azure-linux-scale-set

Expand All @@ -1466,7 +1466,7 @@ stages:
parameters:
build: true
baseImage: $(baseImage)
command: "BuildAndRunManagedUnitTests --code-coverage-enabled $(CodeCoverageEnabled)"
command: "BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)"
apiKey: $(DD_LOGGER_DD_API_KEY)

- publish: artifacts/build_data
Expand All @@ -1483,7 +1483,7 @@ stages:

- stage: unit_tests_arm64
condition: and(succeeded(), eq(variables['isBenchmarksOnlyBuild'], 'False'))
dependsOn: [build_arm64_tracer, merge_commit_id]
dependsOn: [build_arm64_tracer, merge_commit_id, generate_variables]
variables:
targetShaId: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.sha']]
targetBranch: $[ stageDependencies.merge_commit_id.fetch.outputs['set_sha.branch']]
Expand All @@ -1494,14 +1494,10 @@ stages:

- job: test
timeoutInMinutes: 60 #default value

strategy:
matrix:
arm64:
baseImage: debian
artifactSuffix: linux-arm64
alpine:
baseImage: alpine
artifactSuffix: linux-musl-arm64
$[stageDependencies.generate_variables.generate_variables_job.outputs['generate_variables_step.unit_tests_linux_arm64_matrix'] ]
pool:
name: aws-arm64-auto-scaling
workspace:
Expand All @@ -1519,7 +1515,7 @@ stages:
parameters:
build: true
baseImage: $(baseImage)
command: "BuildAndRunManagedUnitTests"
command: "BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)"
apiKey: $(DD_LOGGER_DD_API_KEY)

- publish: artifacts/build_data
Expand Down Expand Up @@ -1815,6 +1811,12 @@ stages:
targetShaId: $(targetShaId)
targetBranch: $(targetBranch)
- template: steps/install-dotnet-sdks.yml
# This is a hack because otherwise Azure Functions _always_ tries to use the one from program files otherwise
- script: |
cd /D %PROGRAMFILES%/dotnet
rename dotnet.exe dotnet.exe.bak
where dotnet
displayName: 'Rename default dotnet.exe'
- template: steps/restore-working-directory.yml

- template: steps/install-msi.yml
Expand Down
38 changes: 0 additions & 38 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: "Bug Report (Low Priority)"
description: "Create a public Bug Report. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult."
title: "[BUG]: "
labels: type:bug
body:
- type: input
attributes:
label: Tracer Version(s)
description: "Version of the tracer used"
placeholder: 1.9.0
validations:
required: true

- type: input
attributes:
label: Operating system and platform
description: "The operating system (Windows, Linux, Ubuntu) and platform (arm64, x64) on which you are experiencing the issue"
placeholder: Windows (x64), Linux (arm64)
validations:
required: true

- type: input
attributes:
label: Instrumentation Mode
description: "How is your application being instrumented"
placeholder: automatic with msi installer, manual with NuGet package
validations:
required: true

- type: input
attributes:
label: TFM
description: "What Target Framework Moniker (TFM) are you using in your project?"
placeholder: "net462, net9.0"
validations:
required: true

- type: textarea
attributes:
label: Bug Report
description: Please add a clear and concise description of the bug here
validations:
required: true

- type: textarea
attributes:
label: Reproduction Code
description: Please add code here to help us reproduce the problem
validations:
required: false
9 changes: 6 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
blank_issues_enabled: true
blank_issues_enabled: false
contact_links:
- name: Helpdesk support
- name: Bug Report (High Priority)
url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:.net
about: This option creates an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private.
about: Create an expedited Bug Report via the helpdesk (no login required). This will allow us to look up your account and allows you to provide additional information in private. Please do not create a GitHub issue to report a bug.
- name: Feature Request (High Priority)
url: https://help.datadoghq.com/hc/en-us/requests/new?tf_1260824651490=pt_product_type:apm&tf_1900004146284=pt_apm_language:.net&tf_1260825272270=pt_apm_category_feature_request
about: Create an expedited Feature Request via the helpdesk (no login required). This helps with prioritization and allows you to provide additional information in private. Please do not create a GitHub issue to request a feature.
22 changes: 0 additions & 22 deletions .github/ISSUE_TEMPLATE/feature_request.md

This file was deleted.

59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Feature Request (Low Priority)
description: Create a public Feature Request. Note that these may not be addressed as quickly as the helpdesk and that looking up account information will be difficult.
title: "[FEATURE]: "
labels: type:enhancement
body:
- type: input
attributes:
label: Framework or Library Name
description: "If your feature request is to add instrumentation support for a library please provide the name here"
placeholder: "ASP.NET MVC, StackExchange.Redis"
validations:
required: false

- type: input
attributes:
label: Library Type
description: "If your feature request is to add instrumentation support for a library please provide the version you use"
placeholder: "web framework, data store, cache"
validations:
required: false

- type: input
attributes:
label: Library Version(s)
description: "If your feature request is to add instrumentation support for a library please provide the version you use"
placeholder: 5.2
validations:
required: false

- type: textarea
attributes:
label: Describe the feature you'd like
description: A clear and concise description of what you want to happen.
validations:
required: true

- type: textarea
attributes:
label: Is your feature request related to a problem?
description: |
Please add a clear and concise description of your problem.
E.g. I'm unable to instrument my database queries...
validations:
required: false

- type: textarea
attributes:
label: Describe alternatives you've considered
description: A clear and concise description of any alternative solutions or features you've considered
validations:
required: false

- type: textarea
attributes:
label: Additional context
description: Add any other context or screenshots about the feature request here
validations:
required: false

7 changes: 0 additions & 7 deletions Datadog.Trace.sln
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyLoadContextResolve"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.AspNet.MultipleAppsInDomain", "tracer\test\test-applications\aspnet\Samples.AspNet.MultipleAppsInDomain\Samples.AspNet.MultipleAppsInDomain.csproj", "{A82EB6F8-D8D0-4763-B252-08CA3F39D153}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Security.AspNetCore5.DatabaseIntegration", "tracer\test\test-applications\security\Samples.Security.AspNetCore5.DatabaseIntegration\Samples.Security.AspNetCore5.DatabaseIntegration.csproj", "{067CE939-C803-4959-890A-B6B34C83F87A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1430,10 +1428,6 @@ Global
{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A82EB6F8-D8D0-4763-B252-08CA3F39D153}.Release|Any CPU.Build.0 = Release|Any CPU
{067CE939-C803-4959-890A-B6B34C83F87A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{067CE939-C803-4959-890A-B6B34C83F87A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{067CE939-C803-4959-890A-B6B34C83F87A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{067CE939-C803-4959-890A-B6B34C83F87A}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -1666,7 +1660,6 @@ Global
{D6155F26-8245-4B66-8944-79C3DF9F9DA3} = {BAF8F246-3645-42AD-B1D0-0F7EAFBAB34A}
{8B1AF6A7-DD41-4347-B637-90C23D69B50E} = {498A300E-D036-49B7-A43D-821D1CAF11A5}
{A82EB6F8-D8D0-4763-B252-08CA3F39D153} = {AFA0AB23-64F0-4AC1-9050-6CE8FE06F580}
{067CE939-C803-4959-890A-B6B34C83F87A} = {0972AD57-B16B-494F-AE0A-091DD6F3B42B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {160A1D00-1F5B-40F8-A155-621B4459D78F}
Expand Down
Loading

0 comments on commit d88b1f3

Please sign in to comment.