protocol update wip

Author: BFergerson

sourceplusplus/control/LiveInstrumentRemote.py

@@ -1,8 +1,6 @@
 import sys
 import threading
-from typing import List
 
-import humps
 from nopdb import nopdb
 from vertx import EventBus
 
@@ -26,8 +24,8 @@ def __init__(self, eb: EventBus):
         LiveInstrumentRemote.dbg.start()
         threading.settrace(sys.gettrace())
 
-    def add_live_instrument(self, instruments: List[dict]):
-        for inst_dict in instruments:
+    def add_live_instrument(self, command: LiveInstrumentCommand):
+        for inst_dict in command.instruments:
             instrument_type: LiveInstrumentType = LiveInstrumentType.from_string(inst_dict["type"])
             if instrument_type == LiveInstrumentType.BREAKPOINT:
                 live_instrument = LiveBreakpoint.from_dict(inst_dict)
@@ -43,21 +41,15 @@ def add_live_instrument(self, instruments: List[dict]):
             if instrument_type == LiveInstrumentType.BREAKPOINT:
                 bp.exec("import sourceplusplus.control.ContextReceiver as ContextReceiver\n"
                         "ContextReceiver.apply_breakpoint('" + live_instrument.id + "',globals(),locals())")
-                body = humps.camelize(inst_dict)
-                body["meta"] = inst_dict["meta"]
-                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=body)
+                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=live_instrument.to_dict())
             elif instrument_type == LiveInstrumentType.LOG:
                 bp.exec("import sourceplusplus.control.ContextReceiver as ContextReceiver\n"
                         "ContextReceiver.apply_log('" + live_instrument.id + "',globals(),locals())")
-                body = humps.camelize(inst_dict)
-                body["meta"] = inst_dict["meta"]
-                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=body)
+                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=live_instrument.to_dict())
             else:
                 bp.exec("import sourceplusplus.control.ContextReceiver as ContextReceiver\n"
                         "ContextReceiver.apply_meter('" + live_instrument.id + "',globals(),locals())")
-                body = humps.camelize(inst_dict)
-                body["meta"] = inst_dict["meta"]
-                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=body)
+                self.eb.publish(address="spp.processor.status.live-instrument-applied", body=live_instrument.to_dict())
 
     def remove_live_instrument(self, command: LiveInstrumentCommand):
         print("Removing live instrument(s)")
@@ -84,6 +76,6 @@ def remove_live_instrument(self, command: LiveInstrumentCommand):
     def handle_instrument_command(self, command: LiveInstrumentCommand):
         print("Received command: " + command.command_type)
         if command.command_type == CommandType.ADD_LIVE_INSTRUMENT:
-            self.add_live_instrument(command.instruments)
+            self.add_live_instrument(command)
         elif command.command_type == CommandType.REMOVE_LIVE_INSTRUMENT:
             self.remove_live_instrument(command)

sourceplusplus/models/instrument/LiveBreakpoint.py

@@ -15,6 +15,11 @@ def __init__(self, location: LiveSourceLocation):
         self.hit_limit = 1
         self.type = LiveInstrumentType.BREAKPOINT
 
+    def to_dict(self):
+        dict = humps.camelize(json.loads(self.to_json()))
+        dict["meta"] = self.__dict__["meta"]
+        return dict
+
     @classmethod
     def from_dict(cls, json_dict):
         # todo: easier way to convert

sourceplusplus/models/instrument/LiveLog.py

@@ -17,6 +17,11 @@ def __init__(self, location: LiveSourceLocation):
         self.hit_limit = None
         self.type = LiveInstrumentType.LOG
 
+    def to_dict(self):
+        dict = humps.camelize(json.loads(self.to_json()))
+        dict["meta"] = self.__dict__["meta"]
+        return dict
+
     @classmethod
     def from_dict(cls, json_dict):
         # todo: easier way to convert

sourceplusplus/models/instrument/LiveMeter.py

@@ -15,6 +15,11 @@ def __init__(self, location: LiveSourceLocation):
         self.hit_limit = -1
         self.type = LiveInstrumentType.METER
 
+    def to_dict(self):
+        dict = humps.camelize(json.loads(self.to_json()))
+        dict["meta"] = self.__dict__["meta"]
+        return dict
+
     @classmethod
     def from_dict(cls, json_dict):
         # todo: easier way to convert

sourceplusplus/models/instrument/common/LiveSourceLocation.py

@@ -4,9 +4,11 @@
 
 
 class LiveSourceLocation(object):
-    def __init__(self, source, line, commit_id=None, file_checksum=None):
+    def __init__(self, source, line, service=None, service_instance=None, commit_id=None, file_checksum=None):
         self.source = source
         self.line = line
+        self.service = service
+        self.service_instance = service_instance
         self.commit_id = commit_id
         self.file_checksum = file_checksum
 

tests/instrument_serialization/tests.py

@@ -2,6 +2,7 @@
 import time
 import unittest
 
+from sourceplusplus.models.command.LiveInstrumentCommand import LiveInstrumentCommand
 from sourceplusplus.models.instrument.LiveBreakpoint import LiveBreakpoint
 from sourceplusplus.models.instrument.LiveLog import LiveLog
 from sourceplusplus.models.instrument.common.LiveSourceLocation import LiveSourceLocation
@@ -11,6 +12,43 @@
 
 class TestSum(unittest.TestCase):
 
+    def test_command_serialization(self):
+        raw_command = {
+            "commandType": "ADD_LIVE_INSTRUMENT",
+            "instruments": [
+                {
+                    "location": {
+                        "source": "E2ETest.py",
+                        "line": 18, "service": None,
+                        "serviceInstance": None,
+                        "commitId": None,
+                        "fileChecksum": None
+                    },
+                    "condition": None,
+                    "expiresAt": None,
+                    "hitLimit": 1,
+                    "id": "3145bbee-8d81-4184-8c3d-f97f208a6e15",
+                    "applyImmediately": False,
+                    "applied": False,
+                    "pending": True,
+                    "throttle": {
+                        "limit": 1,
+                        "step": "SECOND"
+                    },
+                    "meta": {
+                        "created_at": "1644293169743",
+                        "created_by": "system",
+                        "hit_count": 0
+                    },
+                    "type": "BREAKPOINT"
+                }
+            ],
+            "locations": []
+        }
+        command = LiveInstrumentCommand.from_json(json.dumps(raw_command))
+        bp = LiveBreakpoint.from_dict(command.instruments[0])
+        self.assertEqual(raw_command["instruments"][0], LiveBreakpoint.from_json(bp.to_json()).to_dict())
+
     def test_deserialize_breakpoint(self):
         raw_bp = {
             "location": {