Skip to content

Commit 9418aa0

Browse files
committed
chore: migrate to JDK_JAVA_OPTIONS
1 parent b21020e commit 9418aa0

File tree

1 file changed

+16
-11
lines changed

1 file changed

+16
-11
lines changed

backend/jvm/build.gradle.kts

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,25 @@ jib {
7171
container {
7272
appRoot = "/app"
7373
ports = listOf("8080", "9898")
74-
entrypoint = buildList {
75-
add("java")
76-
add("-javaagent:${appRoot}/otel/otel-javaagent.jar")
77-
addAll(runJvmArgs.map { it.replace(tmp, "/tmp/") })
78-
add("-cp")
79-
add("@${appRoot}/jib-classpath-file")
80-
add("@${appRoot}/jib-main-class-file")
81-
}
82-
74+
entrypoint =
75+
listOf(
76+
"java",
77+
"-cp",
78+
"@${appRoot}/jib-classpath-file",
79+
"@${appRoot}/jib-main-class-file",
80+
)
8381
environment =
8482
mapOf(
85-
"OTEL_JAVAAGENT_ENABLED" to "true",
86-
"OTEL_JAVAAGENT_LOGGING" to "application",
83+
"JDK_JAVA_OPTIONS" to
84+
buildList {
85+
add("-javaagent:${appRoot}/otel/otel-javaagent.jar")
86+
addAll(runJvmArgs.map { it.replace(tmp, "/tmp/") })
87+
}
88+
.joinToString(" "),
8789
"OTEL_EXPERIMENTAL_CONFIG_FILE" to "${appRoot}/otel/sdk-config.yaml",
90+
// "OTEL_JAVAAGENT_EXTENSIONS" to "${appRoot}/otel/extensions",
91+
// "OTEL_JAVAAGENT_ENABLED" to "true",
92+
// "OTEL_JAVAAGENT_LOGGING" to "application",
8893
)
8994

9095
args = listOf(project.name, project.version.toString())

0 commit comments

Comments
 (0)