adding tests, nox and correct attribute additions in client & job (le…

…ft out of last commit)
tswast · Aug 21, 2020 · Aug 1, 2020 · Aug 3, 2020 · Aug 4, 2020 · Aug 4, 2020
commit f4aba6dac584f84a026c9e95c9c98a197c056a93
diff --git a/google/cloud/bigquery/client.py b/google/cloud/bigquery/client.py
@@ -1675,9 +1675,9 @@ def cancel_job(
         span_creator = SpanCreator()
 
         attributes = {"path": path,
-                   "job_id": job_id,
-                    "location": location
-                    }
+                      "job_id": job_id,
+                      "location": location
+                      }
 
         with span_creator.create(name='BigQuery.CancelJob', attributes=attributes, client=self):
             resource = self._call_api(
@@ -2870,7 +2870,7 @@ def insert_rows_json(
         span_creator = SpanCreator()
         attributes = {"path": path}
         with span_creator.create(name='BigQuery.insertRowsJson', attributes=attributes, client=self):
-                response = self._call_api(
+            response = self._call_api(
                 retry,
                 method="POST",
                 path=path,

diff --git a/google/cloud/bigquery/job.py b/google/cloud/bigquery/job.py
@@ -671,8 +671,7 @@ def exists(self, client=None, retry=DEFAULT_RETRY, timeout=None):
 
         try:
             span_creator = SpanCreator()
-            attributes = extra_params
-            #attributes['path'] = self.path
+            attributes = {'path': self.path}
             with span_creator.create(name='BigQuery.job.exists', attributes=attributes, job_ref=self):
                 client._call_api(
                     retry,
@@ -708,8 +707,7 @@ def reload(self, client=None, retry=DEFAULT_RETRY, timeout=None):
         if self.location:
             extra_params["location"] = self.location
         span_creator = SpanCreator()
-        attributes = extra_params
-        #attributes['path'] = self.path
+        attributes = {'path': self.path}
         with span_creator.create(name='BigQuery.job.reload', attributes=attributes, job_ref=self):
             api_response = client._call_api(
                 retry,
@@ -746,8 +744,7 @@ def cancel(self, client=None, retry=DEFAULT_RETRY, timeout=None):
 
         path = "{}/cancel".format(self.path)
         span_creator = SpanCreator()
-        attributes = extra_params
-        #attributes['path'] = path
+        attributes = {'path': path}
         with span_creator.create(name='BigQuery.job.cancel', attributes=attributes, job_ref=self):
             api_response = client._call_api(
                 retry,

diff --git a/google/cloud/bigquery/opentelemetry_tracing.py b/google/cloud/bigquery/opentelemetry_tracing.py
@@ -14,18 +14,12 @@
 
 import logging
 from contextlib import contextmanager
-
-from google.api_core.exceptions import GoogleAPICallError
 import pdb
+from google.api_core.exceptions import GoogleAPICallError
 
 Logger = logging.getLogger(__name__)
-
 try:
     from opentelemetry import trace
-    from opentelemetry import propagators
-    from opentelemetry.trace import SpanContext
-    from opentelemetry.trace import get_current_span
-    from opentelemetry.trace import set_span_in_context
     from opentelemetry.trace.status import Status
     from opentelemetry.instrumentation.utils import http_status_to_canonical_code
 
@@ -44,15 +38,12 @@
 
 class SpanCreator:
     def __init__(self):
-        '''
-        Constructs a span creator with all default attributes
-        '''
+        # Constructs a span creator with all default attributes
         self.opentelemetry_enbled = HAS_OPENTELEMETRY
         self.attributes = {
             'db.system': 'bigquery',
         }
 
-
     @contextmanager
     def create(self, name, attributes=None, client=None, job_ref=None):
         if not self.opentelemetry_enbled:
@@ -69,7 +60,6 @@ def create(self, name, attributes=None, client=None, job_ref=None):
 
         if attributes:
             self.attributes.update(attributes)
-
         # yield new span value
         with tracer.start_as_current_span(name=name, attributes=self.attributes) as span:
             try:
@@ -89,14 +79,10 @@ def set_job_attributes(self, job_ref):
         self.attributes['num_child_jobs'] = str(job_ref.num_child_jobs)
         self.attributes['job_id'] = job_ref.job_id
         self.attributes['parent_job_id'] = job_ref.parent_job_id
-        #self.attributes['job_type'] = job_ref.job_type
+        # self.attributes['job_type'] = job_ref.job_type
         self.attributes['timeCreated'] = job_ref.created
         self.attributes['timeStarted'] = job_ref.started
         self.attributes['timeEnded'] = job_ref.ended
         self.attributes['errors'] = job_ref.errors
         self.attributes['errorResult'] = job_ref.error_result
         self.attributes['state'] = job_ref.state
-
-
-
-
diff --git a/noxfile.py b/noxfile.py
@@ -33,7 +33,14 @@ def default(session):
     """
     # Install all test dependencies, then install local packages in-place.
     session.install(
-        "mock", "pytest", "google-cloud-testutils", "pytest-cov", "freezegun"
+        "mock",
+        "pytest",
+        "google-cloud-testutils",
+        "pytest-cov",
+        "freezegun",
+        "opentelemetry-api",
+        "opentelemetry-sdk",
+        "opentelemetry-instrumentation"
     )
     session.install("grpcio")