Skip to content

Commit

Permalink
Move under v2_0.common
Browse files Browse the repository at this point in the history
  • Loading branch information
@trask
trask committed Dec 9, 2024
1 parent 77012ed commit 2c08222
Show file tree
Hide file tree
Showing 27 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion ...tor/client/AbstractKtorClientTelemetry.kt → ...mon/client/AbstractKtorClientTelemetry.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.call.*
import io.ktor.client.request.*
Expand Down
4 changes: 2 additions & 2 deletions ...ent/AbstractKtorClientTelemetryBuilder.kt → ...ent/AbstractKtorClientTelemetryBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.request.*
import io.ktor.client.statement.*
Expand All @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder
import io.opentelemetry.context.Context
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
import io.opentelemetry.instrumentation.ktor.internal.KtorBuilderUtil
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtil

abstract class AbstractKtorClientTelemetryBuilder(
private val instrumentationName: String
Expand Down
2 changes: 1 addition & 1 deletion .../ktor/client/AbstractKtorClientTracing.kt → ...ommon/client/AbstractKtorClientTracing.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.call.*
import io.ktor.client.request.*
Expand Down
4 changes: 2 additions & 2 deletions ...lient/AbstractKtorClientTracingBuilder.kt → ...lient/AbstractKtorClientTracingBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.request.*
import io.ktor.client.statement.*
Expand All @@ -13,7 +13,7 @@ import io.opentelemetry.api.common.AttributesBuilder
import io.opentelemetry.context.Context
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor
import io.opentelemetry.instrumentation.ktor.internal.KtorBuilderUtilOld
import io.opentelemetry.instrumentation.ktor.v2_0.common.internal.KtorBuilderUtilOld

@Deprecated("Use AbstractKtorClientTelemetryBuilder instead", ReplaceWith("AbstractKtorClientTelemetryBuilder"))
abstract class AbstractKtorClientTracingBuilder(
Expand Down
2 changes: 1 addition & 1 deletion .../client/KtorHttpClientAttributesGetter.kt → .../client/KtorHttpClientAttributesGetter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.request.*
import io.ktor.client.statement.*
Expand Down
2 changes: 1 addition & 1 deletion ...tion/ktor/client/KtorHttpHeadersSetter.kt → ..._0/common/client/KtorHttpHeadersSetter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client
package io.opentelemetry.instrumentation.ktor.v2_0.common.client

import io.ktor.client.request.HttpRequestBuilder
import io.opentelemetry.context.propagation.TextMapSetter
Expand Down
4 changes: 2 additions & 2 deletions ...tion/ktor/client/internal/Experimental.kt → ..._0/common/client/internal/Experimental.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.client.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.client.internal

import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTelemetryBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetryBuilder
import java.lang.reflect.InvocationTargetException
import java.lang.reflect.Method
import java.util.logging.Level
Expand Down
2 changes: 1 addition & 1 deletion ...entation/ktor/internal/KtorBuilderUtil.kt → ...r/v2_0/common/internal/KtorBuilderUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.client.request.*
import io.ktor.client.statement.*
Expand Down
6 changes: 3 additions & 3 deletions ...ation/ktor/internal/KtorBuilderUtilOld.kt → ...2_0/common/internal/KtorBuilderUtilOld.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.client.request.*
import io.ktor.client.statement.*
import io.ktor.server.request.*
import io.ktor.server.response.*
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpClientInstrumenterBuilder
import io.opentelemetry.instrumentation.api.incubator.builder.internal.DefaultHttpServerInstrumenterBuilder
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTracingBuilder
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTracingBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracingBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTracingBuilder

/**
* This class is internal and is hence not for public use. Its APIs are unstable and can change at
Expand Down
2 changes: 1 addition & 1 deletion .../ktor/internal/KtorClientTelemetryUtil.kt → ...ommon/internal/KtorClientTelemetryUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.client.*
import io.ktor.client.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...on/ktor/internal/KtorClientTracingUtil.kt → .../common/internal/KtorClientTracingUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.client.*
import io.ktor.client.request.*
Expand Down
2 changes: 1 addition & 1 deletion .../ktor/internal/KtorServerTelemetryUtil.kt → ...ommon/internal/KtorServerTelemetryUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.server.application.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...ntation/ktor/internal/KtorServerTracer.kt → .../v2_0/common/internal/KtorServerTracer.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.server.application.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...on/ktor/internal/KtorServerTracingUtil.kt → .../common/internal/KtorServerTracingUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.internal
package io.opentelemetry.instrumentation.ktor.v2_0.common.internal

import io.ktor.server.application.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...ver/AbstractKtorServerTelemetryBuilder.kt → ...ver/AbstractKtorServerTelemetryBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.server
package io.opentelemetry.instrumentation.ktor.v2_0.common.server

import io.ktor.http.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...erver/AbstractKtorServerTracingBuilder.kt → ...erver/AbstractKtorServerTracingBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.server
package io.opentelemetry.instrumentation.ktor.v2_0.common.server

import io.ktor.http.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion ...n/ktor/server/ApplicationRequestGetter.kt → ...common/server/ApplicationRequestGetter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.server
package io.opentelemetry.instrumentation.ktor.v2_0.common.server

import io.ktor.server.request.*
import io.opentelemetry.context.propagation.TextMapGetter
Expand Down
2 changes: 1 addition & 1 deletion .../server/KtorHttpServerAttributesGetter.kt → .../server/KtorHttpServerAttributesGetter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.instrumentation.ktor.server
package io.opentelemetry.instrumentation.ktor.v2_0.common.server

import io.ktor.server.plugins.*
import io.ktor.server.request.*
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTelemetry.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import io.ktor.client.statement.*
import io.ktor.util.*
import io.opentelemetry.context.propagation.ContextPropagators
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTelemetry
import io.opentelemetry.instrumentation.ktor.internal.KtorClientTelemetryUtil
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetry

class KtorClientTelemetry internal constructor(
instrumenter: Instrumenter<HttpRequestData, HttpResponse>,
Expand Down
2 changes: 1 addition & 1 deletion ...in/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTelemetryBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package io.opentelemetry.instrumentation.ktor.v2_0.client

import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTelemetryBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.InstrumentationProperties.INSTRUMENTATION_NAME
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTelemetryBuilder

class KtorClientTelemetryBuilder : AbstractKtorClientTelemetryBuilder(INSTRUMENTATION_NAME) {

Expand Down
2 changes: 1 addition & 1 deletion ...ry/src/main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracing.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import io.ktor.client.statement.*
import io.ktor.util.*
import io.opentelemetry.context.propagation.ContextPropagators
import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter
import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTracing
import io.opentelemetry.instrumentation.ktor.internal.KtorClientTracingUtil
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracing

@Deprecated("Use KtorClientTelemetry instead", ReplaceWith("KtorClientTelemetry"))
class KtorClientTracing internal constructor(
Expand Down
2 changes: 1 addition & 1 deletion ...main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorClientTracingBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

package io.opentelemetry.instrumentation.ktor.v2_0.client

import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTracingBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.InstrumentationProperties.INSTRUMENTATION_NAME
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracingBuilder

@Deprecated("Use KtorClientTelemetryBuilder instead", ReplaceWith("KtorClientTelemetryBuilder"))
class KtorClientTracingBuilder : AbstractKtorClientTracingBuilder(INSTRUMENTATION_NAME) {
Expand Down
2 changes: 1 addition & 1 deletion ...in/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorServerTelemetryBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import io.opentelemetry.context.Context
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource
import io.opentelemetry.instrumentation.ktor.internal.KtorServerTelemetryUtil
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTelemetryBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.InstrumentationProperties.INSTRUMENTATION_NAME
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTelemetryBuilder

class KtorServerTelemetryBuilder internal constructor(
instrumentationName: String
Expand Down
2 changes: 1 addition & 1 deletion ...main/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/server/KtorServerTracingBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import io.opentelemetry.context.Context
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRoute
import io.opentelemetry.instrumentation.api.semconv.http.HttpServerRouteSource
import io.opentelemetry.instrumentation.ktor.internal.KtorServerTracingUtil
import io.opentelemetry.instrumentation.ktor.server.AbstractKtorServerTracingBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.InstrumentationProperties.INSTRUMENTATION_NAME
import io.opentelemetry.instrumentation.ktor.v2_0.common.server.AbstractKtorServerTracingBuilder

@Deprecated("Use KtorServerTelemetryBuilder instead", ReplaceWith("KtorServerTelemetryBuilder"))
class KtorServerTracingBuilder internal constructor(
Expand Down
5 changes: 4 additions & 1 deletion ...in/kotlin/io/opentelemetry/instrumentation/ktor/v2_0/client/AbstractKtorHttpClientTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ import io.opentelemetry.instrumentation.testing.junit.http.HttpClientResult
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions
import io.opentelemetry.instrumentation.testing.junit.http.HttpClientTestOptions.DEFAULT_HTTP_ATTRIBUTES
import io.opentelemetry.semconv.NetworkAttributes
import kotlinx.coroutines.*
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.junit.jupiter.api.AfterAll
import java.net.URI

Expand Down
1 change: 0 additions & 1 deletion ...otlin/io/opentelemetry/instrumentation/ktor/v2_0/client/KtorHttpClientSingleConnection.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package io.opentelemetry.instrumentation.ktor.v2_0.client

import io.ktor.client.*
import io.ktor.client.engine.cio.*
import io.ktor.client.request.*
import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection
import kotlinx.coroutines.runBlocking
Expand Down
2 changes: 1 addition & 1 deletion ...main/kotlin/io/opentelemetry/instrumentation/ktor/v3_0/client/KtorClientTracingBuilder.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

package io.opentelemetry.instrumentation.ktor.v3_0.client

import io.opentelemetry.instrumentation.ktor.client.AbstractKtorClientTracingBuilder
import io.opentelemetry.instrumentation.ktor.v2_0.common.client.AbstractKtorClientTracingBuilder
import io.opentelemetry.instrumentation.ktor.v3_0.InstrumentationProperties.INSTRUMENTATION_NAME

@Deprecated("Use KtorClientTelemetryBuilder instead", ReplaceWith("KtorClientTelemetryBuilder"))
Expand Down

0 comments on commit 2c08222

Please sign in to comment.