Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- `opentelemetry-instrumentation-django`: Fixes invalid type at WSGI request headers and attributes collection.
([#3731](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3731))
- `opentelemetry-instrumentation-botocore`: bedrock: only decode JSON input buffer in Anthropic Claude streaming
([#3875](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/3875))
- `opentelemetry-instrumentation-aiohttp-client`, `opentelemetry-instrumentation-aiohttp-server`: Fix readme links and text
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

import logging
import types
from logging import getLogger
from time import time
Expand Down Expand Up @@ -131,6 +132,17 @@ def __call__(self, request):
_logger = getLogger(__name__)


class RequestFilter(logging.Filter):
def filter(self, record: logging.LogRecord) -> bool:
request = getattr(record, "request", None)
record.request = str(request)
return True


_wsgi_request_logger = logging.getLogger("django.request")
_wsgi_request_logger.addFilter(RequestFilter())


def _is_asgi_request(request: HttpRequest) -> bool:
return ASGIRequest is not None and isinstance(request, ASGIRequest)

Expand Down Expand Up @@ -276,6 +288,7 @@ def process_request(self, request):
custom_attributes = (
wsgi_collect_custom_request_headers_attributes(carrier)
)

if len(custom_attributes) > 0:
span.set_attributes(custom_attributes)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
# pylint: disable=E0611
# pylint: disable=too-many-lines

import logging
from sys import modules
from timeit import default_timer
from unittest import TestCase
from unittest.mock import Mock, patch

from django import VERSION, conf
Expand All @@ -35,6 +37,9 @@
DjangoInstrumentor,
_DjangoMiddleware,
)
from opentelemetry.instrumentation.django.middleware.otel_middleware import (
RequestFilter,
)
from opentelemetry.instrumentation.propagators import (
TraceResponsePropagator,
set_global_response_propagator,
Expand Down Expand Up @@ -100,6 +105,53 @@ def path(path_argument, *args, **kwargs):
_django_instrumentor = DjangoInstrumentor()


# pylint: disable=too-many-public-methods
class TestRequestFilter(TestCase):
def test_converts_http_request_to_string(self):
class DummyRequest:
def __str__(self):
return "<DummyRequest method=GET path=/example/>"

request = DummyRequest()

record = logging.LogRecord(
name="django.request",
level=logging.ERROR,
pathname=__file__,
lineno=0,
msg="test message",
args=(),
exc_info=None,
)
record.request = request

expected_repr = str(request)

request_filter = RequestFilter()
result = request_filter.filter(record)

self.assertTrue(result)
self.assertEqual(record.request, expected_repr)
self.assertIsInstance(record.request, str)

def test_handles_missing_request_attribute(self):
record = logging.LogRecord(
name="django.request",
level=logging.INFO,
pathname=__file__,
lineno=0,
msg="no request",
args=(),
exc_info=None,
)

request_filter = RequestFilter()
result = request_filter.filter(record)

self.assertTrue(result)
self.assertEqual(record.request, "None")


# pylint: disable=too-many-public-methods
class TestMiddleware(WsgiTestBase):
@classmethod
Expand Down