Remove regex support from sampling rules

Author: PROFeNoM

ext/configuration.c

@@ -76,19 +76,6 @@ static bool dd_parse_dbm_mode(zai_str value, zval *decoded_value, bool persisten
     return true;
 }
 
-static bool dd_parse_sampling_rules_format(zai_str value, zval *decoded_value, bool persistent) {
-    UNUSED(persistent);
-    if (zai_str_eq_ci_cstr(value, "regex")) {
-        ZVAL_LONG(decoded_value, DD_TRACE_SAMPLING_RULES_FORMAT_REGEX);
-    } else if (zai_str_eq_ci_cstr(value, "glob")) {
-        ZVAL_LONG(decoded_value, DD_TRACE_SAMPLING_RULES_FORMAT_GLOB);
-    } else {
-        return false;
-    }
-
-    return true;
-}
-
 #define CALIAS_EXPAND(name) {.ptr = name, .len = sizeof(name) - 1},
 
 #ifndef _WIN32

ext/configuration.h

@@ -23,12 +23,6 @@ enum ddtrace_dbm_propagation_mode {
     DD_TRACE_DBM_PROPAGATION_FULL,
 };
 
-// To remove in 1.0
-enum ddtrace_sampling_rules_format {
-    DD_TRACE_SAMPLING_RULES_FORMAT_REGEX,
-    DD_TRACE_SAMPLING_RULES_FORMAT_GLOB
-};
-
 /* From the curl docs on CONNECT_TIMEOUT_MS:
  *     If libcurl is built to use the standard system name resolver, that
  *     portion of the transfer will still use full-second resolution for
@@ -128,7 +122,6 @@ enum ddtrace_sampling_rules_format {
     CONFIG(INT, DD_TRACE_RATE_LIMIT, "0", .ini_change = zai_config_system_ini_change)                          \
     CALIAS(DOUBLE, DD_TRACE_SAMPLE_RATE, "-1", CALIASES("DD_SAMPLING_RATE"))                                   \
     CONFIG(JSON, DD_TRACE_SAMPLING_RULES, "[]")                                                                \
-    CONFIG(CUSTOM(INT), DD_TRACE_SAMPLING_RULES_FORMAT, "regex", .parser = dd_parse_sampling_rules_format)     \
     CONFIG(JSON, DD_SPAN_SAMPLING_RULES, "[]")                                                                 \
     CONFIG(STRING, DD_SPAN_SAMPLING_RULES_FILE, "", .ini_change = ddtrace_alter_sampling_rules_file_config)    \
     CONFIG(SET_LOWERCASE, DD_TRACE_HEADER_TAGS, "")                                                            \

ext/ddshared.c

@@ -28,7 +28,7 @@ bool dd_glob_rule_is_wildcards_only(zval *pattern) {
     return *p == 0;
 }
 
-bool dd_rule_matches(zval *pattern, zval *prop, int rulesFormat) {
+bool dd_rule_matches(zval *pattern, zval *prop) {
     if (Z_TYPE_P(pattern) != IS_STRING) {
         return false;
     }
@@ -62,12 +62,7 @@ bool dd_rule_matches(zval *pattern, zval *prop, int rulesFormat) {
         }
     }
 
-    bool result;
-    if (rulesFormat == DD_TRACE_SAMPLING_RULES_FORMAT_GLOB) {
-        result = dd_glob_rule_matches(pattern, str);
-    } else {
-        result = zai_match_regex(Z_STR_P(pattern), str);
-    }
+    bool result = dd_glob_rule_matches(pattern, str);;
     zend_string_release(str);
     return result;
 }

ext/ddshared.h

@@ -6,7 +6,7 @@
 extern zend_string *ddtrace_php_version;
 
 void ddshared_minit(void);
-bool dd_rule_matches(zval *pattern, zval *prop, int rulesFormat);
+bool dd_rule_matches(zval *pattern, zval *prop);
 bool dd_glob_rule_matches(zval *pattern, zend_string* value);
 
 #endif  // DD_TRACE_SHARED_H

ext/priority_sampling/priority_sampling.c

@@ -64,18 +64,18 @@ static bool dd_check_sampling_rule(zend_array *rule, ddtrace_span_data *span) {
             if (!mapped_service) {
                 mapped_service = service;
             }
-            if (!dd_rule_matches(rule_pattern, mapped_service, get_DD_TRACE_SAMPLING_RULES_FORMAT())) {
+            if (!dd_rule_matches(rule_pattern, mapped_service)) {
                 return false;
             }
         }
     }
     if ((rule_pattern = zend_hash_str_find(rule, ZEND_STRL("name")))) {
-        if (!dd_rule_matches(rule_pattern, &span->property_name, get_DD_TRACE_SAMPLING_RULES_FORMAT())) {
+        if (!dd_rule_matches(rule_pattern, &span->property_name)) {
             return false;
         }
     }
     if ((rule_pattern = zend_hash_str_find(rule, ZEND_STRL("resource")))) {
-        if (!dd_rule_matches(rule_pattern, &span->property_resource, get_DD_TRACE_SAMPLING_RULES_FORMAT())) {
+        if (!dd_rule_matches(rule_pattern, &span->property_resource)) {
             return false;
         }
     }
@@ -90,7 +90,7 @@ static bool dd_check_sampling_rule(zend_array *rule, ddtrace_span_data *span) {
                 if (!(value = zend_hash_find(meta, tag_name)) && !(value = zend_hash_find(metrics, tag_name))) {
                     return false;
                 }
-                if (!dd_rule_matches(rule_pattern, value, get_DD_TRACE_SAMPLING_RULES_FORMAT())) {
+                if (!dd_rule_matches(rule_pattern, value)) {
                     return false;
                 }
             }

tests/ext/priority_sampling/005-rule-name.phpt

@@ -1,7 +1,7 @@
 --TEST--
 priority_sampling rule with name match
 --ENV--
-DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "name": "bar"},{"sample_rate": 0.3, "name": "foo"}]
+DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "name": "bar"},{"sample_rate": 0.3, "name": "foo*"}]
 DD_TRACE_GENERATE_ROOT_SPAN=1
 --FILE--
 <?php

tests/ext/priority_sampling/007-rule-service.phpt

@@ -1,7 +1,7 @@
 --TEST--
 priority_sampling rule with service match
 --ENV--
-DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "service": "bar"},{"sample_rate": 0.3, "service": "foo"}]
+DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "service": "bar"},{"sample_rate": 0.3, "service": "foo*?"}]
 DD_TRACE_GENERATE_ROOT_SPAN=1
 --SKIPIF--
 <?php

tests/ext/priority_sampling/009-rule-name-service.phpt

@@ -1,7 +1,7 @@
 --TEST--
 priority_sampling rule with name and service match
 --ENV--
-DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.3, "name": "fo.*ame", "service": "bar"}, {"sample_rate": 0.7}]
+DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.3, "name": "fo*ame", "service": "barservic?"}, {"sample_rate": 0.7}]
 DD_TRACE_GENERATE_ROOT_SPAN=1
 --FILE--
 <?php

tests/ext/priority_sampling/014-rule-resource.phpt

@@ -1,7 +1,7 @@
 --TEST--
 priority_sampling rule with resource match
 --ENV--
-DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "resource": "bar"},{"sample_rate": 0.3, "resource": "foo"}]
+DD_TRACE_SAMPLING_RULES=[{"sample_rate": 0.7, "resource": "*bar*"},{"sample_rate": 0.3, "resource": "*foo*"}]
 DD_TRACE_GENERATE_ROOT_SPAN=1
 --SKIPIF--
 <?php

tests/ext/priority_sampling/021-rule-name-as-glob-with-question-mark.phpt

@@ -2,7 +2,6 @@
 priority_sampling rule with name match, using glob
 --ENV--
 DD_TRACE_GENERATE_ROOT_SPAN=1
-DD_TRACE_SAMPLING_RULES_FORMAT=glob
 --FILE--
 <?php