V2 proxy instead of v4

Author: gyuheon0h

datadog-crashtracker/src/crash_info/errors_intake.rs

@@ -12,7 +12,7 @@ use ddcommon::Endpoint;
 use http::Uri;
 use serde::Serialize;
 
-const ERROR_INTAKE_AGENT_PATH: &str = "/evp_proxy/v4/api/v2/errorsintake";
+const ERROR_INTAKE_AGENT_PATH: &str = "/evp_proxy/v2/api/v2/errorsintake";
 const ERROR_INTAKE_DIRECT_PATH: &str = "/api/v2/errorsintake";
 const ERROR_INTAKE_SUBDOMAIN: &str = "event-platform-intake";
 
@@ -563,8 +563,8 @@ mod tests {
         assert_eq!(endpoint_9126.url.port_u16(), Some(9126));
         assert_eq!(endpoint_9126.url.path(), ERROR_INTAKE_AGENT_PATH);
 
-        // This should be the URL that gets built for the test environment
-        let expected_url = "http://localhost:9126/evp_proxy/v4/api/v2/errorsintake";
+        // This should be the URL that gets built for the test environment (using v2 to match test agent)
+        let expected_url = "http://localhost:9126/evp_proxy/v2/api/v2/errorsintake";
         assert_eq!(endpoint_9126.url.to_string(), expected_url);
     }
 }

ddtelemetry/src/config.rs

@@ -10,8 +10,7 @@ pub const DEFAULT_DD_SITE: &str = "datadoghq.com";
 pub const PROD_INTAKE_SUBDOMAIN: &str = "instrumentation-telemetry-intake";
 
 const DIRECT_TELEMETRY_URL_PATH: &str = "/api/v2/apmtelemetry";
-// const AGENT_TELEMETRY_URL_PATH: &str = "/telemetry/proxy/api/v2/apmtelemetry";
-const AGENT_TELEMETRY_URL_PATH: &str = "/evp_proxy/v4/api/v2/errorsintake";
+const AGENT_TELEMETRY_URL_PATH: &str = "/telemetry/proxy/api/v2/apmtelemetry";
 
 #[cfg(unix)]
 const TRACE_SOCKET_PATH: &str = "/var/run/datadog/apm.socket";