do_stuff returns response, so we don't need _

labs/automatic-instrumentation/library-instrumentation/initial/src/app.py

@@ -1,37 +1,38 @@
-# pyright: reportMissingTypeStubs=false, reportUnknownParameterType=false, reportMissingParameterType=false, reportUnknownArgumentType=false, reportUnknownMemberType=false, reportAttributeAccessIssue=false
-
-import time
-
-import requests
-from client import ChaosClient, FakerClient
-from flask import Flask, make_response
-
-# global variables
-app = Flask(__name__)
-
-@app.route("/users", methods=["GET"])
-def get_user():
-    user, status = db.get_user(123)
-    data = {}
-    if user is not None:
-        data = {"id": user.id, "name": user.name, "address": user.address}
-    response = make_response(data, status)
-    return response
-
-
-def do_stuff():
-    time.sleep(0.1)
-    url = "http://echo:6000/"
-    _response = requests.get(url)
-
-
-@app.route("/")
-def index():
-    do_stuff()
-    current_time = time.strftime("%a, %d %b %Y %H:%M:%S", time.gmtime())
-    return f"Hello, World! It's currently {current_time}"
-
-
-if __name__ == "__main__":
-    db = ChaosClient(client=FakerClient())
-    app.run(host="0.0.0.0", debug=True)
+# pyright: reportMissingTypeStubs=false, reportUnknownParameterType=false, reportMissingParameterType=false, reportUnknownArgumentType=false, reportUnknownMemberType=false, reportAttributeAccessIssue=false
+
+import time
+
+import requests
+from client import ChaosClient, FakerClient
+from flask import Flask, make_response
+
+# global variables
+app = Flask(__name__)
+
+@app.route("/users", methods=["GET"])
+def get_user():
+    user, status = db.get_user(123)
+    data = {}
+    if user is not None:
+        data = {"id": user.id, "name": user.name, "address": user.address}
+    response = make_response(data, status)
+    return response
+
+
+def do_stuff():
+    time.sleep(0.1)
+    url = "http://echo:6000/"
+    response = requests.get(url)
+    return response
+
+
+@app.route("/")
+def index():
+    do_stuff()
+    current_time = time.strftime("%a, %d %b %Y %H:%M:%S", time.gmtime())
+    return f"Hello, World! It's currently {current_time}"
+
+
+if __name__ == "__main__":
+    db = ChaosClient(client=FakerClient())
+    app.run(host="0.0.0.0", debug=True)

labs/automatic-instrumentation/library-instrumentation/solution/src/app.py

@@ -38,7 +38,8 @@ def get_user():
 def do_stuff():
     time.sleep(0.1)
     url = "http://echo:6000/"
-    _response = requests.get(url)
+    response = requests.get(url)
+    return response
 
 
 @app.route("/")

labs/collector/initial/src/app.py

@@ -83,6 +83,7 @@ def do_stuff():
     response = requests.get(url)
     print(response.json())
     logging.info(str(response.json()))
+    return response
 
 @tracer.start_as_current_span("index")
 @app.route("/")

labs/collector/solution/src/app.py

@@ -83,6 +83,7 @@ def do_stuff():
     response = requests.get(url)
     print(response.json())
     logging.info(str(response.json()))
+    return response
 
 @tracer.start_as_current_span("index")
 @app.route("/")

labs/manual-instrumentation-logs/initial/src/app.py

@@ -22,7 +22,8 @@ def get_user():
 def do_stuff():
     time.sleep(0.1)
     url = "http://echo:6000/"
-    _response = requests.get(url)
+    response = requests.get(url)
+    return response
 
 
 @app.route("/")

labs/manual-instrumentation-logs/solution/src/app.py

@@ -34,6 +34,7 @@ def do_stuff():
     url = "http://echo:6000/"
     response = requests.get(url)
     logging.info(response.json())
+    return response
 
 
 @app.route("/")

labs/manual-instrumentation-metrics/initial/src/app.py

@@ -22,7 +22,8 @@ def get_user():
 def do_stuff():
     time.sleep(0.1)
     url = "http://echo:6000/"
-    _response = requests.get(url)
+    response = requests.get(url)
+    return response
 
 
 @app.route("/")

labs/manual-instrumentation-metrics/solution/src/app.py

@@ -47,7 +47,8 @@ def get_user():
 def do_stuff():
     time.sleep(0.1)
     url = "http://echo:6000/"
-    _response = requests.get(url)
+    response = requests.get(url)
+    return response
 
 
 @app.route("/")

labs/manual-instrumentation-traces/initial/src/app.py

@@ -23,6 +23,7 @@ def do_stuff():
     time.sleep(0.1)
     url = "http://echo:6000/"
     response = requests.get(url)
+    return response
 
 
 @app.route("/")

labs/manual-instrumentation-traces/solution/src/app.py

@@ -1,6 +1,7 @@
 # pyright: reportMissingTypeStubs=false, reportUnknownParameterType=false, reportMissingParameterType=false, reportUnknownArgumentType=false
 
 import time
+import json
 
 import requests
 from client import ChaosClient, FakerClient
@@ -47,8 +48,14 @@ def do_stuff():
 
     time.sleep(.1)
     url = "http://echo:6000/"
-    _response = requests.get(url, headers=headers)
-
+    response = requests.get(url, headers=headers)
+
+    # debug
+    print("Headers included in outbound request:")
+    print(json.dumps(response.json()["request"]["headers"], indent=2))
+
+    return response
+
 @app.route('/')
 @tracer.start_as_current_span("index")
 def index():