feat: use structured logging on GCF with python 3.7 (#434)

daniel-sanche · web-flow · commit d7e58707c90a · 2021-11-01T15:58:25.000-07:00
diff --git a/packages/google-cloud-logging/google/cloud/logging_v2/client.py b/packages/google-cloud-logging/google/cloud/logging_v2/client.py
@@ -355,13 +355,9 @@ def get_default_handler(self, **kw):
                 return AppEngineHandler(self, **kw)
             elif monitored_resource.type == _GKE_RESOURCE_TYPE:
                 return ContainerEngineHandler(**kw)
-            elif (
-                monitored_resource.type == _GCF_RESOURCE_TYPE
-                and sys.version_info[0] == 3
-                and sys.version_info[1] >= 8
-            ):
-                # Cloud Functions with runtimes > 3.8 supports structured logs on standard out
-                # 3.7 should use the standard CloudLoggingHandler, which sends logs over the network.
+            elif monitored_resource.type == _GCF_RESOURCE_TYPE:
+                # __stdout__ stream required to support structured logging on Python 3.7
+                kw["stream"] = kw.get("stream", sys.__stdout__)
                 return StructuredLogHandler(**kw, project_id=self.project)
             elif monitored_resource.type == _RUN_RESOURCE_TYPE:
                 return StructuredLogHandler(**kw, project_id=self.project)
diff --git a/tests/environment b/tests/environment
@@ -1 +1 @@
-Subproject commit 17b7a46908320891605908d5baa5f32eb255380e
+Subproject commit dc85066053b8dc2246c8b72f93a5b97f92885eb2

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 17b7a46908320891605908d5baa5f32eb255380e`
	`1`	`+Subproject commit dc85066053b8dc2246c8b72f93a5b97f92885eb2`