Merge pull request #34 from sourceplusplus/bump

bump

Author: BFergerson

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

@@ -25,12 +25,12 @@ class LiveBreakpointTest : ProbeIntegrationTest() {
         val testContext = VertxTestContext()
         val consumer = vertx.eventBus().localConsumer<JsonObject>("local." + Provide.LIVE_INSTRUMENT_SUBSCRIBER)
         consumer.handler {
-            val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
-            log.trace("Received event: $event")
+            testContext.verify {
+                val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
+                log.trace("Received event: $event")
 
-            if (event.eventType == LiveInstrumentEventType.BREAKPOINT_HIT) {
-                val item = Json.decodeValue(event.data, LiveBreakpointHit::class.java)
-                testContext.verify {
+                if (event.eventType == LiveInstrumentEventType.BREAKPOINT_HIT) {
+                    val item = Json.decodeValue(event.data, LiveBreakpointHit::class.java)
                     val vars = item.stackTrace.first().variables
                     assertEquals(9, vars.size)
                 }

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

@@ -25,12 +25,12 @@ class LiveLogTest : ProbeIntegrationTest() {
         val testContext = VertxTestContext()
         val consumer = vertx.eventBus().localConsumer<JsonObject>("local." + Provide.LIVE_INSTRUMENT_SUBSCRIBER)
         consumer.handler {
-            val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
-            log.trace("Received event: $event")
+            testContext.verify {
+                val event = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java)
+                log.trace("Received event: $event")
 
-            if (event.eventType == LiveInstrumentEventType.LOG_HIT) {
-                val item = Json.decodeValue(event.data, LiveLogHit::class.java)
-                testContext.verify {
+                if (event.eventType == LiveInstrumentEventType.LOG_HIT) {
+                    val item = Json.decodeValue(event.data, LiveLogHit::class.java)
                     assertEquals("1 a a", item.logResult.logs.first().getFormattedMessage())
                 }
                 consumer.unregister()

e2e/config/logback.xml

@@ -23,11 +23,12 @@ services:
       - "5445:5445"
       - "5450:5450"
       - "5455:5455"
+    environment:
+      - SPP_LOGGING_LEVEL=trace
+      - SPP_OAP_HOST=skywalking-oap
     volumes:
-      - ./config/logback.xml:/opt/sourceplusplus/config/logback.xml
       - ./config/spp-platform.crt:/opt/sourceplusplus/config/spp-platform.crt
       - ./config/spp-platform.key:/opt/sourceplusplus/config/spp-platform.key
-      - ./config/spp-platform.yml:/opt/sourceplusplus/config/spp-platform.yml
   skywalking-oap:
     image: sourceplusplus/spp-oap-server:latest
     container_name: skywalking-oap