Merge pull request #46 from sourceplusplus/dev

Dev

Author: BFergerson

control/build.gradle.kts

@@ -25,7 +25,6 @@ tasks.getByName<JavaCompile>("compileJava") {
 dependencies {
     compileOnly("org.apache.skywalking:apm-agent-core:$skywalkingAgentVersion")
     implementation("io.vertx:vertx-tcp-eventbus-bridge:$vertxVersion")
-    implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
     implementation("com.github.sourceplusplus.protocol:protocol:$projectVersion") {
         isTransitive = false
@@ -41,10 +40,6 @@ dependencies {
     testImplementation("io.vertx:vertx-service-proxy:$vertxVersion")
     testImplementation("io.vertx:vertx-service-discovery:$vertxVersion")
     testImplementation("io.vertx:vertx-lang-kotlin-coroutines:$vertxVersion")
-    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
-    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion")
-    testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-guava:$jacksonVersion")
-    testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:$jacksonVersion")
 }
 
 tasks.getByName<Test>("test") {
@@ -148,5 +143,8 @@ tasks.getByName<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("sha
     relocate("org.yaml", "spp.probe.common.org.yaml")
     relocate("io", "spp.probe.common.io")
     relocate("com.fasterxml", "spp.probe.common.com.fasterxml")
+
+    //need to move marshall package to allow probe to observe platform
+    relocate("spp.protocol.marshall", "spp.protocol")
 }
 tasks.getByName("jar").dependsOn("shadowJar")

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

@@ -26,7 +26,7 @@ import org.apache.skywalking.apm.agent.core.context.util.ThrowableTransformer
 import org.apache.skywalking.apm.agent.core.plugin.WitnessFinder
 import spp.probe.ProbeConfiguration
 import spp.probe.SourceProbe
-import spp.protocol.ProtocolMarshaller
+import spp.protocol.marshall.ProtocolMarshaller
 import spp.protocol.instrument.*
 import spp.protocol.instrument.command.CommandType
 import spp.protocol.instrument.command.LiveInstrumentCommand

control/src/main/resources/build.properties

@@ -33,7 +33,7 @@ import spp.protocol.instrument.event.LiveInstrumentEvent
 import spp.protocol.instrument.event.LiveInstrumentEventType
 import java.util.concurrent.TimeUnit
 
-class LiveBreakpointTest : ProbeIntegrationTest() {
+class ProbeBreakpointTest : ProbeIntegrationTest() {
 
     @Test
     fun testPrimitives() = runBlocking {

control/src/test/kotlin/integration/LiveBreakpointTest.kt renamed to control/src/test/kotlin/integration/ProbeBreakpointTest.kt

@@ -36,7 +36,7 @@ import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.extension.ExtendWith
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import spp.protocol.ProtocolMarshaller
+import spp.protocol.marshall.ProtocolMarshaller
 import spp.protocol.SourceServices
 import spp.protocol.SourceServices.Provide.toLiveInstrumentSubscriberAddress
 import spp.protocol.extend.TCPServiceFrameParser
@@ -68,7 +68,6 @@ abstract class ProbeIntegrationTest {
         @JvmStatic
         fun setup() = runBlocking {
             vertx = Vertx.vertx()
-            ProtocolMarshaller.setupCodecs(vertx)
 
             val socket = setupTcp(vertx)
             socket.handler(FrameParser(TCPServiceFrameParser(vertx, socket)))

control/src/test/kotlin/integration/ProbeIntegrationTest.kt

@@ -33,7 +33,7 @@ import spp.protocol.instrument.event.LiveInstrumentEventType
 import spp.protocol.instrument.event.LiveLogHit
 import java.util.concurrent.TimeUnit
 
-class LiveLogTest : ProbeIntegrationTest() {
+class ProbeLogTest : ProbeIntegrationTest() {
 
     @Test
     fun testPrimitives() = runBlocking {

control/src/test/kotlin/integration/LiveLogTest.kt renamed to control/src/test/kotlin/integration/ProbeLogTest.kt

@@ -1,7 +1,7 @@
 kotlin.code.style=official
 
 probeGroup=spp.probe
-projectVersion=0.4.1
+projectVersion=0.4.2
 
 vertxVersion=4.2.4