Merge branch 'log-export-env-var' of https://github.com/jeremydvoss/o…

…pentelemetry-python into log-export-env-var

docs/examples/opencensus-shim/.gitignore

@@ -0,0 +1 @@
+example.db

docs/examples/opencensus-shim/README.rst

@@ -44,23 +44,44 @@ Alternatively, you can install the Python dependencies separately:
         opentelemetry-api \
         opentelemetry-sdk \
         opentelemetry-exporter-jaeger \
-        opentelemetry-opencensus-shim
+        opentelemetry-opencensus-shim \
+        opentelemetry-instrumentation-sqlite3 \
+        opencensus \
+        opencensus-ext-flask
 
 
 Run the Application
 -------------------
 
-.. TODO implement the example
+Start the application in a terminal.
+
+.. code-block:: sh
+
+    flask --app app run -h 0.0.0.0
+
+Point your browser to the address printed out (probably http://127.0.0.1:5000). Alternatively, just use curl to trigger a request:
+
+.. code-block:: sh
+
+    curl http://127.0.0.1:5000
 
 Jaeger UI
 *********
 
-Open the Jaeger UI in your browser at
-`<http://localhost:16686>`_ and view traces for the
-"OpenCensus Shim Example" service.
+Open the Jaeger UI in your browser at `<http://localhost:16686>`_ and view traces for the
+"opencensus-shim-example-flask" service. Click on a span named "span" in the scatter plot. You
+will see a span tree with the following structure:
+
+* ``span``
+    * ``query movies from db``
+        * ``SELECT``
+    * ``build response html``
 
-Note that tags and logs (OpenCensus) and attributes and events (OpenTelemetry)
-from both tracing systems appear in the exported trace.
+The root span comes from OpenCensus Flask instrumentation. The children ``query movies from
+db`` and ``build response html`` come from the manual instrumentation using OpenTelemetry's
+:meth:`opentelemetry.trace.Tracer.start_as_current_span`. Finally, the ``SELECT`` span is
+created by OpenTelemetry's SQLite3 instrumentation. Everything is exported to Jaeger using the
+OpenTelemetry exporter.
 
 Useful links
 ------------

docs/examples/opencensus-shim/app.py

@@ -0,0 +1,102 @@
+# Copyright The OpenTelemetry Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import sqlite3
+
+from flask import Flask
+from opencensus.ext.flask.flask_middleware import FlaskMiddleware
+
+from opentelemetry import trace
+from opentelemetry.exporter.jaeger.thrift import JaegerExporter
+from opentelemetry.instrumentation.sqlite3 import SQLite3Instrumentor
+from opentelemetry.sdk.resources import Resource
+from opentelemetry.sdk.trace import TracerProvider
+from opentelemetry.sdk.trace.export import BatchSpanProcessor
+from opentelemetry.shim.opencensus import install_shim
+
+DB = "example.db"
+
+# Set up OpenTelemetry
+tracer_provider = TracerProvider(
+    resource=Resource(
+        {
+            "service.name": "opencensus-shim-example-flask",
+        }
+    )
+)
+trace.set_tracer_provider(tracer_provider)
+
+# Configure OTel to export traces to Jaeger
+tracer_provider.add_span_processor(
+    BatchSpanProcessor(
+        JaegerExporter(
+            agent_host_name="localhost",
+            agent_port=6831,
+        )
+    )
+)
+tracer = tracer_provider.get_tracer(__name__)
+
+# Install the shim to start bridging spans from OpenCensus to OpenTelemetry
+install_shim()
+
+# Instrument sqlite3 library
+SQLite3Instrumentor().instrument()
+
+# Setup Flask with OpenCensus instrumentation
+app = Flask(__name__)
+FlaskMiddleware(app)
+
+
+# Setup the application database
+def setup_db():
+    with sqlite3.connect(DB) as con:
+        cur = con.cursor()
+        cur.execute(
+            """
+            CREATE TABLE IF NOT EXISTS movie(
+                title,
+                year,
+                PRIMARY KEY(title, year)
+            )
+            """
+        )
+        cur.execute(
+            """
+            INSERT OR IGNORE INTO movie(title, year) VALUES
+                ('Mission Telemetry', 2000),
+                ('Observing the World', 2010),
+                ('The Tracer', 1999),
+                ('The Instrument', 2020)
+            """
+        )
+
+
+setup_db()
+
+
+@app.route("/")
+def hello_world():
+    lines = []
+    with tracer.start_as_current_span("query movies from db"), sqlite3.connect(
+        DB
+    ) as con:
+        cur = con.cursor()
+        for title, year in cur.execute("SELECT title, year from movie"):
+            lines.append(f"<li>{title} is from the year {year}</li>")
+
+    with tracer.start_as_current_span("build response html"):
+        html = f"<ul>{''.join(lines)}</ul>"
+
+    return html

docs/examples/opencensus-shim/requirements.txt

@@ -2,3 +2,6 @@ opentelemetry-api
 opentelemetry-sdk
 opentelemetry-exporter-jaeger
 opentelemetry-opencensus-shim
+opentelemetry-instrumentation-sqlite3
+opencensus
+opencensus-ext-flask