Requests library spec fidelity (#746)

Author: victoraugustolls

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## Unreleased
+- Added `http code` to `grpc code` status code mapping on `utils`
+  ([#746](https://github.com/census-instrumentation/opencensus-python/pull/746))
 
 ## 0.7.1
 Released 2019-08-05

contrib/opencensus-ext-requests/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
 ## Unreleased
+- Added attributes following specs listed [here](https://github.com/census-instrumentation/opencensus-specs/blob/master/trace/HTTP.md#attributes)
+  ([#746](https://github.com/census-instrumentation/opencensus-python/pull/746))
+- Fixed span name
+  ([#746](https://github.com/census-instrumentation/opencensus-python/pull/746))
 
 ## 0.7.1
 Released 2019-08-06

contrib/opencensus-ext-requests/opencensus/ext/requests/trace.py

@@ -21,6 +21,7 @@
     from urlparse import urlparse
 
 from opencensus.trace import attributes_helper
+from opencensus.trace import exceptions_status
 from opencensus.trace import execution_context
 from opencensus.trace import span as span_module
 from opencensus.trace import utils
@@ -33,8 +34,12 @@
 SESSION_WRAP_METHODS = 'request'
 SESSION_CLASS_NAME = 'Session'
 
-HTTP_URL = attributes_helper.COMMON_ATTRIBUTES['HTTP_URL']
+HTTP_HOST = attributes_helper.COMMON_ATTRIBUTES['HTTP_HOST']
+HTTP_METHOD = attributes_helper.COMMON_ATTRIBUTES['HTTP_METHOD']
+HTTP_PATH = attributes_helper.COMMON_ATTRIBUTES['HTTP_PATH']
+HTTP_ROUTE = attributes_helper.COMMON_ATTRIBUTES['HTTP_ROUTE']
 HTTP_STATUS_CODE = attributes_helper.COMMON_ATTRIBUTES['HTTP_STATUS_CODE']
+HTTP_URL = attributes_helper.COMMON_ATTRIBUTES['HTTP_URL']
 
 
 def trace_integration(tracer=None):
@@ -74,22 +79,47 @@ def call(url, *args, **kwargs):
         if utils.disable_tracing_hostname(dest_url, blacklist_hostnames):
             return requests_func(url, *args, **kwargs)
 
+        path = parsed_url.path if parsed_url.path else '/'
+
         _tracer = execution_context.get_opencensus_tracer()
         _span = _tracer.start_span()
-        _span.name = '[requests]{}'.format(requests_func.__name__)
+        _span.name = '{}'.format(path)
         _span.span_kind = span_module.SpanKind.CLIENT
 
-        # Add the requests url to attributes
-        _tracer.add_attribute_to_current_span(HTTP_URL, url)
+        # Add the requests host to attributes
+        _tracer.add_attribute_to_current_span(
+            HTTP_HOST, dest_url)
 
-        result = requests_func(url, *args, **kwargs)
+        # Add the requests method to attributes
+        _tracer.add_attribute_to_current_span(
+            HTTP_METHOD, requests_func.__name__.upper())
 
-        # Add the status code to attributes
+        # Add the requests path to attributes
         _tracer.add_attribute_to_current_span(
-            HTTP_STATUS_CODE, str(result.status_code))
+            HTTP_PATH, path)
 
-        _tracer.end_span()
-        return result
+        # Add the requests url to attributes
+        _tracer.add_attribute_to_current_span(HTTP_URL, url)
+
+        try:
+            result = requests_func(url, *args, **kwargs)
+        except requests.Timeout:
+            _span.set_status(exceptions_status.TIMEOUT)
+        except requests.URLRequired:
+            _span.set_status(exceptions_status.INVALID_URL)
+        except Exception as e:
+            _span.set_status(exceptions_status.unknown(e))
+        else:
+            # Add the status code to attributes
+            _tracer.add_attribute_to_current_span(
+                HTTP_STATUS_CODE, result.status_code
+            )
+            _span.set_status(
+                utils.status_from_http_code(result.status_code)
+            )
+            return result
+        finally:
+            _tracer.end_span()
 
     return call
 
@@ -113,10 +143,12 @@ def wrap_session_request(wrapped, instance, args, kwargs):
     if utils.disable_tracing_hostname(dest_url, blacklist_hostnames):
         return wrapped(*args, **kwargs)
 
+    path = parsed_url.path if parsed_url.path else '/'
+
     _tracer = execution_context.get_opencensus_tracer()
     _span = _tracer.start_span()
 
-    _span.name = '[requests]{}'.format(method)
+    _span.name = '{}'.format(path)
     _span.span_kind = span_module.SpanKind.CLIENT
 
     try:
@@ -127,14 +159,37 @@ def wrap_session_request(wrapped, instance, args, kwargs):
     except Exception:  # pragma: NO COVER
         pass
 
-    # Add the requests url to attributes
-    _tracer.add_attribute_to_current_span(HTTP_URL, url)
+    # Add the requests host to attributes
+    _tracer.add_attribute_to_current_span(
+        HTTP_HOST, dest_url)
 
-    result = wrapped(*args, **kwargs)
+    # Add the requests method to attributes
+    _tracer.add_attribute_to_current_span(
+        HTTP_METHOD, method.upper())
 
-    # Add the status code to attributes
+    # Add the requests path to attributes
     _tracer.add_attribute_to_current_span(
-        HTTP_STATUS_CODE, str(result.status_code))
+        HTTP_PATH, path)
+
+    # Add the requests url to attributes
+    _tracer.add_attribute_to_current_span(HTTP_URL, url)
 
-    _tracer.end_span()
-    return result
+    try:
+        result = wrapped(*args, **kwargs)
+    except requests.Timeout:
+        _span.set_status(exceptions_status.TIMEOUT)
+    except requests.URLRequired:
+        _span.set_status(exceptions_status.INVALID_URL)
+    except Exception as e:
+        _span.set_status(exceptions_status.unknown(e))
+    else:
+        # Add the status code to attributes
+        _tracer.add_attribute_to_current_span(
+            HTTP_STATUS_CODE, result.status_code
+        )
+        _span.set_status(
+            utils.status_from_http_code(result.status_code)
+        )
+        return result
+    finally:
+        _tracer.end_span()