From 07f81461df3e87da0495475d79eed415f3698634 Mon Sep 17 00:00:00 2001 From: Jakub Wach Date: Tue, 14 Dec 2021 13:36:36 +0100 Subject: [PATCH 1/3] lambda instrumentation - support for flush timeout (#825) * lambda instrumentation - support for flush timeout * Update instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py Co-authored-by: (Eliseo) Nathaniel Ruiz Nowell * Update instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py Co-authored-by: (Eliseo) Nathaniel Ruiz Nowell * fixing lint * fixing django lint Co-authored-by: (Eliseo) Nathaniel Ruiz Nowell --- CHANGELOG.md | 4 +++ .../instrumentation/aws_lambda/__init__.py | 19 ++++++++++++- .../test_aws_lambda_instrumentation_manual.py | 28 +++++++++++++++++++ .../instrumentation/django/middleware.py | 1 - .../tests/test_middleware.py | 2 ++ .../tests/test_middleware_asgi.py | 2 ++ 6 files changed, 54 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46f42fd58b..bf61ce8925 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.7.0-0.26b0...HEAD) +### Added + +- `opentelemetry-instrumentation-aws-lambda` Adds support for configurable flush timeout via `OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT` property. ([#825](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/825)) + ### Fixed - `opentelemetry-exporter-richconsole` Fixed attribute error on parentless spans. diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py index 2df4359a65..951f27dd44 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/__init__.py @@ -97,6 +97,9 @@ def custom_event_context_extractor(lambda_event): _HANDLER = "_HANDLER" _X_AMZN_TRACE_ID = "_X_AMZN_TRACE_ID" ORIG_HANDLER = "ORIG_HANDLER" +OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT = ( + "OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT" +) def _default_event_context_extractor(lambda_event: Any) -> Context: @@ -167,6 +170,7 @@ def _determine_parent_context( def _instrument( wrapped_module_name, wrapped_function_name, + flush_timeout, event_context_extractor: Callable[[Any], Context], tracer_provider: TracerProvider = None, ): @@ -222,7 +226,7 @@ def _instrumented_lambda_handler_call( # NOTE: `force_flush` before function quit in case of Lambda freeze. # Assumes we are using the OpenTelemetry SDK implementation of the # `TracerProvider`. - _tracer_provider.force_flush() + _tracer_provider.force_flush(flush_timeout) except Exception: # pylint: disable=broad-except logger.error( "TracerProvider was missing `force_flush` method. This is necessary in case of a Lambda freeze and would exist in the OTel SDK implementation." @@ -262,9 +266,22 @@ def _instrument(self, **kwargs): self._wrapped_function_name, ) = lambda_handler.rsplit(".", 1) + flush_timeout_env = os.environ.get( + OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT, "" + ) + flush_timeout = 30000 + try: + flush_timeout = int(flush_timeout_env) + except ValueError: + logger.warning( + "Could not convert OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT value %s to int", + flush_timeout_env, + ) + _instrument( self._wrapped_module_name, self._wrapped_function_name, + flush_timeout, event_context_extractor=kwargs.get( "event_context_extractor", _default_event_context_extractor ), diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py index 270925e2f1..c2d7d71689 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/tests/test_aws_lambda_instrumentation_manual.py @@ -19,6 +19,7 @@ from opentelemetry.instrumentation.aws_lambda import ( _HANDLER, _X_AMZN_TRACE_ID, + OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT, AwsLambdaInstrumentor, ) from opentelemetry.propagate import get_global_textmap @@ -246,3 +247,30 @@ def custom_event_context_extractor(lambda_event): self.assertTrue(parent_context.is_remote) test_env_patch.stop() + + def test_lambda_no_error_with_invalid_flush_timeout(self): + + test_env_patch = mock.patch.dict( + "os.environ", + { + **os.environ, + # NOT Active Tracing + _X_AMZN_TRACE_ID: MOCK_XRAY_TRACE_CONTEXT_NOT_SAMPLED, + # NOT using the X-Ray Propagator + OTEL_PROPAGATORS: "tracecontext", + OTEL_INSTRUMENTATION_AWS_LAMBDA_FLUSH_TIMEOUT: "invalid-timeout-string", + }, + ) + test_env_patch.start() + + AwsLambdaInstrumentor().instrument() + + mock_execute_lambda() + + spans = self.memory_exporter.get_finished_spans() + + assert spans + + self.assertEqual(len(spans), 1) + + test_env_patch.stop() diff --git a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py index 91af787c28..9cdc7e682c 100644 --- a/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py +++ b/instrumentation/opentelemetry-instrumentation-django/src/opentelemetry/instrumentation/django/middleware.py @@ -58,7 +58,6 @@ def __call__(self, request): response = self.get_response(request) return self.process_response(request, response) - else: # Django versions 1.x can use `settings.MIDDLEWARE_CLASSES` and expect # old-style middlewares, which are created by inheriting from diff --git a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py index 473a0fb3c0..f5d31d920b 100644 --- a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py +++ b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# pylint: disable=E0611 + from sys import modules from unittest.mock import Mock, patch diff --git a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware_asgi.py b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware_asgi.py index 3d8d557bcc..ecc3172e8b 100644 --- a/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware_asgi.py +++ b/instrumentation/opentelemetry-instrumentation-django/tests/test_middleware_asgi.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +# pylint: disable=E0611 + from sys import modules from unittest.mock import Mock, patch From 0786aa49adb3fe9b0f7fdd31c69511d48d3b413e Mon Sep 17 00:00:00 2001 From: Owais Lone Date: Fri, 17 Dec 2021 22:34:57 +0530 Subject: [PATCH 2/3] updating changelogs and version to 1.8.0-0.27b0 (#835) --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 6 +- _template/version.py | 2 +- eachdist.ini | 4 +- .../opentelemetry-exporter-datadog/setup.cfg | 2 +- .../opentelemetry/exporter/datadog/version.py | 2 +- .../setup.cfg | 2 +- .../exporter/richconsole/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/aiohttp_client/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/aiopg/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/asgi/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/asyncpg/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/aws_lambda/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/boto/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/botocore/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/celery/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/dbapi/version.py | 2 +- .../setup.cfg | 12 ++-- .../instrumentation/django/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/elasticsearch/version.py | 2 +- .../setup.cfg | 10 +-- .../instrumentation/falcon/version.py | 2 +- .../setup.cfg | 10 +-- .../instrumentation/fastapi/version.py | 2 +- .../setup.cfg | 10 +-- .../instrumentation/flask/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/grpc/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/httpx/version.py | 2 +- .../setup.cfg | 4 +- .../instrumentation/jinja2/version.py | 2 +- .../setup.cfg | 4 +- .../instrumentation/logging/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/mysql/version.py | 2 +- .../setup.cfg | 2 +- .../instrumentation/pika/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/psycopg2/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/pymemcache/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/pymongo/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/pymysql/version.py | 2 +- .../setup.cfg | 10 +-- .../instrumentation/pyramid/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/redis/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/requests/version.py | 2 +- .../setup.cfg | 4 +- .../instrumentation/sklearn/version.py | 2 +- .../setup.cfg | 4 +- .../instrumentation/sqlalchemy/version.py | 2 +- .../setup.cfg | 6 +- .../instrumentation/sqlite3/version.py | 2 +- .../setup.cfg | 10 +-- .../instrumentation/starlette/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/tornado/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/urllib/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/urllib3/version.py | 2 +- .../setup.cfg | 8 +-- .../instrumentation/wsgi/version.py | 2 +- opentelemetry-distro/setup.cfg | 6 +- .../src/opentelemetry/distro/version.py | 2 +- .../instrumentation/bootstrap_gen.py | 70 +++++++++---------- .../opentelemetry/instrumentation/version.py | 2 +- .../propagators/ot_trace/version.py | 2 +- .../src/opentelemetry/util/http/version.py | 2 +- 84 files changed, 209 insertions(+), 205 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index dafc28d542..1a72cbcfc3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,7 +6,7 @@ on: - 'release/*' pull_request: env: - CORE_REPO_SHA: 82a40052d2a49615b745fcbc890c9aabd6f88140 + CORE_REPO_SHA: f0d559f5a8c40185e4cada6ed1914642b937f256 jobs: build: diff --git a/CHANGELOG.md b/CHANGELOG.md index bf61ce8925..34355907c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ 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.7.0-0.26b0...HEAD) +## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.8.0-0.27b0...HEAD) + +## [1.8.0-0.27b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.8.0-0.27b0) - 2021-12-17 + + ### Added diff --git a/_template/version.py b/_template/version.py index a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/eachdist.ini b/eachdist.ini index 62b9417ac0..c2795e0ef2 100644 --- a/eachdist.ini +++ b/eachdist.ini @@ -16,7 +16,7 @@ sortfirst= ext/* [stable] -version=1.7.1 +version=1.8.0 packages= opentelemetry-sdk @@ -34,7 +34,7 @@ packages= opentelemetry-api [prerelease] -version=0.26b1 +version=0.27b0 packages= all diff --git a/exporter/opentelemetry-exporter-datadog/setup.cfg b/exporter/opentelemetry-exporter-datadog/setup.cfg index d1e3e1ab4d..b9c78e84ef 100644 --- a/exporter/opentelemetry-exporter-datadog/setup.cfg +++ b/exporter/opentelemetry-exporter-datadog/setup.cfg @@ -43,7 +43,7 @@ install_requires = ddtrace>=0.34.0,<0.47.0 opentelemetry-api ~= 1.3 opentelemetry-sdk ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/exporter/opentelemetry-exporter-richconsole/setup.cfg b/exporter/opentelemetry-exporter-richconsole/setup.cfg index 8756bd3d39..42e9886e5b 100644 --- a/exporter/opentelemetry-exporter-richconsole/setup.cfg +++ b/exporter/opentelemetry-exporter-richconsole/setup.cfg @@ -43,7 +43,7 @@ install_requires = rich>=10.0.0 opentelemetry-api ~= 1.3 opentelemetry-sdk ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [options.packages.find] where = src diff --git a/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py b/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py index a48aab26a5..f0adf9ba13 100644 --- a/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py +++ b/exporter/opentelemetry-exporter-richconsole/src/opentelemetry/exporter/richconsole/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg index b31853ccef..a8df441c0a 100644 --- a/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg @@ -41,9 +41,9 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.packages.find] 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 bc738c434e..ebfe53f2b6 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg index 35fb2b15a4..688dad5781 100644 --- a/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg @@ -41,14 +41,14 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation-dbapi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-dbapi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-test-utils == 0.27b0 + opentelemetry-semantic-conventions == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg index f52dbf48d1..f1ef988e0e 100644 --- a/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asgi/setup.cfg @@ -41,14 +41,14 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 asgiref ~= 3.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg index 9dba9992b8..5e21490e74 100644 --- a/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-asyncpg/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg index c54990c90f..b23b602985 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/setup.cfg @@ -38,13 +38,13 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 opentelemetry-propagator-aws-xray == 1.0.1 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py index a48aab26a5..f0adf9ba13 100644 --- a/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py +++ b/instrumentation/opentelemetry-instrumentation-aws-lambda/src/opentelemetry/instrumentation/aws_lambda/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg index f51f8eb2f2..308e89c639 100644 --- a/instrumentation/opentelemetry-instrumentation-boto/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-boto/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = moto~=2.0 - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg index fd08176910..7edb41631b 100644 --- a/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-botocore/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = moto[all] ~= 2.2.6 - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg index 3201246b2b..1c82111f1a 100644 --- a/instrumentation/opentelemetry-instrumentation-celery/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-celery/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = pytest - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg index 8139dacc3d..61aa28794e 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-dbapi/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 e3247fa84c..ca562a66e6 100644 --- a/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py +++ b/instrumentation/opentelemetry-instrumentation-dbapi/src/opentelemetry/instrumentation/dbapi/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" _instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-django/setup.cfg b/instrumentation/opentelemetry-instrumentation-django/setup.cfg index 30ce12d014..4c4a32fa45 100644 --- a/instrumentation/opentelemetry-instrumentation-django/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-django/setup.cfg @@ -40,17 +40,17 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-util-http == 0.26b1 - opentelemetry-instrumentation-wsgi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-util-http == 0.27b0 + opentelemetry-instrumentation-wsgi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [options.extras_require] asgi = - opentelemetry-instrumentation-asgi == 0.26b1 + opentelemetry-instrumentation-asgi == 0.27b0 test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg index 14cba716f6..1a802b767c 100644 --- a/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-elasticsearch/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg index bf19e8c75c..e2bc6da060 100644 --- a/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-falcon/setup.cfg @@ -40,15 +40,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-instrumentation-wsgi == 0.26b1 - opentelemetry-util-http == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-wsgi == 0.27b0 + opentelemetry-util-http == 0.27b0 + opentelemetry-instrumentation == 0.27b0 opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg index ad953f6cf2..83ead0630f 100644 --- a/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-fastapi/setup.cfg @@ -41,10 +41,10 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-instrumentation-asgi == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-instrumentation-asgi == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.entry_points] opentelemetry_instrumentor = @@ -52,7 +52,7 @@ opentelemetry_instrumentor = [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 requests ~= 2.23.0 # needed for testclient [options.packages.find] 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 05c2e38710..36e1f56682 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -40,15 +40,15 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-util-http == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-instrumentation-wsgi == 0.26b1 + opentelemetry-util-http == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-instrumentation-wsgi == 0.27b0 opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg index f40f1e0942..ee6d778255 100644 --- a/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-grpc/setup.cfg @@ -42,13 +42,13 @@ packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 opentelemetry-sdk ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 opentelemetry-sdk ~= 1.3 protobuf >= 3.13.0 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg index 732c74655a..ab209e7b5e 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-httpx/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-semantic-conventions == 0.26b1 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-semantic-conventions == 0.27b0 [options.extras_require] test = opentelemetry-sdk ~= 1.3 - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 respx ~= 0.17.0 [options.packages.find] diff --git a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py index a48aab26a5..f0adf9ba13 100644 --- a/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py +++ b/instrumentation/opentelemetry-instrumentation-httpx/src/opentelemetry/instrumentation/httpx/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg index a01e334b9b..237bc19c3b 100644 --- a/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-jinja2/setup.cfg @@ -40,12 +40,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg index 23c7ccbba2..7cd3b424e6 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-logging/setup.cfg @@ -40,11 +40,11 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 e3247fa84c..ca562a66e6 100644 --- a/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py +++ b/instrumentation/opentelemetry-instrumentation-logging/src/opentelemetry/instrumentation/logging/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" _instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg index 88493fde7e..b185a4c0b9 100644 --- a/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-mysql/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation-dbapi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-dbapi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-pika/setup.cfg b/instrumentation/opentelemetry-instrumentation-pika/setup.cfg index 144599e791..9054eb0104 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pika/setup.cfg @@ -48,7 +48,7 @@ install_requires = test = pytest wrapt >= 1.0.0, < 2.0.0 - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [options.packages.find] where = src diff --git a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py index a48aab26a5..f0adf9ba13 100644 --- a/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py +++ b/instrumentation/opentelemetry-instrumentation-pika/src/opentelemetry/instrumentation/pika/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg index 6c2bfe00de..5980d90e0c 100644 --- a/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-psycopg2/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation-dbapi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-dbapi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg index 5a280075a5..39b617e65b 100644 --- a/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymemcache/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg index 4798993ae0..85ccdabc97 100644 --- a/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymongo/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg index 68456e6880..3fb987863d 100644 --- a/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pymysql/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation-dbapi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-dbapi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg index 9b8ec2f9d6..3c85ea4c03 100644 --- a/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-pyramid/setup.cfg @@ -40,17 +40,17 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation-wsgi == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation-wsgi == 0.27b0 + opentelemetry-util-http == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = werkzeug == 0.16.1 - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg index c1806bdb9d..8871256ef0 100644 --- a/instrumentation/opentelemetry-instrumentation-redis/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-redis/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 wrapt >= 1.12.1 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 opentelemetry-sdk ~= 1.3 [options.packages.find] 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg index 9056857d45..b1d25d199b 100644 --- a/instrumentation/opentelemetry-instrumentation-requests/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-requests/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg index aad0ab66c5..2bbc311c1a 100644 --- a/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sklearn/setup.cfg @@ -41,11 +41,11 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 bc738c434e..ebfe53f2b6 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg index dec8030b30..420c2a33ad 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlalchemy/setup.cfg @@ -41,8 +41,8 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 packaging >= 21.0 wrapt >= 1.11.2 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg index e3d4723900..0b6807d942 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/setup.cfg @@ -41,12 +41,12 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation-dbapi == 0.26b1 - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation-dbapi == 0.27b0 + opentelemetry-instrumentation == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 e3247fa84c..ca562a66e6 100644 --- a/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py +++ b/instrumentation/opentelemetry-instrumentation-sqlite3/src/opentelemetry/instrumentation/sqlite3/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" _instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg index cb63436434..63c0a6fcd4 100644 --- a/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-starlette/setup.cfg @@ -41,10 +41,10 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-instrumentation-asgi == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-instrumentation-asgi == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.entry_points] opentelemetry_instrumentor = @@ -52,7 +52,7 @@ opentelemetry_instrumentor = [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 requests ~= 2.23.0 # needed for testclient [options.packages.find] 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg index 74e0ef36ac..dbad601dc9 100644 --- a/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-tornado/setup.cfg @@ -39,14 +39,14 @@ package_dir= =src packages=find_namespace: install_requires = - opentelemetry-instrumentation == 0.26b1 + opentelemetry-instrumentation == 0.27b0 opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg index ca0d0554d8..9d4088a997 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 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 e3247fa84c..ca562a66e6 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py +++ b/instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/version.py @@ -12,6 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "0.26b1" +__version__ = "0.27b0" _instruments = tuple() diff --git a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg index 63dec2b8da..cbcbe81f72 100644 --- a/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-urllib3/setup.cfg @@ -41,14 +41,14 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 wrapt >= 1.0.0, < 2.0.0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg index 61ea394929..08890e7570 100644 --- a/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-wsgi/setup.cfg @@ -41,13 +41,13 @@ package_dir= packages=find_namespace: install_requires = opentelemetry-api ~= 1.3 - opentelemetry-semantic-conventions == 0.26b1 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-util-http == 0.26b1 + opentelemetry-semantic-conventions == 0.27b0 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-util-http == 0.27b0 [options.extras_require] test = - opentelemetry-test-utils == 0.26b1 + opentelemetry-test-utils == 0.27b0 [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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/opentelemetry-distro/setup.cfg b/opentelemetry-distro/setup.cfg index 09b0cb9237..5047857ea2 100644 --- a/opentelemetry-distro/setup.cfg +++ b/opentelemetry-distro/setup.cfg @@ -42,8 +42,8 @@ zip_safe = False include_package_data = True install_requires = opentelemetry-api ~= 1.3 - opentelemetry-instrumentation == 0.26b1 - opentelemetry-sdk == 1.7.1 + opentelemetry-instrumentation == 0.27b0 + opentelemetry-sdk == 1.8.0 [options.packages.find] where = src @@ -57,4 +57,4 @@ opentelemetry_configurator = [options.extras_require] test = otlp = - opentelemetry-exporter-otlp == 1.7.1 + opentelemetry-exporter-otlp == 1.8.0 diff --git a/opentelemetry-distro/src/opentelemetry/distro/version.py b/opentelemetry-distro/src/opentelemetry/distro/version.py index a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py index 27a1717ea0..8e551cd106 100644 --- a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py +++ b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/bootstrap_gen.py @@ -18,126 +18,126 @@ libraries = { "aiohttp": { "library": "aiohttp ~= 3.0", - "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.26b1", + "instrumentation": "opentelemetry-instrumentation-aiohttp-client==0.27b0", }, "aiopg": { "library": "aiopg >= 0.13.0, < 1.3.0", - "instrumentation": "opentelemetry-instrumentation-aiopg==0.26b1", + "instrumentation": "opentelemetry-instrumentation-aiopg==0.27b0", }, "asgiref": { "library": "asgiref ~= 3.0", - "instrumentation": "opentelemetry-instrumentation-asgi==0.26b1", + "instrumentation": "opentelemetry-instrumentation-asgi==0.27b0", }, "asyncpg": { "library": "asyncpg >= 0.12.0", - "instrumentation": "opentelemetry-instrumentation-asyncpg==0.26b1", + "instrumentation": "opentelemetry-instrumentation-asyncpg==0.27b0", }, "boto": { "library": "boto~=2.0", - "instrumentation": "opentelemetry-instrumentation-boto==0.26b1", + "instrumentation": "opentelemetry-instrumentation-boto==0.27b0", }, "botocore": { "library": "botocore ~= 1.0", - "instrumentation": "opentelemetry-instrumentation-botocore==0.26b1", + "instrumentation": "opentelemetry-instrumentation-botocore==0.27b0", }, "celery": { "library": "celery >= 4.0, < 6.0", - "instrumentation": "opentelemetry-instrumentation-celery==0.26b1", + "instrumentation": "opentelemetry-instrumentation-celery==0.27b0", }, "django": { "library": "django >= 1.10", - "instrumentation": "opentelemetry-instrumentation-django==0.26b1", + "instrumentation": "opentelemetry-instrumentation-django==0.27b0", }, "elasticsearch": { "library": "elasticsearch >= 2.0", - "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.26b1", + "instrumentation": "opentelemetry-instrumentation-elasticsearch==0.27b0", }, "falcon": { "library": "falcon >= 2.0.0, < 4.0.0", - "instrumentation": "opentelemetry-instrumentation-falcon==0.26b1", + "instrumentation": "opentelemetry-instrumentation-falcon==0.27b0", }, "fastapi": { "library": "fastapi ~= 0.58", - "instrumentation": "opentelemetry-instrumentation-fastapi==0.26b1", + "instrumentation": "opentelemetry-instrumentation-fastapi==0.27b0", }, "flask": { "library": "flask >= 1.0, < 3.0", - "instrumentation": "opentelemetry-instrumentation-flask==0.26b1", + "instrumentation": "opentelemetry-instrumentation-flask==0.27b0", }, "grpcio": { "library": "grpcio ~= 1.27", - "instrumentation": "opentelemetry-instrumentation-grpc==0.26b1", + "instrumentation": "opentelemetry-instrumentation-grpc==0.27b0", }, "httpx": { "library": "httpx >= 0.18.0, < 0.19.0", - "instrumentation": "opentelemetry-instrumentation-httpx==0.26b1", + "instrumentation": "opentelemetry-instrumentation-httpx==0.27b0", }, "jinja2": { "library": "jinja2 >= 2.7, < 4.0", - "instrumentation": "opentelemetry-instrumentation-jinja2==0.26b1", + "instrumentation": "opentelemetry-instrumentation-jinja2==0.27b0", }, "mysql-connector-python": { "library": "mysql-connector-python ~= 8.0", - "instrumentation": "opentelemetry-instrumentation-mysql==0.26b1", + "instrumentation": "opentelemetry-instrumentation-mysql==0.27b0", }, "pika": { "library": "pika >= 1.1.0", - "instrumentation": "opentelemetry-instrumentation-pika==0.26b1", + "instrumentation": "opentelemetry-instrumentation-pika==0.27b0", }, "psycopg2": { "library": "psycopg2 >= 2.7.3.1", - "instrumentation": "opentelemetry-instrumentation-psycopg2==0.26b1", + "instrumentation": "opentelemetry-instrumentation-psycopg2==0.27b0", }, "pymemcache": { "library": "pymemcache ~= 1.3", - "instrumentation": "opentelemetry-instrumentation-pymemcache==0.26b1", + "instrumentation": "opentelemetry-instrumentation-pymemcache==0.27b0", }, "pymongo": { "library": "pymongo ~= 3.1", - "instrumentation": "opentelemetry-instrumentation-pymongo==0.26b1", + "instrumentation": "opentelemetry-instrumentation-pymongo==0.27b0", }, "PyMySQL": { "library": "PyMySQL < 2", - "instrumentation": "opentelemetry-instrumentation-pymysql==0.26b1", + "instrumentation": "opentelemetry-instrumentation-pymysql==0.27b0", }, "pyramid": { "library": "pyramid >= 1.7", - "instrumentation": "opentelemetry-instrumentation-pyramid==0.26b1", + "instrumentation": "opentelemetry-instrumentation-pyramid==0.27b0", }, "redis": { "library": "redis >= 2.6", - "instrumentation": "opentelemetry-instrumentation-redis==0.26b1", + "instrumentation": "opentelemetry-instrumentation-redis==0.27b0", }, "requests": { "library": "requests ~= 2.0", - "instrumentation": "opentelemetry-instrumentation-requests==0.26b1", + "instrumentation": "opentelemetry-instrumentation-requests==0.27b0", }, "scikit-learn": { "library": "scikit-learn ~= 0.24.0", - "instrumentation": "opentelemetry-instrumentation-sklearn==0.26b1", + "instrumentation": "opentelemetry-instrumentation-sklearn==0.27b0", }, "sqlalchemy": { "library": "sqlalchemy", - "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.26b1", + "instrumentation": "opentelemetry-instrumentation-sqlalchemy==0.27b0", }, "starlette": { "library": "starlette ~= 0.13.0", - "instrumentation": "opentelemetry-instrumentation-starlette==0.26b1", + "instrumentation": "opentelemetry-instrumentation-starlette==0.27b0", }, "tornado": { "library": "tornado >= 5.1.1", - "instrumentation": "opentelemetry-instrumentation-tornado==0.26b1", + "instrumentation": "opentelemetry-instrumentation-tornado==0.27b0", }, "urllib3": { "library": "urllib3 >= 1.0.0, < 2.0.0", - "instrumentation": "opentelemetry-instrumentation-urllib3==0.26b1", + "instrumentation": "opentelemetry-instrumentation-urllib3==0.27b0", }, } default_instrumentations = [ - "opentelemetry-instrumentation-aws-lambda==0.26b1", - "opentelemetry-instrumentation-dbapi==0.26b1", - "opentelemetry-instrumentation-logging==0.26b1", - "opentelemetry-instrumentation-sqlite3==0.26b1", - "opentelemetry-instrumentation-urllib==0.26b1", - "opentelemetry-instrumentation-wsgi==0.26b1", + "opentelemetry-instrumentation-aws-lambda==0.27b0", + "opentelemetry-instrumentation-dbapi==0.27b0", + "opentelemetry-instrumentation-logging==0.27b0", + "opentelemetry-instrumentation-sqlite3==0.27b0", + "opentelemetry-instrumentation-urllib==0.27b0", + "opentelemetry-instrumentation-wsgi==0.27b0", ] diff --git a/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py b/opentelemetry-instrumentation/src/opentelemetry/instrumentation/version.py index a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" 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 a48aab26a5..f0adf9ba13 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.26b1" +__version__ = "0.27b0" From 30d0c2ea90dffa7d958a28a699a9021ecb04aa71 Mon Sep 17 00:00:00 2001 From: Ashutosh Goel <39601429+ashu658@users.noreply.github.com> Date: Mon, 20 Dec 2021 17:18:59 +0530 Subject: [PATCH 3/3] Conditionally create server spans for flask (#828) * Making span as internal in presence of a span in current context * Updating changelog * Removing extra print statements * Resolving comments: Setting current context as parent in its presence * Ignoring pylint check as django.conf.urls.url is removed in django 4.0 Django release notes: https://docs.djangoproject.com/en/4.0/releases/4.0/ * Removing changes in django files --- CHANGELOG.md | 3 ++ .../instrumentation/flask/__init__.py | 21 ++++++++++---- .../tests/test_programmatic.py | 29 +++++++++++++++++++ 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34355907c2..37d860fd19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `opentelemetry-instrumentation-tornado` Add support instrumentation for Tornado 5.1.1 ([#812](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/812)) + +- `opentelemetry-instrumentation-flask` Flask: Conditionally create SERVER spans + ([#828](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/828)) ## [1.7.1-0.26b1](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.7.0-0.26b0) - 2021-11-11 diff --git a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py index e96b005acd..de403f9ea3 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py @@ -176,15 +176,24 @@ def _before_request(): return flask_request_environ = flask.request.environ span_name = get_default_span_name() - token = context.attach( - extract(flask_request_environ, getter=otel_wsgi.wsgi_getter) - ) + + token = ctx = span_kind = None + + if trace.get_current_span() is trace.INVALID_SPAN: + ctx = extract(flask_request_environ, getter=otel_wsgi.wsgi_getter) + token = context.attach(ctx) + span_kind = trace.SpanKind.SERVER + else: + ctx = context.get_current() + span_kind = trace.SpanKind.INTERNAL span = tracer.start_span( span_name, - kind=trace.SpanKind.SERVER, + ctx, + kind=span_kind, start_time=flask_request_environ.get(_ENVIRON_STARTTIME_KEY), ) + if request_hook: request_hook(span, flask_request_environ) @@ -229,7 +238,9 @@ def _teardown_request(exc): activation.__exit__( type(exc), exc, getattr(exc, "__traceback__", None) ) - context.detach(flask.request.environ.get(_ENVIRON_TOKEN)) + + if flask.request.environ.get(_ENVIRON_TOKEN, None): + context.detach(flask.request.environ.get(_ENVIRON_TOKEN)) return _teardown_request diff --git a/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py b/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py index 50dd188af1..a3064b52e5 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py +++ b/instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py @@ -23,6 +23,7 @@ get_global_response_propagator, set_global_response_propagator, ) +from opentelemetry.instrumentation.wsgi import OpenTelemetryMiddleware from opentelemetry.sdk.resources import Resource from opentelemetry.semconv.trace import SpanAttributes from opentelemetry.test.test_base import TestBase @@ -413,3 +414,31 @@ def test_custom_span_name(self): span_list[0].resource.attributes["service.name"], "flask-api-no-app", ) + + +class TestProgrammaticWrappedWithOtherFramework( + InstrumentationTest, TestBase, WsgiTestBase +): + def setUp(self): + super().setUp() + + self.app = Flask(__name__) + self.app.wsgi_app = OpenTelemetryMiddleware(self.app.wsgi_app) + FlaskInstrumentor().instrument_app(self.app) + self._common_initialization() + + def tearDown(self) -> None: + super().tearDown() + with self.disable_logging(): + FlaskInstrumentor().uninstrument_app(self.app) + + def test_mark_span_internal_in_presence_of_span_from_other_framework(self): + resp = self.client.get("/hello/123") + self.assertEqual(200, resp.status_code) + resp.get_data() + span_list = self.memory_exporter.get_finished_spans() + self.assertEqual(trace.SpanKind.INTERNAL, span_list[0].kind) + self.assertEqual(trace.SpanKind.SERVER, span_list[1].kind) + self.assertEqual( + span_list[0].parent.span_id, span_list[1].context.span_id + )