Skip to content

Commit 30a8607

Browse files
authored
Merge pull request #51 from sourceplusplus/dev
v0.4.3
2 parents 9816d80 + 2437b37 commit 30a8607

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,13 +117,25 @@ object ProbeConfiguration {
117117
get() {
118118
val settings = toProperties(rawProperties).stream()
119119
.filter { it[0].startsWith("skywalking.") }
120-
.collect(Collectors.toList())
120+
.collect(Collectors.toList()).toMutableList()
121+
getSkyWalkingDefaults()
122+
.filter { default -> settings.stream().noneMatch { it[0] == default[0] } }
123+
.forEach { settings.add(it) }
121124
if (settings.stream().noneMatch { it[0] == "skywalking.agent.service_name" } ||
122125
settings.stream().noneMatch { it[0] == "skywalking.collector.backend_service" }) {
123126
throw RuntimeException("Missing Apache SkyWalking setup configuration")
124127
}
125128
return settings
126129
}
130+
131+
private fun getSkyWalkingDefaults(): MutableSet<Array<String>> {
132+
return mutableSetOf(
133+
arrayOf("skywalking.agent.is_cache_enhanced_class", "true"),
134+
arrayOf("skywalking.agent.class_cache_mode", "FILE"),
135+
arrayOf("skywalking.plugin.toolkit.log.transmit_formatted", "false")
136+
)
137+
}
138+
127139
val sppSettings: List<Array<String>>
128140
get() = toProperties(rawProperties).stream()
129141
.filter { it[0].startsWith("spp.") }

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kotlin.code.style=official
22

33
probeGroup=spp.probe
4-
projectVersion=0.4.2
4+
projectVersion=0.4.3
55

66
vertxVersion=4.2.4
77

0 commit comments

Comments
 (0)