whatap-python 1.7.1__tar.gz → 1.7.2__tar.gz

{whatap_python-1.7.1 → whatap_python-1.7.2}/PKG-INFO

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

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/__init__.py

@@ -224,6 +224,8 @@ def config(home):
         from whatap.conf.license import License
         conf.PCODE = License.getProjectCode(conf.license)
 
+        import whatap.counter
+
         hooks(home)
 
 

whatap_python-1.7.2/whatap/build.py

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

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/conf/configuration.py

@@ -203,4 +203,6 @@ Configuration = {
     "log_unhandled_exception": 'false',
     "threadstack_faulthandler": False,
     "max_send_queue_size": 1000,
+    "open_file_descriptor_enabled":False,
+    "open_file_descriptor_interval":60,
 }

whatap_python-1.7.2/whatap/counter/__init__.py

@@ -0,0 +1,6 @@
+from .counter_manager import CounterMgr  # CounterMgr 클래스 import
+
+# CounterMgr 인스턴스를 생성하고 시작하도록 설정
+mgr = CounterMgr()
+mgr.setDaemon(True)
+mgr.start()

whatap_python-1.7.2/whatap/counter/counter_manager.py

@@ -0,0 +1,36 @@
+import os
+import time
+import logging
+from threading import Thread
+from .tasks.openfiledescriptor import OpenFileDescriptorTask
+
+#현재 디렉토리 아래 tasks 가 있고 그안의 openfiledescriptor.py 파일에  OpenFileDescriptorTask 클래스를 import 하고싶어.
+
+class CounterMgr(Thread):
+    def __init__(self):
+        super(CounterMgr, self).__init__()  # Thread 초기화
+        self.tasks = list()
+        self.last_executed = {}  # 각 task의 마지막 실행 시간을 기록하기 위한 딕셔너리
+        
+    def run(self):
+        # OpenFileDescriptorTask 인스턴스 생성 후 tasks에 추가
+        task = OpenFileDescriptorTask()
+        self.tasks.append(task)
+        self.last_executed[task.name()] = 0  # 각 task의 마지막 실행 시간을 초기화
+        while True:
+            current_time = time.time()  # 현재 시간을 초 단위로 가져옴
+            time.sleep(1)  # 0.1초마다 확인 (부하 줄이기)
+            for task in self.tasks:
+                
+                # 현재 시간과 마지막 실행 시간을 비교하여 task.interval() 초 만큼의 시간이 지났으면 실행
+                last_executed_time = self.last_executed[task.name()]
+                interval = task.interval()
+                
+                if current_time - last_executed_time >= interval:
+                    try:
+                        self.last_executed[task.name()] = current_time  # 마지막 실행 시간 업데이트
+                        task.process()  # task 실행
+                        
+                    except Exception as e:
+                        logging.debug(e, extra={'id': 'WA181'}, exc_info=True)
+                        

whatap_python-1.7.2/whatap/counter/tasks/openfiledescriptor.py

@@ -0,0 +1,57 @@
+import whatap.net.async_sender as async_sender
+from whatap.pack import tagCountPack
+from whatap import DateUtil, conf
+import whatap.io as whatapio
+import os, resource
+
+currentpid = os.getpid()
+
+soft_limit, _= resource.getrlimit(resource.RLIMIT_NOFILE)
+
+class OpenFileDescriptorTask:
+    def name(self):
+
+        return "OpenFileDescriptorTask"
+    
+    def interval(self):
+        from whatap.conf.configure import Configure as conf
+        return conf.open_file_descriptor_interval
+    
+    def process(self):
+        from whatap.conf.configure import Configure as conf
+        if not conf.open_file_descriptor_enabled:
+            return
+
+        currentnofile = self.currentNofile()
+        if soft_limit:
+            current_nofile_pct = float(currentnofile) / float(soft_limit) * float(100)
+        else:
+            current_nofile_pct = "N/A"
+        category = "app_filedescriptor"
+        tags = dict(pid=currentpid)
+        fields = dict(max_nofile = soft_limit,
+                      currnet_nofile=currentnofile,
+                      current_nofile_pct=current_nofile_pct )
+
+        p = tagCountPack.getTagCountPack(
+            t=DateUtil.now(),
+            category=f"{category}",
+            tags=tags,
+            fields=fields
+        )
+
+        p.pcode = conf.PCODE
+        bout = whatapio.DataOutputX()
+        bout.writePack(p, None)
+        packbytes = bout.toByteArray()
+
+        async_sender.send_relaypack(packbytes)
+
+    def currentNofile(self):
+        fd_directory = f'/proc/{currentpid}/fd'  # 현재 프로세스의 파일 디스크립터가 있는 디렉터리
+        try:
+            fd_count = len(os.listdir(fd_directory))  # fd 디렉터리 안의 파일 목록 개수
+            return fd_count
+        except FileNotFoundError:
+            #print("이 시스템에서는 /proc 파일 시스템이 지원되지 않습니다.")
+            return "N/A"

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/pack/pack_enum.py

@@ -29,7 +29,7 @@ class PackEnum(object):
     COMPOSITE = 0x1700
 
     LOGSINK = 0x170a
-
+    TAG_COUNT = 0x1601
     @staticmethod
     def create(p):
         return None

whatap_python-1.7.2/whatap/pack/tagCountPack.py

@@ -0,0 +1,61 @@
+from whatap.pack.pack import Pack
+from whatap.pack.pack_enum import PackEnum
+from whatap.value.map_value import MapValue
+from whatap.io.data_outputx import DataOutputX
+from whatap.util.hash_util import HashUtil as hashutil
+
+class TagCountPack(Pack):
+    def __init__(self):
+        super(TagCountPack, self).__init__()
+        self.tagHash = 0 #  int64
+        self.tags = MapValue()
+        self.fields = MapValue()   
+        
+    def getPackType(self):
+        return PackEnum.TAG_COUNT
+
+    def write(self, dout):
+        super(TagCountPack, self).write(dout)
+
+        dout.writeByte(0)
+        dout.writeText(self.Category)
+        if self.tagHash == 0 and self.tags.size() > 0:
+            tagHash, tagBytes = self.resetTagHash()
+            self.tagHash = tagHash
+            dout.writeDecimal(tagHash)
+            dout.write(tagBytes)
+        else:
+            dout.writeDecimal(self.tagHash)
+            dout.writeValue(self.tags)
+        dout.writeValue(self.fields)
+        
+    def resetTagHash(self) :
+        dout = DataOutputX()
+        dout.writeValue(self.tags)
+        tagBytes = dout.toByteArray()
+        tagHash = hashutil.hash(tagBytes)
+        return tagHash, tagBytes
+        
+    def read(self, din):
+        super(TagCountPack, self).read(din)
+        din.readByte()
+        self.Category = din.readText()
+        self.tagHash = din.ReadDecimal()
+        self.tags = din.readValue()
+        self.fields = din.readValue()
+        
+        return self
+
+def getTagCountPack( t = 0,
+        category = None,
+        tags = {},
+        fields = {}):
+    pack = TagCountPack()
+    pack.time = t
+    pack.Category = category
+    for k, v in tags.items():
+        pack.tags.putAuto(k, v)
+    for k, v in fields.items():
+        pack.fields.putAuto(k, v)
+    return pack
+    

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/trace/mod/application_wsgi.py

@@ -307,8 +307,12 @@ def interceptor_step_error(e, ctx=None):
 def interceptor_httpc_request(fn, httpc_url, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
     if not ctx or ctx.active_httpc_hash:
-        return fn(*args, **kwargs)
-
+        try:
+            return fn(*args, **kwargs)
+        except Exception as e:
+            interceptor_step_error(e, ctx=ctx)
+        finally:    
+            return
     param = None
     method = None
     if httpc_url.find('?') > -1:
@@ -365,7 +369,7 @@ def interceptor_sock_connect(fn, *args, **kwargs):
 
 def interceptor_db_con(fn, db_type, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
-    if ctx.db_opening:
+    if not ctx:
         return fn(*args, **kwargs)
 
     start_time = DateUtil.nowSystem()
@@ -443,7 +447,7 @@ def interceptor_db_execute(fn, *args, **kwargs):
     except Exception as e:
         query = args[1]
 
-    if not query or ctx.active_sqlhash:
+    if not query:
         return fn(*args, **kwargs)
 
     start_time = DateUtil.nowSystem()
@@ -474,19 +478,26 @@ def interceptor_db_close(fn, *args, **kwargs):
     ctx.db_opening = False
 
     if not conf.profile_dbc_close:
-        return fn(*args, **kwargs)
-
+        try:
+            return fn(*args, **kwargs)
+        except Exception as e:
+            interceptor_step_error(e)
+        finally:
+            return
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
-
-    callback = fn(*args, **kwargs)
-
-    text = 'DB: Close Connection.'
-    datas = [' ', ' ', text]
-    ctx.elapsed = DateUtil.nowSystem() - start_time
-    async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
-    return callback
-
+    
+    try:
+        callback = fn(*args, **kwargs)
+        return callback
+    except Exception as e:
+        interceptor_step_error(e)
+    finally:
+        text = 'DB: Close Connection.'
+        datas = [' ', ' ', text]
+        ctx.elapsed = DateUtil.nowSystem() - start_time
+        async_sender.send_packet(PacketTypeEnum.TX_MSG, ctx, datas)
+    
 
 check_seq = 1
 

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/trace/mod/database_mongo.py

@@ -26,7 +26,7 @@ class WhatapMongoCmdEventListener(pymongo.monitoring.CommandListener):
 
     def __started(self, event):
         ctx = TraceContextManager.getLocalContext()
-        if not ctx or ctx.db_opening :
+        if not ctx:
             return
         start_time = DateUtil.nowSystem()
         ctx.start_time = start_time
@@ -49,7 +49,6 @@ class WhatapMongoCmdEventListener(pymongo.monitoring.CommandListener):
         
         start_time = DateUtil.nowSystem()
         ctx.start_time = start_time
-        ctx.active_sqlhash = command
 
     def succeeded(self, event):
         try:

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/trace/mod/database_redis.py

@@ -9,7 +9,8 @@ import numbers
 
 def intercept_send_command(fn, instance, *args, **kwargs):
     ctx = TraceContextManager.getLocalContext()
-    if ctx.db_opening :
+    if not ctx:
+        
         return fn(instance, *args, **kwargs)
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
@@ -29,9 +30,7 @@ def intercept_send_command(fn, instance, *args, **kwargs):
     ctx.elapsed = DateUtil.nowSystem() - start_time
     async_sender.send_packet(PacketTypeEnum.TX_DB_CONN, ctx, datas)
     query = " ".join([ str(arg)[:20] for arg in args])
-    if ctx.active_sqlhash:
-        return fn(instance, *args, **kwargs)
-
+    
     start_time = DateUtil.nowSystem()
     ctx.start_time = start_time
     ctx.active_sqlhash = query

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/trace/mod/database_toolkit.py

@@ -68,7 +68,7 @@ def instrument_sqlalchemy_engine(module):
             except Exception as e:
                 query = str(args[2])
             # print('instrument_sqlalchemy_engine 3:', query)
-            if not query or ctx.active_sqlhash:
+            if not query :
                 return fn(*args, **kwargs)
 
             start_time = DateUtil.nowSystem()

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap/value/map_value.py

@@ -2,6 +2,7 @@ from whatap.value.boolean_value import BooleanValue
 from whatap.value.decimal_value import DecimalValue
 from whatap.value.number_value import NumberValue
 from whatap.value.text_value import TextValue
+from whatap.value.float_value import FloatValue
 from whatap.value.value import Value
 from whatap.value.value_enum import ValueEnum
 
@@ -75,6 +76,27 @@ class MapValue(Value):
         self.table[key] = value
         return self
 
+    def putAuto(self, key, value):
+        # key가 string이 아닐 경우, 경고 메시지를 출력하고 아무 것도 하지 않음
+        if not isinstance(key, str):
+            #print("키는 문자열이어야 합니다.")
+            return self
+
+        # value의 타입에 따라 적절하게 감싸기
+        if isinstance(value, int):
+            wrapped_value = DecimalValue(value)
+        elif isinstance(value, float):
+            wrapped_value = FloatValue(value)
+        elif isinstance(value, (str)):
+            wrapped_value = TextValue(value)
+        else:
+            #print("지원하지 않는 값 타입입니다.")
+            return self
+
+        # key-value 쌍을 저장
+        self.table[key] = wrapped_value
+        return self
+
     def putValue(self, key, value):
         self.table[key] = value
         return self

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap_python.egg-info/PKG-INFO

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

{whatap_python-1.7.1 → whatap_python-1.7.2}/whatap_python.egg-info/SOURCES.txt

@@ -18,6 +18,10 @@ whatap/conf/configuration.py
 whatap/conf/configure.py
 whatap/conf/license.py
 whatap/control/__init__.py
+whatap/counter/__init__.py
+whatap/counter/counter_manager.py
+whatap/counter/tasks/__init__.py
+whatap/counter/tasks/openfiledescriptor.py
 whatap/io/__init__.py
 whatap/io/data_inputx.py
 whatap/io/data_outputx.py
@@ -33,6 +37,7 @@ whatap/pack/__init__.py
 whatap/pack/logSinkPack.py
 whatap/pack/pack.py
 whatap/pack/pack_enum.py
+whatap/pack/tagCountPack.py
 whatap/scripts/__init__.py
 whatap/trace/__init__.py
 whatap/trace/simple_trace_context.py

whatap_python-1.7.1/whatap/build.py

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