Skip to content

Commit f142d9a

Browse files
committed
Merge branch 'master' of github.com:DataDog/dd-trace-dotnet into pavlo.khrebto/EX-2703/ffe-config-and-endpoint
2 parents e59f1d7 + 6c2f702 commit f142d9a

87 files changed

Lines changed: 9474 additions & 7178 deletions

File tree

Some content is hidden

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

.azure-pipelines/ultimate-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ variables:
121121
DD_INSTRUMENTATION_TELEMETRY_ENABLED: 0
122122
NUKE_TELEMETRY_OPTOUT: 1
123123
# Include all test frameworks when (variable is set) OR ((running on master/release/hotfix) and (NOT scheduled build)),
124-
IncludeAllTestFrameworks: $[or(eq(variables['run_all_test_frameworks'], 'true'), and(or(in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hostfix/')), not(eq(variables['Build.Reason'], 'Schedule'))))]
124+
IncludeAllTestFrameworks: $[or(eq(variables['run_all_test_frameworks'], 'true'), and(or(in(variables['Build.SourceBranch'], 'refs/heads/master', 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/hotfix/')), not(eq(variables['Build.Reason'], 'Schedule'))))]
125125
IntegrationTestSampleName: $(TEST_SAMPLE_NAME)
126126
IntegrationTestFilter: $(TEST_FILTER)
127127
DockerComposeProjectName: ddtrace-$(Build.BuildNumber)

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353

5454
## integration tests for auto-instrumentations
5555
/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/ @DataDog/apm-idm-dotnet @DataDog/tracing-dotnet
56+
/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/DataStreamsMonitoring* @DataDog/tracing-dotnet @DataDog/data-streams-monitoring
5657
/tracer/test/Datadog.Trace.ClrProfiler.IntegrationTests/**/DataStreamsMonitoring* @DataDog/tracing-dotnet @DataDog/data-streams-monitoring
5758

5859
### co-owned integrations tests

.github/actions/create-signed-pull-request/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ inputs:
3030
reviewers:
3131
description: 'Comma-separated reviewers to request. GitHub usernames, not teams.'
3232
required: false
33+
draft:
34+
description: 'Whether to create the pull request as a draft.'
35+
required: false
36+
default: 'false'
3337

3438
outputs:
3539
pull-request-number:
@@ -55,4 +59,5 @@ runs:
5559
body: ${{ inputs.body }}
5660
labels: ${{ inputs.labels }}
5761
reviewers: ${{ inputs.reviewers }}
62+
draft: ${{ inputs.draft }}
5863
delete-branch: true
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
issuer: https://token.actions.githubusercontent.com
2+
3+
subject_pattern: repo:DataDog/dd-trace-dotnet:.*
4+
5+
claim_pattern:
6+
event_name: (schedule|workflow_dispatch)
7+
ref: refs/heads/master
8+
ref_protected: "true"
9+
job_workflow_ref: DataDog/dd-trace-dotnet/\.github/workflows/update_ffe_fixtures\.yml@refs/heads/master
10+
11+
permissions:
12+
contents: write
13+
pull_requests: write
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
name: Update FFE fixtures
2+
3+
on:
4+
schedule:
5+
- cron: "0 0 * * 0" # Every Sunday at midnight UTC
6+
workflow_dispatch:
7+
inputs:
8+
fixture_ref:
9+
description: Branch, tag, or commit from DataDog/ffe-system-test-data
10+
required: true
11+
default: main
12+
type: string
13+
14+
concurrency:
15+
group: update-ffe-fixtures
16+
cancel-in-progress: false
17+
18+
jobs:
19+
update_ffe_fixtures:
20+
runs-on: ubuntu-latest
21+
permissions:
22+
id-token: write
23+
24+
steps:
25+
- name: Get dd-octo-sts token
26+
uses: DataDog/dd-octo-sts-action@96a25462dbcb10ebf0bfd6e2ccc917d2ab235b9a # v1.0.4
27+
id: octo-sts
28+
with:
29+
scope: DataDog/dd-trace-dotnet
30+
policy: self.update_ffe_fixtures.create-pr
31+
32+
- name: Checkout
33+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
34+
with:
35+
persist-credentials: false
36+
37+
- name: Update fixture snapshot
38+
id: fixtures
39+
env:
40+
FFE_FIXTURE_REF: ${{ inputs.fixture_ref || 'main' }}
41+
run: ./tracer/build.sh UpdateFfeFixtures --FfeFixtureRef "$FFE_FIXTURE_REF"
42+
43+
- name: Create Pull Request
44+
if: steps.fixtures.outputs.changed == 'true'
45+
uses: ./.github/actions/create-signed-pull-request
46+
with:
47+
token: ${{ steps.octo-sts.outputs.token }}
48+
branch: bot/ffe-fixtures-update
49+
commit-message: "test(ffe): update canonical fixtures"
50+
base: master
51+
title: "test(ffe): update canonical fixtures"
52+
draft: true
53+
labels: "area:tests,feature_flags"
54+
body: |
55+
## Summary of changes
56+
57+
Updates the FFE tests to commit ${{ steps.fixtures.outputs.source_commit }}.
58+
59+
## Reason for change
60+
61+
Keep dd-trace-dotnet synchronized with the canonical FFE evaluator fixtures. New fixtures may intentionally make unit tests fail when they expose evaluator bugs that must be addressed before this update is merged.
62+
63+
Canonical source: https://github.com/DataDog/ffe-system-test-data
64+
Source commit: ${{ steps.fixtures.outputs.source_commit }}
65+
66+
## Implementation details
67+
68+
- Refresh the checked-in FFE fixture snapshot from the canonical repository.
69+
- Load ${{ steps.fixtures.outputs.fixture_count }} canonical JSON fixture cases.
70+
71+
## Test coverage
72+
73+
The existing FFE unit tests run against the refreshed canonical fixtures.
74+
75+
## Other details
76+
77+
Address evaluator failures in this update PR before merging it.

.gitlab/one-pipeline.locked.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT THIS FILE MANUALLY
22
# This file is auto-generated by automation.
33
include:
4-
- remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.3.0/one-pipeline.yml
4+
- remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.3.1/one-pipeline.yml
55

0 commit comments

Comments
 (0)