From 5aee78091266a74516d45c831e6e323a42ca9ab2 Mon Sep 17 00:00:00 2001 From: Prajilesh N Date: Mon, 2 Nov 2020 09:42:47 +0530 Subject: [PATCH 1/3] Converted TextMap propagator getter to a class and added keys method (#1196) Co-authored-by: alrex --- .../src/opentelemetry/instrumentation/flask/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c88a76090..1235b09a3 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py +++ b/instrumentation/opentelemetry-instrumentation-flask/src/opentelemetry/instrumentation/flask/__init__.py @@ -118,7 +118,7 @@ def _before_request(): if span_name is None: span_name = otel_wsgi.get_default_span_name(environ) token = context.attach( - propagators.extract(otel_wsgi.get_header_from_environ, environ) + propagators.extract(otel_wsgi.carrier_getter, environ) ) tracer = trace.get_tracer(__name__, __version__) From 4df183f144165982e1144c86cad2015ce9fab2c5 Mon Sep 17 00:00:00 2001 From: alrex Date: Mon, 2 Nov 2020 08:01:02 -0800 Subject: [PATCH 2/3] fixing changelogs (#1315) Found a few discrepancies in the changelogs that needed to be fixed --- .../opentelemetry-instrumentation-flask/CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md index c030e9e8c..cdb6916d1 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md @@ -4,8 +4,6 @@ - Use `url.rule` instead of `request.endpoint` for span name ([#1260](https://github.com/open-telemetry/opentelemetry-python/pull/1260)) -- Record span status and http.status_code attribute on exception - ([#1257](https://github.com/open-telemetry/opentelemetry-python/pull/1257)) ## Version 0.13b0 From fa78389163d4e01213af396fd68285ffe4ab8810 Mon Sep 17 00:00:00 2001 From: alrex Date: Mon, 2 Nov 2020 09:00:06 -0800 Subject: [PATCH 3/3] [pre-release] Update changelogs, version [0.15b0] (#1320) --- .../opentelemetry-instrumentation-flask/CHANGELOG.md | 4 ++++ .../opentelemetry-instrumentation-flask/setup.cfg | 8 ++++---- .../src/opentelemetry/instrumentation/flask/version.py | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md b/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md index cdb6916d1..4c7e7a055 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md +++ b/instrumentation/opentelemetry-instrumentation-flask/CHANGELOG.md @@ -2,6 +2,10 @@ ## Unreleased +## Version 0.15b0 + +Released 2020-11-02 + - Use `url.rule` instead of `request.endpoint` for span name ([#1260](https://github.com/open-telemetry/opentelemetry-python/pull/1260)) diff --git a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg index 1ea37e42c..8d7edfe9c 100644 --- a/instrumentation/opentelemetry-instrumentation-flask/setup.cfg +++ b/instrumentation/opentelemetry-instrumentation-flask/setup.cfg @@ -40,14 +40,14 @@ package_dir= packages=find_namespace: install_requires = flask ~= 1.0 - opentelemetry-instrumentation-wsgi == 0.15.dev0 - opentelemetry-instrumentation == 0.15.dev0 - opentelemetry-api == 0.15.dev0 + opentelemetry-instrumentation-wsgi == 0.15b0 + opentelemetry-instrumentation == 0.15b0 + opentelemetry-api == 0.15b0 [options.extras_require] test = flask~=1.0 - opentelemetry-test == 0.15.dev0 + opentelemetry-test == 0.15b0 [options.packages.find] where = src 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 e7b342d64..ff494d225 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.15.dev0" +__version__ = "0.15b0"