@rsdk/graphql 4.2.5-next.0 → 4.3.0-next.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.0-next.1](https://github.com/R-Vision/rsdk/compare/v4.3.0-next.0...v4.3.0-next.1) (2024-03-21)
+
+**Note:** Version bump only for package @rsdk/graphql
+
+## [4.3.0-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.5-next.0...v4.3.0-next.0) (2024-03-19)
+
+### Features
+
+* reworked cli system ([745ebf5](https://github.com/R-Vision/rsdk/commit/745ebf53635de135a4a9083f47ce833efe2d4411))
+
 ## [4.2.5-next.0](https://github.com/R-Vision/rsdk/compare/v4.2.4...v4.2.5-next.0) (2024-03-04)
 
 **Note:** Version bump only for package @rsdk/graphql

package/dist/{graphql.config.d.ts → config.d.ts}

@@ -1,5 +1,5 @@
 import { Config } from '@rsdk/core';
-export declare class GraphQLConfig extends Config {
+export declare class GraphqlConfig extends Config {
     playground: boolean;
     requestLogging: boolean;
 }

package/dist/{graphql.config.js → config.js}

@@ -9,30 +9,30 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLConfig = void 0;
+exports.GraphqlConfig = void 0;
 const core_1 = require("@rsdk/core");
-let GraphQLConfig = class GraphQLConfig extends core_1.Config {
+let GraphqlConfig = class GraphqlConfig extends core_1.Config {
     playground;
     requestLogging;
 };
-exports.GraphQLConfig = GraphQLConfig;
+exports.GraphqlConfig = GraphqlConfig;
 __decorate([
     (0, core_1.Property)('GRAPHQL_ENABLE_PLAYGROUND', new core_1.BoolParser(), {
         defaultValue: false,
         description: 'Enables GraphQL playground and introspection',
     }),
     __metadata("design:type", Boolean)
-], GraphQLConfig.prototype, "playground", void 0);
+], GraphqlConfig.prototype, "playground", void 0);
 __decorate([
     (0, core_1.Property)('GRAPHQL_REQUEST_LOGGING', new core_1.BoolParser(), {
         defaultValue: false,
         description: 'Enable trace logging all requests',
     }),
     __metadata("design:type", Boolean)
-], GraphQLConfig.prototype, "requestLogging", void 0);
-exports.GraphQLConfig = GraphQLConfig = __decorate([
+], GraphqlConfig.prototype, "requestLogging", void 0);
+exports.GraphqlConfig = GraphqlConfig = __decorate([
     (0, core_1.ConfigSection)({
         tags: [core_1.ConfigTag.infrastructure, core_1.ConfigTag.transport, core_1.ConfigTag.graphql],
     })
-], GraphQLConfig);
-//# sourceMappingURL=graphql.config.js.map
+], GraphqlConfig);
+//# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMoB;AAKb,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,UAAU,CAAW;IAMrB,cAAc,CAAW;CAC1B,CAAA;AAZY,sCAAa;AAKxB;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;iDACmB;AAMrB;IAJC,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;qDACuB;wBAXd,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CAYzB"}

package/dist/gql.tracing-extractor.d.ts

@@ -0,0 +1,6 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+export declare class GqlTracingExtractor implements ProtocolTracingHeadersExtractor {
+    extract(executionContext: ExecutionContext): TracingHeaders;
+}

package/dist/gql.tracing-extractor.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GqlTracingExtractor = void 0;
+const types_1 = require("@rsdk/core/dist/tracing/types");
+const http_server_1 = require("@rsdk/http.server");
+class GqlTracingExtractor {
+    extract(executionContext) {
+        const req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
+        /**
+         * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
+         * и мы перегоняем эти данные в request заголовки
+         */
+        const headers = {
+            ...req?.headers,
+            ...req?.connectionParams?.headers,
+        };
+        const tracingHeaders = new http_server_1.HttpHeaders(headers).getHeaders(req);
+        return new types_1.TracingHeaders({
+            ...tracingHeaders,
+        });
+    }
+}
+exports.GqlTracingExtractor = GqlTracingExtractor;
+//# sourceMappingURL=gql.tracing-extractor.js.map

package/dist/gql.tracing-extractor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gql.tracing-extractor.js","sourceRoot":"","sources":["../src/gql.tracing-extractor.ts"],"names":[],"mappings":";;;AAEA,yDAA+D;AAC/D,mDAAgD;AAEhD,MAAa,mBAAmB;IAC9B,OAAO,CAAC,gBAAkC;QACxC,MAAM,GAAG,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,uEAAuE;QAEvH;;;WAGG;QACH,MAAM,OAAO,GAAG;YACd,GAAG,GAAG,EAAE,OAAO;YACf,GAAG,GAAG,EAAE,gBAAgB,EAAE,OAAO;SAClC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,yBAAW,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAEhE,OAAO,IAAI,sBAAc,CAAC;YACxB,GAAG,cAAc;SAClB,CAAC,CAAC;IACL,CAAC;CACF;AAnBD,kDAmBC"}

package/dist/graphql-logger.interceptor.d.ts

@@ -1,10 +1,10 @@
 import type { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import { ILogger } from '@rsdk/logging';
 import type { Observable } from 'rxjs/internal/Observable';
-import { GraphQLConfig } from './graphql.config';
+import { GraphqlConfig } from './config';
 export declare class GraphqlLoggerInterceptor implements NestInterceptor {
     private logger;
     private graphQLConfig;
-    constructor(logger: ILogger, graphQLConfig: GraphQLConfig);
+    constructor(logger: ILogger, graphQLConfig: GraphqlConfig);
     intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>>;
 }

package/dist/graphql-logger.interceptor.js

@@ -19,7 +19,7 @@ const core_1 = require("@rsdk/core");
 const throwError_1 = require("rxjs/internal/observable/throwError");
 const catchError_1 = require("rxjs/internal/operators/catchError");
 const tap_1 = require("rxjs/internal/operators/tap");
-const graphql_config_1 = require("./graphql.config");
+const config_1 = require("./config");
 let GraphqlLoggerInterceptor = class GraphqlLoggerInterceptor {
     logger;
     graphQLConfig;
@@ -75,6 +75,6 @@ exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor;
 exports.GraphqlLoggerInterceptor = GraphqlLoggerInterceptor = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, core_1.InjectLogger)(GraphqlLoggerInterceptor)),
-    __metadata("design:paramtypes", [Object, graphql_config_1.GraphQLConfig])
+    __metadata("design:paramtypes", [Object, config_1.GraphqlConfig])
 ], GraphqlLoggerInterceptor);
 //# sourceMappingURL=graphql-logger.interceptor.js.map

package/dist/graphql-logger.interceptor.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql-logger.interceptor.js","sourceRoot":"","sources":["../src/graphql-logger.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAA4C;AAE5C,6CAAsD;AACtD,qCAA0C;AAG1C,oEAAiE;AACjE,mEAAgE;AAChE,qDAAkD;AAElD,qDAAiD;AAG1C,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEe;IACxC;IAFV,YACkD,MAAe,EACvD,aAA4B;QADY,WAAM,GAAN,MAAM,CAAS;QACvD,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IAEJ,SAAS,CACP,OAAyB,EACzB,IAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAkB,KAAK,SAAS,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAE1E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YAC5C,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,uBAAU,EAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACtD,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,KAAK;aACN,CAAC,CAAC;YACH,OAAO,IAAA,uBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,EACF,IAAA,SAAG,EAAC,CAAC,QAAQ,EAAE,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBAC3C,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA7DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,mBAAY,EAAC,wBAAwB,CAAC,CAAA;6CAChB,8BAAa;GAH3B,wBAAwB,CA6DpC"}
+{"version":3,"file":"graphql-logger.interceptor.js","sourceRoot":"","sources":["../src/graphql-logger.interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAKA,2CAA4C;AAE5C,6CAAsD;AACtD,qCAA0C;AAG1C,oEAAiE;AACjE,mEAAgE;AAChE,qDAAkD;AAElD,qCAAyC;AAGlC,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IAEe;IACxC;IAFV,YACkD,MAAe,EACvD,aAA4B;QADY,WAAM,GAAN,MAAM,CAAS;QACvD,kBAAa,GAAb,aAAa,CAAe;IACnC,CAAC;IAEJ,SAAS,CACP,OAAyB,EACzB,IAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC;YACvC,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,EAAkB,KAAK,SAAS,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;QAED,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,6BAAmB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;QAE1E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE;YAC5C,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,CACvB,IAAA,uBAAU,EAAC,CAAC,KAAK,EAAE,EAAE;YACnB,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE;gBACtD,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,KAAK;aACN,CAAC,CAAC;YACH,OAAO,IAAA,uBAAU,EAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,CAAC,CAAC,EACF,IAAA,SAAG,EAAC,CAAC,QAAQ,EAAE,EAAE;YACf,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE;gBAC3C,OAAO,EAAE,aAAa;gBACtB,SAAS;gBACT,OAAO;gBACP,QAAQ,EAAE,OAAO,GAAG,SAAS;gBAC7B,QAAQ;aACT,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF,CAAA;AA7DY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,mBAAY,EAAC,wBAAwB,CAAC,CAAA;6CAChB,sBAAa;GAH3B,wBAAwB,CA6DpC"}

package/dist/graphql.plugin.d.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareConsumer } from '@nestjs/common';
-import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin } from '@rsdk/core';
+import type { IErrorsFormatter, IErrorsSender, NestModuleDefinitions, PlatformAppPlugin, ProtocolTracingHeadersExtractor } from '@rsdk/core';
 export type Approach = 'schema-first' | 'code-first';
 export interface GraphQLPluginOptions<T extends Approach> {
     approach: T;
@@ -16,6 +16,10 @@ export interface GraphQLPluginCodeFirstOptions extends GraphQLPluginOptions<'cod
 export declare const isCodeFirst: (options: GraphQLPluginOptions<Approach>) => options is GraphQLPluginCodeFirstOptions;
 export declare class GraphQLPlugin implements PlatformAppPlugin {
     private readonly options;
+    tracingHeadersExtractors(): {
+        protocol: string;
+        extractor: ProtocolTracingHeadersExtractor;
+    }[];
     private readonly path;
     constructor(options: GraphQLPluginCodeFirstOptions | GraphQLPluginSchemaFirstOptions);
     forTransports(): Readonly<string[]>;

package/dist/graphql.plugin.js

@@ -6,8 +6,9 @@ const core_1 = require("@nestjs/core");
 const graphql_1 = require("@nestjs/graphql");
 const logging_1 = require("@rsdk/logging");
 const apollo_logger_adapter_1 = require("./apollo-logger.adapter");
+const config_1 = require("./config");
 const error_handling_1 = require("./error-handling");
-const graphql_config_1 = require("./graphql.config");
+const gql_tracing_extractor_1 = require("./gql.tracing-extractor");
 const graphql_logger_interceptor_1 = require("./graphql-logger.interceptor");
 const onConnect = (connectionParams) => {
     const out = connectionParams ?? {};
@@ -25,6 +26,14 @@ const isCodeFirst = (options) => options.approach === 'code-first';
 exports.isCodeFirst = isCodeFirst;
 class GraphQLPlugin {
     options;
+    tracingHeadersExtractors() {
+        return [
+            {
+                protocol: 'graphql',
+                extractor: new gql_tracing_extractor_1.GqlTracingExtractor(),
+            },
+        ];
+    }
     path;
     constructor(options) {
         this.options = options;
@@ -48,7 +57,7 @@ class GraphQLPlugin {
                 ],
             },
             graphql_1.GraphQLModule.forRootAsync({
-                inject: [graphql_config_1.GraphQLConfig],
+                inject: [config_1.GraphqlConfig],
                 driver: apollo_1.ApolloDriver,
                 useFactory: (config) => ({
                     path: this.path,

package/dist/graphql.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/graphql",
-  "version": "4.2.5-next.0",
+  "version": "4.3.0-next.1",
   "description": "Plugin for graphql",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -19,14 +19,15 @@
     "@nestjs/common": "^10.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/graphql": "^12.0.8",
-    "@rsdk/common": "^4.2.5-next.0",
-    "@rsdk/core": "^4.2.5-next.0",
-    "@rsdk/http.server.express": "^4.2.5-next.0",
-    "@rsdk/logging": "^4.2.5-next.0",
+    "@rsdk/common": "^4.3.0-next.1",
+    "@rsdk/core": "^4.3.0-next.1",
+    "@rsdk/http.server": "^4.3.0-next.1",
+    "@rsdk/http.server.express": "^4.3.0-next.1",
+    "@rsdk/logging": "^4.3.0-next.1",
     "graphql": "^16.6.0",
     "graphql-subscriptions": "^2.0.0",
-    "reflect-metadata": "^0.1.13",
+    "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.8.1"
   },
-  "gitHead": "3fd1ccaa4a982d914736c13b87dc9bfe03cd229d"
+  "gitHead": "da58041323f3145aa436e02774d36d44606c1217"
 }

package/src/{graphql.config.ts → config.ts}

@@ -9,7 +9,7 @@ import {
 @ConfigSection({
   tags: [ConfigTag.infrastructure, ConfigTag.transport, ConfigTag.graphql],
 })
-export class GraphQLConfig extends Config {
+export class GraphqlConfig extends Config {
   @Property('GRAPHQL_ENABLE_PLAYGROUND', new BoolParser(), {
     defaultValue: false,
     description: 'Enables GraphQL playground and introspection',

package/src/gql.tracing-extractor.ts

@@ -0,0 +1,25 @@
+import type { ExecutionContext } from '@nestjs/common';
+import type { ProtocolTracingHeadersExtractor } from '@rsdk/core';
+import { TracingHeaders } from '@rsdk/core/dist/tracing/types';
+import { HttpHeaders } from '@rsdk/http.server';
+
+export class GqlTracingExtractor implements ProtocolTracingHeadersExtractor {
+  extract(executionContext: ExecutionContext): TracingHeaders {
+    const req = executionContext.getArgs()[2]?.req; // аналог GqlExecutionContext.create(executionContext).getContext().req
+
+    /**
+     * При работе с сабскрипшен через веб сокет, заголовки передаются в опции подключения к сабскрипшен в переменную connectionParams
+     * и мы перегоняем эти данные в request заголовки
+     */
+    const headers = {
+      ...req?.headers,
+      ...req?.connectionParams?.headers,
+    };
+
+    const tracingHeaders = new HttpHeaders(headers).getHeaders(req);
+
+    return new TracingHeaders({
+      ...tracingHeaders,
+    });
+  }
+}

package/src/graphql-logger.interceptor.ts

@@ -13,13 +13,13 @@ import { throwError } from 'rxjs/internal/observable/throwError';
 import { catchError } from 'rxjs/internal/operators/catchError';
 import { tap } from 'rxjs/internal/operators/tap';
 
-import { GraphQLConfig } from './graphql.config';
+import { GraphqlConfig } from './config';
 
 @Injectable()
 export class GraphqlLoggerInterceptor implements NestInterceptor {
   constructor(
     @InjectLogger(GraphqlLoggerInterceptor) private logger: ILogger,
-    private graphQLConfig: GraphQLConfig,
+    private graphQLConfig: GraphqlConfig,
   ) {}
 
   intercept(

package/src/graphql.plugin.ts

@@ -8,12 +8,14 @@ import type {
   IErrorsSender,
   NestModuleDefinitions,
   PlatformAppPlugin,
+  ProtocolTracingHeadersExtractor,
 } from '@rsdk/core';
 import { LoggerFactory } from '@rsdk/logging';
 
 import { ApolloLoggerAdapter } from './apollo-logger.adapter';
+import { GraphqlConfig } from './config';
 import { GraphQLErrorsFormatter, GraphQLErrorsSender } from './error-handling';
-import { GraphQLConfig } from './graphql.config';
+import { GqlTracingExtractor } from './gql.tracing-extractor';
 import { GraphqlLoggerInterceptor } from './graphql-logger.interceptor';
 
 const onConnect = (connectionParams: any): any => {
@@ -63,6 +65,18 @@ export const isCodeFirst = (
   options.approach === 'code-first';
 
 export class GraphQLPlugin implements PlatformAppPlugin {
+  tracingHeadersExtractors(): {
+    protocol: string;
+    extractor: ProtocolTracingHeadersExtractor;
+  }[] {
+    return [
+      {
+        protocol: 'graphql',
+        extractor: new GqlTracingExtractor(),
+      },
+    ];
+  }
+
   private readonly path: string;
 
   constructor(
@@ -92,10 +106,10 @@ export class GraphQLPlugin implements PlatformAppPlugin {
         ],
       },
       GraphQLModule.forRootAsync<ApolloDriverConfig>({
-        inject: [GraphQLConfig],
+        inject: [GraphqlConfig],
         driver: ApolloDriver,
 
-        useFactory: (config: GraphQLConfig) => ({
+        useFactory: (config: GraphqlConfig) => ({
           path: this.path,
           ...(isCodeFirst(this.options) && {
             autoSchemaFile: this.options.autoSchemaFile ?? 'schema.graqhql',

package/dist/graphql.config.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"graphql.config.js","sourceRoot":"","sources":["../src/graphql.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAMoB;AAKb,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,UAAU,CAAW;IAMrB,cAAc,CAAW;CAC1B,CAAA;AAZY,sCAAa;AAKxB;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;iDACmB;AAMrB;IAJC,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;qDACuB;wBAXd,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CAYzB"}