Skip to content

Commit

Permalink
chore(tracer): revert "limit memory usage for extra services reports" (
Browse files Browse the repository at this point in the history
…#7074)

Reverts #7060

- [x] foobar
  • Loading branch information
emmettbutler committed Sep 27, 2023
1 parent c7b2520 commit c6808b2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
8 changes: 4 additions & 4 deletions ddtrace/settings/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class Config(object):
available and can be updated by users.
"""

_extra_services_queue = multiprocessing.Queue(512) # type: multiprocessing.Queue
_extra_services_queue = multiprocessing.Queue() # type: multiprocessing.Queue

class _HTTPServerConfig(object):
_error_statuses = "500-599" # type: str
Expand Down Expand Up @@ -422,12 +422,12 @@ def __getattr__(self, name):
return self._config[name]

def _add_extra_service(self, service_name: str) -> None:
from queue import Full
from queue import Empty

if self._remote_config_enabled and service_name != self.service:
if service_name != self.service:
try:
self._extra_services_queue.put_nowait(service_name)
except Full: # nosec
except Empty: # nosec
pass
except BaseException:
log.debug("unexpected failure with _add_extra_service", exc_info=True)
Expand Down
19 changes: 5 additions & 14 deletions tests/contrib/flask/test_flask_appsec.py
Original file line number Diff line number Diff line change
Expand Up @@ -927,8 +927,6 @@ def test_route():
)

def test_multiple_service_name(self):
import time

import flask

import ddtrace
Expand All @@ -938,15 +936,8 @@ def new_service(service_name):
ddtrace.Pin.override(flask.Flask, service=service_name, tracer=ddtrace.tracer)
return "Ok %s" % service_name, 200

with override_global_config(dict(_remote_config_enabled=True)):
self._aux_appsec_prepare_tracer()
assert ddtrace.config._remote_config_enabled
resp = self.client.get("/new_service/awesome_test")
assert resp.status_code == 200
assert get_response_body(resp) == "Ok awesome_test"
for _ in range(10):
time.sleep(1)
if "awesome_test" in ddtrace.config._get_extra_services():
break
else:
raise AssertionError("extra service not found")
self._aux_appsec_prepare_tracer()
resp = self.client.get("/new_service/awesome_test")
assert resp.status_code == 200
assert get_response_body(resp) == "Ok awesome_test"
assert "awesome_test" in ddtrace.config._get_extra_services()

0 comments on commit c6808b2

Please sign in to comment.