From c5e6a7d48d22b76ac17ae07f107d2a4f7f3d974f Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 24 Nov 2020 09:08:33 -0800 Subject: [PATCH 1/4] updating changelogs and version to 0.16b0 --- .../error_handler_0/src/error_handler_0/version.py | 2 +- .../error_handler_1/src/error_handler_1/version.py | 2 +- .../src/opentelemetry/exporter/jaeger/version.py | 2 +- .../src/opentelemetry/exporter/opencensus/version.py | 2 +- .../src/opentelemetry/exporter/otlp/version.py | 2 +- .../src/opentelemetry/exporter/prometheus/version.py | 2 +- .../src/opentelemetry/exporter/zipkin/version.py | 2 +- .../opentelemetry/instrumentation/opentracing_shim/version.py | 2 +- opentelemetry-api/CHANGELOG.md | 4 ++++ opentelemetry-api/src/opentelemetry/version.py | 2 +- opentelemetry-instrumentation/CHANGELOG.md | 4 ++++ opentelemetry-instrumentation/setup.cfg | 2 +- .../src/opentelemetry/instrumentation/version.py | 2 +- opentelemetry-proto/CHANGELOG.md | 4 ++++ opentelemetry-proto/src/opentelemetry/proto/version.py | 2 +- opentelemetry-sdk/CHANGELOG.md | 4 ++++ opentelemetry-sdk/setup.cfg | 2 +- opentelemetry-sdk/src/opentelemetry/sdk/version.py | 2 +- tests/util/src/opentelemetry/test/version.py | 2 +- 19 files changed, 31 insertions(+), 15 deletions(-) diff --git a/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py b/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py +++ b/docs/examples/error_hander/error_handler_0/src/error_handler_0/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py b/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py +++ b/docs/examples/error_hander/error_handler_1/src/error_handler_1/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py index 7b04708d09a..55018c707ed 100644 --- a/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py +++ b/exporter/opentelemetry-exporter-jaeger/src/opentelemetry/exporter/jaeger/version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py +++ b/exporter/opentelemetry-exporter-opencensus/src/opentelemetry/exporter/opencensus/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py +++ b/exporter/opentelemetry-exporter-otlp/src/opentelemetry/exporter/otlp/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py +++ b/exporter/opentelemetry-exporter-prometheus/src/opentelemetry/exporter/prometheus/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py +++ b/exporter/opentelemetry-exporter-zipkin/src/opentelemetry/exporter/zipkin/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/src/opentelemetry/instrumentation/opentracing_shim/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/opentelemetry-api/CHANGELOG.md b/opentelemetry-api/CHANGELOG.md index a957b5e844f..7bd5c7f1b80 100644 --- a/opentelemetry-api/CHANGELOG.md +++ b/opentelemetry-api/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Add optional parameter to `record_exception` method ([#1314](https://github.com/open-telemetry/opentelemetry-python/pull/1314)) - Add pickle support to SpanContext class ([#1380](https://github.com/open-telemetry/opentelemetry-python/pull/1380)) diff --git a/opentelemetry-api/src/opentelemetry/version.py b/opentelemetry-api/src/opentelemetry/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/opentelemetry-api/src/opentelemetry/version.py +++ b/opentelemetry-api/src/opentelemetry/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/opentelemetry-instrumentation/CHANGELOG.md b/opentelemetry-instrumentation/CHANGELOG.md index 34366cb6b14..17a904c7ce0 100644 --- a/opentelemetry-instrumentation/CHANGELOG.md +++ b/opentelemetry-instrumentation/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Add IDs Generator as Configurable Property of Auto Instrumentation ([#1404](https://github.com/open-telemetry/opentelemetry-python/pull/1404)) - Added support for `OTEL_EXPORTER` to the `opentelemetry-instrument` command ([#1036](https://github.com/open-telemetry/opentelemetry-python/pull/1036)) diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index 6080af2526a..5e9151ce4df 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -41,7 +41,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 0.16.dev0 + opentelemetry-api == 0.16b0 wrapt >= 1.0.0, < 2.0.0 [options.packages.find] diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/opentelemetry-proto/CHANGELOG.md b/opentelemetry-proto/CHANGELOG.md index b8e1d48ce58..a6d905c34d2 100644 --- a/opentelemetry-proto/CHANGELOG.md +++ b/opentelemetry-proto/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Update protobuf versions ([#1356](https://github.com/open-telemetry/opentelemetry-python/pull/1356)) diff --git a/opentelemetry-proto/src/opentelemetry/proto/version.py b/opentelemetry-proto/src/opentelemetry/proto/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/opentelemetry-proto/src/opentelemetry/proto/version.py +++ b/opentelemetry-proto/src/opentelemetry/proto/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/opentelemetry-sdk/CHANGELOG.md b/opentelemetry-sdk/CHANGELOG.md index ffc04404ac5..7bfec73e055 100644 --- a/opentelemetry-sdk/CHANGELOG.md +++ b/opentelemetry-sdk/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Allow samplers to modify tracestate ([#1319](https://github.com/open-telemetry/opentelemetry-python/pull/1319)) - Add optional parameter to `record_exception` method diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg index d27a24cf491..4b51b159691 100644 --- a/opentelemetry-sdk/setup.cfg +++ b/opentelemetry-sdk/setup.cfg @@ -41,7 +41,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 0.16.dev0 + opentelemetry-api == 0.16b0 [options.packages.find] where = src diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version.py b/opentelemetry-sdk/src/opentelemetry/sdk/version.py index 1f98d44fa88..36c4f8c245b 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/version.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.16.dev0" +__version__ = "0.16b0" diff --git a/tests/util/src/opentelemetry/test/version.py b/tests/util/src/opentelemetry/test/version.py index 4c4951dcda1..39c7b8647db 100644 --- a/tests/util/src/opentelemetry/test/version.py +++ b/tests/util/src/opentelemetry/test/version.py @@ -1 +1 @@ -__version__ = "0.16.dev0" +__version__ = "0.16b0" From 5c392bad15cb374b412c1bdbb864c13e037b01ff Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 24 Nov 2020 09:08:55 -0800 Subject: [PATCH 2/4] adding setup/changelog files --- docs/examples/error_hander/error_handler_0/setup.cfg | 2 +- docs/examples/error_hander/error_handler_1/setup.cfg | 2 +- exporter/opentelemetry-exporter-jaeger/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-opencensus/CHANGELOG.md | 4 ++++ exporter/opentelemetry-exporter-opencensus/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-otlp/CHANGELOG.md | 4 ++++ exporter/opentelemetry-exporter-otlp/setup.cfg | 6 +++--- exporter/opentelemetry-exporter-prometheus/setup.cfg | 4 ++-- exporter/opentelemetry-exporter-zipkin/CHANGELOG.md | 4 ++++ exporter/opentelemetry-exporter-zipkin/setup.cfg | 4 ++-- .../setup.cfg | 4 ++-- tests/util/setup.cfg | 4 ++-- 12 files changed, 29 insertions(+), 17 deletions(-) diff --git a/docs/examples/error_hander/error_handler_0/setup.cfg b/docs/examples/error_hander/error_handler_0/setup.cfg index 3ea84d43d80..2d0a816d8ba 100644 --- a/docs/examples/error_hander/error_handler_0/setup.cfg +++ b/docs/examples/error_hander/error_handler_0/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 0.16.dev0 + opentelemetry-sdk == 0.16b0 [options.packages.find] where = src diff --git a/docs/examples/error_hander/error_handler_1/setup.cfg b/docs/examples/error_hander/error_handler_1/setup.cfg index 6b9ab21e4b4..3e73a13cd42 100644 --- a/docs/examples/error_hander/error_handler_1/setup.cfg +++ b/docs/examples/error_hander/error_handler_1/setup.cfg @@ -36,7 +36,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 0.16.dev0 + opentelemetry-sdk == 0.16b0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg index 66d0d61cbbd..f860236eb28 100644 --- a/exporter/opentelemetry-exporter-jaeger/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger/setup.cfg @@ -40,8 +40,8 @@ package_dir= packages=find_namespace: install_requires = thrift >= 0.10.0 - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md index 33a182a3fd6..add2c275805 100644 --- a/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-opencensus/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Update protobuf versions ([#1356](https://github.com/open-telemetry/opentelemetry-python/pull/1356)) diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg index ad470e2b191..069f5883202 100644 --- a/exporter/opentelemetry-exporter-opencensus/setup.cfg +++ b/exporter/opentelemetry-exporter-opencensus/setup.cfg @@ -41,8 +41,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 opencensus-proto >= 0.1.0, < 1.0.0 - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 protobuf >= 3.13.0 [options.packages.find] diff --git a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md index e467d8f78e9..8b1f50ee3ca 100644 --- a/exporter/opentelemetry-exporter-otlp/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-otlp/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Change temporality for Counter and UpDownCounter ([#1384](https://github.com/open-telemetry/opentelemetry-python/pull/1384)) - Add Gzip compression for exporter diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg index 7ba1b5c1f9f..ae80d0311a6 100644 --- a/exporter/opentelemetry-exporter-otlp/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp/setup.cfg @@ -41,9 +41,9 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52.0 - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 - opentelemetry-proto == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 + opentelemetry-proto == 0.16b0 backoff ~= 1.10.0 [options.extras_require] diff --git a/exporter/opentelemetry-exporter-prometheus/setup.cfg b/exporter/opentelemetry-exporter-prometheus/setup.cfg index 540f9fcc9ed..56d0f7f0155 100644 --- a/exporter/opentelemetry-exporter-prometheus/setup.cfg +++ b/exporter/opentelemetry-exporter-prometheus/setup.cfg @@ -40,8 +40,8 @@ package_dir= packages=find_namespace: install_requires = prometheus_client >= 0.5.0, < 1.0.0 - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md index 972096a8ef9..0dc580fb78b 100644 --- a/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md +++ b/exporter/opentelemetry-exporter-zipkin/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.16b0 + +Released 2020-11-24 + - Support for v2 api protobuf format ([#1318](https://github.com/open-telemetry/opentelemetry-python/pull/1318)) ## Version 0.14b0 diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg index 1803eac14e8..35a01719f97 100644 --- a/exporter/opentelemetry-exporter-zipkin/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin/setup.cfg @@ -41,8 +41,8 @@ packages=find_namespace: install_requires = protobuf >= 3.12 requests ~= 2.7 - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg index 33cad7b9351..698b1d83da2 100644 --- a/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-opentracing-shim/setup.cfg @@ -41,11 +41,11 @@ packages=find_namespace: install_requires = Deprecated >= 1.2.6 opentracing ~= 2.0 - opentelemetry-api == 0.16.dev0 + opentelemetry-api == 0.16b0 [options.extras_require] test = - opentelemetry-test == 0.16.dev0 + opentelemetry-test == 0.16b0 opentracing ~= 2.2.0 [options.packages.find] diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg index 6d261009635..4c48b46302c 100644 --- a/tests/util/setup.cfg +++ b/tests/util/setup.cfg @@ -37,8 +37,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 0.16.dev0 - opentelemetry-sdk == 0.16.dev0 + opentelemetry-api == 0.16b0 + opentelemetry-sdk == 0.16b0 [options.extras_require] test = flask~=1.0 From 776de5f4f654dc0ee8bba2f7fe74f082d8c6487d Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 24 Nov 2020 09:10:01 -0800 Subject: [PATCH 3/4] updating contrib SHA --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b54c1841a1a..41dd19c934a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: master + CONTRIB_REPO_SHA: 10c0c107bf0a9f444a09c4a74675bb2f33666c37 jobs: build: From e3a46ebfbfd756eb21b4bd0f1b5e3f57a9148ba1 Mon Sep 17 00:00:00 2001 From: Alex Boten Date: Tue, 24 Nov 2020 13:40:16 -0800 Subject: [PATCH 4/4] update contrib SHA --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 41dd19c934a..f0533cdbc39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ env: # Otherwise, set variable to the commit of your branch on # opentelemetry-python-contrib which is compatible with these Core repo # changes. - CONTRIB_REPO_SHA: 10c0c107bf0a9f444a09c4a74675bb2f33666c37 + CONTRIB_REPO_SHA: 6e083efa3d603f7ce6a448f35605fce9411d1154 jobs: build: