fix: Update logging library (GoogleCloudPlatform#6472)

averikitsch · dandhlee · web-flow · commit 92a683ee44a0 · 2021-07-27T09:39:48.000-07:00
* fix: Update logging library

* lint

* fix syntax

* Update logging manual

* Update test

* Update e2e_test.py

* Update e2e_test.py

Co-authored-by: Dan Lee &lt;71398022+dandhlee@users.noreply.github.com&gt;
diff --git a/run/logging-manual/e2e_test.py b/run/logging-manual/e2e_test.py
@@ -22,7 +22,7 @@
 import time
 import uuid
 
-from google.cloud import logging_v2
+from google.cloud.logging_v2.services.logging_service_v2 import LoggingServiceV2Client
 
 import pytest
 
@@ -174,7 +174,7 @@ def test_end_to_end(service_url_auth_token, deployed_service):
 
     # Test that the logs are writing properly to stackdriver
     time.sleep(10)  # Slight delay writing to stackdriver
-    client = logging_v2.LoggingServiceV2Client()
+    client = LoggingServiceV2Client()
     resource_names = [f"projects/{PROJECT}"]
     # We add timestamp for making the query faster.
     now = datetime.datetime.now(datetime.timezone.utc)
@@ -188,12 +188,17 @@ def test_end_to_end(service_url_auth_token, deployed_service):
     )
 
     # Retry a maximum number of 10 times to find results in stackdriver
+    found = False
     for x in range(10):
-        iterator = client.list_log_entries(resource_names, filter_=filters)
+        iterator = client.list_log_entries({"resource_names": resource_names, "filter": filters})
         for entry in iterator:
+            found = True
             # If there are any results, exit loop
             break
+        # When message found, exit loop
+        if found:
+            break
         # Linear backoff
         time.sleep(3 * x)
 
-    assert iterator.num_results
+    assert found
diff --git a/run/pubsub/e2e_test.py b/run/pubsub/e2e_test.py
@@ -21,8 +21,8 @@
 import uuid
 
 from google.api_core.exceptions import NotFound
-from google.cloud import logging_v2
 from google.cloud import pubsub_v1
+from google.cloud.logging_v2.services.logging_service_v2 import LoggingServiceV2Client
 
 
 import pytest
@@ -196,7 +196,7 @@ def test_end_to_end(pubsub_topic):
 
     # Check the logs for "Hello Runner"
     time.sleep(20)  # Slight delay writing to stackdriver
-    client = logging_v2.LoggingServiceV2Client()
+    client = LoggingServiceV2Client()
     resource_names = [f"projects/{PROJECT}"]
 
     # We add timestamp for making the query faster.
@@ -211,7 +211,7 @@ def test_end_to_end(pubsub_topic):
     # Retry a maximum number of 10 times to find results in stackdriver
     found = False
     for x in range(10):
-        iterator = client.list_log_entries(resource_names, filter_=filters)
+        iterator = client.list_log_entries({"resource_names": resource_names, "filter": filters})
         for entry in iterator:
             if entry.text_payload == "Hello Runner!":
                 found = True
