Grpc instrumentation attributes fix

experimental/packages/opentelemetry-instrumentation-grpc/src/enums/AttributeNames.ts

@@ -17,9 +17,24 @@
 /**
  * https://github.com/open-telemetry/opentelemetry-specification/blob/master/specification/trace/semantic_conventions/http.md
  */
-export enum AttributeNames {
-  GRPC_KIND = 'grpc.kind', // SERVER or CLIENT
-  GRPC_METHOD = 'grpc.method',
-  GRPC_ERROR_NAME = 'grpc.error_name',
-  GRPC_ERROR_MESSAGE = 'grpc.error_message',
+import { SemanticAttributes } from '@opentelemetry/semantic-conventions';
+
+interface AttributesType {
+  RPC_SYSTEM: string;
+  GRPC_METHOD: string;
+  RPC_SERVICE: string;
+  GRPC_ERROR_NAME: string;
+  GRPC_ERROR_MESSAGE: string;
 }
+
+const RPC_METHOD  = SemanticAttributes.RPC_METHOD;
+const RPC_SYSTEM  = SemanticAttributes.RPC_SYSTEM;
+const RPC_SERVICE  = SemanticAttributes.RPC_SERVICE;
+
+export const AttributeNames: Readonly<AttributesType> = {
+  RPC_SYSTEM: RPC_SYSTEM,
+  GRPC_METHOD: RPC_METHOD,
+  RPC_SERVICE: RPC_SERVICE,
+  GRPC_ERROR_NAME: 'grpc.error_name',
+  GRPC_ERROR_MESSAGE: 'grpc.error_message',
+};

experimental/packages/opentelemetry-instrumentation-grpc/src/enums/AttributeValues.ts

@@ -0,0 +1,23 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+interface AttributeValuesType {
+  RPC_SYSTEM: string
+}
+
+export const AttributeValues: Readonly<AttributeValuesType> = {
+  RPC_SYSTEM: 'grpc'
+};

experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/clientUtils.ts

@@ -17,7 +17,6 @@
 import { GrpcJsInstrumentation } from './';
 import type { GrpcClientFunc, SendUnaryDataCallback } from './types';
 import {
-  SpanKind,
   Span,
   SpanStatusCode,
   SpanStatus,
@@ -127,11 +126,6 @@ export function makeGrpcClientRemoteCall(
       }
     }
 
-    span.setAttributes({
-      [AttributeNames.GRPC_METHOD]: original.path,
-      [AttributeNames.GRPC_KIND]: SpanKind.CLIENT,
-    });
-
     setSpanContext(metadata);
     const call = original.apply(self, args);
 

experimental/packages/opentelemetry-instrumentation-grpc/src/grpc-js/index.ts

@@ -50,6 +50,8 @@ import {
 } from './clientUtils';
 import { EventEmitter } from 'events';
 import { AttributeNames } from '../enums/AttributeNames';
+import { _extractMethodAndService } from '../utils';
+import {AttributeValues} from '../enums/AttributeValues';
 
 export class GrpcJsInstrumentation extends InstrumentationBase {
   constructor(
@@ -188,10 +190,14 @@ export class GrpcJsInstrumentation extends InstrumentationBase {
                   keys: carrier => Object.keys(carrier.getMap()),
                 }),
                 () => {
+                  const { service, method } = _extractMethodAndService(name)
+
                   const span = instrumentation.tracer
                     .startSpan(spanName, spanOptions)
                     .setAttributes({
-                      [AttributeNames.GRPC_KIND]: spanOptions.kind,
+                      [AttributeNames.RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+                      [AttributeNames.GRPC_METHOD]: method,
+                      [AttributeNames.RPC_SERVICE]: service,
                     });
 
                   context.with(trace.setSpan(context.active(), span), () => {
@@ -283,9 +289,15 @@ export class GrpcJsInstrumentation extends InstrumentationBase {
           original,
           args
         );
-        const span = instrumentation.tracer.startSpan(name, {
-          kind: SpanKind.CLIENT,
-        });
+        const { service, method } = _extractMethodAndService(original.path)
+
+        const span = instrumentation.tracer
+          .startSpan(name, { kind: SpanKind.CLIENT })
+          .setAttributes({
+            [AttributeNames.RPC_SYSTEM]: 'grpc',
+            [AttributeNames.GRPC_METHOD]: method,
+            [AttributeNames.RPC_SERVICE]: service,
+          })
         return context.with(trace.setSpan(context.active(), span), () =>
           makeGrpcClientRemoteCall(original, args, metadata, this)(span)
         );

experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/clientUtils.ts

@@ -22,7 +22,6 @@ import {
   context,
   Span,
   SpanStatusCode,
-  SpanKind,
   SpanStatus,
   propagation,
 } from '@opentelemetry/api';
@@ -99,10 +98,6 @@ export const makeGrpcClientRemoteCall = function (
     }
 
     span.addEvent('sent');
-    span.setAttributes({
-      [AttributeNames.GRPC_METHOD]: original.path,
-      [AttributeNames.GRPC_KIND]: SpanKind.CLIENT,
-    });
 
     setSpanContext(metadata);
     const call = original.apply(self, args);

experimental/packages/opentelemetry-instrumentation-grpc/src/grpc/index.ts

@@ -41,8 +41,9 @@ import {
   serverStreamAndBidiHandler,
 } from './serverUtils';
 import { makeGrpcClientRemoteCall, getMetadata } from './clientUtils';
-import { _methodIsIgnored } from '../utils';
+import { _extractMethodAndService, _methodIsIgnored } from '../utils';
 import { AttributeNames } from '../enums/AttributeNames';
+import {AttributeValues} from "../enums/AttributeValues";
 
 /**
  * Holding reference to grpc module here to access constant of grpc modules
@@ -195,10 +196,14 @@ export class GrpcNativeInstrumentation extends InstrumentationBase<
                   keys: metadata => Object.keys(metadata.getMap()),
                 }),
                 () => {
+                  const { service, method } = _extractMethodAndService(name);
+
                   const span = instrumentation.tracer
                     .startSpan(spanName, spanOptions)
                     .setAttributes({
-                      [AttributeNames.GRPC_KIND]: spanOptions.kind,
+                      [AttributeNames.RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+                      [AttributeNames.GRPC_METHOD]: method,
+                      [AttributeNames.RPC_SERVICE]: service,
                     });
 
                   context.with(trace.setSpan(context.active(), span), () => {
@@ -292,9 +297,15 @@ export class GrpcNativeInstrumentation extends InstrumentationBase<
         )}`;
         const args = Array.prototype.slice.call(arguments);
         const metadata = getMetadata(grpcClient, original, args);
+        const { service, method } = _extractMethodAndService(original.path)
         const span = instrumentation.tracer.startSpan(name, {
           kind: SpanKind.CLIENT,
-        });
+        })
+          .setAttributes({
+            [AttributeNames.RPC_SYSTEM]: AttributeValues.RPC_SYSTEM,
+            [AttributeNames.GRPC_METHOD]: method,
+            [AttributeNames.RPC_SERVICE]: service,
+          });
         return context.with(trace.setSpan(context.active(), span), () =>
           makeGrpcClientRemoteCall(
             grpcClient,

experimental/packages/opentelemetry-instrumentation-grpc/src/utils.ts

@@ -95,3 +95,18 @@ export const _methodIsIgnored = (
 
   return false;
 };
+
+/**
+ * Return method and service values getting from grpc name/path
+ * @param name the grpc name/path
+ */
+export const _extractMethodAndService = (name: string): { service: string, method: string } => {
+  const serviceMethod = name.replace(/^\//, '').split('/');
+  const service = serviceMethod.shift() || '';
+  const method = serviceMethod.join('/');
+
+  return ({
+    service,
+    method
+  })
+};