tracing: use standardized db.system=spanner

odeke-em · odeke-em · commit ac63111c8106 · 2024-08-01T01:08:47.000+03:00
diff --git a/google/cloud/spanner_v1/_opentelemetry_tracing.py b/google/cloud/spanner_v1/_opentelemetry_tracing.py
@@ -59,7 +59,7 @@ def trace_call(name, session, extra_attributes=None):
 
     # Set base attributes that we know for every trace created
     attributes = {
-        DB_SYSTEM: "google.cloud.spanner",
+        DB_SYSTEM: "spanner",
         DB_CONNECTION_STRING: SpannerClient.DEFAULT_ENDPOINT,
         DB_NAME: session._database.name,
         NET_HOST_NAME: SpannerClient.DEFAULT_ENDPOINT,
diff --git a/tests/system/test_session_api.py b/tests/system/test_session_api.py
@@ -341,7 +341,7 @@ def assert_span_attributes(
 
 def _make_attributes(db_instance, **kwargs):
     attributes = {
-        ot_helpers.DB_SYSTEM: "google.cloud.spanner",
+        ot_helpers.DB_SYSTEM: "spanner",
         ot_helpers.DB_CONNECTION_STRING: "spanner.googleapis.com",
         ot_helpers.DB_NAME: db_instance,
         ot_helpers.NET_HOST_NAME: "spanner.googleapis.com",
diff --git a/tests/unit/test__opentelemetry_tracing.py b/tests/unit/test__opentelemetry_tracing.py
@@ -63,7 +63,7 @@ def test_trace_call(self):
             }
 
             expected_attributes = {
-                DB_SYSTEM: "google.cloud.spanner",
+                DB_SYSTEM: "spanner",
                 DB_CONNECTION_STRING: "spanner.googleapis.com",
                 NET_HOST_NAME: "spanner.googleapis.com",
             }
@@ -88,7 +88,7 @@ def test_trace_error(self):
             extra_attributes = {DB_NAME: "database_name"}
 
             expected_attributes = {
-                DB_SYSTEM: "google.cloud.spanner",
+                DB_SYSTEM: "spanner",
                 DB_CONNECTION_STRING: "spanner.googleapis.com",
                 NET_HOST_NAME: "spanner.googleapis.com",
             }
@@ -115,7 +115,7 @@ def test_trace_grpc_error(self):
             extra_attributes = {DB_NAME: "database_name"}
 
             expected_attributes = {
-                DB_SYSTEM: "google.cloud.spanner",
+                DB_SYSTEM: "spanner",
                 DB_CONNECTION_STRING: "spanner.googleapis.com",
                 NET_HOST_NAME: "spanner.googleapis.com",
             }
@@ -139,7 +139,7 @@ def test_trace_codeless_error(self):
             extra_attributes = {DB_NAME: "database_name"}
 
             expected_attributes = {
-                DB_SYSTEM: "google.cloud.spanner",
+                DB_SYSTEM: "spanner",
                 DB_CONNECTION_STRING: "spanner.googleapis.com",
                 NET_HOST_NAME: "spanner.googleapis.com",
             }
diff --git a/tests/unit/test_batch.py b/tests/unit/test_batch.py
@@ -31,7 +31,7 @@
     ["bharney@example.com", "Bharney", "Rhubble", 31],
 ]
 BASE_ATTRIBUTES = {
-    DB_SYSTEM: "google.cloud.spanner",
+    DB_SYSTEM: "spanner",
     DB_CONNECTION_STRING: "spanner.googleapis.com",
     DB_NAME: "testing",
     NET_HOST_NAME: "spanner.googleapis.com",
diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py
@@ -50,7 +50,7 @@ class TestSession(OpenTelemetryBase):
     SESSION_NAME = DATABASE_NAME + "/sessions/" + SESSION_ID
     DATABASE_ROLE = "dummy-role"
     BASE_ATTRIBUTES = {
-        DB_SYSTEM: "google.cloud.spanner",
+        DB_SYSTEM: "spanner",
         DB_CONNECTION_STRING: "spanner.googleapis.com",
         DB_NAME: DATABASE_NAME,
         NET_HOST_NAME: "spanner.googleapis.com",
diff --git a/tests/unit/test_snapshot.py b/tests/unit/test_snapshot.py
@@ -47,7 +47,7 @@
 SECONDS = 3
 MICROS = 123456
 BASE_ATTRIBUTES = {
-    DB_SYSTEM: "google.cloud.spanner",
+    DB_SYSTEM: "spanner",
     DB_CONNECTION_STRING: "spanner.googleapis.com",
     DB_NAME: "testing",
     NET_HOST_NAME: "spanner.googleapis.com",
@@ -537,7 +537,7 @@ def test_iteration_w_multiple_span_creation(self):
                 self.assertEqual(
                     dict(span.attributes),
                     {
-                        DB_SYSTEM: "google.cloud.spanner",
+                        DB_SYSTEM: "spanner",
                         DB_CONNECTION_STRING: "spanner.googleapis.com",
                         DB_NAME: "testing",
                         NET_HOST_NAME: "spanner.googleapis.com",
diff --git a/tests/unit/test_spanner.py b/tests/unit/test_spanner.py
@@ -116,7 +116,7 @@ class TestTransaction(OpenTelemetryBase):
     TRANSACTION_TAG = "transaction-tag"
 
     BASE_ATTRIBUTES = {
-        DB_SYSTEM: "google.cloud.spanner",
+        DB_SYSTEM: "spanner",
         DB_CONNECTION_STRING: "spanner.googleapis.com",
         DB_NAME: "testing",
         NET_HOST_NAME: "spanner.googleapis.com",
diff --git a/tests/unit/test_transaction.py b/tests/unit/test_transaction.py
@@ -60,7 +60,7 @@ class TestTransaction(OpenTelemetryBase):
     TRANSACTION_TAG = "transaction-tag"
 
     BASE_ATTRIBUTES = {
-        DB_SYSTEM: "google.cloud.spanner",
+        DB_SYSTEM: "spanner",
         DB_CONNECTION_STRING: "spanner.googleapis.com",
         DB_NAME: "testing",
         NET_HOST_NAME: "spanner.googleapis.com",

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def test_trace_call(self):`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`expected_attributes = {`
`66`		`- DB_SYSTEM: "google.cloud.spanner",`
	`66`	`+ DB_SYSTEM: "spanner",`
`67`	`67`	`DB_CONNECTION_STRING: "spanner.googleapis.com",`
`68`	`68`	`NET_HOST_NAME: "spanner.googleapis.com",`
`69`	`69`	`}`
`@@ -88,7 +88,7 @@ def test_trace_error(self):`
`88`	`88`	`extra_attributes = {DB_NAME: "database_name"}`
`89`	`89`
`90`	`90`	`expected_attributes = {`
`91`		`- DB_SYSTEM: "google.cloud.spanner",`
	`91`	`+ DB_SYSTEM: "spanner",`
`92`	`92`	`DB_CONNECTION_STRING: "spanner.googleapis.com",`
`93`	`93`	`NET_HOST_NAME: "spanner.googleapis.com",`
`94`	`94`	`}`
`@@ -115,7 +115,7 @@ def test_trace_grpc_error(self):`
`115`	`115`	`extra_attributes = {DB_NAME: "database_name"}`
`116`	`116`
`117`	`117`	`expected_attributes = {`
`118`		`- DB_SYSTEM: "google.cloud.spanner",`
	`118`	`+ DB_SYSTEM: "spanner",`
`119`	`119`	`DB_CONNECTION_STRING: "spanner.googleapis.com",`
`120`	`120`	`NET_HOST_NAME: "spanner.googleapis.com",`
`121`	`121`	`}`
`@@ -139,7 +139,7 @@ def test_trace_codeless_error(self):`
`139`	`139`	`extra_attributes = {DB_NAME: "database_name"}`
`140`	`140`
`141`	`141`	`expected_attributes = {`
`142`		`- DB_SYSTEM: "google.cloud.spanner",`
	`142`	`+ DB_SYSTEM: "spanner",`
`143`	`143`	`DB_CONNECTION_STRING: "spanner.googleapis.com",`
`144`	`144`	`NET_HOST_NAME: "spanner.googleapis.com",`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`["[email protected]", "Bharney", "Rhubble", 31],`
`32`	`32`	`]`
`33`	`33`	`BASE_ATTRIBUTES = {`
`34`		`- DB_SYSTEM: "google.cloud.spanner",`
	`34`	`+ DB_SYSTEM: "spanner",`
`35`	`35`	`DB_CONNECTION_STRING: "spanner.googleapis.com",`
`36`	`36`	`DB_NAME: "testing",`
`37`	`37`	`NET_HOST_NAME: "spanner.googleapis.com",`