whatap-python 1.6.6__tar.gz → 1.6.8__tar.gz

{whatap_python-1.6.6 → whatap_python-1.6.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatap-python
-Version: 1.6.6
+Version: 1.6.8
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.6.8/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '1.6.8'
+release_date = '20240827'

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap/net/async_sender.py

@@ -1,3 +1,4 @@
+import copy
 import queue, time, threading
 from . import udp_session
 from whatap.conf.configure import Configure as conf
@@ -11,12 +12,15 @@ class SendType(Enum):
     RELAY = 2
 
 def send_packet( packet_type, ctx, datas=[]):
-    ctx = SimpleTraceContext(ctx.id, ctx.start_time, ctx.elapsed, ctx.thread_id)
+    ctx = SimpleTraceContext(ctx)
+
+    # deep coopy TraceContext object before adding it to the queue, preventing potential data overwriting issues caused by concurrent modifications
+    copied_ctx = ctx.getDeepCopiedContext()
     _initThread()
     global q
     if q.full():
         return
-    q.put((SendType.DATAS, (packet_type, ctx, datas)))
+    q.put((SendType.DATAS, (packet_type, copied_ctx, datas)))
 
 def send_relaypack( packbytes):
     _initThread()

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap/trace/mod/application_graphql.py

@@ -6,23 +6,45 @@ from whatap.trace.trace_context_manager import TraceContextManager
 import whatap.net.async_sender as async_sender
 from whatap.net.packet_type_enum import PacketTypeEnum
 from whatap.util.date_util import DateUtil
-import re
+import pkg_resources
+from graphql.language.ast import OperationDefinitionNode
+
 
 def parseServiceName(graphql_doc):
-    try:
-        op_def = [
-            i for i in graphql_doc.definitions
-            if type(i).__name__ == "OperationDefinition"
-        ][0]
-    except KeyError:
-        return "GraphQL unknown operation"
+    # GraphQL-core 버전 확인
+    graphql_core_version = pkg_resources.get_distribution("graphql-core").version
+
+    # GraphQL-core 3.x 이상 버전일 경우
+    if graphql_core_version.startswith("3") or graphql_core_version.startswith("4"):
+        try:
+            # OperationDefinitionNode 타입의 노드 필터링 (3.x 이상 버전 로직)
+            op_def = [
+                i for i in graphql_doc.definitions
+                if isinstance(i, OperationDefinitionNode)
+            ][0]
+        except (IndexError, KeyError):
+            return "GraphQL unknown operation"
+
+        # operation의 타입이 OperationType Enum인 경우
+        op = op_def.operation.value  # Enum 값을 문자열로 변환
+    else:
+        try:
+            # 이전 버전 로직 (OperationDefinition 사용)
+            op_def = [
+                i for i in graphql_doc.definitions
+                if type(i).__name__ == "OperationDefinition"
+            ][0]
+        except (IndexError, KeyError):
+            return "GraphQL unknown operation"
+
+        # operation의 타입이 문자열인 경우
+        op = op_def.operation  # 문자열 그대로 사용
 
-    op = op_def.operation
     name = op_def.name
-    fields = op_def.selection_set.selections
-    if not fields:
-        fields = []
-    return "/GraphQL %s %s" % (op.upper(), name.value if name else "+".join([f.name.value for f in fields]))  
+    fields = op_def.selection_set.selections if op_def.selection_set else []
+
+    return "/GraphQL %s %s" % (op.upper(), name.value if name else "+".join([f.name.value for f in fields]))
+
 
 def intercept_execute(fn, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap/trace/mod/application_wsgi.py

@@ -210,7 +210,7 @@ def interceptor(rn_environ, *args, **kwargs):
 
         if getattr(callback, 'status_code', None):
             status_code = callback.status_code
-            errors = [callback.reason_phrase, callback.__class__.__name__]
+            errors = [callback.__class__.__name__, callback.reason_phrase]
             interceptor_error(status_code, errors, ctx=ctx)
 
         if conf.profile_http_header_enabled:

whatap_python-1.6.8/whatap/trace/simple_trace_context.py

@@ -0,0 +1,18 @@
+import copy
+
+from whatap.trace.trace_context import TraceContext
+
+
+class SimpleTraceContext(TraceContext):
+    def __init__(self, ctx: TraceContext):
+        self.ctx = ctx
+
+    """
+    Replaced Python's built-in deepcopy function with a manual deep copy method in SimpleTraceContext.
+    This change prevents potential pickle errors when serializing the TraceContext object.
+    Each attribute is copied individually to ensure that complex objects within TraceContext are correctly handled.
+    """
+    def getDeepCopiedContext(self):
+        for key, value in self.ctx.__dict__.items():
+            setattr(self, key, value)
+        return self

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap/trace/trace_module_definition.py

@@ -99,6 +99,11 @@ DEFINITION = {
     ],
     'application_graphql':[
         #('graphql','instrument_graphql'),
+
+        #graphen-core 3.x~
+        ('graphql.execution.execute','instrument_graphql'),
+
+        #graphen-core 2.x
         ('graphql.execution.executor','instrument_graphql'),
     ],
     'database_mongo':[

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatap-python
-Version: 1.6.6
+Version: 1.6.8
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.6.6/whatap/build.py

@@ -1,4 +0,0 @@
-app = 'Python'
-name = 'whatap-python'
-version = '1.6.6'
-release_date = '20240607'

whatap_python-1.6.6/whatap/trace/simple_trace_context.py

@@ -1,9 +0,0 @@
-from whatap.trace.trace_context import TraceContext
-
-
-class SimpleTraceContext(TraceContext):
-    def __init__(self, id, start_time, elapsed, thread_id):
-        self.id = id
-        self.start_time = start_time
-        self.elapsed = elapsed
-        self.thread_id = thread_id

{whatap_python-1.6.6 → whatap_python-1.6.8}/whatap/trace/mod/application_django.py

@@ -146,6 +146,7 @@ def instrument_handlers_base(module):
                       e[1].args[1] if len(
                           e[1].args) > 1 \
                           else repr(e[1].args[0])]
+
             interceptor_error(status_code, errors)
             
             return callback
@@ -202,7 +203,6 @@ def instrument_generic_base(module):
             try:
                 callback = fn(*args, **kwargs)
             except Exception as e:
-
                 interceptor_step_error(e, ctx = ctx)
                 raise e
             return callback