whatap-python 2.0.2__tar.gz → 2.0.3rc1__tar.gz

{whatap_python-2.0.2 → whatap_python-2.0.3rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatap-python
-Version: 2.0.2
+Version: 2.0.3rc1
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

{whatap_python-2.0.2 → whatap_python-2.0.3rc1}/whatap/__init__.py

@@ -301,9 +301,45 @@ from whatap.trace.trace_module_definition import DEFINITION, IMPORT_HOOKS, \
     PLUGIN
 
 
+def _build_ignore_instrumentation_set():
+    """whatap.conf 의 ignore_instrumentation_set 값을 정규화하여 반환.
+    Configure.load() 가 _set 접미사 키를 콤마 split 해 list 로 만들지만,
+    환경변수/직접 setProperty 등 다른 경로로 들어온 경우(str)도 함께 처리한다.
+    """
+    raw = getattr(conf, 'ignore_instrumentation_set', None) or []
+    if isinstance(raw, str):
+        raw = raw.split(',')
+    return {str(item).strip().lower() for item in raw if item and str(item).strip()}
+
+
+def _is_instrumentation_ignored(definition_key, ignore_set):
+    """DEFINITION 키(예: 'database.redis', 'logging')가 무시 대상인지 판정.
+
+    매칭 규칙(셋 중 하나라도 맞으면 True):
+      1) 키 전체가 일치        예: 'database.redis' == 'database.redis'
+      2) 카테고리(점 앞)와 일치  예: 'database'        → 'database.*' 모두
+      3) 라이브러리(점 뒤)와 일치 예: 'redis'           → 'database.redis'
+    """
+    if not ignore_set:
+        return False
+    key_lower = definition_key.lower()
+    if key_lower in ignore_set:
+        return True
+    if '.' in key_lower:
+        category, lib = key_lower.split('.', 1)
+        if category in ignore_set or lib in ignore_set:
+            return True
+    return False
+
+
 def hooks(home):
+    ignore_set = _build_ignore_instrumentation_set()
+    skipped_keys = []
     try:
         for key, value_list in DEFINITION.items():
+            if _is_instrumentation_ignored(key, ignore_set):
+                skipped_keys.append(key)
+                continue
             for value in value_list:
                 if len(value) >= 3 and isinstance(value[2], str):
                     module_path = value[2]
@@ -318,7 +354,14 @@ def hooks(home):
         logging.debug(e, extra={'id': 'MODULE ERROR'})
     finally:
         try:
-            if conf.trace_logging_enabled:
+            if skipped_keys:
+                logging.debug(
+                    'WHATAP: ignore_instrumentation_set skipped: {}'.format(
+                        ','.join(skipped_keys)),
+                    extra={'id': 'WA_IGN'})
+
+            if conf.trace_logging_enabled and not _is_instrumentation_ignored(
+                    'logging', ignore_set):
                 logging_module = sys.modules.get("logging")
                 from whatap.trace.mod.logging import instrument_logging
                 instrument_logging(logging_module)

whatap_python-2.0.3rc1/whatap/build.py

@@ -0,0 +1,4 @@
+app = 'Python'
+name = 'whatap-python'
+version = '2.0.3rc1'
+release_date = '20260506'

{whatap_python-2.0.2 → whatap_python-2.0.3rc1}/whatap/conf/configuration.py

@@ -19,6 +19,13 @@ Configuration = {
     "trace_ignore_url_prefix": None,
     "trace_websocket_enabled": False,
 
+    # 자동 계측에서 제외할 라이브러리 목록(콤마 구분).
+    #   - DEFINITION 키 전체:   database.redis, llm.openai
+    #   - 카테고리만:          database  (database.* 전부 스킵)
+    #   - 라이브러리 이름만:    redis, openai, django  (해당 키만 스킵)
+    # 예: ignore_instrumentation_set=redis,openai,application.django
+    "ignore_instrumentation_set": [],
+
     "llm_api_hosts": "",
 
     "debug": False,

{whatap_python-2.0.2 → whatap_python-2.0.3rc1}/whatap_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: whatap-python
-Version: 2.0.2
+Version: 2.0.3rc1
 Summary: Monitoring and Profiling Service
 Home-page: https://www.whatap.io
 Author: whatap

whatap_python-2.0.2/whatap/build.py

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