Skip to content

Commit 9cf7174

Browse files
committed
Change codegen for DefaultTelemetry refs
1 parent 5d1c704 commit 9cf7174

File tree

5 files changed

+25
-3
lines changed

5 files changed

+25
-3
lines changed

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/SwiftDependency.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class SwiftDependency(
5454
val SMITHY_STREAMS = smithySwiftDependency("SmithyStreams")
5555
val SMITHY_EVENT_STREAMS_API = smithySwiftDependency("SmithyEventStreamsAPI")
5656
val SMITHY_EVENT_STREAMS = smithySwiftDependency("SmithyEventStreams")
57+
val SMITHY_TELEMETRY_API = smithySwiftDependency("SmithyTelemetryAPI")
5758
val SMITHY_TEST_UTIL = smithySwiftDependency("SmithyTestUtil")
5859
val SMITHY_READ_WRITE = smithySwiftDependency("SmithyReadWrite")
5960
val SMITHY_TIMESTAMPS = smithySwiftDependency("SmithyTimestamps")

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/config/DefaultClientConfiguration.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import software.amazon.smithy.swift.codegen.lang.FunctionParameter
1313
import software.amazon.smithy.swift.codegen.model.toOptional
1414
import software.amazon.smithy.swift.codegen.swiftmodules.ClientRuntimeTypes
1515
import software.amazon.smithy.swift.codegen.swiftmodules.SmithyRetriesAPITypes
16+
import software.amazon.smithy.swift.codegen.swiftmodules.SmithyTelemetryAPITypes
1617
import software.amazon.smithy.swift.codegen.swiftmodules.SwiftTypes
1718

1819
class DefaultClientConfiguration : ClientConfiguration {
@@ -23,7 +24,7 @@ class DefaultClientConfiguration : ClientConfiguration {
2324
ConfigProperty(
2425
"telemetryProvider",
2526
ClientRuntimeTypes.Core.TelemetryProvider,
26-
{ it.format("\$N.provider", ClientRuntimeTypes.Core.DefaultTelemetry) },
27+
{ it.format("\$N.provider", SmithyTelemetryAPITypes.DefaultTelemetry) },
2728
),
2829
ConfigProperty(
2930
"retryStrategyOptions",

smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/swiftmodules/ClientRuntimeTypes.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ object ClientRuntimeTypes {
8383
val HeaderDeserializationError = runtimeSymbol("HeaderDeserializationError", SwiftDeclaration.ENUM)
8484
val quoteHeaderValue = runtimeSymbol("quoteHeaderValue", SwiftDeclaration.FUNC)
8585
val DefaultClientPlugin = runtimeSymbol("DefaultClientPlugin", SwiftDeclaration.CLASS)
86-
val DefaultTelemetry = runtimeSymbol("DefaultTelemetry", SwiftDeclaration.ENUM)
8786
val splitHeaderListValues = runtimeSymbol("splitHeaderListValues", SwiftDeclaration.FUNC)
8887
val splitHttpDateHeaderListValues = runtimeSymbol("splitHttpDateHeaderListValues", SwiftDeclaration.FUNC)
8988
val OrchestratorBuilder = runtimeSymbol("OrchestratorBuilder", SwiftDeclaration.CLASS)
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package software.amazon.smithy.swift.codegen.swiftmodules
2+
3+
import software.amazon.smithy.codegen.core.Symbol
4+
import software.amazon.smithy.swift.codegen.SwiftDeclaration
5+
import software.amazon.smithy.swift.codegen.SwiftDependency
6+
7+
object SmithyTelemetryAPITypes {
8+
val DefaultTelemetry = runtimeSymbol("DefaultTelemetry", SwiftDeclaration.ENUM)
9+
}
10+
11+
private fun runtimeSymbol(
12+
name: String,
13+
declaration: SwiftDeclaration? = null,
14+
): Symbol =
15+
SwiftSymbol.make(
16+
name,
17+
declaration,
18+
SwiftDependency.SMITHY_TELEMETRY_API,
19+
emptyList(),
20+
emptyList(),
21+
)

smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/HttpProtocolClientGeneratorTests.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ extension RestJsonProtocolClient {
9999
httpInterceptorProviders: [ClientRuntime.HttpInterceptorProvider]? = nil
100100
) throws {
101101
self.init(
102-
telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider,
102+
telemetryProvider ?? SmithyTelemetryAPI.DefaultTelemetry.provider,
103103
retryStrategyOptions ?? ClientRuntime.ClientConfigurationDefaults.defaultRetryStrategyOptions,
104104
clientLogMode ?? ClientRuntime.ClientConfigurationDefaults.defaultClientLogMode,
105105
endpoint,

0 commit comments

Comments
 (0)