Add MonitoredResource to interface #3386

waprin · 2017-05-08T23:01:10Z

This adds MonitoredResource as an option to higher level interface.

I also changed the variable name from resource to entry in make_entry_resource because its' confusing to call it a resource when resource is overloaded.

Tests/docs are TBD, wanted +1 on overall direction then I'll write them.

Some notes:

This is intended to be a non-breaking change to existing users. If you use log_text, log_struct etc the default is still the global resource. However, within a Batch you could also explicitly set it to None and wait to set it until the final commit call.
Copied the Resource class from Monitoring. They are the same proto so we could move it to a common package . We could also use the proto but unclear if that will work with the _gax. This is what @jonparrott suggested and I think is pretty.

cc @liyanhui1228 @duggelz

theacodes

@waprin I anticipate you'll also be making test updates? Both we need to verify that this works with both http and gax flavors.

logging/google/cloud/logging/logger.py

@@ -123,19 +128,24 @@ def _make_entry_resource(self, text=None, info=None, message=None,
        :type timestamp: :class:`datetime.datetime`
        :param timestamp: (Optional) timestamp of event being logged.

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


logging/google/cloud/logging/logger.py


-    def commit(self, client=None):
+    def commit(self, client=None, resource=None):


logging/google/cloud/logging/resource.py

+        ).format(**self.__dict__)
+
+
+class Resource(collections.namedtuple('Resource', 'type labels')):


waprin · 2017-05-08T23:50:14Z

Ya like I said just wanted +1 on overall direction before clean up tests docs since I hate writing all the tests/docs then being asked to totally change everything.

theacodes · 2017-05-09T16:51:01Z

@waprin direction looks good. Let me know when you're ready for another review.

waprin · 2017-05-09T21:51:32Z

@jonparrott ready for review, looks like we have an unrelated BigQuery system test failure.

theacodes

This mostly LGTM, with a few questions. I'd like @dhermes or @lukesneeringer to do a pass as well. :)

Thanks for doing this, @waprin!

logging/nox.py

@@ -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'


logging/tests/system.py

@@ -171,6 +171,24 @@ def test_log_text_with_timestamp(self):
        self.assertEqual(entries[0].payload, text_payload)
        self.assertEqual(entries[0].timestamp, now.replace(tzinfo=UTC))

+    def test_log_text_with_resource(self):


waprin · 2017-05-09T23:33:00Z

System test snafu, forgot they say success without running without service account locally, fixing now.

dhermes

Mostly cosmetic changes, but one primary question:

Why does the Batch have self.resource but it's methods also accept resource different than self.resource?

logging/google/cloud/logging/logger.py

+from google.cloud.logging.resource import Resource
+
+
+_GLOBAL_RESOURCE = Resource(type='global', labels={})


logging/google/cloud/logging/logger.py

@@ -123,19 +128,24 @@ def _make_entry_resource(self, text=None, info=None, message=None,
        :type timestamp: :class:`datetime.datetime`
        :param timestamp: (Optional) timestamp of event being logged.

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


logging/google/cloud/logging/logger.py

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


logging/google/cloud/logging/logger.py

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


logging/google/cloud/logging/logger.py

@@ -268,13 +291,17 @@ 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.Resource`


logging/tests/unit/test_logger.py

@@ -530,16 +551,19 @@ def test_ctor_defaults(self):
        self.assertEqual(len(batch.entries), 0)

    def test_log_text_defaults(self):
+        from google.cloud.logging.logger import _GLOBAL_RESOURCE


logging/google/cloud/logging/logger.py

        """
        self.entries.append(
            ('text', text, labels, insert_id, severity, http_request,
-             timestamp))
+             timestamp, resource))


logging/google/cloud/logging/logger.py

        """
        self.entries.append(
            ('struct', info, labels, insert_id, severity, http_request,
-             timestamp))
+             timestamp, resource))


logging/google/cloud/logging/logger.py

        """
        self.entries.append(
            ('proto', message, labels, insert_id, severity, http_request,
-             timestamp))
+             timestamp, resource))


logging/google/cloud/logging/logger.py

@@ -473,6 +517,8 @@ def commit(self, client=None):
                info = {'protoPayload': MessageToDict(entry)}
            else:
                raise ValueError('Unknown entry type: %s' % (entry_type,))
+            if resource is not None:
+                info['resource'] = resource._to_dict()


waprin · 2017-05-10T00:30:11Z

@dhermes as far as Batch resource goes...

If you look at the API, when you write multiple entries, you can give each individual entry a resource but also the higher level write call (which we encapsulate as a Batch) a resource. The Batch resource (self.resource) is used wherever entries are missing one. So a few places you suggested we should fall back to self.resource, but really what we want there is just for the entry resource to be missing so that Batch resource overrides it on server side.

Also since all the log_* calls default to the global resource, callers would have to explicitly specify None for the individual resources then set the Batch resource. Debatable whether this is a use case people actually want, @jonparrott seemed skeptical of whether it should go in there but I wanted to keep the client library somewhat aligned with the API. I suppose I could rip it out and just ignore the whole Batch resource aspect altogether and make Resource required on all the entry calls.

theacodes · 2017-05-10T16:21:52Z

@waprin I was skeptical because I didn't see that the api has that functionality. We should match the API. We shouldn't go through and fill in the resource for each entry on our end, we should just submit it as part of the request to the server (in both gax and http).

waprin · 2017-05-10T16:44:53Z

Right, I believe the way I did it best matches the API semantics. Only setting it at the Batch level is also not right because your Batch might contain entries of different resource type.

Fixing coverage now...

logging/google/cloud/logging/entries.py

@@ -72,16 +73,19 @@ class _BaseEntry(object):
    :type http_request: dict
    :param http_request: (optional) info about HTTP request associated with
                         the entry
+    :type resource :class:`google.cloud.logging.resource.Resource`


logging/google/cloud/logging/entries.py

@@ -170,14 +181,18 @@ class ProtobufEntry(_BaseEntry):
    :type http_request: dict
    :param http_request: (optional) info about HTTP request associated with
                         the entry
+
+    :type resource :class:`google.cloud.logging.resource.Resource`


logging/google/cloud/logging/logger.py

@@ -344,11 +367,15 @@ class Batch(object):

    :type client: :class:`google.cloud.logging.client.Client`
    :param client: The client to use.
+
+    :type resource: :class:`google.cloud.logging.resource.Resource`


logging/google/cloud/logging/logger.py

            'logName': self.full_name,
-            'resource': {'type': 'global'},
+            'resource': resource._to_dict()


logging/google/cloud/logging/logger.py

        """
        self.entries.append(
            ('text', text, labels, insert_id, severity, http_request,
-             timestamp))
+             timestamp, resource))


logging/nox.py

@@ -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'


logging/tests/system.py

@@ -1,4 +1,4 @@
-# Copyright 2016 Google Inc.
+# Copyright 2017 Google Inc.


logging/tests/system.py

+            labels={
+                'module_id': 'default',
+                'version_id': 'test'
+        })


logging/tests/unit/test_entries.py

+                'labels': {
+                    'module_id':'default',
+                    'version': 'test'
+        }})


logging/tests/unit/test_logger.py

@@ -329,6 +338,8 @@ def test_log_proto_w_default_labels(self):
            'protoPayload': json.loads(MessageToJson(message)),
            'resource': {
                'type': 'global',
+                'labels': {},
+


waprin · 2017-05-10T20:44:00Z

@jonparrott @dhermes docs built, just looked carefully at all the styles/docs issue and all lgtm so this is ready for another pass

logging/google/cloud/logging/entries.py

@@ -72,16 +73,19 @@ class _BaseEntry(object):
    :type http_request: dict
    :param http_request: (optional) info about HTTP request associated with
                         the entry
+    :type resource: :class:`~google.cloud.logging.resource.Resource`


logging/google/cloud/logging/logger.py

@@ -268,13 +287,17 @@ 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.Resource`
+        :param resource: Monitored resource of the entry


logging/google/cloud/logging/logger.py

@@ -379,13 +406,17 @@ def log_text(self, text, 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.Resource`
+        :param resource: (Optional) Monitored resource of the entry


waprin · 2017-05-11T16:24:38Z

@dhermes ready for another pass/merge

theacodes

Looks almost good to me, two outstanding questions.

logging/google/cloud/logging/logger.py

@@ -91,7 +95,8 @@ def batch(self, client=None):

    def _make_entry_resource(self, text=None, info=None, message=None,
                             labels=None, insert_id=None, severity=None,
-                             http_request=None, timestamp=None):
+                             http_request=None, timestamp=None,
+                             resource=_GLOBAL_RESOURCE):


logging/tests/system.py

@@ -171,6 +171,24 @@ def test_log_text_with_timestamp(self):
        self.assertEqual(entries[0].payload, text_payload)
        self.assertEqual(entries[0].timestamp, now.replace(tzinfo=UTC))

+    def test_log_text_with_resource(self):


waprin · 2017-05-11T17:50:07Z

System tests default to whatever the Client defaults to which is usually gRPC unless it's not supported. It seems a reasonable idea to parametrize the system tests to run with gRPC on and off, but don't think that's particular to these tests. Will create separate issue.

jaitaiwan · 2017-05-24T06:59:24Z

Hey guys, when will this be released in the google-cloud-logging package?

dhermes · 2017-05-24T15:17:43Z

@lukesneeringer I can do a release today. WDYT?

bjwatson · 2017-06-22T17:12:24Z

@tseaver I've had an internal request to release this Logging fix ASAP. Since you're planning to do new releases this week, this should be covered, but I just wanted to make sure.

tseaver · 2017-06-23T20:30:21Z

@bjwatson Still on my radar: at this point I will be making releases over the weekend, to catch up with some unplanned sitting-in-waiting-room time this week.

bjwatson · 2017-06-23T20:33:16Z

Thanks @tseaver! Sorry to hear about excessive waiting room time this week.

…s-samples#3386) Fix: GoogleCloudPlatform/python-docs-samples#3381

@nnegrey

* Add new "quickstart" samples [(#547)](GoogleCloudPlatform/python-docs-samples#547) * Quickstart tests [(#569)](GoogleCloudPlatform/python-docs-samples#569) * Add tests for quickstarts * Update secrets * Add translate samples [(#574)](GoogleCloudPlatform/python-docs-samples#574) * Generate most non-appengine readmes Change-Id: I3779282126cdd05b047194d356932b9995484115 * Update requirements.txt * added model in the sample [(#650)](GoogleCloudPlatform/python-docs-samples#650) * added with and without model separately [(#657)](GoogleCloudPlatform/python-docs-samples#657) * Translate API no longer requires an API key. [(#659)](GoogleCloudPlatform/python-docs-samples#659) * Auto-update dependencies. [(#715)](GoogleCloudPlatform/python-docs-samples#715) * Changes default model to premium [(#749)](GoogleCloudPlatform/python-docs-samples#749) * Updates readme template to show credential auth instead of api key. [(#802)](GoogleCloudPlatform/python-docs-samples#802) * Updates translate version to match speech and language. [(#843)](GoogleCloudPlatform/python-docs-samples#843) * Translate update [(#886)](GoogleCloudPlatform/python-docs-samples#886) * Remove cloud config fixture [(#887)](GoogleCloudPlatform/python-docs-samples#887) * Remove cloud config fixture * Fix client secrets * Fix bigtable instance * Unicode for translation * Adds check for translated text * Unicode for translation * Unicode for translation * Unicode for translation * missing newline * Adds six for 2/3 compatibility * Changes encoding style. * Fix unicode * renaming of the product to Google Translation API [(#910)](GoogleCloudPlatform/python-docs-samples#910) * Update translate readme * Re-generate all readmes * Fix README rst links [(#962)](GoogleCloudPlatform/python-docs-samples#962) * Fix README rst links * Update all READMEs * Auto-update dependencies. [(#1004)](GoogleCloudPlatform/python-docs-samples#1004) * Auto-update dependencies. * Fix natural language samples * Fix pubsub iam samples * Fix language samples * Fix bigquery samples * Auto-update dependencies. [(#1055)](GoogleCloudPlatform/python-docs-samples#1055) * Auto-update dependencies. * Explicitly use latest bigtable client Change-Id: Id71e9e768f020730e4ca9514a0d7ebaa794e7d9e * Revert language update for now Change-Id: I8867f154e9a5aae00d0047c9caf880e5e8f50c53 * Remove pdb. smh Change-Id: I5ff905fadc026eebbcd45512d4e76e003e3b2b43 * Auto-update dependencies. [(#1093)](GoogleCloudPlatform/python-docs-samples#1093) * Auto-update dependencies. * Fix storage notification poll sample Change-Id: I6afbc79d15e050531555e4c8e51066996717a0f3 * Fix spanner samples Change-Id: I40069222c60d57e8f3d3878167591af9130895cb * Drop coverage because it's not useful Change-Id: Iae399a7083d7866c3c7b9162d0de244fbff8b522 * Try again to fix flaky logging test Change-Id: I6225c074701970c17c426677ef1935bb6d7e36b4 * Update all generated readme auth instructions [(#1121)](GoogleCloudPlatform/python-docs-samples#1121) Change-Id: I03b5eaef8b17ac3dc3c0339fd2c7447bd3e11bd2 * Added Link to Python Setup Guide [(#1158)](GoogleCloudPlatform/python-docs-samples#1158) * Update Readme.rst to add Python setup guide As requested in b/64770713. This sample is linked in documentation https://cloud.google.com/bigtable/docs/scaling, and it would make more sense to update the guide here than in the documentation. * Update README.rst * Update README.rst * Update README.rst * Update README.rst * Update README.rst * Update install_deps.tmpl.rst * Updated readmegen scripts and re-generated related README files * Fixed the lint error * Auto-update dependencies. [(#1186)](GoogleCloudPlatform/python-docs-samples#1186) * Fixed failed tests on Kokoro (Spanner + Translate) [(#1192)](GoogleCloudPlatform/python-docs-samples#1192) * Fixed failed tests on Kokoro (Spanner + Translate) * Update quickstart_test.py * Added "Open in Cloud Shell" buttons to README files [(#1254)](GoogleCloudPlatform/python-docs-samples#1254) * Auto-update dependencies. [(#1377)](GoogleCloudPlatform/python-docs-samples#1377) * Auto-update dependencies. * Update requirements.txt * Regenerate the README files and fix the Open in Cloud Shell link for some samples [(#1441)](GoogleCloudPlatform/python-docs-samples#1441) * Update READMEs to fix numbering and add git clone [(#1464)](GoogleCloudPlatform/python-docs-samples#1464) * Add translate region tags [(#1488)](GoogleCloudPlatform/python-docs-samples#1488) * Add region tags * Added end region tags * Linting errors fixed * Include the comma in the translation [(#1787)](GoogleCloudPlatform/python-docs-samples#1787) * Auto-update dependencies. [(#1980)](GoogleCloudPlatform/python-docs-samples#1980) * Auto-update dependencies. * Update requirements.txt * Update requirements.txt * Translation v3beta1 samples [(#2084)](GoogleCloudPlatform/python-docs-samples#2084) * Add in progress beta snippets Change-Id: I2cd8ddc2307a8e40d56ce7e493749dc05c34d164 * Add google-cloud-storage dependency Change-Id: Iff7bc9b2c82b1e829580a3d4ad628087dbeee8be * Non-'global' location required for BatchTranslateText Change-Id: I5198aa6368a088e8f5ee295dc55a5e9e4ca8f494 * Upgrade google-cloud-translate to 1.4.0 1.4.0 includes the new v3beta1 alongside V2 Change-Id: I5adfe78ea7e78d84678db343cd84516e3d05491f * Update Translate samples You can now provide your own glossary ID The tests now run within a randomly created bucket (deleted after each test) Change-Id: I5cb2680cd0e9e43c85932a6a0dc19e6fab5008c5 * pytest.fixture for random test bucket Change-Id: I8e816ed4c95a6235347a29849044b4cab02d40a8 * flake8 spec fixes Change-Id: I4932bcf856a9498b01d9661c90c6b45ee2958ee1 * Added pytest fixture for creating glossary (WIP) Change-Id: Iddb5ecbf0eefb9efd2243dc4bc56b585102e9351 * Add assertions, remove placeholder TODOs Change-Id: If1eb20bca5bfcc87dd0652d5488b2188afa626af * fixing translate-with-glossary bug [(#2323)](GoogleCloudPlatform/python-docs-samples#2323) * Translate beta samples fix [(#2327)](GoogleCloudPlatform/python-docs-samples#2327) * fixing translate-with-glossary bug * tests passing * reverting to python3 compatibility * snippets test fix * Using glossaries with tts and vision tutorial sample code [(#2325)](GoogleCloudPlatform/python-docs-samples#2325) * fixing translate-with-glossary bug * initial commit * adding resources * adding more resources * glossary accomodates upper case words * finished hybrid glossaries tutorial sample code * Revert "fixing translate-with-glossary bug" This reverts commit 6a9f7ca3f68239a862106fcbcd9c73649ce36c77. * lint fix for tests. TODO src lint fix * lint * it's the final lint-down * adding README * implementing @nnegrey's feedback * lint * lint * extracting files from cloud-client * lint comment test * fixing comments per @beccasaurus * removing redundant directory * implementing @nnegrey's feedback * lint * lint * handling glossary-already-exists exception * lint * adding ssml functionality * fixing imports per @nnegrey * fixed import comment * more specific exceptions import * removing period from copyright * fix: refactored MP3 file creation test for Hybrid glossaries samples [(#2379)](GoogleCloudPlatform/python-docs-samples#2379) * fix: refactored MP3 file creation test * fix: lint * Fix variable names in comments [(#2400)](GoogleCloudPlatform/python-docs-samples#2400) * Adds updates for samples profiler ... vision [(#2439)](GoogleCloudPlatform/python-docs-samples#2439) * Update v2 samples to explicitly use v2 library [(#2498)](GoogleCloudPlatform/python-docs-samples#2498) * fix: translate test [(#2671)](GoogleCloudPlatform/python-docs-samples#2671) * fix: translate test * Add unicode formatting * automl: add natural language sentiment analysis ga samples [(#2677)](GoogleCloudPlatform/python-docs-samples#2677) * automl: add natural language sentiment analysis ga samples * Add links to documentation * Update tests to use centralized project * Fix environment variable, make translate test less flaky * fix region tag typo [(#2731)](GoogleCloudPlatform/python-docs-samples#2731) * Migrate published samples [(#2759)](GoogleCloudPlatform/python-docs-samples#2759) Migrate from tmp-generated-samples branch 615c08e Remove boilerplate Update copyright date Blacken Remove unused imports Shorten docstrings Remove CLI Set defaults in function definition Add link to supported types guide Inline function arguments Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> * translate v3 snippets [(#2745)](GoogleCloudPlatform/python-docs-samples#2745) * translate text v3 * added translate text with glossary snippets * finished glossary tests * removed overlapping files * added encoding tag * added more descriptive docs and broke down tests * Update translate/cloud-client/translate_v3_create_glossary.py Co-Authored-By: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> * Update translate/cloud-client/translate_v3_create_glossary.py Co-Authored-By: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> * fixed test for translate with glossary * fixed lint Co-authored-by: Michelle Casbon <texasmichelle@users.noreply.github.com> Co-authored-by: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> * Translate: migrate published samples [(#2768)](GoogleCloudPlatform/python-docs-samples#2768) Migrate from tmp-generated-samples branch 615c08e Remove boilerplate Update copyright date Blacken Remove unused imports * Translate: migrate published glossaries samples [(#2769)](GoogleCloudPlatform/python-docs-samples#2769) Migrate from tmp-generated-samples branch fef998b Remove boilerplate Update copyright date Blacken Remove unused imports Shorten docstrings Remove CLI * translate: increase timeout [(#2937)](GoogleCloudPlatform/python-docs-samples#2937) * Translate: migrate published v3 translate batch samples [(#2914)](GoogleCloudPlatform/python-docs-samples#2914) * Translate: migrate published b v3 tch samples * added missing requirements * extended wait time * inlined some vals and specified input and output * added link to supported file types & modified default values of input uri * fixed small nit * chore(deps): update dependency google-cloud-storage to v1.26.0 [(#3046)](GoogleCloudPlatform/python-docs-samples#3046) * chore(deps): update dependency google-cloud-storage to v1.26.0 * chore(deps): specify dependencies by python version * chore: up other deps to try to remove errors Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> Co-authored-by: Leah Cole <coleleah@google.com> * chore(deps): update dependency google-cloud-translate to v1.7.0 [(#3084)](GoogleCloudPlatform/python-docs-samples#3084) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-translate](https://github.com/googleapis/python-translate) | minor | `==1.6.0` -> `==1.7.0` | --- ### Release Notes <details> <summary>googleapis/python-translate</summary> ### [`v1.7.0`](https://github.com/googleapis/python-translate/blob/master/CHANGELOG.md#170) [Compare Source](https://github.com/googleapis/python-translate/compare/v1.6.0...v1.7.0) 10-07-2019 14:57 PDT ##### Implementation Changes - Update docstrings, client confg (via synth). ([#9411](https://github.com/googleapis/google-cloud-python/pull/9411)) - Remove send / receive message size limit (via synth). ([#8974](https://github.com/googleapis/google-cloud-python/pull/8974)) ##### New Features - Add support for V3 of the API. ([#9020](https://github.com/googleapis/google-cloud-python/pull/9020)) - Make `parent` argument required for all client methods in v3beta1; add `labels` argument (via synth). ([#9354](https://github.com/googleapis/google-cloud-python/pull/9354)) - Add client options to translate_v2. ([#8737](https://github.com/googleapis/google-cloud-python/pull/8737)) ##### Dependencies - Bump minimum version for google-api-core to 1.14.0. ([#8709](https://github.com/googleapis/google-cloud-python/pull/8709)) ##### Documentation - Fix links to reference documentation. ([#8884](https://github.com/googleapis/google-cloud-python/pull/8884)) - Link to googleapis.dev documentation in READMEs. ([#8705](https://github.com/googleapis/google-cloud-python/pull/8705)) ##### Internal / Testing Changes - Update `ListGlossaries` method annotation (via synth) ([#9385](https://github.com/googleapis/google-cloud-python/pull/9385)) - Fix intersphinx reference to requests ([#9294](https://github.com/googleapis/google-cloud-python/pull/9294)) - Remove CI for gh-pages, use googleapis.dev for api_core refs. ([#9085](https://github.com/googleapis/google-cloud-python/pull/9085)) - Update intersphinx mapping for requests. ([#8805](https://github.com/googleapis/google-cloud-python/pull/8805)) </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). * translate: fix tests [(#3087)](GoogleCloudPlatform/python-docs-samples#3087) Fix: GoogleCloudPlatform/python-docs-samples#3018 * translate-v3: samples [(#3034)](GoogleCloudPlatform/python-docs-samples#3034) * translate with custom model, get supported langs * inlined small nit * added encoding to model test * added missing region tags and link to supported langs * inlined text-to-translate * directly inlined contents * revert text-translate vars * reversed inlined text params * small nit Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> * chore(deps): update dependency google-cloud-vision to v0.42.0 [(#3170)](GoogleCloudPlatform/python-docs-samples#3170) * chore(deps): update dependency google-cloud-texttospeech to v1 [(#3210)](GoogleCloudPlatform/python-docs-samples#3210) Co-authored-by: gcf-merge-on-green[bot] <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> * chore(deps): update dependency google-cloud-translate to v2 [(#3211)](GoogleCloudPlatform/python-docs-samples#3211) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-translate](https://github.com/googleapis/python-translate) | major | `==1.7.0` -> `==2.0.1` | --- ### Release Notes <details> <summary>googleapis/python-translate</summary> ### [`v2.0.1`](https://github.com/googleapis/python-translate/blob/master/CHANGELOG.md#201-httpswwwgithubcomgoogleapispython-translatecomparev200v201-2020-01-31) [Compare Source](https://github.com/googleapis/python-translate/compare/v2.0.0...v2.0.1) ### [`v2.0.0`](https://github.com/googleapis/python-translate/blob/master/CHANGELOG.md#200) [Compare Source](https://github.com/googleapis/python-translate/compare/v1.7.0...v2.0.0) 10-23-2019 11:13 PDT ##### New Features - Make v3 the default client. ([#9498](https://github.com/googleapis/google-cloud-python/pull/9498)) ##### Internal / Testing Changes - Add VPC-SC system tests. ([#9272](https://github.com/googleapis/google-cloud-python/pull/9272)) </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). * Simplify noxfile setup. [(#2806)](GoogleCloudPlatform/python-docs-samples#2806) * chore(deps): update dependency requests to v2.23.0 * Simplify noxfile and add version control. * Configure appengine/standard to only test Python 2.7. * Update Kokokro configs to match noxfile. * Add requirements-test to each folder. * Remove Py2 versions from everything execept appengine/standard. * Remove conftest.py. * Remove appengine/standard/conftest.py * Remove 'no-sucess-flaky-report' from pytest.ini. * Add GAE SDK back to appengine/standard tests. * Fix typo. * Roll pytest to python 2 version. * Add a bunch of testing requirements. * Remove typo. * Add appengine lib directory back in. * Add some additional requirements. * Fix issue with flake8 args. * Even more requirements. * Readd appengine conftest.py. * Add a few more requirements. * Even more Appengine requirements. * Add webtest for appengine/standard/mailgun. * Add some additional requirements. * Add workaround for issue with mailjet-rest. * Add responses for appengine/standard/mailjet. Co-authored-by: Renovate Bot <bot@renovateapp.com> * Update dependency google-cloud-vision to v1 [(#3227)](GoogleCloudPlatform/python-docs-samples#3227) This PR contains the following updates: | Package | Update | Change | |---|---|---| | [google-cloud-vision](https://github.com/googleapis/python-vision) | major | `==0.42.0` -> `==1.0.0` | --- ### Release Notes <details> <summary>googleapis/python-vision</summary> ### [`v1.0.0`](https://github.com/googleapis/python-vision/blob/master/CHANGELOG.md#100-httpswwwgithubcomgoogleapispython-visioncomparev0420v100-2020-02-28) [Compare Source](https://github.com/googleapis/python-vision/compare/v0.42.0...v1.0.0) ##### Features - bump release status to GA ([#11](https://www.github.com/googleapis/python-vision/issues/11)) ([2129bde](https://www.github.com/googleapis/python-vision/commit/2129bdedfa0dca85c5adc5350bff10d4a485df77)) </details> --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Never, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#GoogleCloudPlatform/python-docs-samples). * translate: make test generic [(#3386)](GoogleCloudPlatform/python-docs-samples#3386) Fix: GoogleCloudPlatform/python-docs-samples#3381 * [translate] fix: mark some tests as flaky [(#3495)](GoogleCloudPlatform/python-docs-samples#3495) tests which involve LRO. fixes #2875 * testing: replace @flaky with @pytest.mark.flaky [(#3496)](GoogleCloudPlatform/python-docs-samples#3496) * testing: replace @flaky with @pytest.mark.flaky * lint * mark few tests as flaky that involves LRO polling. * lint * chore(deps): update dependency google-cloud-storage to v1.28.0 [(#3260)](GoogleCloudPlatform/python-docs-samples#3260) Co-authored-by: Takashi Matsuo <tmatsuo@google.com> * translate: fix glossary leak issue [(#3572)](GoogleCloudPlatform/python-docs-samples#3572) * fix glossary leak issue * removed try/catch from teardown methods, removed sample_ prefix from all other methods * added specific exceptions to tests, added backoff tags to tests * fixed the lint issues * reordered imports * moved backoff inside methd and removed Retry * corrected import nit * chore: some lint fixes [(#3751)](GoogleCloudPlatform/python-docs-samples#3751) * chore: some lint fixes * longer timeout, more retries * disable detect_test.py::test_async_detect_document * chore(deps): update dependency google-cloud-storage to v1.28.1 [(#3785)](GoogleCloudPlatform/python-docs-samples#3785) * chore(deps): update dependency google-cloud-storage to v1.28.1 * [asset] testing: use uuid instead of time Co-authored-by: Takashi Matsuo <tmatsuo@google.com> * [translate] fix hybrid glossaries tests [(#3936)](GoogleCloudPlatform/python-docs-samples#3936) * testing: start using btlr [(#3959)](GoogleCloudPlatform/python-docs-samples#3959) * testing: start using btlr The binary is at gs://cloud-devrel-kokoro-resources/btlr/v0.0.1/btlr * add period after DIFF_FROM * use array for btlr args * fix websocket tests * add debug message * wait longer for the server to spin up * dlp: bump the wait timeout to 10 minutes * [run] copy noxfile.py to child directory to avoid gcloud issue * [iam] fix: only display description when the key exists * use uuid4 instead of uuid1 * [iot] testing: use the same format for registry id * Stop asserting Out of memory not in the output * fix missing imports * [dns] testing: more retries with delay * [dlp] testing: longer timeout * use the max-concurrency flag * use 30 workers * [monitoring] use multiple projects * [dlp] testing: longer timeout * Replace GCLOUD_PROJECT with GOOGLE_CLOUD_PROJECT. [(#4022)](GoogleCloudPlatform/python-docs-samples#4022) * remove whitelist replace with allowlist [(#4050)](GoogleCloudPlatform/python-docs-samples#4050) * chore(deps): update dependency google-cloud-storage to v1.29.0 [(#4040)](GoogleCloudPlatform/python-docs-samples#4040) * chore(deps): update dependency google-cloud-texttospeech to v2.1.0 [(#4147)](GoogleCloudPlatform/python-docs-samples#4147) * testing(translate): parameterize the timeout [(#4247)](GoogleCloudPlatform/python-docs-samples#4247) fixes #4239 (by specifying a longer timeout) * chore(deps): update dependency pytest to v5.4.3 [(#4279)](GoogleCloudPlatform/python-docs-samples#4279) * chore(deps): update dependency pytest to v5.4.3 * specify pytest for python 2 in appengine Co-authored-by: Leah Cole <coleleah@google.com> * Update dependency flaky to v3.7.0 [(#4300)](GoogleCloudPlatform/python-docs-samples#4300) * testing(translate): bump the timeout for operations [(#4258)](GoogleCloudPlatform/python-docs-samples#4258) fixes #4220 * chore: update templates * chore: narrows samples CODEOWNERS to .py only * chore: wip migration to microgenerator client, units, docs complete * feat!: move API to python microgenerator * docs: readmegen updates * chore: add build config for docs-presubmit * chore: rm protos * chore: uses PROJECT_ID env var in system test * chore: clarifies examples in migration guide * chore: adds explicit variable Co-authored-by: Jason Dobry <jmdobry@users.noreply.github.com> Co-authored-by: Jon Wayne Parrott <jonwayne@google.com> Co-authored-by: Puneith Kaul <puneith@users.noreply.github.com> Co-authored-by: DPE bot <dpebot@google.com> Co-authored-by: Gus Class <gguuss@gmail.com> Co-authored-by: florencep <florenceperot@google.com> Co-authored-by: Bill Prin <waprin@gmail.com> Co-authored-by: michaelawyu <chenyumic@google.com> Co-authored-by: Frank Natividad <frankyn@users.noreply.github.com> Co-authored-by: Averi Kitsch <akitsch@google.com> Co-authored-by: Charles Engelke <github@engelke.com> Co-authored-by: Rebecca Taylor <remilytaylor@gmail.com> Co-authored-by: Elizabeth Crowdus <elcrowdus@gmail.com> Co-authored-by: Noah Negrey <nnegrey@users.noreply.github.com> Co-authored-by: Leah E. Cole <6719667+leahecole@users.noreply.github.com> Co-authored-by: Michelle Casbon <texasmichelle@users.noreply.github.com> Co-authored-by: Mike <45373284+munkhuushmgl@users.noreply.github.com> Co-authored-by: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Co-authored-by: WhiteSource Renovate <bot@renovateapp.com> Co-authored-by: Leah Cole <coleleah@google.com> Co-authored-by: gcf-merge-on-green[bot] <60162190+gcf-merge-on-green[bot]@users.noreply.github.com> Co-authored-by: Takashi Matsuo <tmatsuo@google.com> Co-authored-by: Bu Sun Kim <8822365+busunkim96@users.noreply.github.com>

Add MonitoredResource to interface

c9c0733

googlebot added the cla: yes This human has signed the Contributor License Agreement. label May 8, 2017

waprin requested a review from theacodes May 8, 2017 23:01

theacodes self-assigned this May 8, 2017

theacodes suggested changes May 8, 2017

View reviewed changes

Bill Prin added 2 commits May 9, 2017 14:15

Add tests, fix stuff

bb8bf4a

more docs fixups

5559ba9

waprin changed the title ~~[DO NOT MERGE] Add MonitoredResource to interface~~ Add MonitoredResource to interface May 9, 2017

theacodes approved these changes May 9, 2017

View reviewed changes

dhermes reviewed May 9, 2017

View reviewed changes

Bill Prin added 2 commits May 9, 2017 17:20

system tests fix and dhermes review

46eff7a

fix year

02d5ff3

Bill Prin added 2 commits May 9, 2017 17:33

style fixups

ce6f32f

style fixups

cf0bd5c

Bill Prin added 3 commits May 10, 2017 09:51

make entry resource resource is never none

1aec1e8

style mixup

23f3c90

Add coverage

de04ce3

dhermes reviewed May 10, 2017

View reviewed changes

Bill Prin added 5 commits May 10, 2017 11:28

fix cover

762983c

missing tilde

b0ce33a

dhermes comments

040bd1c

fix 3.6

bcf54f8

dhermes

84ed6ac

Bill Prin added 5 commits May 10, 2017 12:34

fix nox

8df8c83

fix global nox

4ba34a0

touchups

4d1ee71

style touchups

6bb5ddd

style fixup

a2a6be2

dhermes reviewed May 10, 2017

View reviewed changes

Bill Prin added 2 commits May 10, 2017 14:56

dhermes comments

ef54bc1

tweak docs

09c4d90

theacodes reviewed May 11, 2017

View reviewed changes

theacodes approved these changes May 11, 2017

View reviewed changes

theacodes merged commit 20f3368 into master May 11, 2017

theacodes deleted the logging_resource branch May 11, 2017 17:52

theacodes mentioned this pull request May 11, 2017

Python Logging API always defaults to Custom logs #2673

Closed

waprin mentioned this pull request May 11, 2017

Should system tests be parametrized to run under both HTTP and gRPC? #3403

Closed

tseaver mentioned this pull request Jun 26, 2017

Prep logging-1.1.0 release. #3528

Merged

parthea pushed a commit that referenced this pull request Oct 21, 2023

translate: make test generic [(#3386)](GoogleCloudPlatform/python-doc…

426a4ce

…s-samples#3386) Fix: GoogleCloudPlatform/python-docs-samples#3381


		def commit(self, client=None):
		def commit(self, client=None, resource=None):

		).format(**self.__dict__)


		class Resource(collections.namedtuple('Resource', 'type labels')):

		from google.cloud.logging.resource import Resource


		_GLOBAL_RESOURCE = Resource(type='global', labels={})

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

		@@ -1,4 +1,4 @@
		# Copyright 2016 Google Inc.
		# Copyright 2017 Google Inc.

Add MonitoredResource to interface #3386

Add MonitoredResource to interface #3386

Conversation

waprin commented May 8, 2017

theacodes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 8, 2017

theacodes commented May 9, 2017

waprin commented May 9, 2017

theacodes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 9, 2017

dhermes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 10, 2017

theacodes commented May 10, 2017

waprin commented May 10, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 10, 2017

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 11, 2017

theacodes left a comment

Choose a reason for hiding this comment

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

waprin commented May 11, 2017

jaitaiwan commented May 24, 2017

dhermes commented May 24, 2017