pull latest + fix conflicts

Author: mattrmc1

lib/sdk/server-ai/src/main/java/com/launchdarkly/sdk/server/ai/LDAIClient.java

@@ -90,6 +90,10 @@ AIJudgeConfig judgeConfig(
    * stores the resumption token from a previous tracker (via
    * {@link LDAIConfigTracker#getResumptionToken()}) and passes it back here to continue tracking
    * against the same run.
+   * <p>
+   * <strong>Security note:</strong> resumption tokens embed flag-evaluation details such as the
+   * variation key and config version. Keep tokens server-side and do not round-trip them through
+   * untrusted clients where they could leak flag-targeting information.
    *
    * @param resumptionToken the token returned by a previous tracker; must not be {@code null}
    * @param context the evaluation context for the new request; must not be {@code null}

lib/sdk/server-ai/src/main/java/com/launchdarkly/sdk/server/ai/datamodel/LDAITrackingTypes.java

@@ -423,21 +423,29 @@ public Builder sampled(boolean sampled) {
       /**
        * Sets the metric key.
        *
-       * @param metricKey the metric key; may be {@code null}
+       * @param metricKey the metric key; may be {@code null}, but must not be blank if non-null
        * @return this builder
+       * @throws IllegalArgumentException if {@code metricKey} is non-null and blank
        */
       public Builder metricKey(String metricKey) {
+        if (metricKey != null && metricKey.trim().isEmpty()) {
+          throw new IllegalArgumentException("metricKey must not be blank");
+        }
         this.metricKey = metricKey;
         return this;
       }
 
       /**
        * Sets the judge score.
        *
-       * @param score the score; may be {@code null}
+       * @param score the score; may be {@code null}, but must be finite if non-null
        * @return this builder
+       * @throws IllegalArgumentException if {@code score} is non-null and non-finite (NaN or infinite)
        */
       public Builder score(Double score) {
+        if (score != null && !Double.isFinite(score)) {
+          throw new IllegalArgumentException("score must be finite");
+        }
         this.score = score;
         return this;
       }

lib/sdk/server-ai/src/main/java/com/launchdarkly/sdk/server/ai/internal/LDAIConfigTrackerImpl.java

@@ -155,7 +155,7 @@ public String getResumptionToken() {
   @Override
   public void trackDuration(Duration duration) {
     if (duration == null) {
-      logger.warn("Skipping trackDuration: duration was null.");
+      logger.debug("Skipping trackDuration: duration was null.");
       return;
     }
     long ms = Math.max(0L, duration.toMillis());
@@ -181,7 +181,7 @@ public <T> T trackDurationOf(Callable<T> operation) throws Exception {
   @Override
   public void trackTimeToFirstToken(Duration duration) {
     if (duration == null) {
-      logger.warn("Skipping trackTimeToFirstToken: duration was null.");
+      logger.debug("Skipping trackTimeToFirstToken: duration was null.");
       return;
     }
     long ms = Math.max(0L, duration.toMillis());
@@ -213,7 +213,7 @@ public void trackError() {
   @Override
   public void trackFeedback(FeedbackKind kind) {
     if (kind == null) {
-      logger.warn("Skipping trackFeedback: kind was null.");
+      logger.debug("Skipping trackFeedback: kind was null.");
       return;
     }
     // Resolve event name BEFORE claiming the guard — an exception here must not burn the slot.
@@ -228,7 +228,7 @@ public void trackFeedback(FeedbackKind kind) {
   @Override
   public void trackTokens(TokenUsage tokens) {
     if (tokens == null) {
-      logger.warn("Skipping trackTokens: tokens was null.");
+      logger.debug("Skipping trackTokens: tokens was null.");
       return;
     }
     boolean hasPositive = tokens.getTotal() > 0 || tokens.getInput() > 0 || tokens.getOutput() > 0;
@@ -254,7 +254,7 @@ public void trackTokens(TokenUsage tokens) {
   @Override
   public void trackToolCall(String toolKey) {
     if (toolKey == null) {
-      logger.warn("Skipping trackToolCall: toolKey was null.");
+      logger.debug("Skipping trackToolCall: toolKey was null.");
       return;
     }
     toolCalls.add(toolKey);
@@ -275,7 +275,7 @@ public void trackToolCalls(List<String> toolKeys) {
   @Override
   public void trackJudgeResult(JudgeResult result) {
     if (result == null) {
-      logger.warn("Skipping trackJudgeResult: result was null.");
+      logger.debug("Skipping trackJudgeResult: result was null.");
       return;
     }
     if (!result.isSampled()) {
@@ -284,10 +284,10 @@ public void trackJudgeResult(JudgeResult result) {
     if (!result.isSuccess()) {
       return;
     }
-    if (result.getMetricKey() == null) {
+    if (result.getMetricKey() == null || result.getMetricKey().trim().isEmpty()) {
       return;
     }
-    if (result.getScore() == null) {
+    if (result.getScore() == null || !Double.isFinite(result.getScore())) {
       return;
     }
     ObjectBuilder data = baseData();
@@ -315,17 +315,25 @@ public <T> T trackMetricsOf(
       trackError();
       throw e;
     }
+    // Capture operation duration immediately so a slow extractor does not inflate the metric.
+    long operationElapsedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
 
-    // Extractor exceptions propagate to the caller — do NOT catch them here.
-    // Do NOT call trackError() on extractor failure; the AI operation itself succeeded.
-    AIMetrics metrics = metricsExtractor.apply(result);
+    // Extractor exceptions propagate to the caller, but the operation's duration must still be
+    // recorded — the AI operation itself succeeded, only the user-supplied extractor failed.
+    // Do NOT call trackError(); that signals the operation failed, which is not what happened.
+    AIMetrics metrics;
+    try {
+      metrics = Objects.requireNonNull(metricsExtractor.apply(result), "metricsExtractor returned null");
+    } catch (RuntimeException e) {
+      trackDuration(Duration.ofMillis(operationElapsedMs));
+      throw e;
+    }
 
     // Duration: prefer runner-reported value (§1.1.13.2), fall back to wall-clock.
     if (metrics.getDurationMs() != null) {
       trackDuration(Duration.ofMillis(metrics.getDurationMs()));
     } else {
-      long elapsed = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - start);
-      trackDuration(Duration.ofMillis(elapsed));
+      trackDuration(Duration.ofMillis(operationElapsedMs));
     }
 
     if (metrics.isSuccess()) {

lib/sdk/server-ai/src/main/java/com/launchdarkly/sdk/server/ai/internal/ResumptionTokens.java

@@ -13,8 +13,9 @@
  * <p>
  * This class is an internal implementation detail and is not part of the supported API.
  */
+
 public final class ResumptionTokens {
-  private static final int MAX_TOKEN_BYTES = 4096;
+  private static final int MAX_TOKEN_LENGTH = 4096;
   private static final Base64.Encoder ENCODER = Base64.getUrlEncoder().withoutPadding();
   private static final Base64.Decoder DECODER = Base64.getUrlDecoder();
 
@@ -61,8 +62,8 @@ static Decoded decode(String token) {
     if (token == null) {
       throw new IllegalArgumentException("Resumption token must not be null");
     }
-    if (token.length() > MAX_TOKEN_BYTES) {
-      throw new IllegalArgumentException("Resumption token exceeds maximum length of " + MAX_TOKEN_BYTES + " bytes");
+    if (token.length() > MAX_TOKEN_LENGTH) {
+      throw new IllegalArgumentException("Resumption token exceeds maximum length of " + MAX_TOKEN_LENGTH + " characters");
     }
 
     String json;
@@ -150,10 +151,10 @@ private static Decoded parseJson(String json) {
       }
     }
 
-    if (runId == null) {
+    if (runId == null || runId.isEmpty()) {
       throw new IllegalArgumentException("Resumption token missing required field 'runId'");
     }
-    if (configKey == null) {
+    if (configKey == null || configKey.isEmpty()) {
       throw new IllegalArgumentException("Resumption token missing required field 'configKey'");
     }
     if (version == null) {

lib/sdk/server-ai/src/test/java/com/launchdarkly/sdk/server/ai/internal/LDAIConfigTrackerImplTest.java

@@ -3,6 +3,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
@@ -82,6 +83,13 @@ private List<String> warnings() {
         .collect(Collectors.toList());
   }
 
+  private List<String> debugs() {
+    return logCapture.getMessages().stream()
+        .filter(m -> m.getLevel() == LDLogLevel.DEBUG)
+        .map(LogCapture.Message::getText)
+        .collect(Collectors.toList());
+  }
+
   private LDValue baseExpectedData() {
     return LDValue.buildObject()
         .put("runId", RUN_ID)
@@ -172,10 +180,11 @@ public void trackDurationAtMostOnce() {
   }
 
   @Test
-  public void trackDurationNullIsIgnoredWithWarning() {
+  public void trackDurationNullIsIgnoredWithDebugLog() {
     tracker.trackDuration(null);
     verify(client, never()).trackMetric(eq("$ld:ai:duration:total"), any(), any(), anyDouble());
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
   }
 
   // ---- trackDurationOf ------------------------------------------------------
@@ -215,10 +224,11 @@ public void trackTimeToFirstTokenAtMostOnce() {
   }
 
   @Test
-  public void trackTimeToFirstTokenNullIsIgnoredWithWarning() {
+  public void trackTimeToFirstTokenNullIsIgnoredWithDebugLog() {
     tracker.trackTimeToFirstToken(null);
     verify(client, never()).trackMetric(eq("$ld:ai:tokens:ttf"), any(), any(), anyDouble());
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
   }
 
   // ---- trackSuccess / trackError --------------------------------------------
@@ -299,9 +309,10 @@ public void trackFeedbackAtMostOnce() {
   }
 
   @Test
-  public void trackFeedbackNullIsIgnoredWithWarning_slotNotBurned() {
+  public void trackFeedbackNullIsIgnoredWithDebugLog_slotNotBurned() {
     tracker.trackFeedback(null);
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
     // Slot should not be burned — a subsequent valid call should still work
     tracker.trackFeedback(FeedbackKind.POSITIVE);
     verify(client, times(1)).trackMetric(eq("$ld:ai:feedback:user:positive"), any(), any(), anyDouble());
@@ -342,10 +353,11 @@ public void trackTokensAtMostOnce() {
   }
 
   @Test
-  public void trackTokensNullIsIgnoredWithWarning() {
+  public void trackTokensNullIsIgnoredWithDebugLog() {
     tracker.trackTokens(null);
     verify(client, never()).trackMetric(eq("$ld:ai:tokens:total"), any(), any(), anyDouble());
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
   }
 
   // ---- trackToolCall --------------------------------------------------------
@@ -382,10 +394,11 @@ public void trackToolCallsDelegate() {
   }
 
   @Test
-  public void trackToolCallNullIsIgnoredWithWarning() {
+  public void trackToolCallNullIsIgnoredWithDebugLog() {
     tracker.trackToolCall(null);
     verify(client, never()).trackMetric(eq("$ld:ai:tool_call"), any(), any(), anyDouble());
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
   }
 
   // ---- trackJudgeResult -----------------------------------------------------
@@ -470,9 +483,10 @@ public void trackJudgeResultIsNotAtMostOnce() {
   }
 
   @Test
-  public void trackJudgeResultNullIsIgnoredWithWarning() {
+  public void trackJudgeResultNullIsIgnoredWithDebugLog() {
     tracker.trackJudgeResult(null);
-    assertThat(warnings().size(), greaterThanOrEqualTo(1));
+    assertThat(debugs().size(), greaterThanOrEqualTo(1));
+    assertThat(warnings(), is(empty()));
   }
 
   // ---- trackMetricsOf -------------------------------------------------------
@@ -501,6 +515,23 @@ public void trackMetricsOfUsesRunnerReportedDurationWhenPresent() throws Excepti
     verify(client).trackMetric(eq("$ld:ai:duration:total"), any(), any(), eq(999.0));
   }
 
+  @Test
+  public void trackMetricsOfWallClockDurationExcludesSlowExtractor() throws Exception {
+    // Operation returns immediately; extractor sleeps. Recorded duration must reflect only the
+    // operation, not the extractor work.
+    long extractorSleepMs = 200L;
+    AIMetrics metrics = AIMetrics.builder().success(true).build();
+    tracker.trackMetricsOf(
+        r -> { try { Thread.sleep(extractorSleepMs); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); } return metrics; },
+        () -> "ok");
+    ArgumentCaptor<Double> durationCaptor = ArgumentCaptor.forClass(Double.class);
+    verify(client).trackMetric(eq("$ld:ai:duration:total"), any(), any(), durationCaptor.capture());
+    assertThat(
+        "wall-clock duration must not include extractor time",
+        durationCaptor.getValue() < (double) extractorSleepMs / 2,
+        is(true));
+  }
+
   @Test
   public void trackMetricsOfTracksErrorAndRethrowsOnOperationException() {
     try {
@@ -528,6 +559,18 @@ public void trackMetricsOfExtractorExceptionPropagatesAndDoesNotCallTrackError()
     verify(client, never()).trackMetric(eq("$ld:ai:generation:success"), any(), any(), anyDouble());
   }
 
+  @Test
+  public void trackMetricsOfRecordsDurationWhenExtractorThrows() {
+    try {
+      tracker.trackMetricsOf(
+          r -> { throw new RuntimeException("extractor failed"); },
+          () -> "ok");
+    } catch (Exception e) {
+      // expected; we care that duration was recorded before the throw
+    }
+    verify(client).trackMetric(eq("$ld:ai:duration:total"), any(), any(), anyDouble());
+  }
+
   @Test
   public void trackMetricsOfTracksToolCalls() throws Exception {
     AIMetrics metrics = AIMetrics.builder()