Skip to content

Commit 8e0154b

Browse files
committed
Fix code style
1 parent 85513ba commit 8e0154b

File tree

2 files changed

+22
-4
lines changed

2 files changed

+22
-4
lines changed

instrumentation/ktor/ktor-3.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/server/KtorHttpServerAttributesGetter.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,21 @@ internal enum class KtorHttpServerAttributesGetter : HttpServerAttributesGetter<
4242
return request.queryString()
4343
}
4444

45-
override fun getNetworkProtocolName(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith("HTTP/")) "http" else null
45+
override fun getNetworkProtocolName(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith(
46+
"HTTP/"
47+
)) {
48+
"http"
49+
} else {
50+
null
51+
}
4652

47-
override fun getNetworkProtocolVersion(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith("HTTP/")) request.httpVersion.substring("HTTP/".length) else null
53+
override fun getNetworkProtocolVersion(request: ApplicationRequest, response: ApplicationResponse?): String? = if (request.httpVersion.startsWith(
54+
"HTTP/"
55+
)) {
56+
request.httpVersion.substring("HTTP/".length)
57+
} else {
58+
null
59+
}
4860

4961
override fun getNetworkPeerAddress(request: ApplicationRequest, response: ApplicationResponse?): String? {
5062
val remote = request.local.remoteHost

instrumentation/ktor/ktor-3.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/server/KtorServerTracing.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ class KtorServerTracing private constructor(
5050
}
5151

5252
@Deprecated("Please use method `spanStatusExtractor`")
53-
fun setStatusExtractor(extractor: (SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) {
53+
fun setStatusExtractor(
54+
extractor: (SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>) -> SpanStatusExtractor<in ApplicationRequest, in ApplicationResponse>
55+
) {
5456
spanStatusExtractor { prevStatusExtractor ->
5557
extractor(prevStatusExtractor).extract(spanStatusBuilder, request, response, error)
5658
}
@@ -194,7 +196,11 @@ class KtorServerTracing private constructor(
194196

195197
require(configuration.isOpenTelemetryInitialized()) { "OpenTelemetry must be set" }
196198

197-
val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(configuration.serverBuilder.instrumenterBuilder(), ApplicationRequestGetter, configuration.spanKindExtractor(SpanKindExtractor.alwaysServer()))
199+
val instrumenter = InstrumenterUtil.buildUpstreamInstrumenter(
200+
configuration.serverBuilder.instrumenterBuilder(),
201+
ApplicationRequestGetter,
202+
configuration.spanKindExtractor(SpanKindExtractor.alwaysServer())
203+
)
198204

199205
val feature = KtorServerTracing(instrumenter)
200206

0 commit comments

Comments
 (0)