Release for Datadog exporters and some azure exporter changes (#818)

Author: lzchen

README.rst

@@ -226,12 +226,14 @@ Trace Exporter
 --------------
 
 -  `Azure`_
+-  `Datadog`_
 -  `Jaeger`_
 -  `OCAgent`_
 -  `Stackdriver`_
 -  `Zipkin`_
 
 .. _Azure: https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-azure
+.. _Datadog: https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-datadog
 .. _Django: https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-django
 .. _Flask: https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-flask
 .. _gevent: https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-gevent

contrib/opencensus-ext-azure/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## 1.0.1
+Released 2019-11-18
+
+- Validate instrumentation key in Azure Exporters
+  ([#789](https://github.com/census-instrumentation/opencensus-python/pull/789))
+
 ## 1.0.0
 Released 2019-09-30
 

contrib/opencensus-ext-azure/README.rst

@@ -37,11 +37,11 @@ This example shows how to send a warning level log to Azure Monitor.
     logger.addHandler(AzureLogHandler(connection_string='InstrumentationKey=<your-instrumentation_key-here>'))
     logger.warning('Hello, World!')
 
-* Alternatively, you can specify your `connection string` in an environment variable ``APPLICATIONINSIGHTS_CONNECTION_STRING``.
 
 You can enrich the logs with trace IDs and span IDs by using the `logging integration <../opencensus-ext-logging>`_.
 
 * Create an Azure Monitor resource and get the instrumentation key, more information can be found `here <https://docs.microsoft.com/azure/azure-monitor/app/create-new-resource>`_.
+* Install the `logging integration package <../opencensus-ext-logging>`_ using ``pip install opencensus-ext-logging``.
 * Place your instrumentation key in a `connection string` and directly into your code.
 * Alternatively, you can specify your `connection string` in an environment variable ``APPLICATIONINSIGHTS_CONNECTION_STRING``.
 
@@ -71,7 +71,7 @@ You can enrich the logs with trace IDs and span IDs by using the `logging integr
     logger.warning('Before the span')
     with tracer.span(name='test'):
         logger.warning('In the span')
-    logger.warning('After the span')s
+    logger.warning('After the span')
 
 Metrics
 ~~~~~~~

contrib/opencensus-ext-azure/opencensus/ext/azure/common/utils.py

@@ -16,17 +16,18 @@
 import locale
 import os
 import platform
+import re
 import sys
 
+from opencensus.common.utils import timestamp_to_microseconds, to_iso_str
+from opencensus.common.version import __version__ as opencensus_version
+from opencensus.ext.azure.common.version import __version__ as ext_version
+
 try:
     from urllib.parse import urlparse
 except ImportError:
     from urlparse import urlparse
 
-from opencensus.common.version import __version__ as opencensus_version
-from opencensus.common.utils import timestamp_to_microseconds
-from opencensus.common.utils import to_iso_str
-from opencensus.ext.azure.common.version import __version__ as ext_version
 
 azure_monitor_context = {
     'ai.cloud.role': os.path.basename(sys.argv[0]) or 'Python Application',
@@ -65,3 +66,27 @@ def timestamp_to_iso_str(timestamp):
 
 def url_to_dependency_name(url):
     return urlparse(url).netloc
+
+
+# Validate UUID format
+# Specs taken from https://tools.ietf.org/html/rfc4122
+uuid_regex_pattern = re.compile('^[0-9a-f]{8}-'
+                                '[0-9a-f]{4}-'
+                                '[1-5][0-9a-f]{3}-'
+                                '[89ab][0-9a-f]{3}-'
+                                '[0-9a-f]{12}$')
+
+
+def validate_instrumentation_key(instrumentation_key):
+    """Validates the instrumentation key used for Azure Monitor.
+
+    An instrumentation key cannot be null or empty. An instrumentation key
+    is valid for Azure Monitor only if it is a valid UUID.
+
+    :param instrumentation_key: The instrumentation key to validate
+    """
+    if not instrumentation_key:
+        raise ValueError("Instrumentation key cannot be none or empty.")
+    match = uuid_regex_pattern.match(instrumentation_key)
+    if not match:
+        raise ValueError("Invalid instrumentation key.")

contrib/opencensus-ext-azure/opencensus/ext/azure/common/version.py

@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '1.0.0'
+__version__ = '1.0.1'

contrib/opencensus-ext-azure/opencensus/ext/azure/log_exporter/__init__.py

@@ -17,15 +17,14 @@
 import time
 import traceback
 
-from opencensus.common.schedule import Queue
-from opencensus.common.schedule import QueueExitEvent
-from opencensus.common.schedule import QueueEvent
-from opencensus.ext.azure.common import Options
-from opencensus.ext.azure.common import utils
-from opencensus.ext.azure.common.protocol import Data
-from opencensus.ext.azure.common.protocol import Envelope
-from opencensus.ext.azure.common.protocol import ExceptionData
-from opencensus.ext.azure.common.protocol import Message
+from opencensus.common.schedule import Queue, QueueEvent, QueueExitEvent
+from opencensus.ext.azure.common import Options, utils
+from opencensus.ext.azure.common.protocol import (
+    Data,
+    Envelope,
+    ExceptionData,
+    Message,
+)
 from opencensus.ext.azure.common.storage import LocalFileStorage
 from opencensus.ext.azure.common.transport import TransportMixin
 from opencensus.trace import execution_context
@@ -116,8 +115,7 @@ class AzureLogHandler(TransportMixin, BaseLogHandler):
 
     def __init__(self, **options):
         self.options = Options(**options)
-        if not self.options.instrumentation_key:
-            raise ValueError('The instrumentation_key is not provided.')
+        utils.validate_instrumentation_key(self.options.instrumentation_key)
         self.export_interval = self.options.export_interval
         self.max_batch_size = self.options.max_batch_size
         self.storage = LocalFileStorage(

contrib/opencensus-ext-azure/opencensus/ext/azure/metrics_exporter/__init__.py

@@ -14,15 +14,17 @@
 
 import json
 import logging
+
 import requests
 
 from opencensus.common import utils as common_utils
-from opencensus.ext.azure.common import Options
-from opencensus.ext.azure.common import utils
-from opencensus.ext.azure.common.protocol import Data
-from opencensus.ext.azure.common.protocol import DataPoint
-from opencensus.ext.azure.common.protocol import Envelope
-from opencensus.ext.azure.common.protocol import MetricData
+from opencensus.ext.azure.common import Options, utils
+from opencensus.ext.azure.common.protocol import (
+    Data,
+    DataPoint,
+    Envelope,
+    MetricData,
+)
 from opencensus.ext.azure.metrics_exporter import standard_metrics
 from opencensus.metrics import transport
 from opencensus.metrics.export.metric_descriptor import MetricDescriptorType
@@ -40,8 +42,7 @@ def __init__(self, options=None):
         if options is None:
             options = Options()
         self.options = options
-        if not self.options.instrumentation_key:
-            raise ValueError('The instrumentation_key is not provided.')
+        utils.validate_instrumentation_key(self.options.instrumentation_key)
         if self.options.max_batch_size <= 0:
             raise ValueError('Max batch size must be at least 1.')
         self.max_batch_size = self.options.max_batch_size

contrib/opencensus-ext-azure/opencensus/ext/azure/trace_exporter/__init__.py

@@ -15,13 +15,14 @@
 import logging
 
 from opencensus.common.schedule import QueueExitEvent
-from opencensus.ext.azure.common import Options
-from opencensus.ext.azure.common import utils
+from opencensus.ext.azure.common import Options, utils
 from opencensus.ext.azure.common.exporter import BaseExporter
-from opencensus.ext.azure.common.protocol import Data
-from opencensus.ext.azure.common.protocol import Envelope
-from opencensus.ext.azure.common.protocol import RemoteDependency
-from opencensus.ext.azure.common.protocol import Request
+from opencensus.ext.azure.common.protocol import (
+    Data,
+    Envelope,
+    RemoteDependency,
+    Request,
+)
 from opencensus.ext.azure.common.storage import LocalFileStorage
 from opencensus.ext.azure.common.transport import TransportMixin
 from opencensus.trace.span import SpanKind
@@ -39,8 +40,7 @@ class AzureExporter(TransportMixin, BaseExporter):
 
     def __init__(self, **options):
         self.options = Options(**options)
-        if not self.options.instrumentation_key:
-            raise ValueError('The instrumentation_key is not provided.')
+        utils.validate_instrumentation_key(self.options.instrumentation_key)
         self.storage = LocalFileStorage(
             path=self.options.storage_path,
             max_size=self.options.storage_max_size,

contrib/opencensus-ext-azure/tests/test_azure_utils.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import unittest
+
 from opencensus.ext.azure.common import utils
 
 
@@ -42,3 +43,97 @@ def test_url_to_dependency_name(self):
                 'https://www.wikipedia.org/wiki/Rabbit'
             ),
             'www.wikipedia.org')
+
+    def test_validate_instrumentation_key(self):
+        key = '1234abcd-5678-4efa-8abc-1234567890ab'
+        self.assertIsNone(utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_none(self):
+        key = None
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_empty(self):
+        key = ''
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_prefix(self):
+        key = 'test1234abcd-5678-4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_suffix(self):
+        key = '1234abcd-5678-4efa-8abc-1234567890abtest'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_length(self):
+        key = '1234abcd-5678-4efa-8abc-12234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_dashes(self):
+        key = '1234abcda5678-4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section1_length(self):
+        key = '1234abcda-678-4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section2_length(self):
+        key = '1234abcd-678-a4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section3_length(self):
+        key = '1234abcd-6789-4ef-8cabc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section4_length(self):
+        key = '1234abcd-678-4efa-8bc-11234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section5_length(self):
+        key = '234abcd-678-4efa-8abc-11234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section1_hex(self):
+        key = 'x234abcd-5678-4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section2_hex(self):
+        key = '1234abcd-x678-4efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section3_hex(self):
+        key = '1234abcd-5678-4xfa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section4_hex(self):
+        key = '1234abcd-5678-4xfa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_section5_hex(self):
+        key = '1234abcd-5678-4xfa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_version(self):
+        key = '1234abcd-5678-6efa-8abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))
+
+    def test_invalid_key_variant(self):
+        key = '1234abcd-5678-4efa-2abc-1234567890ab'
+        self.assertRaises(ValueError,
+                          lambda: utils.validate_instrumentation_key(key))

contrib/opencensus-ext-datadog/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## Unreleased
+
+## 0.1.0
+Released 2019-11-18
+
+- Initial version
+  ([#793](https://github.com/census-instrumentation/opencensus-python/pull/793))