Skip to content

Commit 2bd4de5

Browse files
committed
Revert "Change codegen for DefaultTelemetry refs"
This reverts commit 9cf7174.
1 parent 2507525 commit 2bd4de5

File tree

5 files changed

+3
-25
lines changed

5 files changed

+3
-25
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ 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")
5857
val SMITHY_TEST_UTIL = smithySwiftDependency("SmithyTestUtil")
5958
val SMITHY_READ_WRITE = smithySwiftDependency("SmithyReadWrite")
6059
val SMITHY_TIMESTAMPS = smithySwiftDependency("SmithyTimestamps")

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ 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
1716
import software.amazon.smithy.swift.codegen.swiftmodules.SwiftTypes
1817

1918
class DefaultClientConfiguration : ClientConfiguration {
@@ -24,7 +23,7 @@ class DefaultClientConfiguration : ClientConfiguration {
2423
ConfigProperty(
2524
"telemetryProvider",
2625
ClientRuntimeTypes.Core.TelemetryProvider,
27-
{ it.format("\$N.provider", SmithyTelemetryAPITypes.DefaultTelemetry) },
26+
{ it.format("\$N.provider", ClientRuntimeTypes.Core.DefaultTelemetry) },
2827
),
2928
ConfigProperty(
3029
"retryStrategyOptions",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ 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)
8687
val splitHeaderListValues = runtimeSymbol("splitHeaderListValues", SwiftDeclaration.FUNC)
8788
val splitHttpDateHeaderListValues = runtimeSymbol("splitHttpDateHeaderListValues", SwiftDeclaration.FUNC)
8889
val OrchestratorBuilder = runtimeSymbol("OrchestratorBuilder", SwiftDeclaration.CLASS)

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

Lines changed: 0 additions & 21 deletions
This file was deleted.

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 ?? SmithyTelemetryAPI.DefaultTelemetry.provider,
102+
telemetryProvider ?? ClientRuntime.DefaultTelemetry.provider,
103103
retryStrategyOptions ?? ClientRuntime.ClientConfigurationDefaults.defaultRetryStrategyOptions,
104104
clientLogMode ?? ClientRuntime.ClientConfigurationDefaults.defaultClientLogMode,
105105
endpoint,

0 commit comments

Comments
 (0)