Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit a7b99fd

Browse filesBrowse files
chore: Merge main into experimental-v4 (#906)
* fix: Added missing import into logger.py (#896) * test: Fixed unsupported resource type in system test (#904) * fix: Added type hints to CloudLoggingHandler constructor (#903) * fix: Added type hints to CloudLoggingHandler constructor * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * Removed Client typing due to circular imports --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent bf4efa9 commit a7b99fd
Copy full SHA for a7b99fd

File tree

Expand file treeCollapse file tree

3 files changed

+15
-7
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+15
-7
lines changed

‎google/cloud/logging_v2/handlers/handlers.py

Copy file name to clipboardExpand all lines: google/cloud/logging_v2/handlers/handlers.py
+13-6Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,19 @@
1818
import json
1919
import logging
2020

21-
from google.cloud.logging_v2.handlers.transports import BackgroundThreadTransport
21+
from typing import Optional, IO
22+
23+
from google.cloud.logging_v2.handlers.transports import (
24+
BackgroundThreadTransport,
25+
Transport,
26+
)
2227
from google.cloud.logging_v2.handlers._monitored_resources import (
2328
detect_resource,
2429
add_resource_labels,
2530
)
2631
from google.cloud.logging_v2.handlers._helpers import get_request_data
32+
from google.cloud.logging_v2.resource import Resource
33+
2734

2835
DEFAULT_LOGGER_NAME = "python"
2936

@@ -149,11 +156,11 @@ def __init__(
149156
self,
150157
client,
151158
*,
152-
name=DEFAULT_LOGGER_NAME,
153-
transport=BackgroundThreadTransport,
154-
resource=None,
155-
labels=None,
156-
stream=None,
159+
name: str = DEFAULT_LOGGER_NAME,
160+
transport: Transport = BackgroundThreadTransport,
161+
resource: Resource = None,
162+
labels: Optional[dict] = None,
163+
stream: Optional[IO] = None,
157164
**kwargs,
158165
):
159166
"""

‎google/cloud/logging_v2/logger.py

Copy file name to clipboardExpand all lines: google/cloud/logging_v2/logger.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from google.api_core.exceptions import InvalidArgument
3030
from google.rpc.error_details_pb2 import DebugInfo
3131

32+
import google.cloud.logging_v2
3233
import google.protobuf.message
3334

3435
_GLOBAL_RESOURCE = Resource(type="global", labels={})

‎tests/system/test_system.py

Copy file name to clipboardExpand all lines: tests/system/test_system.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ def test_handlers_w_extras(self):
622622
"trace_sampled": True,
623623
"http_request": expected_request,
624624
"source_location": expected_source,
625-
"resource": Resource(type="cloudiot_device", labels={}),
625+
"resource": Resource(type="global", labels={}),
626626
"labels": {"test-label": "manual"},
627627
}
628628
cloud_logger.warning(LOG_MESSAGE, extra=extra)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.