Merge branch 'master' into renovate/com.avast.gradle.docker-compose-0.x

Author: BFergerson

e2e/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     environment:
       - SPP_PLATFORM_HOST=spp-platform
   spp-platform:
-    image: sourceplusplus/spp-platform:latest
+    image: sourceplusplus/spp-platform:0.7.3
     container_name: spp-platform
     hostname: spp-platform
     ports:

setup.py

@@ -2,7 +2,7 @@
 from setuptools import setup
 
 setup(name='sourceplusplus',
-      version='0.1.7',
+      version='0.1.8',
       description='Source++ Python Probe',
       url='https://github.com/sourceplusplus/probe-python',
       author='Source++',

sourceplusplus/SourcePlusPlus.py

@@ -139,22 +139,22 @@ def __send_connected(self, eb: EventBus):
             for key, val in self.probe_config["spp"].get("probe_metadata").items():
                 probe_metadata[key] = val
 
+        # add probe auth headers (if present)
+        headers = {}
+        if self.probe_config["spp"].get("authentication") is not None:
+            for key, val in self.probe_config["spp"].get("authentication").items():
+                headers[key] = val
+
         # send probe connected event
         reply_address = str(uuid.uuid4())
-        eb.send(address="spp.platform.status.probe-connected", body={
+        eb.send(address="spp.platform.status.probe-connected", headers=headers, body={
             "instanceId": self.probe_config["spp"]["probe_id"],
             "connectionTime": round(time.time() * 1000),
             "meta": probe_metadata
         }, reply_handler=lambda msg: self.__register_remotes(eb, reply_address, msg["body"]))
 
     def __register_remotes(self, eb, reply_address, status):
         eb.unregister_handler(reply_address)
-        eb.register_handler(
-            address="spp.probe.command.live-instrument-remote",
-            handler=lambda msg: self.instrument_remote.handle_instrument_command(
-                LiveInstrumentCommand.from_json(json.dumps(msg["body"]))
-            )
-        )
         eb.register_handler(
             address="spp.probe.command.live-instrument-remote:" + self.probe_config["spp"]["probe_id"],
             handler=lambda msg: self.instrument_remote.handle_instrument_command(

sourceplusplus/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.1.7'
+__version__ = '0.1.8'
 __name__ = 'Source++'
 agent_name = 'Source++ Python Probe'