Skip to content

[python] Avoid passing global tracer to pin in weblog apps #4004

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mabdinur merged 1 commit into from
Feb 5, 2025
Merged

[python] Avoid passing global tracer to pin in weblog apps #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/build/docker/python/django/app/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,7 @@ def get_value(request):
def create_extra_service(request):
new_service_name = request.GET.get("serviceName", default="")
if new_service_name:
Pin.override(django, service=new_service_name, tracer=tracer)
Pin.override(django, service=new_service_name)
return HttpResponse("OK")


Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/fastapi/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -876,7 +876,7 @@ def safe_eval(expr):
@app.get("/createextraservice", response_class=PlainTextResponse)
def create_extra_service(serviceName: str = ""):
if serviceName:
Pin.override(fastapi, service=serviceName, tracer=tracer)
Pin.override(fastapi, service=serviceName)
return "OK"


Expand Down
2 changes: 1 addition & 1 deletion utils/build/docker/python/flask/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ def db():
def create_extra_service():
new_service_name = request.args.get("serviceName", default="", type=str)
if new_service_name:
Pin.override(Flask, service=new_service_name, tracer=tracer)
Pin.override(Flask, service=new_service_name)
return Response("OK")


Expand Down
6 changes: 1 addition & 5 deletions utils/build/docker/python/flask/integrations/messaging/rabbitmq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
import kombu

from ddtrace.trace import tracer, Pin


def rabbitmq_produce(queue, exchange, routing_key, message):
conn = kombu.Connection("amqp://rabbitmq:5672")
conn.connect()
producer = conn.Producer()
Pin.override(producer, tracer=tracer)

task_queue = kombu.Queue(queue, kombu.Exchange(exchange), routing_key=routing_key)
to_publish = {"message": message}
Expand All @@ -24,8 +21,7 @@ def process_message(body, message):
message.ack()
messages.append(message.payload)

with kombu.Consumer(conn, [task_queue], accept=["json"], callbacks=[process_message]) as consumer:
Pin.override(consumer, tracer=tracer)
with kombu.Consumer(conn, [task_queue], accept=["json"], callbacks=[process_message]):
conn.drain_events(timeout=timeout)

conn.close()
Expand Down