diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1845614ede..3a5cffeaa6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 2ac247e8b666c6b5a735719ab78dc0cd94907d9b + CORE_REPO_SHA: 8ea980d33af22e58385a71ee798795d80a1e8c8c jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index f5387851ee..0115340375 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,9 @@ 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-contrib/compare/v0.200...HEAD) +## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.2.0-0.21b0...HEAD) +## [0.21b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.2.0-0.21b0) - 2021-05-11 ### Changed - `opentelemetry-propagator-ot-trace` Use `TraceFlags` object in `extract` diff --git a/_template/setup.cfg b/_template/setup.cfg index d9536870c4..a05ddfb892 100644 --- a/_template/setup.cfg +++ b/_template/setup.cfg @@ -45,7 +45,7 @@ package_dir= packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 + opentelemetry-api == 1.2.0 [options.extras_require] test = diff --git a/_template/version.py b/_template/version.py index 2b08175266..df84e5962e 100644 --- a/_template/version.py +++ b/_template/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/eachdist.ini b/eachdist.ini index 65e6fc501e..6c4927ca5a 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -16,6 +16,32 @@ sortfirst= exporter/* ext/* +[stable] +version=1.2.0 + +packages= + opentelemetry-sdk + opentelemetry-proto + propagator/opentelemetry-propagator-jaeger + propagator/opentelemetry-propagator-b3 + exporter/opentelemetry-exporter-zipkin-proto-http + exporter/opentelemetry-exporter-zipkin-json + exporter/opentelemetry-exporter-zipkin + exporter/opentelemetry-exporter-otlp-proto-grpc + exporter/opentelemetry-exporter-otlp + exporter/opentelemetry-exporter-jaeger-thrift + exporter/opentelemetry-exporter-jaeger-proto-grpc + exporter/opentelemetry-exporter-jaeger + opentelemetry-api + +[prerelease] +version=0.21b0 + +packages= + all + opentelemetry-semantic-conventions + opentelemetry-test + [lintroots] extraroots=examples/*,scripts/ subglob=*.py,tests/,test/,src/*,examples/* diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index ee35b555c4..ff4b9d21d1 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -39,9 +39,9 @@ package_dir= packages=find_namespace: install_requires = ddtrace>=0.34.0,<0.47.0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-sdk == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-sdk == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py index 2b08175266..df84e5962e 100644 --- a/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py +++ b/exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index 809750e068..3a4feb1f10 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -38,9 +38,9 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 aiohttp ~= 3.0 wrapt >= 1.0.0, < 2.0.0 diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py index 0b40082f67..6474e480ef 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index 806b0b3882..93d4c001f5 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -38,16 +38,16 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation-dbapi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation-dbapi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 aiopg >= 0.13.0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py +++ b/instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index a112d2e228..b348081f2e 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 asgiref ~= 3.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py +++ b/instrumentation/opentelemetry-instrumentation-asgi/src/opentelemetry/instrumentation/asgi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index e0326f90f7..6b14fa7135 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 asyncpg >= 0.12.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/src/opentelemetry/instrumentation/asyncpg/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index 5a3a7f0b7b..74456724aa 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -39,16 +39,16 @@ package_dir= packages=find_namespace: install_requires = boto ~= 2.0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-instrumentation-botocore == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-instrumentation-botocore == 0.21b0 [options.extras_require] test = boto~=2.0 moto~=1.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py +++ b/instrumentation/opentelemetry-instrumentation-boto/src/opentelemetry/instrumentation/boto/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index 45cb5fa4d5..8d7823d0bd 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -39,14 +39,14 @@ package_dir= packages=find_namespace: install_requires = botocore ~= 1.0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 [options.extras_require] test = moto ~= 1.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py +++ b/instrumentation/opentelemetry-instrumentation-botocore/src/opentelemetry/instrumentation/botocore/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index f22f07adaa..f159e523e6 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -39,15 +39,15 @@ package_dir= packages=find_namespace: install_requires = celery >= 4.0, < 6.0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 [options.extras_require] test = pytest celery >= 4.0, < 6.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py +++ b/instrumentation/opentelemetry-instrumentation-celery/src/opentelemetry/instrumentation/celery/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index ee3e8bd27c..10112ea093 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index ac7eca0896..13b3f727d9 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -39,15 +39,15 @@ package_dir= packages=find_namespace: install_requires = django >= 1.10 - opentelemetry-util-http == 0.21.dev0 - opentelemetry-instrumentation-wsgi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 + opentelemetry-util-http == 0.21b0 + opentelemetry-instrumentation-wsgi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py +++ b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index e8564d69e7..98bb4593e6 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 wrapt >= 1.0.0, < 2.0.0 elasticsearch >= 2.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 elasticsearch-dsl >= 2.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/src/opentelemetry/instrumentation/elasticsearch/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index af88e821dc..58b5e26a7b 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -40,16 +40,16 @@ package_dir= packages=find_namespace: install_requires = falcon ~= 2.0 - opentelemetry-instrumentation-wsgi == 0.21.dev0 - opentelemetry-util-http == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 + opentelemetry-instrumentation-wsgi == 0.21b0 + opentelemetry-util-http == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 [options.extras_require] test = falcon ~= 2.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 parameterized == 0.7.4 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py +++ b/instrumentation/opentelemetry-instrumentation-falcon/src/opentelemetry/instrumentation/falcon/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg index 7f3ab92c0b..2b0e0ad2d8 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg @@ -38,11 +38,11 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-instrumentation-asgi == 0.21.dev0 - opentelemetry-util-http == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-instrumentation-asgi == 0.21b0 + opentelemetry-util-http == 0.21b0 [options.entry_points] opentelemetry_instrumentor = @@ -50,7 +50,7 @@ opentelemetry_instrumentor = [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 fastapi ~= 0.58.1 requests ~= 2.23.0 # needed for testclient diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py b/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py +++ b/instrumentation/opentelemetry-instrumentation-fastapi/src/opentelemetry/instrumentation/fastapi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 6b6fe2bd69..8ad8f6bdbc 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -39,16 +39,16 @@ package_dir= packages=find_namespace: install_requires = flask ~= 1.0 - opentelemetry-util-http == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-instrumentation-wsgi == 0.21.dev0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 + opentelemetry-util-http == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-instrumentation-wsgi == 0.21b0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 [options.extras_require] test = flask~=1.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.entry_points] opentelemetry_instrumentor = diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index 3bfdf614d2..796f31c836 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -38,17 +38,17 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-sdk == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-sdk == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 grpcio ~= 1.27 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 - opentelemetry-sdk == 1.2.0.dev0 + opentelemetry-test == 0.21b0 + opentelemetry-sdk == 1.2.0 protobuf >= 3.13.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py +++ b/instrumentation/opentelemetry-instrumentation-grpc/src/opentelemetry/instrumentation/grpc/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index 4147b5d07a..f14fffe685 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -37,14 +37,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation == 0.21b0 jinja2~=2.7 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py +++ b/instrumentation/opentelemetry-instrumentation-jinja2/src/opentelemetry/instrumentation/jinja2/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index 02d5ff7e0f..bf63fbaed8 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -37,12 +37,12 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation == 0.21b0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py b/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py +++ b/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index 18759c8651..42313bc4dd 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation-dbapi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation-dbapi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 mysql-connector-python ~= 8.0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py +++ b/instrumentation/opentelemetry-instrumentation-mysql/src/opentelemetry/instrumentation/mysql/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index 79f2f795cb..bf5b230323 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation-dbapi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation-dbapi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 psycopg2-binary >= 2.7.3.1 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/src/opentelemetry/instrumentation/psycopg2/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index a5937d9097..55c409dbfd 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 pymemcache ~= 1.3 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/src/opentelemetry/instrumentation/pymemcache/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index c0cab48390..958cf23d8d 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 pymongo ~= 3.1 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py +++ b/instrumentation/opentelemetry-instrumentation-pymongo/src/opentelemetry/instrumentation/pymongo/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index 726e606c5a..2fb2848e71 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation-dbapi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation-dbapi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 PyMySQL ~= 0.10.1 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py +++ b/instrumentation/opentelemetry-instrumentation-pymysql/src/opentelemetry/instrumentation/pymysql/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index e9870d64e7..1fef692d3d 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -39,17 +39,17 @@ package_dir= packages=find_namespace: install_requires = pyramid >= 1.7 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation-wsgi == 0.21.dev0 - opentelemetry-util-http == 0.21.dev0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation-wsgi == 0.21b0 + opentelemetry-util-http == 0.21b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = werkzeug == 0.16.1 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py +++ b/instrumentation/opentelemetry-instrumentation-pyramid/src/opentelemetry/instrumentation/pyramid/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index 31e90b37dc..a677c39919 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -38,16 +38,16 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 redis >= 2.6 wrapt >= 1.12.1 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 - opentelemetry-sdk == 1.2.0.dev0 + opentelemetry-test == 0.21b0 + opentelemetry-sdk == 1.2.0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py +++ b/instrumentation/opentelemetry-instrumentation-redis/src/opentelemetry/instrumentation/redis/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index c49aa3342c..9680c88733 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 requests ~= 2.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 httpretty ~= 1.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py +++ b/instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index f95094ef9e..1264e346e0 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -38,13 +38,13 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation == 0.21b0 scikit-learn ~= 0.22.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py b/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py index 0b40082f67..6474e480ef 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py +++ b/instrumentation/opentelemetry-instrumentation-sklearn/src/opentelemetry/instrumentation/sklearn/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index 3b4998dc67..2abd3ebc36 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 wrapt >= 1.11.2 sqlalchemy [options.extras_require] test = - opentelemetry-sdk == 1.2.0.dev0 + opentelemetry-sdk == 1.2.0 pytest [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/src/opentelemetry/instrumentation/sqlalchemy/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index 8c55747284..8a774c608d 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -38,14 +38,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation-dbapi == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation-dbapi == 0.21b0 + opentelemetry-instrumentation == 0.21b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg index 59a4ea16e1..852b5eda25 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg @@ -38,11 +38,11 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-instrumentation-asgi == 0.21.dev0 - opentelemetry-util-http == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-instrumentation-asgi == 0.21b0 + opentelemetry-util-http == 0.21b0 [options.entry_points] opentelemetry_instrumentor = @@ -50,7 +50,7 @@ opentelemetry_instrumentor = [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 starlette ~= 0.13.0 requests ~= 2.23.0 # needed for testclient diff --git a/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py b/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py +++ b/instrumentation/opentelemetry-instrumentation-starlette/src/opentelemetry/instrumentation/starlette/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index 217aa6cf7c..4b39a676f5 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -38,15 +38,15 @@ package_dir= packages=find_namespace: install_requires = tornado >= 6.0 - opentelemetry-instrumentation == 0.21.dev0 - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-util-http == 0.21.dev0 + opentelemetry-instrumentation == 0.21b0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-util-http == 0.21b0 [options.extras_require] test = tornado >= 6.0 - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.entry_points] opentelemetry_instrumentor = diff --git a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py +++ b/instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index 35ae810db1..eb3ec1a778 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -38,13 +38,13 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 httpretty ~= 1.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py +++ b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg index f2051cfcd9..316f8bea62 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg @@ -38,15 +38,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 urllib3 >= 1.0.0, < 2.0.0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 httpretty ~= 1.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py +++ b/instrumentation/opentelemetry-instrumentation-urllib3/src/opentelemetry/instrumentation/urllib3/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index 9d1f47e453..6c494b4ac5 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -38,13 +38,13 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-semantic-conventions == 0.21.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-semantic-conventions == 0.21b0 + opentelemetry-instrumentation == 0.21b0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py index 2b08175266..df84e5962e 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py +++ b/instrumentation/opentelemetry-instrumentation-wsgi/src/opentelemetry/instrumentation/wsgi/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/opentelemetry-instrumentation/setup.cfg b/opentelemetry-instrumentation/setup.cfg index 382e5725b0..b0a66c529e 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 == 1.2.0.dev0 + opentelemetry-api == 1.2.0 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 2b08175266..df84e5962e 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.21.dev0" +__version__ = "0.21b0" diff --git a/propagator/opentelemetry-propagator-ot-trace/setup.cfg b/propagator/opentelemetry-propagator-ot-trace/setup.cfg index 5cc1d98b34..f4571ae08b 100644 --- a/propagator/opentelemetry-propagator-ot-trace/setup.cfg +++ b/propagator/opentelemetry-propagator-ot-trace/setup.cfg @@ -38,8 +38,8 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-sdk == 1.2.0.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-sdk == 1.2.0 [options.packages.find] where = src diff --git a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py index 2b08175266..df84e5962e 100644 --- a/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py +++ b/propagator/opentelemetry-propagator-ot-trace/src/opentelemetry/propagators/ot_trace/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/scripts/eachdist.py b/scripts/eachdist.py index 8426d6f61c..68411f2728 100755 --- a/scripts/eachdist.py +++ b/scripts/eachdist.py @@ -229,10 +229,11 @@ def setup_instparser(instparser): ) releaseparser = subparsers.add_parser( - "release", help="Prepares release, used by maintainers and CI", + "update_versions", + help="Updates version numbers, used by maintainers and CI", ) releaseparser.set_defaults(func=release_args) - releaseparser.add_argument("--version", required=True) + releaseparser.add_argument("--versions", required=True) releaseparser.add_argument( "releaseargs", nargs=argparse.REMAINDER, help=extraargs_help("pytest") ) @@ -247,6 +248,20 @@ def setup_instparser(instparser): help="Format only this path instead of entire repository", ) + versionparser = subparsers.add_parser( + "version", help="Get the version for a release", + ) + versionparser.set_defaults(func=version_args) + versionparser.add_argument( + "--mode", + "-m", + default="DEFAULT", + help=cleandoc( + """Section of config file to use for target selection configuration. + See description of exec for available options.""" + ), + ) + return parser.parse_args(args) @@ -353,7 +368,7 @@ def runsubprocess(dry_run, params, *args, **kwargs): check = kwargs.pop("check") # Enforce specifying check - print(">>>", cmdstr, file=sys.stderr) + print(">>>", cmdstr, file=sys.stderr, flush=True) # This is a workaround for subprocess.run(['python']) leaving the virtualenv on Win32. # The cause for this is that when running the python.exe in a virtualenv, @@ -366,7 +381,7 @@ def runsubprocess(dry_run, params, *args, **kwargs): # Only this would find the "correct" python.exe. params = list(params) - executable = shutil.which(params[0]) # On Win32, pytho + executable = shutil.which(params[0]) if executable: params[0] = executable try: @@ -532,13 +547,13 @@ def update_changelog(path, version, new_entry): try: with open(path) as changelog: text = changelog.read() - if "## Version {}".format(version) in text: + if "## [{}]".format(version) in text: raise AttributeError( "{} already contans version {}".format(path, version) ) with open(path) as changelog: for line in changelog: - if line.startswith("## Unreleased"): + if line.startswith("## [Unreleased]"): unreleased_changes = False elif line.startswith("## "): break @@ -551,26 +566,26 @@ def update_changelog(path, version, new_entry): if unreleased_changes: print("updating: {}".format(path)) - text = re.sub("## Unreleased", new_entry, text) + text = re.sub(r"## \[Unreleased\].*", new_entry, text) with open(path, "w") as changelog: changelog.write(text) -def update_changelogs(targets, version): - print("updating CHANGELOG") +def update_changelogs(version): today = datetime.now().strftime("%Y-%m-%d") - new_entry = "## Unreleased\n\n## Version {}\n\nReleased {}".format( - version, today + new_entry = """## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v{version}...HEAD) + +## [{version}](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v{version}) - {today} + +""".format( + version=version, today=today ) errors = False - for target in targets: - try: - update_changelog( - "{}/CHANGELOG.md".format(target), version, new_entry - ) - except Exception as err: # pylint: disable=broad-except - print(str(err)) - errors = True + try: + update_changelog("./CHANGELOG.md", version, new_entry) + except Exception as err: # pylint: disable=broad-except + print(str(err)) + errors = True if errors: sys.exit(1) @@ -583,29 +598,47 @@ def find(name, path): return None -def update_version_files(targets, version): +def filter_packages(targets, packages): + if not packages: + return targets + filtered_packages = [] + for target in targets: + for pkg in packages: + if str(pkg) in str(target): + filtered_packages.append(target) + break + return filtered_packages + + +def update_version_files(targets, version, packages): print("updating version.py files") + targets = filter_packages(targets, packages) update_files( targets, - version, "version.py", "__version__ .*", '__version__ = "{}"'.format(version), ) -def update_dependencies(targets, version): +def update_dependencies(targets, version, packages): print("updating dependencies") - update_files( - targets, - version, - "setup.cfg", - r"(opentelemetry-.*)==(.*)", - r"\1== " + version, - ) + if "all" in packages: + packages.extend(targets) + for pkg in packages: + print(pkg) + package_name = str(pkg).split("/")[-1] + print(package_name) + + update_files( + targets, + "setup.cfg", + r"({}.*)==(.*)".format(package_name), + r"\1== " + version, + ) -def update_files(targets, version, filename, search, replace): +def update_files(targets, filename, search, replace): errors = False for target in targets: curr_file = find(filename, target) @@ -616,9 +649,8 @@ def update_files(targets, version, filename, search, replace): with open(curr_file) as _file: text = _file.read() - if version in text: - print("{} already contans version {}".format(curr_file, version)) - errors = True + if replace in text: + print("{} already contains {}".format(curr_file, replace)) continue with open(curr_file, "w") as _file: @@ -633,10 +665,22 @@ def release_args(args): rootpath = find_projectroot() targets = list(find_targets_unordered(rootpath)) - version = args.version - update_dependencies(targets, version) - update_version_files(targets, version) - update_changelogs(targets, version) + cfg = ConfigParser() + cfg.read(str(find_projectroot() / "eachdist.ini")) + versions = args.versions + updated_versions = [] + for group in versions.split(","): + mcfg = cfg[group] + version = mcfg["version"] + updated_versions.append(version) + packages = None + if "packages" in mcfg: + packages = mcfg["packages"].split() + print("update {} packages to {}".format(group, version)) + update_dependencies(targets, version, packages) + update_version_files(targets, version, packages) + + update_changelogs("-".join(updated_versions)) def test_args(args): @@ -670,6 +714,12 @@ def format_args(args): ) +def version_args(args): + cfg = ConfigParser() + cfg.read(str(find_projectroot() / "eachdist.ini")) + print(cfg[args.mode]["version"]) + + def main(): args = parse_args() args.func(args) diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh index 2c1048a0e2..607b6189bb 100755 --- a/scripts/prepare_release.sh +++ b/scripts/prepare_release.sh @@ -1,4 +1,4 @@ -#!/bin/zsh +#!/bin/bash # # This script: # 1. parses the version number from the branch name @@ -11,30 +11,22 @@ # triggering unnecessary pull requests # -VERSION=`echo $1 | awk -F "/" '{print $NF}'` +VERSION=$(./scripts/eachdist.py version --mode stable)-$(./scripts/eachdist.py version --mode prerelease) echo "Using version ${VERSION}" -# check the version matches expected versioning e.g -# 0.6, 0.6b, 0.6b0, 0.6.0 -if [[ ! "${VERSION}" =~ ^([0-9])(\.*[0-9]{1,5}[a-b]*){1,3}$ ]]; then - echo "Version number invalid: $VERSION" - exit 1 -fi # create the release branch git checkout -b release/${VERSION} git push origin release/${VERSION} -# create a temporary branch to create a PR for updated version and changelogs -git checkout -b release/${VERSION}-auto -./scripts/eachdist.py release --version ${VERSION} +./scripts/eachdist.py update_versions --versions stable,prerelease rc=$? if [ $rc != 0 ]; then echo "::set-output name=version_updated::0" exit 0 fi -git add **/version.py **/setup.cfg **/CHANGELOG.md +git add . git commit -m "updating changelogs and version to ${VERSION}" diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg index 6cf0ef3206..f060b3bfb4 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg +++ b/sdk-extension/opentelemetry-sdk-extension-aws/setup.cfg @@ -38,7 +38,7 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 + opentelemetry-api == 1.2.0 [options.entry_points] opentelemetry_propagator = @@ -48,7 +48,7 @@ opentelemetry_id_generator = [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py index 2b08175266..df84e5962e 100644 --- a/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py +++ b/sdk-extension/opentelemetry-sdk-extension-aws/src/opentelemetry/sdk/extension/aws/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0" diff --git a/util/opentelemetry-util-http/setup.cfg b/util/opentelemetry-util-http/setup.cfg index 98b0e36e15..6170ca8d62 100644 --- a/util/opentelemetry-util-http/setup.cfg +++ b/util/opentelemetry-util-http/setup.cfg @@ -38,13 +38,13 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-api == 1.2.0.dev0 - opentelemetry-instrumentation == 0.21.dev0 + opentelemetry-api == 1.2.0 + opentelemetry-instrumentation == 0.21b0 asgiref ~= 3.0 [options.extras_require] test = - opentelemetry-test == 0.21.dev0 + opentelemetry-test == 0.21b0 [options.packages.find] where = src diff --git a/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py b/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py index 2b08175266..df84e5962e 100644 --- a/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py +++ b/util/opentelemetry-util-http/src/opentelemetry/util/http/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.21.dev0" +__version__ = "0.21b0"