feat: add tracing framework (#756)

ianbotsf · web-flow · commit d5afc27981ff · 2022-11-18T14:10:35.000-08:00
diff --git a/.changes/77594af4-5d59-49d4-b96c-9e1d5a9129e7.json b/.changes/77594af4-5d59-49d4-b96c-9e1d5a9129e7.json
@@ -0,0 +1,8 @@
+{
+    "id": "77594af4-5d59-49d4-b96c-9e1d5a9129e7",
+    "type": "feature",
+    "description": "Add a new tracing framework for centralized handling of log messages and metric events and providing easy integration points for connecting to downstream tracing systems (e.g., kotlin-logging)",
+    "issues": [
+        "awslabs/smithy-kotlin#677"
+    ]
+}
diff --git a/aws-runtime/aws-config/build.gradle.kts b/aws-runtime/aws-config/build.gradle.kts
@@ -24,6 +24,7 @@ kotlin {
                 implementation("aws.smithy.kotlin:logging:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:hashing:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http:$smithyKotlinVersion")
+                implementation("aws.smithy.kotlin:tracing-core:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:utils:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:http-client-engine-default:$smithyKotlinVersion")
                 implementation(project(":aws-runtime:aws-http"))
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/CachedCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/CachedCredentialsProvider.kt
@@ -10,8 +10,9 @@ import aws.sdk.kotlin.runtime.config.ExpiringValue
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.io.Closeable
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.time.Clock
+import aws.smithy.kotlin.runtime.tracing.trace
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -54,8 +55,7 @@ public class CachedCredentialsProvider(
     private val cachedCredentials = CachedValue<Credentials>(null, bufferTime = refreshBufferWindow, clock)
 
     override suspend fun getCredentials(): Credentials = cachedCredentials.getOrLoad {
-        val logger = Logger.getLogger<CachedCredentialsProvider>()
-        logger.trace { "refreshing credentials cache" }
+        coroutineContext.trace<CachedCredentialsProvider> { "refreshing credentials cache" }
         val providerCreds = source.getCredentials()
         if (providerCreds.expiration != null) {
             val expiration = minOf(providerCreds.expiration!!, (clock.now() + expireCredentialsAfter))
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/CredentialsProviderChain.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/CredentialsProviderChain.kt
@@ -7,8 +7,10 @@ package aws.sdk.kotlin.runtime.auth.credentials
 
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.http.operation.getLogger
 import aws.smithy.kotlin.runtime.io.Closeable
-import aws.smithy.kotlin.runtime.logging.Logger
+import aws.smithy.kotlin.runtime.tracing.*
+import kotlin.coroutines.coroutineContext
 
 // TODO - support caching the provider that actually resolved credentials such that future calls don't involve going through the full chain
 
@@ -23,20 +25,21 @@ import aws.smithy.kotlin.runtime.logging.Logger
 public open class CredentialsProviderChain(
     protected vararg val providers: CredentialsProvider,
 ) : CredentialsProvider, Closeable {
-    private val logger = Logger.getLogger<CredentialsProviderChain>()
-
     init {
         require(providers.isNotEmpty()) { "at least one provider must be in the chain" }
     }
 
     override fun toString(): String =
         (listOf(this) + providers).map { it::class.simpleName }.joinToString(" -> ")
 
-    override suspend fun getCredentials(): Credentials {
-        val chainException = lazy { CredentialsProviderException("No credentials could be loaded from the chain: $this") }
+    override suspend fun getCredentials(): Credentials = coroutineContext.withChildTraceSpan("Credentials chain") {
+        val logger = coroutineContext.getLogger<CredentialsProviderChain>()
+        val provider = this@CredentialsProviderChain
+        val chainException = lazy { CredentialsProviderException("No credentials could be loaded from the chain: $provider") }
         for (provider in providers) {
+            logger.trace { "Attempting to load credentials from $provider" }
             try {
-                return provider.getCredentials()
+                return@withChildTraceSpan provider.getCredentials()
             } catch (ex: Exception) {
                 logger.debug { "unable to load credentials from $provider: ${ex.message}" }
                 chainException.value.addSuppressed(ex)
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EcsCredentialsProvider.kt
@@ -23,7 +23,6 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.header
 import aws.smithy.kotlin.runtime.http.response.HttpResponse
 import aws.smithy.kotlin.runtime.io.Closeable
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.retries.StandardRetryStrategy
 import aws.smithy.kotlin.runtime.retries.StandardRetryStrategyOptions
 import aws.smithy.kotlin.runtime.retries.delay.ExponentialBackoffWithJitter
@@ -37,6 +36,7 @@ import aws.smithy.kotlin.runtime.serde.json.JsonDeserializer
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
+import kotlin.coroutines.coroutineContext
 
 /**
  * The elastic container metadata service endpoint that should be called by the [aws.sdk.kotlin.runtime.auth.credentials.EcsCredentialsProvider]
@@ -80,7 +80,7 @@ public class EcsCredentialsProvider internal constructor(
     }
 
     override suspend fun getCredentials(): Credentials {
-        val logger = Logger.getLogger<EcsCredentialsProvider>()
+        val logger = coroutineContext.getLogger<EcsCredentialsProvider>()
         val authToken = AwsSdkSetting.AwsContainerAuthorizationToken.resolve(platformProvider)
         val relativeUri = AwsSdkSetting.AwsContainerCredentialsRelativeUri.resolve(platformProvider)
         val fullUri = AwsSdkSetting.AwsContainerCredentialsFullUri.resolve(platformProvider)
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EnvironmentCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/EnvironmentCredentialsProvider.kt
@@ -8,10 +8,16 @@ package aws.sdk.kotlin.runtime.auth.credentials
 import aws.sdk.kotlin.runtime.config.AwsSdkSetting
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
+import aws.smithy.kotlin.runtime.tracing.trace
 import aws.smithy.kotlin.runtime.util.Platform
+import kotlin.coroutines.coroutineContext
 
 private const val PROVIDER_NAME = "Environment"
 
+private val ACCESS_KEY_ID = AwsSdkSetting.AwsAccessKeyId.environmentVariable
+private val SECRET_ACCESS_KEY = AwsSdkSetting.AwsSecretAccessKey.environmentVariable
+private val SESSION_TOKEN = AwsSdkSetting.AwsSessionToken.environmentVariable
+
 /**
  * A [CredentialsProvider] which reads from `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, and `AWS_SESSION_TOKEN`.
  */
@@ -22,10 +28,15 @@ public constructor(private val getEnv: (String) -> String?) : CredentialsProvide
     private fun requireEnv(variable: String): String =
         getEnv(variable) ?: throw ProviderConfigurationException("Missing value for environment variable `$variable`")
 
-    override suspend fun getCredentials(): Credentials = Credentials(
-        accessKeyId = requireEnv(AwsSdkSetting.AwsAccessKeyId.environmentVariable),
-        secretAccessKey = requireEnv(AwsSdkSetting.AwsSecretAccessKey.environmentVariable),
-        sessionToken = getEnv(AwsSdkSetting.AwsSessionToken.environmentVariable),
-        providerName = PROVIDER_NAME,
-    )
+    override suspend fun getCredentials(): Credentials {
+        coroutineContext.trace<EnvironmentCredentialsProvider> {
+            "Attempting to load credentials from env vars $ACCESS_KEY_ID/$SECRET_ACCESS_KEY/$SESSION_TOKEN"
+        }
+        return Credentials(
+            accessKeyId = requireEnv(ACCESS_KEY_ID),
+            secretAccessKey = requireEnv(SECRET_ACCESS_KEY),
+            sessionToken = getEnv(SESSION_TOKEN),
+            providerName = PROVIDER_NAME,
+        )
+    }
 }
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ImdsCredentialsProvider.kt
@@ -14,15 +14,17 @@ import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.http.HttpStatusCode
 import aws.smithy.kotlin.runtime.io.Closeable
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.serde.json.JsonDeserializer
 import aws.smithy.kotlin.runtime.time.Clock
 import aws.smithy.kotlin.runtime.time.Instant
+import aws.smithy.kotlin.runtime.tracing.info
+import aws.smithy.kotlin.runtime.tracing.warn
 import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
 import aws.smithy.kotlin.runtime.util.asyncLazy
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration.Companion.seconds
 
 private const val CREDENTIALS_BASE_PATH: String = "/latest/meta-data/iam/security-credentials"
@@ -52,7 +54,6 @@ public class ImdsCredentialsProvider(
     private val platformProvider: PlatformEnvironProvider = Platform,
     private val clock: Clock = Clock.System,
 ) : CredentialsProvider, Closeable {
-    private val logger = Logger.getLogger<ImdsCredentialsProvider>()
     private var previousCredentials: Credentials? = null
 
     // the time to refresh the Credentials. If set, it will take precedence over the Credentials' expiration time
@@ -97,7 +98,7 @@ public class ImdsCredentialsProvider(
         return when (val resp = deserializeJsonCredentials(deserializer)) {
             is JsonCredentialsResponse.SessionCredentials -> {
                 nextRefresh = if (resp.expiration < clock.now()) {
-                    logger.warn {
+                    coroutineContext.warn<ImdsCredentialsProvider> {
                         "Attempting credential expiration extension due to a credential service availability issue. " +
                             "A refresh of these credentials will be attempted again in " +
                             "${ DEFAULT_CREDENTIALS_REFRESH_SECONDS / 60 } minutes."
@@ -137,7 +138,10 @@ public class ImdsCredentialsProvider(
             client.value.get(CREDENTIALS_BASE_PATH)
         } catch (ex: EC2MetadataError) {
             if (ex.statusCode == HttpStatusCode.NotFound.value) {
-                logger.info { "Received 404 from IMDS when loading profile information. Hint: This instance may not have an IAM role associated." }
+                coroutineContext.info<ImdsCredentialsProvider> {
+                    "Received 404 from IMDS when loading profile information. Hint: This instance may not have an " +
+                        "IAM role associated."
+                }
             }
             throw ex
         }
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/ProfileCredentialsProvider.kt
@@ -16,13 +16,14 @@ import aws.sdk.kotlin.runtime.region.resolveRegion
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
+import aws.smithy.kotlin.runtime.http.operation.getLogger
 import aws.smithy.kotlin.runtime.io.Closeable
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import aws.smithy.kotlin.runtime.util.LazyAsyncValue
 import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 import aws.smithy.kotlin.runtime.util.asyncLazy
+import kotlin.coroutines.coroutineContext
 
 /**
  * A [CredentialsProvider] that gets credentials from a profile in `~/.aws/config` or the shared credentials
@@ -94,7 +95,7 @@ public class ProfileCredentialsProvider(
     )
 
     override suspend fun getCredentials(): Credentials {
-        val logger = Logger.getLogger<ProfileCredentialsProvider>()
+        val logger = coroutineContext.getLogger<ProfileCredentialsProvider>()
         val source = resolveConfigSource(platformProvider, profileName)
         logger.debug { "Loading credentials from profile `${source.profile}`" }
         val profiles = loadAwsProfiles(platformProvider, source)
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/SsoCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/SsoCredentialsProvider.kt
@@ -17,7 +17,9 @@ import aws.smithy.kotlin.runtime.serde.json.*
 import aws.smithy.kotlin.runtime.time.Clock
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.fromEpochMilliseconds
+import aws.smithy.kotlin.runtime.tracing.*
 import aws.smithy.kotlin.runtime.util.*
+import kotlin.coroutines.coroutineContext
 
 private const val PROVIDER_NAME = "SSO"
 
@@ -95,11 +97,16 @@ public class SsoCredentialsProvider public constructor(
 ) : CredentialsProvider {
 
     override suspend fun getCredentials(): Credentials {
+        val traceSpan = coroutineContext.traceSpan
+        val logger = traceSpan.logger<SsoCredentialsProvider>()
+
+        logger.trace { "Attempting to load token file" }
         val token = loadTokenFile()
 
         val client = SsoClient {
             region = ssoRegion
             httpClientEngine = this@SsoCredentialsProvider.httpClientEngine
+            tracer = traceSpan.asNestedTracer("SSO-")
         }
 
         val resp = try {
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsAssumeRoleCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsAssumeRoleCredentialsProvider.kt
@@ -13,12 +13,13 @@ import aws.sdk.kotlin.runtime.config.resolve
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.time.TimestampFormat
 import aws.smithy.kotlin.runtime.time.epochMilliseconds
+import aws.smithy.kotlin.runtime.tracing.*
 import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformEnvironProvider
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -55,7 +56,8 @@ public class StsAssumeRoleCredentialsProvider(
 ) : CredentialsProvider {
 
     override suspend fun getCredentials(): Credentials {
-        val logger = Logger.getLogger<StsAssumeRoleCredentialsProvider>()
+        val traceSpan = coroutineContext.traceSpan
+        val logger = traceSpan.logger<StsAssumeRoleCredentialsProvider>()
         logger.debug { "retrieving assumed credentials" }
 
         // NOTE: multi region access points require regional STS endpoints
@@ -64,6 +66,7 @@ public class StsAssumeRoleCredentialsProvider(
             region = provider.region ?: GLOBAL_STS_PARTITION_ENDPOINT
             credentialsProvider = provider.credentialsProvider
             httpClientEngine = provider.httpClientEngine
+            tracer = traceSpan.asNestedTracer("STS-")
         }
 
         val resp = try {
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsWebIdentityCredentialsProvider.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/auth/credentials/StsWebIdentityCredentialsProvider.kt
@@ -12,10 +12,11 @@ import aws.sdk.kotlin.runtime.config.resolve
 import aws.smithy.kotlin.runtime.auth.awscredentials.Credentials
 import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
 import aws.smithy.kotlin.runtime.http.engine.HttpClientEngine
-import aws.smithy.kotlin.runtime.logging.Logger
 import aws.smithy.kotlin.runtime.time.TimestampFormat
+import aws.smithy.kotlin.runtime.tracing.*
 import aws.smithy.kotlin.runtime.util.Platform
 import aws.smithy.kotlin.runtime.util.PlatformProvider
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -68,7 +69,8 @@ public class StsWebIdentityCredentialsProvider(
     }
 
     override suspend fun getCredentials(): Credentials {
-        val logger = Logger.getLogger<StsAssumeRoleCredentialsProvider>()
+        val traceSpan = coroutineContext.traceSpan
+        val logger = traceSpan.logger<StsAssumeRoleCredentialsProvider>()
         logger.debug { "retrieving assumed credentials via web identity" }
         val provider = this
 
@@ -80,6 +82,7 @@ public class StsWebIdentityCredentialsProvider(
             region = provider.region
             httpClientEngine = provider.httpClientEngine
             // NOTE: credentials provider not needed for this operation
+            tracer = traceSpan.asNestedTracer("STS-")
         }
 
         val resp = try {
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/ImdsClient.kt
@@ -131,6 +131,7 @@ public class ImdsClient private constructor(builder: Builder) : InstanceMetadata
             context {
                 operationName = path
                 service = SERVICE
+
                 // artifact of re-using ServiceEndpointResolver middleware
                 set(SdkClientOption.LogMode, sdkLogMode)
             }
diff --git a/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/TokenMiddleware.kt b/aws-runtime/aws-config/common/src/aws/sdk/kotlin/runtime/config/imds/TokenMiddleware.kt
@@ -16,6 +16,7 @@ import aws.smithy.kotlin.runtime.http.request.HttpRequestBuilder
 import aws.smithy.kotlin.runtime.http.request.url
 import aws.smithy.kotlin.runtime.http.response.complete
 import aws.smithy.kotlin.runtime.time.Clock
+import kotlin.coroutines.coroutineContext
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
@@ -47,7 +48,7 @@ internal class TokenMiddleware(
     }
 
     private suspend fun getToken(clock: Clock, req: SdkHttpRequest): Token {
-        val logger = req.context.getLogger("TokenMiddleware")
+        val logger = coroutineContext.getLogger<TokenMiddleware>()
         logger.trace { "refreshing IMDS token" }
 
         val tokenReq = HttpRequestBuilder().apply {
diff --git a/aws-runtime/aws-http/build.gradle.kts b/aws-runtime/aws-http/build.gradle.kts
@@ -26,6 +26,7 @@ kotlin {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutinesVersion")
                 implementation(project(":aws-runtime:testing"))
+                implementation("aws.smithy.kotlin:tracing-core:$smithyKotlinVersion")
             }
         }
 
diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/AwsRetryMiddleware.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/AwsRetryMiddleware.kt
@@ -34,7 +34,7 @@ public class AwsRetryMiddleware<O>(
 ) : Retry<O>(strategy, policy) {
 
     override suspend fun <H : Handler<SdkHttpRequest, O>> handle(request: SdkHttpRequest, next: H): O {
-        request.subject.header(AMZ_SDK_INVOCATION_ID_HEADER, request.context[HttpOperationContext.SdkRequestId])
+        request.subject.header(AMZ_SDK_INVOCATION_ID_HEADER, request.context.sdkRequestId)
         return super.handle(request, next)
     }
 
diff --git a/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/ResolveAwsEndpoint.kt b/aws-runtime/aws-http/common/src/aws/sdk/kotlin/runtime/http/middleware/ResolveAwsEndpoint.kt
@@ -14,6 +14,7 @@ import aws.smithy.kotlin.runtime.http.operation.ModifyRequestMiddleware
 import aws.smithy.kotlin.runtime.http.operation.SdkHttpRequest
 import aws.smithy.kotlin.runtime.http.operation.getLogger
 import aws.smithy.kotlin.runtime.util.get
+import kotlin.coroutines.coroutineContext
 
 /**
  * Http feature for resolving the (AWS) service endpoint.
@@ -47,7 +48,7 @@ public class ResolveAwsEndpoint(
             }
         }
 
-        val logger = req.context.getLogger("ResolveAwsEndpoint")
+        val logger = coroutineContext.getLogger<ResolveAwsEndpoint>()
         logger.trace { "resolved endpoint: $endpoint" }
         return req
     }
diff --git a/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/AwsRetryMiddlewareTest.kt b/aws-runtime/aws-http/common/test/aws/sdk/kotlin/runtime/http/middleware/AwsRetryMiddlewareTest.kt
@@ -57,10 +57,10 @@ class AwsRetryMiddlewareTest {
         val maxAttempts = strategy.options.maxAttempts
 
         op.install(AwsRetryMiddleware(strategy, AwsDefaultRetryPolicy))
-
         op.roundTrip(client, Unit)
+
         val calls = op.context.attributes[HttpOperationContext.HttpCallList]
-        val sdkRequestId = op.context[HttpOperationContext.SdkRequestId]
+        val sdkRequestId = op.context.sdkRequestId
 
         assertTrue(calls.all { it.request.headers[AMZ_SDK_INVOCATION_ID_HEADER] == sdkRequestId })
         calls.forEachIndexed { idx, call ->
diff --git a/aws-runtime/protocols/aws-event-stream/build.gradle.kts b/aws-runtime/protocols/aws-event-stream/build.gradle.kts
@@ -14,6 +14,7 @@ kotlin {
         commonMain {
             dependencies {
                 api(project(":aws-runtime:aws-core"))
+                implementation("aws.smithy.kotlin:tracing-core:$smithyKotlinVersion")
                 implementation("aws.smithy.kotlin:hashing:$smithyKotlinVersion")
                 // exposes Buffer/MutableBuffer and SdkByteReadChannel
                 api("aws.smithy.kotlin:io:$smithyKotlinVersion")
diff --git a/aws-runtime/protocols/aws-event-stream/common/src/aws/sdk/kotlin/runtime/protocol/eventstream/FrameEncoder.kt b/aws-runtime/protocols/aws-event-stream/common/src/aws/sdk/kotlin/runtime/protocol/eventstream/FrameEncoder.kt
diff --git a/gradle.properties b/gradle.properties
diff --git a/tests/codegen/event-stream/build.gradle.kts b/tests/codegen/event-stream/build.gradle.kts
