Improving tests, corrected changelog

Signed-off-by: Martin Gaievski <gaievski@amazon.com>

Author: martin-gaievski

CHANGELOG.md

@@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 3.x]
 ### Added
-- Add WrappedScorerAccessor interface for plugin access to wrapped scorers in profiling decorators ([#20548](https://github.com/opensearch-project/OpenSearch/issues/20548))
+- Add WrappedScorerAccessor interface for plugin access to wrapped scorers in profiling decorators ([#20607](https://github.com/opensearch-project/OpenSearch/pull/20607))
 - Support expected cluster name with validation in CCS Sniff mode ([#20532](https://github.com/opensearch-project/OpenSearch/pull/20532))
 - Choose the best performing node when writing with append-only index ([#20065](https://github.com/opensearch-project/OpenSearch/pull/20065))
 - Add security policy to allow `accessUnixDomainSocket` in `transport-grpc` module ([#20463](https://github.com/opensearch-project/OpenSearch/pull/20463))
@@ -28,7 +28,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Service does not start on Windows with OpenJDK ([#20615](https://github.com/opensearch-project/OpenSearch/pull/20615))
 - Update RemoteClusterStateCleanupManager to performed batched deletions of stale ClusterMetadataManifests and address deletion timeout issues ([#20566](https://github.com/opensearch-project/OpenSearch/pull/20566))
 - Fix the regression of terms agg optimization at high cardinality ([#20623](https://github.com/opensearch-project/OpenSearch/pull/20623))
-- Fix ProfileScorer.getChildren() to expose wrapped scorer in scorer tree for plugin compatibility ([#20548](https://github.com/opensearch-project/OpenSearch/issues/20548))
 
 ### Dependencies
 - Bump `ch.qos.logback:logback-core` and `ch.qos.logback:logback-classic` from 1.5.24 to 1.5.27 ([#20525](https://github.com/opensearch-project/OpenSearch/pull/20525))

server/src/test/java/org/opensearch/search/profile/query/ProfileScorerTests.java

@@ -129,22 +129,36 @@ public void testImplementsWrappedScorerAccessor() throws IOException {
         assertSame("WrappedScorerAccessor.getWrappedScorer() should return the original scorer", fakeScorer, accessor.getWrappedScorer());
     }
 
-    public void testUnwrapFromScorableReference() throws IOException {
-        // Simulate how a plugin collector receives a generic Scorable reference
-        // (e.g., via LeafCollector.setScorer()) and uses WrappedScorerAccessor
-        // to unwrap the profiling wrapper and access the original scorer
+    public void testUnwrapNestedProfilingScorerFromScorableReference() throws IOException {
+        // Simulate nested profiling: a scorer wrapped in two ProfileScorer layers.
+        // This tests that a plugin can iteratively unwrap through multiple profiling
+        // layers via a generic Scorable reference (as received in LeafCollector.setScorer())
         Query query = new MatchAllDocsQuery();
         Weight weight = query.createWeight(new IndexSearcher(new MultiReader()), ScoreMode.TOP_SCORES, 1f);
         FakeScorer fakeScorer = new FakeScorer(weight);
-        QueryProfileBreakdown profile = new QueryProfileBreakdown(ProfileMetricUtil.getDefaultQueryProfileMetrics());
-
-        // Plugin only sees a Scorable reference, not ProfileScorer
-        Scorable scorable = new ProfileScorer(fakeScorer, profile);
-
-        // Plugin uses instanceof to detect the wrapper and unwrap
-        assertTrue("Scorable should be detected as WrappedScorerAccessor", scorable instanceof WrappedScorerAccessor);
-        Scorer unwrapped = ((WrappedScorerAccessor) scorable).getWrappedScorer();
-        assertSame("Unwrapped scorer should be the original FakeScorer", fakeScorer, unwrapped);
+        QueryProfileBreakdown innerProfile = new QueryProfileBreakdown(ProfileMetricUtil.getDefaultQueryProfileMetrics());
+        QueryProfileBreakdown outerProfile = new QueryProfileBreakdown(ProfileMetricUtil.getDefaultQueryProfileMetrics());
+
+        // Create nested profiling: FakeScorer -> innerProfileScorer -> outerProfileScorer
+        ProfileScorer innerProfileScorer = new ProfileScorer(fakeScorer, innerProfile);
+        ProfileScorer outerProfileScorer = new ProfileScorer(innerProfileScorer, outerProfile);
+
+        // Plugin only sees a Scorable reference
+        Scorable scorable = outerProfileScorer;
+
+        // Unwrap first layer
+        assertTrue("Outer Scorable should be detected as WrappedScorerAccessor", scorable instanceof WrappedScorerAccessor);
+        Scorer firstUnwrap = ((WrappedScorerAccessor) scorable).getWrappedScorer();
+        assertNotSame("First unwrap should not be the original scorer", fakeScorer, firstUnwrap);
+        assertTrue(
+            "First unwrap should still be a WrappedScorerAccessor (inner ProfileScorer)",
+            firstUnwrap instanceof WrappedScorerAccessor
+        );
+
+        // Unwrap second layer to reach the original scorer
+        Scorer secondUnwrap = ((WrappedScorerAccessor) firstUnwrap).getWrappedScorer();
+        assertSame("Second unwrap should be the original FakeScorer", fakeScorer, secondUnwrap);
+        assertFalse("Original scorer should not implement WrappedScorerAccessor", secondUnwrap instanceof WrappedScorerAccessor);
     }
 
     public void testGetChildren_delegatesToWrappedScorer() throws IOException {