From 6e7b4e6dbf53656d123668d3a686826232a48258 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 31 Jan 2022 19:08:21 -0500 Subject: [PATCH 01/18] refactor --- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index 271dc38..bf39406 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -144,7 +144,7 @@ class SubscribeView : CliktCommand( Int.MAX_VALUE ) logsResult.logs.forEach { - println(it.getFormattedMessage()) + println(it.toFormattedMessage()) } } } From ae5992bc80a86c3c24d418e9431ed725576ccbaf Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 31 Jan 2022 23:37:47 -0500 Subject: [PATCH 02/18] bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 57b98f1..79f7733 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.code.style=official cliGroup=com.sourceplusplus -projectVersion=0.3.0 +projectVersion=0.3.1 vertxVersion=4.2.4 graalVersion = 21.3.0 From f2d6300e500f7bab75d098274c23942d92a24af3 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 13:53:44 -0500 Subject: [PATCH 03/18] refactor --- src/test/kotlin/integration/BatchLiveInstrumentCLI.kt | 2 +- src/test/kotlin/integration/CLIIntegrationTest.kt | 8 ++++---- src/test/kotlin/integration/LiveInstrumentCLI.kt | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt b/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt index 7c4ad63..ee0ef38 100644 --- a/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt +++ b/src/test/kotlin/integration/BatchLiveInstrumentCLI.kt @@ -22,8 +22,8 @@ import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull import org.junit.jupiter.api.Test import spp.cli.Main +import spp.protocol.instrument.LiveBreakpoint import spp.protocol.instrument.LiveInstrument -import spp.protocol.instrument.breakpoint.LiveBreakpoint class BatchLiveInstrumentCLI : CLIIntegrationTest() { diff --git a/src/test/kotlin/integration/CLIIntegrationTest.kt b/src/test/kotlin/integration/CLIIntegrationTest.kt index 6db3156..1ff0917 100644 --- a/src/test/kotlin/integration/CLIIntegrationTest.kt +++ b/src/test/kotlin/integration/CLIIntegrationTest.kt @@ -22,10 +22,10 @@ import io.vertx.core.json.Json import io.vertx.core.json.JsonArray import io.vertx.core.json.jackson.DatabindCodec import spp.cli.Main -import spp.protocol.instrument.breakpoint.LiveBreakpoint -import spp.protocol.instrument.log.LiveLog -import spp.protocol.instrument.meter.LiveMeter -import spp.protocol.instrument.span.LiveSpan +import spp.protocol.instrument.LiveBreakpoint +import spp.protocol.instrument.LiveLog +import spp.protocol.instrument.LiveMeter +import spp.protocol.instrument.LiveSpan import java.io.OutputStream import java.io.PrintStream import kotlin.reflect.KClass diff --git a/src/test/kotlin/integration/LiveInstrumentCLI.kt b/src/test/kotlin/integration/LiveInstrumentCLI.kt index 5a1d863..bc4a444 100644 --- a/src/test/kotlin/integration/LiveInstrumentCLI.kt +++ b/src/test/kotlin/integration/LiveInstrumentCLI.kt @@ -17,13 +17,13 @@ */ package integration -import spp.protocol.instrument.LiveInstrument -import spp.protocol.instrument.breakpoint.LiveBreakpoint -import spp.protocol.instrument.log.LiveLog import io.vertx.core.json.Json import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test import spp.cli.Main +import spp.protocol.instrument.LiveBreakpoint +import spp.protocol.instrument.LiveInstrument +import spp.protocol.instrument.LiveLog class LiveInstrumentCLI : CLIIntegrationTest() { From 89f9c80d4e314165c5ccadcf3809ed1b166ff2e5 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 15:54:52 -0500 Subject: [PATCH 04/18] refactor --- .../cli/commands/instrument/SubscribeEvents.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 7ac4ea5..590ef39 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -39,10 +39,9 @@ import spp.protocol.SourceMarkerServices import spp.protocol.extend.TCPServiceFrameParser import spp.protocol.instrument.LiveInstrumentEvent import spp.protocol.instrument.LiveInstrumentEventType +import spp.protocol.instrument.LiveInstrumentRemoved import spp.protocol.instrument.breakpoint.event.LiveBreakpointHit -import spp.protocol.instrument.breakpoint.event.LiveBreakpointRemoved import spp.protocol.instrument.log.event.LiveLogHit -import spp.protocol.instrument.log.event.LiveLogRemoved class SubscribeEvents : CliktCommand( help = "Listens for and outputs live events. Subscribes to all events by default" @@ -107,15 +106,9 @@ class SubscribeEvents : CliktCommand( return@consumer } } - LiveInstrumentEventType.BREAKPOINT_REMOVED -> { - val breakpointRemoved = Json.decodeValue(liveEvent.data, LiveBreakpointRemoved::class.java) - if (breakpointRemoved.breakpointId !in instrumentIds) { - return@consumer - } - } - LiveInstrumentEventType.LOG_REMOVED -> { - val logRemoved = Json.decodeValue(liveEvent.data, LiveLogRemoved::class.java) - if (logRemoved.logId !in instrumentIds) { + LiveInstrumentEventType.BREAKPOINT_REMOVED, LiveInstrumentEventType.LOG_REMOVED -> { + val logRemoved = Json.decodeValue(liveEvent.data, LiveInstrumentRemoved::class.java) + if (logRemoved.liveInstrument.id !in instrumentIds) { return@consumer } } From e8f2f139025f90f4e686fb9f4564c688a6141f1a Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 16:00:18 -0500 Subject: [PATCH 05/18] ignore generated --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 63c8711..2a23f7b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -152,6 +152,7 @@ apollo { spotless { kotlin { + targetExclude("**/generated/**") licenseHeaderFile(file("LICENSE-HEADER.txt")) } } From c6bcaed65166f06e9d4f7d0f7d10da8dd90e35b4 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 16:29:44 -0500 Subject: [PATCH 06/18] refactor --- .../kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 590ef39..265ecbe 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -37,11 +37,7 @@ import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI import spp.protocol.SourceMarkerServices import spp.protocol.extend.TCPServiceFrameParser -import spp.protocol.instrument.LiveInstrumentEvent -import spp.protocol.instrument.LiveInstrumentEventType -import spp.protocol.instrument.LiveInstrumentRemoved -import spp.protocol.instrument.breakpoint.event.LiveBreakpointHit -import spp.protocol.instrument.log.event.LiveLogHit +import spp.protocol.instrument.event.* class SubscribeEvents : CliktCommand( help = "Listens for and outputs live events. Subscribes to all events by default" From 6176c720f2a4e4e1f6eaec6a1d5d96fef7f1c332 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 16:44:13 -0500 Subject: [PATCH 07/18] organize imports --- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index bf39406..459a21a 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -18,8 +18,6 @@ package spp.cli.commands.view import com.github.ajalt.clikt.core.CliktCommand -import com.github.ajalt.clikt.parameters.arguments.argument -import com.github.ajalt.clikt.parameters.arguments.multiple import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option import eu.geekplace.javapinning.JavaPinning From b1ce17bf36487f4a546a0c8f3978e8a4b21c615e Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 17:04:34 -0500 Subject: [PATCH 08/18] refactor --- .../kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 6 +++--- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 265ecbe..0791f86 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -35,7 +35,7 @@ import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameParser import io.vertx.kotlin.coroutines.await import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI -import spp.protocol.SourceMarkerServices +import spp.protocol.SourceServices import spp.protocol.extend.TCPServiceFrameParser import spp.protocol.instrument.event.* @@ -84,7 +84,7 @@ class SubscribeEvents : CliktCommand( ).await() socket!!.handler(FrameParser(TCPServiceFrameParser(vertx, socket))) - vertx.eventBus().consumer("local." + SourceMarkerServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER) { + vertx.eventBus().consumer("local." + SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER) { val liveEvent = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java) //todo: impl filter on platform @@ -153,7 +153,7 @@ class SubscribeEvents : CliktCommand( //register listener FrameHelper.sendFrame( BridgeEventType.REGISTER.name.lowercase(), - SourceMarkerServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER, + SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER, JsonObject(), socket ) diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index 459a21a..5350277 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -34,7 +34,7 @@ import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameParser import io.vertx.kotlin.coroutines.await import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI -import spp.protocol.SourceMarkerServices.Provide.LIVE_VIEW_SUBSCRIBER +import spp.protocol.SourceServices.Provide.LIVE_VIEW_SUBSCRIBER import spp.protocol.artifact.log.Log import spp.protocol.artifact.log.LogOrderType import spp.protocol.artifact.log.LogResult From f35cf2f496c9428ae351ceeefd22b0ab946772a8 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 20:35:08 -0500 Subject: [PATCH 09/18] refactor --- .../kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 0791f86..931e4f8 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -35,9 +35,13 @@ import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameParser import io.vertx.kotlin.coroutines.await import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI +import spp.protocol.ProtocolMarshaller.deserializeLiveInstrumentRemoved import spp.protocol.SourceServices import spp.protocol.extend.TCPServiceFrameParser -import spp.protocol.instrument.event.* +import spp.protocol.instrument.event.LiveBreakpointHit +import spp.protocol.instrument.event.LiveInstrumentEvent +import spp.protocol.instrument.event.LiveInstrumentEventType +import spp.protocol.instrument.event.LiveLogHit class SubscribeEvents : CliktCommand( help = "Listens for and outputs live events. Subscribes to all events by default" @@ -103,7 +107,7 @@ class SubscribeEvents : CliktCommand( } } LiveInstrumentEventType.BREAKPOINT_REMOVED, LiveInstrumentEventType.LOG_REMOVED -> { - val logRemoved = Json.decodeValue(liveEvent.data, LiveInstrumentRemoved::class.java) + val logRemoved = deserializeLiveInstrumentRemoved(JsonObject(liveEvent.data)) if (logRemoved.liveInstrument.id !in instrumentIds) { return@consumer } From de854adfd2dc09e6fde64304b3b806b734c069f9 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Tue, 1 Feb 2022 21:03:51 -0500 Subject: [PATCH 10/18] centralize --- CHANGELOG.md | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 42d0769..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,16 +0,0 @@ -# 0.2.3 -- Added `get-self` command -- Added `add-span`/`get-spans` commands -- Added `add-meter`/`get-meters` commands -- Fixed Windows native build -- Dependency upgrades - -# 0.2.2 -- Simplified instrument commands -- Added `subscribe-events` command - -# 0.2.1 -- Dependency upgrades - -# 0.2.0 -- Module extracted from live platform From 338ab471ae21a8712a7d78131c5b7da289b6031e Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 2 Feb 2022 00:34:08 -0500 Subject: [PATCH 11/18] validate marker auth over tcp --- .../kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 6 +++--- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 931e4f8..c4e5a3f 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -157,9 +157,9 @@ class SubscribeEvents : CliktCommand( //register listener FrameHelper.sendFrame( BridgeEventType.REGISTER.name.lowercase(), - SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER, - JsonObject(), - socket + SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER, null, + JsonObject().apply { PlatformCLI.developer.accessToken?.let { put("auth-token", it) } }, + null, null, socket ) println("Listening for events...") } diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index 5350277..868975c 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -107,9 +107,9 @@ class SubscribeView : CliktCommand( //register listener FrameHelper.sendFrame( BridgeEventType.REGISTER.name.lowercase(), - "$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}", - JsonObject(), - socket + "$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}", null, + JsonObject().apply { PlatformCLI.developer.accessToken?.let { put("auth-token", it) } }, + null, null, socket ) println("Listening for events...") } From 783f3e01521db742a87fd74b97935392dee74811 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 2 Feb 2022 11:03:58 -0500 Subject: [PATCH 12/18] refactor --- src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 2 +- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index c4e5a3f..6d9d113 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -88,7 +88,7 @@ class SubscribeEvents : CliktCommand( ).await() socket!!.handler(FrameParser(TCPServiceFrameParser(vertx, socket))) - vertx.eventBus().consumer("local." + SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER) { + vertx.eventBus().consumer(SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER) { val liveEvent = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java) //todo: impl filter on platform diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index 868975c..fbb20dc 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -91,7 +91,7 @@ class SubscribeView : CliktCommand( ).await() socket!!.handler(FrameParser(TCPServiceFrameParser(vertx, socket))) - vertx.eventBus().consumer("local.$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}") { + vertx.eventBus().consumer("$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}") { val event = Json.decodeValue(it.body().toString(), LiveViewEvent::class.java) if (outputFullEvent) { println(event.metricsData) From c9d551921897cfa88af5576e1f183d6fa969b45f Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 2 Feb 2022 15:08:05 -0500 Subject: [PATCH 13/18] refactor --- .../kotlin/spp/cli/commands/instrument/SubscribeEvents.kt | 6 +++--- src/main/kotlin/spp/cli/commands/view/SubscribeView.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt index 6d9d113..c597fbf 100644 --- a/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt +++ b/src/main/kotlin/spp/cli/commands/instrument/SubscribeEvents.kt @@ -36,7 +36,7 @@ import io.vertx.kotlin.coroutines.await import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI import spp.protocol.ProtocolMarshaller.deserializeLiveInstrumentRemoved -import spp.protocol.SourceServices +import spp.protocol.SourceServices.Provide.toLiveInstrumentSubscriberAddress import spp.protocol.extend.TCPServiceFrameParser import spp.protocol.instrument.event.LiveBreakpointHit import spp.protocol.instrument.event.LiveInstrumentEvent @@ -88,7 +88,7 @@ class SubscribeEvents : CliktCommand( ).await() socket!!.handler(FrameParser(TCPServiceFrameParser(vertx, socket))) - vertx.eventBus().consumer(SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER) { + vertx.eventBus().consumer(toLiveInstrumentSubscriberAddress(PlatformCLI.developer.id)) { val liveEvent = Json.decodeValue(it.body().toString(), LiveInstrumentEvent::class.java) //todo: impl filter on platform @@ -157,7 +157,7 @@ class SubscribeEvents : CliktCommand( //register listener FrameHelper.sendFrame( BridgeEventType.REGISTER.name.lowercase(), - SourceServices.Provide.LIVE_INSTRUMENT_SUBSCRIBER, null, + toLiveInstrumentSubscriberAddress(PlatformCLI.developer.id), null, JsonObject().apply { PlatformCLI.developer.accessToken?.let { put("auth-token", it) } }, null, null, socket ) diff --git a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt index fbb20dc..41d4307 100644 --- a/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt +++ b/src/main/kotlin/spp/cli/commands/view/SubscribeView.kt @@ -34,7 +34,7 @@ import io.vertx.ext.eventbus.bridge.tcp.impl.protocol.FrameParser import io.vertx.kotlin.coroutines.await import kotlinx.coroutines.runBlocking import spp.cli.PlatformCLI -import spp.protocol.SourceServices.Provide.LIVE_VIEW_SUBSCRIBER +import spp.protocol.SourceServices.Provide.toLiveViewSubscriberAddress import spp.protocol.artifact.log.Log import spp.protocol.artifact.log.LogOrderType import spp.protocol.artifact.log.LogResult @@ -91,7 +91,7 @@ class SubscribeView : CliktCommand( ).await() socket!!.handler(FrameParser(TCPServiceFrameParser(vertx, socket))) - vertx.eventBus().consumer("$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}") { + vertx.eventBus().consumer(toLiveViewSubscriberAddress(PlatformCLI.developer.id)) { val event = Json.decodeValue(it.body().toString(), LiveViewEvent::class.java) if (outputFullEvent) { println(event.metricsData) @@ -107,7 +107,7 @@ class SubscribeView : CliktCommand( //register listener FrameHelper.sendFrame( BridgeEventType.REGISTER.name.lowercase(), - "$LIVE_VIEW_SUBSCRIBER.${PlatformCLI.developer.id}", null, + toLiveViewSubscriberAddress(PlatformCLI.developer.id), null, JsonObject().apply { PlatformCLI.developer.accessToken?.let { put("auth-token", it) } }, null, null, socket ) From c9bd55b4981edb8dc4846ff4ce810b2f3dedd4f6 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 2 Feb 2022 15:53:19 -0500 Subject: [PATCH 14/18] bump --- gradle.properties | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 79f7733..579d333 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ projectVersion=0.3.1 vertxVersion=4.2.4 graalVersion = 21.3.0 -jacksonVersion = 2.12.5 +jacksonVersion=2.13.1 apolloVersion=3.0.0 commonsLang3Version = 3.12.0 cliktVersion = 3.2.0 diff --git a/settings.gradle b/settings.gradle index dbd4f2e..ce36349 100644 --- a/settings.gradle +++ b/settings.gradle @@ -12,7 +12,7 @@ pluginManagement { id 'com.github.johnrengelman.shadow' version "7.1.2" apply false id 'com.apollographql.apollo3' version "3.0.0" apply false id 'org.mikeneck.graalvm-native-image' version "1.4.1" apply false - id 'com.diffplug.spotless' version '6.2.0' apply false + id 'com.diffplug.spotless' version '6.2.1' apply false } } From e964f8eecf11b72c2740d07405d8d8c6324025ef Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Wed, 2 Feb 2022 16:58:06 -0500 Subject: [PATCH 15/18] bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 579d333..de108ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ kotlin.code.style=official cliGroup=com.sourceplusplus -projectVersion=0.3.1 +projectVersion=0.4.0 vertxVersion=4.2.4 graalVersion = 21.3.0 From ff20b04f81e86c0b274e693757549af47dd075a5 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Fri, 4 Feb 2022 22:39:56 -0500 Subject: [PATCH 16/18] moved packages --- src/main/kotlin/spp/cli/PlatformCLI.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/spp/cli/PlatformCLI.kt b/src/main/kotlin/spp/cli/PlatformCLI.kt index 425fe02..a10c96a 100644 --- a/src/main/kotlin/spp/cli/PlatformCLI.kt +++ b/src/main/kotlin/spp/cli/PlatformCLI.kt @@ -43,7 +43,7 @@ import org.bouncycastle.openssl.PEMKeyPair import org.bouncycastle.openssl.PEMParser import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter import org.bouncycastle.util.encoders.Hex -import spp.protocol.developer.Developer +import spp.protocol.platform.developer.Developer import spp.protocol.util.KSerializers import java.io.File import java.io.StringReader From adce285e545b84d3afe9a1c5dfa73d669d21ce31 Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 7 Feb 2022 13:30:01 -0500 Subject: [PATCH 17/18] bump --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index ce36349..ee52cbb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ pluginManagement { id 'com.avast.gradle.docker-compose' version "0.15.0" apply false id 'io.gitlab.arturbosch.detekt' version "1.19.0" apply false id 'com.github.johnrengelman.shadow' version "7.1.2" apply false - id 'com.apollographql.apollo3' version "3.0.0" apply false + id 'com.apollographql.apollo3' version "3.1.0" apply false id 'org.mikeneck.graalvm-native-image' version "1.4.1" apply false id 'com.diffplug.spotless' version '6.2.1' apply false } From 8a84e3fc32ece115dd9272c550e10365eede5c3d Mon Sep 17 00:00:00 2001 From: Brandon Fergerson Date: Mon, 7 Feb 2022 15:08:42 -0500 Subject: [PATCH 18/18] bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index de108ae..9ca4f31 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ projectVersion=0.4.0 vertxVersion=4.2.4 graalVersion = 21.3.0 jacksonVersion=2.13.1 -apolloVersion=3.0.0 +apolloVersion=3.1.0 commonsLang3Version = 3.12.0 cliktVersion = 3.2.0 bouncycastleVersion = 1.69