Skip to content

Commit e0d4e22

Browse files
Catch invalid patterns exception from dd.data.jobs.command.pattern (#7383)
Catch exception when compiling data jobs command pattern Not failing tracer installation if the pattern is invalid
1 parent c08dc4f commit e0d4e22

File tree

1 file changed

+10
-1
lines changed
  • dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap

1 file changed

+10
-1
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/Agent.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import java.util.EnumSet;
5454
import java.util.concurrent.TimeUnit;
5555
import java.util.concurrent.atomic.AtomicBoolean;
56+
import java.util.regex.PatternSyntaxException;
5657
import org.slf4j.Logger;
5758
import org.slf4j.LoggerFactory;
5859

@@ -1325,6 +1326,14 @@ private static boolean isDataJobsSupported(String javaCommand, String dataJobsCo
13251326
return true;
13261327
}
13271328

1328-
return javaCommand.matches(dataJobsCommandPattern);
1329+
try {
1330+
return javaCommand.matches(dataJobsCommandPattern);
1331+
} catch (PatternSyntaxException e) {
1332+
log.warn(
1333+
"Invalid data jobs command pattern {}. The value must be a valid regex",
1334+
dataJobsCommandPattern);
1335+
}
1336+
1337+
return true;
13291338
}
13301339
}

0 commit comments

Comments
 (0)