Skip to content

Add MonitoredResource to interface #3386

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.

Sign up for GitHub

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

Merged
theacodes merged 22 commits into from
May 11, 2017
Merged

Add MonitoredResource to interface #3386

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c9c0733
Add MonitoredResource to interface
May 8, 2017
bb8bf4a
Add tests, fix stuff
May 9, 2017
5559ba9
more docs fixups
May 9, 2017
46eff7a
system tests fix and dhermes review
May 10, 2017
02d5ff3
fix year
May 10, 2017
ce6f32f
style fixups
May 10, 2017
cf0bd5c
style fixups
May 10, 2017
1aec1e8
make entry resource resource is never none
May 10, 2017
23f3c90
style mixup
May 10, 2017
de04ce3
Add coverage
May 10, 2017
762983c
fix cover
May 10, 2017
b0ce33a
missing tilde
May 10, 2017
040bd1c
dhermes comments
May 10, 2017
bcf54f8
fix 3.6
May 10, 2017
84ed6ac
dhermes
May 10, 2017
8df8c83
fix nox
May 10, 2017
4ba34a0
fix global nox
May 10, 2017
4d1ee71
touchups
May 10, 2017
6bb5ddd
style touchups
May 10, 2017
a2a6be2
style fixup
May 10, 2017
ef54bc1
dhermes comments
May 10, 2017
09c4d90
tweak docs
May 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
more docs fixups
  • Loading branch information
Bill Prin committed May 9, 2017
commit 5559ba9c9f811f29629963e40f9203863bada942
6 changes: 3 additions & 3 deletions logging/google/cloud/logging/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ def log_struct(self, info, client=None, labels=None, insert_id=None,
:param http_request: (optional) info about HTTP request associated with
the entry.

:type resource :class:``google.cloud.logging.resource`
:type resource :class:``google.cloud.logging.resource.Resource`

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

:param resource: (Optional) Monitored resource of the entry, defaults
to the global resource type.

Expand Down Expand Up @@ -291,7 +291,7 @@ def log_proto(self, message, client=None, labels=None, insert_id=None,
:param http_request: (optional) info about HTTP request associated with
the entry.

:type resource :class:``google.cloud.logging.resource`
:type resource :class:``google.cloud.logging.resource.Resource`

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

:param resource: (Optional) Monitored resource of the entry

:type timestamp: :class:`datetime.datetime`
Expand Down Expand Up @@ -473,7 +473,7 @@ def log_proto(self, message, labels=None, insert_id=None, severity=None,
:type timestamp: :class:`datetime.datetime`
:param timestamp: (optional) timestamp of event being logged.

:type resource :class:``google.cloud.logging.resource`
:type resource :class:``google.cloud.logging.resource.Resource`
:param resource: (Optional) Monitored resource of the entry
"""
self.entries.append(
Expand Down
4 changes: 2 additions & 2 deletions logging/nox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def lint(session):
Returns a failure if flake8 finds linting errors or sufficiently
serious code quality issues.
"""
session.interpreter = 'python3.6'
session.interpreter = 'python3.5'

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

session.install('flake8', *LOCAL_DEPS)
session.install('.')
session.run('flake8', 'google/cloud/logging')
Expand All @@ -95,7 +95,7 @@ def cover(session):
This outputs the coverage report aggregating coverage from the unit
test runs (not system test runs), and then erases coverage data.
"""
session.interpreter = 'python3.6'
session.interpreter = 'python3.5'

This comment was marked as spam.

Sign in to view

session.install('coverage', 'pytest-cov')
session.run('coverage', 'report', '--show-missing', '--fail-under=100')
session.run('coverage', 'erase')