Added object store instrumentation.

Author: s3rius

python/natsrpy/instrumentation/__init__.py

@@ -42,6 +42,7 @@ async def main() -> None:
 from .js_publish import JSPublishInstrumentation
 from .kv import KVInstrumentation
 from .nats_core import NatsCoreInstrumentator
+from .object_store import ObjectStoreInstrumentation
 
 try:
     import opentelemetry  # noqa: F401
@@ -110,9 +111,14 @@ def _instrument(self, **kwargs: Any) -> None:
             tracer,
             capture_body=capture_body,
         ).instrument()
+        ObjectStoreInstrumentation(
+            tracer,
+            capture_body=capture_body,
+        ).instrument()
 
     def _uninstrument(self, **kwargs: Any) -> None:
         NatsCoreInstrumentator.uninstrument()
         JSConsumerInstrumentation.uninstrument()
         JSPublishInstrumentation.uninstrument()
         KVInstrumentation.uninstrument()
+        ObjectStoreInstrumentation.uninstrument()

python/natsrpy/instrumentation/kv.py

@@ -107,7 +107,7 @@ async def _wrapped(
             key: str = args[0]
             value: bytes | str = args[1]
             span = (
-                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.PUT)
+                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.KV_PUT)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .with_kv_value(value, capture_body=capture_body)
@@ -141,7 +141,7 @@ async def _wrapped(
             key: str = args[0]
             value: bytes | str = args[1]
             span = (
-                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.CREATE)
+                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.KV_CREATE)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .with_kv_value(value, capture_body=capture_body)
@@ -175,7 +175,7 @@ async def _wrapped(
             key: str = args[0]
             value: bytes | str = args[1]
             span = (
-                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.UPDATE)
+                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.KV_UPDATE)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .with_kv_value(value, capture_body=capture_body)
@@ -207,7 +207,7 @@ async def _wrapped(
                 return await wrapper(*args, **kwargs)
             key: str = args[0]
             span = (
-                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.DELETE)
+                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.KV_DELETE)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .build()
@@ -238,7 +238,7 @@ async def _wrapped(
                 return await wrapper(*args, **kwargs)
             key: str = args[0]
             span = (
-                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.PURGE)
+                SpanBuilder(tracer, SpanKind.PRODUCER, SpanAction.KV_PURGE)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .build()
@@ -269,7 +269,7 @@ async def _wrapped(
                 return await wrapper(*args, **kwargs)
             key: str = args[0]
             span = (
-                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.GET)
+                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.KV_GET)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .build()
@@ -300,7 +300,7 @@ async def _wrapped(
                 return await wrapper(*args, **kwargs)
             key: str = args[0]
             span = (
-                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.ENTRY)
+                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.KV_ENTRY)
                 .with_kv_bucket(instance.name)
                 .with_kv_key(key)
                 .build()
@@ -395,7 +395,7 @@ async def _wrapped(
             if not is_instrumentation_enabled():
                 return await wrapper(*args, **kwargs)
             span = (
-                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.KEYS)
+                SpanBuilder(tracer, SpanKind.CLIENT, SpanAction.KV_KEYS)
                 .with_kv_bucket(instance.name)
                 .build()
             )