From 0172386c10a2422a5c4730c02c9d1911b8d78ecf Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Thu, 20 Jun 2019 11:11:01 -0700 Subject: [PATCH 1/3] initial api package layout --- opentelemetry-api/CHANGELOG.md | 4 ++ opentelemetry-api/README.rst | 19 ++++++++ opentelemetry-api/opentelemetry/__init__.py | 1 + .../opentelemetry/context/__init__.py | 1 + .../distributedcontext/__init__.py | 1 + .../opentelemetry/internal/__init__.py | 19 ++++++++ .../opentelemetry/internal/version.py | 15 ++++++ .../opentelemetry/logs/__init__.py | 1 + .../opentelemetry/metrics/__init__.py | 1 + .../opentelemetry/resources/__init__.py | 1 + .../opentelemetry/trace/__init__.py | 1 + opentelemetry-api/setup.py | 46 +++++++++++++++++++ 12 files changed, 110 insertions(+) create mode 100644 opentelemetry-api/CHANGELOG.md create mode 100644 opentelemetry-api/README.rst create mode 100644 opentelemetry-api/opentelemetry/__init__.py create mode 100644 opentelemetry-api/opentelemetry/context/__init__.py create mode 100644 opentelemetry-api/opentelemetry/distributedcontext/__init__.py create mode 100644 opentelemetry-api/opentelemetry/internal/__init__.py create mode 100644 opentelemetry-api/opentelemetry/internal/version.py create mode 100644 opentelemetry-api/opentelemetry/logs/__init__.py create mode 100644 opentelemetry-api/opentelemetry/metrics/__init__.py create mode 100644 opentelemetry-api/opentelemetry/resources/__init__.py create mode 100644 opentelemetry-api/opentelemetry/trace/__init__.py create mode 100644 opentelemetry-api/setup.py diff --git a/opentelemetry-api/CHANGELOG.md b/opentelemetry-api/CHANGELOG.md new file mode 100644 index 00000000000..09e4c38c763 --- /dev/null +++ b/opentelemetry-api/CHANGELOG.md @@ -0,0 +1,4 @@ +# Changelog + +## Unreleased +- Initial release diff --git a/opentelemetry-api/README.rst b/opentelemetry-api/README.rst new file mode 100644 index 00000000000..130fbbf39dd --- /dev/null +++ b/opentelemetry-api/README.rst @@ -0,0 +1,19 @@ +OpenTelemetry Python API +============================================================================ + +|pypi| + +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-api.svg + :target: https://pypi.org/project/opentelemetry-api/ + +Installation +------------ + +:: + + pip install opentelemetry-api + +References +---------- + +* `OpenTelemetry Project `_ diff --git a/opentelemetry-api/opentelemetry/__init__.py b/opentelemetry-api/opentelemetry/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/context/__init__.py b/opentelemetry-api/opentelemetry/context/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/context/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/distributedcontext/__init__.py b/opentelemetry-api/opentelemetry/distributedcontext/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/distributedcontext/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/internal/__init__.py b/opentelemetry-api/opentelemetry/internal/__init__.py new file mode 100644 index 00000000000..83ac009440a --- /dev/null +++ b/opentelemetry-api/opentelemetry/internal/__init__.py @@ -0,0 +1,19 @@ +# Copyright 2019, OpenTelemetry 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 .version import __version__ + +__all__ = [ + "__version__", +] diff --git a/opentelemetry-api/opentelemetry/internal/version.py b/opentelemetry-api/opentelemetry/internal/version.py new file mode 100644 index 00000000000..34f10b31ef8 --- /dev/null +++ b/opentelemetry-api/opentelemetry/internal/version.py @@ -0,0 +1,15 @@ +# Copyright 2019, OpenTelemetry 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.0" diff --git a/opentelemetry-api/opentelemetry/logs/__init__.py b/opentelemetry-api/opentelemetry/logs/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/logs/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/metrics/__init__.py b/opentelemetry-api/opentelemetry/metrics/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/metrics/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/resources/__init__.py b/opentelemetry-api/opentelemetry/resources/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/resources/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/trace/__init__.py b/opentelemetry-api/opentelemetry/trace/__init__.py new file mode 100644 index 00000000000..69e3be50dac --- /dev/null +++ b/opentelemetry-api/opentelemetry/trace/__init__.py @@ -0,0 +1 @@ +__path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/opentelemetry-api/setup.py b/opentelemetry-api/setup.py new file mode 100644 index 00000000000..6012b2ec87c --- /dev/null +++ b/opentelemetry-api/setup.py @@ -0,0 +1,46 @@ +# Copyright 2019, OpenTelemetry 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 opencensus.ext.azure.common.version import __version__ + +setup( + name='opentelemetry-api', + version=__version__, # noqa + author='OpenTelemetry Authors', + author_email='cncf-opentelemetry-contributors@lists.cncf.io', + classifiers=[ + 'Development Status :: 3 - Alpha', + 'Intended Audience :: Developers', + 'License :: OSI Approved :: Apache Software License', + 'Programming Language :: Python', + '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='OpenTelemetry Python API', + include_package_data=True, + long_description=open('README.rst').read(), + install_requires=[ + ], + extras_require={}, + license='Apache-2.0', + packages=find_packages(exclude=('examples', 'tests',)), + namespace_packages=[], + url='https://github.com/open-telemetry/opentelemetry-python', + zip_safe=False, +) From 56470721fef8b9f8f051e8355761da5d2b0cb6e5 Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Thu, 20 Jun 2019 11:36:06 -0700 Subject: [PATCH 2/3] fix url and import path --- opentelemetry-api/setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opentelemetry-api/setup.py b/opentelemetry-api/setup.py index 6012b2ec87c..5e3c66bf9db 100644 --- a/opentelemetry-api/setup.py +++ b/opentelemetry-api/setup.py @@ -14,7 +14,7 @@ from setuptools import find_packages from setuptools import setup -from opencensus.ext.azure.common.version import __version__ +from opentelemetry.internal import __version__ setup( name='opentelemetry-api', @@ -41,6 +41,6 @@ license='Apache-2.0', packages=find_packages(exclude=('examples', 'tests',)), namespace_packages=[], - url='https://github.com/open-telemetry/opentelemetry-python', + url='https://github.com/open-telemetry/opentelemetry-python/opentelemetry-api', zip_safe=False, ) From be78ba0dacbad231085e63537417444986015170 Mon Sep 17 00:00:00 2001 From: Reiley Yang Date: Thu, 20 Jun 2019 11:45:32 -0700 Subject: [PATCH 3/3] use double quote instead of single quote for consistency --- opentelemetry-api/opentelemetry/__init__.py | 2 +- .../opentelemetry/context/__init__.py | 2 +- .../distributedcontext/__init__.py | 2 +- .../opentelemetry/logs/__init__.py | 2 +- .../opentelemetry/metrics/__init__.py | 2 +- .../opentelemetry/resources/__init__.py | 2 +- .../opentelemetry/trace/__init__.py | 2 +- opentelemetry-api/setup.py | 34 +++++++++---------- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/opentelemetry-api/opentelemetry/__init__.py b/opentelemetry-api/opentelemetry/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/__init__.py +++ b/opentelemetry-api/opentelemetry/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/context/__init__.py b/opentelemetry-api/opentelemetry/context/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/context/__init__.py +++ b/opentelemetry-api/opentelemetry/context/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/distributedcontext/__init__.py b/opentelemetry-api/opentelemetry/distributedcontext/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/distributedcontext/__init__.py +++ b/opentelemetry-api/opentelemetry/distributedcontext/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/logs/__init__.py b/opentelemetry-api/opentelemetry/logs/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/logs/__init__.py +++ b/opentelemetry-api/opentelemetry/logs/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/metrics/__init__.py b/opentelemetry-api/opentelemetry/metrics/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/metrics/__init__.py +++ b/opentelemetry-api/opentelemetry/metrics/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/resources/__init__.py b/opentelemetry-api/opentelemetry/resources/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/resources/__init__.py +++ b/opentelemetry-api/opentelemetry/resources/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/opentelemetry/trace/__init__.py b/opentelemetry-api/opentelemetry/trace/__init__.py index 69e3be50dac..8db66d3d0f0 100644 --- a/opentelemetry-api/opentelemetry/trace/__init__.py +++ b/opentelemetry-api/opentelemetry/trace/__init__.py @@ -1 +1 @@ -__path__ = __import__('pkgutil').extend_path(__path__, __name__) +__path__ = __import__("pkgutil").extend_path(__path__, __name__) diff --git a/opentelemetry-api/setup.py b/opentelemetry-api/setup.py index 5e3c66bf9db..b03e118f0dd 100644 --- a/opentelemetry-api/setup.py +++ b/opentelemetry-api/setup.py @@ -17,30 +17,30 @@ from opentelemetry.internal import __version__ setup( - name='opentelemetry-api', + name="opentelemetry-api", version=__version__, # noqa - author='OpenTelemetry Authors', - author_email='cncf-opentelemetry-contributors@lists.cncf.io', + author="OpenTelemetry Authors", + author_email="cncf-opentelemetry-contributors@lists.cncf.io", classifiers=[ - 'Development Status :: 3 - Alpha', - 'Intended Audience :: Developers', - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7', + "Development Status :: 3 - Alpha", + "Intended Audience :: Developers", + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "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='OpenTelemetry Python API', + description="OpenTelemetry Python API", include_package_data=True, - long_description=open('README.rst').read(), + long_description=open("README.rst").read(), install_requires=[ ], extras_require={}, - license='Apache-2.0', - packages=find_packages(exclude=('examples', 'tests',)), + license="Apache-2.0", + packages=find_packages(exclude=("examples", "tests",)), namespace_packages=[], - url='https://github.com/open-telemetry/opentelemetry-python/opentelemetry-api', + url="https://github.com/open-telemetry/opentelemetry-python/opentelemetry-api", zip_safe=False, )