Skip to content

bump #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jan 31, 2022
Merged

bump #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27ab175
bump
BFergerson Jan 31, 2022
0dc480c
default
BFergerson Jan 31, 2022
02c9cd2
simplify
BFergerson Jan 31, 2022
d881ce2
logging
BFergerson Jan 31, 2022
0173f38
Update gradle.properties
BFergerson Jan 31, 2022
ac34cac
expand verify scope
BFergerson Jan 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions control/src/test/kotlin/integration/LiveBreakpointTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
10 changes: 5 additions & 5 deletions control/src/test/kotlin/integration/LiveLogTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
45 changes: 0 additions & 45 deletions e2e/config/logback.xml
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions e2e/config/spp-platform.yml
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions e2e/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down