feat: add PackIdGenerator for SLS integration

Author: 0xJacky

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "ulogger"
-version         = "0.1.6"
+version         = "0.1.7"
 description     = "Universal Python logging utilities with SLS and session support"
 requires-python = ">=3.9"
 authors         = [{name="0xJacky", email="me@jackyu.cn"}]

src/ulogger/sls.py

@@ -1,13 +1,44 @@
 """SLS (Simple Log Service) integration for Alibaba Cloud."""
 
+import hashlib
 import json
 import logging
+import os
+import secrets
+import socket
 import threading
 import time
 from dataclasses import dataclass
 from typing import Dict, List, Optional, Tuple
 
 
+class PackIdGenerator:
+    """生成符合阿里云 PackId 规范的标识符，线程安全"""
+
+    _PREFIX_LENGTH = 16
+
+    def __init__(self, prefix: Optional[str] = None) -> None:
+        self._lock = threading.Lock()
+        self._counter = 0
+        self._prefix = (prefix or self._build_prefix()).upper()
+
+    def generate(self) -> str:
+        """生成新的 PackId，格式为 <前缀>-<递增十六进制序号>"""
+        with self._lock:
+            self._counter += 1
+            sequence = self._counter
+        return f"{self._prefix}-{sequence:X}"
+
+    def _build_prefix(self) -> str:
+        hostname = socket.gethostname()
+        pid = os.getpid()
+        now_ns = time.time_ns()
+        entropy = secrets.token_hex(8)
+        payload = f"{hostname}|{pid}|{now_ns}|{entropy}".encode("utf-8")
+        digest = hashlib.sha256(payload).hexdigest().upper()
+        return digest[: self._PREFIX_LENGTH]
+
+
 @dataclass
 class SLSConfig:
     """SLS configuration data class"""
@@ -217,6 +248,7 @@ def __init__(
         self._PutLogsRequest = put_logs_request_cls
         self._LogException = log_exception_cls
         self._lock = threading.Lock()
+        self._pack_id_generator = PackIdGenerator()
 
     def emit(self, record: logging.LogRecord) -> None:
         if not self._client:
@@ -239,6 +271,9 @@ def emit(self, record: logging.LogRecord) -> None:
                 logitems=[log_item],
             )
 
+            pack_id = self._pack_id_generator.generate()
+            self._attach_pack_id(request, pack_id)
+
             with self._lock:
                 self._client.put_logs(request)
 
@@ -341,6 +376,25 @@ def _resolve_timestamp(record: logging.LogRecord) -> Tuple[int, int]:
         now_ns = time.time_ns()
         return now_ns // 1_000_000_000, now_ns % 1_000_000_000
 
+    def _attach_pack_id(self, request, pack_id: str) -> None:
+        tag_payload = [("__pack_id__", pack_id)]
+
+        set_logtags = getattr(request, "set_logtags", None)
+        if callable(set_logtags):
+            set_logtags(tag_payload)
+            return
+
+        set_log_tags = getattr(request, "set_log_tags", None)
+        if callable(set_log_tags):
+            set_log_tags(tag_payload)
+            return
+
+        if hasattr(request, "logtags"):
+            request.logtags = tag_payload
+            return
+
+        request.log_tags = tag_payload
+
     @classmethod
     def create(cls, config: SLSConfig) -> Optional["SLSPropagateHandler"]:
         """Create SLS handler if configuration is valid"""

tests/test_sls.py

@@ -7,7 +7,27 @@
 
 import pytest
 
-from ulogger.sls import SLSClient, SLSConfig, SLSPropagateHandler
+from ulogger.sls import PackIdGenerator, SLSClient, SLSConfig, SLSPropagateHandler
+
+
+class TestPackIdGenerator:
+    """Test PackIdGenerator behavior"""
+
+    def test_generate_sequence_and_format(self):
+        generator = PackIdGenerator()
+
+        first = generator.generate()
+        second = generator.generate()
+
+        assert first != second
+
+        prefix1, seq1 = first.split("-")
+        prefix2, seq2 = second.split("-")
+
+        assert len(prefix1) == 16
+        assert prefix1 == prefix1.upper()
+        assert prefix1 == prefix2
+        assert int(seq2, 16) == int(seq1, 16) + 1
 
 
 class TestSLSConfig:
@@ -364,6 +384,7 @@ def test_emit(self):
         client = MagicMock()
         log_item = MagicMock()
         put_logs_request = MagicMock()
+        put_logs_request.set_logtags = MagicMock()
 
         handler = SLSPropagateHandler(
             client,
@@ -389,6 +410,13 @@ def test_emit(self):
         assert log_item.set_time.call_count == 1
         assert log_item.set_time_nano_part.call_count == 1
         log_item.set_contents.assert_called_once()
+        put_logs_request.set_logtags.assert_called_once()
+        tags = put_logs_request.set_logtags.call_args[0][0]
+        assert tags[0][0] == "__pack_id__"
+        pack_id_value = tags[0][1]
+        prefix, seq = pack_id_value.split("-")
+        assert len(prefix) == 16
+        assert int(seq, 16) >= 1
         client.put_logs.assert_called_once_with(put_logs_request)
 
     def test_emit_logger_disabled(self):