wip: work on status

Author: dimaqq

otlp_json/__init__.py

@@ -118,14 +118,18 @@ def _scope(scope: InstrumentationScope):
     return rv
 
 
+_REMOTE = 0x300
+_LOCAL = 0x100
+
+
 def _span(span: ReadableSpan):
     assert span.context
     rv = {
         "name": span.name,
         "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 and span.parent.is_remote)]),
+        "flags": _REMOTE if span.parent and span.parent.is_remote else _LOCAL,
         "startTimeUnixNano": str(span.start_time),
         "endTimeUnixNano": str(span.end_time),  # can this be unset?
         "status": _status(span.status),
@@ -155,8 +159,10 @@ def _span_id(span_id: int) -> str:
 
 
 def _status(status: Status) -> dict[str, Any]:
-    # FIXME: need an example of bad status
-    return {}
+    rv = {}
+    # rv["code"] ...
+    # rv["message"] = ...
+    return rv
 
 
 def _event(event: Event) -> dict[str, Any]:

test/test_pure_python.py

@@ -11,7 +11,17 @@
 CONTENT_TYPE = "application/json"
 
 
+def canonical(batch):
+    batch["resourceSpans"].sort(key=lambda rs: json.dumps(rs["resource"]))
+    for rs in batch["resourceSpans"]:
+        rs["scopeSpans"].sort(key=lambda sc: sc["scope"]["name"])
+        for sc in rs["scopeSpans"]:
+            sc["spans"].sort(key=lambda sp: sp["spanId"])
+
+    return batch
+
+
 def test_equiv():
-    auth = json.loads(otlp_test_data.sample_json())
-    mine = json.loads(otlp_json.encode_spans(otlp_test_data.sample_spans()))
+    auth = canonical(json.loads(otlp_test_data.sample_json()))
+    mine = canonical(json.loads(otlp_json.encode_spans(otlp_test_data.sample_spans())))
     assert mine == auth