Skip to content

Commit f75e31c

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
committed
🦉 Updates from OwlBot post-processor
See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
1 parent 1bd0a2c commit f75e31c

File tree

6 files changed

+727
-182
lines changed

6 files changed

+727
-182
lines changed

‎tests/unit/test__opentelemetry_tracing.py‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ def test_no_trace_call(self):
5454
self.assertIsNone(no_span)
5555

5656
class TestTracing(OpenTelemetryBase):
57-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
57+
@mock.patch(
58+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
59+
return_value="global",
60+
)
5861
def test_trace_call(self, mock_region):
5962
extra_attributes = {
6063
"attribute1": "value1",
@@ -90,7 +93,10 @@ def test_trace_call(self, mock_region):
9093
self.assertEqual(span.name, "CloudSpanner.Test")
9194
self.assertEqual(span.status.status_code, StatusCode.OK)
9295

93-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
96+
@mock.patch(
97+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
98+
return_value="global",
99+
)
94100
def test_trace_error(self, mock_region):
95101
extra_attributes = {"db.instance": "database_name"}
96102

‎tests/unit/test_batch.py‎

Lines changed: 92 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ def test_commit_already_committed(self):
200200

201201
self.assertNoSpans()
202202

203-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
203+
@mock.patch(
204+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
205+
return_value="global",
206+
)
204207
def test_commit_grpc_error(self, mock_region):
205208
keys = [[0], [1], [2]]
206209
keyset = KeySet(keys=keys)
@@ -222,7 +225,10 @@ def test_commit_grpc_error(self, mock_region):
222225
),
223226
)
224227

225-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
228+
@mock.patch(
229+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
230+
return_value="global",
231+
)
226232
def test_commit_ok(self, mock_region):
227233
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
228234
now_pb = _datetime_to_pb_timestamp(now)
@@ -380,40 +386,58 @@ def _test_commit_with_options(
380386

381387
self.assertEqual(max_commit_delay_in, max_commit_delay)
382388

383-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
389+
@mock.patch(
390+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
391+
return_value="global",
392+
)
384393
def test_commit_w_request_tag_success(self, mock_region):
385394
request_options = RequestOptions(
386395
request_tag="tag-1",
387396
)
388397
self._test_commit_with_options(request_options=request_options)
389398

390-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
399+
@mock.patch(
400+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
401+
return_value="global",
402+
)
391403
def test_commit_w_transaction_tag_success(self, mock_region):
392404
request_options = RequestOptions(
393405
transaction_tag="tag-1-1",
394406
)
395407
self._test_commit_with_options(request_options=request_options)
396408

397-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
409+
@mock.patch(
410+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
411+
return_value="global",
412+
)
398413
def test_commit_w_request_and_transaction_tag_success(self, mock_region):
399414
request_options = RequestOptions(
400415
request_tag="tag-1",
401416
transaction_tag="tag-1-1",
402417
)
403418
self._test_commit_with_options(request_options=request_options)
404419

405-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
420+
@mock.patch(
421+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
422+
return_value="global",
423+
)
406424
def test_commit_w_request_and_transaction_tag_dictionary_success(self, mock_region):
407425
request_options = {"request_tag": "tag-1", "transaction_tag": "tag-1-1"}
408426
self._test_commit_with_options(request_options=request_options)
409427

410-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
428+
@mock.patch(
429+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
430+
return_value="global",
431+
)
411432
def test_commit_w_incorrect_tag_dictionary_error(self, mock_region):
412433
request_options = {"incorrect_tag": "tag-1-1"}
413434
with self.assertRaises(ValueError):
414435
self._test_commit_with_options(request_options=request_options)
415436

416-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
437+
@mock.patch(
438+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
439+
return_value="global",
440+
)
417441
def test_commit_w_max_commit_delay(self, mock_region):
418442
request_options = RequestOptions(
419443
request_tag="tag-1",
@@ -423,7 +447,10 @@ def test_commit_w_max_commit_delay(self, mock_region):
423447
max_commit_delay_in=datetime.timedelta(milliseconds=100),
424448
)
425449

426-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
450+
@mock.patch(
451+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
452+
return_value="global",
453+
)
427454
def test_commit_w_exclude_txn_from_change_streams(self, mock_region):
428455
request_options = RequestOptions(
429456
request_tag="tag-1",
@@ -432,7 +459,10 @@ def test_commit_w_exclude_txn_from_change_streams(self, mock_region):
432459
request_options=request_options, exclude_txn_from_change_streams=True
433460
)
434461

435-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
462+
@mock.patch(
463+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
464+
return_value="global",
465+
)
436466
def test_commit_w_isolation_level(self, mock_region):
437467
request_options = RequestOptions(
438468
request_tag="tag-1",
@@ -442,7 +472,10 @@ def test_commit_w_isolation_level(self, mock_region):
442472
isolation_level=TransactionOptions.IsolationLevel.REPEATABLE_READ,
443473
)
444474

445-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
475+
@mock.patch(
476+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
477+
return_value="global",
478+
)
446479
def test_commit_w_read_lock_mode(self, mock_region):
447480
request_options = RequestOptions(
448481
request_tag="tag-1",
@@ -452,7 +485,10 @@ def test_commit_w_read_lock_mode(self, mock_region):
452485
read_lock_mode=TransactionOptions.ReadWrite.ReadLockMode.OPTIMISTIC,
453486
)
454487

455-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
488+
@mock.patch(
489+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
490+
return_value="global",
491+
)
456492
def test_commit_w_isolation_level_and_read_lock_mode(self, mock_region):
457493
request_options = RequestOptions(
458494
request_tag="tag-1",
@@ -463,7 +499,10 @@ def test_commit_w_isolation_level_and_read_lock_mode(self, mock_region):
463499
read_lock_mode=TransactionOptions.ReadWrite.ReadLockMode.PESSIMISTIC,
464500
)
465501

466-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
502+
@mock.patch(
503+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
504+
return_value="global",
505+
)
467506
def test_context_mgr_already_committed(self, mock_region):
468507
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
469508
database = _Database()
@@ -478,7 +517,10 @@ def test_context_mgr_already_committed(self, mock_region):
478517

479518
self.assertEqual(api._committed, None)
480519

481-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
520+
@mock.patch(
521+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
522+
return_value="global",
523+
)
482524
def test_context_mgr_success(self, mock_region):
483525
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
484526
now_pb = _datetime_to_pb_timestamp(now)
@@ -526,7 +568,10 @@ def test_context_mgr_success(self, mock_region):
526568
),
527569
)
528570

529-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
571+
@mock.patch(
572+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
573+
return_value="global",
574+
)
530575
def test_context_mgr_failure(self, mock_region):
531576
now = datetime.datetime.utcnow().replace(tzinfo=UTC)
532577
now_pb = _datetime_to_pb_timestamp(now)
@@ -558,7 +603,10 @@ def test_ctor(self):
558603
groups = self._make_one(session)
559604
self.assertIs(groups._session, session)
560605

561-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
606+
@mock.patch(
607+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
608+
return_value="global",
609+
)
562610
def test_batch_write_already_committed(self, mock_region):
563611
keys = [[0], [1], [2]]
564612
keyset = KeySet(keys=keys)
@@ -582,7 +630,10 @@ def test_batch_write_already_committed(self, mock_region):
582630
with self.assertRaises(ValueError):
583631
groups.batch_write()
584632

585-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
633+
@mock.patch(
634+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
635+
return_value="global",
636+
)
586637
def test_batch_write_grpc_error(self, mock_region):
587638
keys = [[0], [1], [2]]
588639
keyset = KeySet(keys=keys)
@@ -681,30 +732,48 @@ def _test_batch_write_with_request_options(
681732
),
682733
)
683734

684-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
735+
@mock.patch(
736+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
737+
return_value="global",
738+
)
685739
def test_batch_write_no_request_options(self, mock_region):
686740
self._test_batch_write_with_request_options()
687741

688-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
742+
@mock.patch(
743+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
744+
return_value="global",
745+
)
689746
def test_batch_write_end_to_end_tracing_enabled(self, mock_region):
690747
self._test_batch_write_with_request_options(enable_end_to_end_tracing=True)
691748

692-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
749+
@mock.patch(
750+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
751+
return_value="global",
752+
)
693753
def test_batch_write_w_transaction_tag_success(self, mock_region):
694754
self._test_batch_write_with_request_options(
695755
RequestOptions(transaction_tag="tag-1-1")
696756
)
697757

698-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
758+
@mock.patch(
759+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
760+
return_value="global",
761+
)
699762
def test_batch_write_w_transaction_tag_dictionary_success(self, mock_region):
700763
self._test_batch_write_with_request_options({"transaction_tag": "tag-1-1"})
701764

702-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
765+
@mock.patch(
766+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
767+
return_value="global",
768+
)
703769
def test_batch_write_w_incorrect_tag_dictionary_error(self, mock_region):
704770
with self.assertRaises(ValueError):
705771
self._test_batch_write_with_request_options({"incorrect_tag": "tag-1-1"})
706772

707-
@mock.patch("google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region", return_value="global")
773+
@mock.patch(
774+
"google.cloud.spanner_v1._opentelemetry_tracing._get_cloud_region",
775+
return_value="global",
776+
)
708777
def test_batch_write_w_exclude_txn_from_change_streams(self, mock_region):
709778
self._test_batch_write_with_request_options(
710779
exclude_txn_from_change_streams=True

0 commit comments

Comments
 (0)