Skip to content

Commit a0dfef9

Browse files
committed
Normalized formatting.
1 parent 55a3fe9 commit a0dfef9

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

src/Contrast.K8s.AgentOperator/Core/Reactions/Injecting/Patching/Agents/JavaAgentPatcher.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,17 @@ public void PatchContainer(V1Container container, PatchingContext context)
3030
&& GetFirstOrDefaultEnvVar(container.Env, "CONTRAST_EXISTING_JAVA_TOOL_OPTIONS") is null)
3131
{
3232
var contrastAgentArgument = GetContrastAgentArgument(context);
33+
3334
//Parse and patch the existing JAVA_TOOL_OPTIONS
3435
container.Env.AddOrUpdate(new V1EnvVar("CONTRAST_EXISTING_JAVA_TOOL_OPTIONS", currentJavaToolOptions));
36+
3537
try
3638
{
3739
var options = JavaArgumentParser.ParseArguments(currentJavaToolOptions).ToList();
40+
3841
//Patch contrast-agent.jar to the correct path
39-
var contrastJavaAgentIndex = options.FindIndex(x => x.StartsWith("-javaagent", StringComparison.OrdinalIgnoreCase) && x.Contains("contrast-agent.jar", StringComparison.OrdinalIgnoreCase));
42+
var contrastJavaAgentIndex = options.FindIndex(x => x.StartsWith("-javaagent", StringComparison.OrdinalIgnoreCase)
43+
&& x.Contains("contrast-agent.jar", StringComparison.OrdinalIgnoreCase));
4044
if (contrastJavaAgentIndex >= 0)
4145
{
4246
options[contrastJavaAgentIndex] = contrastAgentArgument;
@@ -45,11 +49,12 @@ public void PatchContainer(V1Container container, PatchingContext context)
4549
{
4650
options.Insert(0, contrastAgentArgument);
4751
}
52+
4853
container.Env.AddOrUpdate(new V1EnvVar("JAVA_TOOL_OPTIONS", string.Join(' ', options)));
4954
}
5055
catch (Exception e)
5156
{
52-
Logger.Warn(e, $"Failed to parse existing JAVA_TOOL_OPTIONS, unable to patch!");
57+
Logger.Warn(e, "Failed to parse existing JAVA_TOOL_OPTIONS, unable to patch!");
5358
}
5459
}
5560
}
@@ -59,9 +64,8 @@ public void PatchContainer(V1Container container, PatchingContext context)
5964
return collection.FirstOrDefault(x => string.Equals(x.Name, name, StringComparison.OrdinalIgnoreCase));
6065
}
6166

62-
private string GetContrastAgentArgument(PatchingContext context) => $"-javaagent:{context.ContrastMountPath}/contrast-agent.jar";
67+
private static string GetContrastAgentArgument(PatchingContext context) => $"-javaagent:{context.ContrastMountPath}/contrast-agent.jar";
6368

6469
public string GetMountPath() => "/opt/contrast";
65-
6670
}
6771
}

0 commit comments

Comments
 (0)