From 54d42fd4a07e3ae0e451f3d84a5d6cee38d20137 Mon Sep 17 00:00:00 2001 From: Diego Hurtado Date: Fri, 3 Apr 2020 20:39:16 -0600 Subject: [PATCH 1/2] Fix example in documentation Fixes #550 --- .../src/opentelemetry/ext/flask/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py b/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py index 02b0de8652e..fb12175a55d 100644 --- a/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py +++ b/ext/opentelemetry-ext-flask/src/opentelemetry/ext/flask/__init__.py @@ -15,11 +15,11 @@ .. code-block:: python + from opentelemetry.ext.flask import FlaskInstrumentor + FlaskInstrumentor().instrument() # This needs to be executed before importing Flask from flask import Flask - from opentelemetry.ext.flask import instrument_app app = Flask(__name__) - instrument_app(app) # This is where the magic happens. ✨ @app.route("/") def hello(): From e4a741c3f1a18c846c4c7d8724294957feabe336 Mon Sep 17 00:00:00 2001 From: Chris Kleinknecht Date: Tue, 7 Apr 2020 14:56:45 -0700 Subject: [PATCH 2/2] Update getting started guide too --- docs/getting-started.rst | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/getting-started.rst b/docs/getting-started.rst index bbd696015fb..47c19e32fcc 100644 --- a/docs/getting-started.rst +++ b/docs/getting-started.rst @@ -184,12 +184,14 @@ And let's write a small Flask application that sends an HTTP request, activating .. code-block:: python # flask_example.py + from opentelemetry.ext.flask import FlaskInstrumentor + FlaskInstrumentor().instrument() # This needs to be executed before importing Flask + import flask import requests import opentelemetry.ext.http_requests from opentelemetry import trace - from opentelemetry.ext.flask import instrument_app from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import ConsoleSpanExporter from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor @@ -201,7 +203,6 @@ And let's write a small Flask application that sends an HTTP request, activating app = flask.Flask(__name__) opentelemetry.ext.http_requests.enable(trace.get_tracer_provider()) - instrument_app(app) @app.route("/") def hello():