Skip to content

Commit 31ba35e

Browse files
Fix build warnings in our code (left some test warnings that are real) (#620)
Co-authored-by: Bryce Buchanan <[email protected]>
1 parent 816c73e commit 31ba35e

File tree

11 files changed

+14
-20
lines changed

11 files changed

+14
-20
lines changed

Examples/ConcurrencyContext/main.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ let sampleValue = "sampleValue"
1414
// On Apple platforms, the default is the activity based context manager. We want to opt-in to the structured concurrency based context manager instead.
1515
OpenTelemetry.registerDefaultConcurrencyContextManager()
1616

17-
let stdout = StdoutExporter()
17+
let stdout = StdoutSpanExporter()
1818
OpenTelemetry.registerTracerProvider(
1919
tracerProvider: TracerProviderBuilder().add(
2020
spanProcessor: SimpleSpanProcessor(spanExporter: stdout)
@@ -30,7 +30,7 @@ extension Task where Failure == Never, Success == Never {
3030
}
3131

3232
func simpleSpan() async throws {
33-
let span = tracer.spanBuilder(spanName: "SimpleSpan").setSpanKind(spanKind: .client).startSpan()
33+
let span = await tracer.spanBuilder(spanName: "SimpleSpan").setSpanKind(spanKind: .client).startSpan()
3434
span.setAttribute(key: sampleKey, value: sampleValue)
3535
try await Task.sleep(seconds: 0.5)
3636
span.end()
@@ -42,15 +42,15 @@ func childSpan() async throws {
4242
span.setAttribute(key: sampleKey, value: sampleValue)
4343
await Task.detached {
4444
// A detached task doesn't inherit the task local context, so this span won't have a parent.
45-
let notAChildSpan = tracer.spanBuilder(spanName: "notAChild").setSpanKind(spanKind: .client).startSpan()
45+
let notAChildSpan = await tracer.spanBuilder(spanName: "notAChild").setSpanKind(spanKind: .client).startSpan()
4646
notAChildSpan.setAttribute(key: sampleKey, value: sampleValue)
4747
notAChildSpan.end()
4848
}.value
4949

5050
try await Task {
5151
// Normal tasks should still inherit the context.
5252
try await Task.sleep(seconds: 0.2)
53-
let childSpan = tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
53+
let childSpan = await tracer.spanBuilder(spanName: "childSpan").setSpanKind(spanKind: .client).startSpan()
5454
childSpan.setAttribute(key: sampleKey, value: sampleValue)
5555
try await Task.sleep(seconds: 0.5)
5656
childSpan.end()

Examples/Logs Sample/main.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ func configure() {
1717
target: .hostAndPort("localhost", 4317),
1818
eventLoopGroup: MultiThreadedEventLoopGroup(numberOfThreads: 1))
1919

20-
21-
OtlpLogExporter(channel: ClientConnection(configuration: configuration))
22-
2320
OpenTelemetry.registerLoggerProvider(loggerProvider: LoggerProviderBuilder().with(processors: [
2421
BatchLogRecordProcessor(logRecordExporter:OtlpLogExporter(channel: ClientConnection(configuration: configuration)))]).build())
2522

Examples/OTLP Exporter/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let configuration = ClientConnection.Configuration.default(
3232
let client = ClientConnection(configuration: configuration)
3333

3434
let otlpTraceExporter = OtlpTraceExporter(channel: client)
35-
let stdoutExporter = StdoutExporter()
35+
let stdoutExporter = StdoutSpanExporter()
3636
let spanExporter = MultiSpanExporter(spanExporters: [otlpTraceExporter, stdoutExporter])
3737

3838
let spanProcessor = SimpleSpanProcessor(spanExporter: spanExporter)

Examples/OTLP HTTP Exporter/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let instrumentationScopeName = "OTLPHTTPExporter"
2323
let instrumentationScopeVersion = "semver:0.1.0"
2424

2525
let otlpHttpTraceExporter = OtlpHttpTraceExporter()
26-
let stdoutExporter = StdoutExporter()
26+
let stdoutExporter = StdoutSpanExporter()
2727
let spanExporter = MultiSpanExporter(spanExporters: [otlpHttpTraceExporter, stdoutExporter])
2828

2929
let spanProcessor = SimpleSpanProcessor(spanExporter: spanExporter)

Examples/Simple Exporter/main.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let instrumentationScopeVersion = "semver:0.1.0"
2323
var tracer: TracerSdk
2424
let jaegerCollectorAddress = "localhost"
2525
let jaegerExporter = JaegerSpanExporter(serviceName: "SimpleExporter", collectorAddress: jaegerCollectorAddress)
26-
let stdoutExporter = StdoutExporter()
26+
let stdoutExporter = StdoutSpanExporter()
2727

2828
// let zipkinExporterOptions = ZipkinTraceExporterOptions()
2929
// let zipkinExporter = ZipkinTraceExporter(options: zipkinExporterOptions)

Sources/Instrumentation/URLSession/URLSessionLogger.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class URLSessionLogger {
158158
}
159159
instrumentation.configuration.injectCustomHeaders?(&request, span)
160160
var instrumentedRequest = request
161-
objc_setAssociatedObject(instrumentedRequest, &URLSessionInstrumentation.instrumentedKey, true, .OBJC_ASSOCIATION_COPY_NONATOMIC)
161+
objc_setAssociatedObject(instrumentedRequest, URLSessionInstrumentation.instrumentedKey, true, .OBJC_ASSOCIATION_COPY_NONATOMIC)
162162
let propagators = OpenTelemetry.instance.propagators
163163
var traceHeaders = tracePropagationHTTPHeaders(span: span, textMapPropagator: propagators.textMapPropagator, textMapBaggagePropagator: propagators.textMapBaggagePropagator)
164164
if let originalHeaders = request.allHTTPHeaderFields {

Sources/OpenTelemetrySdk/Metrics/Stable/CallbackRegistration.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ public class CallbackRegistration {
2727
if !hasStorages {
2828
return
2929
}
30-
for var measurement in observableMeasurements {
30+
for measurement in observableMeasurements {
3131
measurement.setActiveReader(reader: reader, startEpochNanos: startEpochNanos, epochNanos: epochNanos)
3232
}
3333
callback()
34-
for var measurement in observableMeasurements {
34+
for measurement in observableMeasurements {
3535
measurement.clearActiveReader()
3636
}
3737
}

Sources/OpenTelemetrySdk/Metrics/Stable/State/AsynchronousMetricStorage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class AsynchronousMetricStorage: MetricStorage {
4242
let newMeasurement = measurement.hasDoubleValue ? Measurement.doubleMeasurement(startEpochNano: start, endEpochNano: measurement.epochNano, value: measurement.doubleValue, attributes: processedAttributes) : Measurement.longMeasurement(startEpochNano: start, endEpochNano: measurement.epochNano, value: measurement.longValue, attributes: processedAttributes)
4343
do {
4444
try recordPoint(point: aggregator.toPoint(measurement: newMeasurement))
45-
} catch let HistogramAggregatorError.unsupportedOperation(error) {
45+
} catch HistogramAggregatorError.unsupportedOperation(_) {
4646
// TODO: log error
4747
} catch {
4848
// TODO: log default error
@@ -65,7 +65,7 @@ public class AsynchronousMetricStorage: MetricStorage {
6565
public func collect(resource: Resource, scope: InstrumentationScopeInfo, startEpochNanos: UInt64, epochNanos: UInt64) -> StableMetricData {
6666
var result: [[String: AttributeValue]: PointData]
6767
if aggregationTemporality == .delta {
68-
var points = self.points
68+
let points = self.points
6969
var lastPoints = self.lastPoints
7070
lastPoints = lastPoints.filter { element in
7171
points[element.key] == nil // remove if points does not contain key

Tests/ExportersTests/DatadogExporter/Spans/SpansExporterTests.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ class SpansExporterTests: XCTestCase {
1818
}
1919

2020
func testWhenExportSpanIsCalled_thenTraceIsUploaded() throws {
21-
#if os(watchOS)
22-
throw XCTSkip("Test is flaky on watchOS")
23-
#endif
2421
throw XCTSkip("Skipped flaky test.")
2522
var tracesSent = false
2623
let expec = expectation(description: "traces received")

Tests/ExportersTests/OpenTelemetryProtocol/OtlpTraceExporterTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import OpenTelemetryProtocolExporterCommon
1313
@testable import OpenTelemetrySdk
1414
import XCTest
1515

16-
extension String: LocalizedError {
16+
extension Swift.String: LocalizedError {
1717
public var errorDescription: String? { return self }
1818
}
1919

0 commit comments

Comments
 (0)