add probe id to remotes

BFergerson · BFergerson · commit 0c79f11c0630 · 2021-11-08T17:47:37.000-05:00
diff --git a/e2e/Dockerfile-spp-oap-server b/e2e/Dockerfile-spp-oap-server
@@ -1,4 +1,4 @@
-FROM sourceplusplus/spp-oap-server:0.1.19
+FROM sourceplusplus/spp-oap-server:latest
 
 ADD ./config/spp-platform.crt /skywalking
 ADD ./config/spp-platform.key /skywalking
diff --git a/e2e/Dockerfile-spp-platform b/e2e/Dockerfile-spp-platform
@@ -1,4 +1,4 @@
-FROM sourceplusplus/spp-platform:0.1.19
+FROM sourceplusplus/spp-platform:latest
 
 ADD ./config/logback.xml /opt/sourceplusplus/config
 ADD ./config/spp-platform.crt /opt/sourceplusplus/config
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
@@ -52,7 +52,7 @@ services:
       - spp-platform
     restart: on-failure
     environment:
-      - SW_STORAGE=elasticsearch7
+      - SW_STORAGE=elasticsearch
       - SW_STORAGE_ES_CLUSTER_NODES=es-server:9200
       - SPP_PLATFORM_HOST=spp-platform
       - SPP_PLATFORM_PORT=5460
diff --git a/sourceplusplus/SourcePlusPlus.py b/sourceplusplus/SourcePlusPlus.py
@@ -122,13 +122,13 @@ def __send_connected(self, eb: EventBus):
     def __register_remotes(self, eb, reply_address, status):
         eb.unregister_handler(reply_address)
         eb.register_handler(
-            address="spp.probe.command.live-breakpoint-remote",
+            address="spp.probe.command.live-breakpoint-remote:" + self.probe_config["spp"]["probe_id"],
             handler=lambda msg: self.instrument_remote.handle_instrument_command(
                 LiveInstrumentCommand.from_json(json.dumps(msg["body"])), LiveInstrumentType.BREAKPOINT
             )
         )
         eb.register_handler(
-            address="spp.probe.command.live-log-remote",
+            address="spp.probe.command.live-log-remote:" + self.probe_config["spp"]["probe_id"],
             handler=lambda msg: self.instrument_remote.handle_instrument_command(
                 LiveInstrumentCommand.from_json(json.dumps(msg["body"])), LiveInstrumentType.LOG
             )

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM sourceplusplus/spp-platform:0.1.19`
	`1`	`+FROM sourceplusplus/spp-platform:latest`
`2`	`2`
`3`	`3`	`ADD ./config/logback.xml /opt/sourceplusplus/config`
`4`	`4`	`ADD ./config/spp-platform.crt /opt/sourceplusplus/config`
Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,13 @@ def __send_connected(self, eb: EventBus):`
`122`	`122`	`def __register_remotes(self, eb, reply_address, status):`
`123`	`123`	`eb.unregister_handler(reply_address)`
`124`	`124`	`eb.register_handler(`
`125`		`- address="spp.probe.command.live-breakpoint-remote",`
	`125`	`+ address="spp.probe.command.live-breakpoint-remote:" + self.probe_config["spp"]["probe_id"],`
`126`	`126`	`handler=lambda msg: self.instrument_remote.handle_instrument_command(`
`127`	`127`	`LiveInstrumentCommand.from_json(json.dumps(msg["body"])), LiveInstrumentType.BREAKPOINT`
`128`	`128`	`)`
`129`	`129`	`)`
`130`	`130`	`eb.register_handler(`
`131`		`- address="spp.probe.command.live-log-remote",`
	`131`	`+ address="spp.probe.command.live-log-remote:" + self.probe_config["spp"]["probe_id"],`
`132`	`132`	`handler=lambda msg: self.instrument_remote.handle_instrument_command(`
`133`	`133`	`LiveInstrumentCommand.from_json(json.dumps(msg["body"])), LiveInstrumentType.LOG`
`134`	`134`	`)`