From 71fd156eda216d77bc92ee5a01c736e23f91bb4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=A4ggmark?= <hugo.haggmark@gmail.com>
Date: Wed, 20 Aug 2025 13:18:59 +0200
Subject: [PATCH] Plugins: adds plugin version to log output (#109845)

---
 .../datasources/components/DataSourcePluginSettings.tsx     | 6 +++++-
 public/app/features/plugins/extensions/utils.test.tsx       | 4 ++--
 public/app/features/plugins/extensions/utils.tsx            | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/app/features/datasources/components/DataSourcePluginSettings.tsx b/public/app/features/datasources/components/DataSourcePluginSettings.tsx
index 78062064bfc..f920837275b 100644
--- a/public/app/features/datasources/components/DataSourcePluginSettings.tsx
+++ b/public/app/features/datasources/components/DataSourcePluginSettings.tsx
@@ -34,7 +34,11 @@ export class DataSourcePluginSettings extends PureComponent<Props> {
       <div>
         {plugin.components.ConfigEditor &&
           createElement(plugin.components.ConfigEditor, {
-            options: writableProxy(dataSource, { source: 'datasource', pluginId: plugin.meta?.id }),
+            options: writableProxy(dataSource, {
+              source: 'datasource',
+              pluginId: plugin.meta?.id,
+              pluginVersion: plugin.meta?.info?.version,
+            }),
             onOptionsChange: this.onModelChanged,
           })}
       </div>
diff --git a/public/app/features/plugins/extensions/utils.test.tsx b/public/app/features/plugins/extensions/utils.test.tsx
index 33da958ae89..6f8837f206d 100644
--- a/public/app/features/plugins/extensions/utils.test.tsx
+++ b/public/app/features/plugins/extensions/utils.test.tsx
@@ -903,7 +903,7 @@ describe('Plugin Extensions / Utils', () => {
       // Logs a warning
       expect(log.error).toHaveBeenCalledTimes(1);
       expect(log.error).toHaveBeenCalledWith(
-        `Attempted to mutate object property "c" from extension with id grafana-worldmap-panel and version unknown`,
+        `Attempted to mutate object property "c" from extension with id grafana-worldmap-panel and version 1.0.0`,
         {
           stack: expect.any(String),
         }
@@ -931,7 +931,7 @@ describe('Plugin Extensions / Utils', () => {
       // Logs a warning
       expect(log.warning).toHaveBeenCalledTimes(1);
       expect(log.warning).toHaveBeenCalledWith(
-        `Attempted to mutate object property "c" from extension with id grafana-worldmap-panel and version unknown`,
+        `Attempted to mutate object property "c" from extension with id grafana-worldmap-panel and version 1.0.0`,
         {
           stack: expect.any(String),
         }
diff --git a/public/app/features/plugins/extensions/utils.tsx b/public/app/features/plugins/extensions/utils.tsx
index f083059cece..dc195f08888 100644
--- a/public/app/features/plugins/extensions/utils.tsx
+++ b/public/app/features/plugins/extensions/utils.tsx
@@ -98,7 +98,9 @@ export const wrapWithPluginContext = <T,>({
     return (
       <PluginContextProvider meta={pluginMeta}>
         <ExtensionErrorBoundary pluginId={pluginId} extensionTitle={extensionTitle} log={log}>
-          <Component {...writableProxy(props, { log, source: 'extension', pluginId })} />
+          <Component
+            {...writableProxy(props, { log, source: 'extension', pluginId, pluginVersion: pluginMeta.info?.version })}
+          />
         </ExtensionErrorBoundary>
       </PluginContextProvider>
     );