From f96b29ca527b4228e05f46103476e11b66924ce1 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 15:03:29 -0800 Subject: [PATCH 1/7] move b3 propagator out of sdk --- .../opentelemetry-propagator-b3/LICENSE | 201 ++++++++++++++++++ .../opentelemetry-propagator-b3/MANIFEST.in | 9 + .../opentelemetry-propagator-b3/README.rst | 23 ++ .../opentelemetry-propagator-b3/setup.cfg | 49 +++++ .../opentelemetry-propagator-b3/setup.py | 26 +++ .../opentelemetry/propagators/b3/__init__.py | 0 .../opentelemetry/propagators/b3/version.py | 15 ++ .../tests/__init__.py | 13 ++ .../tests}/test_b3_format.py | 10 +- scripts/build.sh | 2 +- tox.ini | 9 + 11 files changed, 351 insertions(+), 6 deletions(-) create mode 100644 propagator/opentelemetry-propagator-b3/LICENSE create mode 100644 propagator/opentelemetry-propagator-b3/MANIFEST.in create mode 100644 propagator/opentelemetry-propagator-b3/README.rst create mode 100644 propagator/opentelemetry-propagator-b3/setup.cfg create mode 100644 propagator/opentelemetry-propagator-b3/setup.py rename opentelemetry-sdk/src/opentelemetry/sdk/trace/propagation/b3_format.py => propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/__init__.py (100%) create mode 100644 propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py create mode 100644 propagator/opentelemetry-propagator-b3/tests/__init__.py rename {opentelemetry-sdk/tests/trace/propagation => propagator/opentelemetry-propagator-b3/tests}/test_b3_format.py (96%) diff --git a/propagator/opentelemetry-propagator-b3/LICENSE b/propagator/opentelemetry-propagator-b3/LICENSE new file mode 100644 index 00000000000..261eeb9e9f8 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/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/propagator/opentelemetry-propagator-b3/MANIFEST.in b/propagator/opentelemetry-propagator-b3/MANIFEST.in new file mode 100644 index 00000000000..aed3e33273b --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/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/propagator/opentelemetry-propagator-b3/README.rst b/propagator/opentelemetry-propagator-b3/README.rst new file mode 100644 index 00000000000..2ff3f9df117 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/README.rst @@ -0,0 +1,23 @@ +OpenTelemetry B3 Propagator +=========================== + +|pypi| + +.. |pypi| image:: https://badge.fury.io/py/opentelemetry-propagator-b3.svg + :target: https://pypi.org/project/opentelemetry-propagator-b3/ + +This library provides a propagator for the B3 format + +Installation +------------ + +:: + + pip install opentelemetry-propagator-b3 + + +References +---------- + +* `OpenTelemetry `_ +* `B3 format `_ diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg new file mode 100644 index 00000000000..d0ba31eeb76 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/setup.cfg @@ -0,0 +1,49 @@ +# Copyright 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. +# +[metadata] +name = opentelemetry-propagator-b3 +description = OpenTelemetry B3 Propagator +long_description = file: README.rst +long_description_content_type = text/x-rst +author = OpenTelemetry Authors +author_email = cncf-opentelemetry-contributors@lists.cncf.io +url = https://github.com/open-telemetry/opentelemetry-python/tree/master/propagator/opentelemetry-propagator-b3 +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 + Programming Language :: Python :: 3.9 + +[options] +python_requires = >=3.5 +package_dir= + =src +packages=find_namespace: +install_requires = + opentelemetry-api == 0.17.dev0 + +[options.extras_require] +test = + +[options.packages.find] +where = src diff --git a/propagator/opentelemetry-propagator-b3/setup.py b/propagator/opentelemetry-propagator-b3/setup.py new file mode 100644 index 00000000000..4df5188b1d0 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/setup.py @@ -0,0 +1,26 @@ +# Copyright 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", "propagators", "b3", "version.py" +) +PACKAGE_INFO = {} +with open(VERSION_FILENAME) as f: + exec(f.read(), PACKAGE_INFO) + +setuptools.setup(version=PACKAGE_INFO["__version__"]) diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/propagation/b3_format.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/__init__.py similarity index 100% rename from opentelemetry-sdk/src/opentelemetry/sdk/trace/propagation/b3_format.py rename to propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/__init__.py diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py new file mode 100644 index 00000000000..86e1dbb17ab --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py @@ -0,0 +1,15 @@ +# Copyright 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. + +__version__ = "0.17.dev0" diff --git a/propagator/opentelemetry-propagator-b3/tests/__init__.py b/propagator/opentelemetry-propagator-b3/tests/__init__.py new file mode 100644 index 00000000000..b0a6f428417 --- /dev/null +++ b/propagator/opentelemetry-propagator-b3/tests/__init__.py @@ -0,0 +1,13 @@ +# Copyright 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. diff --git a/opentelemetry-sdk/tests/trace/propagation/test_b3_format.py b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py similarity index 96% rename from opentelemetry-sdk/tests/trace/propagation/test_b3_format.py rename to propagator/opentelemetry-propagator-b3/tests/test_b3_format.py index 93d5bbe56e6..bdd5aeacd5a 100644 --- a/opentelemetry-sdk/tests/trace/propagation/test_b3_format.py +++ b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py @@ -16,7 +16,7 @@ from unittest.mock import Mock, patch import opentelemetry.sdk.trace as trace -import opentelemetry.sdk.trace.propagation.b3_format as b3_format +import opentelemetry.propagators.b3 as b3_format import opentelemetry.trace as trace_api from opentelemetry.context import get_current from opentelemetry.trace.propagation.textmap import DictGetter @@ -255,10 +255,10 @@ def test_missing_trace_id(self): self.assertEqual(span_context.trace_id, trace_api.INVALID_TRACE_ID) @patch( - "opentelemetry.sdk.trace.propagation.b3_format.trace.RandomIdsGenerator.generate_trace_id" + "opentelemetry.propagators.b3.trace.RandomIdsGenerator.generate_trace_id" ) @patch( - "opentelemetry.sdk.trace.propagation.b3_format.trace.RandomIdsGenerator.generate_span_id" + "opentelemetry.propagators.b3.trace.RandomIdsGenerator.generate_span_id" ) def test_invalid_trace_id( self, mock_generate_span_id, mock_generate_trace_id @@ -281,10 +281,10 @@ def test_invalid_trace_id( self.assertEqual(span_context.span_id, 2) @patch( - "opentelemetry.sdk.trace.propagation.b3_format.trace.RandomIdsGenerator.generate_trace_id" + "opentelemetry.propagators.b3.trace.RandomIdsGenerator.generate_trace_id" ) @patch( - "opentelemetry.sdk.trace.propagation.b3_format.trace.RandomIdsGenerator.generate_span_id" + "opentelemetry.propagators.b3.trace.RandomIdsGenerator.generate_span_id" ) def test_invalid_span_id( self, mock_generate_span_id, mock_generate_trace_id diff --git a/scripts/build.sh b/scripts/build.sh index 0dec4a27ba3..853a2970039 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -16,7 +16,7 @@ DISTDIR=dist mkdir -p $DISTDIR rm -rf $DISTDIR/* - for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-instrumentation/ opentelemetry-proto/ exporter/*/ instrumentation/*/ ; do + for d in opentelemetry-api/ opentelemetry-sdk/ opentelemetry-instrumentation/ opentelemetry-proto/ exporter/*/ instrumentation/*/ propagator/*/; do ( echo "building $d" cd "$d" diff --git a/tox.ini b/tox.ini index fb5ebee5ab7..5eaa3bc493b 100644 --- a/tox.ini +++ b/tox.ini @@ -47,6 +47,10 @@ envlist = py3{5,6,7,8,9}-test-core-opentracing-shim pypy3-test-core-opentracing-shim + ; opentelemetry-propagator-b3 + py3{5,6,7,8,9}-test-propagator-b3 + pypy3-test-propagator-b3 + lint tracecontext mypy,mypyinstalled @@ -77,6 +81,8 @@ changedir = test-exporter-otlp: exporter/opentelemetry-exporter-otlp/tests test-exporter-prometheus: exporter/opentelemetry-exporter-prometheus/tests test-exporter-zipkin: exporter/opentelemetry-exporter-zipkin/tests + + test-propagator-b3: propagator/opentelemetry-propagator-b3/tests commands_pre = ; Install without -e to test the actual installation @@ -104,6 +110,8 @@ commands_pre = zipkin: pip install {toxinidir}/exporter/opentelemetry-exporter-zipkin + b3: pip install {toxinidir}/propagator/opentelemetry-propagator-b3 + ; In order to get a healthy coverage report, ; we have to install packages in editable mode. coverage: python {toxinidir}/scripts/eachdist.py install --editable @@ -150,6 +158,7 @@ commands_pre = python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-prometheus[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin[test] + python -m pip install -e {toxinidir}/exporter/opentelemetry-propagator-b3[test] commands = python scripts/eachdist.py lint --check-only From 98dd7b809c9202586460f324a030d26840aa062e Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 15:17:19 -0800 Subject: [PATCH 2/7] move the propagator entrypoint --- README.md | 8 ++++++++ opentelemetry-sdk/setup.cfg | 2 -- propagator/opentelemetry-propagator-b3/setup.cfg | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8d211cd118e..9043aeace90 100644 --- a/README.md +++ b/README.md @@ -76,6 +76,14 @@ directory includes OpenTelemetry exporter packages. You can install the packages pip install opentelemetry-exporter-{exporter} ``` +The +[`propagator/`](https://github.com/open-telemetry/opentelemetry-python/tree/master/propagator) +directory includes OpenTelemetry propagator packages. You can install the packages separately with the following command: + +```sh +pip install opentelemetry-propagator-{propagator} +``` + To install the development versions of these packages instead, clone or fork this repository and perform an [editable install](https://pip.pypa.io/en/stable/reference/pip_install/#editable-installs): diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg index 765d3891ec8..b035e463c06 100644 --- a/opentelemetry-sdk/setup.cfg +++ b/opentelemetry-sdk/setup.cfg @@ -53,8 +53,6 @@ opentelemetry_meter_provider = sdk_meter_provider = opentelemetry.sdk.metrics:MeterProvider opentelemetry_tracer_provider = sdk_tracer_provider = opentelemetry.sdk.trace:TracerProvider -opentelemetry_propagator = - b3 = opentelemetry.sdk.trace.propagation.b3_format:B3Format opentelemetry_exporter = console_span = opentelemetry.sdk.trace.export:ConsoleSpanExporter console_metrics = opentelemetry.sdk.metrics.export:ConsoleMetricsExporter diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg index d0ba31eeb76..9916bc343a9 100644 --- a/propagator/opentelemetry-propagator-b3/setup.cfg +++ b/propagator/opentelemetry-propagator-b3/setup.cfg @@ -47,3 +47,7 @@ test = [options.packages.find] where = src + +[options.entry_points] +opentelemetry_propagator = + b3 = opentelemetry.propagators.b3:B3Format \ No newline at end of file From 0372d551df1ae02194dad61b32d15eab2c48790c Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 15:19:42 -0800 Subject: [PATCH 3/7] update changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d77447ad31..774b2c95257 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,10 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add support for OTLP v0.6.0 ([#1472](https://github.com/open-telemetry/opentelemetry-python/pull/1472)) - - Add protobuf via gRPC exporting support for Jaeger ([#1471](https://github.com/open-telemetry/opentelemetry-python/pull/1471)) - - Add support for Python 3.9 ([#1441](https://github.com/open-telemetry/opentelemetry-python/pull/1441)) @@ -46,6 +44,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ([#1507](https://github.com/open-telemetry/opentelemetry-python/pull/1507)) - `opentelemetry-exporter-jaeger` Updated Jaeger exporter status code tag ([#1488](https://github.com/open-telemetry/opentelemetry-python/pull/1488)) +- `opentelemetry-sdk` The B3Format propagator has been moved into its own package: `opentelemetry-propagator-b3` + ([#1513](https://github.com/open-telemetry/opentelemetry-python/pull/1513)) ## [0.16b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.16b1) - 2020-11-26 ### Added From 63ede90de44087ec77cc3d8811a4771cc2a45eb3 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 16:45:50 -0800 Subject: [PATCH 4/7] fix lint --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 5eaa3bc493b..497d3f35563 100644 --- a/tox.ini +++ b/tox.ini @@ -158,7 +158,7 @@ commands_pre = python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-otlp[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-prometheus[test] python -m pip install -e {toxinidir}/exporter/opentelemetry-exporter-zipkin[test] - python -m pip install -e {toxinidir}/exporter/opentelemetry-propagator-b3[test] + python -m pip install -e {toxinidir}/propagator/opentelemetry-propagator-b3[test] commands = python scripts/eachdist.py lint --check-only From 687689a024d22b91c8c9591ec7a7851d5d48c04c Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 17:01:22 -0800 Subject: [PATCH 5/7] updating getting started --- docs/getting-started.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docs/getting-started.rst b/docs/getting-started.rst index 7e0ab3c312a..228e254df60 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -187,10 +187,16 @@ By default, ``opentelemetry-python`` is configured to use the `W3C Trace Context HTTP headers for HTTP requests, but you can configure it to leverage different propagators. Here's an example using Zipkin's `b3 propagation `_: +.. code-block:: sh + + pip install opentelemetry-propagator-b3 + +Following the installation of the package containing the b3 propagator, configure the propagator as follows: + .. code-block:: python from opentelemetry import propagators - from opentelemetry.sdk.trace.propagation.b3_format import B3Format + from opentelemetry.propagators.b3 import B3Format propagators.set_global_textmap(B3Format()) From 614976f835ab3e6b5b67daacbb4d36135f796654 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Thu, 7 Jan 2021 17:06:08 -0800 Subject: [PATCH 6/7] fix lint --- propagator/opentelemetry-propagator-b3/tests/test_b3_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py index bdd5aeacd5a..4364dbc6af8 100644 --- a/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py +++ b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py @@ -15,8 +15,8 @@ import unittest from unittest.mock import Mock, patch -import opentelemetry.sdk.trace as trace import opentelemetry.propagators.b3 as b3_format +import opentelemetry.sdk.trace as trace import opentelemetry.trace as trace_api from opentelemetry.context import get_current from opentelemetry.trace.propagation.textmap import DictGetter From eacb4f0bd133c4bd76e433fe5a92daacf18d04d8 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 12 Jan 2021 09:37:07 -0800 Subject: [PATCH 7/7] pylint can't find the module installed as editable --- propagator/opentelemetry-propagator-b3/tests/test_b3_format.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py index 1a8f54ae5aa..aea06b47fb9 100644 --- a/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py +++ b/propagator/opentelemetry-propagator-b3/tests/test_b3_format.py @@ -15,7 +15,7 @@ import unittest from unittest.mock import Mock, patch -import opentelemetry.propagators.b3 as b3_format +import opentelemetry.propagators.b3 as b3_format # pylint: disable=no-name-in-module,import-error import opentelemetry.sdk.trace as trace import opentelemetry.sdk.trace.ids_generator as ids_generator import opentelemetry.trace as trace_api