Allow turning on JSON Detection in StackDriver #6293
Merged
Conversation
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
googlebot added the cla: yes 
crwilcox suggested changes Oct 24, 2018
| } | ||
| | ||
| if self._include_logger_name: | ||
| log_record['info']['python_logger'] = record.name |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
crwilcox reviewed Oct 24, 2018
| | ||
| def enqueue(self, record, message, resource=None, labels=None, | ||
| trace=None, span_id=None): | ||
| trace=None, span_id=None, include_logger_name=True): |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
tseaver suggested changes Oct 24, 2018
Contributor
tseaver left a comment
tseaver left a comment There was a problem hiding this comment.
We need test coverage for the case where the user disables adding the logger name.
To enable JSON detection in StackDriver, `jsonPayload` should have no fields other than `message`. This patch lets clients opt-in to this behavior, by creating a custom Transport. Fixes #5799
Contributor Author
Contributor Author
| @tseaver added tests and they seem to pass! |
yuvipanda added a commit to yuvipanda/mybinder.org-deploy that referenced this pull request Oct 25, 2018
This patch sends events (currently, just launches) to stackdriver. The events aren't parsed as JSON by stackdriver yet, but that should be fixed by googleapis/google-cloud-python#6293. You can find the events under 'Global -> binderhub-events-text'.
crwilcox added the kokoro:force-run 
kokoro-team removed the kokoro:force-run Contributor Author
| @crwilcox I found linting errors from @kokoro-team, and pushed a fix! Thanks |
tseaver added api: logging kokoro-team removed the kokoro:force-run Contributor Author
| I missed one lint failure, fixed now. Would be easier if lint ran on CircleCI or something earlier. |
Contributor
| Hi @yuvipanda . Thanks for the PR. Something 'funny' is going on with the test runs on GitHub right now. You should see a series of tests happening for this, but none are showing. We will need to sort that out before merging. |
Contributor Author
| @crwilcox are these the @kokoro-team tests or something else? Anything I can do? |
tseaver suggested changes Oct 26, 2018
| grace_period = 50 | ||
| max_batch_size = 50 | ||
| max_latency = 0.1 | ||
| include_logger_name = True |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| worker = self._make_one( | ||
| logger, grace_period=grace_period, max_batch_size=max_batch_size, | ||
| max_latency=max_latency) | ||
| max_latency=max_latency, include_logger_name=include_logger_name) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
| self.assertEqual(worker._grace_period, grace_period) | ||
| self.assertEqual(worker._max_batch_size, max_batch_size) | ||
| self.assertEqual(worker._max_latency, max_latency) | ||
| self.assertEqual(worker._include_logger_name, include_logger_name) |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
crwilcox added the kokoro:force-run kokoro-team removed the kokoro:force-run tseaver added the kokoro:force-run tseaver approved these changes Oct 26, 2018
kokoro-team removed the kokoro:force-run 
Contributor
| @crwilcox I believe your comments have been addressed. CI is green, so merge when ready. |
crwilcox approved these changes Oct 26, 2018
Contributor
| Thank you @yuvipanda for the contribution! |
Contributor Author
yuvipanda added a commit to yuvipanda/binderhub that referenced this pull request Oct 29, 2018
Includes googleapis/google-cloud-python#6293. Lets us push structured logs to stackdriver, rather than textual logs.
This was referenced Oct 29, 2018
tseaver added a commit that referenced this pull request Oct 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
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.
To enable JSON detection in StackDriver,
jsonPayloadshouldhave no fields other than
message. This patch lets clientsopt-in to this behavior, by creating a custom Transport.
Fixes #5799