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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: whatap-python
-Version: 1.6.7
+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.7 → 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.7 → 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.7 → 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.7
+Version: 1.6.8
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-1.6.7/whatap/build.py

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