Remove unnecessary interceptor argument

Author: satazor

packages/opentelemetry-instrumentation-connect-node/src/instrumentation.ts

@@ -50,7 +50,7 @@ export class ConnectNodeInstrumentation extends InstrumentationBase<ConnectNodeI
       this._diag.debug('patched createConnectTransport');
 
       return (options: ConnectTransportOptions) => {
-        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer, 'client');
+        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer);
 
         return original({
           ...options,
@@ -65,7 +65,7 @@ export class ConnectNodeInstrumentation extends InstrumentationBase<ConnectNodeI
       this._diag.debug('patched createGrpcTransport');
 
       return (options: GrpcTransportOptions) => {
-        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer, 'client');
+        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer);
 
         return original({
           ...options,
@@ -80,7 +80,7 @@ export class ConnectNodeInstrumentation extends InstrumentationBase<ConnectNodeI
       this._diag.debug('patched createGrpcWebTransport');
 
       return (options: GrpcWebTransportOptions) => {
-        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer, 'client');
+        const interceptor = createClientInterceptor(this.getConfig(), this._diag, this.tracer);
 
         return original({
           ...options,
@@ -95,7 +95,7 @@ export class ConnectNodeInstrumentation extends InstrumentationBase<ConnectNodeI
       this._diag.debug('patched connectNodeAdapter');
 
       return (options: ConnectNodeAdapterOptions) => {
-        const interceptor = createServerInterceptor(this.getConfig(), this._diag, this.tracer, 'server');
+        const interceptor = createServerInterceptor(this.getConfig(), this._diag, this.tracer);
 
         return original({
           ...options,

packages/opentelemetry-instrumentation-connect-node/src/interceptor.ts

@@ -135,15 +135,10 @@ const carrierSetterAndGetter = {
   set: (carrier: Headers, key: string, value: string) => carrier.set(key, value)
 };
 
-export const createClientInterceptor = (
-  config: ConnectNodeInstrumentationConfig,
-  diag: DiagLogger,
-  tracer: Tracer,
-  kind: RpcKind
-) => {
-  const startSpan = createStartSpan(config, tracer, kind);
-  const endSpanWithSuccess = createEndSpanWithSuccess(config, kind);
-  const endSpanWithError = createEndSpanWithError(config, kind);
+export const createClientInterceptor = (config: ConnectNodeInstrumentationConfig, diag: DiagLogger, tracer: Tracer) => {
+  const startSpan = createStartSpan(config, tracer, 'client');
+  const endSpanWithSuccess = createEndSpanWithSuccess(config, 'client');
+  const endSpanWithError = createEndSpanWithError(config, 'client');
 
   return (next: InterceptorAnyFn): InterceptorAnyFn =>
     async req => {
@@ -187,15 +182,10 @@ export const createClientInterceptor = (
     };
 };
 
-export const createServerInterceptor = (
-  config: ConnectNodeInstrumentationConfig,
-  diag: DiagLogger,
-  tracer: Tracer,
-  kind: RpcKind
-) => {
-  const startSpan = createStartSpan(config, tracer, kind);
-  const endSpanWithSuccess = createEndSpanWithSuccess(config, kind);
-  const endSpanWithError = createEndSpanWithError(config, kind);
+export const createServerInterceptor = (config: ConnectNodeInstrumentationConfig, diag: DiagLogger, tracer: Tracer) => {
+  const startSpan = createStartSpan(config, tracer, 'server');
+  const endSpanWithSuccess = createEndSpanWithSuccess(config, 'server');
+  const endSpanWithError = createEndSpanWithError(config, 'server');
 
   return (next: InterceptorAnyFn): InterceptorAnyFn =>
     async req => {