From a8e7caee344496ebecbe556bf8d4ec0754c9fb82 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 11:34:13 -0800 Subject: [PATCH 1/9] use refactored tests --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index 74542ed04..fc5043749 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit 74542ed0406167670870b7db1b170562973ede06 +Subproject commit fc504374934bffd6278e5dc98e7921ae1c9affb5 From 5373e45eeb1e932a2c9cd0ccda9b557d447a8d64 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 14:13:38 -0800 Subject: [PATCH 2/9] logger infers resources --- google/cloud/logging_v2/logger.py | 4 +++- tests/environment | 2 +- tests/unit/test_logger.py | 26 +++++++++++++++++++------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/google/cloud/logging_v2/logger.py b/google/cloud/logging_v2/logger.py index 6e9c5f00d..124c33934 100644 --- a/google/cloud/logging_v2/logger.py +++ b/google/cloud/logging_v2/logger.py @@ -20,6 +20,7 @@ from google.cloud.logging_v2.entries import StructEntry from google.cloud.logging_v2.entries import TextEntry from google.cloud.logging_v2.resource import Resource +from google.cloud.logging_v2.handlers._monitored_resources import detect_resource _GLOBAL_RESOURCE = Resource(type="global", labels={}) @@ -62,6 +63,7 @@ def __init__(self, name, client, *, labels=None): self.name = name self._client = client self.labels = labels + self.default_resource = detect_resource(client.project) @property def client(self): @@ -120,7 +122,7 @@ def _do_log(self, client, _entry_class, payload=None, **kw): # Apply defaults kw["log_name"] = kw.pop("log_name", self.full_name) kw["labels"] = kw.pop("labels", self.labels) - kw["resource"] = kw.pop("resource", _GLOBAL_RESOURCE) + kw["resource"] = kw.pop("resource", self.default_resource) if payload is not None: entry = _entry_class(payload=payload, **kw) diff --git a/tests/environment b/tests/environment index fc5043749..ea5c8d638 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit fc504374934bffd6278e5dc98e7921ae1c9affb5 +Subproject commit ea5c8d63825adcfa11a59d78155c329d4ed4d6cb diff --git a/tests/unit/test_logger.py b/tests/unit/test_logger.py index 869330633..a26b7e4b2 100644 --- a/tests/unit/test_logger.py +++ b/tests/unit/test_logger.py @@ -99,11 +99,13 @@ def test_batch_w_alternate_client(self): self.assertIs(batch.client, client2) def test_log_empty_defaults_w_default_labels(self): + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + DEFAULT_LABELS = {"foo": "spam"} ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), - "resource": {"type": "global", "labels": {}}, + "resource": detect_resource(self.PROJECT)._to_dict(), "labels": DEFAULT_LABELS, } ] @@ -170,12 +172,14 @@ def test_log_empty_w_explicit(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_text_defaults(self): + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + RESOURCE = detect_resource(self.PROJECT)._to_dict() TEXT = "TEXT" ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "textPayload": TEXT, - "resource": {"type": "global", "labels": {}}, + "resource": RESOURCE, } ] client = _Client(self.PROJECT) @@ -187,13 +191,15 @@ def test_log_text_defaults(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_text_w_unicode_and_default_labels(self): + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource TEXT = "TEXT" + RESOURCE = detect_resource(self.PROJECT)._to_dict() DEFAULT_LABELS = {"foo": "spam"} ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "textPayload": TEXT, - "resource": {"type": "global", "labels": {}}, + "resource": RESOURCE, "labels": DEFAULT_LABELS, } ] @@ -263,12 +269,14 @@ def test_log_text_explicit(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_struct_defaults(self): + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource STRUCT = {"message": "MESSAGE", "weather": "cloudy"} + RESOURCE = detect_resource(self.PROJECT)._to_dict() ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "jsonPayload": STRUCT, - "resource": {"type": "global", "labels": {}}, + "resource": RESOURCE, } ] client = _Client(self.PROJECT) @@ -280,13 +288,15 @@ def test_log_struct_defaults(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_struct_w_default_labels(self): + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource STRUCT = {"message": "MESSAGE", "weather": "cloudy"} + RESOURCE = detect_resource(self.PROJECT)._to_dict() DEFAULT_LABELS = {"foo": "spam"} ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "jsonPayload": STRUCT, - "resource": {"type": "global", "labels": {}}, + "resource": RESOURCE, "labels": DEFAULT_LABELS, } ] @@ -359,13 +369,14 @@ def test_log_proto_defaults(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource message = Struct(fields={"foo": Value(bool_value=True)}) ENTRIES = [ { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "protoPayload": json.loads(MessageToJson(message)), - "resource": {"type": "global", "labels": {}}, + "resource": detect_resource(self.PROJECT)._to_dict(), } ] client = _Client(self.PROJECT) @@ -380,6 +391,7 @@ def test_log_proto_w_default_labels(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value + from google.cloud.logging_v2.handlers._monitored_resources import detect_resource message = Struct(fields={"foo": Value(bool_value=True)}) DEFAULT_LABELS = {"foo": "spam"} @@ -387,7 +399,7 @@ def test_log_proto_w_default_labels(self): { "logName": "projects/%s/logs/%s" % (self.PROJECT, self.LOGGER_NAME), "protoPayload": json.loads(MessageToJson(message)), - "resource": {"type": "global", "labels": {}}, + "resource": detect_resource(self.PROJECT)._to_dict(), "labels": DEFAULT_LABELS, } ] From 0814f32fb25aa11a32091cf05f36da4e5910f56b Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 14:42:36 -0800 Subject: [PATCH 3/9] fix lint; refactored tests --- tests/environment | 2 +- tests/unit/test_logger.py | 32 +++++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/tests/environment b/tests/environment index ea5c8d638..f44be6723 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit ea5c8d63825adcfa11a59d78155c329d4ed4d6cb +Subproject commit f44be6723264797171b6dad407c1ed0d437c250c diff --git a/tests/unit/test_logger.py b/tests/unit/test_logger.py index a26b7e4b2..53ecac8f5 100644 --- a/tests/unit/test_logger.py +++ b/tests/unit/test_logger.py @@ -99,7 +99,9 @@ def test_batch_w_alternate_client(self): self.assertIs(batch.client, client2) def test_log_empty_defaults_w_default_labels(self): - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) DEFAULT_LABELS = {"foo": "spam"} ENTRIES = [ @@ -172,7 +174,10 @@ def test_log_empty_w_explicit(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_text_defaults(self): - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) + RESOURCE = detect_resource(self.PROJECT)._to_dict() TEXT = "TEXT" ENTRIES = [ @@ -191,7 +196,10 @@ def test_log_text_defaults(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_text_w_unicode_and_default_labels(self): - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) + TEXT = "TEXT" RESOURCE = detect_resource(self.PROJECT)._to_dict() DEFAULT_LABELS = {"foo": "spam"} @@ -269,7 +277,10 @@ def test_log_text_explicit(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_struct_defaults(self): - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) + STRUCT = {"message": "MESSAGE", "weather": "cloudy"} RESOURCE = detect_resource(self.PROJECT)._to_dict() ENTRIES = [ @@ -288,7 +299,10 @@ def test_log_struct_defaults(self): self.assertEqual(api._write_entries_called_with, (ENTRIES, None, None, None)) def test_log_struct_w_default_labels(self): - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) + STRUCT = {"message": "MESSAGE", "weather": "cloudy"} RESOURCE = detect_resource(self.PROJECT)._to_dict() DEFAULT_LABELS = {"foo": "spam"} @@ -369,7 +383,9 @@ def test_log_proto_defaults(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) message = Struct(fields={"foo": Value(bool_value=True)}) ENTRIES = [ @@ -391,7 +407,9 @@ def test_log_proto_w_default_labels(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value - from google.cloud.logging_v2.handlers._monitored_resources import detect_resource + from google.cloud.logging_v2.handlers._monitored_resources import ( + detect_resource, + ) message = Struct(fields={"foo": Value(bool_value=True)}) DEFAULT_LABELS = {"foo": "spam"} From dd3316f047b7c392f1f965004a3a91133bb2d683 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 14:51:29 -0800 Subject: [PATCH 4/9] updated submodule --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index f44be6723..eebd61520 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit f44be6723264797171b6dad407c1ed0d437c250c +Subproject commit eebd6152090b568594357ffd69c212e4681afdbe From 7319da7a49013a9e41d117b3d12770904328336a Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 15:05:25 -0800 Subject: [PATCH 5/9] updated submodule --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index eebd61520..4a2753b1a 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit eebd6152090b568594357ffd69c212e4681afdbe +Subproject commit 4a2753b1a89bf40c9de56177441fa411f24866f8 From 5a3c21f83b136ee9fcc6646ad4eff14c2862db2a Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 15:24:36 -0800 Subject: [PATCH 6/9] merged environment test changes --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index 4a2753b1a..fe64fb750 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit 4a2753b1a89bf40c9de56177441fa411f24866f8 +Subproject commit fe64fb7506015cd73ebefea005da07dfc071082b From 560b6c55d23acbb96c6c786153032ca0190394ee Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 15:50:45 -0800 Subject: [PATCH 7/9] updated submodule --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index fe64fb750..7705f7b80 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit fe64fb7506015cd73ebefea005da07dfc071082b +Subproject commit 7705f7b8091a20f66ddb71f77e59ea58592a553e From 2bf33014c2e8df8c3f32d25158737a93cbd7cc57 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Mon, 8 Mar 2021 16:14:55 -0800 Subject: [PATCH 8/9] updated sub module --- tests/environment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/environment b/tests/environment index 7705f7b80..a7dd02716 160000 --- a/tests/environment +++ b/tests/environment @@ -1 +1 @@ -Subproject commit 7705f7b8091a20f66ddb71f77e59ea58592a553e +Subproject commit a7dd027166b8df1980881a94ba8473065497701d From 6527ea55b4cbc5bb2582ece685f4bec08993c00b Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 9 Mar 2021 09:27:03 -0800 Subject: [PATCH 9/9] Trigger Build