Merge branch 'main' into databaserole_sessionlabels

Author: surbhigarg92

observability-test/observability.ts

@@ -126,7 +126,10 @@ describe('startTrace', () => {
   });
 
   it('with semantic attributes', () => {
-    const opts = {tableName: 'table', dbName: 'db'};
+    const opts = {
+      tableName: 'table',
+      dbName: 'projects/PROJECT_ID/instances/INSTANCE_ID/databases/DATABASE_ID',
+    };
     startTrace('aSpan', opts, span => {
       assert.equal(
         span.attributes[ATTR_OTEL_SCOPE_NAME],
@@ -158,6 +161,12 @@ describe('startTrace', () => {
         'Missing gcp.client.repo attribute',
       );
 
+      assert.equal(
+        span.attributes['gcp.resource.name'],
+        '//spanner.googleapis.com/projects/PROJECT_ID/instances/INSTANCE_ID/databases/DATABASE_ID',
+        'Missing gcp.resource.name attribute',
+      );
+
       assert.equal(
         span.attributes[SEMATTRS_DB_SQL_TABLE],
         'table',
@@ -166,7 +175,7 @@ describe('startTrace', () => {
 
       assert.equal(
         span.attributes[SEMATTRS_DB_NAME],
-        'db',
+        'projects/PROJECT_ID/instances/INSTANCE_ID/databases/DATABASE_ID',
         'Missing DB_NAME attribute',
       );
     });

samples/observability-traces.js

@@ -37,7 +37,7 @@ async function main(
   } = require('@opentelemetry/sdk-trace-base');
   const {Spanner} = require('@google-cloud/spanner');
 
-  const traceExporter = new TraceExporter();
+  const traceExporter = new TraceExporter({projectId: projectId});
 
   // Create a provider with a custom sampler
   const provider = new NodeTracerProvider({
@@ -81,7 +81,7 @@ async function main(
     spanner.close();
   }
 
-  provider.forceFlush();
+  await provider.forceFlush();
 
   // This sleep gives ample time for the trace
   // spans to be exported to Google Cloud Trace.

src/database.ts

@@ -473,10 +473,8 @@ class Database extends common.GrpcServiceObject {
     this.instance = instance;
 
     const poolOpts = typeof poolOptions === 'object' ? poolOptions : null;
-    this.databaseRole =
-      databaseRole || (poolOpts && poolOpts.databaseRole) || null;
-    this.labels =
-      this._getSpanner().sessionLabels || (poolOpts && poolOpts.labels) || null;
+    this.databaseRole = databaseRole || poolOpts?.databaseRole || null;
+    this.labels = this._getSpanner().sessionLabels || poolOpts?.labels || null;
 
     this._observabilityOptions = instance._observabilityOptions;
     this._traceConfig = {

src/instrument.ts

@@ -150,6 +150,10 @@ export function startTrace<T>(
         span.setAttribute('db.sql.table', config.tableName);
       }
       if (config.dbName) {
+        span.setAttribute(
+          'gcp.resource.name',
+          `//spanner.googleapis.com/${config.dbName}`,
+        );
         span.setAttribute('db.name', config.dbName);
       }
       if (config.requestTag) {

src/v1/instance_admin_client.ts

@@ -1,4 +1,4 @@
-// Copyright 2025 Google LLC
+// Copyright 2026 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

test/gapic_instance_admin_v1.ts

@@ -1,4 +1,4 @@
-// Copyright 2025 Google LLC
+// Copyright 2026 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.