fix: respond to PR comments

Author: taeold

src/functions_framework/aio/__init__.py

@@ -218,7 +218,7 @@ async def __call__(self, scope, receive, send):
                     "body": b"Internal Server Error",
                 }
             )
-            # Don't re-raise to prevent starlette from printing tracebak again
+            # Don't re-raise to prevent starlette from printing traceback again
 
 
 def create_asgi_app(target=None, source=None, signature_type=None):

src/functions_framework/execution_id.py

@@ -77,17 +77,17 @@ def _generate_execution_id():
 
 def _extract_context_from_headers(headers):
     """Extract execution context from request headers."""
-    execution_id = headers.get(EXECUTION_ID_REQUEST_HEADER)
-
     trace_context = re.match(
         _TRACE_CONTEXT_REGEX_PATTERN,
         headers.get(TRACE_CONTEXT_REQUEST_HEADER, ""),
     )
+    execution_id = headers.get(EXECUTION_ID_REQUEST_HEADER)
     span_id = trace_context.group("span_id") if trace_context else None
 
     return ExecutionContext(execution_id, span_id)
 
 
+# Middleware to add execution id to request header if one does not already exist
 class WsgiMiddleware:
     def __init__(self, wsgi_app):
         self.wsgi_app = wsgi_app

tests/test_execution_id_async.py

@@ -339,3 +339,27 @@ def test_sync_cloudevent_function_has_execution_context(monkeypatch, capsys):
     record = capsys.readouterr()
     assert f"Execution ID in sync CloudEvent: {TEST_EXECUTION_ID}" in record.err
     assert "No execution context in sync CloudEvent function!" not in record.err
+
+
+def test_cloudevent_returns_500(capsys, monkeypatch):
+    monkeypatch.setenv("LOG_EXECUTION_ID", "true")
+    source = TEST_FUNCTIONS_DIR / "execution_id" / "async_main.py"
+    target = "async_cloudevent_error"
+    app = create_asgi_app(target, source, signature_type="cloudevent")
+    client = TestClient(app, raise_server_exceptions=False)
+    resp = client.post(
+        "/",
+        headers={
+            "ce-specversion": "1.0",
+            "ce-type": "com.example.test",
+            "ce-source": "test-source",
+            "ce-id": "test-id",
+            "Function-Execution-Id": TEST_EXECUTION_ID,
+            "Content-Type": "application/json",
+        },
+    )
+    assert resp.status_code == 500
+    record = capsys.readouterr()
+    assert f'"execution_id": "{TEST_EXECUTION_ID}"' in record.err
+    assert '"logging.googleapis.com/labels"' in record.err
+    assert "ValueError" in record.err

tests/test_functions/execution_id/async_main.py

@@ -56,3 +56,7 @@ def sync_cloudevent_with_context(cloud_event):
         logger.info(f"Execution ID in sync CloudEvent: {context.execution_id}")
     else:
         logger.error("No execution context in sync CloudEvent function!")
+
+
+async def async_cloudevent_error(cloudevent):
+    raise ValueError("This is a test error")