refactor namespace package - componentize ocagent trace exporter (census-instrumentation#546)

* componentize ocagent trace exporter

* remove unused file

* sort import order

* address review comments

Author: reyang

contrib/opencensus-ext-django/tests/test_django_middleware.py

@@ -19,13 +19,13 @@
 from django.test.utils import teardown_test_environment
 
 from opencensus.common.transports import sync
+from opencensus.ext.ocagent import trace_exporter
 from opencensus.trace import execution_context
 from opencensus.trace import span as span_module
 from opencensus.trace import utils
 from opencensus.trace.exporters import print_exporter
 from opencensus.trace.exporters import zipkin_exporter
 from opencensus.trace.exporters import jaeger_exporter
-from opencensus.trace.exporters.ocagent import trace_exporter
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import always_on
 from opencensus.trace.samplers import probability

contrib/opencensus-ext-flask/tests/test_flask_middleware.py

@@ -22,6 +22,7 @@
 import mock
 
 from opencensus.ext.flask import flask_middleware
+from opencensus.ext.ocagent import trace_exporter
 from opencensus.trace import execution_context
 from opencensus.trace import span as span_module
 from opencensus.trace import span_data
@@ -32,7 +33,6 @@
 from opencensus.trace.exporters import print_exporter
 from opencensus.trace.exporters import stackdriver_exporter
 from opencensus.trace.exporters import zipkin_exporter
-from opencensus.trace.exporters.ocagent import trace_exporter
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import always_off, always_on, ProbabilitySampler
 from opencensus.trace.span_context import SpanContext

contrib/opencensus-ext-ocagent/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## Unreleased
+
+- Initial version.

contrib/opencensus-ext-ocagent/README.rst

@@ -0,0 +1,16 @@
+OpenCensus OC-Agent Trace Exporter
+============================================================================
+
+Installation
+------------
+
+::
+
+    pip install opencensus-ext-ocagent
+
+Usage
+-----
+
+.. code:: python
+
+    # TBD

contrib/opencensus-ext-ocagent/opencensus/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

contrib/opencensus-ext-ocagent/opencensus/ext/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/__init__.py

@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)

opencensus/trace/exporters/ocagent/trace_exporter.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/__init__.py

@@ -21,14 +21,14 @@
 
 from opencensus.common.transports import sync
 from opencensus.common.version import __version__
-from opencensus.trace.exporters import base
-from opencensus.trace.exporters.gen.opencensus.agent.common.v1 \
+from opencensus.ext.ocagent.trace_exporter import utils
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.agent.common.v1 \
     import common_pb2
-from opencensus.trace.exporters.gen.opencensus.agent.trace.v1 \
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.agent.trace.v1 \
     import trace_service_pb2
-from opencensus.trace.exporters.gen.opencensus.agent.trace.v1 \
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.agent.trace.v1 \
     import trace_service_pb2_grpc
-from opencensus.trace.exporters.ocagent import utils
+from opencensus.trace.exporters import base
 
 # Default agent endpoint
 DEFAULT_ENDPOINT = 'localhost:55678'

opencensus/trace/exporters/gen/opencensus/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/__init__.py

@@ -1,7 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from opencensus.trace.exporters.gen.opencensus.agent.trace.v1 import trace_service_pb2 as opencensus_dot_proto_dot_agent_dot_trace_dot_v1_dot_trace__service__pb2
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.agent.trace.v1 import trace_service_pb2 as opencensus_dot_proto_dot_agent_dot_trace_dot_v1_dot_trace__service__pb2
 
 
 class TraceServiceStub(object):

opencensus/trace/exporters/gen/opencensus/agent/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/__init__.py

@@ -17,7 +17,8 @@
 from google.protobuf.internal.well_known_types import ParseError
 from google.protobuf.timestamp_pb2 import Timestamp
 from google.protobuf.wrappers_pb2 import BoolValue, UInt32Value
-from opencensus.trace.exporters.gen.opencensus.trace.v1 import trace_pb2
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.trace.v1 \
+    import trace_pb2
 
 
 def translate_to_trace_proto(span_data):

opencensus/trace/exporters/gen/opencensus/agent/common/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/__init__.py

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

opencensus/trace/exporters/gen/opencensus/agent/common/v1/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/common/__init__.py

@@ -0,0 +1,51 @@
+# Copyright 2019, 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.
+
+from setuptools import find_packages
+from setuptools import setup
+from version import __version__
+
+setup(
+    name='opencensus-ext-ocagent',
+    version=__version__,  # noqa
+    author='OpenCensus Authors',
+    author_email='[email protected]',
+    classifiers=[
+        'Intended Audience :: Developers',
+        'Development Status :: 3 - Alpha',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: Apache Software License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: 3.7',
+    ],
+    description='OpenCensus OC-Agent Trace Exporter',
+    include_package_data=True,
+    long_description=open('README.rst').read(),
+    install_requires=[
+        'grpcio >= 1.0.0, < 2.0.0',
+        'opencensus >= 0.2.dev0, < 1.0.0',
+    ],
+    extras_require={},
+    license='Apache-2.0',
+    packages=find_packages(exclude=('tests',)),
+    namespace_packages=[],
+    url='https://github.com/census-instrumentation/opencensus-python/tree/master/contrib/opencensus-ext-ocagent',
+    zip_safe=False,
+)

opencensus/trace/exporters/gen/opencensus/agent/trace/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/common/v1/__init__.py

@@ -20,10 +20,11 @@
 import unittest
 
 from opencensus.common.version import __version__
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.trace.v1 \
+    import trace_config_pb2
+from opencensus.ext.ocagent.trace_exporter import TraceExporter
 from opencensus.trace import span_context as span_context_module
 from opencensus.trace import span_data as span_data_module
-from opencensus.trace.exporters.gen.opencensus.trace.v1 import trace_config_pb2
-from opencensus.trace.exporters.ocagent.trace_exporter import TraceExporter
 
 
 SERVICE_NAME = 'my-service'

opencensus/trace/exporters/gen/opencensus/agent/common/v1/common_pb2.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/common/v1/common_pb2.py

@@ -16,6 +16,9 @@
 from datetime import datetime, timedelta
 import unittest
 
+from opencensus.ext.ocagent.trace_exporter import utils
+from opencensus.ext.ocagent.trace_exporter.gen.opencensus.trace.v1 \
+    import trace_pb2
 from opencensus.trace import attributes as attributes_module
 from opencensus.trace import link as link_module
 from opencensus.trace import span as span_module
@@ -24,8 +27,6 @@
 from opencensus.trace import status as status_module
 from opencensus.trace import time_event as time_event_module
 from opencensus.trace import tracestate as tracestate_module
-from opencensus.trace.exporters.ocagent import utils
-from opencensus.trace.exporters.gen.opencensus.trace.v1 import trace_pb2
 
 
 class TestTraceExporterUtils(unittest.TestCase):

opencensus/trace/exporters/gen/opencensus/agent/trace/v1/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/trace/__init__.py

@@ -0,0 +1,15 @@
+# Copyright 2019, 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.
+
+__version__ = '0.1.dev0'

opencensus/trace/exporters/ocagent/__init__.py renamed to contrib/opencensus-ext-ocagent/opencensus/ext/ocagent/trace_exporter/gen/opencensus/agent/trace/v1/__init__.py

@@ -21,12 +21,14 @@
 def _install_dev_packages(session):
     session.install('-e', 'contrib/opencensus-correlation')
     session.install('-e', '.')
+
     session.install('-e', 'contrib/opencensus-ext-dbapi')
     session.install('-e', 'contrib/opencensus-ext-django')
     session.install('-e', 'contrib/opencensus-ext-flask')
     session.install('-e', 'contrib/opencensus-ext-grpc')
     session.install('-e', 'contrib/opencensus-ext-httplib')
     session.install('-e', 'contrib/opencensus-ext-mysql')
+    session.install('-e', 'contrib/opencensus-ext-ocagent')
     session.install('-e', 'contrib/opencensus-ext-postgresql')
     session.install('-e', 'contrib/opencensus-ext-pymongo')
     session.install('-e', 'contrib/opencensus-ext-pymysql')