feat(client): allow configuring env via system properties

Author: stainless-app[bot]

README.md

@@ -53,7 +53,8 @@ import com.braintrustdata.api.client.okhttp.BraintrustOkHttpClient;
 import com.braintrustdata.api.models.Project;
 import com.braintrustdata.api.models.ProjectCreateParams;
 
-// Configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
+// Configures using the `braintrust.apiKey` and `braintrust.baseUrl` system properties
+// Or configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
 BraintrustClient client = BraintrustOkHttpClient.fromEnv();
 
 ProjectCreateParams params = ProjectCreateParams.builder()
@@ -64,13 +65,14 @@ Project project = client.projects().create(params);
 
 ## Client configuration
 
-Configure the client using environment variables:
+Configure the client using system properties or environment variables:
 
 ```java
 import com.braintrustdata.api.client.BraintrustClient;
 import com.braintrustdata.api.client.okhttp.BraintrustOkHttpClient;
 
-// Configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
+// Configures using the `braintrust.apiKey` and `braintrust.baseUrl` system properties
+// Or configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
 BraintrustClient client = BraintrustOkHttpClient.fromEnv();
 ```
 
@@ -92,18 +94,21 @@ import com.braintrustdata.api.client.BraintrustClient;
 import com.braintrustdata.api.client.okhttp.BraintrustOkHttpClient;
 
 BraintrustClient client = BraintrustOkHttpClient.builder()
-    // Configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
+    // Configures using the `braintrust.apiKey` and `braintrust.baseUrl` system properties
+    Or configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
     .fromEnv()
     .apiKey("My API Key")
     .build();
 ```
 
 See this table for the available options:
 
-| Setter    | Environment variable  | Required | Default value                  |
-| --------- | --------------------- | -------- | ------------------------------ |
-| `apiKey`  | `BRAINTRUST_API_KEY`  | false    | -                              |
-| `baseUrl` | `BRAINTRUST_BASE_URL` | true     | `"https://api.braintrust.dev"` |
+| Setter    | System property      | Environment variable  | Required | Default value                  |
+| --------- | -------------------- | --------------------- | -------- | ------------------------------ |
+| `apiKey`  | `braintrust.apiKey`  | `BRAINTRUST_API_KEY`  | false    | -                              |
+| `baseUrl` | `braintrust.baseUrl` | `BRAINTRUST_BASE_URL` | true     | `"https://api.braintrust.dev"` |
+
+System properties take precedence over environment variables.
 
 > [!TIP]
 > Don't create more than one client in the same application. Each client has a connection pool and
@@ -149,7 +154,8 @@ import com.braintrustdata.api.models.Project;
 import com.braintrustdata.api.models.ProjectCreateParams;
 import java.util.concurrent.CompletableFuture;
 
-// Configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
+// Configures using the `braintrust.apiKey` and `braintrust.baseUrl` system properties
+// Or configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
 BraintrustClient client = BraintrustOkHttpClient.fromEnv();
 
 ProjectCreateParams params = ProjectCreateParams.builder()
@@ -167,7 +173,8 @@ import com.braintrustdata.api.models.Project;
 import com.braintrustdata.api.models.ProjectCreateParams;
 import java.util.concurrent.CompletableFuture;
 
-// Configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
+// Configures using the `braintrust.apiKey` and `braintrust.baseUrl` system properties
+// Or configures using the `BRAINTRUST_API_KEY` and `BRAINTRUST_BASE_URL` environment variables
 BraintrustClientAsync client = BraintrustOkHttpClientAsync.fromEnv();
 
 ProjectCreateParams params = ProjectCreateParams.builder()

braintrust-java-core/src/main/kotlin/com/braintrustdata/api/core/ClientOptions.kt

@@ -235,8 +235,11 @@ private constructor(
         fun timeout(): Timeout = timeout
 
         fun fromEnv() = apply {
-            System.getenv("BRAINTRUST_BASE_URL")?.let { baseUrl(it) }
-            System.getenv("BRAINTRUST_API_KEY")?.let { apiKey(it) }
+            (System.getProperty("braintrust.baseUrl") ?: System.getenv("BRAINTRUST_BASE_URL"))
+                ?.let { baseUrl(it) }
+            (System.getProperty("braintrust.apiKey") ?: System.getenv("BRAINTRUST_API_KEY"))?.let {
+                apiKey(it)
+            }
         }
 
         /**