Skip to content

Commit cfc4e06

Browse files
estringanaestringana
committed
Rename rasp telemetry name
1 parent c21468f commit cfc4e06

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

‎appsec/src/extension/commands_helpers.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -751,9 +751,9 @@ void _handle_telemetry_metric(const char *nonnull key_str, size_t key_len,
751751
HANDLE_METRIC("remote_config.last_success", DDTRACE_METRIC_TYPE_GAUGE);
752752

753753
// Rasp
754-
HANDLE_METRIC("appsec.rasp.timeout", DDTRACE_METRIC_TYPE_COUNT);
755-
HANDLE_METRIC("appsec.rasp.rule.match", DDTRACE_METRIC_TYPE_COUNT);
756-
HANDLE_METRIC("appsec.rasp.rule.eval", DDTRACE_METRIC_TYPE_COUNT);
754+
HANDLE_METRIC("rasp.timeout", DDTRACE_METRIC_TYPE_COUNT);
755+
HANDLE_METRIC("rasp.rule.match", DDTRACE_METRIC_TYPE_COUNT);
756+
HANDLE_METRIC("rasp.rule.eval", DDTRACE_METRIC_TYPE_COUNT);
757757

758758
mlog_g(dd_log_info, "Unknown telemetry metric %.*s", (int)key_len, key_str);
759759
}

‎appsec/src/helper/metrics.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ constexpr std::string_view waf_duration = "_dd.appsec.waf.duration";
102102
constexpr std::string_view rasp_duration = "_dd.appsec.rasp.duration";
103103
constexpr std::string_view rasp_rule_eval = "_dd.appsec.rasp.rule.eval";
104104
constexpr std::string_view rasp_timeout = "_dd.appsec.rasp.timeout";
105-
constexpr std::string_view telemetry_rasp_rule_eval = "appsec.rasp.rule.eval";
106-
constexpr std::string_view telemetry_rasp_rule_match = "appsec.rasp.rule.match";
107-
constexpr std::string_view telemetry_rasp_timeout = "appsec.rasp.timeout";
105+
constexpr std::string_view telemetry_rasp_rule_eval = "rasp.rule.eval";
106+
constexpr std::string_view telemetry_rasp_rule_match = "rasp.rule.match";
107+
constexpr std::string_view telemetry_rasp_timeout = "rasp.timeout";
108108

109109
} // namespace dds::metrics
110110

‎appsec/tests/helper/waf_test.cpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,15 @@ TEST(WafTest, ValidRunGood)
185185
metrics::telemetry_tags::from_string(
186186
std::string{"event_rules_version:1.2.3,waf_version:"} +
187187
ddwaf_get_version())));
188-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.eval"sv, 1,
188+
EXPECT_CALL(submitm, submit_metric("rasp.rule.eval"sv, 1,
189189
metrics::telemetry_tags::from_string(
190190
std::string{"rule_type:lfi,waf_version:"} +
191191
ddwaf_get_version())));
192-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.match"sv, 0,
192+
EXPECT_CALL(submitm, submit_metric("rasp.rule.match"sv, 0,
193193
metrics::telemetry_tags::from_string(
194194
std::string{"rule_type:lfi,waf_version:"} +
195195
ddwaf_get_version())));
196-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.timeout"sv, 0,
196+
EXPECT_CALL(submitm, submit_metric("rasp.timeout"sv, 0,
197197
metrics::telemetry_tags::from_string(
198198
std::string{"rule_type:lfi,waf_version:"} +
199199
ddwaf_get_version())));
@@ -715,31 +715,31 @@ TEST(WafTest, TelemetryIsSent)
715715

716716
// SSRF
717717
EXPECT_CALL(
718-
submitm, submit_metric("appsec.rasp.rule.eval"sv, 2,
718+
submitm, submit_metric("rasp.rule.eval"sv, 2,
719719
metrics::telemetry_tags::from_string(
720720
std::string{"rule_type:ssrf,waf_version:"} +
721721
ddwaf_get_version())));
722722
EXPECT_CALL(
723-
submitm, submit_metric("appsec.rasp.rule.match"sv, 1,
723+
submitm, submit_metric("rasp.rule.match"sv, 1,
724724
metrics::telemetry_tags::from_string(
725725
std::string{"rule_type:ssrf,waf_version:"} +
726726
ddwaf_get_version())));
727727
EXPECT_CALL(
728-
submitm, submit_metric("appsec.rasp.timeout"sv, 0,
728+
submitm, submit_metric("rasp.timeout"sv, 0,
729729
metrics::telemetry_tags::from_string(
730730
std::string{"rule_type:ssrf,waf_version:"} +
731731
ddwaf_get_version())));
732732

733733
// LFI
734-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.eval"sv, 1,
734+
EXPECT_CALL(submitm, submit_metric("rasp.rule.eval"sv, 1,
735735
metrics::telemetry_tags::from_string(
736736
std::string{"rule_type:lfi,waf_version:"} +
737737
ddwaf_get_version())));
738-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.match"sv, 1,
738+
EXPECT_CALL(submitm, submit_metric("rasp.rule.match"sv, 1,
739739
metrics::telemetry_tags::from_string(
740740
std::string{"rule_type:lfi,waf_version:"} +
741741
ddwaf_get_version())));
742-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.timeout"sv, 0,
742+
EXPECT_CALL(submitm, submit_metric("rasp.timeout"sv, 0,
743743
metrics::telemetry_tags::from_string(
744744
std::string{"rule_type:lfi,waf_version:"} +
745745
ddwaf_get_version())));
@@ -781,15 +781,15 @@ TEST(WafTest, TelemetryTimeoutMetric)
781781
std::string{"event_rules_version:1.2.3,waf_version:"} +
782782
ddwaf_get_version() + std::string{",waf_timeout:true"})));
783783

784-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.eval"sv, 1,
784+
EXPECT_CALL(submitm, submit_metric("rasp.rule.eval"sv, 1,
785785
metrics::telemetry_tags::from_string(
786786
std::string{"rule_type:lfi,waf_version:"} +
787787
ddwaf_get_version())));
788-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.rule.match"sv, 0,
788+
EXPECT_CALL(submitm, submit_metric("rasp.rule.match"sv, 0,
789789
metrics::telemetry_tags::from_string(
790790
std::string{"rule_type:lfi,waf_version:"} +
791791
ddwaf_get_version())));
792-
EXPECT_CALL(submitm, submit_metric("appsec.rasp.timeout"sv, 1,
792+
EXPECT_CALL(submitm, submit_metric("rasp.timeout"sv, 1,
793793
metrics::telemetry_tags::from_string(
794794
std::string{"rule_type:lfi,waf_version:"} +
795795
ddwaf_get_version())));

‎appsec/tests/integration/src/test/groovy/com/datadog/appsec/php/integration/TelemetryTests.groovy

+6-6
Original file line numberDiff line numberDiff line change
@@ -343,12 +343,12 @@ class TelemetryTests {
343343
waitForMetrics(30) { List<TelemetryHelpers.GenerateMetrics> messages ->
344344
def allSeries = messages.collectMany { it.series }
345345
wafReq1 = allSeries.find { it.name == 'waf.requests' && it.tags.size() == 2 }
346-
lfiEval = allSeries.find{ it.name == 'appsec.rasp.rule.eval' && 'rule_type:lfi' in it.tags}
347-
lfiMatch = allSeries.find{ it.name == 'appsec.rasp.rule.match' && 'rule_type:lfi' in it.tags}
348-
lfiTimeout = allSeries.find{ it.name == 'appsec.rasp.timeout' && 'rule_type:lfi' in it.tags}
349-
ssrfEval = allSeries.find{ it.name == 'appsec.rasp.rule.eval' && 'rule_type:ssrf' in it.tags}
350-
ssrfMatch = allSeries.find{ it.name == 'appsec.rasp.rule.match' && 'rule_type:ssrf' in it.tags}
351-
ssrfTimeout = allSeries.find{ it.name == 'appsec.rasp.timeout' && 'rule_type:lfi' in it.tags}
346+
lfiEval = allSeries.find{ it.name == 'rasp.rule.eval' && 'rule_type:lfi' in it.tags}
347+
lfiMatch = allSeries.find{ it.name == 'rasp.rule.match' && 'rule_type:lfi' in it.tags}
348+
lfiTimeout = allSeries.find{ it.name == 'rasp.timeout' && 'rule_type:lfi' in it.tags}
349+
ssrfEval = allSeries.find{ it.name == 'rasp.rule.eval' && 'rule_type:ssrf' in it.tags}
350+
ssrfMatch = allSeries.find{ it.name == 'rasp.rule.match' && 'rule_type:ssrf' in it.tags}
351+
ssrfTimeout = allSeries.find{ it.name == 'rasp.timeout' && 'rule_type:lfi' in it.tags}
352352

353353
wafReq1 && lfiEval && ssrfEval && lfiMatch && ssrfMatch && lfiTimeout && ssrfTimeout
354354
}

0 commit comments

Comments
 (0)