Skip to content

Commit 5bb2c6d

Browse files
e5le5l
committed
Add Ktor 3.0.0 support
1 parent 4497fbf commit 5bb2c6d

File tree

48 files changed

+1565
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+1565
-28
lines changed

‎docs/supported-libraries.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ These are the supported libraries and frameworks:
9292
| [Jodd Http](https://http.jodd.org/) | 4.2+ | N/A | [HTTP Client Spans], [HTTP Client Metrics] |
9393
| [JSP](https://javaee.github.io/javaee-spec/javadocs/javax/servlet/jsp/package-summary.html) | 2.3+ | N/A | Controller Spans [3] |
9494
| [Kotlin Coroutines](https://kotlinlang.org/docs/coroutines-overview.html) | 1.0+ | N/A | Context propagation |
95-
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
95+
| [Ktor](https://github.com/ktorio/ktor) | 1.0+ | [opentelemetry-ktor-1.0](../instrumentation/ktor/ktor-1.0/library),<br>[opentelemetry-ktor-2.0](../instrumentation/ktor/ktor-2.0/library),<br>[opentelemetry-ktor-3.0](../instrumentation/ktor/ktor-3.0/library) | [HTTP Client Spans], [HTTP Client Metrics], [HTTP Server Spans], [HTTP Server Metrics] |
9696
| [Kubernetes Client](https://github.com/kubernetes-client/java) | 7.0+ | N/A | [HTTP Client Spans] |
9797
| [Lettuce](https://github.com/lettuce-io/lettuce-core) | 4.0+ | [opentelemetry-lettuce-5.1](../instrumentation/lettuce/lettuce-5.1/library) | [Database Client Spans] |
9898
| [Log4j 1](https://logging.apache.org/log4j/1.2/) | 1.2+ | N/A | none |

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
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.v2_0.client.KtorClientTracing;
17-
import io.opentelemetry.instrumentation.ktor.v2_0.client.KtorClientTracingBuilder;
18-
import io.opentelemetry.instrumentation.ktor.v2_0.internal.KtorBuilderUtil;
16+
import io.opentelemetry.instrumentation.ktor.v3_0.client.KtorClientTracing;
17+
import io.opentelemetry.instrumentation.ktor.v3_0.client.KtorClientTracingBuilder;
18+
import io.opentelemetry.instrumentation.ktor.v3_0.internal.KtorBuilderUtil;
1919
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
2020
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
2121
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

‎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.v2_0.internal.KtorBuilderUtil;
15-
import io.opentelemetry.instrumentation.ktor.v2_0.server.KtorServerTracing;
14+
import io.opentelemetry.instrumentation.ktor.v3_0.internal.KtorBuilderUtil;
15+
import io.opentelemetry.instrumentation.ktor.v3_0.server.KtorServerTracing;
1616
import io.opentelemetry.javaagent.bootstrap.internal.AgentCommonConfig;
1717
import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
1818
import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;

‎instrumentation/ktor/ktor-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.instrumentation.ktor.v2_0.client
77

88
import io.ktor.client.*
9+
import io.opentelemetry.instrumentation.ktor.v3_0.client.AbstractKtorHttpClientTest
910
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientInstrumentationExtension
1011
import org.junit.jupiter.api.extension.RegisterExtension
1112

‎instrumentation/ktor/ktor-2.0/javaagent/src/test/java/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorHttpServerTest.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
package io.opentelemetry.instrumentation.ktor.v2_0.server
77

88
import io.ktor.server.application.*
9+
import io.opentelemetry.instrumentation.ktor.v3_0.server.AbstractKtorHttpServerTest
910
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension
1011
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension
1112
import io.opentelemetry.instrumentation.testing.junit.http.HttpServerTestOptions

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/InstrumentationProperties.kt‎ renamed to ‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/InstrumentationProperties.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.ktor.v2_0
6+
package io.opentelemetry.instrumentation.ktor.v3_0
77

88
/**
99
* Common properties for both client and server instrumentations

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.ktor.v2_0.client
6+
package io.opentelemetry.instrumentation.ktor.v3_0.client
77

88
import io.ktor.client.*
99
import io.ktor.client.call.*

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracingBuilder.kt‎ renamed to ‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/KtorClientTracingBuilder.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.ktor.v2_0.client
6+
package io.opentelemetry.instrumentation.ktor.v3_0.client
77

88
import io.ktor.client.request.*
99
import io.ktor.client.statement.*
@@ -13,8 +13,8 @@ import io.opentelemetry.api.common.AttributesBuilder
1313
import io.opentelemetry.context.Context
1414
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
1515
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
16-
import io.opentelemetry.instrumentation.ktor.v2_0.InstrumentationProperties.INSTRUMENTATION_NAME
17-
import io.opentelemetry.instrumentation.ktor.v2_0.internal.KtorBuilderUtil
16+
import io.opentelemetry.instrumentation.ktor.v3_0.InstrumentationProperties.INSTRUMENTATION_NAME
17+
import io.opentelemetry.instrumentation.ktor.v3_0.internal.KtorBuilderUtil
1818

1919
class KtorClientTracingBuilder {
2020
companion object {

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientAttributesGetter.kt‎ renamed to ‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/KtorHttpClientAttributesGetter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.ktor.v2_0.client
6+
package io.opentelemetry.instrumentation.ktor.v3_0.client
77

88
import io.ktor.client.request.*
99
import io.ktor.client.statement.*

‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpHeadersSetter.kt‎ renamed to ‎instrumentation/ktor/ktor-2.0/library/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/KtorHttpHeadersSetter.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package io.opentelemetry.instrumentation.ktor.v2_0.client
6+
package io.opentelemetry.instrumentation.ktor.v3_0.client
77

88
import io.ktor.client.request.HttpRequestBuilder
99
import io.opentelemetry.context.propagation.TextMapSetter

0 commit comments

Comments
 (0)