@composed-di/instrumentation-otel 0.6.0-alpha → 0.8.0-alpha

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './otelInstrumentation';
+export * from './otelServiceInstrumentation';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,8BAA8B,CAAA"}

package/dist/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./otelInstrumentation"), exports);
+__exportStar(require("./otelServiceInstrumentation"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAqC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+DAA4C"}

package/dist/otelInstrumentation.d.ts

@@ -1,5 +1,5 @@
 import { Tracer } from '@opentelemetry/api';
-import { DisposeContext, EventSpan, InitializeContext, MethodCallContext, ServiceInstrumentation } from '@composed-di/instrumentation-core';
+import { DisposeContext, OperationSpan, InitializeContext, MethodCallContext, ServiceInstrumentation } from '@composed-di/instrumentation-core';
 export interface OTELInstrumentationOptions {
     /**
      * The tracer used to create spans. Defaults to a tracer obtained from
@@ -15,15 +15,16 @@ export interface OTELInstrumentationOptions {
  *
  * Arguments and results are recorded (as the
  * `composed_di.service.function.arguments` / `.result` attributes,
- * serialized to JSON) exactly when `instrument()` delivers them — capture
- * and redaction policy live in the InstrumentOptions, not here.
+ * serialized to JSON) exactly when `instrument()` (inherited from
+ * ServiceInstrumentation) delivers them — capture and redaction policy
+ * live in the InstrumentOptions, not here.
  */
-export declare class OTELInstrumentation implements ServiceInstrumentation {
+export declare class OTELInstrumentation extends ServiceInstrumentation {
     private readonly tracer;
     constructor(options?: OTELInstrumentationOptions);
-    onInitialize(context: InitializeContext): EventSpan;
-    onDispose(context: DisposeContext): EventSpan;
-    onMethodCall(context: MethodCallContext): EventSpan;
+    onInitialize(context: InitializeContext): OperationSpan;
+    onDispose(context: DisposeContext): OperationSpan;
+    onMethodCall(context: MethodCallContext): OperationSpan;
     private buildSpan;
     private buildAttributes;
 }

package/dist/otelInstrumentation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otelInstrumentation.d.ts","sourceRoot":"","sources":["../src/otelInstrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACP,MAAM,oBAAoB,CAAA;AAM3B,OAAO,EACL,cAAc,EAEd,SAAS,EACT,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,mBAAoB,YAAW,sBAAsB;IAChE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAEnB,OAAO,GAAE,0BAA+B;IAKpD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS;IAWnD,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,SAAS;IAW7C,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,SAAS;IAYnD,OAAO,CAAC,SAAS;IAkCjB,OAAO,CAAC,eAAe;CAuBxB"}
+{"version":3,"file":"otelInstrumentation.d.ts","sourceRoot":"","sources":["../src/otelInstrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACP,MAAM,oBAAoB,CAAA;AAM3B,OAAO,EACL,cAAc,EAEd,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;;;GAQG;AACH,qBAAa,mBAAoB,SAAQ,sBAAsB;IAC7D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAEnB,OAAO,GAAE,0BAA+B;IAMpD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;IAWvD,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,aAAa;IAWjD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;IAYvD,OAAO,CAAC,SAAS;IAkCjB,OAAO,CAAC,eAAe;CAuBxB"}

package/dist/otelInstrumentation.js

@@ -3,17 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OTELInstrumentation = void 0;
 const api_1 = require("@opentelemetry/api");
 const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const instrumentation_core_1 = require("@composed-di/instrumentation-core");
 /**
  * A ServiceInstrumentation that records service events as OTEL spans.
  *
  * Arguments and results are recorded (as the
  * `composed_di.service.function.arguments` / `.result` attributes,
- * serialized to JSON) exactly when `instrument()` delivers them — capture
- * and redaction policy live in the InstrumentOptions, not here.
+ * serialized to JSON) exactly when `instrument()` (inherited from
+ * ServiceInstrumentation) delivers them — capture and redaction policy
+ * live in the InstrumentOptions, not here.
  */
-class OTELInstrumentation {
+class OTELInstrumentation extends instrumentation_core_1.ServiceInstrumentation {
     constructor(options = {}) {
         var _a;
+        super();
         this.tracer =
             (_a = options.tracer) !== null && _a !== void 0 ? _a : api_1.trace.getTracer('@composed-di/instrumentation-otel');
     }
@@ -22,7 +25,7 @@ class OTELInstrumentation {
             key: context.key,
             event: 'initialize',
             className: 'ServiceFactory',
-            functionName: 'initialize',
+            methodName: 'initialize',
         });
         const spanName = `ServiceFactory[${context.key.name}].initialize`;
         return this.buildSpan(spanName, attributes);
@@ -32,7 +35,7 @@ class OTELInstrumentation {
             key: context.key,
             event: 'dispose',
             className: 'ServiceFactory',
-            functionName: 'dispose',
+            methodName: 'dispose',
         });
         const spanName = `ServiceFactory[${context.key.name}].dispose`;
         return this.buildSpan(spanName, attributes);
@@ -42,7 +45,7 @@ class OTELInstrumentation {
             key: context.key,
             event: 'call',
             className: context.className,
-            functionName: context.functionName,
+            methodName: context.methodName,
             args: context.args,
         });
         const spanName = attributes[semantic_conventions_1.ATTR_CODE_FUNCTION_NAME];
@@ -78,7 +81,7 @@ class OTELInstrumentation {
     buildAttributes(params) {
         var _a;
         const attributes = {
-            [semantic_conventions_1.ATTR_CODE_FUNCTION_NAME]: `${(_a = params.className) !== null && _a !== void 0 ? _a : params.key.name}.${params.functionName}`,
+            [semantic_conventions_1.ATTR_CODE_FUNCTION_NAME]: `${(_a = params.className) !== null && _a !== void 0 ? _a : params.key.name}.${params.methodName}`,
             'composed_di.service.key': params.key.name,
             'composed_di.service.event': params.event,
         };

package/dist/otelInstrumentation.js.map

@@ -1 +1 @@
-{"version":3,"file":"otelInstrumentation.js","sourceRoot":"","sources":["../src/otelInstrumentation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"otelInstrumentation.js","sourceRoot":"","sources":["../src/otelInstrumentation.ts"],"names":[],"mappings":";;;AAAA,4CAM2B;AAC3B,8EAI4C;AAC5C,4EAO0C;AAc1C;;;;;;;;GAQG;AACH,MAAa,mBAAoB,SAAQ,6CAAsB;IAG7D,YAAY,UAAsC,EAAE;;QAClD,KAAK,EAAE,CAAA;QACP,IAAI,CAAC,MAAM;YACT,MAAA,OAAO,CAAC,MAAM,mCAAI,WAAK,CAAC,SAAS,CAAC,mCAAmC,CAAC,CAAA;IAC1E,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,YAAY;YACnB,SAAS,EAAE,gBAAgB;YAC3B,UAAU,EAAE,YAAY;SACzB,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,kBAAkB,OAAO,CAAC,GAAG,CAAC,IAAI,cAAc,CAAA;QACjE,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,SAAS,CAAC,OAAuB;QAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,SAAS;YAChB,SAAS,EAAE,gBAAgB;YAC3B,UAAU,EAAE,SAAS;SACtB,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,kBAAkB,OAAO,CAAC,GAAG,CAAC,IAAI,WAAW,CAAA;QAC9D,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAED,YAAY,CAAC,OAA0B;QACrC,MAAM,UAAU,GAAG,IAAI,CAAC,eAAe,CAAC;YACtC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,MAAM;YACb,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,IAAI,EAAE,OAAO,CAAC,IAAI;SACnB,CAAC,CAAA;QACF,MAAM,QAAQ,GAAG,UAAU,CAAC,8CAAuB,CAAC,CAAA;QACpD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;IAC7C,CAAC;IAEO,SAAS,CAAC,QAAgB,EAAE,UAAsB;QACxD,MAAM,aAAa,GAAG,aAAW,CAAC,MAAM,EAAE,CAAA;QAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,EAAE,aAAa,CAAC,CAAA;QAC3E,MAAM,WAAW,GAAG,WAAK,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;QAEtD,OAAO;YACL,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,aAAW,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YAC9C,GAAG,EAAE,CAAC,OAAyB,EAAE,EAAE;gBACjC,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;oBAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAA;oBAC3B,IAAI,CAAC,eAAe,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;oBACpE,IAAI,CAAC,YAAY,CACf,sCAAe,EACf,KAAK,YAAY,KAAK;wBACpB,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,6CAAsB;wBACtC,CAAC,CAAC,6CAAsB,CAC3B,CAAA;oBACD,IAAI,CAAC,SAAS,CAAC;wBACb,IAAI,EAAE,oBAAc,CAAC,KAAK;wBAC1B,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;qBAChE,CAAC,CAAA;gBACJ,CAAC;qBAAM,IAAI,OAAO,IAAI,OAAO,EAAE,CAAC;oBAC9B,wDAAwD;oBACxD,yDAAyD;oBACzD,IAAI,CAAC,YAAY,CACf,qCAAqC,EACrC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CACzB,CAAA;gBACH,CAAC;gBACD,IAAI,CAAC,GAAG,EAAE,CAAA;YACZ,CAAC;SACF,CAAA;IACH,CAAC;IAEO,eAAe,CAAC,MAMvB;;QACC,MAAM,UAAU,GAA8B;YAC5C,CAAC,8CAAuB,CAAC,EAAE,GAAG,MAAA,MAAM,CAAC,SAAS,mCAAI,MAAM,CAAC,GAAG,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE;YACxF,yBAAyB,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI;YAC1C,2BAA2B,EAAE,MAAM,CAAC,KAAK;SAC1C,CAAA;QAED,0DAA0D;QAC1D,uDAAuD;QACvD,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC;YAChB,UAAU,CAAC,wCAAwC,CAAC,GAAG,SAAS,CAC9D,MAAM,CAAC,IAAI,CACZ,CAAA;QACH,CAAC;QAED,OAAO,UAAU,CAAA;IACnB,CAAC;CACF;AApGD,kDAoGC;AAED,SAAS,SAAS,CAAC,KAAc;;IAC/B,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,IAAI,GAAG,MAAA,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,mCAAI,MAAM,CAAC,KAAK,CAAC,CAAA;IAC/C,CAAC;IAAC,WAAM,CAAC;QACP,IAAI,GAAG,kBAAkB,CAAA;IAC3B,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC"}

package/dist/otelServiceInstrumentation.d.ts

@@ -0,0 +1,31 @@
+import { Tracer } from '@opentelemetry/api';
+import { DisposeContext, OperationSpan, InitializeContext, MethodCallContext, ServiceInstrumentation } from '@composed-di/instrumentation-core';
+export interface OTELInstrumentationOptions {
+    /**
+     * The tracer used to create spans. Defaults to a tracer obtained from
+     * the global tracer provider — the one `NodeSDK` (and therefore
+     * `@opentelemetry/auto-instrumentations-node`) registers on startup —
+     * so most setups can omit it. The global lookup is lazy: it also works
+     * when the instrumentation is constructed before the SDK starts.
+     */
+    tracer?: Tracer;
+}
+/**
+ * A ServiceInstrumentation that records service events as OTEL spans.
+ *
+ * Arguments and results are recorded (as the
+ * `composed_di.service.function.arguments` / `.result` attributes,
+ * serialized to JSON) exactly when `instrument()` (inherited from
+ * ServiceInstrumentation) delivers them — capture and redaction policy
+ * live in the InstrumentOptions, not here.
+ */
+export declare class OTELServiceInstrumentation extends ServiceInstrumentation {
+    private readonly tracer;
+    constructor(options?: OTELInstrumentationOptions);
+    onInitialize(context: InitializeContext): OperationSpan;
+    onDispose(context: DisposeContext): OperationSpan;
+    onMethodCall(context: MethodCallContext): OperationSpan;
+    private buildSpan;
+    private buildAttributes;
+}
+//# sourceMappingURL=otelServiceInstrumentation.d.ts.map

package/dist/otelServiceInstrumentation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"otelServiceInstrumentation.d.ts","sourceRoot":"","sources":["../src/otelServiceInstrumentation.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,MAAM,EACP,MAAM,oBAAoB,CAAA;AAM3B,OAAO,EACL,cAAc,EAEd,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EACvB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,WAAW,0BAA0B;IACzC;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED;;;;;;;;GAQG;AACH,qBAAa,0BAA2B,SAAQ,sBAAsB;IACpE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAQ;gBAEnB,OAAO,GAAE,0BAA+B;IAMpD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;IAWvD,SAAS,CAAC,OAAO,EAAE,cAAc,GAAG,aAAa;IAWjD,YAAY,CAAC,OAAO,EAAE,iBAAiB,GAAG,aAAa;IAYvD,OAAO,CAAC,SAAS;IAkCjB,OAAO,CAAC,eAAe;CAuBxB"}

package/dist/otelServiceInstrumentation.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OTELServiceInstrumentation = void 0;
+const api_1 = require("@opentelemetry/api");
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const instrumentation_core_1 = require("@composed-di/instrumentation-core");
+/**
+ * A ServiceInstrumentation that records service events as OTEL spans.
+ *
+ * Arguments and results are recorded (as the
+ * `composed_di.service.function.arguments` / `.result` attributes,
+ * serialized to JSON) exactly when `instrument()` (inherited from
+ * ServiceInstrumentation) delivers them — capture and redaction policy
+ * live in the InstrumentOptions, not here.
+ */
+class OTELServiceInstrumentation extends instrumentation_core_1.ServiceInstrumentation {
+    constructor(options = {}) {
+        var _a;
+        super();
+        this.tracer =
+            (_a = options.tracer) !== null && _a !== void 0 ? _a : api_1.trace.getTracer('@composed-di/instrumentation-otel');
+    }
+    onInitialize(context) {
+        const attributes = this.buildAttributes({
+            key: context.key,
+            event: 'initialize',
+            className: 'ServiceFactory',
+            methodName: 'initialize',
+        });
+        const spanName = `ServiceFactory[${context.key.name}].initialize`;
+        return this.buildSpan(spanName, attributes);
+    }
+    onDispose(context) {
+        const attributes = this.buildAttributes({
+            key: context.key,
+            event: 'dispose',
+            className: 'ServiceFactory',
+            methodName: 'dispose',
+        });
+        const spanName = `ServiceFactory[${context.key.name}].dispose`;
+        return this.buildSpan(spanName, attributes);
+    }
+    onMethodCall(context) {
+        const attributes = this.buildAttributes({
+            key: context.key,
+            event: 'call',
+            className: context.className,
+            methodName: context.methodName,
+            args: context.args,
+        });
+        const spanName = attributes[semantic_conventions_1.ATTR_CODE_FUNCTION_NAME];
+        return this.buildSpan(spanName, attributes);
+    }
+    buildSpan(spanName, attributes) {
+        const parentContext = api_1.context.active();
+        const span = this.tracer.startSpan(spanName, { attributes }, parentContext);
+        const spanContext = api_1.trace.setSpan(parentContext, span);
+        return {
+            run: (fn) => api_1.context.with(spanContext, fn),
+            end: (outcome) => {
+                if (outcome.type === 'failure') {
+                    const error = outcome.error;
+                    span.recordException(error instanceof Error ? error : String(error));
+                    span.setAttribute(semantic_conventions_1.ATTR_ERROR_TYPE, error instanceof Error
+                        ? error.name || semantic_conventions_1.ERROR_TYPE_VALUE_OTHER
+                        : semantic_conventions_1.ERROR_TYPE_VALUE_OTHER);
+                    span.setStatus({
+                        code: api_1.SpanStatusCode.ERROR,
+                        message: error instanceof Error ? error.message : String(error),
+                    });
+                }
+                else if ('value' in outcome) {
+                    // Present exactly when result capture is enabled in the
+                    // InstrumentOptions; the value arrives already redacted.
+                    span.setAttribute('composed_di.service.function.result', serialize(outcome.value));
+                }
+                span.end();
+            },
+        };
+    }
+    buildAttributes(params) {
+        var _a;
+        const attributes = {
+            [semantic_conventions_1.ATTR_CODE_FUNCTION_NAME]: `${(_a = params.className) !== null && _a !== void 0 ? _a : params.key.name}.${params.methodName}`,
+            'composed_di.service.key': params.key.name,
+            'composed_di.service.event': params.event,
+        };
+        // Present exactly when argument capture is enabled in the
+        // InstrumentOptions; the args arrive already redacted.
+        if (params.args) {
+            attributes['composed_di.service.function.arguments'] = serialize(params.args);
+        }
+        return attributes;
+    }
+}
+exports.OTELServiceInstrumentation = OTELServiceInstrumentation;
+function serialize(value) {
+    var _a;
+    let text;
+    try {
+        text = (_a = JSON.stringify(value)) !== null && _a !== void 0 ? _a : String(value);
+    }
+    catch (_b) {
+        text = '[unserializable]';
+    }
+    return text;
+}
+//# sourceMappingURL=otelServiceInstrumentation.js.map

package/dist/otelServiceInstrumentation.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@composed-di/instrumentation-otel",
-  "version": "0.6.0-alpha",
+  "version": "0.8.0-alpha",
   "private": false,
   "keywords": [
     "dependency injection",
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@opentelemetry/semantic-conventions": "^1.30.0",
-    "@composed-di/core": "^0.6.0-alpha",
-    "@composed-di/instrumentation-core": "^0.6.0-alpha"
+    "@composed-di/core": "^0.8.0-alpha",
+    "@composed-di/instrumentation-core": "^0.8.0-alpha"
   },
   "devDependencies": {
     "@opentelemetry/api": "1.9.1",

package/src/index.ts

@@ -1 +1 @@
-export * from './otelInstrumentation'
+export * from './otelServiceInstrumentation'

package/src/{otelInstrumentation.ts → otelServiceInstrumentation.ts}

@@ -12,8 +12,8 @@ import {
 } from '@opentelemetry/semantic-conventions'
 import {
   DisposeContext,
-  EventOutcome,
-  EventSpan,
+  OperationOutcome,
+  OperationSpan,
   InitializeContext,
   MethodCallContext,
   ServiceInstrumentation,
@@ -36,59 +36,61 @@ export interface OTELInstrumentationOptions {
  *
  * Arguments and results are recorded (as the
  * `composed_di.service.function.arguments` / `.result` attributes,
- * serialized to JSON) exactly when `instrument()` delivers them — capture
- * and redaction policy live in the InstrumentOptions, not here.
+ * serialized to JSON) exactly when `instrument()` (inherited from
+ * ServiceInstrumentation) delivers them — capture and redaction policy
+ * live in the InstrumentOptions, not here.
  */
-export class OTELInstrumentation implements ServiceInstrumentation {
+export class OTELServiceInstrumentation extends ServiceInstrumentation {
   private readonly tracer: Tracer
 
   constructor(options: OTELInstrumentationOptions = {}) {
+    super()
     this.tracer =
       options.tracer ?? trace.getTracer('@composed-di/instrumentation-otel')
   }
 
-  onInitialize(context: InitializeContext): EventSpan {
+  onInitialize(context: InitializeContext): OperationSpan {
     const attributes = this.buildAttributes({
       key: context.key,
       event: 'initialize',
       className: 'ServiceFactory',
-      functionName: 'initialize',
+      methodName: 'initialize',
     })
     const spanName = `ServiceFactory[${context.key.name}].initialize`
     return this.buildSpan(spanName, attributes)
   }
 
-  onDispose(context: DisposeContext): EventSpan {
+  onDispose(context: DisposeContext): OperationSpan {
     const attributes = this.buildAttributes({
       key: context.key,
       event: 'dispose',
       className: 'ServiceFactory',
-      functionName: 'dispose',
+      methodName: 'dispose',
     })
     const spanName = `ServiceFactory[${context.key.name}].dispose`
     return this.buildSpan(spanName, attributes)
   }
 
-  onMethodCall(context: MethodCallContext): EventSpan {
+  onMethodCall(context: MethodCallContext): OperationSpan {
     const attributes = this.buildAttributes({
       key: context.key,
       event: 'call',
       className: context.className,
-      functionName: context.functionName,
+      methodName: context.methodName,
       args: context.args,
     })
     const spanName = attributes[ATTR_CODE_FUNCTION_NAME]
     return this.buildSpan(spanName, attributes)
   }
 
-  private buildSpan(spanName: string, attributes: Attributes): EventSpan {
+  private buildSpan(spanName: string, attributes: Attributes): OperationSpan {
     const parentContext = otelContext.active()
     const span = this.tracer.startSpan(spanName, { attributes }, parentContext)
     const spanContext = trace.setSpan(parentContext, span)
 
     return {
       run: (fn) => otelContext.with(spanContext, fn),
-      end: (outcome: EventOutcome) => {
+      end: (outcome: OperationOutcome) => {
         if (outcome.type === 'failure') {
           const error = outcome.error
           span.recordException(error instanceof Error ? error : String(error))
@@ -119,11 +121,11 @@ export class OTELInstrumentation implements ServiceInstrumentation {
     key: ServiceKey<unknown>
     event: 'initialize' | 'dispose' | 'call'
     className?: string
-    functionName: string
+    methodName: string
     args?: readonly unknown[]
   }) {
     const attributes: { [key: string]: string } = {
-      [ATTR_CODE_FUNCTION_NAME]: `${params.className ?? params.key.name}.${params.functionName}`,
+      [ATTR_CODE_FUNCTION_NAME]: `${params.className ?? params.key.name}.${params.methodName}`,
       'composed_di.service.key': params.key.name,
       'composed_di.service.event': params.event,
     }