- use unittest assert statements

- capture a list of headers

Signed-off-by: Varsha GS <[email protected]>

Author: GSVarsha

instana/instrumentation/django/middleware.py

@@ -30,14 +30,16 @@ def __init__(self, get_response=None):
         self.get_response = get_response
 
     def _extract_custom_headers(self, span, headers, format):
-        try:
-            if agent.options.extra_http_headers is not None:
-                for custom_header in agent.options.extra_http_headers:
-                    # Headers are available in this format: HTTP_X_CAPTURE_THIS
-                    django_header = ('HTTP_' + custom_header.upper()).replace('-', '_') if format else custom_header
+        if agent.options.extra_http_headers is None:
+            return
+
+        try:            
+            for custom_header in agent.options.extra_http_headers:
+                # Headers are available in this format: HTTP_X_CAPTURE_THIS
+                django_header = ('HTTP_' + custom_header.upper()).replace('-', '_') if format else custom_header
 
-                    if django_header in headers:
-                        span.set_tag("http.header.%s" % custom_header, headers[django_header])
+                if django_header in headers:
+                    span.set_tag("http.header.%s" % custom_header, headers[django_header])
 
         except Exception:
             logger.debug("extract_custom_headers: ", exc_info=True)

tests/apps/app_django.py

@@ -126,9 +126,11 @@ def complex(request):
 
 
 def response_with_headers(request):
-    response = HttpResponse(content_type='')
-    response['X-Capture-This-Too'] = 'this too'
-    return response
+    headers = {
+        'X-Capture-This-Too': 'this too',
+        'X-Capture-That-Too': 'that too'
+    }
+    return HttpResponse('Stan wuz here with headers!', headers=headers)
 
 
 urlpatterns = [