Revert "feat: otel instrumentation as per MCP semantic convention (#306)" (#317)

This reverts commit 807cc5f.

Author: twishabansal

package-lock.json

@@ -47,7 +47,6 @@ export class ToolboxClient {
     session?: AxiosInstance | null,
     clientHeaders?: ClientHeadersConfig | null,
     protocol: Protocol = Protocol.MCP,
-    telemetryEnabled = false,
   ) {
     this.coreClient = new CoreToolboxClient(
       url,
@@ -56,7 +55,6 @@ export class ToolboxClient {
       protocol,
       'toolbox-adk-js',
       VERSION,
-      telemetryEnabled,
     );
   }
 
@@ -109,12 +107,4 @@ export class ToolboxClient {
     );
     return coreTools.map(coreTool => new ToolboxTool(coreTool));
   }
-
-  /**
-   * Closes the client and flushes any pending telemetry (e.g. session duration metric).
-   * Should be called when the client is no longer needed.
-   */
-  async close(): Promise<void> {
-    await this.coreClient.close();
-  }
 }

packages/toolbox-adk/src/toolbox_adk/client.ts

@@ -28,7 +28,6 @@ import {VERSION} from '../src/toolbox_adk/version.js';
 type MockCoreClient = {
   loadTool: typeof mockLoadTool;
   loadToolset: typeof mockLoadToolset;
-  close: typeof mockClose;
 };
 
 // Define the signature of the mock constructor itself
@@ -39,11 +38,8 @@ type MockCoreClientConstructor = (
   protocol?: string | null,
   clientName?: string,
   clientVersion?: string,
-  telemetryEnabled?: boolean,
 ) => MockCoreClient;
 
-const mockClose = jest.fn<() => Promise<void>>();
-
 const mockLoadTool =
   jest.fn<
     (
@@ -68,7 +64,6 @@ const MockCoreToolboxClient = jest
   .mockImplementation(() => ({
     loadTool: mockLoadTool,
     loadToolset: mockLoadToolset,
-    close: mockClose,
   }));
 
 const MockToolboxTool = jest.fn();
@@ -93,7 +88,6 @@ describe('ToolboxClient', () => {
   beforeEach(() => {
     mockLoadTool.mockReset();
     mockLoadToolset.mockReset();
-    mockClose.mockReset();
     MockCoreToolboxClient.mockClear();
     MockToolboxTool.mockClear();
   });
@@ -111,7 +105,6 @@ describe('ToolboxClient', () => {
       'mcp-default',
       'toolbox-adk-js',
       VERSION,
-      false,
     );
   });
 
@@ -186,28 +179,4 @@ describe('ToolboxClient', () => {
 
     expect(mockLoadToolset).toHaveBeenCalledWith(undefined, {}, {}, false);
   });
-
-  it.each([false, true])(
-    'should forward telemetryEnabled=%s to core client',
-    telemetryEnabled => {
-      new ToolboxClient(
-        'http://test.url',
-        null,
-        null,
-        undefined,
-        telemetryEnabled,
-      );
-      const callArgs = MockCoreToolboxClient.mock.calls[0] as unknown[];
-      expect(callArgs[6]).toBe(telemetryEnabled);
-    },
-  );
-
-  it('should delegate close() to coreClient.close()', async () => {
-    mockClose.mockResolvedValue(undefined);
-    const client = new ToolboxClient('http://test.url');
-
-    await client.close();
-
-    expect(mockClose).toHaveBeenCalledTimes(1);
-  });
 });

packages/toolbox-adk/test/test.client.ts

@@ -61,13 +61,7 @@
         "uuid": "^11.1.0"
     },
     "peerDependencies": {
-        "zod": "^3.24.4",
-        "@opentelemetry/api": "^1.9.0"
-    },
-    "peerDependenciesMeta": {
-        "@opentelemetry/api": {
-            "optional": true
-        }
+        "zod": "^3.24.4"
     },
     "devDependencies": {
         "rimraf": "^6.1.2"

packages/toolbox-core/package.json

@@ -57,14 +57,8 @@ class ToolboxClient {
    * requests. If not provided, a new one will be created.
    * @param {ClientHeadersConfig} [clientHeaders] - Optional initial headers to
    * be included in each request.
-   * @param {Protocol} [protocol] - MCP protocol version to use. Defaults to
-   * the latest supported version. Pass a specific version (e.g.,
-   * `Protocol.MCP_v20241105`) to pin to an older revision.
    * @param {string} [clientName] - Optional name of the client package.
    * @param {string} [clientVersion] - Optional version of the client package.
-   * @param {boolean} [telemetryEnabled] - Set to `true` to enable OpenTelemetry
-   * tracing and metrics. Requires the optional `@opentelemetry/api` peer
-   * dependency. Silently ignored if the package is not installed.
    */
   constructor(
     url: string,
@@ -73,7 +67,6 @@ class ToolboxClient {
     protocol: Protocol = Protocol.MCP,
     clientName?: string,
     clientVersion?: string,
-    telemetryEnabled = false,
   ) {
     this.#clientHeaders = clientHeaders || {};
     warnIfHttpAndHeaders(url, this.#clientHeaders);
@@ -95,7 +88,6 @@ class ToolboxClient {
           protocol,
           clientName,
           clientVersion,
-          telemetryEnabled,
         );
         break;
       case Protocol.MCP_v20250326:
@@ -105,7 +97,6 @@ class ToolboxClient {
           protocol,
           clientName,
           clientVersion,
-          telemetryEnabled,
         );
         break;
       case Protocol.MCP_v20250618:
@@ -115,7 +106,6 @@ class ToolboxClient {
           protocol,
           clientName,
           clientVersion,
-          telemetryEnabled,
         );
         break;
       case Protocol.MCP_v20251125:
@@ -125,7 +115,6 @@ class ToolboxClient {
           protocol,
           clientName,
           clientVersion,
-          telemetryEnabled,
         );
         break;
       default:
@@ -371,14 +360,6 @@ class ToolboxClient {
 
     return tools;
   }
-
-  /**
-   * Closes the client and flushes any pending telemetry (e.g. session duration metric).
-   * Should be called when the client is no longer needed.
-   */
-  async close(): Promise<void> {
-    await this.#transport.close();
-  }
 }
 
 export {ToolboxClient};