otlp-json 0.9.3__tar.gz → 0.9.4__tar.gz

{otlp_json-0.9.3 → otlp_json-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: otlp-json
-Version: 0.9.3
+Version: 0.9.4
 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

{otlp_json-0.9.3 → otlp_json-0.9.4}/otlp_json/__init__.py

@@ -7,6 +7,8 @@ from typing import Any, TYPE_CHECKING
 if TYPE_CHECKING:
     from typing_extensions import TypeAlias
 
+    from opentelemetry.trace import Link
+    from opentelemetry._logs import LogRecord
     from opentelemetry.sdk.trace import ReadableSpan, Event
     from opentelemetry.sdk.resources import Resource
     from opentelemetry.sdk.util.instrumentation import InstrumentationScope
@@ -66,26 +68,27 @@ def encode_spans(spans: Sequence[ReadableSpan]) -> bytes:
 
 
 def _resource(resource: Resource):
-    rv = {"attributes": []}
-    for k, v in resource.attributes.items():
+    # TODO: add schema_url once that lands in opentelemetry-sdk
+    return _attributes(resource)
+
+
+def _attributes(
+    thing: Resource | InstrumentationScope | ReadableSpan | Event | Link | LogRecord,
+) -> dict[str, Any]:
+    rv = {"attributes": [], "dropped_attributes_count": 0}
+
+    assert thing.attributes is not None
+    for k, v in thing.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
+    rv["dropped_attributes_count"] = len(thing.attributes) - len(rv["attributes"])  # type: ignore
 
-    if not rv["attributes"]:
-        del rv["attributes"]
-
-    if not rv["dropped_attributes_count"]:
-        del rv["dropped_attributes_count"]
+    for k in ("attributes", "dropped_attributes_count"):
+        if not rv[k]:
+            del rv[k]
 
     return rv
 
@@ -99,8 +102,9 @@ def _homogeneous_array(value: list[_LEAF_VALUE]) -> list[_LEAF_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.
+    # protobuf allows bytes, but I think OTLP spec does not?
+    # protobuf allows k:v pairs, but I think OTLP doesn't.
+    # TODO: read up the spec and validate the allowed type range.
     for klass, (key, post) in _VALUE_TYPES.items():
         if isinstance(value, klass):
             return {key: post(value)}
@@ -109,7 +113,10 @@ def _value(value: _VALUE) -> dict[str, Any]:
 
 
 def _scope(scope: InstrumentationScope):
-    rv = {"name": scope.name}
+    rv = {
+        "name": scope.name,
+        **_attributes(scope),
+    }
     if scope.version:
         rv["version"] = scope.version
     return rv
@@ -123,29 +130,16 @@ def _span(span: ReadableSpan):
         "traceId": _trace_id(span.context.trace_id),
         "spanId": _span_id(span.context.span_id),
         "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),  # -"-
+        "startTimeUnixNano": str(span.start_time),
+        "endTimeUnixNano": str(span.end_time),  # can this be unset?
         "status": _status(span.status),
-        "attributes": [],
+        **_attributes(span),
     }
 
     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"]
-
+    # TODO: is this field really nullable?
     if span.events:
         rv["events"] = [_event(e) for e in span.events]
 
@@ -165,7 +159,7 @@ def _span_id(span_id: int) -> str:
 
 
 def _status(status: Status) -> dict[str, Any]:
-    # FIXME
+    # FIXME: need an example of bad status
     return {}
 
 
@@ -173,21 +167,7 @@ def _event(event: Event) -> dict[str, Any]:
     rv = {
         "name": event.name,
         "timeUnixNano": str(event.timestamp),
-        "attributes": [],
+        **_attributes(event),
     }
-
-    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"]
-
+    # TODO: any optional attributes?
     return rv

{otlp_json-0.9.3 → otlp_json-0.9.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "otlp-json"
-version = "0.9.3"
+version = "0.9.4"
 description = "🐍Lightweight OTEL span to JSON converter, no dependencies, pure Python🐍"
 requires-python = ">=3.8"
 # https://github.com/astral-sh/uv/issues/4204

{otlp_json-0.9.3 → otlp_json-0.9.4}/uv.lock

@@ -374,7 +374,7 @@ wheels = [
 
 [[package]]
 name = "otlp-json"
-version = "0.9.2"
+version = "0.9.3"
 source = { editable = "." }
 
 [package.dev-dependencies]
@@ -405,7 +405,7 @@ testing = [
 
 [[package]]
 name = "otlp-test-data"
-version = "0.11.0"
+version = "0.11.2"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "freezegun" },
@@ -414,9 +414,9 @@ dependencies = [
     { name = "opentelemetry-exporter-otlp" },
     { name = "opentelemetry-exporter-otlp-proto-http" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/70/c9/bb8de92ae3eea7ba501e38661270d505ec094453fcfaa6d4aa1da120fc8f/otlp_test_data-0.11.0.tar.gz", hash = "sha256:01855e4d84afa76a33457594c30023b1e33accdcf8aaef4611159274f2dd66c3", size = 37638 }
+sdist = { url = "https://files.pythonhosted.org/packages/df/d7/21bed69e7f201abbdb27bf84bea1a02f65991efc60d88aaeb4001c9069ad/otlp_test_data-0.11.2.tar.gz", hash = "sha256:6be622eaa675e08568d140ce0863f0dfbf3eeb7dd1b567d66633ddd79d4d9632", size = 37707 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/28/b3/464748f40e489fc335c2d01147c0cbbe19eb2ec2ab95bdb6b33b74649ea4/otlp_test_data-0.11.0-py3-none-any.whl", hash = "sha256:254955385a4ee1fc30b8514c08600f65b8b7dca55073b6cbdca555c02c533e8b", size = 3373 },
+    { url = "https://files.pythonhosted.org/packages/4c/62/462acb3181f178832c286e8b6f9787a6983dd5bdd9588564624a861db837/otlp_test_data-0.11.2-py3-none-any.whl", hash = "sha256:419190181f221d611d24dba8850e980d69bc7e1195bd36f0c4e5ec6a3bcdcc7e", size = 3584 },
 ]
 
 [[package]]
@@ -457,15 +457,15 @@ wheels = [
 
 [[package]]
 name = "pyright"
-version = "1.1.394"
+version = "1.1.395"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "nodeenv" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b1/e4/79f4d8a342eed6790fdebdb500e95062f319ee3d7d75ae27304ff995ae8c/pyright-1.1.394.tar.gz", hash = "sha256:56f2a3ab88c5214a451eb71d8f2792b7700434f841ea219119ade7f42ca93608", size = 3809348 }
+sdist = { url = "https://files.pythonhosted.org/packages/fb/47/a2e1dfd70f9f0db34f70d5b108c82be57bf24185af69c95acff57f9239fa/pyright-1.1.395.tar.gz", hash = "sha256:53703169068c160bfb41e1b44ba3e2512492869c26cfad927e1268cb3fbb1b1c", size = 3813566 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/d6/4c/50c74e3d589517a9712a61a26143b587dba6285434a17aebf2ce6b82d2c3/pyright-1.1.394-py3-none-any.whl", hash = "sha256:5f74cce0a795a295fb768759bbeeec62561215dea657edcaab48a932b031ddbb", size = 5679540 },
+    { url = "https://files.pythonhosted.org/packages/5f/a1/531897f8caa6c6cc99862cd1c908ddd8a366a51d968e83ab4523ded98b30/pyright-1.1.395-py3-none-any.whl", hash = "sha256:f9bc726870e740c6c77c94657734d90563a3e9765bb523b39f5860198ed75eef", size = 5688787 },
 ]
 
 [[package]]