Merge branch 'main' into rithika.narayan/update-node-version

Author: rithikanarayan

ci/input_files/build.yaml.tpl

@@ -27,7 +27,7 @@ default:
   - apt-get install -y ca-certificates curl gnupg xxd
   - mkdir -p /etc/apt/keyrings
   - curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-  # We are explicitly setting the node_18.x version for the installation
+  # We are explicitly setting the node_20.x version for the installation
   - echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
   - apt-get update
   - apt-get install nodejs -y

datadog_lambda/asm.py

@@ -126,8 +126,8 @@ def asm_start_request(
 
     request_ip = _get_request_header_client_ip(request_headers, peer_ip, True)
     if request_ip is not None:
-        span.set_tag_str("http.client_ip", request_ip)
-        span.set_tag_str("network.client.ip", request_ip)
+        span.set_tag("http.client_ip", request_ip)
+        span.set_tag("network.client.ip", request_ip)
 
     # Encode the parsed query and append it to reconstruct the original raw URI expected by AppSec.
     if parsed_query:

tests/test_asm.py

@@ -331,8 +331,8 @@ def test_asm_start_request_parametrized(
 
     # Check IP tags were set if IP is present
     if expected_ip:
-        mock_span.set_tag_str.assert_any_call("http.client_ip", expected_ip)
-        mock_span.set_tag_str.assert_any_call("network.client.ip", expected_ip)
+        mock_span.set_tag.assert_any_call("http.client_ip", expected_ip)
+        mock_span.set_tag.assert_any_call("network.client.ip", expected_ip)
 
 
 @pytest.mark.parametrize(