Add progress messages and remove new line from response (GoogleCloudPlatform#3289)

qqqstuv · web-flow · commit acf89eb583db · 2020-04-23T17:04:07.000Z
- Log some progress messages while fetching services' endpoints
- Remove newline character in return.
diff --git a/trace/cloud-trace-demo-app/README.md b/trace/cloud-trace-demo-app/README.md
@@ -42,7 +42,7 @@ If you are using the provided image, skip to the next section.
     `./setup.sh`
 12. Send request to the last service:
 
-    `curl $(kubectl get svc cloud-trace-demo-c -ojsonpath='{.status.loadBalancer.ingress[0].ip}')`
+    `curl -w "\n" $(kubectl get svc cloud-trace-demo-c -ojsonpath='{.status.loadBalancer.ingress[0].ip}')`
 13. Visit [Trace List](https://pantheon.corp.google.com/traces/list) to check traces generated.
     Click on any trace in the graph to see the Waterfall View.
     ![Screenshot](./example.png)
diff --git a/trace/cloud-trace-demo-app/app/app.py b/trace/cloud-trace-demo-app/app/app.py
@@ -14,13 +14,14 @@
 """
 A sample app demonstrating Stackdriver Trace
 """
-
+# [START trace_demo_imports]
 from flask import Flask
 from opencensus.trace import execution_context
 from opencensus.trace.propagation import google_cloud_format
 from opencensus.trace.samplers import AlwaysOnSampler
 from opencensus.ext.stackdriver.trace_exporter import StackdriverExporter
 from opencensus.ext.flask.flask_middleware import FlaskMiddleware
+# [END trace_demo_imports]
 
 import requests
 import argparse
@@ -29,6 +30,7 @@
 
 app = Flask(__name__)
 
+# [START trace_demo_middleware]
 propagator = google_cloud_format.GoogleCloudFormatPropagator()
 
 
@@ -41,6 +43,7 @@ def createMiddleWare(exporter):
         propagator=propagator,
         sampler=AlwaysOnSampler())
     return middleware
+# [END trace_demo_middleware]
 
 
 @app.route('/')
@@ -55,13 +58,15 @@ def template_test():
         return output_string, 200
     # Endpoint is the next service to send string to.
     data = {'body': output_string}
+    # [START trace_context_header]
     trace_context_header = propagator.to_header(execution_context.get_opencensus_tracer().span_context)
     response = requests.get(
         url,
         params=data,
         headers={
           'X-Cloud-Trace-Context' : trace_context_header}
     )
+    # [END trace_context_header]
     return response.text + app.config['keyword']
 
 
@@ -72,5 +77,7 @@ def template_test():
     args = parser.parse_args()
     app.config['keyword'] = args.keyword
     app.config['endpoint'] = args.endpoint
+    # [START trace_demo_create_exporter]
     createMiddleWare(StackdriverExporter())
+    # [END trace_demo_create_exporter]
     app.run(debug=True, host='0.0.0.0', port=8080)
diff --git a/trace/cloud-trace-demo-app/app/demo-service-c.yaml.template b/trace/cloud-trace-demo-app/app/demo-service-c.yaml.template
@@ -22,7 +22,7 @@ spec:
         - python
         args:
         - app.py
-        - --keyword=!\n
+        - --keyword=!
         - --endpoint=http://{{ endpoint }}
         ports:
         - containerPort: 8080
diff --git a/trace/cloud-trace-demo-app/setup.sh b/trace/cloud-trace-demo-app/setup.sh
@@ -9,6 +9,7 @@ echo "Fetching the external IP of service a"
 endpoint=""
 for run in {1..20}
 do
+  echo "Attempt #${run} to fetch the external IP of service a..."
   sleep 5
   endpoint=`kubectl get svc cloud-trace-demo-a -ojsonpath='{.status.loadBalancer.ingress[0].ip}'`
   if [[ "$endpoint" != "" ]]; then
@@ -31,6 +32,7 @@ echo "Fetching the external IP of service b"
 endpoint=""
 for run in {1..20}
 do
+  echo "Attempt #${run} to fetch the external IP of service b..."
   sleep 5
   endpoint=`kubectl get svc cloud-trace-demo-b -ojsonpath='{.status.loadBalancer.ingress[0].ip}'`
   if [[ "$endpoint" != "" ]]; then
