fix/transport cleanup, new stacktrace-parser version, fixes for otel mapper

Author: piotr-szewczyk

packages/traceo-sdk-node-core/src/transport.ts

@@ -105,41 +105,41 @@ const requestOptions = (url: string, method: RequestType): http.RequestOptions =
   };
 };
 
-const requestHeaders = (method: RequestType) => {
-  const headers = getGlobalTraceo().headers;
-
-  if (method !== "POST") return headers;
-  return {
-    headers: {
-      "Content-Type": "application/json",
-      ...headers
-    }
-  };
-};
-
-/**
- * Make http/s request to Traceo platoform.
- *
- * Default request method is POST, in this case in hedaers is passed "Content-Type": "application/json".
- * URL is concatenation of passed host to client and pathanme to this method.
- * Use callback/onError callbacks to handle action after operation.
- */
-const request = ({ url, method = "POST", body, onError, callback }: RequestOptionsType) => {
-  const options = {
-    ...requestHeaders(method),
-    ...requestOptions(url, method)
-  };
-
-  const httpModule = requestModule();
-
-  const request = httpModule.request(options, callback);
-  request.on("error", () => onError);
-
-  requestWriteBody(method, request, body);
-
-  request.end();
-};
-
-export const transport = {
-  request
-};
+// const requestHeaders = (method: RequestType) => {
+//   const headers = getGlobalTraceo().headers;
+
+//   if (method !== "POST") return headers;
+//   return {
+//     headers: {
+//       "Content-Type": "application/json",
+//       ...headers
+//     }
+//   };
+// };
+
+// /**
+//  * Make http/s request to Traceo platoform.
+//  *
+//  * Default request method is POST, in this case in hedaers is passed "Content-Type": "application/json".
+//  * URL is concatenation of passed host to client and pathanme to this method.
+//  * Use callback/onError callbacks to handle action after operation.
+//  */
+// const request = ({ url, method = "POST", body, onError, callback }: RequestOptionsType) => {
+//   const options = {
+//     ...requestHeaders(method),
+//     ...requestOptions(url, method)
+//   };
+
+//   const httpModule = requestModule();
+
+//   const request = httpModule.request(options, callback);
+//   request.on("error", () => onError);
+
+//   requestWriteBody(method, request, body);
+
+//   request.end();
+// };
+
+// export const transport = {
+//   request
+// };

packages/traceo-sdk-node/package.json

@@ -33,7 +33,7 @@
         "test:watch": "jest --watch --notify"
     },
     "dependencies": {
-        "stacktrace-parser-node": "^1.1.3",
+        "stacktrace-parser-node": "^1.1.5",
         "@traceo-sdk/node-core": "0.33.1",
         "os": "^0.1.2"
     },

packages/traceo-sdk-node/src/metrics/index.ts

@@ -3,14 +3,10 @@ import { EventLoopMetrics } from "./default/event-loop";
 import { HeapMetrics } from "./default/heap";
 import { MemoryUsageMetrics } from "./default/memory-usage";
 import {
-  transport,
+  HttpClient,
   CAPTURE_ENDPOINT,
   utils,
-  MetricType,
-  InstrumentType,
-  ValueType,
   INodeClient,
-  DataPointType,
   TraceoMetricType,
   TraceoMetric
 } from "@traceo-sdk/node-core";
@@ -64,7 +60,11 @@ export class MetricsRunner {
 
     const metrics: TraceoMetric[] = [...cpuUsage, ...eventLoop, ...heap, ...memory, ...this.loadAvg];
 
-    transport.request({
+    if (metrics.length === 0) {
+      return;
+    }
+
+    HttpClient.request({
       url: CAPTURE_ENDPOINT.METRICS,
       body: metrics,
       onError: (error: Error) => {

packages/traceo-sdk-opentelemetry/src/exporters/metricsExporter.ts

@@ -34,6 +34,10 @@ export class TraceoMetricExporter extends OTLPMetricExporter {
     }
 
     const payload: TraceoMetric[] = OtelMapper.mapMetrics(metrics);
+    if (payload.length === 0) {
+      return;
+    }
+
     HttpClient.request({
       body: payload,
       url: CAPTURE_ENDPOINT.METRICS,

packages/traceo-sdk-opentelemetry/src/exporters/otelMapper.ts

@@ -51,7 +51,7 @@ export class OtelMapper {
         return otelSpans.map((otel) => ({
             name: otel.name,
             kind: this.getSpanKind(otel.kind),
-            status: otel.status.code.toString(),
+            status: this.getSpanStatus(otel.status.code),
             statusMessage: otel.status.message,
             traceId: otel.spanContext().traceId,
             spanId: otel.spanContext().spanId,
@@ -77,10 +77,24 @@ export class OtelMapper {
             case SpanKind.CONSUMER:
                 return "CONSUMER";
             default:
-                return "";
+                return "N/A";
         }
     }
 
+    private static getSpanStatus(status: SpanStatusCode): string {
+        if (!status) {
+            return "Unset";
+        }
+        
+        if (status === SpanStatusCode.ERROR) {
+            return "Error";
+        } else if (status === SpanStatusCode.OK) {
+            return "OK";
+        }
+
+        return "Unset";
+    }
+
     private static getEpochNanos(time: HrTime): number {
         return time[0] + time[1] / 1e9;
     }

packages/traceo-sdk-opentelemetry/src/exporters/tracingExporter.ts

@@ -29,6 +29,10 @@ export class TraceoTracingExporter extends OTLPTraceExporter {
     }
 
     const payload: TraceoSpan[] = OtelMapper.mapSpans(items);
+    if (payload.length === 0) {
+      return;
+    }
+    
     HttpClient.request({
       body: payload,
       url: CAPTURE_ENDPOINT.TRACING,