UncountablePythonSDK 0.0.174__py3-none-any.whl → 0.0.175__py3-none-any.whl

pkgs/type_spec/non_discriminated_union_exceptions.py

@@ -6,7 +6,7 @@ NON_DISCRIMINATED_UNION_EXCEPTIONS = [
     "output_parameters.AnalyticalMethodLinkedOptionValue",
     "recipes_redirect.RecipesRedirectResult",
     "value_spec.ResolvedPathAll",
-    "weighted_sum.WeightedSumEntitiesOld",
+    "deprecated_calculation_types.DeprecatedWeightedSumEntitiesV0",
     "workflows.WorkflowTotalDisplay",
     "type_info.TypeFormActionConstraint",
     "structured_loading.CompatibleFilterNode",

uncountable/integration/telemetry.py

@@ -15,7 +15,6 @@ from typing import Generator, assert_never, cast
 import psutil
 from opentelemetry import _logs, trace
 from opentelemetry._logs import Logger as OTELLogger, LogRecord
-from opentelemetry.context import get_current
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
 from opentelemetry.sdk._logs import (
     LoggerProvider,
@@ -51,23 +50,16 @@ def _cast_attributes(attributes: dict[str, base_t.JsonValue]) -> Attributes:
     return cast(Attributes, attributes)
 
 
-def _dd_log_correlation_attributes(
-    span_context: trace.SpanContext,
-) -> dict[str, base_t.JsonValue]:
-    # Integration server logs export via ConsoleLogExporter
-    # (stdout), not OTLP, so we inject the dd.trace_id / dd.span_id
-    # correlation keys manually (hex trace, decimal span).
-    if not span_context.is_valid:
-        return {}
-    return {
-        "dd.trace_id": trace.format_trace_id(span_context.trace_id),
-        "dd.span_id": str(span_context.span_id),
-    }
-
-
 def one_line_formatter(record: ReadableLogRecord) -> str:
-    json_data = record.to_json()
-    return json.dumps(json.loads(json_data), separators=(",", ":")) + "\n"
+    payload = json.loads(record.to_json())
+
+    trace_id = record.log_record.trace_id
+    span_id = record.log_record.span_id
+    if trace_id:
+        payload["dd.trace_id"] = trace.format_trace_id(trace_id)
+    if span_id:
+        payload["dd.span_id"] = str(span_id)
+    return json.dumps(payload, separators=(",", ":")) + "\n"
 
 
 @functools.cache
@@ -142,10 +134,10 @@ class Logger:
         return self.base_span.get_span_context().span_id
 
     @property
-    def base_trace_id(self) -> int | None:
+    def trace_id(self) -> int | None:
         return self.base_span.get_span_context().trace_id
 
-    def _correlation_span(self) -> Span:
+    def _current_span_with_fallback(self) -> Span:
         active_span = trace.get_current_span()
         if active_span.get_span_context().is_valid:
             return active_span
@@ -158,7 +150,9 @@ class Logger:
         message: str | None = None,
         severity: LogSeverity | None = None,
     ) -> Attributes:
-        patched_attributes: dict[str, base_t.JsonValue] = {**self._bound_attributes}
+        patched_attributes: dict[str, base_t.JsonValue] = {
+            **self._bound_attributes,
+        }
         for scope_attrs in self._scope_attributes_stack:
             patched_attributes.update(scope_attrs)
         if attributes is not None:
@@ -181,20 +175,15 @@ class Logger:
         self, message: str, *, severity: LogSeverity, attributes: Attributes | None
     ) -> None:
         otel_logger = get_otel_logger()
-        log_attributes: dict[str, base_t.JsonValue] = dict(
-            self._patch_attributes(
-                message=message, severity=severity, attributes=attributes
-            )
-        )
-        log_attributes.update(
-            _dd_log_correlation_attributes(self._correlation_span().get_span_context())
-        )
+
         log_record = LogRecord(
             body=message,
             severity_text=severity,
             timestamp=time.time_ns(),
-            attributes=_cast_attributes(log_attributes),
-            context=get_current(),
+            attributes=self._patch_attributes(
+                message=message, severity=severity, attributes=attributes
+            ),
+            context=trace.set_span_in_context(self._current_span_with_fallback()),
             severity_number=_get_severity_number(severity),
         )
         otel_logger.emit(log_record)
@@ -242,7 +231,7 @@ class Logger:
         patched_attributes = self._patch_attributes(
             message=message, severity=severity, attributes=attributes
         )
-        self._correlation_span().record_exception(
+        self._current_span_with_fallback().record_exception(
             exception=exception, attributes=patched_attributes
         )
         log_message = f"{message}\nexception: {exception}{traceback_str}"

{uncountablepythonsdk-0.0.174.dist-info → uncountablepythonsdk-0.0.175.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: UncountablePythonSDK
-Version: 0.0.174
+Version: 0.0.175
 Summary: Uncountable SDK
 Project-URL: Homepage, https://github.com/uncountableinc/uncountable-python-sdk
 Project-URL: Repository, https://github.com/uncountableinc/uncountable-python-sdk.git

{uncountablepythonsdk-0.0.174.dist-info → uncountablepythonsdk-0.0.175.dist-info}/RECORD

@@ -95,7 +95,7 @@ pkgs/type_spec/emit_python.py,sha256=zQXAw-vPbv-YCic5qXCebW5LhXTo9sUqwJ3d9aG48w4
 pkgs/type_spec/emit_typescript.py,sha256=Qu9f1Yv_wc449KHcBGO58hatbzvPvgMbZ11jferi3oY,11567
 pkgs/type_spec/emit_typescript_util.py,sha256=fNPgSMf3jA66_STGqN4cuH0rH3CvGLc3TKQIEdHxGYA,13558
 pkgs/type_spec/load_types.py,sha256=1a8-AGVfpZTOiB8G-JW_1NhMZLg_SINaaKH6l2IrbW8,5045
-pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=vkKyTESIc0-FENhxenLiFDAvxxBTQNlWLqh-3tAFvus,651
+pkgs/type_spec/non_discriminated_union_exceptions.py,sha256=zfYHKhmq3Q7g6vB4tkno8pZj_F8enbSn_CjCJgJAu80,676
 pkgs/type_spec/open_api_util.py,sha256=LX6ny4xNOWXQO3qWVM8elrSDTqWsj_7jFplax2POShE,7992
 pkgs/type_spec/test.py,sha256=4ueujBq-pEgnX3Z69HyPmD-bullFXmpixcpVzfOkhP4,489
 pkgs/type_spec/util.py,sha256=S_SGTJU192x-wIbngVUTvXhQENMbBfxluigLmnItGI8,4848
@@ -137,7 +137,7 @@ uncountable/integration/request_context.py,sha256=N_FJJxqvfUJ0yV9h3I3vFTGNJiDfyL
 uncountable/integration/scan_profiles.py,sha256=iTpzYKBHarlhYG6CKYtyAmQ7vUhEUbj2icGVHell8AU,3059
 uncountable/integration/scheduler.py,sha256=BajQ4txvgEBw8S9x1P0eGm-uBkKp_oecJK65SQd2hNw,8477
 uncountable/integration/server.py,sha256=P4RRGwU9jMselHPWbU6GxhRLgVtN7Ydcxr18sFn2zI8,5778
-uncountable/integration/telemetry.py,sha256=vCIw73OBfxzAaXhPz6VdMqUtWEW70QVoXZ5Q9RIJsU0,16431
+uncountable/integration/telemetry.py,sha256=7IWhCxchtVYJwwwFYduwnMEUdxO8srx2RnocLzcQmtg,15965
 uncountable/integration/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 uncountable/integration/db/connect.py,sha256=mE3bdV0huclH2iT_dXCQdRL4LkjIuf_myAR64RTWXEs,498
 uncountable/integration/db/session.py,sha256=96cGQXpe6IugBTdSsjdP0S5yhJ6toSmbVB6qhc3FJzE,693
@@ -409,7 +409,7 @@ uncountable/types/api/uploader/complete_async_parse.py,sha256=Os1HAubxTlbut6Gylj
 uncountable/types/api/uploader/invoke_uploader.py,sha256=QU1KmAFgGHSWskZEKfaAww8rCj-hVNP0i4kMQE3x3Fc,1822
 uncountable/types/api/user/__init__.py,sha256=gCgbynxG3jA8FQHzercKtrHKHkiIKr8APdZYUniAor8,55
 uncountable/types/api/user/get_current_user_info.py,sha256=BT7bGp5SOHz3XdKWhhdZ6acnInafT2PgdJ-H4YH3W7c,1181
-uncountablepythonsdk-0.0.174.dist-info/METADATA,sha256=IgpDlDYzY8guCjmz-ROa_2rEA2Vs5uqJepWThvfDAPc,2172
-uncountablepythonsdk-0.0.174.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-uncountablepythonsdk-0.0.174.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
-uncountablepythonsdk-0.0.174.dist-info/RECORD,,
+uncountablepythonsdk-0.0.175.dist-info/METADATA,sha256=8pwGUT8NIoJ_bP3Y6TAOUjk8LSX_pDlAotlZC6UB4h0,2172
+uncountablepythonsdk-0.0.175.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+uncountablepythonsdk-0.0.175.dist-info/top_level.txt,sha256=1UVGjAU-6hJY9qw2iJ7nCBeEwZ793AEN5ZfKX9A1uj4,31
+uncountablepythonsdk-0.0.175.dist-info/RECORD,,