Skip to content
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.

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

feat: Add middleware DatadogDiagnosticMiddleware #735

Merged
merged 4 commits into from
Jul 24, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ Change Log
Unreleased
~~~~~~~~~~

[3.6.0] - 2024-07-25
~~~~~~~~~~~~~~~~~~~~
Added
-----
* New middleware ``edx_arch_experiments.datadog_diagnostics.middleware.DatadogDiagnosticMiddleware`` for logging diagnostics on traces in Datadog.

[3.5.1] - 2024-07-15
~~~~~~~~~~~~~~~~~~~~
Changed
Expand Down
2 changes: 1 addition & 1 deletion edx_arch_experiments/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
A plugin to include applications under development by the architecture team at 2U.
"""

__version__ = '3.5.1'
__version__ = '3.6.0'
75 changes: 75 additions & 0 deletions edx_arch_experiments/datadog_diagnostics/middleware.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
"""
Diagnostic middleware for Datadog.
"""

import logging

from django.core.exceptions import MiddlewareNotUsed
from edx_toggles.toggles import WaffleFlag

log = logging.getLogger(__name__)

# .. toggle_name: datadog.diagnostics.log_root_span
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
# .. toggle_description: Enables logging of Dataodog root span IDs for web requests.
robrap marked this conversation as resolved.
Show resolved Hide resolved
# .. toggle_warning: This is a noisy feature and so it should only be enabled
# for a percentage of requests.
Comment on lines +16 to +17
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right now we are dealing with both Splunk and Datadog, so this makes sense. Also, our Log Ingest was high (over-budget), but SRE may have taken care of that for us? Otherwise, in the future, we could instead control this via Log Index rules that could be tuned based on noisiness. Although the log messages might still affect disk usage, if it really is high.

# .. toggle_use_cases: temporary
# .. toggle_creation_date: 2024-07-24
# .. toggle_target_removal_date: 2024-10-01
# .. toggle_tickets: https://github.com/edx/edx-arch-experiments/issues/692
LOG_ROOT_SPAN = WaffleFlag('datadog.diagnostics.log_root_span', module_name=__name__)


# pylint: disable=missing-function-docstring
class DatadogDiagnosticMiddleware:
"""
Middleware to add diagnostic logging for Datadog.

Best added early in the middleware stack.

Only activates if ``ddtrace`` package is installed and
``datadog.diagnostics.log_root_span`` Waffle flag is enabled.
"""
def __init__(self, get_response):
self.get_response = get_response
self.error = False

try:
from ddtrace import tracer # pylint: disable=import-outside-toplevel
self.dd_tracer = tracer
except ImportError:
# If import fails, don't even load this middleware.
raise MiddlewareNotUsed # pylint: disable=raise-missing-from

def __call__(self, request):
return self.get_response(request)

def process_view(self, request, _view_func, _view_args, _view_kwargs):
try:
self.log_diagnostics(request)
except BaseException as e:
# If there's an error, it will probably hit every request,
# so let's just log it once.
if not self.error:
self.error = True
log.error(
"Encountered error in DatadogDiagnosticMiddleware "
f"(suppressing further errors): {e!r}"
)

def log_diagnostics(self, request):
"""
Contains all the actual logging logic.
"""
if LOG_ROOT_SPAN.is_enabled():
route_pattern = getattr(request.resolver_match, 'route', None)
local_root_span = self.dd_tracer.current_root_span()
current_span = self.dd_tracer.current_span()
# pylint: disable=protected-access
log.info(
f"Datadog span diagnostics: Route = {route_pattern}; "
f"local root span = {local_root_span._pprint()}; "
f"current span = {current_span._pprint()}"
)
Loading