Merge branch 'census-instrumentation:master' into master

petrem · web-flow · commit 353d698dd8b3 · 2023-11-01T16:41:39.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,7 +13,6 @@ jobs:
     runs-on: ubuntu-20.04
     env:
       # We use these variables to convert between tox and GHA version literals
-      py27: 2.7
       py35: 3.5
       py36: 3.6
       py37: 3.7
@@ -23,7 +22,7 @@ jobs:
       # ensures the entire test matrix is run, even if one permutation fails
       fail-fast: false
       matrix:
-        python-version: [py27, py35, py36, py37, py38, py39]
+        python-version: [py35, py36, py37, py38, py39]
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -42,3 +41,21 @@ jobs:
           key: v1-tox-${{ matrix.python-version }}-${{ hashFiles('tox.ini', '**/setup.py') }}
       - name: run tox
         run: tox -f ${{ matrix.python-version }}
+  build-27:
+    runs-on: ubuntu-20.04
+    container:
+      image: python:2.7.18-buster
+    env:
+      py27: 2.7
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install tox
+        run: pip install -U tox==3.27.1 tox-factor
+      - name: Cache tox environment
+        uses: actions/cache@v2
+        with:
+          path: .tox
+          key: v1-tox-27-${{ hashFiles('tox.ini', '**/setup.py') }}
+      - name: Run tox for Python 2.7
+        run: tox -f py27
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## Unreleased
 
+# 0.11.3
+Released 2023-09-18
+
+- Updated `azure` modules
+
+# 0.11.2
+Released 2023-03-10
+
+- Updated `azure`, `fastapi`,`flask` modules
+
 # 0.11.1
 Released 2023-01-18
 
diff --git a/contrib/opencensus-ext-azure/CHANGELOG.md b/contrib/opencensus-ext-azure/CHANGELOG.md
@@ -2,12 +2,30 @@
 
 ## Unreleased
 
+## 1.1.11
+
+Released 2023-10-12
+
+- Add str fallback to envelope serialization
+([#1196](https://github.com/census-instrumentation/opencensus-python/pull/1196))
+- Remove outerId from exceptiondata
+([#1221](https://github.com/census-instrumentation/opencensus-python/pull/1221))
+
+## 1.1.10
+
+Released 2023-09-18
+
+- Add str fallback to envelope serialization
+([#1196](https://github.com/census-instrumentation/opencensus-python/pull/1196))
+
+## 1.1.9
+
+Released 2023-03-10
+
 - Fix export of exception information in traces
 ([#1187](https://github.com/census-instrumentation/opencensus-python/pull/1187))
 - Modify metrics exporter to include setting export interval to 60s
 ([#1193](https://github.com/census-instrumentation/opencensus-python/pull/1193))
-- Add str fallback to envelope serialization
-([#1196](https://github.com/census-instrumentation/opencensus-python/pull/1196))
 
 ## 1.1.8
 
diff --git a/contrib/opencensus-ext-azure/opencensus/ext/azure/common/transport.py b/contrib/opencensus-ext-azure/opencensus/ext/azure/common/transport.py
@@ -111,13 +111,16 @@ def _transmit(self, envelopes):
                 token = self.options.credential.get_token(_MONITOR_OAUTH_SCOPE)
                 headers["Authorization"] = "Bearer {}".format(token.token)
             endpoint += '/v2.1/track'
+            proxies = json.loads(self.options.proxies)
+            allow_redirects = len(proxies) != 0
+
             response = requests.post(
                 url=endpoint,
                 data=json.dumps(envelopes, default=str),
                 headers=headers,
                 timeout=self.options.timeout,
-                proxies=json.loads(self.options.proxies),
-                allow_redirects=False,
+                proxies=proxies,
+                allow_redirects=allow_redirects,
             )
         except requests.Timeout as ex:
             if not self._is_stats_exporter():
diff --git a/contrib/opencensus-ext-azure/opencensus/ext/azure/trace_exporter/__init__.py b/contrib/opencensus-ext-azure/opencensus/ext/azure/trace_exporter/__init__.py
@@ -101,7 +101,7 @@ def span_data_to_envelope(self, sd):
                 data = ExceptionData(
                     exceptions=[{
                         'id': 1,
-                        'outerId': '{}'.format(sd.span_id),
+                        'outerId': 0,
                         'typeName': sd.attributes.get(ERROR_NAME, ''),
                         'message': sd.attributes[ERROR_MESSAGE],
                         'hasFullStack': STACKTRACE in sd.attributes,
diff --git a/contrib/opencensus-ext-fastapi/CHANGELOG.md b/contrib/opencensus-ext-fastapi/CHANGELOG.md
@@ -4,4 +4,7 @@
 
 ## 0.1.0
 
+Released 2023-03-10
+
 - Initial version
+([#1124](https://github.com/census-instrumentation/opencensus-python/pull/1124))
diff --git a/contrib/opencensus-ext-flask/CHANGELOG.md b/contrib/opencensus-ext-flask/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+## 0.8.2
+Released 2023-03-10
+
 - Add exception information to span attributes
 ([#1188](https://github.com/census-instrumentation/opencensus-python/pull/1188))
 
diff --git a/contrib/opencensus-ext-grpc/opencensus/ext/grpc/server_interceptor.py b/contrib/opencensus-ext-grpc/opencensus/ext/grpc/server_interceptor.py
@@ -25,11 +25,40 @@
 from opencensus.trace import tracer as tracer_module
 from opencensus.trace.propagation import binary_format
 
-ATTRIBUTE_COMPONENT = 'COMPONENT'
-ATTRIBUTE_ERROR_NAME = 'ERROR_NAME'
-ATTRIBUTE_ERROR_MESSAGE = 'ERROR_MESSAGE'
+COMPONENT = attributes_helper.COMMON_ATTRIBUTES['COMPONENT']
+ERROR_NAME = attributes_helper.COMMON_ATTRIBUTES['ERROR_NAME']
+ERROR_MESSAGE = attributes_helper.COMMON_ATTRIBUTES['ERROR_MESSAGE']
+
+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_URL = attributes_helper.COMMON_ATTRIBUTES['HTTP_URL']
+HTTP_STATUS_CODE = attributes_helper.COMMON_ATTRIBUTES['HTTP_STATUS_CODE']
+GRPC_METHOD = attributes_helper.GRPC_ATTRIBUTES['GRPC_METHOD']
+
 RECV_PREFIX = 'Recv'
 
+GRPC_HTTP_STATUS_MAPPING = {
+    grpc.StatusCode.OK: 200,
+    grpc.StatusCode.FAILED_PRECONDITION: 400,
+    grpc.StatusCode.INVALID_ARGUMENT: 400,
+    grpc.StatusCode.OUT_OF_RANGE: 400,
+    grpc.StatusCode.UNAUTHENTICATED: 401,
+    grpc.StatusCode.PERMISSION_DENIED: 403,
+    grpc.StatusCode.NOT_FOUND: 404,
+    grpc.StatusCode.ABORTED: 409,
+    grpc.StatusCode.ALREADY_EXISTS: 409,
+    grpc.StatusCode.RESOURCE_EXHAUSTED: 429,
+    grpc.StatusCode.CANCELLED: 499,
+    grpc.StatusCode.UNKNOWN: 500,
+    grpc.StatusCode.INTERNAL: 500,
+    grpc.StatusCode.DATA_LOSS: 500,
+    grpc.StatusCode.UNIMPLEMENTED: 501,
+    grpc.StatusCode.UNAVAILABLE: 503,
+    grpc.StatusCode.DEADLINE_EXCEEDED: 504
+}
+
 
 class OpenCensusServerInterceptor(grpc.ServerInterceptor):
     def __init__(self, sampler=None, exporter=None):
@@ -56,6 +85,12 @@ def new_behavior(request_or_iterator, servicer_context):
                     # invoke the original rpc behavior
                     response_or_iterator = behavior(request_or_iterator,
                                                     servicer_context)
+
+                    http_status_code = _convert_grpc_code_to_http_status_code(
+                        servicer_context._state.code
+                    )
+                    span.add_attribute(HTTP_STATUS_CODE, http_status_code)
+
                     if response_streaming:
                         response_or_iterator = grpc_utils.wrap_iter_with_message_events(  # noqa: E501
                             request_or_response_iter=response_or_iterator,
@@ -107,28 +142,60 @@ def _start_server_span(self, servicer_context):
         )
 
         span.span_kind = span_module.SpanKind.SERVER
+
+        grpc_call_details = servicer_context._rpc_event.call_details
+        grpc_host = grpc_call_details.host.decode('utf-8')
+        grpc_method = grpc_call_details.method.decode('utf-8')
+
+        tracer.add_attribute_to_current_span(
+            COMPONENT, 'grpc'
+        )
+        tracer.add_attribute_to_current_span(
+            GRPC_METHOD, grpc_method
+        )
+
+        tracer.add_attribute_to_current_span(
+            HTTP_HOST, grpc_host
+        )
+        tracer.add_attribute_to_current_span(
+            HTTP_METHOD, 'POST'
+        )
+        tracer.add_attribute_to_current_span(
+            HTTP_ROUTE, grpc_method
+        )
+        tracer.add_attribute_to_current_span(
+            HTTP_PATH, grpc_method
+        )
         tracer.add_attribute_to_current_span(
-            attribute_key=attributes_helper.COMMON_ATTRIBUTES.get(
-                ATTRIBUTE_COMPONENT),
-            attribute_value='grpc')
+            HTTP_URL, 'grpc://' + grpc_host + grpc_method
+        )
 
         execution_context.set_opencensus_tracer(tracer)
         execution_context.set_current_span(span)
         return span
 
 
+def _convert_grpc_code_to_http_status_code(grpc_state_code):
+    """
+    Converts a gRPC state code into the corresponding HTTP response status.
+    See:
+    https://github.com/googleapis/googleapis/blob/master/google/rpc/code.proto
+    """
+    if grpc_state_code is None:
+        return 200
+    else:
+        return GRPC_HTTP_STATUS_MAPPING.get(grpc_state_code, 500)
+
+
 def _add_exc_info(span):
     exc_type, exc_value, tb = sys.exc_info()
-    span.add_attribute(
-        attributes_helper.COMMON_ATTRIBUTES.get(
-            ATTRIBUTE_ERROR_MESSAGE),
-        str(exc_value)
-    )
+    span.add_attribute(ERROR_MESSAGE, str(exc_value))
     span.stack_trace = stack_trace.StackTrace.from_traceback(tb)
     span.status = status.Status(
         code=code_pb2.UNKNOWN,
         message=str(exc_value)
     )
+    span.add_attribute(HTTP_STATUS_CODE, 500)
 
 
 def _wrap_rpc_behavior(handler, fn):
diff --git a/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py b/contrib/opencensus-ext-grpc/tests/test_server_interceptor.py
@@ -14,6 +14,7 @@
 
 import unittest
 
+import grpc
 import mock
 from google.rpc import code_pb2
 
@@ -22,6 +23,9 @@
 from opencensus.trace import execution_context
 from opencensus.trace import span as span_module
 
+MOCK_HOST = b'localhost:5000'
+MOCK_METHOD = b'/helloworld.Greeter/SayHello'
+
 
 class TestOpenCensusServerInterceptor(unittest.TestCase):
     def test_constructor(self):
@@ -38,7 +42,10 @@ def test_intercept_service_no_metadata(self):
             '.tracer_module.Tracer', MockTracer)
         mock_context = mock.Mock()
         mock_context.invocation_metadata = mock.Mock(return_value=None)
-        mock_context._rpc_event.call_details.method = 'hello'
+
+        mock_context._rpc_event.call_details.host = MOCK_HOST
+        mock_context._rpc_event.call_details.method = MOCK_METHOD
+        mock_context._state.code = grpc.StatusCode.OK
         interceptor = server_interceptor.OpenCensusServerInterceptor(
             None, None)
         mock_handler = mock.Mock()
@@ -53,6 +60,13 @@ def test_intercept_service_no_metadata(self):
 
         expected_attributes = {
             'component': 'grpc',
+            'grpc.method': '/helloworld.Greeter/SayHello',
+            'http.host': 'localhost:5000',
+            'http.method': 'POST',
+            'http.route': '/helloworld.Greeter/SayHello',
+            'http.path': '/helloworld.Greeter/SayHello',
+            'http.url': 'grpc://localhost:5000/helloworld.Greeter/SayHello',
+            'http.status_code': 200
         }
 
         self.assertEqual(
@@ -78,7 +92,9 @@ def test_intercept_service(self):
             mock_handler.response_streaming = rsp_streaming
             mock_continuation = mock.Mock(return_value=mock_handler)
 
-            mock_context._rpc_event.call_details.method = 'hello'
+            mock_context._rpc_event.call_details.host = MOCK_HOST
+            mock_context._rpc_event.call_details.method = MOCK_METHOD
+            mock_context._state.code = grpc.StatusCode.OK
             interceptor = server_interceptor.OpenCensusServerInterceptor(
                 None, None)
 
@@ -89,6 +105,13 @@ def test_intercept_service(self):
 
             expected_attributes = {
                 'component': 'grpc',
+                'grpc.method': '/helloworld.Greeter/SayHello',
+                'http.host': 'localhost:5000',
+                'http.method': 'POST',
+                'http.route': '/helloworld.Greeter/SayHello',
+                'http.path': '/helloworld.Greeter/SayHello',
+                'http.url': 'grpc://localhost:5000/helloworld.Greeter/SayHello',    # noqa: E501
+                'http.status_code': 200
             }
 
             self.assertEqual(
@@ -110,7 +133,9 @@ def test_intercept_handler_exception(self):
                 None, None)
             mock_context = mock.Mock()
             mock_context.invocation_metadata = mock.Mock(return_value=None)
-            mock_context._rpc_event.call_details.method = 'hello'
+
+            mock_context._rpc_event.call_details.host = MOCK_HOST
+            mock_context._rpc_event.call_details.method = MOCK_METHOD
             mock_handler = mock.Mock()
             mock_handler.request_streaming = req_streaming
             mock_handler.response_streaming = rsp_streaming
@@ -128,6 +153,13 @@ def test_intercept_handler_exception(self):
 
             expected_attributes = {
                 'component': 'grpc',
+                'grpc.method': '/helloworld.Greeter/SayHello',
+                'http.host': 'localhost:5000',
+                'http.method': 'POST',
+                'http.route': '/helloworld.Greeter/SayHello',
+                'http.path': '/helloworld.Greeter/SayHello',
+                'http.url': 'grpc://localhost:5000/helloworld.Greeter/SayHello',    # noqa: E501
+                'http.status_code': 500,
                 'error.message': 'Test'
             }
 
diff --git a/setup.py b/setup.py
@@ -45,6 +45,7 @@
         'opencensus-context >= 0.2.dev0',
         'google-api-core >= 1.0.0, < 2.0.0; python_version<"3.6"',
         'google-api-core >= 1.0.0, < 3.0.0; python_version>="3.6"',
+        "six ~= 1.16",
     ],
     extras_require={},
     license='Apache-2.0',
