wip: address pr comments

Author: starfy84

packages/opentelemetry-instrumentation-typed-express-router/examples/simple-express-app.js

@@ -5,4 +5,3 @@
 export * from './instrumentation';
 export * from './types';
 export { ApiTsAttributes } from './utils';
-export { VERSION } from './version';

packages/opentelemetry-instrumentation-typed-express-router/src/index.ts

@@ -9,15 +9,15 @@ import {
 import { context, SpanKind } from '@opentelemetry/api';
 
 import { TypedExpressRouterInstrumentationConfig, kPatched } from './types';
-import { VERSION } from './version';
+const { version } = require('../package.json');
 import { ApiTsAttributes, handleGenericError } from './utils';
 
 /**
  * OpenTelemetry instrumentation for @api-ts/typed-express-router
  */
 export class TypedExpressRouterInstrumentation extends InstrumentationBase<TypedExpressRouterInstrumentationConfig> {
   constructor(config: TypedExpressRouterInstrumentationConfig = {}) {
-    super('opentelemetry-instrumentation-typed-express-router', VERSION, config);
+    super('opentelemetry-instrumentation-typed-express-router', version, config);
   }
 
   protected init() {
@@ -27,7 +27,6 @@ export class TypedExpressRouterInstrumentation extends InstrumentationBase<Typed
         ['>=0.0.0'],
         (moduleExports: any, moduleVersion) => {
           this._diag.debug(`Patching @api-ts/typed-express-router@${moduleVersion}`);
-
           // Patch wrapRouter function which is responsible for creating the router
           if (typeof moduleExports.wrapRouter === 'function') {
             const original = moduleExports.wrapRouter;
@@ -91,7 +90,6 @@ export class TypedExpressRouterInstrumentation extends InstrumentationBase<Typed
    */
   private _patchWrapRouter(original: Function) {
     const instrumentation = this;
-
     const patched = function (this: unknown, ...args: any[]) {
       // Call the original wrapRouter function
       const wrappedRouter = original.apply(this, args);

packages/opentelemetry-instrumentation-typed-express-router/src/instrumentation.ts

@@ -6,23 +6,6 @@ import { test } from 'node:test';
 import assert from 'node:assert';
 import { TypedExpressRouterInstrumentation } from '../src';
 
-// Setup for all tests but not used in simple tests
-// Kept for reference when adding more complex tests
-/*
-function setupTracing() {
-  const provider = new NodeTracerProvider();
-  const memoryExporter = new InMemorySpanExporter();
-  provider.register();
-  
-  return {
-    provider,
-    memoryExporter,
-    getSpans: () => memoryExporter.getFinishedSpans(),
-    resetSpans: () => memoryExporter.reset(),
-  };
-};
-*/
-
 test('TypedExpressRouterInstrumentation constructor', async () => {
   // Test that the instrumentation can be instantiated without error
   const instrumentation = new TypedExpressRouterInstrumentation();
@@ -53,7 +36,3 @@ test('TypedExpressRouterInstrumentation enable/disable', async () => {
   instrumentation.disable();
   assert.strictEqual(instrumentation.isEnabled(), false);
 });
-
-// Note: We cannot test the actual patching functionality in isolation
-// because it requires a real typed-express-router module.
-// Integration tests will cover this part.