refactor namespace package - cleanup opencensus.common namespace (census-instrumentation#529)

* cleanup opencensus.common namespace

* address review comments

* minor fix

* manually merge changes

* fix merge conflict

* keep copyright year untouched

Author: reyang

opencensus/common/__init__.py

@@ -1,13 +1 @@
-# Copyright 2018, OpenCensus Authors
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

opencensus/common/backports.py renamed to opencensus/common/backports/__init__.py

@@ -29,7 +29,7 @@
 ISO_DATETIME_REGEX = '%Y-%m-%dT%H:%M:%S.%fZ'
 
 
-def _get_truncatable_str(str_to_convert):
+def get_truncatable_str(str_to_convert):
     """Truncate a string if exceed limit and record the truncated bytes
     count.
     """

opencensus/common/http_handler.py renamed to opencensus/common/http_handler/__init__.py

@@ -23,7 +23,7 @@ def _format_attribute_value(value):
         value_type = 'int_value'
     elif isinstance(value, six.string_types):
         value_type = 'string_value'
-        value = utils._get_truncatable_str(value)
+        value = utils.get_truncatable_str(value)
     elif isinstance(value, float):
         value_type = 'double_value'
     else:

opencensus/common/resource.py renamed to opencensus/common/resource/__init__.py

@@ -15,7 +15,7 @@
 from datetime import datetime
 from itertools import chain
 
-from opencensus.common.utils import _get_truncatable_str
+from opencensus.common.utils import get_truncatable_str
 from opencensus.trace import attributes
 from opencensus.trace import base_span
 from opencensus.trace import link as link_module
@@ -265,7 +265,7 @@ def format_span_json(span):
     :returns: Formatted Span.
     """
     span_json = {
-        'displayName': _get_truncatable_str(span.name),
+        'displayName': get_truncatable_str(span.name),
         'spanId': span.span_id,
         'startTime': span.start_time,
         'endTime': span.end_time,

opencensus/common/utils.py renamed to opencensus/common/utils/__init__.py

@@ -106,7 +106,7 @@ def _format_legacy_span_json(span_data):
     :return: Dictionary representing the Span
     """
     span_json = {
-        'displayName': utils._get_truncatable_str(span_data.name),
+        'displayName': utils.get_truncatable_str(span_data.name),
         'spanId': span_data.span_id,
         'startTime': span_data.start_time,
         'endTime': span_data.end_time,

opencensus/common/version.py renamed to opencensus/common/version/__init__.py

@@ -17,7 +17,7 @@
 import random
 import traceback
 
-from opencensus.common.utils import _get_truncatable_str
+from opencensus.common.utils import get_truncatable_str
 
 MAX_FRAMES = 128
 
@@ -86,18 +86,18 @@ def __init__(self,
     def format_stack_frame_json(self):
         """Convert StackFrame object to json format."""
         stack_frame_json = {}
-        stack_frame_json['function_name'] = _get_truncatable_str(
+        stack_frame_json['function_name'] = get_truncatable_str(
             self.func_name)
-        stack_frame_json['original_function_name'] = _get_truncatable_str(
+        stack_frame_json['original_function_name'] = get_truncatable_str(
             self.original_func_name)
-        stack_frame_json['file_name'] = _get_truncatable_str(self.file_name)
+        stack_frame_json['file_name'] = get_truncatable_str(self.file_name)
         stack_frame_json['line_number'] = self.line_num
         stack_frame_json['column_number'] = self.col_num
         stack_frame_json['load_module'] = {
-            'module': _get_truncatable_str(self.load_module),
-            'build_id': _get_truncatable_str(self.build_id),
+            'module': get_truncatable_str(self.load_module),
+            'build_id': get_truncatable_str(self.build_id),
         }
-        stack_frame_json['source_version'] = _get_truncatable_str(
+        stack_frame_json['source_version'] = get_truncatable_str(
             self.source_version)
 
         return stack_frame_json