Update span parser

AutoCollection/diagnostic-channel/SpanParser.ts

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for details.
-import { SpanAttributes, SpanKind } from "@opentelemetry/api";
+import { SpanAttributes, SpanKind, SpanStatusCode } from "@opentelemetry/api";
 import { Span } from "@opentelemetry/tracing";
 import * as Contracts from "../../Declarations/Contracts";
 import * as Constants from "../../Declarations/Constants";
@@ -17,22 +17,19 @@ export function spanToTelemetryContract(span: Span): (Contracts.DependencyTeleme
     const id = `|${span.spanContext().traceId}.${span.spanContext().spanId}.`;
     const duration = Math.round(span["_duration"][0] * 1e3 + span["_duration"][1] / 1e6);
     let peerAddress = span.attributes["peer.address"] ? span.attributes["peer.address"].toString() : "";
-    let component = span.attributes["component"] ? span.attributes["component"].toString() : "";
 
-    const isHttp: boolean = ((component).toUpperCase() === Constants.DependencyTypeName.Http) || (!!span.attributes[Constants.SpanAttribute.HttpUrl]);
-    const isGrpc: boolean = (component).toLowerCase() === Constants.DependencyTypeName.Grpc;
+    const isHttp: boolean = (!!span.attributes[Constants.SpanAttribute.HttpStatusCode]) || (!!span.attributes[Constants.SpanAttribute.HttpUrl]);
+    const isGrpc: boolean = (!!span.attributes[Constants.SpanAttribute.GrpcStatusCode]);
     if (isHttp) {
         // Read http span attributes
         const method = span.attributes[Constants.SpanAttribute.HttpMethod] || "GET";
         const url = new URL(span.attributes[Constants.SpanAttribute.HttpUrl].toString());
-        const host = span.attributes[Constants.SpanAttribute.HttpHost] || url.host;
-        const port = span.attributes[Constants.SpanAttribute.HttpPort] || url.port || null;
         const pathname = url.pathname || "/";
 
         // Translate to AI Dependency format
         const name = `${method} ${pathname}`;
         const dependencyTypeName = Constants.DependencyTypeName.Http;
-        const target = port ? `${host}:${port}`.toString() : host.toString();
+        const target = span.attributes[Constants.SpanAttribute.HttpUrl].toString() ? url.hostname : undefined;
         const data = url.toString();
         const resultCode = span.attributes[Constants.SpanAttribute.HttpStatusCode] || span.status.code || 0;
         const success = resultCode < 400; // Status.OK
@@ -50,12 +47,12 @@ export function spanToTelemetryContract(span: Span): (Contracts.DependencyTeleme
         const name = service ? `${method} ${service}` : span.name;
         return {
             id, duration, name,
-            target: service.toString(),
+            target: method.toString(),
             data: service.toString() || name,
             url: service.toString() || name,
             dependencyTypeName: Constants.DependencyTypeName.Grpc,
-            resultCode: String(span.status.code || 0),
-            success: span.status.code === 0,
+            resultCode: String(span.attributes[Constants.SpanAttribute.GrpcStatusCode] || span.status.code || 0),
+            success: span.status.code === SpanStatusCode.OK,
             properties: filterSpanAttributes(span.attributes),
         }
     } else {
@@ -68,12 +65,12 @@ export function spanToTelemetryContract(span: Span): (Contracts.DependencyTeleme
         });
         return {
             id, duration, name,
-            target: peerAddress,
+            target: span.attributes[Constants.SpanAttribute.HttpUrl].toString() || undefined,
             data: peerAddress || name,
             url: peerAddress || name,
-            dependencyTypeName: span.kind === SpanKind.INTERNAL ? Constants.DependencyTypeName.InProc : (component || span.name),
+            dependencyTypeName: span.kind === SpanKind.INTERNAL ? Constants.DependencyTypeName.InProc : span.name,
             resultCode: String(span.status.code || 0),
-            success: span.status.code === 0,
+            success: span.status.code === SpanStatusCode.OK,
             properties: {
                 ...filterSpanAttributes(span.attributes),
                 "_MS.links": links || undefined

Declarations/Constants.ts

@@ -1,4 +1,5 @@
 import Contracts = require("./Contracts")
+import * as conventions from "@opentelemetry/semantic-conventions";
 
 export const DEFAULT_BREEZE_ENDPOINT = "https://dc.services.visualstudio.com";
 export const DEFAULT_LIVEMETRICS_ENDPOINT = "https://rt.services.visualstudio.com";
@@ -123,16 +124,15 @@ export const TelemetryTypeStringToQuickPulseDocumentType: { [key in Contracts.Te
 // OpenTelemetry Span Attributes
 export const SpanAttribute = {
     // HTTP
-    HttpHost: "http.host",
-    HttpMethod: "http.method",
-    HttpPort: "http.port",
-    HttpStatusCode: "http.status_code",
-    HttpUrl: "http.url",
-    HttpUserAgent: "http.user_agent",
+    HttpMethod: conventions.SemanticAttributes.HTTP_METHOD,
+    HttpStatusCode: conventions.SemanticAttributes.HTTP_STATUS_CODE,
+    HttpUrl: conventions.SemanticAttributes.HTTP_URL,
+    HttpUserAgent: conventions.SemanticAttributes.HTTP_USER_AGENT,
 
     // GRPC
-    GrpcMethod: "grpc.method",
-    GrpcService: "rpc.service", // rpc not grpc
+    GrpcStatusCode: conventions.SemanticAttributes.RPC_GRPC_STATUS_CODE,
+    GrpcMethod: conventions.SemanticAttributes.RPC_METHOD, // rpc not grpc
+    GrpcService: conventions.SemanticAttributes.RPC_SERVICE, // rpc not grpc
 };
 
 export const DependencyTypeName = {

package.json

@@ -57,6 +57,7 @@
   "dependencies": {
     "@azure/core-http": "^2.0.0",
     "@opentelemetry/api": "^1.0.0",
+    "@opentelemetry/semantic-conventions": "^0.23.0",
     "@opentelemetry/tracing": "^0.23.0",
     "cls-hooked": "^4.2.2",
     "continuation-local-storage": "^3.2.1",