Skip to content
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

chore(datadog_agent source, datadog_metrics sink): Add end to end tests with the Datadog Agent for metrics. #18840

Merged
merged 72 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
e522ded
start
neuronull Sep 14, 2023
d7592c6
CI
neuronull Sep 14, 2023
79248a3
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Sep 28, 2023
d8891fd
add scaffolding for the differentiation of series API versions
neuronull Oct 2, 2023
91ca255
fix(datadog_metrics sink): fix the integration tests which weren't ac…
neuronull Oct 3, 2023
9afbd83
fix workflows
neuronull Oct 3, 2023
cc9cc2d
clippy
neuronull Oct 3, 2023
597305d
fix filter for traces
neuronull Oct 3, 2023
3f9cd72
add first pass
neuronull Oct 3, 2023
4e204c5
Merge branch 'neuronull/fix_datadog_metrics_sink_integration_tests' i…
neuronull Oct 3, 2023
3a96f18
add testing coverage
neuronull Oct 3, 2023
9923219
cargo.lock
neuronull Oct 3, 2023
4523fcd
reduce duplicated code
neuronull Oct 4, 2023
a87bf0c
cleanup
neuronull Oct 4, 2023
376da18
clippy
neuronull Oct 4, 2023
715cf22
Merge branch 'master' into neuronull/fix_datadog_metrics_sink_integra…
neuronull Oct 4, 2023
7117d98
Merge branch 'neuronull/fix_datadog_metrics_sink_integration_tests' i…
neuronull Oct 4, 2023
5912324
Merge branch 'master' into neuronull/sink_datadog_metrics_v2_series_e…
neuronull Oct 5, 2023
c95a326
feedback ds: remove check for sort by name
neuronull Oct 5, 2023
d73cfe0
feedback ds: extend unit tests for v2
neuronull Oct 5, 2023
c9c0fbc
feedback ds: extend the int test coverage
neuronull Oct 5, 2023
2ac5bbf
Revert "feedback ds: remove check for sort by name"
neuronull Oct 5, 2023
cb92dc5
add explicit sort check
neuronull Oct 5, 2023
96ef122
add env var for v1 support
neuronull Oct 5, 2023
2de3617
check events
neuronull Oct 5, 2023
b9181e0
add note in deprecations
neuronull Oct 6, 2023
4920c7c
Merge branch 'master' into neuronull/sink_datadog_metrics_v2_series_e…
neuronull Oct 10, 2023
45e78e5
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Oct 10, 2023
7406730
ds feedback logs PR
neuronull Oct 10, 2023
d513eaf
Merge branch 'master' into neuronull/sink_datadog_metrics_v2_series_e…
neuronull Oct 10, 2023
90d9ca8
Merge branch 'neuronull/sink_datadog_metrics_v2_series_endpoint_conve…
neuronull Oct 10, 2023
b7451f5
config pain; start aggregation
neuronull Oct 11, 2023
e7f3953
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Oct 12, 2023
6f7d3b8
Merge branch 'neuronull/dd_e2e_metrics' into neuronull/dd_e2e_metrics…
neuronull Oct 12, 2023
244b9ed
remove dead code allow
neuronull Oct 12, 2023
f3db321
Merge branch 'neuronull/sink_datadog_metrics_v2_series_endpoint_conve…
neuronull Oct 12, 2023
cc35100
move to e2e dir
neuronull Oct 12, 2023
50f2988
improve comparison logic
neuronull Oct 12, 2023
e47a00e
Merge branch 'master' into neuronull/dd_e2e_metrics
neuronull Oct 13, 2023
15e9c83
Merge branch 'neuronull/dd_e2e_metrics' into neuronull/dd_e2e_metrics…
neuronull Oct 13, 2023
9705c12
code reduction
neuronull Oct 13, 2023
93ca197
add sketches, some reorg
neuronull Oct 13, 2023
2dd590a
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Oct 13, 2023
c66de4f
cleanup
neuronull Oct 13, 2023
9125574
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 10, 2024
0ef4238
Merge branch 'master' into neuronull/dd_e2e_metrics
neuronull Jan 12, 2024
2b14940
true up the int test comment changes
neuronull Jan 12, 2024
54fe46d
cleanup
neuronull Jan 12, 2024
48ec676
rework the massaging and comparison model
neuronull Jan 12, 2024
8a166d7
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 12, 2024
61d25be
compare to all versions
neuronull Jan 12, 2024
06277c2
cleanup and address TODO for sketches
neuronull Jan 16, 2024
fe3c31e
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 17, 2024
aa19307
clippy
neuronull Jan 17, 2024
fb7fc57
touchups
neuronull Jan 17, 2024
61c5217
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 19, 2024
c0c2e2f
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 22, 2024
c33af87
fix workflows
neuronull Jan 22, 2024
1e8bfb0
feedback bg
neuronull Jan 24, 2024
af5c4a9
feedback bg
neuronull Jan 24, 2024
c9d33d3
feedback ds: metric type check
neuronull Jan 26, 2024
031cdcc
add descriptive comment
neuronull Jan 30, 2024
773bb24
spelling
neuronull Jan 30, 2024
6da0b03
chore(vdev): refactor e2e tests into own subcommand (#19666)
neuronull Jan 30, 2024
ce73f67
Merge branch 'neuronull/dd_e2e_infra_logs' into neuronull/dd_e2e_metrics
neuronull Jan 30, 2024
34f9e7a
merge conflict
neuronull Jan 30, 2024
12318fb
update workflows
neuronull Jan 30, 2024
68d0fb7
rename
neuronull Jan 30, 2024
5820a0b
fix e2e logic
neuronull Jan 30, 2024
32e133c
fix e2e
neuronull Jan 30, 2024
f11099a
fix e2e
neuronull Jan 30, 2024
5933c06
script usage
neuronull Jan 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ dkr
Dockerfiles
DOOV
Douban
E2ETest
Enot
Evercoss
Explay
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ on:
k8s:
value: ${{ jobs.source.outputs.k8s }}
all-int:
value: ${{ jobs.int_tests.outputs.all-int }}
value: ${{ jobs.int_tests.outputs.all-tests }}
amqp:
value: ${{ jobs.int_tests.outputs.amqp }}
appsignal:
Expand Down Expand Up @@ -116,9 +116,11 @@ on:
value: ${{ jobs.int_tests.outputs.webhdfs }}
# e2e tests
all-e2e:
value: ${{ jobs.e2e_tests.outputs.all-e2e }}
value: ${{ jobs.e2e_tests.outputs.all-tests }}
e2e-datadog-logs:
value: ${{ jobs.e2e_tests.outputs.datadog-logs }}
e2e-datadog-metrics:
value: ${{ jobs.e2e_tests.outputs.datadog-metrics }}

jobs:
# Detects changes that are not specific to integration tests
Expand Down Expand Up @@ -193,7 +195,7 @@ jobs:
runs-on: ubuntu-latest
if: ${{ inputs.int_tests }}
outputs:
all-int: ${{ steps.filter.outputs.all-int}}
all-tests: ${{ steps.filter.outputs.all-tests}}
amqp: ${{ steps.filter.outputs.amqp }}
appsignal: ${{ steps.filter.outputs.appsignal}}
aws: ${{ steps.filter.outputs.aws }}
Expand Down Expand Up @@ -249,16 +251,17 @@ jobs:
runs-on: ubuntu-latest
if: ${{ inputs.e2e_tests }}
outputs:
all-e2e: ${{ steps.filter.outputs.all-int}}
datadog-logs: ${{ steps.filter.outputs.e2e-datadog-logs }}
all-tests: ${{ steps.filter.outputs.all-tests}}
datadog-logs: ${{ steps.filter.outputs.datadog-logs }}
datadog-metrics: ${{ steps.filter.outputs.datadog-metrics }}
steps:
- uses: actions/checkout@v3

# creates a yaml file that contains the filters for each test,
# extracted from the output of the `vdev int ci-paths` command, which
# sources the paths from the scripts/integration/.../test.yaml files
- name: Create filter rules for e2e tests
run: cargo vdev int ci-paths > int_test_filters.yaml
run: cargo vdev e2e ci-paths > int_test_filters.yaml

- uses: dorny/paths-filter@v2
id: filter
Expand Down
13 changes: 12 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
github.event_name == 'schedule' || (
needs.changes.outputs.all-e2e == 'true'
|| needs.changes.outputs.e2e-datadog-logs == 'true'
|| needs.changes.outputs.e2e-datadog-metrics == 'true'
)
)
timeout-minutes: 45
Expand Down Expand Up @@ -81,7 +82,17 @@ jobs:
with:
timeout_minutes: 35
max_attempts: 3
command: bash scripts/ci-integration-test.sh e2e-datadog-logs
command: bash scripts/ci-int-e2e-test.sh e2e datadog-logs

- if: (github.event_name == 'schedule' || needs.changes.outputs.all-e2e == 'true' || needs.changes.outputs.e2e-datadog-metrics == 'true') &&
(github.event_name != 'pull_request' || env.PR_HAS_ACCESS_TO_SECRETS == 'true')
name: e2e-datadog-metrics
uses: nick-fields/retry@v2
with:
timeout_minutes: 35
max_attempts: 3
command: bash scripts/ci-int-e2e-test.sh e2e datadog-metrics


e2e-test-suite:
name: E2E Test Suite
Expand Down
Loading
Loading