Merge pull request #194 from nachoBonafonte/Fix-jaeger-exporter

Author: Ignacio Bonafonte

Sources/Exporters/Jaeger/Adapter.swift

@@ -41,8 +41,8 @@ final class Adapter {
         let spanHex = span.spanId.hexString
         let spanId = Int64(spanHex, radix: 16) ?? 0
         let operationName = span.name
-        let startTime = Int64(span.startTime.timeIntervalSince1970.toMilliseconds)
-        let duration = Int64(span.endTime.timeIntervalSince(span.startTime).toMilliseconds)
+        let startTime = Int64(span.startTime.timeIntervalSince1970.toMicroseconds)
+        let duration = Int64(span.endTime.timeIntervalSince(span.startTime).toMicroseconds)
 
         var parentSpanId: Int64 = 0
 
@@ -66,15 +66,13 @@ final class Adapter {
         tags.append(Tag(key: Adapter.keySpanKind, vType: .string, vStr: span.kind.rawValue.uppercased(), vDouble: nil, vBool: nil, vLong: nil, vBinary: nil))
         if case let Status.error(description) = span.status {
             tags.append(Tag(key: Adapter.keySpanStatusMessage, vType: .string, vStr: description, vDouble: nil, vBool: nil, vLong: nil, vBinary: nil))
+            tags.append(Tag(key: keyError, vType: .bool, vStr: nil, vDouble: nil, vBool: true, vLong: nil, vBinary: nil))
+
         } else {
             tags.append(Tag(key: Adapter.keySpanStatusMessage, vType: .string, vStr: "", vDouble: nil, vBool: nil, vLong: nil, vBinary: nil))
         }
         tags.append(Tag(key: Adapter.keySpanStatusCode, vType: .long, vStr: nil, vDouble: nil, vBool: nil, vLong: Int64(span.status.code), vBinary: nil))
 
-        if span.status != .ok {
-            tags.append(Tag(key: keyError, vType: .bool, vStr: nil, vDouble: nil, vBool: true, vLong: nil, vBinary: nil))
-        }
-
         return Span(traceIdLow: traceIdLow, traceIdHigh: traceIdHigh, spanId: spanId, parentSpanId: parentSpanId, operationName: operationName, references: references, flags: 0, startTime: startTime, duration: duration, tags: tags, logs: logs)
     }
 
@@ -135,7 +133,7 @@ final class Adapter {
     }
 
     static func toJaegerLog(event: SpanData.Event) -> Log {
-        let timestamp = Int64(event.timestamp.timeIntervalSince1970.toMilliseconds)
+        let timestamp = Int64(event.timestamp.timeIntervalSince1970.toMicroseconds)
 
         var tags = TList<Tag>()
         tags.append(Tag(key: Adapter.keyLogMessage, vType: .string, vStr: event.name, vDouble: nil, vBool: nil, vLong: nil, vBinary: nil))

Tests/ExportersTests/DatadogExporter/Upload/HTTPClientTests.swift

@@ -36,7 +36,7 @@ class HTTPClientTests: XCTestCase {
             case .success:
                 break
             case .failure(let error):
-                XCTAssertEqual((error as? ErrorMock)?.description, "no internet connection")
+                XCTAssertNotNil(error)
                 expectation.fulfill()
             }
         }

Tests/ExportersTests/Jaeger/AdapterTests.swift

@@ -18,12 +18,14 @@ class AdapterTests: XCTestCase {
     static let spanId = "0000000000def456"
     static let parentSpanId = "0000000000aef789"
 
+    let microsecondsInSecond: Double = 1000000
+
     func testProtoSpans() {
-        let duration = 900 // ms
-        let startMs = UInt64(Date().timeIntervalSince1970 * 1000)
-        let endMs = startMs + UInt64(duration)
+        let duration = 900 // microseconds
+        let startMicroseconds = UInt64(Date().timeIntervalSince1970 * microsecondsInSecond)
+        let endMicroseconds = startMicroseconds + UInt64(duration)
 
-        let span = getSpanData(startMs: startMs, endMs: endMs)
+        let span = getSpanData(startMicroseconds: startMicroseconds, endMicroseconds: endMicroseconds)
         let spans = [span]
 
         let jaegerSpans = Adapter.toJaeger(spans: spans)
@@ -33,19 +35,19 @@ class AdapterTests: XCTestCase {
     }
 
     func testProtoSpan() {
-        let duration = 900 // ms
-        let startMs = UInt64(Date().timeIntervalSince1970 * 1000)
-        let endMs = startMs + UInt64(duration)
+        let duration = 900 // microseconds
+        let startMicroseconds = UInt64(Date().timeIntervalSince1970 * microsecondsInSecond)
+        let endMicroseconds = startMicroseconds + UInt64(duration)
 
-        let span = getSpanData(startMs: startMs, endMs: endMs)
+        let span = getSpanData(startMicroseconds: startMicroseconds, endMicroseconds: endMicroseconds)
 
         // test
         let jaegerSpan = Adapter.toJaeger(span: span)
 
         XCTAssertEqual(span.traceId.hexString, String(format: "%016llx", jaegerSpan.traceIdHigh) + String(format: "%016llx", jaegerSpan.traceIdLow))
         XCTAssertEqual(span.spanId.hexString, String(format: "%016llx", jaegerSpan.spanId))
         XCTAssertEqual("GET /api/endpoint", jaegerSpan.operationName)
-        XCTAssertEqual(Int64(startMs), jaegerSpan.startTime)
+        XCTAssertEqual(Int64(startMicroseconds), jaegerSpan.startTime)
         XCTAssertEqual(duration, Int(jaegerSpan.duration))
 
         XCTAssertEqual(jaegerSpan.tags?.count, 4)
@@ -181,8 +183,8 @@ class AdapterTests: XCTestCase {
     }
 
     func testStatusNotOk() {
-        let startMs = UInt64(Date().timeIntervalSince1970 * 1000)
-        let endMs = startMs + 900
+        let startMicroseconds = UInt64(Date().timeIntervalSince1970 * microsecondsInSecond)
+        let endMicroseconds = startMicroseconds + 900
 
         let span = SpanData(traceId: TraceId(fromHexString: AdapterTests.traceId),
                             spanId: SpanId(fromHexString: AdapterTests.spanId),
@@ -192,9 +194,9 @@ class AdapterTests: XCTestCase {
                             instrumentationLibraryInfo: InstrumentationLibraryInfo(),
                             name: "GET /api/endpoint",
                             kind: .server,
-                            startTime: Date(timeIntervalSince1970: Double(startMs) / 1000),
+                            startTime: Date(timeIntervalSince1970: Double(startMicroseconds) / microsecondsInSecond),
                             status: .error(description: "GenericError"),
-                            endTime: Date(timeIntervalSince1970: Double(endMs) / 1000),
+                            endTime: Date(timeIntervalSince1970: Double(endMicroseconds) / microsecondsInSecond),
                             hasRemoteParent: false)
 
         XCTAssertNotNil(Adapter.toJaeger(span: span))
@@ -203,15 +205,15 @@ class AdapterTests: XCTestCase {
     func testSpanError() {
         let attributes = ["error.type": AttributeValue.string(self.name),
                           "error.message": AttributeValue.string("server error")]
-        let startMs = UInt64(Date().timeIntervalSince1970 * 1000)
-        let endMs = startMs + 900
+        let startMicroseconds = UInt64(Date().timeIntervalSince1970 * microsecondsInSecond)
+        let endMicroseconds = startMicroseconds + 900
 
         var span = SpanData(traceId: TraceId(fromHexString: AdapterTests.traceId),
                             spanId: SpanId(fromHexString: AdapterTests.spanId),
                             name: "GET /api/endpoint",
                             kind: .server,
-                            startTime: Date(timeIntervalSince1970: Double(startMs) / 1000),
-                            endTime: Date(timeIntervalSince1970: Double(endMs) / 1000))
+                            startTime: Date(timeIntervalSince1970: Double(startMicroseconds) / microsecondsInSecond),
+                            endTime: Date(timeIntervalSince1970: Double(endMicroseconds) / microsecondsInSecond))
         span.settingHasEnded(true)
         span.settingStatus(.error(description: "GenericError"))
         span.settingAttributes(attributes)
@@ -230,7 +232,7 @@ class AdapterTests: XCTestCase {
         return SpanData.Event(name: "the log message", timestamp: Date(), attributes: attributes)
     }
 
-    private func getSpanData(startMs: UInt64, endMs: UInt64) -> SpanData {
+    private func getSpanData(startMicroseconds: UInt64, endMicroseconds: UInt64) -> SpanData {
         let valueB = AttributeValue.bool(true)
         let attributes = ["valueB": valueB]
 
@@ -245,12 +247,12 @@ class AdapterTests: XCTestCase {
                         instrumentationLibraryInfo: InstrumentationLibraryInfo(),
                         name: "GET /api/endpoint",
                         kind: .server,
-                        startTime: Date(timeIntervalSince1970: Double(startMs) / 1000),
+                        startTime: Date(timeIntervalSince1970: Double(startMicroseconds) / microsecondsInSecond),
                         attributes: attributes,
                         events: [getTimedEvent()],
                         links: [link],
                         status: Status.ok,
-                        endTime: Date(timeIntervalSince1970: Double(endMs) / 1000),
+                        endTime: Date(timeIntervalSince1970: Double(endMicroseconds) / microsecondsInSecond),
                         hasRemoteParent: false)
     }