bdd-trace 0.4.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

bdd_trace/log.py

@@ -17,6 +17,7 @@ def setup_logging(
     level: str | int = INFO,
     trace_id_format: str = "%(asctime)s|%(levelname)s|%(name)s|%(otelTraceID)s|%(message)s",
     no_trace_id_format: str = "%(asctime)s|%(levelname)s|%(name)s|%(message)s",
+    extra_handlers: list[Handler] | None = None,
 ) -> None:
     global _log_queue, _log_listener
     if _log_queue is not None or _log_listener is not None:
@@ -29,9 +30,10 @@ def setup_logging(
     for module in modules:
         _setup_module_logger(level, module)
 
+    log_process_handlers = extra_handlers or []
     format = trace_id_format if profile != Profile.NO_TRACE else no_trace_id_format
     console_handler = _create_console_handler(modules, format)
-    log_process_handlers = [console_handler]
+    log_process_handlers.append(console_handler)
     if profile != Profile.NO_TRACE:
         otel_handler = LoggingHandler()
         log_process_handlers.append(otel_handler)

bdd_trace/trace.py

@@ -20,6 +20,10 @@ _EXPORTER_OTLP_INSECURE_KEY = "exporter_otlp_insecure"
 _SERVICE_NAME_KEY = "service_name"
 _PYTHON_FASTAPI_EXCLUDE_URLS_KEY = "python_fastapi_excluded_urls"
 _INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST_KEY = "instrumentation_http_capture_headers_server_request"
+_OTEL_PYTHON_LOG_CORRELATION_KEY = "otel_python_log_correlation"
+_EXPORTER_OTLP_TRACES_PROTOCOL_KEY = "exporter_otlp_traces_protocol"
+_EXPORTER_OTLP_METRICS_PROTOCOL_KEY = "exporter_otlp_metrics_protocol"
+_EXPORTER_OTLP_LOGS_PROTOCOL_KEY = "exporter_otlp_logs_protocol"
 
 _default_envs = {
     _TRACES_EXPORTER_KEY: "otlp",
@@ -28,14 +32,18 @@ _default_envs = {
     _PYTHON_FASTAPI_EXCLUDE_URLS_KEY: "/healthCheck",
     _INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST_KEY: "X-User-Id,X-Conversation-From",
     _EXPORTER_OTLP_INSECURE_KEY: "true",
+    _OTEL_PYTHON_LOG_CORRELATION_KEY: "true",
 }
 
 _profile_config = {
     Profile.DEV: {
-        _TRACES_EXPORTER_KEY: "console",
-        _METRICS_EXPORTER_KEY: "console",
-        _LOGS_EXPORTER_KEY: "console",
-        _EXPORTER_OTLP_ENDPOINT_KEY: None,
+        _TRACES_EXPORTER_KEY: "otlp",
+        _METRICS_EXPORTER_KEY: "otlp",
+        _LOGS_EXPORTER_KEY: "otlp",
+        _EXPORTER_OTLP_ENDPOINT_KEY: "http://otel-sls-collector-test.life-science-platform.zhejianglab.com",
+        _EXPORTER_OTLP_TRACES_PROTOCOL_KEY: "http/protobuf",
+        _EXPORTER_OTLP_METRICS_PROTOCOL_KEY: "http/protobuf",
+        _EXPORTER_OTLP_LOGS_PROTOCOL_KEY: "http/protobuf",
     },
     Profile.TEST: {
         _TRACES_EXPORTER_KEY: "otlp",

{bdd_trace-0.4.1.dist-info → bdd_trace-0.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bdd-trace
-Version: 0.4.1
+Version: 0.5.2
 Summary: BDD项目日志和追踪SDK
 Author: 蔡涛
 Author-email: 蔡涛 <caitao@zhejianglab.cn>

bdd_trace-0.5.2.dist-info/RECORD

@@ -0,0 +1,7 @@
+bdd_trace/__init__.py,sha256=X4Nx6VppPfXXXEe5oC_foryalbOk5f9HLOi50Nat8mY,154
+bdd_trace/log.py,sha256=Solf9XJTnfgEtvQidTQadoQ7MBHuPSrpPBCUt6X1Dro,2846
+bdd_trace/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+bdd_trace/trace.py,sha256=wmzwkcHtV7CslLFKzpIFjSv-55WsqX28uPfsgYDvumA,3784
+bdd_trace-0.5.2.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+bdd_trace-0.5.2.dist-info/METADATA,sha256=aZ5MjyAKeUuB1aYKOrK242J8Sz7HHkz4ahpYQ-F-0cI,1585
+bdd_trace-0.5.2.dist-info/RECORD,,

bdd_trace-0.4.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-bdd_trace/__init__.py,sha256=X4Nx6VppPfXXXEe5oC_foryalbOk5f9HLOi50Nat8mY,154
-bdd_trace/log.py,sha256=dCxXu9qoPeInqgZw6ElumDmc4B_QX5KultLlZ5edfns,2745
-bdd_trace/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bdd_trace/trace.py,sha256=ovXyQkKQVzhMjScIxAMi55UG7lZUYn6ipwY6nN_W0AM,3229
-bdd_trace-0.4.1.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-bdd_trace-0.4.1.dist-info/METADATA,sha256=0W8Yh05xaCMEOCtIp0FArslo_hDU7vvQuHFJ2W-1eLI,1585
-bdd_trace-0.4.1.dist-info/RECORD,,