trace: Update OpenTelemetry dependency (GoogleCloudPlatform#5696)

ymotongpoo · web-flow · commit ea1c4c089e75 · 2021-04-14T15:18:03.000Z
* Update OpenTelemetry package versions close to the latest * Remove unused packages from requirements.txt * Add some lines to follow the updated library interfaces ## Description Fixes GoogleCloudPlatform#5695 and replace GoogleCloudPlatform#5662. Note: It's a good idea to open an issue first for discussion. ## Checklist - [X] I have followed [Sample Guidelines from AUTHORING_GUIDE.MD](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md) - [X] README is updated to include [all relevant information](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#readme-file) - [X] **Tests** pass: `nox -s py-3.6` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [X] **Lint** pass: `nox -s lint` (see [Test Environment Setup](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/AUTHORING_GUIDE.md#test-environment-setup)) - [ ] These samples need a new **API enabled** in testing projects to pass (let us know which ones) - [ ] These samples need a new/updated **env vars** in testing projects set to pass (let us know which ones) - [X] Please **merge** this PR for me once it is approved. - [ ] This sample adds a new sample directory, and I updated the [CODEOWNERS file](https://github.com/GoogleCloudPlatform/python-docs-samples/blob/master/.github/CODEOWNERS) with the codeowners for this sample
diff --git a/trace/cloud-trace-demo-app-opentelemetry/app/app.py b/trace/cloud-trace-demo-app-opentelemetry/app/app.py
@@ -19,23 +19,26 @@
 
 # [START trace_demo_imports]
 import flask
-
-from opentelemetry import trace
+from opentelemetry import propagators, trace
 from opentelemetry.exporter.cloud_trace import CloudTraceSpanExporter
+from opentelemetry.instrumentation.flask import FlaskInstrumentor
 from opentelemetry.sdk.trace import TracerProvider
 from opentelemetry.sdk.trace.export import SimpleExportSpanProcessor
+from opentelemetry.tools.cloud_trace_propagator import CloudTraceFormatPropagator
 
 # [END trace_demo_imports]
 
 app = flask.Flask(__name__)
+FlaskInstrumentor().instrument_app(app)
 
 
 def configure_exporter(exporter):
     trace.set_tracer_provider(TracerProvider())
-
     trace.get_tracer_provider().add_span_processor(SimpleExportSpanProcessor(exporter))
+    propagators.set_global_textmap(CloudTraceFormatPropagator())
 
 
+configure_exporter(CloudTraceSpanExporter())
 tracer = trace.get_tracer(__name__)
 
 
@@ -54,4 +57,3 @@ def template_test():
 
 if __name__ == "__main__":
     app.run(debug=True, host="0.0.0.0", port=8080)
-    configure_exporter(CloudTraceSpanExporter())
diff --git a/trace/cloud-trace-demo-app-opentelemetry/app/app_test.py b/trace/cloud-trace-demo-app-opentelemetry/app/app_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-A sample app demonstrating Stackdriver Trace
+A sample app demonstrating Google Cloud Trace
 """
 import mock
 
diff --git a/trace/cloud-trace-demo-app-opentelemetry/app/requirements.txt b/trace/cloud-trace-demo-app-opentelemetry/app/requirements.txt
@@ -1,14 +1,8 @@
 Flask==1.1.2
-opentelemetry-api==0.8b0
-opentelemetry-auto-instrumentation==0.8b0
-opentelemetry-exporter-cloud-trace==0.9b0
-opentelemetry-ext-flask==0.8b0
-opentelemetry-ext-grpc==0.8b0
-opentelemetry-ext-jaeger==0.8b0
-opentelemetry-ext-requests==0.8b0
-opentelemetry-ext-wsgi==0.8b0
-opentelemetry-sdk==0.8b0
-grpcio==1.36.1
+opentelemetry-exporter-google-cloud==0.18b0
+opentelemetry-tools-google-cloud==0.18b0
+opentelemetry-instrumentation-flask==0.17b0
+grpcio==1.37.0
 httpretty==1.0.5
 google-cloud-monitoring==1.1.0
 google-cloud-trace==0.24.0
