FileSpanExporter.ts fix,

lumigo-io · Oct 4, 2024 · f607b8b · f607b8b
1 parent ed63798
commit f607b8b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 20 deletions.
diff --git a/src/exporters/FileSpanExporter.ts b/src/exporters/FileSpanExporter.ts
@@ -35,7 +35,9 @@ export class FileSpanExporter extends FileExporter<ReadableSpan> {
       attributes: span.attributes,
       status: span.status,
       events: span.events,
-      resource: span.resource,
+      resource: {
+        attributes: span.resource.attributes
+      }
     };
   }
 }
diff --git a/test/instrumentations/amqplib/amqplibTestUtils.js b/test/instrumentations/amqplib/amqplibTestUtils.js
@@ -39,6 +39,7 @@ export function getExpectedSpan({
   return {
     traceId: expect.any(String),
     id: expect.any(String),
+    parentId: expect.any(String),
     timestamp: expect.any(Number),
     duration: expect.any(Number),
     name: nameSpanAttr,

diff --git a/test/instrumentations/http/http.test.ts b/test/instrumentations/http/http.test.ts
@@ -14,7 +14,7 @@ const TEST_TIMEOUT = 20_000;
 const INSTRUMENTATION_NAME = 'http';
 
 const expectedResourceAttributes = {
-    attributes: {
+  attributes: {
         'framework': expect.toBeOneOf(['node', 'express']),
         'lumigo.distro.version': expect.stringMatching(/1\.\d+\.\d+/),
         'process.environ': expect.any(String),
@@ -27,7 +27,13 @@ const expectedResourceAttributes = {
         'telemetry.sdk.language': 'nodejs',
         'telemetry.sdk.name': 'opentelemetry',
         'telemetry.sdk.version': expect.any(String),
-    }
+        'process.executable.path': expect.any(String),
+        'process.command_args': expect.any(Array),
+        'process.owner': expect.any(String),
+        'process.command': expect.any(String),
+    },
+  asyncAttributesPending: expect.any(Boolean),
+  _syncAttributes: expect.any(Object),
 };
 
 describe('Instrumentation tests for the http package', function () {
@@ -248,7 +254,13 @@ describe('Instrumentation tests for the http package', function () {
                 'http.status_text': 'OK',
                 'http.url': 'htt',
                 'lumigo.execution_tags.foo': 'bar',
-                'lumigo.execution_tags.date': 1234567
+                'lumigo.execution_tags.date': 1234567,
+                'net.host.name': 'localhost',
+                "net.transport": "ip_tcp",
+                "net.host.ip": "::1",
+                "net.host.port": expect.any(Number),
+                "net.peer.ip": "::1",
+                "net.peer.port": expect.any(Number),
             }
         );
 

diff --git a/test/instrumentations/ioredis/ioredisTestUtils.ts b/test/instrumentations/ioredis/ioredisTestUtils.ts
@@ -39,9 +39,7 @@ export function getExpectedSpan({
     name,
     kind: SpanKind.CLIENT,
     resource: {
-      _attributes: resourceAttributes,
-      asyncAttributesPending: expect.any(Boolean),
-      _syncAttributes: expect.any(Object),
+      attributes: resourceAttributes,
     },
     attributes,
     status: {

diff --git a/test/instrumentations/kafkajs/kafkaJsTestUtils.js b/test/instrumentations/kafkajs/kafkaJsTestUtils.js
@@ -42,9 +42,7 @@ export function getExpectedSpan({ spanKind, resourceAttributes, host, topic, mes
     name: topic,
     kind: spanKind,
     resource: {
-      _attributes: resourceAttributes,
-      asyncAttributesPending: expect.any(Boolean),
-      _syncAttributes: expect.any(Object),
+      attributes: resourceAttributes,
     },
     attributes: {
       'messaging.destination': topic,

diff --git a/test/instrumentations/mongodb/mongodbTestUtils.js b/test/instrumentations/mongodb/mongodbTestUtils.js
@@ -29,9 +29,7 @@ export function getExpectedSpan(nameSpanAttr, resourceAttributes, dbStatement) {
     name: nameSpanAttr,
     kind: SpanKind.CLIENT,
     resource: {
-      _attributes: resourceAttributes,
-      asyncAttributesPending: expect.any(Boolean),
-      _syncAttributes: expect.any(Object),
+      attributes: resourceAttributes,
     },
     attributes: {
       'db.system': 'mongodb',
@@ -65,7 +63,7 @@ export function getExpectedSpanWithParent(
     name: nameSpanAttr,
     kind: SpanKind.CLIENT,
     resource: {
-      _attributes: resourceAttributes,
+      attributes: resourceAttributes,
     },
     attributes: {
       'db.system': 'mongodb',

diff --git a/test/instrumentations/prisma/prismaTestUtils.js b/test/instrumentations/prisma/prismaTestUtils.js
@@ -32,9 +32,7 @@ export function getExpectedSpan({ name, resourceAttributes, attributes }) {
     name: name,
     kind: SpanKind.INTERNAL,
     resource: {
-      _attributes: resourceAttributes,
-      asyncAttributesPending: expect.any(Boolean),
-      _syncAttributes: expect.any(Object),
+      attributes: resourceAttributes,
     },
     attributes: attributes,
     status: {

diff --git a/test/instrumentations/redis/redisTestUtils.ts b/test/instrumentations/redis/redisTestUtils.ts
@@ -43,9 +43,7 @@ export function getExpectedSpan({
     name: nameSpanAttr,
     kind: SpanKind.CLIENT,
     resource: {
-      _attributes: resourceAttributes,
-      asyncAttributesPending: expect.any(Boolean),
-      _syncAttributes: expect.any(Object),
+      attributes: resourceAttributes,
     },
     attributes: {
       'db.system': 'redis',