Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 1 addition & 13 deletions manifests/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -564,19 +564,7 @@ manifest:
tests/appsec/waf/test_rules.py::Test_RFI: v1.28.6
tests/appsec/waf/test_rules.py::Test_SSRF: v1.28.6
tests/appsec/waf/test_rules.py::Test_Scanners: v1.28.6
tests/appsec/waf/test_telemetry.py::Test_TelemetryMetrics: # Modified by easy win activation script
- weblog_declaration:
'*': missing_feature
uds: '>=3.36.0'
poc: '>=3.36.0'
tests/appsec/waf/test_telemetry.py::Test_TelemetryMetrics::test_headers_are_correct: # Created by easy win activation script
- weblog_declaration:
uds: missing_feature
poc: missing_feature
tests/appsec/waf/test_telemetry.py::Test_TelemetryMetrics::test_waf_requests_match_traced_requests: # Created by easy win activation script
- weblog_declaration:
uds: missing_feature
poc: missing_feature
tests/appsec/waf/test_telemetry.py::Test_TelemetryMetrics: v3.37.0
tests/appsec/waf/test_truncation.py::Test_Truncation: missing_feature
tests/auto_inject/test_auto_inject_install.py::TestContainerAutoInjectInstallScriptAppsec: v3.36.0
tests/auto_inject/test_auto_inject_install.py::TestContainerAutoInjectInstallScriptProfiling: bug (PROF-12209)
Expand Down
14 changes: 10 additions & 4 deletions tests/appsec/waf/test_telemetry.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,15 @@ def test_waf_requests_match_traced_requests(self):
for series in self._find_series(TELEMETRY_REQUEST_TYPE_GENERATE_METRICS, "appsec", expected_metric_name):
for point in series["points"]:
total_requests_metric += point[1]
assert total_requests_metric == request_count, (
"Number of requests in traces do not match waf.requests metric total"
)

if context.library == "dotnet":
assert total_requests_metric >= request_count, (
"Number of requests in traces do nois higher than waf.requests metric total"
)
else:
assert total_requests_metric == request_count, (
"Number of requests in traces do not match waf.requests metric total"
)

def _find_series(self, request_type: str, namespace: str, metric: str):
series = []
Expand Down Expand Up @@ -243,7 +249,7 @@ def _validate_headers(headers: list[list[str]], request_type: str):
elif context.library > "nodejs@4.20.0":
# APM Node.js migrates Telemetry to V2
expected_headers["DD-Telemetry-API-Version"] = "v2"
elif context.library >= "java@1.23.0" or context.library >= "golang@2.0.0":
elif context.library >= "java@1.23.0" or context.library >= "golang@2.0.0" or context.library == "dotnet":
expected_headers["DD-Telemetry-API-Version"] = "v2"
else:
expected_headers["DD-Telemetry-API-Version"] = "v1"
Expand Down
Loading