diff --git a/docs-requirements.txt b/docs-requirements.txt index 958f97b1..dfac9cdf 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -3,5 +3,6 @@ Sphinx sphinx-autodoc-typehints opentelemetry-api opentelemetry-sdk --e ./opentelemetry-exporter-google-cloud +-e ./opentelemetry-exporter-cloud-trace +-e ./opentelemetry-exporter-cloud-monitoring -e ./opentelemetry-tools-google-cloud diff --git a/docs/cloud_monitoring/cloud_monitoring.rst b/docs/cloud_monitoring/cloud_monitoring.rst index c85025cd..8fc7148d 100644 --- a/docs/cloud_monitoring/cloud_monitoring.rst +++ b/docs/cloud_monitoring/cloud_monitoring.rst @@ -1,8 +1,8 @@ OpenTelemetry Cloud Monitoring Exporter ======================================= -.. image:: https://badge.fury.io/py/opentelemetry-exporter-google-cloud.svg - :target: https://badge.fury.io/py/opentelemetry-exporter-google-cloud +.. image:: https://badge.fury.io/py/opentelemetry-exporter-cloud-monitoring.svg + :target: https://badge.fury.io/py/opentelemetry-exporter-cloud-monitoring .. automodule:: opentelemetry.exporter.cloud_monitoring :members: diff --git a/docs/cloud_trace/cloud_trace.rst b/docs/cloud_trace/cloud_trace.rst index 5db1ed80..ec9c403f 100644 --- a/docs/cloud_trace/cloud_trace.rst +++ b/docs/cloud_trace/cloud_trace.rst @@ -1,8 +1,8 @@ OpenTelemetry Cloud Trace Exporter ================================== -.. image:: https://badge.fury.io/py/opentelemetry-exporter-google-cloud.svg - :target: https://badge.fury.io/py/opentelemetry-exporter-google-cloud +.. image:: https://badge.fury.io/py/opentelemetry-exporter-cloud-trace.svg + :target: https://badge.fury.io/py/opentelemetry-exporter-cloud-trace .. automodule:: opentelemetry.exporter.cloud_trace :members: diff --git a/opentelemetry-exporter-google-cloud/CHANGELOG.md b/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md similarity index 91% rename from opentelemetry-exporter-google-cloud/CHANGELOG.md rename to opentelemetry-exporter-cloud-monitoring/CHANGELOG.md index 191b8fcf..01dfdcf0 100644 --- a/opentelemetry-exporter-google-cloud/CHANGELOG.md +++ b/opentelemetry-exporter-cloud-monitoring/CHANGELOG.md @@ -2,6 +2,9 @@ ## Unreleased +- Split cloud trace and cloud monitoring exporters into separate packages + ([#107](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/107)) + ## Version 0.18b0 Released 2021-03-31 diff --git a/opentelemetry-exporter-google-cloud/LICENSE b/opentelemetry-exporter-cloud-monitoring/LICENSE similarity index 100% rename from opentelemetry-exporter-google-cloud/LICENSE rename to opentelemetry-exporter-cloud-monitoring/LICENSE diff --git a/opentelemetry-exporter-google-cloud/MANIFEST.in b/opentelemetry-exporter-cloud-monitoring/MANIFEST.in similarity index 100% rename from opentelemetry-exporter-google-cloud/MANIFEST.in rename to opentelemetry-exporter-cloud-monitoring/MANIFEST.in diff --git a/opentelemetry-exporter-cloud-monitoring/README.rst b/opentelemetry-exporter-cloud-monitoring/README.rst new file mode 100644 index 00000000..929d0e94 --- /dev/null +++ b/opentelemetry-exporter-cloud-monitoring/README.rst @@ -0,0 +1,91 @@ +OpenTelemetry Google Cloud Integration +====================================== + +.. image:: https://badge.fury.io/py/opentelemetry-exporter-cloud-monitoring.svg + :target: https://badge.fury.io/py/opentelemetry-exporter-cloud-monitoring + +.. image:: https://readthedocs.org/projects/google-cloud-opentelemetry/badge/?version=latest + :target: https://google-cloud-opentelemetry.readthedocs.io/en/latest/?badge=latest + :alt: Documentation Status + +This library provides support for: + +- Exporting traces to Google Cloud Trace +- Exporting metrics to Google Cloud Monitoring + +For resource detection and GCP trace context propagation, see +`opentelemetry-tools-google-cloud +`_. + +Installation +------------ + +.. code:: bash + + pip install opentelemetry-exporter-cloud-monitoring + +Usage +----- + +Traces + +.. code:: python + + from opentelemetry import trace + from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter + from opentelemetry.sdk.trace import TracerProvider + from opentelemetry.sdk.trace.export import ( + SimpleExportSpanProcessor, + ) + + trace.set_tracer_provider(TracerProvider()) + + cloud_trace_exporter = CloudTraceSpanExporter( + project_id='my-gcloud-project', + ) + trace.get_tracer_provider().add_span_processor( + SimpleExportSpanProcessor(cloud_trace_exporter) + ) + tracer = trace.get_tracer(__name__) + with tracer.start_as_current_span('foo'): + print('Hello world!') + + +Metrics + +.. code:: python + + import time + + from opentelemetry import metrics + from opentelemetry.exporter.cloud_monitoring import ( + CloudMonitoringMetricsExporter, + ) + from opentelemetry.sdk.metrics import Counter, MeterProvider + + metrics.set_meter_provider(MeterProvider()) + meter = metrics.get_meter(__name__) + metrics.get_meter_provider().start_pipeline( + meter, CloudMonitoringMetricsExporter(), 5 + ) + + requests_counter = meter.create_counter( + name="request_counter", + description="number of requests", + unit="1", + value_type=int + ) + + staging_labels = {"environment": "staging"} + + for i in range(20): + requests_counter.add(25, staging_labels) + time.sleep(10) + + + +References +---------- + +* `Cloud Trace `_ +* `OpenTelemetry Project `_ diff --git a/opentelemetry-exporter-google-cloud/mypy.ini b/opentelemetry-exporter-cloud-monitoring/mypy.ini similarity index 100% rename from opentelemetry-exporter-google-cloud/mypy.ini rename to opentelemetry-exporter-cloud-monitoring/mypy.ini diff --git a/opentelemetry-exporter-cloud-monitoring/setup.cfg b/opentelemetry-exporter-cloud-monitoring/setup.cfg new file mode 100644 index 00000000..e401a202 --- /dev/null +++ b/opentelemetry-exporter-cloud-monitoring/setup.cfg @@ -0,0 +1,36 @@ +[metadata] +name = opentelemetry-exporter-cloud-monitoring +description = Google Cloud Monitoring exporter for OpenTelemetry +long_description = file: README.rst +long_description_content_type = text/x-rst +author = Google +author_email = opentelemetry-pypi@google.com +url = https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/tree/master/opentelemetry-exporter-cloud-monitoring +platforms = any +license = Apache-2.0 +classifiers = + Development Status :: 4 - Beta + Intended Audience :: Developers + License :: OSI Approved :: Apache Software License + Programming Language :: Python + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.5 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + +[options] +python_requires = >=3.5 +package_dir= + =src +packages=find_namespace: +install_requires = + google-cloud-monitoring <2.0.0 + opentelemetry-api ~= 0.17b0 + opentelemetry-sdk ~= 0.17b0 + +[options.packages.find] +where = src + +[options.extras_require] +test = diff --git a/opentelemetry-exporter-google-cloud/setup.py b/opentelemetry-exporter-cloud-monitoring/setup.py similarity index 100% rename from opentelemetry-exporter-google-cloud/setup.py rename to opentelemetry-exporter-cloud-monitoring/setup.py diff --git a/opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/cloud_monitoring/__init__.py b/opentelemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/cloud_monitoring/__init__.py similarity index 100% rename from opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/cloud_monitoring/__init__.py rename to opentelemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/cloud_monitoring/__init__.py diff --git a/opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/google/version.py b/opentelemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/google/version.py similarity index 100% rename from opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/google/version.py rename to opentelemetry-exporter-cloud-monitoring/src/opentelemetry/exporter/google/version.py diff --git a/opentelemetry-exporter-google-cloud/src/opentelemetry/py.typed b/opentelemetry-exporter-cloud-monitoring/src/opentelemetry/py.typed similarity index 100% rename from opentelemetry-exporter-google-cloud/src/opentelemetry/py.typed rename to opentelemetry-exporter-cloud-monitoring/src/opentelemetry/py.typed diff --git a/opentelemetry-exporter-google-cloud/tests/test_cloud_monitoring.py b/opentelemetry-exporter-cloud-monitoring/tests/test_cloud_monitoring.py similarity index 100% rename from opentelemetry-exporter-google-cloud/tests/test_cloud_monitoring.py rename to opentelemetry-exporter-cloud-monitoring/tests/test_cloud_monitoring.py diff --git a/opentelemetry-exporter-google-cloud/tests/test_cloud_monitoring_exporter_integration.py b/opentelemetry-exporter-cloud-monitoring/tests/test_cloud_monitoring_exporter_integration.py similarity index 100% rename from opentelemetry-exporter-google-cloud/tests/test_cloud_monitoring_exporter_integration.py rename to opentelemetry-exporter-cloud-monitoring/tests/test_cloud_monitoring_exporter_integration.py diff --git a/opentelemetry-exporter-cloud-trace/CHANGELOG.md b/opentelemetry-exporter-cloud-trace/CHANGELOG.md new file mode 100644 index 00000000..01dfdcf0 --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/CHANGELOG.md @@ -0,0 +1,74 @@ +# Changelog + +## Unreleased + +- Split cloud trace and cloud monitoring exporters into separate packages + ([#107](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/107)) + +## Version 0.18b0 + +Released 2021-03-31 + +## Version 0.17b0 + +Released 2021-02-04 + +## Version 0.16b1 + +Released 2021-01-14 + +- Add mapping between opentelemetry and google traces attributes + ([#90](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/90)) + +## Version 0.15b0 + +Released 2020-11-04 + +## Version 0.14b0 + +Released 2020-10-27 + +- Fix breakages for opentelemetry-python v0.14b0 + ([#79](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/79), + [#83](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/83)) + +## Version 0.13b0 + +Released 2020-09-17 + +## Version 0.12b0 + +Released 2020-08-17 + +- Add spankind support for trace exporter + ([#58](https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/pull/58)) + +## Version 0.11b0 + +Released 2020-08-05 + +- Add support for resources + ([#853](https://github.com/open-telemetry/opentelemetry-python/pull/853)) + +## Version 0.10b0 + +Released 2020-06-23 + +- Add g.co/agent label for Google internal metrics tracking + ([#833](https://github.com/open-telemetry/opentelemetry-python/pull/833)) +- Adding trouble-shooting tips + ([#827](https://github.com/open-telemetry/opentelemetry-python/pull/827)) +- Added Cloud Trace context propagation + ([#819](https://github.com/open-telemetry/opentelemetry-python/pull/819)) +- Added tests to tox coverage files + ([#804](https://github.com/open-telemetry/opentelemetry-python/pull/804)) +- Add ability for exporter to add unique identifier + ([#841](https://github.com/open-telemetry/opentelemetry-python/pull/841)) +- Added tests to tox coverage files + ([#804](https://github.com/open-telemetry/opentelemetry-python/pull/804)) + +## 0.9b0 + +Released 2020-06-10 + +- Initial release diff --git a/opentelemetry-exporter-cloud-trace/LICENSE b/opentelemetry-exporter-cloud-trace/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/opentelemetry-exporter-cloud-trace/MANIFEST.in b/opentelemetry-exporter-cloud-trace/MANIFEST.in new file mode 100644 index 00000000..aed3e332 --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/MANIFEST.in @@ -0,0 +1,9 @@ +graft src +graft tests +global-exclude *.pyc +global-exclude *.pyo +global-exclude __pycache__/* +include CHANGELOG.md +include MANIFEST.in +include README.rst +include LICENSE diff --git a/opentelemetry-exporter-google-cloud/README.rst b/opentelemetry-exporter-cloud-trace/README.rst similarity index 91% rename from opentelemetry-exporter-google-cloud/README.rst rename to opentelemetry-exporter-cloud-trace/README.rst index f3a321a7..48bd998b 100644 --- a/opentelemetry-exporter-google-cloud/README.rst +++ b/opentelemetry-exporter-cloud-trace/README.rst @@ -1,8 +1,8 @@ OpenTelemetry Google Cloud Integration ====================================== -.. image:: https://badge.fury.io/py/opentelemetry-exporter-google-cloud.svg - :target: https://badge.fury.io/py/opentelemetry-exporter-google-cloud +.. image:: https://badge.fury.io/py/opentelemetry-exporter-cloud-trace.svg + :target: https://badge.fury.io/py/opentelemetry-exporter-cloud-trace .. image:: https://readthedocs.org/projects/google-cloud-opentelemetry/badge/?version=latest :target: https://google-cloud-opentelemetry.readthedocs.io/en/latest/?badge=latest @@ -22,7 +22,7 @@ Installation .. code:: bash - pip install opentelemetry-exporter-google-cloud + pip install opentelemetry-exporter-cloud-trace Usage ----- diff --git a/opentelemetry-exporter-cloud-trace/mypy.ini b/opentelemetry-exporter-cloud-trace/mypy.ini new file mode 100644 index 00000000..f9e8305e --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/mypy.ini @@ -0,0 +1,21 @@ +[mypy] +namespace_packages = True +explicit_package_bases = True +mypy_path = $MYPY_CONFIG_FILE_DIR/src + +[mypy-opentelemetry.sdk.*] +ignore_missing_imports = True + +[mypy-google.auth.*] +ignore_missing_imports = True + +[mypy-google.cloud.*] +ignore_missing_imports = True + +[mypy-google.api.*] +ignore_missing_imports = True + +[mypy-google.rpc.*] +ignore_missing_imports = True + + diff --git a/opentelemetry-exporter-google-cloud/setup.cfg b/opentelemetry-exporter-cloud-trace/setup.cfg similarity index 83% rename from opentelemetry-exporter-google-cloud/setup.cfg rename to opentelemetry-exporter-cloud-trace/setup.cfg index 0e1a154c..0f0b06c4 100644 --- a/opentelemetry-exporter-google-cloud/setup.cfg +++ b/opentelemetry-exporter-cloud-trace/setup.cfg @@ -1,11 +1,11 @@ [metadata] -name = opentelemetry-exporter-google-cloud -description = Google Cloud integrations for OpenTelemetry +name = opentelemetry-exporter-cloud-trace +description = Google Cloud Trace exporter for OpenTelemetry long_description = file: README.rst long_description_content_type = text/x-rst author = Google author_email = opentelemetry-pypi@google.com -url = https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/opentelemetry-exporter-google-cloud +url = https://github.com/GoogleCloudPlatform/opentelemetry-operations-python/tree/master/opentelemetry-exporter-cloud-trace platforms = any license = Apache-2.0 classifiers = @@ -25,7 +25,6 @@ package_dir= =src packages=find_namespace: install_requires = - google-cloud-monitoring <2.0.0 google-cloud-trace >=0.24.0, <1.0.0 opentelemetry-api ~= 0.17b0 opentelemetry-sdk ~= 0.17b0 diff --git a/opentelemetry-exporter-cloud-trace/setup.py b/opentelemetry-exporter-cloud-trace/setup.py new file mode 100644 index 00000000..23d69973 --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/setup.py @@ -0,0 +1,29 @@ +# Copyright 2021 The 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. +import os + +import setuptools + +BASE_DIR = os.path.dirname(__file__) +VERSION_FILENAME = os.path.join( + BASE_DIR, "src", "opentelemetry", "exporter", "google", "version.py", +) +PACKAGE_INFO = {} +with open(VERSION_FILENAME) as f: + exec(f.read(), PACKAGE_INFO) + +setuptools.setup( + version=PACKAGE_INFO["__version__"], + package_data={"opentelemetry": ["py.typed"]}, +) diff --git a/opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/cloud_trace/__init__.py b/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/__init__.py similarity index 100% rename from opentelemetry-exporter-google-cloud/src/opentelemetry/exporter/cloud_trace/__init__.py rename to opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/cloud_trace/__init__.py diff --git a/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/google/version.py b/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/google/version.py new file mode 100644 index 00000000..c6c15464 --- /dev/null +++ b/opentelemetry-exporter-cloud-trace/src/opentelemetry/exporter/google/version.py @@ -0,0 +1,15 @@ +# Copyright 2021 Google +# +# 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.18.dev0" diff --git a/opentelemetry-exporter-google-cloud/tests/__init__.py b/opentelemetry-exporter-cloud-trace/src/opentelemetry/py.typed similarity index 100% rename from opentelemetry-exporter-google-cloud/tests/__init__.py rename to opentelemetry-exporter-cloud-trace/src/opentelemetry/py.typed diff --git a/opentelemetry-exporter-google-cloud/tests/test_cloud_trace_exporter.py b/opentelemetry-exporter-cloud-trace/tests/test_cloud_trace_exporter.py similarity index 100% rename from opentelemetry-exporter-google-cloud/tests/test_cloud_trace_exporter.py rename to opentelemetry-exporter-cloud-trace/tests/test_cloud_trace_exporter.py diff --git a/opentelemetry-exporter-google-cloud/tests/test_integration_cloud_trace_exporter.py b/opentelemetry-exporter-cloud-trace/tests/test_integration_cloud_trace_exporter.py similarity index 100% rename from opentelemetry-exporter-google-cloud/tests/test_integration_cloud_trace_exporter.py rename to opentelemetry-exporter-cloud-trace/tests/test_integration_cloud_trace_exporter.py diff --git a/tox.ini b/tox.ini index dee84078..08625413 100644 --- a/tox.ini +++ b/tox.ini @@ -3,13 +3,13 @@ skipsdist = True skip_missing_interpreters = True envlist = ; Add the `ci` factor to any env that should be running during CI. - py3{5,6,7,8}-ci-test-{exporter,tools} - {lint,mypy}-ci-{exporter,tools} + py3{5,6,7,8}-ci-test-{cloudtrace,cloudmonitoring,tools} + {lint,mypy}-ci-{cloudtrace,cloudmonitoring,tools} docs-ci ; These are development commands and share the same virtualenv *within the ; package root directory* e.g. opentelemetry-tools-google-cloud/venv - {dev,fix}-{exporter,tools} + {dev,fix}-{cloudtrace,cloudmonitoring,tools} ; this section contains constants that can be referenced elsewhere [constants] @@ -33,10 +33,11 @@ test_results_dir = {toxinidir}/.test-results/test-results download = true setenv = ; for package specific commands, use these envvars to cd into the directory - exporter: PACKAGE_NAME = opentelemetry-exporter-google-cloud + cloudtrace: PACKAGE_NAME = opentelemetry-exporter-cloud-trace + cloudmonitoring: PACKAGE_NAME = opentelemetry-exporter-cloud-monitoring tools: PACKAGE_NAME = opentelemetry-tools-google-cloud -[testenv:py3{5,6,7,8}-ci-test-{exporter,tools}] +[testenv:py3{5,6,7,8}-ci-test-{cloudtrace,cloudmonitoring,tools}] deps = test: {[constants]base_deps} test: pytest @@ -51,7 +52,7 @@ commands = pytest --junitxml={[constants]test_results_dir}/{envname}/junit.xml { whitelist_externals = bash -[testenv:{lint,mypy}-ci-{exporter,tools}] +[testenv:{lint,mypy}-ci-{cloudtrace,cloudmonitoring,tools}] basepython = {[constants]dev_basepython} deps = {[constants]dev_deps} @@ -82,10 +83,11 @@ whitelist_externals = ; dev/fix use the same virtualenv. To (re)create the virtualenv ; for development, run `tox -f dev`. To run fixers (black, isort) `tox -f fix`. -[testenv:{dev,fix}-{exporter,tools}] +[testenv:{dev,fix}-{cloudtrace,cloudmonitoring,tools}] basepython = {[constants]dev_basepython} envdir = - exporter: opentelemetry-exporter-google-cloud/venv + cloudtrace: opentelemetry-exporter-cloud-trace/venv + cloudmonitoring: opentelemetry-exporter-cloud-monitoring/venv tools: opentelemetry-tools-google-cloud/venv deps = {[constants]dev_deps}