Skip to content

Commit e4c4660

Browse files
authored
dynamic attach: fix npe, use ";" as separator instead of "," (#917)
1 parent 38d26e0 commit e4c4660

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

bootstrap/src/main/java/com/grafana/AgentStarted.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public class AgentStarted {
99
@SuppressWarnings("SystemOut")
1010
public static void run(String agentArgs) {
1111
boolean debug = false;
12-
if (!agentArgs.isEmpty()) {
13-
String[] options = agentArgs.split(",");
12+
if (agentArgs != null && !agentArgs.isEmpty()) {
13+
String[] options = agentArgs.split(";");
1414
for (String option : options) {
1515
String[] keyValue = option.split("=");
1616
if (keyValue.length == 2) {

smoke-tests/src/test/java/com/grafana/extensions/smoketest/SmokeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ protected void startTarget(String extraCliArgs) {
8989
MountableFile.forHostPath(agentPath), "/opentelemetry-javaagent.jar")
9090
.withEnv(
9191
"JAVA_TOOL_OPTIONS",
92-
"-javaagent:/opentelemetry-javaagent.jar=grafana.otel.debug-agent-startup=true,"
92+
"-javaagent:/opentelemetry-javaagent.jar=grafana.otel.debug-agent-startup=true;"
9393
+ extraCliArgs)
9494
.withEnv("OTEL_BSP_MAX_EXPORT_BATCH", "1")
9595
.withEnv("OTEL_BSP_SCHEDULE_DELAY", "10")

0 commit comments

Comments
 (0)