Skip to content

Commit 5e4e3e1

Browse files
committed
feat: add uninstrument
1 parent 918405b commit 5e4e3e1

File tree

5 files changed

+6
-39
lines changed

5 files changed

+6
-39
lines changed

instrumentation/opentelemetry-instrumentation-remoulade/setup.cfg

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ install_requires =
4343
opentelemetry-api ~= 1.3
4444
opentelemetry-semantic-conventions == 0.30b0
4545
opentelemetry-instrumentation == 0.30b0
46-
wrapt >= 1.12.1
4746

4847
[options.extras_require]
4948
test =
@@ -55,4 +54,4 @@ where = src
5554

5655
[options.entry_points]
5756
opentelemetry_instrumentor =
58-
redis = opentelemetry.instrumentation.remoulade:RemouladeInstrumentor
57+
remoulade = opentelemetry.instrumentation.remoulade:RemouladeInstrumentor

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

+1-3
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,4 @@ def _instrument(self, **kwargs):
104104
broker.get_broker().add_middleware(instrumentation_middleware)
105105

106106
def _uninstrument(self, **kwargs):
107-
# Wait for remoulade==0.49.0 release
108-
# broker.get_broker().remove_middleware(InstrumentationMiddleware)
109-
return
107+
broker.get_broker().remove_middleware(InstrumentationMiddleware)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# limitations under the License.
1414

1515

16-
_instruments = ("remoulade >= 0.48",)
16+
_instruments = ("remoulade >= 0.49",)

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

-29
This file was deleted.

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from opentelemetry.instrumentation.remoulade import RemouladeInstrumentor
44
from opentelemetry.test.test_base import TestBase
55
from opentelemetry.trace import SpanKind
6-
from opentelemetry.semconv.trace import SpanAttributes
76

87

98
@remoulade.actor(max_retries=3)
@@ -36,7 +35,7 @@ def test_message(self):
3635
consumer,
3736
{
3837
"remoulade.action": "run",
39-
"remoulade.actor_name": "actor_multiply",
38+
"remoulade.actor_name": "actor_div",
4039
},
4140
)
4241

@@ -46,7 +45,7 @@ def test_message(self):
4645
producer,
4746
{
4847
"remoulade.action": "send",
49-
"remoulade.actor_name": "actor_multiply",
48+
"remoulade.actor_name": "actor_div",
5049
},
5150
)
5251

@@ -69,7 +68,7 @@ def test_retries(self):
6968
self.assertEqual(consumer_spans[0].name, "remoulade/process(retry-3)")
7069
self.assertSpanHasAttributes(
7170
consumer_spans[0],
72-
{ "retry_count": 3 }
71+
{"retry_count": 3}
7372
)
7473
self.assertEqual(consumer_spans[1].name, "remoulade/process(retry-2)")
7574
self.assertSpanHasAttributes(

0 commit comments

Comments
 (0)