Merge branch 'master' into dougqh/tagmap-reset-and-remove-fix

dougqh · web-flow · commit d08c29d98a15 · 2026-01-12T13:13:15.000-05:00
diff --git a/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java b/dd-trace-core/src/main/java/datadog/trace/core/StatusLogger.java
@@ -162,15 +162,17 @@ public void toJson(JsonWriter writer, Config config) throws IOException {
   }
 
   private static boolean agentServiceCheck(Config config) {
-    if (config.getAgentUrl().startsWith("unix:")) {
-      return new File(config.getAgentUnixDomainSocket()).exists();
-    } else {
-      try (Socket s = new Socket()) {
-        s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
-        return true;
-      } catch (IOException ex) {
-        return false;
+    try {
+      if (config.getAgentUrl().startsWith("unix:")) {
+        return new File(config.getAgentUnixDomainSocket()).exists();
+      } else {
+        try (Socket s = new Socket()) {
+          s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);
+          return true;
+        }
       }
+    } catch (Throwable ex) {
+      return false;
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -162,15 +162,17 @@ public void toJson(JsonWriter writer, Config config) throws IOException {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`private static boolean agentServiceCheck(Config config) {`
`165`		`- if (config.getAgentUrl().startsWith("unix:")) {`
`166`		`- return new File(config.getAgentUnixDomainSocket()).exists();`
`167`		`- } else {`
`168`		`- try (Socket s = new Socket()) {`
`169`		`- s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);`
`170`		`- return true;`
`171`		`- } catch (IOException ex) {`
`172`		`- return false;`
	`165`	`+ try {`
	`166`	`+ if (config.getAgentUrl().startsWith("unix:")) {`
	`167`	`+ return new File(config.getAgentUnixDomainSocket()).exists();`
	`168`	`+ } else {`
	`169`	`+ try (Socket s = new Socket()) {`
	`170`	`+ s.connect(new InetSocketAddress(config.getAgentHost(), config.getAgentPort()), 500);`
	`171`	`+ return true;`
	`172`	`+ }`
`173`	`173`	`}`
	`174`	`+ } catch (Throwable ex) {`
	`175`	`+ return false;`
`174`	`176`	`}`
`175`	`177`	`}`
`176`	`178`