From 1bca3cb0a42dcacc354d1752b47b8b1c64139d852c19f0295156e8781a6997e8 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 22 Jan 2021 13:01:12 +0000 Subject: [PATCH 1/2] Accepting request 865954 from home:glaubitz:branches:devel:languages:python - Version update to 0.17b0 + Added - Add support for OTLP v0.6.0 (#1472) - Add protobuf via gRPC exporting support for Jaeger (#1471) - Add support for Python 3.9 (#1441) - Added the ability to disable instrumenting libraries specified by OTEL_PYTHON_DISABLED_INSTRUMENTATIONS env variable, when using opentelemetry-instrument command. (#1461) - Add `fields` to propagators (#1374) - Add local/remote samplers to parent based sampler (#1440) - Add support for OTEL_SPAN_{ATTRIBUTE_COUNT_LIMIT,EVENT_COUNT_LIMIT,LINK_COUNT_LIMIT} (#1377) - Return `None` for `DictGetter` if key not found (#1449) - Added support for Jaeger propagator (#1219) - Remove dependency on SDK from `opentelemetry-instrumentation` package. The `opentelemetry-sdk` package now registers an entrypoint `opentelemetry_configurator` to allow `opentelemetry-instrument` to load the configuration for the SDK (#1420) - `opentelemetry-exporter-zipkin` Add support for array attributes in Span and Resource exports (#1285) - Added `__repr__` for `DefaultSpan`, added `trace_flags` to `__repr__` of `SpanContext` (#1485) - `opentelemetry-sdk` Add support for OTEL_TRACE_SAMPLER and OTEL_TRACE_SAMPLER_ARG env variables (#1496) - Adding `opentelemetry-distro` package to add default configuration for span exporter to OTLP (#1482) + Changed - `opentelemetry-exporter-zipkin` Updated zipkin exporter status code and error tag (#1486) - Recreate span on every run of a `start_as_current_span`-decorated function (#1451) - `opentelemetry-exporter-otlp` Headers are now passed in as tuple as metadata, instead of a OBS-URL: https://build.opensuse.org/request/show/865954 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opentelemetry-api?expand=0&rev=8 --- LICENSE | 201 ------------------------------- opentelemetry-api-0.17b0.tar.gz | 3 + opentelemetry-api-0.6b0.tar.gz | 3 - python-opentelemetry-api.changes | 81 +++++++++++++ python-opentelemetry-api.spec | 17 +-- tests.tar.bz2 | 3 - 6 files changed, 89 insertions(+), 219 deletions(-) delete mode 100644 LICENSE create mode 100644 opentelemetry-api-0.17b0.tar.gz delete mode 100644 opentelemetry-api-0.6b0.tar.gz delete mode 100644 tests.tar.bz2 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index ed43975..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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-api-0.17b0.tar.gz b/opentelemetry-api-0.17b0.tar.gz new file mode 100644 index 0000000..e8f589a --- /dev/null +++ b/opentelemetry-api-0.17b0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a28664a00d4025ee9f9c17b78f2d1a14bd8f540fd21fdccb2cdf832e7506e2eb +size 38018 diff --git a/opentelemetry-api-0.6b0.tar.gz b/opentelemetry-api-0.6b0.tar.gz deleted file mode 100644 index f81639f..0000000 --- a/opentelemetry-api-0.6b0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:11df823b83838c45da3c9b3d542a26c4a581b5b4bfe4cf0b447254006026acc9 -size 22733 diff --git a/python-opentelemetry-api.changes b/python-opentelemetry-api.changes index e689b73..e4d715b 100644 --- a/python-opentelemetry-api.changes +++ b/python-opentelemetry-api.changes @@ -1,3 +1,84 @@ +------------------------------------------------------------------- +Fri Jan 22 11:39:19 UTC 2021 - John Paul Adrian Glaubitz + +- Version update to 0.17b0 + + Added + - Add support for OTLP v0.6.0 (#1472) + - Add protobuf via gRPC exporting support for Jaeger (#1471) + - Add support for Python 3.9 (#1441) + - Added the ability to disable instrumenting libraries specified by + OTEL_PYTHON_DISABLED_INSTRUMENTATIONS env variable, when using + opentelemetry-instrument command. (#1461) + - Add `fields` to propagators (#1374) + - Add local/remote samplers to parent based sampler (#1440) + - Add support for OTEL_SPAN_{ATTRIBUTE_COUNT_LIMIT,EVENT_COUNT_LIMIT,LINK_COUNT_LIMIT} + (#1377) + - Return `None` for `DictGetter` if key not found (#1449) + - Added support for Jaeger propagator (#1219) + - Remove dependency on SDK from `opentelemetry-instrumentation` package. The + `opentelemetry-sdk` package now registers an entrypoint `opentelemetry_configurator` + to allow `opentelemetry-instrument` to load the configuration for the SDK (#1420) + - `opentelemetry-exporter-zipkin` Add support for array attributes in Span and + Resource exports (#1285) + - Added `__repr__` for `DefaultSpan`, added `trace_flags` to `__repr__` of + `SpanContext` (#1485) + - `opentelemetry-sdk` Add support for OTEL_TRACE_SAMPLER and OTEL_TRACE_SAMPLER_ARG + env variables (#1496) + - Adding `opentelemetry-distro` package to add default configuration for + span exporter to OTLP (#1482) + + Changed + - `opentelemetry-exporter-zipkin` Updated zipkin exporter status code and error tag + (#1486) + - Recreate span on every run of a `start_as_current_span`-decorated function (#1451) + - `opentelemetry-exporter-otlp` Headers are now passed in as tuple as metadata, instead of a + string, which was incorrect. (#1507) + - `opentelemetry-exporter-jaeger` Updated Jaeger exporter status code tag (#1488) + - `opentelemetry-api` `opentelemety-sdk` Moved `idsgenerator` into sdk (#1514) + - `opentelemetry-sdk` The B3Format propagator has been moved into its own package: + `opentelemetry-propagator-b3` (#1513) + - Update default port for OTLP exporter from 55680 to 4317 (#1516) + - `opentelemetry-exporter-zipkin` Update boolean attribute value transformation (#1509) + - Move opentelemetry-opentracing-shim out of instrumentation folder (#1533) + - `opentelemetry-sdk` The JaegerPropagator has been moved into its own package: + `opentelemetry-propagator-jaeger` (#1525) + - `opentelemetry-exporter-jaeger`, `opentelemetry-exporter-zipkin` Update + InstrumentationInfo tag keys for Jaeger and Zipkin exporters (#1535) + - `opentelemetry-sdk` Remove rate property setter from TraceIdRatioBasedSampler (#1536) + - Fix TraceState to adhere to specs (#1502) + + Removed + - `opentelemetry-api` Remove ThreadLocalRuntimeContext since python3.4 is not supported. +- from version 0.16b1 + + Added + - Add meter reference to observers (#1425) +- from version 0.16b0 + + Added + - Add optional parameter to `record_exception` method (#1314) + - Add pickle support to SpanContext class (#1380) + - Add instrumentation library name and version to OTLP exported metrics (#1418) + - Add Gzip compression for exporter (#1141) + - Support for v2 api protobuf format (#1318) + - Add IDs Generator as Configurable Property of Auto Instrumentation (#1404) + - Added support for `OTEL_EXPORTER` to the `opentelemetry-instrument` command + (#1036) + + Changed + - Change temporality for Counter and UpDownCounter (#1384) + - OTLP exporter: Handle error case when no credentials supplied (#1366) + - Update protobuf versions (#1356) + - Add missing references to instrumented packages (#1416) + - Instrumentation Package depends on the OTel SDK (#1405) + - Allow samplers to modify tracestate (#1319) + - Update exception handling optional parameters, add escaped attribute to record_exception + (#1365) + - Rename `MetricRecord` to `ExportRecord` (#1367) + - Rename `Record` to `Accumulation` (#1373) + - Rename `Meter` to `Accumulator (#1372) + - Fix `ParentBased` sampler for implicit parent spans. Fix also `trace_state` + erasure for dropped spans or spans sampled by the `TraceIdRatioBased` sampler. + (#1394) +- See upstream CHANGELOG.md for the changes from 0.7b1 to 0.15b0 + + https://raw.githubusercontent.com/open-telemetry/opentelemetry-python/master/CHANGELOG.md +- Drop tests.tar.bz2 tarball as tests are included in the upstream source now + ------------------------------------------------------------------- Wed Apr 15 14:03:21 UTC 2020 - pgajdos@suse.com diff --git a/python-opentelemetry-api.spec b/python-opentelemetry-api.spec index 5e0425a..12aecb1 100644 --- a/python-opentelemetry-api.spec +++ b/python-opentelemetry-api.spec @@ -1,7 +1,7 @@ # # spec file for package python-opentelemetry-api # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,16 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-opentelemetry-api -Version: 0.6b0 +Version: 0.17b0 Release: 0 Summary: OpenTelemetry Python API License: Apache-2.0 URL: https://github.com/open-telemetry/opentelemetry-python/tree/master/opentelemetry-api Source: https://files.pythonhosted.org/packages/source/o/opentelemetry-api/opentelemetry-api-%{version}.tar.gz -# https://github.com/open-telemetry/opentelemetry-python/pull/557 -Source98: tests.tar.bz2 -# https://github.com/open-telemetry/opentelemetry-python/issues/473 -Source99: https://raw.githubusercontent.com/open-telemetry/opentelemetry-python/master/LICENSE +BuildRequires: %{python_module aiocontextvars} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros @@ -43,8 +40,7 @@ BuildRequires: %{python_module pytest} OpenTelemetry Python API %prep -%setup -q -n opentelemetry-api-%{version} -a98 -cp %{SOURCE99} . +%setup -q -n opentelemetry-api-%{version} %build %python_build @@ -54,10 +50,7 @@ cp %{SOURCE99} . %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -# test_environment_variables and test_getattr erroring, -# let us see whether they got fixed via github PR referenced -# above (in next version) -%pytest -k 'not (test_getattr or test_environment_variables)' +%pytest %files %{python_files} %doc README.rst diff --git a/tests.tar.bz2 b/tests.tar.bz2 deleted file mode 100644 index 6d5892b..0000000 --- a/tests.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c83e3dcf22e1b4fef74baeb02a4dbbd330b8483469284c8813f55ca50445fb46 -size 8675 From 4ffe617353e2040d47f06352507af01d847d9f1e80de5b2a5d705f444167d439 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 22 Jan 2021 13:49:20 +0000 Subject: [PATCH 2/2] Accepting request 866014 from home:bnavigator:branches:devel:languages:python - aiocontextvars is only needed for older Python 3.6. Python 3.7 and beyond provide everything in stdlib contextvars. See upstreams' setup.cfg. Use rpm boolean dependencies to pull in aiocontextvars only for python36 if available (TW) or python3 if python3-base < 3.7 (Leap) OBS-URL: https://build.opensuse.org/request/show/866014 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-opentelemetry-api?expand=0&rev=9 --- python-opentelemetry-api.changes | 9 +++++++++ python-opentelemetry-api.spec | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/python-opentelemetry-api.changes b/python-opentelemetry-api.changes index e4d715b..67c9eb8 100644 --- a/python-opentelemetry-api.changes +++ b/python-opentelemetry-api.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Jan 22 13:40:17 UTC 2021 - Benjamin Greiner + +- aiocontextvars is only needed for older Python 3.6. Python 3.7 + and beyond provide everything in stdlib contextvars. See + upstreams' setup.cfg. Use rpm boolean dependencies to pull in + aiocontextvars only for python36 if available (TW) or python3 if + python3-base < 3.7 (Leap) + ------------------------------------------------------------------- Fri Jan 22 11:39:19 UTC 2021 - John Paul Adrian Glaubitz diff --git a/python-opentelemetry-api.spec b/python-opentelemetry-api.spec index 12aecb1..04ff446 100644 --- a/python-opentelemetry-api.spec +++ b/python-opentelemetry-api.spec @@ -25,12 +25,15 @@ Summary: OpenTelemetry Python API License: Apache-2.0 URL: https://github.com/open-telemetry/opentelemetry-python/tree/master/opentelemetry-api Source: https://files.pythonhosted.org/packages/source/o/opentelemetry-api/opentelemetry-api-%{version}.tar.gz -BuildRequires: %{python_module aiocontextvars} BuildRequires: %{python_module setuptools} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: ((python3-aiocontextvars and python3-base < 3.7) or (python36-aiocontextvars and python36-base)) BuildArch: noarch Requires: python-setuptools +%if %{python_version_nodots} < 37 +Requires: python-aiocontextvars +%endif # SECTION test requirements BuildRequires: %{python_module pytest} # /SECTION