-
Notifications
You must be signed in to change notification settings - Fork 48
Add a parameter route_logs_to_stdout_as_json to the CloudLoggingExporter #385
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
DylanRussell
wants to merge
3
commits into
GoogleCloudPlatform:main
Choose a base branch
from
DylanRussell:newbranch2
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -140,7 +140,9 @@ def __init__( | |
project_id: Optional[str] = None, | ||
default_log_name: Optional[str] = None, | ||
client: Optional[LoggingServiceV2Client] = None, | ||
route_logs_to_stdout_as_json: bool = False, | ||
): | ||
self.route_logs_to_stdout_as_json = route_logs_to_stdout_as_json | ||
self.project_id: str | ||
if not project_id: | ||
_, default_project_id = google.auth.default() | ||
|
@@ -151,13 +153,18 @@ def __init__( | |
self.default_log_name = default_log_name | ||
else: | ||
self.default_log_name = "otel_python_inprocess_log_name_temp" | ||
self.client = client or LoggingServiceV2Client( | ||
transport=LoggingServiceV2GrpcTransport( | ||
channel=LoggingServiceV2GrpcTransport.create_channel( | ||
options=_OPTIONS, | ||
if route_logs_to_stdout_as_json and client: | ||
raise Exception( | ||
"Cannot route logs to stdout and set a logging client to send logs to." | ||
) | ||
if not route_logs_to_stdout_as_json: | ||
self.client = client or LoggingServiceV2Client( | ||
transport=LoggingServiceV2GrpcTransport( | ||
channel=LoggingServiceV2GrpcTransport.create_channel( | ||
options=_OPTIONS, | ||
) | ||
) | ||
) | ||
) | ||
|
||
def export(self, batch: Sequence[LogData]): | ||
now = datetime.datetime.now() | ||
|
@@ -215,11 +222,15 @@ def export(self, batch: Sequence[LogData]): | |
for k, v in attributes.items() | ||
} | ||
_set_payload_in_log_entry(log_entry, log_record.body) | ||
log_entries.append(log_entry) | ||
if self.route_logs_to_stdout_as_json: | ||
print(LogEntry.to_json(log_entry)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have you seen https://cloud.google.com/logging/docs/structured-logging? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm confused. Should I just be logging the jsonPayload field of the log ? |
||
else: | ||
log_entries.append(log_entry) | ||
|
||
self._write_log_entries(log_entries) | ||
if not self.route_logs_to_stdout_as_json: | ||
self._write_log_entries_to_cloud_logging(log_entries) | ||
|
||
def _write_log_entries(self, log_entries: list[LogEntry]): | ||
def _write_log_entries_to_cloud_logging(self, log_entries: list[LogEntry]): | ||
batch: list[LogEntry] = [] | ||
batch_byte_size = 0 | ||
for entry in log_entries: | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we need quite a bit more stuff here, like documenting why and how the user would use this.