diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b60727d00d..8edc60a529 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: 370afa618c30a9773b0594c2ea469518c8b2c274 + CONTRIB_REPO_SHA: a8de87379a6930246ee5f2bf25efe19e147357cf jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index a655af87e4..bcb8d65d4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.0.0rc1...HEAD) +## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v0.18b0...HEAD) + +## [0.18b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v0.18b0) - 2021-02-16 + +### Added +- Add urllib to opentelemetry-bootstrap target list + ([#1584])(https://github.com/open-telemetry/opentelemetry-python/pull/1584) ## [1.0.0rc1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.0.0rc1) - 2021-02-12 diff --git a/docs/examples/error_handler/error_handler_0/setup.cfg b/docs/examples/error_handler/error_handler_0/setup.cfg index b26c9d57a1..192e5994b0 100644 --- a/docs/examples/error_handler/error_handler_0/setup.cfg +++ b/docs/examples/error_handler/error_handler_0/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-sdk == 1.0.0rc1 [options.packages.find] where = src diff --git a/docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py b/docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py index ebb75f6c11..dfe19a5f33 100644 --- a/docs/examples/error_handler/error_handler_0/src/error_handler_0/version.py +++ b/docs/examples/error_handler/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.18.dev0" +__version__ = "0.18b0" diff --git a/docs/examples/error_handler/error_handler_1/setup.cfg b/docs/examples/error_handler/error_handler_1/setup.cfg index f24ed6bd0d..09609aa3a4 100644 --- a/docs/examples/error_handler/error_handler_1/setup.cfg +++ b/docs/examples/error_handler/error_handler_1/setup.cfg @@ -37,7 +37,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-sdk == 1.0.0rc1 [options.packages.find] where = src diff --git a/docs/examples/error_handler/error_handler_1/src/error_handler_1/version.py b/docs/examples/error_handler/error_handler_1/src/error_handler_1/version.py index ebb75f6c11..dfe19a5f33 100644 --- a/docs/examples/error_handler/error_handler_1/src/error_handler_1/version.py +++ b/docs/examples/error_handler/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.18.dev0" +__version__ = "0.18b0" diff --git a/exporter/opentelemetry-exporter-jaeger/setup.cfg b/exporter/opentelemetry-exporter-jaeger/setup.cfg index 02dbd4597c..30fc15b1f1 100644 --- a/exporter/opentelemetry-exporter-jaeger/setup.cfg +++ b/exporter/opentelemetry-exporter-jaeger/setup.cfg @@ -42,8 +42,8 @@ install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52.0 thrift >= 0.10.0 - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-opencensus/setup.cfg b/exporter/opentelemetry-exporter-opencensus/setup.cfg index b10fbe2f04..fa49b0e428 100644 --- a/exporter/opentelemetry-exporter-opencensus/setup.cfg +++ b/exporter/opentelemetry-exporter-opencensus/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 opencensus-proto >= 0.1.0, < 1.0.0 - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 protobuf >= 3.13.0 [options.packages.find] 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 ebb75f6c11..dfe19a5f33 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.18.dev0" +__version__ = "0.18b0" diff --git a/exporter/opentelemetry-exporter-otlp/setup.cfg b/exporter/opentelemetry-exporter-otlp/setup.cfg index 612529ff3e..a5547be3d6 100644 --- a/exporter/opentelemetry-exporter-otlp/setup.cfg +++ b/exporter/opentelemetry-exporter-otlp/setup.cfg @@ -42,9 +42,9 @@ packages=find_namespace: install_requires = grpcio >= 1.0.0, < 2.0.0 googleapis-common-protos ~= 1.52.0 - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 - opentelemetry-proto == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 + opentelemetry-proto == 1.0.0rc1 backoff ~= 1.10.0 [options.extras_require] 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 e4529dffc6..9c1fd38d1b 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__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/exporter/opentelemetry-exporter-zipkin/setup.cfg b/exporter/opentelemetry-exporter-zipkin/setup.cfg index 58cad78612..ab9cce6d55 100644 --- a/exporter/opentelemetry-exporter-zipkin/setup.cfg +++ b/exporter/opentelemetry-exporter-zipkin/setup.cfg @@ -42,8 +42,8 @@ packages=find_namespace: install_requires = protobuf >= 3.12 requests ~= 2.7 - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 [options.packages.find] where = src 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 e4529dffc6..9c1fd38d1b 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__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/opentelemetry-api/src/opentelemetry/version.py b/opentelemetry-api/src/opentelemetry/version.py index e4529dffc6..9c1fd38d1b 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__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index 41eeda5d70..09490ea710 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -41,8 +41,8 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 [options.packages.find] where = src @@ -56,4 +56,4 @@ opentelemetry_configurator = [options.extras_require] test = otlp = - opentelemetry-exporter-otlp == 1.0.0.dev0 + opentelemetry-exporter-otlp == 1.0.0rc1 diff --git a/opentelemetry-distro/src/opentelemetry/distro/version.py b/opentelemetry-distro/src/opentelemetry/distro/version.py index ebb75f6c11..dfe19a5f33 100644 --- a/opentelemetry-distro/src/opentelemetry/distro/version.py +++ b/opentelemetry-distro/src/opentelemetry/distro/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.18.dev0" +__version__ = "0.18b0" diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index db8c4675be..93745e5044 100644 --- a/opentelemetry-instrumentation/setup.cfg +++ b/opentelemetry-instrumentation/setup.cfg @@ -42,7 +42,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 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 ebb75f6c11..dfe19a5f33 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.18.dev0" +__version__ = "0.18b0" diff --git a/opentelemetry-proto/src/opentelemetry/proto/version.py b/opentelemetry-proto/src/opentelemetry/proto/version.py index e4529dffc6..9c1fd38d1b 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__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/opentelemetry-sdk/setup.cfg b/opentelemetry-sdk/setup.cfg index 231b715980..d81c7e93c1 100644 --- a/opentelemetry-sdk/setup.cfg +++ b/opentelemetry-sdk/setup.cfg @@ -42,7 +42,7 @@ packages=find_namespace: zip_safe = False include_package_data = True install_requires = - opentelemetry-api == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 [options.packages.find] where = src diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py index 39f34e961e..e3f489706f 100644 --- a/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py +++ b/opentelemetry-sdk/src/opentelemetry/sdk/trace/__init__.py @@ -122,6 +122,8 @@ def force_flush(self, timeout_millis: int = 30000) -> bool: """ +# Temporary fix until https://github.com/PyCQA/pylint/issues/4098 is resolved +# pylint:disable=no-member class SynchronousMultiSpanProcessor(SpanProcessor): """Implementation of class:`SpanProcessor` that forwards all received events to a list of span processors sequentially. diff --git a/opentelemetry-sdk/src/opentelemetry/sdk/version.py b/opentelemetry-sdk/src/opentelemetry/sdk/version.py index e4529dffc6..9c1fd38d1b 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__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/propagator/opentelemetry-propagator-b3/setup.cfg b/propagator/opentelemetry-propagator-b3/setup.cfg index 8062d85339..c08bc882f0 100644 --- a/propagator/opentelemetry-propagator-b3/setup.cfg +++ b/propagator/opentelemetry-propagator-b3/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 [options.extras_require] test = diff --git a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py index e4529dffc6..9c1fd38d1b 100644 --- a/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py +++ b/propagator/opentelemetry-propagator-b3/src/opentelemetry/propagators/b3/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/propagator/opentelemetry-propagator-jaeger/setup.cfg b/propagator/opentelemetry-propagator-jaeger/setup.cfg index b24569100f..fbde36d057 100644 --- a/propagator/opentelemetry-propagator-jaeger/setup.cfg +++ b/propagator/opentelemetry-propagator-jaeger/setup.cfg @@ -40,7 +40,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 [options.extras_require] test = diff --git a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py index e4529dffc6..9c1fd38d1b 100644 --- a/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py +++ b/propagator/opentelemetry-propagator-jaeger/src/opentelemetry/propagators/jaeger/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "1.0.0.dev0" +__version__ = "1.0.0rc1" diff --git a/scripts/build.sh b/scripts/build.sh index 53a9fa6eef..0dbd225fdf 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/ opentelemetry-distro/ exporter/*/ shim/*/ propagator/*/; do + for d in opentelemetry-instrumentation/ opentelemetry-distro/ exporter/opentelemetry-exporter-opencensus shim/*/ ; do ( echo "building $d" cd "$d" diff --git a/shim/opentelemetry-opentracing-shim/setup.cfg b/shim/opentelemetry-opentracing-shim/setup.cfg index f7a06ea35d..b065dd135b 100644 --- a/shim/opentelemetry-opentracing-shim/setup.cfg +++ b/shim/opentelemetry-opentracing-shim/setup.cfg @@ -42,11 +42,11 @@ packages=find_namespace: install_requires = Deprecated >= 1.2.6 opentracing ~= 2.0 - opentelemetry-api == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 [options.extras_require] test = - opentelemetry-test == 0.18.dev0 + opentelemetry-test == 0.18b0 opentracing ~= 2.2.0 [options.packages.find] diff --git a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py index ebb75f6c11..dfe19a5f33 100644 --- a/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py +++ b/shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.18.dev0" +__version__ = "0.18b0" diff --git a/tests/util/setup.cfg b/tests/util/setup.cfg index 94333459ab..f8b2bc47b6 100644 --- a/tests/util/setup.cfg +++ b/tests/util/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.0.0.dev0 - opentelemetry-sdk == 1.0.0.dev0 + opentelemetry-api == 1.0.0rc1 + opentelemetry-sdk == 1.0.0rc1 [options.extras_require] test = flask~=1.0 diff --git a/tests/util/src/opentelemetry/test/version.py b/tests/util/src/opentelemetry/test/version.py index b34d984ac9..3dce336fa2 100644 --- a/tests/util/src/opentelemetry/test/version.py +++ b/tests/util/src/opentelemetry/test/version.py @@ -1 +1 @@ -__version__ = "0.18.dev0" +__version__ = "0.18b0"