Skip to content

Commit 3fb798e

Browse files
committed
feat: install_directory config
1 parent 6454dc3 commit 3fb798e

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

boot/src/main/kotlin/spp/probe/SourceProbe.kt

+1-4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameHelper
3030
import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameParser
3131
import org.apache.skywalking.apm.agent.core.conf.Config
3232
import org.apache.skywalking.apm.agent.core.logging.core.LogLevel
33+
import spp.probe.ProbeConfiguration.PROBE_DIRECTORY
3334
import spp.probe.ProbeConfiguration.PROBE_ID
3435
import spp.probe.ProbeConfiguration.instrumentation
3536
import spp.probe.ProbeConfiguration.probeMessageHeaders
@@ -56,10 +57,6 @@ import java.util.zip.ZipInputStream
5657
object SourceProbe {
5758

5859
private val BUILD = ResourceBundle.getBundle("probe_build")
59-
private var PROBE_DIRECTORY = File(
60-
if (System.getProperty("os.name").lowercase().startsWith("mac"))
61-
"/tmp" else System.getProperty("java.io.tmpdir"), "spp-probe"
62-
)
6360

6461
@JvmField
6562
var vertx: Vertx? = null

boot/src/test/resources/spp-test-probe.yml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ spp:
22
platform_host: ${SPP_PROBE_PLATFORM_HOST:-localhost}
33
platform_port: ${SPP_PROBE_PLATFORM_PORT:-12800}
44
quiet_mode: ${SPP_PROBE_QUIET_MODE:-false}
5+
install_directory: ${SPP_PROBE_INSTALL_DIRECTORY:-/tmp/spp-probe}
56
skywalking:
67
logging:
78
level: ${SW_LOGGING_LEVEL:-INFO}

common/src/main/kotlin/spp/probe/ProbeConfiguration.kt

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ import kotlin.system.exitProcess
3131

3232
object ProbeConfiguration {
3333

34+
val PROBE_DIRECTORY by lazy {
35+
getString("probe_directory")?.let { File(it) }
36+
?: File(System.getProperty("java.io.tmpdir"), "spp-probe")
37+
}
38+
3439
@JvmField
3540
val PROBE_ID = UUID.randomUUID().toString()
3641
var instrumentation: Instrumentation? = null

0 commit comments

Comments
 (0)