@openapi-typescript-infra/service 4.16.0 → 4.18.0

package/.eslintrc.js

@@ -3,7 +3,7 @@
  * Instead, edit the coconfig.js or coconfig.ts file in your project root.
  *
  * See https://github.com/gas-buddy/coconfig for more information.
- * @version coconfig@1.4.1
+ * @version coconfig@1.5.2
  */
 const configModule = require('@openapi-typescript-infra/coconfig');
 

package/.prettierrc.js

@@ -3,7 +3,7 @@
  * Instead, edit the coconfig.js or coconfig.ts file in your project root.
  *
  * See https://github.com/gas-buddy/coconfig for more information.
- * @version coconfig@1.4.1
+ * @version coconfig@1.5.2
  */
 const configModule = require('@openapi-typescript-infra/coconfig');
 

package/build/telemetry/index.d.ts

@@ -11,7 +11,7 @@ import type { ConfigurationSchema } from '../config/schema';
  * In addition, since we have to load it right away before configuration
  * is available, we can't use configuration to decide anything.
  */
-export declare function startGlobalTelemetry(serviceName: string): void;
+export declare function startGlobalTelemetry(serviceName: string): Promise<void>;
 export declare function getGlobalPrometheusExporter(): PrometheusExporter | undefined;
 export declare function shutdownGlobalTelemetry(): Promise<void>;
 export declare function startWithTelemetry<SLocals extends AnyServiceLocals = ServiceLocals<ConfigurationSchema>, RLocals extends RequestLocals = RequestLocals>(options: DelayLoadServiceStartOptions): Promise<{

package/build/telemetry/index.js

@@ -24,14 +24,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startWithTelemetry = exports.shutdownGlobalTelemetry = exports.getGlobalPrometheusExporter = exports.startGlobalTelemetry = void 0;
-const api_1 = require("@opentelemetry/api");
 const exporter_trace_otlp_proto_1 = require("@opentelemetry/exporter-trace-otlp-proto");
 const opentelemetry = __importStar(require("@opentelemetry/sdk-node"));
 const exporter_prometheus_1 = require("@opentelemetry/exporter-prometheus");
 const instrumentations_1 = require("./instrumentations");
 const DummyExporter_1 = require("./DummyExporter");
 // For troubleshooting, set the log level to DiagLogLevel.DEBUG
-api_1.diag.setLogger(new api_1.DiagConsoleLogger(), api_1.DiagLogLevel.INFO);
+opentelemetry.api.diag.setLogger(new (opentelemetry.api.DiagConsoleLogger)(), opentelemetry.api.DiagLogLevel.INFO);
 function getExporter() {
     if (!process.env.DISABLE_OLTP_EXPORTER &&
         (['production', 'staging'].includes(process.env.APP_ENV || process.env.NODE_ENV || '') ||
@@ -55,16 +54,17 @@ let telemetrySdk;
  * In addition, since we have to load it right away before configuration
  * is available, we can't use configuration to decide anything.
  */
-function startGlobalTelemetry(serviceName) {
+async function startGlobalTelemetry(serviceName) {
     if (!prometheusExporter) {
         prometheusExporter = new exporter_prometheus_1.PrometheusExporter({ preventServerStart: true });
+        const instrumentations = (0, instrumentations_1.getAutoInstrumentations)();
         telemetrySdk = new opentelemetry.NodeSDK({
             serviceName,
-            autoDetectResources: true,
+            autoDetectResources: false,
             traceExporter: getExporter(),
-            resourceDetectors: (0, instrumentations_1.getResourceDetectors)(),
+            resource: await (0, instrumentations_1.getResource)(),
             metricReader: prometheusExporter,
-            instrumentations: [(0, instrumentations_1.getAutoInstrumentations)()],
+            instrumentations,
             views: [
                 new opentelemetry.metrics.View({
                     instrumentName: 'http_request_duration_seconds',
@@ -82,14 +82,13 @@ function getGlobalPrometheusExporter() {
 }
 exports.getGlobalPrometheusExporter = getGlobalPrometheusExporter;
 async function shutdownGlobalTelemetry() {
-    await prometheusExporter?.shutdown();
     await telemetrySdk?.shutdown();
     telemetrySdk = undefined;
     prometheusExporter = undefined;
 }
 exports.shutdownGlobalTelemetry = shutdownGlobalTelemetry;
 async function startWithTelemetry(options) {
-    startGlobalTelemetry(options.name);
+    await startGlobalTelemetry(options.name);
     // eslint-disable-next-line import/no-unresolved, @typescript-eslint/no-var-requires
     const { startApp, listen } = require('../express-app/app.js');
     // eslint-disable-next-line import/no-dynamic-require, global-require, @typescript-eslint/no-var-requires

package/build/telemetry/index.js.map

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

package/build/telemetry/instrumentations.d.ts

@@ -1,19 +1,19 @@
 import type { Instrumentation } from '@opentelemetry/instrumentation';
 import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns';
 import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express';
-import { FetchInstrumentation } from 'opentelemetry-instrumentation-fetch-node';
+import { UndiciInstrumentation } from '@opentelemetry/instrumentation-undici';
 import { GenericPoolInstrumentation } from '@opentelemetry/instrumentation-generic-pool';
 import { HttpInstrumentation } from '@opentelemetry/instrumentation-http';
 import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis';
 import { NetInstrumentation } from '@opentelemetry/instrumentation-net';
 import { PgInstrumentation } from '@opentelemetry/instrumentation-pg';
 import { PinoInstrumentation } from '@opentelemetry/instrumentation-pino';
-import { Detector, DetectorSync } from '@opentelemetry/resources';
+import { Resource } from '@opentelemetry/resources';
 declare const InstrumentationMap: {
     '@opentelemetry/instrumentation-http': typeof HttpInstrumentation;
     '@opentelemetry/instrumentation-dns': typeof DnsInstrumentation;
     '@opentelemetry/instrumentation-express': typeof ExpressInstrumentation;
-    'opentelemetry-instrumentation-fetch-node': typeof FetchInstrumentation;
+    '@opentelemetry/instrumentation-undici': typeof UndiciInstrumentation;
     '@opentelemetry/instrumentation-generic-pool': typeof GenericPoolInstrumentation;
     '@opentelemetry/instrumentation-ioredis': typeof IORedisInstrumentation;
     '@opentelemetry/instrumentation-net': typeof NetInstrumentation;
@@ -25,5 +25,5 @@ export type InstrumentationConfigMap = {
     [Name in keyof typeof InstrumentationMap]?: ConfigArg<(typeof InstrumentationMap)[Name]>;
 };
 export declare function getAutoInstrumentations(inputConfigs?: InstrumentationConfigMap): Instrumentation[];
-export declare function getResourceDetectors(): (Detector | DetectorSync)[];
+export declare function getResource(): Promise<Resource>;
 export {};

package/build/telemetry/instrumentations.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getResourceDetectors = exports.getAutoInstrumentations = void 0;
+exports.getResource = exports.getAutoInstrumentations = void 0;
 const instrumentation_dns_1 = require("@opentelemetry/instrumentation-dns");
 const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
-const opentelemetry_instrumentation_fetch_node_1 = require("opentelemetry-instrumentation-fetch-node");
+const instrumentation_undici_1 = require("@opentelemetry/instrumentation-undici");
 const instrumentation_generic_pool_1 = require("@opentelemetry/instrumentation-generic-pool");
 const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
 const instrumentation_ioredis_1 = require("@opentelemetry/instrumentation-ioredis");
@@ -17,7 +17,7 @@ const InstrumentationMap = {
     '@opentelemetry/instrumentation-http': instrumentation_http_1.HttpInstrumentation,
     '@opentelemetry/instrumentation-dns': instrumentation_dns_1.DnsInstrumentation,
     '@opentelemetry/instrumentation-express': instrumentation_express_1.ExpressInstrumentation,
-    'opentelemetry-instrumentation-fetch-node': opentelemetry_instrumentation_fetch_node_1.FetchInstrumentation,
+    '@opentelemetry/instrumentation-undici': instrumentation_undici_1.UndiciInstrumentation,
     '@opentelemetry/instrumentation-generic-pool': instrumentation_generic_pool_1.GenericPoolInstrumentation,
     '@opentelemetry/instrumentation-ioredis': instrumentation_ioredis_1.IORedisInstrumentation,
     '@opentelemetry/instrumentation-net': instrumentation_net_1.NetInstrumentation,
@@ -43,15 +43,22 @@ function getAutoInstrumentations(inputConfigs = {}) {
         .filter((i) => !!i);
 }
 exports.getAutoInstrumentations = getAutoInstrumentations;
-function getResourceDetectors() {
-    return [
-        resource_detector_container_1.containerDetector,
+// Async function to get combined resources
+async function getResource() {
+    const syncDetectors = [
         resources_1.envDetectorSync,
         resources_1.hostDetectorSync,
         resources_1.osDetectorSync,
         resources_1.processDetectorSync,
+    ];
+    const asyncDetectors = [
+        resource_detector_container_1.containerDetector,
         resource_detector_gcp_1.gcpDetector,
     ];
+    const asyncResources = await (0, resources_1.detectResources)({ detectors: asyncDetectors });
+    const syncResources = (0, resources_1.detectResourcesSync)({ detectors: syncDetectors });
+    // Combine async and sync resources
+    return syncResources.merge(asyncResources);
 }
-exports.getResourceDetectors = getResourceDetectors;
+exports.getResource = getResource;
 //# sourceMappingURL=instrumentations.js.map

package/build/telemetry/instrumentations.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentations.js","sourceRoot":"","sources":["../../src/telemetry/instrumentations.ts"],"names":[],"mappings":";;;AACA,4EAAwE;AACxE,oFAAgF;AAChF,uGAAgF;AAChF,8FAAyF;AACzF,8EAA0E;AAC1E,oFAAgF;AAChF,4EAAwE;AACxE,0EAAsE;AACtE,8EAA0E;AAC1E,4FAA+E;AAC/E,gFAAmE;AACnE,wDAOkC;AAElC,MAAM,kBAAkB,GAAG;IACzB,qCAAqC,EAAE,0CAAmB;IAC1D,oCAAoC,EAAE,wCAAkB;IACxD,wCAAwC,EAAE,gDAAsB;IAChE,0CAA0C,EAAE,+DAAoB;IAChE,6CAA6C,EAAE,yDAA0B;IACzE,wCAAwC,EAAE,gDAAsB;IAChE,oCAAoC,EAAE,wCAAkB;IACxD,mCAAmC,EAAE,sCAAiB;IACtD,qCAAqC,EAAE,0CAAmB;CAC3D,CAAC;AAQF,SAAgB,uBAAuB,CACrC,eAAyC,EAAE;IAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA2C,CAAC;IACvF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,qDAAqD;QACrD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5C,IAAI,CAAC;YACH,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAsB,CAAC;AAC7C,CAAC;AAnBD,0DAmBC;AAED,SAAgB,oBAAoB;IAClC,OAAO;QACL,+CAAiB;QACjB,2BAAe;QACf,4BAAgB;QAChB,0BAAc;QACd,+BAAmB;QACnB,mCAAW;KACZ,CAAC;AACJ,CAAC;AATD,oDASC"}
+{"version":3,"file":"instrumentations.js","sourceRoot":"","sources":["../../src/telemetry/instrumentations.ts"],"names":[],"mappings":";;;AACA,4EAAwE;AACxE,oFAAgF;AAChF,kFAA8E;AAC9E,8FAAyF;AACzF,8EAA0E;AAC1E,oFAAgF;AAChF,4EAAwE;AACxE,0EAAsE;AACtE,8EAA0E;AAC1E,4FAA+E;AAC/E,gFAAmE;AACnE,wDAQkC;AAElC,MAAM,kBAAkB,GAAG;IACzB,qCAAqC,EAAE,0CAAmB;IAC1D,oCAAoC,EAAE,wCAAkB;IACxD,wCAAwC,EAAE,gDAAsB;IAChE,uCAAuC,EAAE,8CAAqB;IAC9D,6CAA6C,EAAE,yDAA0B;IACzE,wCAAwC,EAAE,gDAAsB;IAChE,oCAAoC,EAAE,wCAAkB;IACxD,mCAAmC,EAAE,sCAAiB;IACtD,qCAAqC,EAAE,0CAAmB;CAC3D,CAAC;AAQF,SAAgB,uBAAuB,CACrC,eAAyC,EAAE;IAE3C,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAA2C,CAAC;IACvF,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,QAAQ,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1C,qDAAqD;QACrD,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5C,IAAI,CAAC;YACH,OAAO,IAAI,QAAQ,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,kBAAkB,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC3C,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAsB,CAAC;AAC7C,CAAC;AAnBD,0DAmBC;AAED,2CAA2C;AACpC,KAAK,UAAU,WAAW;IAC/B,MAAM,aAAa,GAAG;QACpB,2BAAe;QACf,4BAAgB;QAChB,0BAAc;QACd,+BAAmB;KACpB,CAAC;IACF,MAAM,cAAc,GAAG;QACrB,+CAAiB;QACjB,mCAAW;KACZ,CAAC;IAEF,MAAM,cAAc,GAAG,MAAM,IAAA,2BAAe,EAAC,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,IAAA,+BAAmB,EAAC,EAAE,SAAS,EAAE,aAAa,EAAE,CAAC,CAAC;IAExE,mCAAmC;IACnC,OAAO,aAAa,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AAC7C,CAAC;AAjBD,kCAiBC"}