@vtex/api 6.50.0-beta.2 → 7.0.1

package/lib/service/logger/client.d.ts

@@ -1,2 +1,2 @@
-import { LogClient } from '@vtex/diagnostics-nodejs/dist/types';
-export declare function getLogClient(account: string, workspace: string, appName: string): Promise<LogClient>;
+import { Types } from '@vtex/diagnostics-nodejs';
+export declare function getLogClient(): Promise<Types.LogClient>;

package/lib/service/logger/client.js

@@ -1,45 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLogClient = void 0;
-const diagnostics_nodejs_1 = require("@vtex/diagnostics-nodejs");
 const telemetry_1 = require("../telemetry");
-let logClient;
+let client;
 let isInitializing = false;
 let initPromise = undefined;
-async function getLogClient(account, workspace, appName) {
-    if (logClient) {
-        return logClient;
+async function getLogClient() {
+    if (client) {
+        return client;
     }
     if (initPromise) {
         return initPromise;
     }
     isInitializing = true;
-    initPromise = initializeClient(account, workspace, appName);
+    initPromise = initializeClient();
     return initPromise;
 }
 exports.getLogClient = getLogClient;
-async function initializeClient(account, workspace, appName) {
+async function initializeClient() {
     try {
-        const telemetryClient = await (0, telemetry_1.getTelemetryClient)();
-        const logsConfig = diagnostics_nodejs_1.Exporters.CreateLogsExporterConfig({
-            endpoint: process.env.OTEL_EXPORTER_OTLP_ENDPOINT,
-            path: process.env.OTEL_EXPORTER_OTLP_PATH || '/v1/logs',
-            protocol: 'http',
-            interval: 5,
-            timeoutSeconds: 5,
-            headers: { 'Content-Type': 'application/json' },
-        });
-        const logsExporter = diagnostics_nodejs_1.Exporters.CreateExporter(logsConfig, 'otlp');
-        await logsExporter.initialize();
-        const clientKey = `${account}-${workspace}-${appName}`;
-        logClient = await telemetryClient.newLogsClient({
-            exporter: logsExporter,
-            loggerName: `node-vtex-api-${clientKey}`,
-        });
-        return logClient;
+        const { logsClient } = await (0, telemetry_1.initializeTelemetry)();
+        client = logsClient;
+        initPromise = undefined;
+        return logsClient;
     }
     catch (error) {
         console.error('Failed to initialize logs client:', error);
+        initPromise = undefined;
         throw error;
     }
     finally {

package/lib/service/logger/logger.js

@@ -89,7 +89,7 @@ class Logger {
                     setTimeout(() => reject(new Error('Log client initialization timeout')), constants_1.LOG_CLIENT_INIT_TIMEOUT_MS);
                 });
                 this.logClient = await Promise.race([
-                    (0, client_1.getLogClient)(this.account, this.workspace, constants_1.APP.NAME),
+                    (0, client_1.getLogClient)(),
                     timeoutPromise
                 ]);
                 return this.logClient;

package/lib/service/telemetry/client.d.ts

@@ -1,3 +1,9 @@
-import { TelemetryClient } from '@vtex/diagnostics-nodejs/dist/telemetry';
-export declare function getTelemetryClient(): Promise<TelemetryClient>;
-export declare function resetTelemetryClient(): void;
+import { Logs, Metrics, Traces } from '@vtex/diagnostics-nodejs';
+interface TelemetryClients {
+    logsClient: Logs.LogClient;
+    metricsClient: Metrics.MetricsClient;
+    tracesClient: Traces.TraceClient;
+}
+export declare function initializeTelemetry(): Promise<TelemetryClients>;
+export declare function resetTelemetry(): void;
+export {};

package/lib/service/telemetry/client.js

@@ -1,11 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetTelemetryClient = exports.getTelemetryClient = void 0;
+exports.resetTelemetry = exports.initializeTelemetry = void 0;
 const diagnostics_nodejs_1 = require("@vtex/diagnostics-nodejs");
 const constants_1 = require("../../constants");
+const CLIENT_NAME = constants_1.APP.NAME || 'node-vtex-api';
+const APPLICATION_ID = constants_1.APP.ID || 'vtex-io-app';
+const EXPORTER_OTLP_ENDPOINT = process.env.EXPORTER_OTLP_ENDPOINT;
 class TelemetryClientSingleton {
     constructor() {
         this.initializationPromise = undefined;
+        this.initializeTracesClient = async (telemetryClient) => await telemetryClient.newTracesClient({
+            exporter: diagnostics_nodejs_1.Exporters.CreateExporter(diagnostics_nodejs_1.Exporters.CreateTracesExporterConfig({
+                endpoint: EXPORTER_OTLP_ENDPOINT,
+            }), 'otlp'),
+        });
+        this.initializeMetricsClient = async (telemetryClient) => await telemetryClient.newMetricsClient({
+            exporter: diagnostics_nodejs_1.Exporters.CreateExporter(diagnostics_nodejs_1.Exporters.CreateMetricsExporterConfig({
+                endpoint: EXPORTER_OTLP_ENDPOINT,
+                interval: 5,
+                timeoutSeconds: 5,
+            }), 'otlp'),
+        });
+        this.initializeLogsClient = async (telemetryClient) => await telemetryClient.newLogsClient({
+            exporter: diagnostics_nodejs_1.Exporters.CreateExporter(diagnostics_nodejs_1.Exporters.CreateLogsExporterConfig({
+                endpoint: EXPORTER_OTLP_ENDPOINT,
+            }), 'otlp'),
+            loggerName: `node-vtex-api-${APPLICATION_ID}`,
+        });
     }
     static getInstance() {
         if (!TelemetryClientSingleton.instance) {
@@ -13,45 +34,59 @@ class TelemetryClientSingleton {
         }
         return TelemetryClientSingleton.instance;
     }
-    async initTelemetryClient() {
+    async initializeTelemetryClients() {
         try {
-            const telemetryClient = await (0, diagnostics_nodejs_1.NewTelemetryClient)('node-vtex-api', constants_1.APP.ID || 'vtex-app', {
+            const telemetryClient = await (0, diagnostics_nodejs_1.NewTelemetryClient)(APPLICATION_ID, CLIENT_NAME, 'node-vtex-api', {
                 additionalAttrs: {
                     'version': constants_1.APP.VERSION || '',
                     'environment': process.env.VTEX_WORKSPACE || 'development',
                 },
             });
-            this.telemetryClient = telemetryClient;
-            return telemetryClient;
+            const [tracesClient, metricsClient, logsClient] = await Promise.all([
+                this.initializeTracesClient(telemetryClient),
+                this.initializeMetricsClient(telemetryClient),
+                this.initializeLogsClient(telemetryClient),
+            ]);
+            const instrumentations = [
+                ...diagnostics_nodejs_1.Instrumentation.CommonInstrumentations.minimal(),
+            ];
+            telemetryClient.registerInstrumentations(instrumentations);
+            const clients = {
+                logsClient,
+                metricsClient,
+                tracesClient,
+            };
+            this.telemetryClients = clients;
+            return clients;
         }
         catch (error) {
-            console.error('Failed to initialize telemetry client:', error);
+            console.error('Failed to initialize telemetry clients:', error);
             throw error;
         }
         finally {
             this.initializationPromise = undefined;
         }
     }
-    async getClient() {
-        if (this.telemetryClient) {
-            return this.telemetryClient;
+    async getTelemetryClients() {
+        if (this.telemetryClients) {
+            return this.telemetryClients;
         }
         if (this.initializationPromise) {
             return this.initializationPromise;
         }
-        this.initializationPromise = this.initTelemetryClient();
+        this.initializationPromise = this.initializeTelemetryClients();
         return this.initializationPromise;
     }
     reset() {
-        this.telemetryClient = undefined;
+        this.telemetryClients = undefined;
         this.initializationPromise = undefined;
     }
 }
-async function getTelemetryClient() {
-    return TelemetryClientSingleton.getInstance().getClient();
+async function initializeTelemetry() {
+    return TelemetryClientSingleton.getInstance().getTelemetryClients();
 }
-exports.getTelemetryClient = getTelemetryClient;
-function resetTelemetryClient() {
+exports.initializeTelemetry = initializeTelemetry;
+function resetTelemetry() {
     TelemetryClientSingleton.getInstance().reset();
 }
-exports.resetTelemetryClient = resetTelemetryClient;
+exports.resetTelemetry = resetTelemetry;

package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Auth.d.ts

@@ -3,4 +3,4 @@ import { SchemaDirectiveVisitor } from 'graphql-tools';
 export declare class Auth extends SchemaDirectiveVisitor {
     visitFieldDefinition(field: GraphQLField<any, any>): void;
 }
-export declare const authDirectiveTypeDefs = "\nenum Scope {\n  PUBLIC\n  PRIVATE\n}\n\ndirective @auth(\n  scope: Scope\n  productCode: String\n  resourceCode: String\n) on FIELD_DEFINITION\n";
+export declare const authDirectiveTypeDefs = "\ndirective @auth(\n  productCode: String\n  resourceCode: String\n) on FIELD_DEFINITION\n";

package/lib/service/worker/runtime/graphql/schema/schemaDirectives/Auth.js

@@ -8,11 +8,6 @@ const apollo_server_errors_1 = require("apollo-server-errors");
 const axios_1 = __importDefault(require("axios"));
 const graphql_1 = require("graphql");
 const graphql_tools_1 = require("graphql-tools");
-var Scope;
-(function (Scope) {
-    Scope["PUBLIC"] = "PUBLIC";
-    Scope["PRIVATE"] = "PRIVATE";
-})(Scope || (Scope = {}));
 async function parseIdToken(authToken, vtexIdToken) {
     const url = `vtexid.vtex.com.br/api/vtexid/pub/authenticated/user?authToken=${vtexIdToken}`;
     const req = await axios_1.default.request({
@@ -56,7 +51,7 @@ async function auth(ctx, authArgs) {
 }
 function parseArgs(authArgs) {
     if (!authArgs.productCode || !authArgs.resourceCode) {
-        throw new apollo_server_errors_1.UserInputError('Invalid auth schema directive args. Usage: @auth(scope: Scope, productCode: String, resourceCode: String).');
+        throw new apollo_server_errors_1.UserInputError('Invalid auth schema directive args. Usage: @auth(productCode: String, resourceCode: String).');
     }
     return authArgs;
 }
@@ -65,22 +60,14 @@ class Auth extends graphql_tools_1.SchemaDirectiveVisitor {
         const { resolve = graphql_1.defaultFieldResolver } = field;
         field.resolve = async (root, args, ctx, info) => {
             const authArgs = parseArgs(this.args);
-            if (!authArgs.scope || authArgs.scope == Scope.PRIVATE) {
-                await auth(ctx, authArgs);
-            }
+            await auth(ctx, authArgs);
             return resolve(root, args, ctx, info);
         };
     }
 }
 exports.Auth = Auth;
 exports.authDirectiveTypeDefs = `
-enum Scope {
-  PUBLIC
-  PRIVATE
-}
-
 directive @auth(
-  scope: Scope
   productCode: String
   resourceCode: String
 ) on FIELD_DEFINITION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtex/api",
-  "version": "6.50.0-beta.2",
+  "version": "7.0.1",
   "description": "VTEX I/O API client",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -49,7 +49,7 @@
   "dependencies": {
     "@types/koa": "^2.11.0",
     "@types/koa-compose": "^3.2.3",
-    "@vtex/diagnostics-nodejs": "0.1.0-beta.10",
+    "@vtex/diagnostics-nodejs": "0.1.0-io-beta.19",
     "@vtex/node-error-report": "^0.0.3",
     "@wry/equality": "^0.1.9",
     "agentkeepalive": "^4.0.2",
@@ -124,5 +124,8 @@
     "typemoq": "^2.1.0",
     "typescript": "^4.4.4",
     "typescript-json-schema": "^0.52.0"
+  },
+  "resolutions": {
+    "@grpc/grpc-js": "^1.13.4"
   }
 }