trace: Update trace sample with OpenTelemetry (GoogleCloudPlatform#5706)

* Update product name from Stackdriver to Cloud Trace in README
* Update dependent package versions
* Remove unused and non-direct dependent packages from requirements.txt
* Fix scope of span

Co-authored-by: Dan Lee <[email protected]>
Co-authored-by: Leah E. Cole <[email protected]>

Author: 3 people

trace/trace-python-sample-opentelemetry/README.rst

@@ -1,18 +1,18 @@
 .. This file is automatically generated. Do not edit this file directly.
 
-Stackdriver Trace Python Samples
+Google Cloud Trace Python Samples
 ===============================================================================
 
 .. image:: https://gstatic.com/cloudssh/images/open-btn.png
    :target: https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/python-docs-samples&page=editor&open_in_editor=trace/README.rst
 
 
-This directory contains samples for Stackdriver Trace. `Stackdriver Trace`_ collects latency data from applications and displays it in near real time in the Google Cloud Platform Console.
+This directory contains samples for Google Cloud Trace. `Google Cloud Trace`_ collects latency data from applications and displays it in near real time in the Google Cloud Platform Console.
 
 
 
 
-.. _Stackdriver Trace: https://cloud.google.com/trace/docs
+.. _Google Cloud Trace: https://cloud.google.com/trace/docs
 
 Setup
 -------------------------------------------------------------------------------

trace/trace-python-sample-opentelemetry/main.py

@@ -20,10 +20,11 @@
 from flask import Flask, redirect, url_for
 
 # [START trace_setup_python_configure]
-from opentelemetry import trace
+from opentelemetry import propagators, trace
 from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
+from opentelemetry.tools.cloud_trace_propagator import CloudTraceFormatPropagator
 
 
 def initialize_tracer(project_id):
@@ -32,6 +33,7 @@ def initialize_tracer(project_id):
     trace.get_tracer_provider().add_span_processor(
         SimpleExportSpanProcessor(cloud_trace_exporter)
     )
+    propagators.set_global_textmap(CloudTraceFormatPropagator())
     opentelemetry_tracer = trace.get_tracer(__name__)
 
     return opentelemetry_tracer
@@ -51,10 +53,10 @@ def root():
 @app.route("/index.html", methods=["GET"])
 def index():
     tracer = app.config["TRACER"]
-    tracer.start_as_current_span(name="index")
-    # Add up to 1 sec delay, weighted toward zero
-    time.sleep(random.random() ** 2)
-    result = "Tracing requests"
+    with tracer.start_as_current_span(name="index"):
+        # Add up to 1 sec delay, weighted toward zero
+        time.sleep(random.random() ** 2)
+        result = "Tracing requests"
 
     return result
 
@@ -74,7 +76,6 @@ def index():
     )
     args = parser.parse_args()
 
-    tracer = initialize_tracer(args.project_id)
-    app.config["TRACER"] = tracer
+    app.config["TRACER"] = initialize_tracer(args.project_id)
 
     app.run()

trace/trace-python-sample-opentelemetry/requirements.txt

@@ -1,11 +1,3 @@
 Flask==1.1.2
-google-cloud-trace==0.24.0
-opentelemetry-api==0.16b1
-opentelemetry-instrumentation==0.16b1
-opentelemetry-exporter-google-cloud==0.16b1
-opentelemetry-instrumentation-flask==0.16b1
-opentelemetry-instrumentation-grpc==0.16b1
-opentelemetry-exporter-jaeger==0.16b1
-opentelemetry-instrumentation-requests==0.16b1
-opentelemetry-instrumentation-wsgi==0.16b1
-opentelemetry-sdk==0.16b1
+opentelemetry-exporter-google-cloud==0.18b0
+opentelemetry-tools-google-cloud==0.18b0