Skip to content

Commit fb8151e

Browse files
committed
chore: Add gcp resource name span attribute
1 parent 24394d6 commit fb8151e

File tree

8 files changed

+12
-0
lines changed

8 files changed

+12
-0
lines changed

google/cloud/spanner_v1/_opentelemetry_tracing.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def trace_call(
106106
"gcp.client.service": "spanner",
107107
"gcp.client.version": TRACER_VERSION,
108108
"gcp.client.repo": "googleapis/python-spanner",
109+
"gcp.resource.name": "//spanner.googleapis.com/" + db_name,
109110
}
110111

111112
if extra_attributes:

tests/system/test_session_api.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ def _make_attributes(db_instance, **kwargs):
361361
"gcp.client.service": "spanner",
362362
"gcp.client.version": ot_helpers.LIB_VERSION,
363363
"gcp.client.repo": "googleapis/python-spanner",
364+
"gcp.resource.name": "//spanner.googleapis.com/" + db_instance,
364365
}
365366
ot_helpers.enrich_with_otel_scope(attributes)
366367

tests/unit/test__opentelemetry_tracing.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def test_trace_call(self, mock_region):
5252
"gcp.client.service": "spanner",
5353
"gcp.client.version": LIB_VERSION,
5454
"gcp.client.repo": "googleapis/python-spanner",
55+
"gcp.resource.name": "//spanner.googleapis.com/database_name",
5556
}
5657
)
5758
expected_attributes.update(extra_attributes)
@@ -87,6 +88,7 @@ def test_trace_error(self, mock_region):
8788
"gcp.client.service": "spanner",
8889
"gcp.client.version": LIB_VERSION,
8990
"gcp.client.repo": "googleapis/python-spanner",
91+
"gcp.resource.name": "//spanner.googleapis.com/database_name",
9092
}
9193
)
9294
expected_attributes.update(extra_attributes)

tests/unit/test_batch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
"gcp.client.service": "spanner",
5959
"gcp.client.version": LIB_VERSION,
6060
"gcp.client.repo": "googleapis/python-spanner",
61+
"gcp.resource.name": "//spanner.googleapis.com/testing",
6162
"cloud.region": "global",
6263
}
6364
enrich_with_otel_scope(BASE_ATTRIBUTES)

tests/unit/test_pool.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ class TestFixedSizePool(OpenTelemetryBase):
155155
"gcp.client.service": "spanner",
156156
"gcp.client.version": LIB_VERSION,
157157
"gcp.client.repo": "googleapis/python-spanner",
158+
"gcp.resource.name": "//spanner.googleapis.com/name",
158159
"cloud.region": "global",
159160
}
160161
enrich_with_otel_scope(BASE_ATTRIBUTES)
@@ -549,6 +550,7 @@ class TestBurstyPool(OpenTelemetryBase):
549550
"gcp.client.service": "spanner",
550551
"gcp.client.version": LIB_VERSION,
551552
"gcp.client.repo": "googleapis/python-spanner",
553+
"gcp.resource.name": "//spanner.googleapis.com/name",
552554
"cloud.region": "global",
553555
}
554556
enrich_with_otel_scope(BASE_ATTRIBUTES)
@@ -839,6 +841,7 @@ class TestPingingPool(OpenTelemetryBase):
839841
"gcp.client.service": "spanner",
840842
"gcp.client.version": LIB_VERSION,
841843
"gcp.client.repo": "googleapis/python-spanner",
844+
"gcp.resource.name": "//spanner.googleapis.com/name",
842845
"cloud.region": "global",
843846
}
844847
enrich_with_otel_scope(BASE_ATTRIBUTES)

tests/unit/test_session.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ class TestSession(OpenTelemetryBase):
130130
"gcp.client.service": "spanner",
131131
"gcp.client.version": LIB_VERSION,
132132
"gcp.client.repo": "googleapis/python-spanner",
133+
"gcp.resource.name": "//spanner.googleapis.com/" + DATABASE_NAME,
133134
"cloud.region": "global",
134135
}
135136
enrich_with_otel_scope(BASE_ATTRIBUTES)

tests/unit/test_snapshot.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"gcp.client.service": "spanner",
8181
"gcp.client.version": LIB_VERSION,
8282
"gcp.client.repo": "googleapis/python-spanner",
83+
"gcp.resource.name": "//spanner.googleapis.com/testing",
8384
}
8485
enrich_with_otel_scope(BASE_ATTRIBUTES)
8586

@@ -2232,6 +2233,7 @@ def _build_span_attributes(
22322233
"gcp.client.service": "spanner",
22332234
"gcp.client.version": LIB_VERSION,
22342235
"gcp.client.repo": "googleapis/python-spanner",
2236+
"gcp.resource.name": "//spanner.googleapis.com/" + database.name,
22352237
"x_goog_spanner_request_id": _build_request_id(database, attempt),
22362238
}
22372239
attributes.update(extra_attributes)

tests/unit/test_transaction.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,7 @@ def _build_span_attributes(
13441344
"gcp.client.service": "spanner",
13451345
"gcp.client.version": LIB_VERSION,
13461346
"gcp.client.repo": "googleapis/python-spanner",
1347+
"gcp.resource.name": "//spanner.googleapis.com/" + database.name,
13471348
"cloud.region": GOOGLE_CLOUD_REGION_GLOBAL,
13481349
}
13491350
)

0 commit comments

Comments
 (0)