fix: update library version and fix test failure (GoogleCloudPlatform#8525)

engelke · web-flow · commit 63d7a3728f2a · 2023-03-13T10:55:41.000-07:00
* fix: update library version

* debug: view output

* fix: set flag to adjust output

* fix: use only first line of log

* debug: display raw stdout

* debug: display raw stdout

* fix: strip extra leading output if there

* fix: remove unused import

* fix: update library version

* Don't capture output that won't be used
diff --git a/functions/v2/http_logging/main_test.py b/functions/v2/http_logging/main_test.py
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2023 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the 'License');
 # you may not use this file except in compliance with the License.
@@ -46,6 +46,13 @@ def test_functions_log_http_should_print_message(app, capsys):
     with app.test_request_context(headers={'x-cloud-trace-context': f"{mock_trace}/{mock_span};o=1"}):
         main.structured_logging(flask.request)
         _, err = capsys.readouterr()
-        output_json = json.loads(err)
+
+        # In some situations, the library adds information before the first
+        # intended line. Use the next line in that case.
+        err_lines = err.splitlines()
+        if len(err_lines) > 1:
+            err = err_lines[1]
+
+        output_json = json.loads(err.splitlines()[0])
         for (key, value) in expected.items():
             assert value == output_json[key]
diff --git a/functions/v2/http_logging/requirements.txt b/functions/v2/http_logging/requirements.txt
@@ -1,2 +1,2 @@
-google-cloud-logging==3.1.2
+google-cloud-logging==3.2.5
 functions-framework==3.2.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-google-cloud-logging==3.1.2`
	`1`	`+google-cloud-logging==3.2.5`
`2`	`2`	`functions-framework==3.2.0`