update record hooks

Author: Germey

acedatacloud_scaffold/__version__.py

@@ -1,3 +1,3 @@
-VERSION = (0, 6, 1)
+VERSION = (0, 7, 4)
 
 __version__ = '.'.join(map(str, VERSION))

acedatacloud_scaffold/handlers/base.py

@@ -52,23 +52,42 @@ def write_error_sync(self, status_code, **kwargs):
         self.logger.debug(f'write error {data}')
         self.finish()
 
+    def get_record_application_id(self):
+        return self.application_id
+
+    def get_record_trace_id(self):
+        return self.trace_id
+
+    def get_record_api_id(self):
+        return self.api_id
+
+    def get_record_task_id(self):
+        return self.task_id
+
+    def get_record_request(self):
+        return {
+            'body': self.request.body.decode('utf-8'),
+            'json': json.loads(self.request.body),
+            'headers': dict(self.request.headers),
+            'method': self.request.method,
+        }
+
+    def get_record_response(self):
+        return {
+            'status': self.get_status(),
+        }
+
     @logger.catch
-    def record(self, data, extra_data={}):
+    def record(self, extra_data={}):
         record_server_url = RECORD_SERVER_URL
         self.logger.debug(f'record url {record_server_url}')
         data = {
-            'status': data.get('status'),
-            'trace_id': self.trace_id,
-            'application_id': self.application_id,
-            'metadata': {
-                'task_id': self.task_id,
-            },
-            'request': {
-                'body': self.request.body.decode('utf-8'),
-                'json': json.loads(self.request.body),
-                'query': self.request.query_arguments,
-                'headers': dict(self.request.headers),
-            }
+            'trace_id': self.get_record_trace_id(),
+            'application_id': self.get_record_application_id(),
+            'api_id': self.get_record_api_id(),
+            'task_id': self.get_record_task_id(),
+            'request': self.get_record_request(),
+            'response': self.get_record_response()
         }
         data.update(extra_data)
         logger.debug(f'{self.trace_id} record data {data}')
@@ -81,6 +100,12 @@ def initialize_trace_id(self):
             'utf-8') if trace_id and len(trace_id) > 0 else str(uuid4())
         logger.debug(f'trace id {self.trace_id}')
 
+    def initialize_api_id(self):
+        api_id = self.request.query_arguments.get('api_id')
+        self.api_id = api_id[0].decode(
+            'utf-8') if api_id and len(api_id) > 0 else None
+        logger.debug(f'api id {self.api_id}')
+
     def initialize_application_id(self):
         application_id = self.request.query_arguments.get('application_id')
         self.application_id = application_id[0].decode(
@@ -95,3 +120,4 @@ def initialize(self):
         self.initialize_trace_id()
         self.initialize_task_id()
         self.initialize_application_id()
+        self.initialize_api_id()

acedatacloud_scaffold/mixins/forward.py

@@ -23,6 +23,9 @@ async def get_forward_response_status(self):
         return self.forward_response.status_code \
             if hasattr(self, 'forward_response') else None
 
+    async def get_forward_request_params(self):
+        return None
+
     async def get_forward_response_headers(self):
         return self.forward_response.headers \
             if hasattr(self, 'forward_response') else None
@@ -54,6 +57,7 @@ async def write_response_headers(self):
             self.set_header(header, value)
 
     async def forward(self):
+        self.logger.debug('start to forward request')
         # forward info for building forward request
         forward_timeout = await self.get_forward_request_timeout()
         forward_url = await self.get_forward_request_url()
@@ -64,7 +68,7 @@ async def forward(self):
 
         async with httpx.AsyncClient(timeout=forward_timeout) as client:
             self.logger.debug(
-                f'forward_url {forward_url} forward_headers {forward_headers} forward_body {forward_body}')
+                f'forward_url {forward_url} forward_headers {forward_headers} forward_body {forward_body} forward_params {forward_params}')
             async with client.stream(
                 forward_method,
                 forward_url,