Skip to content

Commit 959499e

Browse files
trasktrask
committed
-fix
1 parent ab1bf85 commit 959499e

File tree

19 files changed

+28
-28
lines changed

19 files changed

+28
-28
lines changed

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/KtorBuilderUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import io.ktor.server.request.*
1111
import io.ktor.server.response.*
1212
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
1313
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder
14-
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTelemetryBuilder
15-
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTelemetryBuilder
14+
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetryBuilder
15+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTelemetryBuilder
1616

1717
/**
1818
* This class is internal and is hence not for public use. Its APIs are unstable and can change at

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/KtorClientTelemetryUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import io.ktor.util.pipeline.*
1313
import io.opentelemetry.context.Context
1414
import io.opentelemetry.extension.kotlin.asContextElement
1515
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientRequestResendCount
16-
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTelemetry
16+
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetry
1717
import kotlinx.coroutines.InternalCoroutinesApi
1818
import kotlinx.coroutines.job
1919
import kotlinx.coroutines.launch

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/KtorClientTracingUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import io.ktor.util.pipeline.*
1313
import io.opentelemetry.context.Context
1414
import io.opentelemetry.extension.kotlin.asContextElement
1515
import io.opentelemetry.instrumentation.api.semconv.http.HttpClientRequestResendCount
16-
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTracing
16+
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracing
1717
import kotlinx.coroutines.InternalCoroutinesApi
1818
import kotlinx.coroutines.job
1919
import kotlinx.coroutines.launch

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/KtorServerTelemetryUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import io.opentelemetry.extension.kotlin.asContextElement
1515
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
1616
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor
1717
import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil
18-
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTelemetryBuilder
19-
import io.opentelemetry.instrumentation.ktor.server.ApplicationRequestGetter
18+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTelemetryBuilder
19+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.ApplicationRequestGetter
2020
import kotlinx.coroutines.withContext
2121

2222
/**

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/internal/KtorServerTracingUtil.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import io.opentelemetry.extension.kotlin.asContextElement
1515
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
1616
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor
1717
import io.opentelemetry.instrumentation.api.internal.InstrumenterUtil
18-
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTracingBuilder
19-
import io.opentelemetry.instrumentation.ktor.server.ApplicationRequestGetter
18+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTracingBuilder
19+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.ApplicationRequestGetter
2020
import kotlinx.coroutines.withContext
2121

2222
/**

‎instrumentation/ktor/ktor-2-common/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/common/server/AbstractKtorServerTelemetryBuilder.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
1717
import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor
1818
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusBuilder
1919
import io.opentelemetry.instrumentation.api.instrumenter.SpanStatusExtractor
20-
import io.opentelemetry.instrumentation.ktor.internal.KtorBuilderUtil
20+
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil
2121

2222
abstract class AbstractKtorServerTelemetryBuilder(private val instrumentationName: String) {
2323
companion object {

‎instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/HttpClientInstrumentation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import io.ktor.client.HttpClientConfig;
1414
import io.ktor.client.engine.HttpClientEngineConfig;
1515
import io.opentelemetry.api.GlobalOpenTelemetry;
16-
import io.opentelemetry.instrumentation.ktor.internal.KtorBuilderUtil;
16+
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
1717
import io.opentelemetry.instrumentation.ktor.v2_0.client.KtorClientTelemetry;
1818
import io.opentelemetry.instrumentation.ktor.v2_0.client.KtorClientTelemetryBuilder;
1919
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;

‎instrumentation/ktor/ktor-2.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/ktor/v2_0/ServerInstrumentation.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import io.ktor.server.application.Application;
1212
import io.ktor.server.application.ApplicationPluginKt;
1313
import io.opentelemetry.api.GlobalOpenTelemetry;
14-
import io.opentelemetry.instrumentation.ktor.internal.KtorBuilderUtil;
15-
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTelemetryBuilder;
14+
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil;
15+
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTelemetryBuilder;
1616
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTelemetryBuilderKt;
1717
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTelemetry.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.ktor.client.statement.*
1212
import io.ktor.util.*
1313
import io.opentelemetry.context.propagation.ContextPropagators
1414
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
15-
import io.opentelemetry.instrumentation.ktor.internal.KtorClientTelemetryUtil
15+
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorClientTelemetryUtil
1616
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetry
1717

1818
class KtorClientTelemetry internal constructor(

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracing.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import io.ktor.client.statement.*
1212
import io.ktor.util.*
1313
import io.opentelemetry.context.propagation.ContextPropagators
1414
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
15-
import io.opentelemetry.instrumentation.ktor.internal.KtorClientTracingUtil
15+
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorClientTracingUtil
1616
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracing
1717

1818
@Deprecated("Use KtorClientTelemetry instead", ReplaceWith("KtorClientTelemetry"))

0 commit comments

Comments
 (0)