whatap-python 2.1.4rc1__tar.gz → 2.2.0__tar.gz

{whatap_python-2.1.4rc1 → whatap_python-2.2.0}/PKG-INFO

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

{whatap_python-2.1.4rc1 → whatap_python-2.2.0}/whatap/__init__.py

@@ -117,6 +117,37 @@ def whatap_print(*args):
             message = " ".join(args)
             print(message)
 
+
+def whatap_error_log(msg, log_id='WHATAP_AGENT_ERROR'):
+    """에이전트 시작 오류를 프로세스 로그(stdout)와 hook.log 양쪽에 동일하게 노출한다.
+
+    hook.log FileHandler 는 Configure.load(display=True)->Logger() 시점에 붙는데,
+    go() 스레드가 config() 보다 먼저 도는 경로(자동 attach)나 start_agent 경로에서는
+    아직 핸들러가 없을 수 있다. 그 경우에도 오류가 유실되지 않도록, 핸들러가 없으면
+    whatap-hook.log 에 직접 append 한다."""
+    # 1) 프로세스 로그 (사용자 애플리케이션 stdout)
+    whatap_print(msg)
+
+    # 2) hook.log
+    try:
+        if logging.handlers:
+            logging.error(msg, extra={'id': log_id})
+            return
+    except Exception:
+        pass
+
+    # FileHandler 미부착: whatap-hook.log 에 직접 기록
+    try:
+        logs_dir = os.environ.get('WHATAP_LOGS') or \
+            os.path.join(os.environ.get('WHATAP_HOME', '.'), 'logs')
+        if not os.path.exists(logs_dir):
+            os.makedirs(logs_dir)
+        with open(os.path.join(logs_dir, LOG_FILE_NAME), 'a') as f:
+            f.write('[{0}] : {1} - {2}\n'.format(
+                time.strftime(LOGGING_DATE_FORMAT), log_id, msg))
+    except Exception as e:
+        whatap_print('WHATAP: hook.log write failed: {}'.format(e))
+
 class Logger(object):
     def __init__(self):
         self.logger = logging
@@ -291,6 +322,18 @@ def config(home):
             from whatap.conf.license import License
             conf.PCODE = License.getProjectCode(conf.license)
 
+        # LLM 채널은 자기 프로젝트 코드를 가진다. LLM 트랜잭션(is_llm=1)은 LLM Go Agent
+        # 소켓으로만 나가므로 결합 좌표에 APM PCODE 를 실으면 서버가 호출자를 엉뚱한
+        # 프로젝트에서 찾는다(conf.pcode_of 참조). getProjectCode 는 키 문자열 파싱이라
+        # 서버 왕복이 없고, apm_enabled=false 인 LLM 전용 배포에서도 해소된다.
+        llm_key = str(getattr(conf, 'llm_accesskey', '') or '').strip()
+        if llm_key:
+            try:
+                from whatap.conf.license import License
+                conf.LLM_PCODE = License.getProjectCode(llm_key)
+            except Exception as e:
+                whatap_print('WHATAP: LLM PCODE RESOLVE ERROR: {}'.format(e))
+
         import whatap.counter
 
         hooks(home)
@@ -366,47 +409,61 @@ def hooks(home):
                 from whatap.trace.mod.logging import instrument_logging
                 instrument_logging(logging_module)
 
+            # 한 모듈에 여러 패턴 계열(스텝=instrument_plugin / 워크플로우=instrument_workflow
+            # / 트랜잭션=instrument_service)이 공존할 수 있도록, IMPORT_HOOKS[모듈]에
+            # 인스트루먼터를 각자의 class_defs 와 함께 리스트로 누적한다. 과거엔 단일 dict 라
+            # 뒤 계열이 앞을 덮어써서 같은 모듈에 두 패턴(예: predict=트랜잭션 + 헬퍼=스텝)을
+            # 못 걸었다.
+            def _register_pattern_hook(module_name, class_def, def_name, mod_path):
+                if not PLUGIN.get(module_name):
+                    PLUGIN[module_name] = []
+                if class_def not in PLUGIN[module_name]:
+                    PLUGIN[module_name].append(class_def)  # 호환용(외부 참조)
+                existing = IMPORT_HOOKS.get(module_name)
+                if isinstance(existing, list):
+                    entry_list = existing
+                elif isinstance(existing, dict):
+                    entry_list = [existing]
+                    IMPORT_HOOKS[module_name] = entry_list
+                else:
+                    entry_list = []
+                    IMPORT_HOOKS[module_name] = entry_list
+                for e in entry_list:
+                    if isinstance(e, dict) and e.get('def') == def_name \
+                            and e.get('module') == mod_path:
+                        e.setdefault('class_defs', []).append(class_def)
+                        return
+                entry_list.append({'def': def_name, 'module': mod_path,
+                                   'class_defs': [class_def]})
+
             if conf.hook_method_patterns:
-                from whatap.trace.mod.plugin import instrument_plugin
-                patterns = conf.hook_method_patterns.split(',')
-                for pattern in patterns:
-                    pattern=pattern.strip()
-                
-                    module_name, class_def = pattern.split(':')
-                    if not PLUGIN.get(module_name):
-                        PLUGIN[module_name] = []
-                    PLUGIN[module_name].append(class_def)
-                    
-                    DEFINITION["plugin"].append(
-                        (module_name, 'instrument_plugin'))
-                    
-                    key = 'plugin'
-                    for value in DEFINITION[key]:
-                        IMPORT_HOOKS[value[0]] = {'def': value[1],
-                                                  'module': '{0}.{1}.{2}.{3}'.format(
-                                                      'whatap',
-                                                      'trace',
-                                                      'mod',
-                                                      key)}
-
-            # 서비스(트랜잭션) 진입점 자동 래핑 (conf 방법). hook_method_patterns 와 같은
-            # import-hook 플러밍, 래퍼만 트랜잭션 open/close (whatap.trace.mod.hook_service_patterns).
-            # @method_profiling 을 소스 수정 없이 conf 로 적용하는 경로.
+                for pattern in conf.hook_method_patterns.split(','):
+                    pattern = pattern.strip()
+                    if not pattern or ':' not in pattern:
+                        continue
+                    module_name, class_def = pattern.split(':', 1)
+                    _register_pattern_hook(module_name.strip(), class_def.strip(),
+                                           'instrument_plugin', 'whatap.trace.mod.plugin')
+
+            # LLM 워크플로우 경계 자동 래핑 (conf 방법). 래퍼만 워크플로우 open/close.
+            if conf.workflow_method_patterns:
+                for pattern in conf.workflow_method_patterns.split(','):
+                    pattern = pattern.strip()
+                    if not pattern or ':' not in pattern:
+                        continue
+                    module_name, class_def = pattern.split(':', 1)
+                    _register_pattern_hook(module_name.strip(), class_def.strip(),
+                                           'instrument_workflow', 'whatap.trace.mod.workflow_plugin')
+
+            # 서비스(트랜잭션) 진입점 자동 래핑 (conf 방법). @method_profiling 의 conf 버전.
             if conf.hook_service_patterns:
                 for pattern in conf.hook_service_patterns.split(','):
                     pattern = pattern.strip()
                     if not pattern or ':' not in pattern:
                         continue
                     module_name, class_def = pattern.split(':', 1)
-                    module_name = module_name.strip()
-                    class_def = class_def.strip()
-                    if not PLUGIN.get(module_name):
-                        PLUGIN[module_name] = []
-                    PLUGIN[module_name].append(class_def)
-                    # 대상 모듈이 PLUGIN 에 등록되면 ImportFinder 가 class_defs 패키징.
-                    IMPORT_HOOKS[module_name] = {
-                        'def': 'instrument_service',
-                        'module': 'whatap.trace.mod.hook_service_patterns'}
+                    _register_pattern_hook(module_name.strip(), class_def.strip(),
+                                           'instrument_service', 'whatap.trace.mod.hook_service_patterns')
 
             if conf.standalone_enabled:
                 if conf.standalone_type == 'multiple-transaction':
@@ -420,9 +477,43 @@ def hooks(home):
             logging.debug(e, extra={'id': 'PLUGIN ERROR'})
         finally:
             sys.meta_path.insert(0, ImportFinder())
+            _instrument_already_imported()
             logging.debug('WHATAP AGENT START!', extra={'id': 'WA000'})
 
 
+def _instrument_already_imported():
+    """finder 설치 시점에 **이미 import 돼 있던** 훅 대상을 직접 계측한다.
+
+    ``ImportFinder.find_spec`` 은 import 시스템이 ``sys.modules`` 미스일 때만 호출하므로,
+    finder 설치보다 먼저 로드된 모듈은 훅이 영원히 안 걸린다. 그리고 이 에이전트는 자기
+    부팅에 필요한 모듈(``subprocess`` — 최상단 import, 데몬 기동에 사용)을 finder 설치
+    **전에** 로드하므로, 그 대상은 DEFINITION 에 등록해도 계측되지 않는다.
+
+    앱이 우회할 수 없는 종류의 구멍이다(앱이 할 수 있는 건 에이전트 내부 instrument_*
+    함수를 대신 호출하는 것뿐이고, 그건 자동계측을 쓰는 의미를 없앤다).
+
+    ``load_module`` 을 그대로 재사용하므로 정상 import 경로와 완전히 같은 처리를 받는다
+    (엔트리 리스트/class_defs 패키징 포함). instrument_* 는 멱등이어야 한다 — 이 스윕과 이후의
+    재-import 가 같은 대상을 두 번 건드릴 수 있다.
+    """
+    try:
+        from whatap.trace.trace_import import load_module
+    except Exception as e:
+        logging.info("pre-imported sweep unavailable: %s: %s",
+                     e.__class__.__name__, e, exc_info=True)
+        return
+    for fullname in list(IMPORT_HOOKS.keys()):
+        module = sys.modules.get(fullname)
+        if module is None:
+            continue
+        try:
+            load_module(module, fullname)
+        except Exception as e:
+            # 계측 실패는 조용히 넘기면 "데이터가 안 보인다" 로만 드러난다.
+            logging.info("failed to inject pre-imported %s: %s: %s",
+                         fullname, e.__class__.__name__, e, exc_info=True)
+
+
 def agent():
     home = 'WHATAP_HOME'
     whatap_home = os.environ.get(home)
@@ -451,9 +542,18 @@ def agent():
                 t.start()
 
             if llm_enabled == 'true':
-                t = threading.Thread(target=go, kwargs={'llm': True})
-                t.setDaemon(True)
-                t.start()
+                # llm_enabled=true 라도 LLM 채널 자격증명(llm_accesskey)이 없으면 LLM
+                # 에이전트를 띄우지 않는다. (env 로 플래그만 켜진 경우의 오작동 방지 —
+                # llm_accesskey/LLM 서버 호스트 없이 LLM 모드로 도는 것을 막는다.)
+                llm_accesskey = (preview_whatap_conf("llm_accesskey")
+                                 or os.environ.get("llm_accesskey"))
+                if llm_accesskey:
+                    t = threading.Thread(target=go, kwargs={'llm': True})
+                    t.setDaemon(True)
+                    t.start()
+                else:
+                    whatap_print("WHATAP: llm_enabled=true 이나 llm_accesskey 가 "
+                                 "없어 LLM 에이전트 기동을 건너뜁니다")
 
         config(home)
 
@@ -472,6 +572,17 @@ AGENT_NAME = 'whatap_python'
 
 
 def go(batch=False, opts={}, llm=False):
+    # LLM 에이전트는 Linux/macOS 를 지원한다(전용 whatap_python 이
+    # $WHATAP_HOME/<os>/<arch> 에 배포됨 — linux/darwin × amd64/arm64).
+    # 그 외 OS(Windows 등)는 전용 바이너리가 없으므로 우회적 "binary not found"
+    # 대신 명시적으로 LLM 기동을 차단하고 알린다.
+    if llm and platform.system().lower() not in ('linux', 'darwin'):
+        whatap_error_log(
+            'WHATAP: LLM agent is supported on Linux/macOS only '
+            '(current OS: {0}); skipping LLM agent start'.format(platform.system()),
+            log_id='WHATAP_LLM_UNSUPPORTED_OS')
+        return
+
     newenv=os.environ.copy()
     newenv['WHATAP_VERSION'] = build.version
     newenv['whatap.start'] = str(DateUtil.now())
@@ -532,47 +643,78 @@ def go(batch=False, opts={}, llm=False):
 
         # Windows uses .exe extension
         agent_binary_name = AGENT_NAME + '.exe' if sys.platform == 'win32' else AGENT_NAME
-        dest_agent = os.path.join(home_path, agent_binary_name)
 
-        # Try to remove existing binary
-        # Windows: File may still be locked even after waiting, ignore error and use existing binary
-        # Unix/Linux: Removal should always succeed
-        needs_deployment = False
-        if os.path.exists(dest_agent):
-            try:
-                os.remove(dest_agent)
-                needs_deployment = True
-            except (OSError, PermissionError) as e:
-                if sys.platform == 'win32':
-                    # Windows: File is still locked, use existing binary
-                    pass
-                else:
-                    # Unix/Linux: This should not happen
-                    raise
+        # LLM mode (Unix/Linux) runs a dedicated whatap_python binary that ships
+        # separately under $WHATAP_HOME/<os>/<arch>/ (e.g. $WHATAP_HOME/linux/amd64).
+        # It is executed in place from there rather than deployed from the bundled
+        # package into $WHATAP_HOME/whatap_python, which the APM agent uses (the two
+        # are now distinct binaries and would otherwise clobber each other).
+        run_in_place = llm and sys.platform != 'win32'
+
+        if run_in_place:
+            source_cwd = os.path.join(home_path, platform.system().lower(), ARCH[platform.machine()])
+            source_agent = os.path.join(source_cwd, agent_binary_name)
+            if not os.path.exists(source_agent):
+                raise FileNotFoundError(
+                    'LLM agent binary not found: {0} '
+                    '(place the LLM {1} under $WHATAP_HOME/{2}/{3}/)'.format(
+                        source_agent, agent_binary_name,
+                        platform.system().lower(), ARCH[platform.machine()]))
+            # Ensure executable (best effort; ignore on read-only locations)
+            if not os.access(source_agent, os.X_OK):
+                try:
+                    os.chmod(source_agent, 0o755)
+                except OSError as e:
+                    whatap_print('WHATAP: chmod LLM agent binary failed: %s' % e)
+            agent_cmd = source_agent
         else:
-            needs_deployment = True
+            dest_agent = os.path.join(home_path, agent_binary_name)
 
-        # Windows doesn't use architecture subdirectories (only single x64 binary for now)
-        if sys.platform == 'win32':
-            source_cwd = os.path.join(os.path.dirname(__file__), 'agent', 'windows')
-        else:
-            source_cwd = os.path.join(os.path.join(os.path.dirname(__file__), 'agent'), platform.system().lower(),
-                                      ARCH[platform.machine()])
+            # Try to remove existing binary
+            # Windows: File may still be locked even after waiting, ignore error and use existing binary
+            # Unix/Linux: Removal should always succeed
+            needs_deployment = False
+            if os.path.exists(dest_agent):
+                try:
+                    os.remove(dest_agent)
+                    needs_deployment = True
+                except (OSError, PermissionError) as e:
+                    if sys.platform == 'win32':
+                        # Windows: File is still locked, use existing binary
+                        pass
+                    else:
+                        # Unix/Linux: This should not happen
+                        raise
+            else:
+                needs_deployment = True
 
-        source_agent = os.path.join(source_cwd, agent_binary_name)
+            # Windows doesn't use architecture subdirectories (only single x64 binary for now)
+            if sys.platform == 'win32':
+                source_cwd = os.path.join(os.path.dirname(__file__), 'agent', 'windows')
+            else:
+                source_cwd = os.path.join(os.path.join(os.path.dirname(__file__), 'agent'), platform.system().lower(),
+                                          ARCH[platform.machine()])
 
-        # Deploy agent binary only if needed
-        if needs_deployment:
-            # Try symlink first (Unix/Linux or Windows with proper permissions)
-            try:
-                os.symlink(source_agent, dest_agent)
-            except (OSError, NotImplementedError):
-                # Fallback to copy on Windows or when symlink fails
-                import shutil
-                shutil.copy2(source_agent, dest_agent)
-                # Make executable on Unix-like systems
-                if sys.platform != 'win32':
-                    os.chmod(dest_agent, 0o755)
+            source_agent = os.path.join(source_cwd, agent_binary_name)
+
+            # Deploy agent binary only if needed
+            if needs_deployment:
+                # Try symlink first (Unix/Linux or Windows with proper permissions)
+                try:
+                    os.symlink(source_agent, dest_agent)
+                except (OSError, NotImplementedError):
+                    # Fallback to copy on Windows or when symlink fails
+                    import shutil
+                    shutil.copy2(source_agent, dest_agent)
+                    # Make executable on Unix-like systems
+                    if sys.platform != 'win32':
+                        os.chmod(dest_agent, 0o755)
+
+            # Windows uses absolute path, Unix/Linux uses relative path
+            if sys.platform == 'win32':
+                agent_cmd = os.path.join(home_path, agent_binary_name)
+            else:
+                agent_cmd = './{0}'.format(agent_binary_name)
 
         sockfile_path = os.path.join(home_path, 'run')
         if not os.path.exists(sockfile_path):
@@ -581,12 +723,6 @@ def go(batch=False, opts={}, llm=False):
         newenv['WHATAP_PID_FILE'] = file_name
         newenv['PYTHON_PARENT_APP_PID'] = str(os.getpid())
 
-        # Windows uses absolute path, Unix/Linux uses relative path
-        if sys.platform == 'win32':
-            agent_cmd = os.path.join(home_path, agent_binary_name)
-        else:
-            agent_cmd = './{0}'.format(agent_binary_name)
-
         # Windows: Run in background with DETACHED_PROCESS
         # Unix/Linux: Run in background with start_new_session
         # 실행 인자 구성
@@ -657,7 +793,10 @@ def go(batch=False, opts={}, llm=False):
     except Exception as e:
         import traceback
         traceback.print_exc()
-        whatap_print('WHATAP: AGENT ERROR: {}'.format(e))
+        # hook.log + 프로세스 로그 양쪽에 동일하게 노출
+        whatap_error_log(
+            'WHATAP: {0} AGENT ERROR: {1}'.format('LLM' if llm else 'APM', e),
+            log_id='WHATAP_LLM_AGENT_ERROR' if llm else 'WHATAP_AGENT_ERROR')
     else:
         whatap_print('WHATAP: AGENT UP! (process name: {}{})\n'.format(AGENT_NAME, ' --llm' if llm else ''))
 
@@ -695,8 +834,8 @@ def _service_trace(fn, service_name=None):
     """fn 을 하나의 트랜잭션(TX_START~TX_END)으로 감싼 래퍼를 반환한다.
 
     ``@method_profiling`` 데코레이터와 conf ``hook_service_patterns``
-    (whatap.trace.mod.hook_service_patterns) 의 **공용 코어**. 여기엔 agent() 부팅이
-    없다 (데코레이터/부트 경로가 각자 처리).
+    (whatap.trace.mod.hook_service_patterns) 의 **공용 코어**. 여기엔 agent() 부팅이 없다
+    (데코레이터/부트 경로가 각자 처리).
 
     코루틴 함수는 동기 래퍼로 감싸면 트랜잭션이 start_interceptor → 코루틴 생성 →
     end_interceptor 로 즉시 열렸다 닫히고, 실제 본문은 호출자가 await 할 때 트랜잭션
@@ -772,26 +911,7 @@ def _service_trace(fn, service_name=None):
 
 
 def method_profiling(fn):
-    # NOTE: 의도적으로 _service_trace 를 쓰지 않는다. 이 데코레이터는 이미 배포된
-    # 공개 API 라, 예외 재전파/컨텍스트 정리/async 지원으로 바꾸면 기존 사용자의
-    # 동작이 달라진다. 해당 수정은 dev 에 있고 정식 머지 때 함께 들어온다.
-    def trace(*args, **kwargs):
-        callback = None
-        try:
-            ctx = TraceContext()
-            ctx.service_name=fn.__name__
-            start_interceptor(ctx)
-            callback = fn(*args, **kwargs)
-        except Exception as e:
-            ctx = TraceContextManager.getLocalContext()
-            interceptor_step_error(e, ctx=ctx)
-            interceptor_error_log(ctx.id, e, fn, args, kwargs)
-            logging.debug('WHATAP(@method_profiling): ' + str(e),
-                          extra={'id': 'WA776'}, exc_info=True)
-        finally:
-            ctx = TraceContextManager.getLocalContext()
-            end_interceptor(ctx=ctx)
-            return callback
+    trace = _service_trace(fn)
 
     if not os.environ.get('whatap.enabled'):
         agent()

whatap_python-2.2.0/whatap/build.py

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