otlp-json 0.9.7__tar.gz → 1.0.1__tar.gz

{otlp_json-0.9.7 → otlp_json-1.0.1}/.github/workflows/ci.yaml

@@ -3,6 +3,7 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  workflow_dispatch:
 
 jobs:
   ci:
@@ -10,8 +11,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13, 3.13t, 3.14]
-        dep-versions: [--frozen, "--resolution lowest", "--resolution highest"]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13, 3.13t, 3.14, 3.15, 3.15t]
+        dep-versions: [--frozen, "--resolution lowest", "--resolution highest --upgrade"]
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v5
@@ -26,6 +27,7 @@ jobs:
           uv build
 
   release:
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
     needs: ci
     runs-on: ubuntu-latest
     environment: release
@@ -35,9 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/setup-uv@v5
-      - run: |
-          uv build --sdist --wheel
-          rm -vf dist/.gitignore  # https://github.com/astral-sh/uv/issues/11652
+      - run: uv build --sdist --wheel
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
           repository-url: https://test.pypi.org/legacy/

{otlp_json-0.9.7 → otlp_json-1.0.1}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: git@github.com:astral-sh/ruff-pre-commit.git
-    rev: v0.9.6
+    rev: v0.11.12
     hooks:
       - id: ruff
         args: [ --fix ]

{otlp_json-0.9.7 → otlp_json-1.0.1}/PKG-INFO

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: otlp-json
-Version: 0.9.7
+Version: 1.0.1
 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
+License: Apache License (2.0)
 Classifier: Development Status :: 3 - Alpha
 Classifier: Framework :: OpenTelemetry
 Classifier: Framework :: OpenTelemetry :: Exporters
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
+Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
@@ -64,13 +65,21 @@ class SomeExporter:
   - 4KB Python source
   - ?? metadata
 
-### TODO(doc)
 
-- link to rust library
-- link to urllib sender
-- link to test vector generator
+### Testing
 
-### TODO(features)
+```sh
+uv sync
+uv run pytest
+```
+
+### Links
+
+- Test data generator: https://pypi.org/project/otlp-test-data/
+- Python stdlib-only exporter: https://github.com/canonical/operator/blob/main/tracing/ops_tracing/_export.py#L141-L160
+- Tiny (compiled) extension written in Rust: https://pypi.org/project/otlp-proto
+
+### Features
 
 - Events
 - Links

{otlp_json-0.9.7 → otlp_json-1.0.1}/otlp_json/__init__.py

@@ -7,15 +7,15 @@ 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
     from opentelemetry.trace.status import Status
 
     _LEAF_VALUE: TypeAlias = "str | int | float | bool"  # TODO: confirm
-    _VALUE: TypeAlias = "_LEAF_VALUE | Sequence[_LEAF_VALUE]"
+    _VALUE: TypeAlias = (
+        "_LEAF_VALUE | Sequence[_LEAF_VALUE] | Mapping[str, _LEAF_VALUE]"
+    )
 
 
 __all__ = [
@@ -79,7 +79,10 @@ def _resource(resource: Resource):
 
 
 def _attributes(
-    thing: Resource | InstrumentationScope | ReadableSpan | Event | Link | LogRecord,
+    thing: Resource
+    | InstrumentationScope
+    | ReadableSpan
+    | Event,  # TODO: | Link | LogRecord
 ) -> dict[str, Any]:
     rv = {"attributes": [], "dropped_attributes_count": 0}
 

{otlp_json-0.9.7 → otlp_json-1.0.1}/pyproject.toml

@@ -1,15 +1,14 @@
 [project]
 name = "otlp-json"
-version = "0.9.7"
+version = "1.0.1"
 description = "🐍Lightweight OTEL span to JSON converter, no dependencies, pure Python🐍"
 requires-python = ">=3.8"
-# https://github.com/astral-sh/uv/issues/4204
-# license = "MIT"
+license = {text = "Apache License (2.0)"}
 readme = "readme.md"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: MIT License",
+    "License :: OSI Approved :: Apache Software License",
     "Natural Language :: English",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
@@ -44,8 +43,14 @@ dev = [
 ]
 testing = [
     "pytest ~= 8.3.4",
-    "otlp-test-data >= 0.9.3",
+    "otlp-test-data >= 1.0.2",
 ]
+[ tool.uv]
+constraint-dependencies = [
+    "wrapt ~= 1.14.0; python_version >= '3.11'",
+    "protobuf>=6.31.0; python_version >= '3.14'",
+]
+exclude-dependencies = ["grpcio"]
 
 [build-system]
 requires = ["hatchling"]

{otlp_json-0.9.7 → otlp_json-1.0.1}/readme.md

@@ -35,13 +35,21 @@ class SomeExporter:
   - 4KB Python source
   - ?? metadata
 
-### TODO(doc)
 
-- link to rust library
-- link to urllib sender
-- link to test vector generator
+### Testing
 
-### TODO(features)
+```sh
+uv sync
+uv run pytest
+```
+
+### Links
+
+- Test data generator: https://pypi.org/project/otlp-test-data/
+- Python stdlib-only exporter: https://github.com/canonical/operator/blob/main/tracing/ops_tracing/_export.py#L141-L160
+- Tiny (compiled) extension written in Rust: https://pypi.org/project/otlp-proto
+
+### Features
 
 - Events
 - Links

{otlp_json-0.9.7 → otlp_json-1.0.1}/test/test_pure_python.py

@@ -17,6 +17,9 @@ def canonical(batch):
         rs["scopeSpans"].sort(key=lambda sc: sc["scope"]["name"])
         for sc in rs["scopeSpans"]:
             sc["spans"].sort(key=lambda sp: sp["spanId"])
+            # FIXME: opentelemetry doesn't render scope attributes, so don't compare them
+            # (we'll just assume that this library renders them correctly)
+            sc["scope"].pop("attributes", None)
 
     return batch