Merge pull request #25 from quintoandar/span-attributes-info

Span attributes info

Author: NurCorezzi

README.md

@@ -12,6 +12,7 @@ Winston logger with sentry configuration included. Also show the module, file pa
 | NODE_ENV             | The application environment running (development, test, production) |
 | PRETTY_LOGS          | Enable colored logs with clean spacing       |
 | JSON_LOGS            | Enable structured logs as JSON               |
+| SPAN_INFO            | Enable span context info on logs             | 
 | SENTRY_APP           | The application's name                       |
 | SENTRY_DSN           | Sentry's DNS                                 |
 | SENTRY_ENVIRONMENT   | The environment running (dev, staging, prod) |

src/main.js

@@ -12,6 +12,7 @@ const { obfuscate } = require('./obfuscate')
 
 const prettyLogs = process.env.PRETTY_LOGS;
 const json_logs = process.env.JSON_LOGS;
+const span_info = process.env.SPAN_INFO;
 const winstonTransports = [
     sentryTransport,
     json_logs ? consoleTransportJson : consoleTransport,
@@ -59,12 +60,15 @@ function formatParams(params, module, funcCallerParam) {
     const metadata = {};
 
     if (tracer && tracer.currentRootSpan && tracer.currentRootSpan.traceId) {
-        const allDescendants = tracer.currentRootSpan.allDescendants().map((span) => span.id)
         metadata.traceId = tracer.currentRootSpan.traceId;
-        metadata.spans = {
-            parentSpanId: tracer.currentRootSpan.parentSpanId ? tracer.currentRootSpan.parentSpanId : null,
-            spanId: tracer.currentRootSpan.id,
-            descendants: allDescendants,
+        if (span_info) {
+            const allDescendants = tracer.currentRootSpan.allDescendants().map((span) => span.id)
+            metadata.rootSpan = {
+                parentSpanId: tracer.currentRootSpan.parentSpanId ? tracer.currentRootSpan.parentSpanId : null,
+                spanId: tracer.currentRootSpan.id,
+                descendants: allDescendants,
+                attributes: tracer.currentRootSpan.attributes 
+            }
         }
     }
 

src/transports.js

@@ -88,9 +88,6 @@ let loggerFormat = format.combine(
         if (info.traceId) {
             out += ` [trace-id: ${info.traceId}]`;
         }
-        if (metadata && metadata.spanId) {
-            out += ` [span-id: ${metadata.spanId}]`;
-        }
 
         const error = info.metadata.error;