Repository: googleapis/google-cloud-python

Issue:
Logging system tests broken
https://travis-ci.org/GoogleCloudPlatform/google-cloud-python/builds/205851892#L2768

```python
Traceback (most recent call last):
  File "/home/travis/build/GoogleCloudPlatform/google-cloud-python/system_tests/logging_.py", line 440, in test_update_sink
    self.assertFalse(sink.exists())
  File "/home/travis/build/GoogleCloudPlatform/google-cloud-python/.tox/system-tests/lib/python2.7/site-packages/google/cloud/logging/sink.py", line 138, in exists
    client.sinks_api.sink_get(self.project, self.name)
  File "/home/travis/build/GoogleCloudPlatform/google-cloud-python/.tox/system-tests/lib/python2.7/site-packages/google/cloud/logging/client.py", line 134, in sinks_api
    self._sinks_api = make_gax_sinks_api(self)
  File "/home/travis/build/GoogleCloudPlatform/google-cloud-python/.tox/system-tests/lib/python2.7/site-packages/google/cloud/logging/_gax.py", line 573, in make_gax_sinks_api
    channel=channel, lib_name='gccl', lib_version=__version__)
TypeError: __init__() got an unexpected keyword argument 'lib_name'
```

Preliminarily assigning to Luke.


Discussion:
Yep, that belongs to me. Thanks.

Resolving patch:
diff --git a/logging/google/cloud/logging/_gax.py b/logging/google/cloud/logging/_gax.py
--- a/logging/google/cloud/logging/_gax.py
+++ b/logging/google/cloud/logging/_gax.py
@@ -26,9 +26,9 @@
 from google.gax import INITIAL_PAGE
 from google.gax.errors import GaxError
 from google.gax.grpc import exc_to_code
-from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
-from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
-from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
+from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
+from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
 from google.protobuf.json_format import MessageToDict
 from google.protobuf.json_format import ParseDict
 from grpc import StatusCode
diff --git a/logging/setup.py b/logging/setup.py
--- a/logging/setup.py
+++ b/logging/setup.py
@@ -52,12 +52,12 @@
 REQUIREMENTS = [
     'google-cloud-core >= 0.23.1, < 0.24dev',
     'grpcio >= 1.0.2, < 2.0dev',
-    'gapic-google-cloud-logging-v2 >= 0.90.1, < 0.91dev',
+    'gapic-google-cloud-logging-v2 >= 0.91.0, < 0.92dev',
 ]
 
 setup(
     name='google-cloud-logging',
-    version='0.23.0',
+    version='0.23.1',
     description='Python Client for Stackdriver Logging',
     long_description=README,
     namespace_packages=[


Test patch:
diff --git a/logging/unit_tests/test__gax.py b/logging/unit_tests/test__gax.py
--- a/logging/unit_tests/test__gax.py
+++ b/logging/unit_tests/test__gax.py
@@ -68,7 +68,7 @@ def test_list_entries_no_paging(self):
 
         from google.api.monitored_resource_pb2 import MonitoredResource
         from google.gax import INITIAL_PAGE
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
 
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from google.cloud._helpers import UTC
@@ -126,7 +126,7 @@ def _list_entries_with_paging_helper(self, payload, struct_pb):
         import datetime
 
         from google.api.monitored_resource_pb2 import MonitoredResource
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
         from google.cloud._helpers import _datetime_to_pb_timestamp
         from google.cloud._helpers import UTC
         from google.cloud._testing import _GAXPageIterator
@@ -217,8 +217,8 @@ def test_list_entries_with_paging_nested_payload(self):
 
     def _make_log_entry_with_extras(self, labels, iid, type_url, now):
         from google.api.monitored_resource_pb2 import MonitoredResource
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import (
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import (
             LogEntryOperation)
         from google.logging.type.http_request_pb2 import HttpRequest
         from google.logging.type.log_severity_pb2 import WARNING
@@ -334,7 +334,7 @@ def test_list_entries_with_extra_properties(self):
         self.assertEqual(options.page_token, TOKEN)
 
     def test_write_entries_single(self):
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
 
         TEXT = 'TEXT'
         ENTRY = {
@@ -368,7 +368,7 @@ def test_write_entries_w_extra_properties(self):
         # pylint: disable=too-many-statements
         from datetime import datetime
         from google.logging.type.log_severity_pb2 import WARNING
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
         from google.cloud._helpers import UTC, _pb_timestamp_to_datetime
 
         NOW = datetime.utcnow().replace(tzinfo=UTC)
@@ -464,7 +464,7 @@ def _write_entries_multiple_helper(self, json_payload, json_struct_pb):
         # pylint: disable=too-many-statements
         import datetime
         from google.logging.type.log_severity_pb2 import WARNING
-        from google.cloud.grpc.logging.v2.log_entry_pb2 import LogEntry
+        from google.cloud.proto.logging.v2.log_entry_pb2 import LogEntry
         from google.protobuf.any_pb2 import Any
         from google.cloud._helpers import _datetime_to_rfc3339
         from google.cloud._helpers import UTC
@@ -635,7 +635,7 @@ def test_ctor(self):
     def test_list_sinks_no_paging(self):
         import six
         from google.gax import INITIAL_PAGE
-        from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
+        from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.logging.sink import Sink
 
@@ -670,7 +670,7 @@ def test_list_sinks_no_paging(self):
         self.assertEqual(options.page_token, INITIAL_PAGE)
 
     def test_list_sinks_w_paging(self):
-        from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
+        from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.logging.sink import Sink
 
@@ -728,7 +728,7 @@ def test_sink_create_conflict(self):
                 self.DESTINATION_URI)
 
     def test_sink_create_ok(self):
-        from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
+        from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
 
         gax_api = _GAXSinksAPI()
         api = self._make_one(gax_api, None)
@@ -764,7 +764,7 @@ def test_sink_get_miss(self):
             api.sink_get(self.PROJECT, self.SINK_NAME)
 
     def test_sink_get_hit(self):
-        from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
+        from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
 
         RESPONSE = {
             'name': self.SINK_PATH,
@@ -808,7 +808,7 @@ def test_sink_update_miss(self):
                 self.DESTINATION_URI)
 
     def test_sink_update_hit(self):
-        from google.cloud.grpc.logging.v2.logging_config_pb2 import LogSink
+        from google.cloud.proto.logging.v2.logging_config_pb2 import LogSink
 
         response = LogSink(name=self.SINK_NAME,
                            destination=self.DESTINATION_URI,
@@ -877,7 +877,7 @@ def test_ctor(self):
     def test_list_metrics_no_paging(self):
         import six
         from google.gax import INITIAL_PAGE
-        from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
+        from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.logging.metric import Metric
 
@@ -912,7 +912,7 @@ def test_list_metrics_no_paging(self):
         self.assertEqual(options.page_token, INITIAL_PAGE)
 
     def test_list_metrics_w_paging(self):
-        from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
+        from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
         from google.cloud._testing import _GAXPageIterator
         from google.cloud.logging.metric import Metric
 
@@ -970,7 +970,7 @@ def test_metric_create_conflict(self):
                 self.DESCRIPTION)
 
     def test_metric_create_ok(self):
-        from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
+        from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
 
         gax_api = _GAXMetricsAPI()
         api = self._make_one(gax_api, None)
@@ -1006,7 +1006,7 @@ def test_metric_get_miss(self):
             api.metric_get(self.PROJECT, self.METRIC_NAME)
 
     def test_metric_get_hit(self):
-        from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
+        from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
 
         RESPONSE = {
             'name': self.METRIC_PATH,
@@ -1050,7 +1050,7 @@ def test_metric_update_miss(self):
                 self.DESCRIPTION)
 
     def test_metric_update_hit(self):
-        from google.cloud.grpc.logging.v2.logging_metrics_pb2 import LogMetric
+        from google.cloud.proto.logging.v2.logging_metrics_pb2 import LogMetric
 
         response = LogMetric(name=self.METRIC_NAME,
                              description=self.DESCRIPTION,