UncountablePythonSDK 0.0.174__tar.gz → 0.0.175__tar.gz

{uncountablepythonsdk-0.0.174/UncountablePythonSDK.egg-info → uncountablepythonsdk-0.0.175}/PKG-INFO

@@ -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 → uncountablepythonsdk-0.0.175/UncountablePythonSDK.egg-info}/PKG-INFO

@@ -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 → uncountablepythonsdk-0.0.175}/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",

{uncountablepythonsdk-0.0.174 → uncountablepythonsdk-0.0.175}/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}"