Skip to content

Commit 48b3f8a

Browse files
author
Ignacio Bonafonte
authored
Merge pull request #173 from nachoBonafonte/minor-details
Rename folder sdk-resource-extension-tests to SDKResourceExtensionTests for consistency with other source code Make InMemoryExporter usable by making constructor public and fix formatting
2 parents 1599d5f + e078ca2 commit 48b3f8a

11 files changed

+28
-26
lines changed

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ let package = Package(
9999
path: "Tests/OpenTelemetryApiTests"),
100100
.testTarget(name: "ResourceExtensionTests",
101101
dependencies: ["ResourceExtension", "OpenTelemetrySdk"],
102-
path: "Tests/InstrumentationTests/sdk-resource-extension-tests"),
102+
path: "Tests/InstrumentationTests/SDKResourceExtensionTests"),
103103
.testTarget(name: "OpenTracingShimTests",
104104
dependencies: ["OpenTracingShim",
105105
"OpenTelemetrySdk"],

Sources/Exporters/InMemory/InMemoryExporter.swift

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,36 +17,38 @@ import Foundation
1717
import OpenTelemetrySdk
1818

1919
public class InMemoryExporter: SpanExporter {
20-
private var finishedSpanItems: [SpanData] = []
21-
private var isRunning: Bool = true
20+
private var finishedSpanItems: [SpanData] = []
21+
private var isRunning: Bool = true
2222

23-
public func getFinishedSpanItems() -> [SpanData] {
24-
return finishedSpanItems
25-
}
23+
public init() {}
2624

27-
public func export(spans: [SpanData]) -> SpanExporterResultCode {
28-
guard isRunning else {
29-
return .failure
25+
public func getFinishedSpanItems() -> [SpanData] {
26+
return finishedSpanItems
3027
}
3128

32-
finishedSpanItems.append(contentsOf: spans)
33-
return .success
34-
}
29+
public func export(spans: [SpanData]) -> SpanExporterResultCode {
30+
guard isRunning else {
31+
return .failure
32+
}
3533

36-
public func flush() -> SpanExporterResultCode {
37-
guard isRunning else {
38-
return .failure
34+
finishedSpanItems.append(contentsOf: spans)
35+
return .success
3936
}
4037

41-
return .success
42-
}
38+
public func flush() -> SpanExporterResultCode {
39+
guard isRunning else {
40+
return .failure
41+
}
4342

44-
public func reset() {
45-
finishedSpanItems.removeAll()
46-
}
43+
return .success
44+
}
45+
46+
public func reset() {
47+
finishedSpanItems.removeAll()
48+
}
4749

48-
public func shutdown() {
49-
finishedSpanItems.removeAll()
50-
isRunning = false
51-
}
50+
public func shutdown() {
51+
finishedSpanItems.removeAll()
52+
isRunning = false
53+
}
5254
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import OpenTelemetrySdk
1919
@testable import ResourceExtension
2020
import XCTest
2121

22-
class ResourcePropogationTests : XCTestCase {
23-
func testPropogation() {
22+
class ResourcePropagationTests : XCTestCase {
23+
func testPropagation() {
2424
let defaultResource = Resource()
2525
let appProvider = ApplicationResourceProvider(source: ApplicationDataSource())
2626
let telemetryProvider = TelemetryResourceProvider(source: TelemetryDataSource())

0 commit comments

Comments
 (0)