From 488b53d52444ea7c09ac7a4980d3b2477491b076 Mon Sep 17 00:00:00 2001
From: Viduni Wickramarachchi <viduni.wickramarachchi@elastic.co>
Date: Wed, 12 Mar 2025 16:45:02 -0400
Subject: [PATCH 1/3] Forward plugin ID

---
 .../server/service/client/index.ts                           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.ts b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.ts
index 43d5209d555f7..56a75e8656e8b 100644
--- a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.ts
+++ b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.ts
@@ -492,6 +492,11 @@ export class ObservabilityAIAssistantClient {
       toolChoice,
       tools,
       functionCalling: (simulateFunctionCalling ? 'simulated' : 'auto') as FunctionCallingMode,
+      metadata: {
+        connectorTelemetry: {
+          pluginId: 'observability_ai_assistant',
+        },
+      },
     };
 
     this.dependencies.logger.debug(

From c65e29cc9d9a40bafba8454a238badcdd0450ed0 Mon Sep 17 00:00:00 2001
From: Viduni Wickramarachchi <viduni.wickramarachchi@elastic.co>
Date: Wed, 12 Mar 2025 18:39:50 -0400
Subject: [PATCH 2/3] Update tests

---
 .../server/service/client/index.test.ts                  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
index cb80eb2a9ca67..efa31dcaf71e8 100644
--- a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
+++ b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
@@ -327,6 +327,9 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: undefined,
             tools: undefined,
+            connectorTelemetry: {
+              pluginId: 'observability_ai_assistant',
+            },
           },
         ]);
       });
@@ -847,6 +850,9 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: 'auto',
             tools: expect.any(Object),
+            connectorTelemetry: {
+              pluginId: 'observability_ai_assistant',
+            },
           },
         ]);
       });
@@ -996,6 +1002,9 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: 'auto',
             tools: expect.any(Object),
+            connectorTelemetry: {
+              pluginId: 'observability_ai_assistant',
+            },
           },
         ]);
       });

From 2fcab52a7f290890711abb224de40b1935c29a10 Mon Sep 17 00:00:00 2001
From: Viduni Wickramarachchi <viduni.wickramarachchi@elastic.co>
Date: Wed, 12 Mar 2025 20:16:02 -0400
Subject: [PATCH 3/3] Update tests

---
 .../server/service/client/index.test.ts        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
index efa31dcaf71e8..6acb26dccfe22 100644
--- a/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
+++ b/x-pack/platform/plugins/shared/observability_ai_assistant/server/service/client/index.test.ts
@@ -327,8 +327,10 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: undefined,
             tools: undefined,
-            connectorTelemetry: {
-              pluginId: 'observability_ai_assistant',
+            metadata: {
+              connectorTelemetry: {
+                pluginId: 'observability_ai_assistant',
+              },
             },
           },
         ]);
@@ -850,8 +852,10 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: 'auto',
             tools: expect.any(Object),
-            connectorTelemetry: {
-              pluginId: 'observability_ai_assistant',
+            metadata: {
+              connectorTelemetry: {
+                pluginId: 'observability_ai_assistant',
+              },
             },
           },
         ]);
@@ -1002,8 +1006,10 @@ describe('Observability AI Assistant client', () => {
             functionCalling: 'auto',
             toolChoice: 'auto',
             tools: expect.any(Object),
-            connectorTelemetry: {
-              pluginId: 'observability_ai_assistant',
+            metadata: {
+              connectorTelemetry: {
+                pluginId: 'observability_ai_assistant',
+              },
             },
           },
         ]);