chore: incorporated v3 and v2 separately

instana · Nov 13, 2024 · bc62393 · bc62393
1 parent 17f0dbf
commit bc62393
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -160,6 +160,7 @@
     "got": "^14.4.4",
     "got-v11": "npm:got@^11.8.6",
     "graphql": "^16.9.0",
+    "graphql-subscriptions-v2": "npm:graphql-subscriptions@^2.0.0",
     "graphql-subscriptions": "^3.0.0",
     "graphql-tag": "^2.12.6",
     "graphql-ws": "^5.16.0",

diff --git a/packages/collector/test/tracing/protocols/graphql/schema.js b/packages/collector/test/tracing/protocols/graphql/schema.js
@@ -203,10 +203,11 @@ module.exports = function exportSchema() {
           subscribe: (__, { id }) => {
             pinoLogger.warn(`subscribe: ${id}`);
 
-            // for graphql-subscriptions/releases version 3, asyncIterator is replaced with asyncIterableIterator
+            // for graphql-subscriptions, asyncIterator is replaced with asyncIterableIterator in v3
             if (pubsub?.asyncIterableIterator) {
               return pubsub.asyncIterableIterator('characterUpdated');
             } else {
+              // v2 or lesser
               return pubsub.asyncIterator('characterUpdated');
             }
           }

diff --git a/packages/core/src/tracing/instrumentation/control_flow/graphqlSubscriptions.js b/packages/core/src/tracing/instrumentation/control_flow/graphqlSubscriptions.js
@@ -16,7 +16,10 @@ const CLS_CONTEXT_SYMBOL = Symbol('_instana_cls_context');
 
 exports.init = () => {
   hook.onModuleLoad('graphql-subscriptions', instrumentModule);
-  hook.onFileLoad(/\/graphql-subscriptions\/dist\/pubsub-async-iterator\.js/, instrumentAsyncIterator);
+  hook.onFileLoad(/\/graphql-subscriptions\/dist\/pubsub-async-iterator\.js/, instrumentAsyncIterableIterator);
+
+  hook.onModuleLoad('graphql-subscriptions-v2', instrumentModule);
+  hook.onFileLoad(/\/graphql-subscriptions-v2\/dist\/pubsub-async-iterator\.js/, instrumentAsyncIterator);
 };
 
 function instrumentModule(graphQlSubscriptions) {
@@ -40,6 +43,11 @@ function instrumentAsyncIterator(pubSubAsyncIterator) {
   shimmer.wrap(pubSubAsyncIterator.PubSubAsyncIterator.prototype, 'pullValue', shimPullValue);
 }
 
+function instrumentAsyncIterableIterator(pubSubAsyncIterator) {
+  shimmer.wrap(pubSubAsyncIterator.PubSubAsyncIterableIterator.prototype, 'pushValue', shimPushValue);
+  shimmer.wrap(pubSubAsyncIterator.PubSubAsyncIterableIterator.prototype, 'pullValue', shimPullValue);
+}
+
 function shimPushValue(originalFunction) {
   return function (event) {
     if (isActive && event && typeof event === 'object' && cls.ns.active) {