fix protobuf google-api

DataDog · Sep 24, 2024 · af12edb · af12edb
1 parent 6028c36
commit af12edb
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/datadog-instrumentations/src/protobufjs.js b/packages/datadog-instrumentations/src/protobufjs.js
@@ -120,16 +120,25 @@ function wrapReflection (protobuf) {
   })
 }
 
+function isPromise (obj) {
+  return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function'
+}
+
 addHook({
   name: 'protobufjs',
   versions: ['>=6.0.0']
 }, protobuf => {
   shimmer.wrap(protobuf.Root.prototype, 'load', original => {
     return function wrappedLoad (...args) {
       const result = original.apply(this, args)
-      result.then(root => {
-        wrapProtobufClasses(root)
-      })
+      if (isPromise(result)) {
+        result.then(root => {
+          wrapProtobufClasses(root)
+        })
+      } else {
+        // If result is not a promise, directly wrap the protobuf classes
+        wrapProtobufClasses(result)
+      }
       return result
     }
   })