Rename IdsGenerator protocol to IdGenerator

Author: Ignacio Bonafonte

Sources/OpenTelemetrySdk/Trace/IdsGenerator.swift renamed to Sources/OpenTelemetrySdk/Trace/IdGenerator.swift

@@ -17,7 +17,7 @@ import Foundation
 import OpenTelemetryApi
 
 /// Interface that is used by the TracerSdk to generate new SpanId and TraceId.
-public protocol IdsGenerator {
+public protocol IdGenerator {
     /// Generates a new valid SpanId
     func generateSpanId() -> SpanId
 

Sources/OpenTelemetrySdk/Trace/RandomIdsGenerator.swift

@@ -16,7 +16,7 @@
 import Foundation
 import OpenTelemetryApi
 
-public struct RandomIdsGenerator: IdsGenerator {
+public struct RandomIdGenerator: IdGenerator {
     public init() {}
 
     public func generateSpanId() -> SpanId {

Sources/OpenTelemetrySdk/Trace/SpanBuilderSDK.swift

@@ -111,14 +111,14 @@ public class SpanBuilderSdk: SpanBuilder {
     public func startSpan() -> Span {
         var parentContext = getParentContext(parentType: parentType, explicitParent: parent, remoteParent: remoteParent)
         let traceId: TraceId
-        let spanId = tracerSharedState.idsGenerator.generateSpanId()
+        let spanId = tracerSharedState.idGenerator.generateSpanId()
         var traceState = TraceState()
 
         if parentContext?.isValid ?? false {
             traceId = parentContext!.traceId
             traceState = parentContext!.traceState
         } else {
-            traceId = tracerSharedState.idsGenerator.generateTraceId()
+            traceId = tracerSharedState.idGenerator.generateTraceId()
             parentContext = nil
         }
 

Sources/OpenTelemetrySdk/Trace/TracerSdkProvider.swift

@@ -21,12 +21,12 @@ public class TracerSdkProvider: TracerProvider {
     private var tracerProvider = [InstrumentationLibraryInfo: TracerSdk]()
     internal var sharedState: TracerSharedState
 
-    /// Returns a new TracerSdkProvider with default Clock, IdsGenerator and Resource.
+    /// Returns a new TracerSdkProvider with default Clock, IdGenerator and Resource.
     public init(clock: Clock = MillisClock(),
-                idsGenerator: IdsGenerator = RandomIdsGenerator(),
+                idGenerator: IdGenerator = RandomIdGenerator(),
                 resource: Resource = EnvVarResource.resource)
     {
-        sharedState = TracerSharedState(clock: clock, idsGenerator: idsGenerator, resource: resource)
+        sharedState = TracerSharedState(clock: clock, idGenerator: idGenerator, resource: resource)
     }
 
     public func get(instrumentationName: String, instrumentationVersion: String? = nil) -> Tracer {

Sources/OpenTelemetrySdk/Trace/TracerSharedState.swift

@@ -18,7 +18,7 @@ import Foundation
 /// Represents the shared state/config between all Tracers created by the same TracerProvider.
 public class TracerSharedState {
     public private(set) var clock: Clock
-    public private(set) var idsGenerator: IdsGenerator
+    public private(set) var idGenerator: IdGenerator
     public private(set) var resource: Resource
 
     public private(set) var sampler: Sampler = ParentBasedSampler(root: Samplers.alwaysOn)
@@ -28,9 +28,9 @@ public class TracerSharedState {
 
     private var registeredSpanProcessors = [SpanProcessor]()
 
-    public init(clock: Clock, idsGenerator: IdsGenerator, resource: Resource) {
+    public init(clock: Clock, idGenerator: IdGenerator, resource: Resource) {
         self.clock = clock
-        self.idsGenerator = idsGenerator
+        self.idGenerator = idGenerator
         self.resource = resource
     }
 

Tests/OpenTelemetrySdkTests/Trace/RecordEventsReadableSpanTests.swift

@@ -22,7 +22,7 @@ class RecordEventsReadableSpanTest: XCTestCase {
     let spanNewName = "NewName"
     let nanosPerSecond: Int64 = 1000000000
     let millisPerSecond: Int64 = 1000
-    let idsGenerator: IdsGenerator = RandomIdsGenerator()
+    let idGenerator: IdGenerator = RandomIdGenerator()
     var traceId: TraceId!
     var spanId: SpanId!
     var parentSpanId: SpanId!
@@ -38,9 +38,9 @@ class RecordEventsReadableSpanTest: XCTestCase {
     let spanProcessor = SpanProcessorMock()
 
     override func setUp() {
-        traceId = idsGenerator.generateTraceId()
-        spanId = idsGenerator.generateSpanId()
-        parentSpanId = idsGenerator.generateSpanId()
+        traceId = idGenerator.generateTraceId()
+        spanId = idGenerator.generateSpanId()
+        parentSpanId = idGenerator.generateSpanId()
         spanContext = SpanContext.create(traceId: traceId, spanId: spanId, traceFlags: TraceFlags(), traceState: TraceState())
         testClock = TestClock(timeInterval: startTime.timeIntervalSince1970)
         link = SpanData.Link(context: spanContext)
@@ -319,9 +319,9 @@ class RecordEventsReadableSpanTest: XCTestCase {
     func testAsSpanData() {
         let name = "GreatSpan"
         let kind = SpanKind.server
-        let traceId = idsGenerator.generateTraceId()
-        let spanId = idsGenerator.generateSpanId()
-        let parentSpanId = idsGenerator.generateSpanId()
+        let traceId = idGenerator.generateTraceId()
+        let spanId = idGenerator.generateSpanId()
+        let parentSpanId = idGenerator.generateSpanId()
         let spanLimits = SpanLimits()
         let spanProcessor = NoopSpanProcessor()
         let clock = TestClock()

Tests/OpenTelemetrySdkTests/Trace/SamplersTests.swift

@@ -21,7 +21,7 @@ class SamplerTests: XCTestCase {
     let spanName = "MySpanName"
     let spanKind = SpanKind.internal
     let numSamplesTries = 1000
-    let idsGenerator: IdsGenerator = RandomIdsGenerator()
+    let idGenerator: IdGenerator = RandomIdGenerator()
     var traceId: TraceId!
     var spanId: SpanId!
     var parentSpanId: SpanId!
@@ -31,9 +31,9 @@ class SamplerTests: XCTestCase {
     var sampledParentLink: SpanData.Link!
 
     override func setUp() {
-        traceId = idsGenerator.generateTraceId()
-        spanId = idsGenerator.generateSpanId()
-        parentSpanId = idsGenerator.generateSpanId()
+        traceId = idGenerator.generateTraceId()
+        spanId = idGenerator.generateSpanId()
+        parentSpanId = idGenerator.generateSpanId()
         sampledSpanContext = SpanContext.create(traceId: traceId, spanId: parentSpanId, traceFlags: TraceFlags().settingIsSampled(true), traceState: traceState)
         notSampledSpanContext = SpanContext.create(traceId: traceId, spanId: parentSpanId, traceFlags: TraceFlags(), traceState: traceState)
         sampledParentLink = SpanData.Link(context: sampledSpanContext)