otlp-json 0.9.1__py3-none-any.whl → 0.9.2__py3-none-any.whl

otlp_json.py → otlp_json/__init__.py

@@ -1,12 +1,13 @@
 from __future__ import annotations
 
 import json
-from typing import Any, Sequence, TYPE_CHECKING
+from collections.abc import Mapping, Sequence
+from typing import Any, TYPE_CHECKING
 
 if TYPE_CHECKING:
     from typing_extensions import TypeAlias
 
-    from opentelemetry.sdk.trace import ReadableSpan
+    from opentelemetry.sdk.trace import ReadableSpan, Event
     from opentelemetry.sdk.resources import Resource
     from opentelemetry.sdk.util.instrumentation import InstrumentationScope
     from opentelemetry.trace.status import Status
@@ -18,6 +19,24 @@ if TYPE_CHECKING:
 CONTENT_TYPE = "application/json"
 
 
+_VALUE_TYPES = {
+    # NOTE: order matters, for isinstance(True, int).
+    bool: ("boolValue", bool),
+    int: ("intValue", str),
+    float: ("doubleValue", float),
+    bytes: ("bytesValue", bytes),
+    str: ("stringValue", str),
+    Sequence: (
+        "arrayValue",
+        lambda value: {"values": [_value(e) for e in _homogeneous_array(value)]},
+    ),
+    Mapping: (
+        "kvlistValue",
+        lambda value: {"values": [{k: _value(v) for k, v in value.items()}]},
+    ),
+}
+
+
 def encode_spans(spans: Sequence[ReadableSpan]) -> bytes:
     spans = sorted(spans, key=lambda s: (id(s.resource), id(s.instrumentation_scope)))
     rv = {"resourceSpans": []}
@@ -47,36 +66,46 @@ def encode_spans(spans: Sequence[ReadableSpan]) -> bytes:
 
 
 def _resource(resource: Resource):
-    return {
-        "attributes": [
-            {"key": k, "value": _value(v)} for k, v in resource.attributes.items()
-        ]
-    }
+    rv = {"attributes": []}
+    for k, v in resource.attributes.items():
+        try:
+            rv["attributes"].append({"key": k, "value": _value(v)})
+        except ValueError:
+            pass
+
+    # NOTE: blocks that contain droppedAttributesCount:
+    # - Event
+    # - Link
+    # - InstrumentationScope
+    # - LogRecord (out of scope for this library)
+    # - Resource
+    rv["dropped_attributes_count"] = len(resource.attributes) - len(rv["attributes"])  # type: ignore
+
+    if not rv["attributes"]:
+        del rv["attributes"]
+
+    if not rv["dropped_attributes_count"]:
+        del rv["dropped_attributes_count"]
+
+    return rv
+
+
+def _homogeneous_array(value: list[_LEAF_VALUE]) -> list[_LEAF_VALUE]:
+    # TODO: empty lists are allowed, aren't they?
+    if len(types := {type(v) for v in value}) > 1:
+        raise ValueError(f"Attribute value arrays must be homogeneous, got {types=}")
+    return value
 
 
 def _value(value: _VALUE) -> dict[str, Any]:
     # Attribute value can be a primitive type, excluging None...
     # TODO: protobuf allows bytes, but I think OTLP doesn't.
     # TODO: protobuf allows k:v pairs, but I think OTLP doesn't.
-    if isinstance(value, (str, int, float, bool)):
-        k = {
-            # TODO: move these to module level
-            str: "stringValue",
-            int: "intValue",
-            float: "floatValue",
-            bool: "boolValue",
-        }[type(value)]
-        return {k: value}
-
-    # Or a homogenous array of a primitive type, excluding None.
-    value = list(value)
-
-    # TODO: empty lists are allowed, aren't they?
-    if len({type(v) for v in value}) > 1:
-        raise ValueError(f"Attribute value arrays must be homogenous, got {value}")
+    for klass, (key, post) in _VALUE_TYPES.items():
+        if isinstance(value, klass):
+            return {key: post(value)}
 
-    # TODO: maybe prevent recursion, OTEL doesn't allow lists of lists
-    return {"arrayValue": [_value(e) for e in value]}
+    raise ValueError(f"Cannot convert attribute of {type(value)=}")
 
 
 def _scope(scope: InstrumentationScope):
@@ -93,13 +122,33 @@ def _span(span: ReadableSpan):
         "kind": span.kind.value or 1,  # unspecified -> internal
         "traceId": _trace_id(span.context.trace_id),
         "spanId": _span_id(span.context.span_id),
-        "flags": 0x100 | ([0, 0x200][bool(span.parent)]),
+        "flags": 0x100 | ([0, 0x200][bool(span.parent and span.parent.is_remote)]),
         "startTimeUnixNano": str(span.start_time),  # TODO: is it ever optional?
         "endTimeUnixNano": str(span.end_time),  # -"-
         "status": _status(span.status),
+        "attributes": [],
     }
+
     if span.parent:
         rv["parentSpanId"] = _span_id(span.parent.span_id)
+
+    for k, v in span.attributes.items():  # type: ignore
+        try:
+            rv["attributes"].append({"key": k, "value": _value(v)})
+        except ValueError:
+            pass
+
+    rv["dropped_attributes_count"] = len(span.attributes) - len(rv["attributes"])  # type: ignore
+
+    if not rv["attributes"]:
+        del rv["attributes"]
+
+    if not rv["dropped_attributes_count"]:
+        del rv["dropped_attributes_count"]
+
+    if span.events:
+        rv["events"] = [_event(e) for e in span.events]
+
     return rv
 
 
@@ -118,3 +167,27 @@ def _span_id(span_id: int) -> str:
 def _status(status: Status) -> dict[str, Any]:
     # FIXME
     return {}
+
+
+def _event(event: Event) -> dict[str, Any]:
+    rv = {
+        "name": event.name,
+        "timeUnixNano": str(event.timestamp),
+        "attributes": [],
+    }
+
+    for k, v in event.attributes.items():  # type: ignore
+        try:
+            rv["attributes"].append({"key": k, "value": _value(v)})
+        except ValueError:
+            pass
+
+    rv["dropped_attributes_count"] = len(event.attributes) - len(rv["attributes"])  # type: ignore
+
+    if not rv["attributes"]:
+        del rv["attributes"]
+
+    if not rv["dropped_attributes_count"]:
+        del rv["dropped_attributes_count"]
+
+    return rv

{otlp_json-0.9.1.dist-info → otlp_json-0.9.2.dist-info}/METADATA

@@ -1,14 +1,19 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: otlp-json
-Version: 0.9.1
+Version: 0.9.2
 Summary: 🐍Lightweight OTEL span to JSON converter, no dependencies, pure Python🐍
+Project-URL: Repository, https://github.com/dimaqq/otlp-json
+Project-URL: Issues, https://github.com/dimaqq/otlp-json/issues
 Classifier: Development Status :: 3 - Alpha
+Classifier: Framework :: OpenTelemetry
+Classifier: Framework :: OpenTelemetry :: Exporters
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -16,12 +21,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Topic :: Software Development :: Libraries
-Classifier: Framework :: OpenTelemetry
-Classifier: Framework :: OpenTelemetry :: Exporters
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 

otlp_json-0.9.2.dist-info/RECORD

@@ -0,0 +1,4 @@
+otlp_json/__init__.py,sha256=KFI4PCFiyTOw3wTUClS1hIeUyAMCCZp1F9F6K6Qi_IQ,5862
+otlp_json-0.9.2.dist-info/METADATA,sha256=1CqS5onFoYgi8n4ft4DuQnsHwV_kp4aHC5zoQVxLIZA,2810
+otlp_json-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+otlp_json-0.9.2.dist-info/RECORD,,

{otlp_json-0.9.1.dist-info → otlp_json-0.9.2.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: hatchling 1.27.0
 Root-Is-Purelib: true
 Tag: py3-none-any
-

otlp_json-0.9.1.dist-info/RECORD

@@ -1,5 +0,0 @@
-otlp_json.py,sha256=GCHauwquLROkov7v4WfmevNlKzC45aYDbvqGYCb66lg,3869
-otlp_json-0.9.1.dist-info/METADATA,sha256=3OlCQjfep4nN69aMkIVHxTOawNDCnEqOLIu5cDCKHVQ,2685
-otlp_json-0.9.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-otlp_json-0.9.1.dist-info/top_level.txt,sha256=7jOohtnyFAP4ixxnF_1gQz1NKEuVS8ELe3ymA4I5FtU,10
-otlp_json-0.9.1.dist-info/RECORD,,

otlp_json-0.9.1.dist-info/top_level.txt

@@ -1 +0,0 @@
-otlp_json