From 1fca88250c33dfd0844476cc1b8faca9194eedba Mon Sep 17 00:00:00 2001
From: Riley Bauer <rjbauer@google.com>
Date: Tue, 14 Aug 2018 16:42:56 -0700
Subject: [PATCH] Fix additional imports, add google-cloud-logging

---
 setup.py                                             | 1 +
 tests/stackdriver/monitoring/query_metadata_tests.py | 6 +++---
 tests/stackdriver/monitoring/query_tests.py          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/setup.py b/setup.py
index 9e4fd2baa..50264feb4 100644
--- a/setup.py
+++ b/setup.py
@@ -93,6 +93,7 @@
     'configparser>=3.5.0',
     'mock>=2.0.0',
     'future>=0.16.0',
+    'google-cloud-logging>=1.6.0',
     'google-cloud-monitoring>=0.30.1',
     'google-api-python-client>=1.6.2',
     'seaborn>=0.7.0',
diff --git a/tests/stackdriver/monitoring/query_metadata_tests.py b/tests/stackdriver/monitoring/query_metadata_tests.py
index d5cce0660..0d0388461 100644
--- a/tests/stackdriver/monitoring/query_metadata_tests.py
+++ b/tests/stackdriver/monitoring/query_metadata_tests.py
@@ -14,9 +14,9 @@
 import mock
 import unittest
 
-from google.cloud.monitoring import Resource
-from google.cloud.monitoring import Metric
-from google.cloud.monitoring import TimeSeries
+from google.cloud.logging.resource import Resource
+from google.cloud.monitoring_v3.types import Metric
+from google.cloud.monitoring_v3.types import TimeSeries
 
 import google.auth
 import google.datalab
diff --git a/tests/stackdriver/monitoring/query_tests.py b/tests/stackdriver/monitoring/query_tests.py
index 7623c40ef..73c288573 100644
--- a/tests/stackdriver/monitoring/query_tests.py
+++ b/tests/stackdriver/monitoring/query_tests.py
@@ -15,7 +15,7 @@
 import mock
 import unittest
 
-from google.cloud.monitoring import Query as BaseQuery
+from google.cloud.monitoring_v3.query import Query as BaseQuery
 
 import google.auth
 import google.datalab