From f0a11d4aff87a41abeae507e218aa3091db04306 Mon Sep 17 00:00:00 2001 From: Nikolay Martynov Date: Thu, 20 Feb 2020 08:18:54 -0500 Subject: [PATCH] Make sure traceUrl is null before detecting agent url --- .../trace/common/writer/ddagent/DDAgentApi.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dd-trace-ot/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java b/dd-trace-ot/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java index ab1ab439dd..47beacb9ca 100644 --- a/dd-trace-ot/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java +++ b/dd-trace-ot/src/main/java/datadog/trace/common/writer/ddagent/DDAgentApi.java @@ -291,12 +291,14 @@ public class DDAgentApi { } private synchronized void detectEndpoint() { - final HttpUrl v4Url = getUrl(host, port, TRACES_ENDPOINT_V4); - if (endpointAvailable(v4Url, unixDomainSocketPath, true)) { - tracesUrl = v4Url; - } else { - log.debug("API v0.4 endpoints not available. Downgrading to v0.3"); - tracesUrl = getUrl(host, port, TRACES_ENDPOINT_V3); + if (tracesUrl == null) { + final HttpUrl v4Url = getUrl(host, port, TRACES_ENDPOINT_V4); + if (endpointAvailable(v4Url, unixDomainSocketPath, true)) { + tracesUrl = v4Url; + } else { + log.debug("API v0.4 endpoints not available. Downgrading to v0.3"); + tracesUrl = getUrl(host, port, TRACES_ENDPOINT_V3); + } } }