fix: typo and run tox

Author: ben-natan

instrumentation/README.md

@@ -28,6 +28,7 @@
 | [opentelemetry-instrumentation-pymysql](./opentelemetry-instrumentation-pymysql) | PyMySQL < 2 |
 | [opentelemetry-instrumentation-pyramid](./opentelemetry-instrumentation-pyramid) | pyramid >= 1.7 |
 | [opentelemetry-instrumentation-redis](./opentelemetry-instrumentation-redis) | redis >= 2.6 |
+| [opentelemetry-instrumentation-remoulade](./opentelemetry-instrumentation-remoulade) | remoulade >= 0.49 |
 | [opentelemetry-instrumentation-requests](./opentelemetry-instrumentation-requests) | requests ~= 2.0 |
 | [opentelemetry-instrumentation-sklearn](./opentelemetry-instrumentation-sklearn) | scikit-learn ~= 0.24.0 |
 | [opentelemetry-instrumentation-sqlalchemy](./opentelemetry-instrumentation-sqlalchemy) | sqlalchemy |

instrumentation/opentelemetry-instrumentation-remoulade/setup.py

@@ -39,13 +39,23 @@
 PACKAGE_INFO = {}
 
 VERSION_FILENAME = os.path.join(
-    BASE_DIR, "src", "opentelemetry", "instrumentation", "remoulade", "version.py"
+    BASE_DIR,
+    "src",
+    "opentelemetry",
+    "instrumentation",
+    "remoulade",
+    "version.py",
 )
 with open(VERSION_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)
 
 PACKAGE_FILENAME = os.path.join(
-    BASE_DIR, "src", "opentelemetry", "instrumentation", "remoulade", "package.py"
+    BASE_DIR,
+    "src",
+    "opentelemetry",
+    "instrumentation",
+    "remoulade",
+    "package.py",
 )
 with open(PACKAGE_FILENAME, encoding="utf-8") as f:
     exec(f.read(), PACKAGE_INFO)

instrumentation/opentelemetry-instrumentation-remoulade/src/opentelemetry/instrumentation/remoulade/__init__.py

@@ -4,14 +4,13 @@
 from remoulade import Middleware, broker
 
 from opentelemetry import trace
+from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
 from opentelemetry.instrumentation.remoulade import utils
-from opentelemetry.instrumentation.remoulade.version import __version__
 from opentelemetry.instrumentation.remoulade.package import _instruments
-from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
+from opentelemetry.instrumentation.remoulade.version import __version__
 from opentelemetry.propagate import extract, inject
 from opentelemetry.semconv.trace import SpanAttributes
 
-
 _MESSAGE_TAG_KEY = "remoulade.action"
 _MESSAGE_SEND = "send"
 _MESSAGE_RUN = "run"
@@ -28,20 +27,32 @@ def before_process_message(self, _broker, message):
         trace_ctx = extract(message.options["trace_ctx"])
         retry_count = message.options.get("retries")
 
-        operation_name = "remoulade/process" if retry_count is None else f"remoulade/process(retry-{retry_count})"
+        operation_name = (
+            "remoulade/process"
+            if retry_count is None
+            else f"remoulade/process(retry-{retry_count})"
+        )
 
-        span = self._tracer.start_span(operation_name, kind=trace.SpanKind.CONSUMER, context=trace_ctx)
+        span = self._tracer.start_span(
+            operation_name, kind=trace.SpanKind.CONSUMER, context=trace_ctx
+        )
 
         if retry_count is not None:
             span.set_attribute("retry_count", retry_count)
 
         activation = trace.use_span(span, end_on_exit=True)
         activation.__enter__()
 
-        utils.attach_span(self._span_registry, message.message_id, (span, activation))
+        utils.attach_span(
+            self._span_registry, message.message_id, (span, activation)
+        )
 
-    def after_process_message(self, _broker, message, *, result=None, exception=None):
-        span, activation = utils.retrieve_span(self._span_registry, message.message_id)
+    def after_process_message(
+        self, _broker, message, *, result=None, exception=None
+    ):
+        span, activation = utils.retrieve_span(
+            self._span_registry, message.message_id
+        )
 
         if span is None:
             # no existing span found for message_id
@@ -58,37 +69,54 @@ def after_process_message(self, _broker, message, *, result=None, exception=None
     def before_enqueue(self, _broker, message, delay):
         retry_count = message.options.get("retries")
 
-        operation_name = "remoulade/send" if retry_count is None else f"remoulade/send(retry-{retry_count})"
+        operation_name = (
+            "remoulade/send"
+            if retry_count is None
+            else f"remoulade/send(retry-{retry_count})"
+        )
 
-        span = self._tracer.start_span(operation_name, kind=trace.SpanKind.PRODUCER)
+        span = self._tracer.start_span(
+            operation_name, kind=trace.SpanKind.PRODUCER
+        )
 
         if retry_count is not None:
             span.set_attribute("retry_count", retry_count)
 
         if span.is_recording():
             span.set_attribute(_MESSAGE_TAG_KEY, _MESSAGE_SEND)
-            span.set_attribute(SpanAttributes.MESSAGING_MESSAGE_ID, message.message_id)
+            span.set_attribute(
+                SpanAttributes.MESSAGING_MESSAGE_ID, message.message_id
+            )
             span.set_attribute(_MESSAGE_NAME_KEY, message.actor_name)
             pass
 
         activation = trace.use_span(span, end_on_exit=True)
         activation.__enter__()
 
-        utils.attach_span(self._span_registry, message.message_id, (span, activation), is_publish=True)
+        utils.attach_span(
+            self._span_registry,
+            message.message_id,
+            (span, activation),
+            is_publish=True,
+        )
 
         if "trace_ctx" not in message.options:
             message.options["trace_ctx"] = {}
         inject(message.options["trace_ctx"])
 
     def after_enqueue(self, _broker, message, delay, exception=None):
-        _, activation = utils.retrieve_span(self._span_registry, message.message_id, is_publish=True)
+        _, activation = utils.retrieve_span(
+            self._span_registry, message.message_id, is_publish=True
+        )
 
         if activation is None:
             # no existing span found for message_id
             return
 
         activation.__exit__(None, None, None)
-        utils.detach_span(self._span_registry, message.message_id, is_publish=True)
+        utils.detach_span(
+            self._span_registry, message.message_id, is_publish=True
+        )
 
 
 class RemouladeInstrumentor(BaseInstrumentor):

instrumentation/opentelemetry-instrumentation-remoulade/tests/test_messages.py

@@ -1,5 +1,6 @@
 import remoulade
 from remoulade.brokers.local import LocalBroker
+
 from opentelemetry.instrumentation.remoulade import RemouladeInstrumentor
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import SpanKind
@@ -66,25 +67,13 @@ def test_retries(self):
         producer_spans = spans[1::2]
 
         self.assertEqual(consumer_spans[0].name, "remoulade/process(retry-3)")
-        self.assertSpanHasAttributes(
-            consumer_spans[0],
-            {"retry_count": 3}
-        )
+        self.assertSpanHasAttributes(consumer_spans[0], {"retry_count": 3})
         self.assertEqual(consumer_spans[1].name, "remoulade/process(retry-2)")
-        self.assertSpanHasAttributes(
-            consumer_spans[1],
-            {"retry_count": 2}
-        )
+        self.assertSpanHasAttributes(consumer_spans[1], {"retry_count": 2})
         self.assertEqual(consumer_spans[3].name, "remoulade/process")
 
         self.assertEqual(producer_spans[0].name, "remoulade/send(retry-3)")
-        self.assertSpanHasAttributes(
-            producer_spans[0],
-            {"retry_count": 3}
-        )
+        self.assertSpanHasAttributes(producer_spans[0], {"retry_count": 3})
         self.assertEqual(producer_spans[1].name, "remoulade/send(retry-2)")
-        self.assertSpanHasAttributes(
-            producer_spans[1],
-            {"retry_count": 2}
-        )
+        self.assertSpanHasAttributes(producer_spans[1], {"retry_count": 2})
         self.assertEqual(producer_spans[3].name, "remoulade/send")

opentelemetry-contrib-instrumentations/setup.cfg

@@ -55,6 +55,7 @@ install_requires =
 	opentelemetry-instrumentation-pymysql==0.30b0
 	opentelemetry-instrumentation-pyramid==0.30b0
 	opentelemetry-instrumentation-redis==0.30b0
+	opentelemetry-instrumentation-remoulade==0.30b0
 	opentelemetry-instrumentation-requests==0.30b0
 	opentelemetry-instrumentation-sklearn==0.30b0
 	opentelemetry-instrumentation-sqlalchemy==0.30b0

opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py

@@ -113,7 +113,7 @@
         "instrumentation": "opentelemetry-instrumentation-redis==0.30b0",
     },
     "remoulade": {
-        "library": "remoulade >= 0.48",
+        "library": "remoulade >= 0.49",
         "instrumentation": "opentelemetry-instrumentation-remoulade==0.30b0",
     },
     "requests": {

tox.ini

@@ -157,7 +157,7 @@ envlist =
     pypy3-test-instrumentation-redis
 
     ; opentelemetry-instrumentation-remoulade
-    py3{6,7,8,9,10}-test-instrumentation-remoualde
+    py3{6,7,8,9,10}-test-instrumentation-remoulade
     pypy3-test-instrumentation-remoulade
 
     ; opentelemetry-instrumentation-celery
@@ -282,6 +282,7 @@ changedir =
   test-instrumentation-pymysql: instrumentation/opentelemetry-instrumentation-pymysql/tests
   test-instrumentation-pyramid: instrumentation/opentelemetry-instrumentation-pyramid/tests
   test-instrumentation-redis: instrumentation/opentelemetry-instrumentation-redis/tests
+  test-instrumentation-remoulade: instrumentation/opentelemetry-instrumentation-remoulade/tests
   test-instrumentation-requests: instrumentation/opentelemetry-instrumentation-requests/tests
   test-instrumentation-sklearn: instrumentation/opentelemetry-instrumentation-sklearn/tests
   test-instrumentation-sqlalchemy{11,14}: instrumentation/opentelemetry-instrumentation-sqlalchemy/tests