Merge branch 'main' into dependabot/gradle/otel-version-1.52.0

Author: ianbotsf

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## [1.5.4] - 08/07/2025
+
 ## [1.5.3] - 07/28/2025
 
 ### Features

build.gradle.kts

@@ -19,7 +19,7 @@ buildscript {
         https://github.com/Kotlin/dokka/issues/3472#issuecomment-1929712374
         https://github.com/Kotlin/dokka/issues/3194#issuecomment-1929382630
          */
-        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.19.2"))
+        classpath(enforcedPlatform("com.fasterxml.jackson:jackson-bom:2.15.3"))
     }
 }
 

gradle.properties

@@ -13,10 +13,10 @@ kotlinx.atomicfu.enableNativeIrTransformation=false
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G
 
 # SDK
-sdkVersion=1.5.4-SNAPSHOT
+sdkVersion=1.5.5-SNAPSHOT
 
 # codegen
-codegenVersion=0.35.4-SNAPSHOT
+codegenVersion=0.35.5-SNAPSHOT
 
 # FIXME Remove after Dokka 2.0 Gradle plugin is stable
 org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ okhttp-version = "5.1.0"
 okhttp4-version = "4.12.0"
 okio-version = "3.16.0"
 otel-version = "1.52.0"
-slf4j-version = "2.0.16"
+slf4j-version = "2.0.17"
 slf4j-v1x-version = "1.7.36"
 crt-kotlin-version = "0.10.0"
 micrometer-version = "1.15.2"
@@ -25,7 +25,7 @@ junit-version = "5.13.4"
 kotest-version = "5.9.1"
 kotlin-compile-testing-version = "0.8.0"
 kotlinx-benchmark-version = "0.4.14"
-kotlinx-serialization-version = "1.7.3"
+kotlinx-serialization-version = "1.9.0"
 docker-java-version = "3.4.0"
 ktor-version = "3.2.3"
 kaml-version = "0.55.0"

runtime/auth/http-auth/api/http-auth.api

@@ -62,6 +62,8 @@ public abstract interface class aws/smithy/kotlin/runtime/http/auth/CloseableBea
 public final class aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider : aws/smithy/kotlin/runtime/http/auth/BearerTokenProvider {
 	public fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
 	public synthetic fun <init> (Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Laws/smithy/kotlin/runtime/util/PlatformProvider;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun resolve (Laws/smithy/kotlin/runtime/collections/Attributes;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 

runtime/auth/http-auth/common/src/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProvider.kt

@@ -4,25 +4,37 @@
  */
 package aws.smithy.kotlin.runtime.http.auth
 
+import aws.smithy.kotlin.runtime.businessmetrics.SmithyBusinessMetric
+import aws.smithy.kotlin.runtime.businessmetrics.emitBusinessMetric
 import aws.smithy.kotlin.runtime.collections.Attributes
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
+import aws.smithy.kotlin.runtime.collections.mutableAttributes
 import aws.smithy.kotlin.runtime.time.Instant
 import aws.smithy.kotlin.runtime.util.PlatformProvider
 
 /**
- * A [BearerTokenProvider] that extracts the bearer token from the target environment variable.
+ * A [BearerTokenProvider] that extracts the bearer token from JVM system properties or environment variables.
  */
 public class EnvironmentBearerTokenProvider(
-    private val key: String,
+    private val sysPropKey: String,
+    private val envKey: String,
     private val platform: PlatformProvider = PlatformProvider.System,
 ) : BearerTokenProvider {
+    @Deprecated("This constructor does not support a parameter for a system property key and will be removed in version 1.6.x")
+    public constructor(
+        envKey: String,
+        platform: PlatformProvider = PlatformProvider.System,
+    ) : this("", envKey, platform)
+
     override suspend fun resolve(attributes: Attributes): BearerToken {
-        val bearerToken = platform.getenv(key)
-            ?: error("$key environment variable is not set")
+        val bearerToken = sysPropKey.takeUnless(String::isBlank)?.let(platform::getProperty)
+            ?: platform.getenv(envKey)
+        if (bearerToken.isNullOrBlank()) throw IllegalStateException("""Missing values for system property "$sysPropKey" and environment variable "$envKey"""")
 
         return object : BearerToken {
             override val token: String = bearerToken
-            override val attributes: Attributes = emptyAttributes()
+            override val attributes: Attributes = mutableAttributes().apply {
+                emitBusinessMetric(SmithyBusinessMetric.BEARER_SERVICE_ENV_VARS)
+            }
             override val expiration: Instant? = null
         }
     }

runtime/auth/http-auth/common/test/aws/smithy/kotlin/runtime/http/auth/EnvironmentBearerTokenProviderTest.kt

@@ -1,6 +1,5 @@
 package aws.smithy.kotlin.runtime.http.auth
 
-import aws.smithy.kotlin.runtime.collections.emptyAttributes
 import aws.smithy.kotlin.runtime.util.TestPlatformProvider
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
@@ -9,27 +8,65 @@ import kotlin.test.assertFailsWith
 
 class EnvironmentBearerTokenProviderTest {
     @Test
-    fun testResolveWithValidToken() = runTest {
+    fun testResolveFromEnvVar() = runTest {
         val provider = EnvironmentBearerTokenProvider(
-            "TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf("TEST_TOKEN" to "test-bearer-token")),
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
         )
 
         val token = provider.resolve()
 
-        assertEquals("test-bearer-token", token.token)
+        assertEquals("test-env-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolveFromSysProps() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
+    }
+
+    @Test
+    fun testResolutionOrder() = runTest {
+        val provider = EnvironmentBearerTokenProvider(
+            "TEST_SYS_PROPS_TOKEN",
+            "TEST_ENV_TOKEN",
+            TestPlatformProvider(
+                props = mapOf("TEST_SYS_PROPS_TOKEN" to "test-sys-props-bearer-token"),
+                env = mapOf("TEST_ENV_TOKEN" to "test-env-bearer-token"),
+            ),
+        )
+
+        val token = provider.resolve()
+
+        assertEquals("test-sys-props-bearer-token", token.token)
     }
 
     @Test
     fun testResolveWithMissingToken() = runTest {
         val provider = EnvironmentBearerTokenProvider(
             "MISSING_TEST_TOKEN",
-            TestPlatformProvider(mutableMapOf()),
+            "MISSING_TEST_TOKEN",
+            TestPlatformProvider(
+                env = mapOf("TEST_TOKEN" to "test-env-bearer-token"),
+                props = mapOf("TEST_TOKEN" to "test-sys-props-bearer-token"),
+            ),
         )
 
         val exception = assertFailsWith<IllegalStateException> {
-            provider.resolve(emptyAttributes())
+            provider.resolve()
         }
-        assertEquals("MISSING_TEST_TOKEN environment variable is not set", exception.message)
+        assertEquals("Missing values for system property \"MISSING_TEST_TOKEN\" and environment variable \"MISSING_TEST_TOKEN\"", exception.message)
     }
 }

runtime/runtime-core/api/runtime-core.api

@@ -107,6 +107,7 @@ public final class aws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetri
 	public static final field ACCOUNT_ID_MODE_DISABLED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_PREFERRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field ACCOUNT_ID_MODE_REQUIRED Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
+	public static final field BEARER_SERVICE_ENV_VARS Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_CRC32C Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;
 	public static final field FLEXIBLE_CHECKSUMS_REQ_SHA1 Laws/smithy/kotlin/runtime/businessmetrics/SmithyBusinessMetric;

runtime/runtime-core/common/src/aws/smithy/kotlin/runtime/businessmetrics/BusinessMetricsUtils.kt

@@ -102,6 +102,7 @@ public enum class SmithyBusinessMetric(public override val identifier: String) :
     FLEXIBLE_CHECKSUMS_REQ_WHEN_REQUIRED("a"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_SUPPORTED("b"),
     FLEXIBLE_CHECKSUMS_RES_WHEN_REQUIRED("c"),
+    BEARER_SERVICE_ENV_VARS("3"),
     ;
 
     override fun toString(): String = identifier