Add timeout

signalfx · Jan 13, 2025 · 32a622e · 32a622e
1 parent 7b3f7db
commit 32a622e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/test/loginjection.bunyan.test.ts b/test/loginjection.bunyan.test.ts
@@ -35,21 +35,21 @@ describe('log injection', () => {
       delete process.env.OTEL_RESOURCE_ATTRIBUTES;
     });
 
-    // it('injects service version and service environment if available', () => {
-    //   startTracing({ serviceName: 'test-service' });
-
-    //   const logger: bunyan = require('bunyan').createLogger({
-    //     name: 'test',
-    //     stream: logStream.stream,
-    //   });
-
-    //   assertInjection(logStream, logger, [
-    //     ['service.name', 'test-service'],
-    //     ['service.version', '1'],
-    //     ['service.environment', 'test'],
-    //   ]);
-
-    //   stopTracing();
-    // });
+    it('injects service version and service environment if available', () => {
+      startTracing({ serviceName: 'test-service' });
+
+      const logger: bunyan = require('bunyan').createLogger({
+        name: 'test',
+        stream: logStream.stream,
+      });
+
+      assertInjection(logStream, logger, [
+        ['service.name', 'test-service'],
+        ['service.version', '1'],
+        ['service.environment', 'test'],
+      ]);
+
+      stopTracing();
+    });
   });
 });
diff --git a/test/utils.ts b/test/utils.ts
@@ -100,16 +100,18 @@ export function assertInjection(
     logger.info('my-log-message');
   });
 
-  assert.strictEqual(stream.record['trace_id'], traceId);
-  assert.strictEqual(stream.record['span_id'], spanId);
-
-  for (const [key, value] of extra || []) {
-    assert.strictEqual(
-      stream.record[key],
-      value,
-      `Invalid value for "${key}": ${util.inspect(stream.record[key])}`
-    );
-  }
+  setTimeout( () => {
+    assert.strictEqual(stream.record['trace_id'], traceId);
+    assert.strictEqual(stream.record['span_id'], spanId);
+
+    for (const [key, value] of extra || []) {
+      assert.strictEqual(
+        stream.record[key],
+        value,
+        `Invalid value for "${key}": ${util.inspect(stream.record[key])}`
+      );
+    }    
+  }, 20)
 }
 
 export function exporterUrl(exporter: any) {