@treatwell/moleculer-essentials 2.0.0-beta.3 → 2.0.0-beta.6

package/README.md

@@ -16,6 +16,9 @@
 - [License](#license)
 <!-- TOC -->
 
+> [!WARNING]
+> Starting v2.0.0-beta.4, this package is only compatible with moleculer v0.15+
+
 ## Purpose
 
 `@treatwell/moleculer-essentials` is a collection of essential utilities and helpers for building
@@ -47,21 +50,20 @@ To complete the TS support and improve the developer experience, we also provide
 
 ## Usage
 
+A working example is available in the [`example`](./example) folder, with a simple calculator service and an OpenAPI.
+It's a great way to start a project.
+
 ### Basic Example
 
 ```ts
 // src/index.ts
+import { join } from 'node:path';
 import fg from 'fast-glob';
 import {
-  HealthCheckMiddleware,
   createLoggerConfig,
   createServiceBroker,
-  defaultLogger,
   ZodValidator,
 } from '@treatwell/moleculer-essentials';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { config } from 'dotenv';
 
 async function run() {
   // Create Service Broker
@@ -92,7 +94,7 @@ async function run() {
 }
 
 run().catch(err => {
-  defaultLogger.error('Error while starting server', { err });
+  console.error('Error while starting server', { err });
   process.exit(1);
 });
 ```

package/dist/index.cjs

@@ -30,6 +30,16 @@ function getSchemaFromMoleculer(schema) {
   }
   return void 0;
 }
+function getContextSchemaField(ctx, prop) {
+  if (!ctx) {
+    return;
+  }
+  const schema = ctx.action ?? ctx.event;
+  if (!schema) {
+    return;
+  }
+  return schema[prop];
+}
 
 class RefExtractor {
   refs = /* @__PURE__ */ new Map();
@@ -730,8 +740,6 @@ class AjvExtractor extends RefExtractor {
 class AjvValidator extends moleculer.Validators.Base {
   modes;
   defaultMode;
-  // broker is a property of the base class
-  broker;
   zodValidator;
   /**
    * Cache of compiled validation functions.
@@ -739,7 +747,7 @@ class AjvValidator extends moleculer.Validators.Base {
    */
   compiledFns = /* @__PURE__ */ new WeakMap();
   constructor(opts, defaultMode, zodValidator) {
-    super();
+    super({});
     this.defaultMode = defaultMode;
     this.zodValidator = zodValidator;
     this.modes = /* @__PURE__ */ new Map();
@@ -795,8 +803,10 @@ class AjvValidator extends moleculer.Validators.Base {
     }
     const { validator, extractor } = validatorMode;
     const refSchema = extractor.extract(schema);
-    const fn = (params, ctx) => {
-      if (!ctx?.action?.disableTransforms) {
+    const fn = (params, opts) => {
+      const ctx = opts?.meta.ctx;
+      const disableTransforms = getContextSchemaField(ctx, "disableTransforms");
+      if (!disableTransforms) {
         applyBeforeTransforms(schema, params);
       }
       const validate = validator.compile(refSchema);
@@ -812,7 +822,7 @@ class AjvValidator extends moleculer.Validators.Base {
           validate.errors || []
         );
       }
-      if (!ctx?.action?.disableTransforms) {
+      if (!disableTransforms) {
         applyAfterTransforms(schema, params);
       }
       return true;
@@ -868,7 +878,7 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, action.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       },
@@ -885,15 +895,21 @@ ${(errors || []).map(
         }
         const validate = this.compile(schema, event.validatorMode);
         return async (ctx) => {
-          validate(ctx.params != null ? ctx.params : {}, ctx);
+          validate(ctx.params != null ? ctx.params : {}, { meta: { ctx } });
           return handler(ctx);
         };
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ZodValidator extends moleculer.Validators.Base {
+  constructor() {
+    super({});
+  }
   compile() {
     throw new Error("compile should not be used, use validate instead");
   }
@@ -916,6 +932,7 @@ ${v4.z.prettifyError(res.error)}`,
   middleware() {
     return {
       name: "Validator",
+      // @ts-expect-error Moleculer wants action.params to be an object
       localAction: (handler, action) => {
         const schema = getSchemaFromMoleculer(action.params);
         if (!schema) {
@@ -926,6 +943,7 @@ ${v4.z.prettifyError(res.error)}`,
           return handler(ctx);
         };
       },
+      // @ts-expect-error Moleculer wants action.params to be an object
       localEvent: (handler, event) => {
         const schema = getSchemaFromMoleculer(event.params);
         if (!schema) {
@@ -938,6 +956,9 @@ ${v4.z.prettifyError(res.error)}`,
       }
     };
   }
+  convertSchemaToMoleculer() {
+    throw new Error("Not implemented");
+  }
 }
 
 class ContextFactory extends moleculer.Context {
@@ -1316,18 +1337,18 @@ function HealthCheckMiddleware(_opts) {
       });
     },
     // After broker started
-    started() {
+    async started() {
       const timeout = setTimeout(() => {
         state = "up";
       }, opts.startDebounce);
       timeout.unref();
     },
     // Before broker stopping
-    stopping() {
+    async stopping() {
       state = "stopping";
     },
     // After broker stopped
-    stopped() {
+    async stopped() {
       state = "down";
       server.close();
     }
@@ -1336,23 +1357,27 @@ function HealthCheckMiddleware(_opts) {
 
 function flattenTags(obj, convertToString = false, path = "") {
   if (!obj) return null;
-  return Object.keys(obj).reduce((res, k) => {
-    const o = obj[k];
-    const pp = (path ? `${path}.` : "") + k;
-    if (compat.isObject(o)) {
-      if ("toHexString" in o) {
-        res[pp] = o.toString();
-      } else {
-        Object.assign(res, flattenTags(o, convertToString, pp));
+  return Object.keys(obj).reduce(
+    (res, k) => {
+      const o = obj[k];
+      const pp = (path ? `${path}.` : "") + k;
+      if (compat.isObject(o)) {
+        if ("toHexString" in o) {
+          res[pp] = o.toString();
+        } else {
+          Object.assign(res, flattenTags(o, convertToString, pp));
+        }
+      } else if (o !== void 0 && o !== null) {
+        res[pp] = convertToString ? String(o) : o;
       }
-    } else if (o !== void 0 && o !== null) {
-      res[pp] = convertToString ? String(o) : o;
-    }
-    return res;
-  }, {});
+      return res;
+    },
+    {}
+  );
 }
 
 class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
+  opts = {};
   queue;
   timer = null;
   defaultTags = {};
@@ -1372,11 +1397,11 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
    */
   init(tracer) {
     super.init(tracer);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
-    this.defaultTags = typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags;
+    this.defaultTags = (typeof this.opts.defaultTags === "function" ? this.opts.defaultTags.call(this, tracer) : this.opts.defaultTags) || null;
     if (this.defaultTags) {
       this.defaultTags = flattenTags(this.defaultTags, true);
     }
@@ -1459,7 +1484,6 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
         "duration.ms": span.duration,
         name: span.name,
         "parent.id": span.parentID,
-        // @ts-expect-error fullName isn't declared on span yet
         "service.name": span.service?.fullName || null,
         ...flattenTags(span.tags, true),
         ...flattenTags(this.errorToObject(span.error), true, "error") || {}
@@ -1469,9 +1493,7 @@ class NewrelicTraceExporter extends moleculer.TracerExporters.Base {
 }
 
 class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
-  // Those fields are not declared on the Base class.
-  registry;
-  logger;
+  opts = {};
   timer = null;
   defaultTags = {};
   constructor(opts) {
@@ -1487,7 +1509,7 @@ class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
    */
   init(registry) {
     super.init(registry);
-    if (this.opts.interval > 0) {
+    if (this.opts.interval && this.opts.interval > 0) {
       this.timer = setInterval(() => this.flush(), this.opts.interval * 1e3);
       this.timer.unref();
     }
@@ -1589,7 +1611,7 @@ class NewrelicMetricsReporter extends moleculer.MetricReporters.Base {
               attributes: labels,
               timestamp,
               value: { count, sum, min: min || 0, max: max || 0 },
-              "interval.ms": this.opts.interval * 1e3
+              "interval.ms": (this.opts.interval || 0) * 1e3
             });
             if (buckets) {
               Object.entries(buckets).forEach(([key, val]) => {

package/dist/index.d.cts

@@ -1,10 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-CSx6iC1f.cjs';
-export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-CSx6iC1f.cjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-DLBNHgt4.cjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-DLBNHgt4.cjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import * as Moleculer from 'moleculer';
-import { Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
+import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -60,7 +59,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.MoleculerServerError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.MoleculerServerError, "cause">>;
                         };
                     };
                 };
@@ -92,7 +91,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.ValidationError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.ValidationError, "cause">>;
                         };
                     };
                 };
@@ -201,6 +200,12 @@ declare class AjvExtractor extends RefExtractor {
  * For now, only methods are typed.
  */
 declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomServiceSchema<Settings, Methods, Mixins>>): typeof svc;
+/**
+ * In order to let TS emit types for inferred services, we return our own
+ * type that extend the original one.
+ * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
+ */
+type _InferredServiceSchema = ServiceSchema;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -209,7 +214,7 @@ declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomService
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): ServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
 
 /**
  * This class replace the default Service class in Moleculer to:
@@ -271,7 +276,7 @@ declare function createLogger(opts?: CreateLoggerOptions): Logger;
 declare function createLoggerConfig(opts?: MoleculerLoggerConfigOptions): LoggerConfig;
 
 type NewrelicTraceExporterOptions = {
-    logger?: LoggerInstance;
+    logger?: Logger$1;
     safetyTags?: boolean;
     /**
      * Base URL for NewRelic server.
@@ -292,7 +297,7 @@ type NewrelicTraceExporterOptions = {
     /**
      * Default span tags.
      */
-    defaultTags?: Record<string, unknown> | (() => Record<string, unknown>);
+    defaultTags?: Record<string, unknown> | ((tracer?: unknown) => Record<string, unknown>);
 };
 /**
  * >>> Hard copy of the moleculer NewRelic provider. It didn't handle errors correctly
@@ -303,6 +308,7 @@ type NewrelicTraceExporterOptions = {
  * API v2: https://zipkin.io/zipkin-api/#/
  */
 declare class NewrelicTraceExporter extends TracerExporters.Base {
+    private readonly opts;
     private queue;
     private timer;
     private defaultTags;
@@ -334,7 +340,7 @@ declare class NewrelicTraceExporter extends TracerExporters.Base {
 }
 
 type DefaultTags = Record<string, unknown> | ((registry: MetricRegistry) => Record<string, unknown>);
-type NewrelicMetricsOptions = MetricReporterOptions & {
+type NewrelicMetricsOptions = MetricReporters.Base.MetricReporterOptions & {
     /**
      * Base URL for NewRelic server.
      */
@@ -358,8 +364,7 @@ type NewrelicMetricsOptions = MetricReporterOptions & {
  * NewRelic API: https://docs.newrelic.com/docs/data-apis/understand-data/metric-data/metric-data-type/
  */
 declare class NewrelicMetricsReporter extends MetricReporters.Base {
-    registry: MetricRegistry;
-    logger: LoggerInstance;
+    private readonly opts;
     private timer;
     private defaultTags;
     constructor(opts: NewrelicMetricsOptions);
@@ -382,4 +387,4 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
 }
 
 export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
-export type { OpenAPIMixinOptions, OpenAPIResponses, Selector };
+export type { OpenAPIMixinOptions, OpenAPIResponses, Selector, _InferredServiceSchema };

package/dist/index.d.mts

@@ -1,10 +1,9 @@
-import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-CSx6iC1f.mjs';
-export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-CSx6iC1f.mjs';
+import { S as SomeJSONSchema, J as JSONSchemaType, C as CustomActionSchema, A as Alias, a as CustomServiceSchema, D as Document, b as SchemaObject, O as OperationObject, R as ReferenceObject, c as CreateLoggerOptions, M as MoleculerLoggerConfigOptions } from './types-DLBNHgt4.mjs';
+export { d as AjvValidator, e as ApiKeySecurityScheme, f as CallbackObject, g as ComponentsObject, h as ContactObject, i as ContextFactory, E as EncodingObject, j as ExampleObject, k as ExternalDocumentationObject, H as HeaderObject, l as HttpSecurityScheme, I as InfoObject, m as InternalCallbackServiceThis, n as InternalObjectServiceThis, L as LicenseObject, o as LinkObject, p as MediaTypeObject, q as OAuth2SecurityScheme, r as OpenIdSecurityScheme, P as ParameterBaseObject, s as ParameterObject, t as PathItemObject, u as PathsObject, v as PropertiesSchema, w as RequestBodyObject, x as RequiredMembers, y as ResponseObject, z as ResponsesObject, B as SecurityRequirementObject, F as SecuritySchemeObject, G as ServerObject, K as ServerVariableObject, T as TagObject, N as Transform, Q as TransformField, U as TransformLevel, V as TransformMap, W as Transformer, X as ValidationSchema, Z as ZodValidator } from './types-DLBNHgt4.mjs';
 import { ObjectId } from 'bson';
 import { z, ZodType } from 'zod/v4';
 import { Ajv2019 } from 'ajv/dist/2019.js';
-import * as Moleculer from 'moleculer';
-import { Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, LoggerInstance, Tracer, Span, MetricReporters, MetricRegistry, MetricReporterOptions } from 'moleculer';
+import { Errors, Context, ServiceSchema, ServiceSettingSchema, Service, ServiceBroker, BrokerOptions, Middleware, LoggerConfig, TracerExporters, Logger as Logger$1, Tracer, Span, MetricReporters, MetricRegistry } from 'moleculer';
 import { Logger } from 'pino';
 import 'pino-pretty';
 
@@ -60,7 +59,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.MoleculerServerError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.MoleculerServerError, "cause">>;
                         };
                     };
                 };
@@ -92,7 +91,7 @@ declare function OpenAPIMixin(options: OpenAPIMixinOptions): Partial<CustomServi
                     description: string;
                     content: {
                         'application/json': {
-                            schema: JSONSchemaType<Omit<Moleculer.Errors.ValidationError, "cause">>;
+                            schema: JSONSchemaType<Omit<Errors.ValidationError, "cause">>;
                         };
                     };
                 };
@@ -201,6 +200,12 @@ declare class AjvExtractor extends RefExtractor {
  * For now, only methods are typed.
  */
 declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomServiceSchema<Settings, Methods, Mixins>>): typeof svc;
+/**
+ * In order to let TS emit types for inferred services, we return our own
+ * type that extend the original one.
+ * More on why: https://github.com/microsoft/TypeScript/pull/58176#issuecomment-2052698294
+ */
+type _InferredServiceSchema = ServiceSchema;
 /**
  * This function is a NO-OP and is only useful for Typescript types.
  * Using Generic arguments allows TS to infer types directly from the object
@@ -209,7 +214,7 @@ declare function wrapMixin<Settings, Methods, Mixins>(svc: Partial<CustomService
  * For the wrapService fn, it will return a moleculer ServiceSchema that will stripe
  * out every smart typing of methods. This should never be used inside a mixin.
  */
-declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): ServiceSchema;
+declare function wrapService<Settings, Methods, Mixins>(svc: CustomServiceSchema<Settings, Methods, Mixins>): _InferredServiceSchema;
 
 /**
  * This class replace the default Service class in Moleculer to:
@@ -271,7 +276,7 @@ declare function createLogger(opts?: CreateLoggerOptions): Logger;
 declare function createLoggerConfig(opts?: MoleculerLoggerConfigOptions): LoggerConfig;
 
 type NewrelicTraceExporterOptions = {
-    logger?: LoggerInstance;
+    logger?: Logger$1;
     safetyTags?: boolean;
     /**
      * Base URL for NewRelic server.
@@ -292,7 +297,7 @@ type NewrelicTraceExporterOptions = {
     /**
      * Default span tags.
      */
-    defaultTags?: Record<string, unknown> | (() => Record<string, unknown>);
+    defaultTags?: Record<string, unknown> | ((tracer?: unknown) => Record<string, unknown>);
 };
 /**
  * >>> Hard copy of the moleculer NewRelic provider. It didn't handle errors correctly
@@ -303,6 +308,7 @@ type NewrelicTraceExporterOptions = {
  * API v2: https://zipkin.io/zipkin-api/#/
  */
 declare class NewrelicTraceExporter extends TracerExporters.Base {
+    private readonly opts;
     private queue;
     private timer;
     private defaultTags;
@@ -334,7 +340,7 @@ declare class NewrelicTraceExporter extends TracerExporters.Base {
 }
 
 type DefaultTags = Record<string, unknown> | ((registry: MetricRegistry) => Record<string, unknown>);
-type NewrelicMetricsOptions = MetricReporterOptions & {
+type NewrelicMetricsOptions = MetricReporters.Base.MetricReporterOptions & {
     /**
      * Base URL for NewRelic server.
      */
@@ -358,8 +364,7 @@ type NewrelicMetricsOptions = MetricReporterOptions & {
  * NewRelic API: https://docs.newrelic.com/docs/data-apis/understand-data/metric-data/metric-data-type/
  */
 declare class NewrelicMetricsReporter extends MetricReporters.Base {
-    registry: MetricRegistry;
-    logger: LoggerInstance;
+    private readonly opts;
     private timer;
     private defaultTags;
     constructor(opts: NewrelicMetricsOptions);
@@ -382,4 +387,4 @@ declare class NewrelicMetricsReporter extends MetricReporters.Base {
 }
 
 export { AjvExtractor, Alias, COERCE_ARRAY_ATTRIBUTE, CustomActionSchema, CustomServiceSchema, DATE_TYPE, Document, EMPTY_OBJECT_SCHEMA, HealthCheckMiddleware, JSONSchemaType, NewrelicMetricsReporter, NewrelicTraceExporter, OBJECTID_TYPE, OpenAPIExtractor, OpenAPIMixin, OperationObject, RefExtractor, ReferenceObject, SCHEMA_REF_NAME, SchemaObject, ServiceFactory, SomeJSONSchema, addFieldsToSchema, composeSchemas, createLogger, createLoggerConfig, createOpenAPIResponses, createServiceBroker, getMetadataFromService, isServiceSelected, isZodSchema, omitFields, optionalExceptFields, optionalFields, pickFields, toPartialSchema, wrapMixin, wrapService, zodCoerceArray, zodDate, zodObjectId, zodToOpenAPISchema };
-export type { OpenAPIMixinOptions, OpenAPIResponses, Selector };
+export type { OpenAPIMixinOptions, OpenAPIResponses, Selector, _InferredServiceSchema };