fix: Prevent instrumentation crash and fix the system test (#666)

* fix: Prevent instrumentation crash and fix the system test

* Update base package to 10.2.2.

package.json

@@ -51,7 +51,7 @@
     "precompile": "gts clean"
   },
   "dependencies": {
-    "@google-cloud/logging": "^10.1.11",
+    "@google-cloud/logging": "^10.2.2",
     "google-auth-library": "^8.0.2"
   },
   "devDependencies": {

src/index.ts

@@ -70,6 +70,11 @@ export const LOGGING_SPAN_KEY = 'logging.googleapis.com/spanId';
  */
 export const LOGGING_SAMPLED_KEY = 'logging.googleapis.com/trace_sampled';
 
+/**
+ * Default library version to be used if version retrieval fails
+ */
+export const NODEJS_BUNYAN_DEFAULT_LIBRARY_VERSION = 'unknown';
+
 // The variable to hold cached library version
 let libraryVersion: string;
 
@@ -479,11 +484,15 @@ export class LoggingBunyan extends Writable {
     if (libraryVersion) {
       return libraryVersion;
     }
-    libraryVersion = require(path.resolve(
-      __dirname,
-      '../../',
-      'package.json'
-    )).version;
+    try {
+      libraryVersion = require(path.resolve(
+        __dirname,
+        '../../',
+        'package.json'
+      )).version;
+    } catch (err) {
+      libraryVersion = NODEJS_BUNYAN_DEFAULT_LIBRARY_VERSION;
+    }
     return libraryVersion;
   }
 }

system-test/logging-bunyan.ts

@@ -91,9 +91,9 @@ describe('LoggingBunyan', function () {
         const info = (entry.data as any)[instrumentation.DIAGNOSTIC_INFO_KEY][
           instrumentation.INSTRUMENTATION_SOURCE_KEY
         ];
-        assert.equal(info[0].name, 'nodejs');
+        assert.equal(info[0].name, 'nodejs-bunyan');
         assert.ok(info[0].version.includes('.'));
-        assert.equal(info[1].name, 'nodejs-bunyan');
+        assert.equal(info[1].name, 'nodejs');
         assert.ok(info[1].version.includes('.'));
         isDiagnosticPresent = true;
       } else {