diff --git a/alertmanager/go.mod b/alertmanager/go.mod
index 9e478984d..a6f76f5a8 100644
--- a/alertmanager/go.mod
+++ b/alertmanager/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/alertmanager
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/alertmanager/go.sum b/alertmanager/go.sum
index ad0f63fad..0820626e3 100644
--- a/alertmanager/go.sum
+++ b/alertmanager/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/alertmanager/sdk/go/datasource/datasource.go b/alertmanager/sdk/go/datasource/datasource.go
index 67800a00b..d9a2d988a 100644
--- a/alertmanager/sdk/go/datasource/datasource.go
+++ b/alertmanager/sdk/go/datasource/datasource.go
@@ -55,9 +55,6 @@ func AlertManager(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/alertmanager/sdk/go/query/alerts/options.go b/alertmanager/sdk/go/query/alerts/options.go
index 28ae61e24..58ddbfeba 100644
--- a/alertmanager/sdk/go/query/alerts/options.go
+++ b/alertmanager/sdk/go/query/alerts/options.go
@@ -19,7 +19,11 @@ import (
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = amDatasource.Selector(datasourceName)
+		sel, err := amDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/alertmanager/sdk/go/query/silences/options.go b/alertmanager/sdk/go/query/silences/options.go
index 0c31c13c1..ca494437c 100644
--- a/alertmanager/sdk/go/query/silences/options.go
+++ b/alertmanager/sdk/go/query/silences/options.go
@@ -19,7 +19,11 @@ import (
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = amDatasource.Selector(datasourceName)
+		sel, err := amDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/clickhouse/go.mod b/clickhouse/go.mod
index bd880d0a4..df0a3e55c 100644
--- a/clickhouse/go.mod
+++ b/clickhouse/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/clickhouse
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/clickhouse/go.sum b/clickhouse/go.sum
index ad0f63fad..0820626e3 100644
--- a/clickhouse/go.sum
+++ b/clickhouse/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/clickhouse/sdk/go/datasource/datasource.go b/clickhouse/sdk/go/datasource/datasource.go
index 45509e4cf..c25184e0c 100644
--- a/clickhouse/sdk/go/datasource/datasource.go
+++ b/clickhouse/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func ClickHouse(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/clickhouse/sdk/go/query/log/options.go b/clickhouse/sdk/go/query/log/options.go
index 1a91a8bea..17a09d5e7 100644
--- a/clickhouse/sdk/go/query/log/options.go
+++ b/clickhouse/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = clickhouseDatasource.Selector(datasourceName)
+		sel, err := clickhouseDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/clickhouse/sdk/go/query/time-series/options.go b/clickhouse/sdk/go/query/time-series/options.go
index 7c8cadb63..13ea7934f 100644
--- a/clickhouse/sdk/go/query/time-series/options.go
+++ b/clickhouse/sdk/go/query/time-series/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = clickhouseDatasource.Selector(datasourceName)
+		sel, err := clickhouseDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/greptimedb/go.mod b/greptimedb/go.mod
index c40bced52..02a1b16d5 100644
--- a/greptimedb/go.mod
+++ b/greptimedb/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/greptimedb
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.4
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/greptimedb/go.sum b/greptimedb/go.sum
index a06654c26..0b64c5a55 100644
--- a/greptimedb/go.sum
+++ b/greptimedb/go.sum
@@ -22,6 +22,10 @@ github.com/nexucis/lamenv v0.5.2 h1:tK/u3XGhCq9qIoVNcXsK9LZb8fKopm0A5weqSRvHd7M=
 github.com/nexucis/lamenv v0.5.2/go.mod h1:HusJm6ltmmT7FMG8A750mOLuME6SHCsr2iFYxp5fFi0=
 github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/perses v0.55.0-beta.4 h1:ty/Avk+RUHaNlbcDKqcEjSV94GqqoXjPpzbdAZq+frk=
 github.com/perses/perses v0.55.0-beta.4/go.mod h1:l+QYn+7oGQ845ygaHIvS2PWcauDy8gaY1uST1Rexcjg=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/greptimedb/sdk/go/datasource/datasource.go b/greptimedb/sdk/go/datasource/datasource.go
index 0b61033f0..8a5a2b87f 100644
--- a/greptimedb/sdk/go/datasource/datasource.go
+++ b/greptimedb/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func GreptimeDB(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/greptimedb/sdk/go/query/log/options.go b/greptimedb/sdk/go/query/log/options.go
index 63fce7f16..a36ce0f6a 100644
--- a/greptimedb/sdk/go/query/log/options.go
+++ b/greptimedb/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = greptimedbDatasource.Selector(datasourceName)
+		sel, err := greptimedbDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/greptimedb/sdk/go/query/time-series/options.go b/greptimedb/sdk/go/query/time-series/options.go
index 947aec18c..f568b2daf 100644
--- a/greptimedb/sdk/go/query/time-series/options.go
+++ b/greptimedb/sdk/go/query/time-series/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = greptimedbDatasource.Selector(datasourceName)
+		sel, err := greptimedbDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/greptimedb/sdk/go/query/trace/options.go b/greptimedb/sdk/go/query/trace/options.go
index f7f53b4fa..c4a901334 100644
--- a/greptimedb/sdk/go/query/trace/options.go
+++ b/greptimedb/sdk/go/query/trace/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = greptimedbDatasource.Selector(datasourceName)
+		sel, err := greptimedbDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/jaeger/go.mod b/jaeger/go.mod
index 39b1b548c..878d5a5ae 100644
--- a/jaeger/go.mod
+++ b/jaeger/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/jaeger
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/jaeger/go.sum b/jaeger/go.sum
index ad0f63fad..0820626e3 100644
--- a/jaeger/go.sum
+++ b/jaeger/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/jaeger/sdk/go/datasource/datasource.go b/jaeger/sdk/go/datasource/datasource.go
index c020e0c99..869853d79 100644
--- a/jaeger/sdk/go/datasource/datasource.go
+++ b/jaeger/sdk/go/datasource/datasource.go
@@ -53,9 +53,6 @@ func Jaeger(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/jaeger/sdk/go/query/options.go b/jaeger/sdk/go/query/options.go
index 42af7954a..a26495a70 100644
--- a/jaeger/sdk/go/query/options.go
+++ b/jaeger/sdk/go/query/options.go
@@ -13,11 +13,17 @@
 
 package query
 
-import "github.com/perses/plugins/jaeger/sdk/go/datasource"
+import (
+	"github.com/perses/plugins/jaeger/sdk/go/datasource"
+)
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = datasource.Selector(datasourceName)
+		sel, err := datasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/json/go.mod b/json/go.mod
index e59f57f1f..9e6eae24c 100644
--- a/json/go.mod
+++ b/json/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/json
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/json/go.sum b/json/go.sum
index ad0f63fad..0820626e3 100644
--- a/json/go.sum
+++ b/json/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/json/sdk/go/datasource/datasource.go b/json/sdk/go/datasource/datasource.go
index 107b2cab9..70e77c001 100644
--- a/json/sdk/go/datasource/datasource.go
+++ b/json/sdk/go/datasource/datasource.go
@@ -55,9 +55,6 @@ func JsonDatasource(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/json/sdk/go/query/options.go b/json/sdk/go/query/options.go
index b258e3d0b..29db4c00b 100644
--- a/json/sdk/go/query/options.go
+++ b/json/sdk/go/query/options.go
@@ -19,7 +19,11 @@ import (
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = jsonDatasource.Selector(datasourceName)
+		sel, err := jsonDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/loki/go.mod b/loki/go.mod
index 186392576..a01aece32 100644
--- a/loki/go.mod
+++ b/loki/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/loki
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/loki/go.sum b/loki/go.sum
index ad0f63fad..0820626e3 100644
--- a/loki/go.sum
+++ b/loki/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/loki/sdk/go/datasource/datasource.go b/loki/sdk/go/datasource/datasource.go
index 2f46e49c0..4afcea880 100644
--- a/loki/sdk/go/datasource/datasource.go
+++ b/loki/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func Loki(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/loki/sdk/go/query/log/options.go b/loki/sdk/go/query/log/options.go
index 9b2e8777a..97ec7c76b 100644
--- a/loki/sdk/go/query/log/options.go
+++ b/loki/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = lokiDatasource.Selector(datasourceName)
+		sel, err := lokiDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/loki/sdk/go/query/time-series/options.go b/loki/sdk/go/query/time-series/options.go
index 3de1fc7e1..2a4f3aefc 100644
--- a/loki/sdk/go/query/time-series/options.go
+++ b/loki/sdk/go/query/time-series/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = lokiDatasource.Selector(datasourceName)
+		sel, err := lokiDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/opensearch/go.mod b/opensearch/go.mod
index 18b358140..93c964b19 100644
--- a/opensearch/go.mod
+++ b/opensearch/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/opensearch
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/opensearch/go.sum b/opensearch/go.sum
index ad0f63fad..0820626e3 100644
--- a/opensearch/go.sum
+++ b/opensearch/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/opensearch/sdk/go/datasource/datasource.go b/opensearch/sdk/go/datasource/datasource.go
index 6cc8b0f8d..80eb53517 100644
--- a/opensearch/sdk/go/datasource/datasource.go
+++ b/opensearch/sdk/go/datasource/datasource.go
@@ -101,9 +101,6 @@ func OpenSearch(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/opensearch/sdk/go/query/log/options.go b/opensearch/sdk/go/query/log/options.go
index e76c0da1c..520deeead 100644
--- a/opensearch/sdk/go/query/log/options.go
+++ b/opensearch/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = opensearchDatasource.Selector(datasourceName)
+		sel, err := opensearchDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/prometheus/go.mod b/prometheus/go.mod
index f084f7db9..87604dadb 100644
--- a/prometheus/go.mod
+++ b/prometheus/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/prometheus
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/prometheus/go.sum b/prometheus/go.sum
index ad0f63fad..0820626e3 100644
--- a/prometheus/go.sum
+++ b/prometheus/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/prometheus/sdk/go/datasource/datasource.go b/prometheus/sdk/go/datasource/datasource.go
index a514c228b..a358fd134 100644
--- a/prometheus/sdk/go/datasource/datasource.go
+++ b/prometheus/sdk/go/datasource/datasource.go
@@ -111,9 +111,6 @@ func Prometheus(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/prometheus/sdk/go/query/options.go b/prometheus/sdk/go/query/options.go
index 6b66b44ea..8d7354125 100644
--- a/prometheus/sdk/go/query/options.go
+++ b/prometheus/sdk/go/query/options.go
@@ -29,7 +29,11 @@ func Expr(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = promDatasource.Selector(datasourceName)
+		sel, err := promDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/prometheus/sdk/go/variable/label-names/options.go b/prometheus/sdk/go/variable/label-names/options.go
index 39938368c..482d7e134 100644
--- a/prometheus/sdk/go/variable/label-names/options.go
+++ b/prometheus/sdk/go/variable/label-names/options.go
@@ -20,7 +20,11 @@ import (
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = promDatasource.Selector(datasourceName)
+		sel, err := promDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/prometheus/sdk/go/variable/label-values/options.go b/prometheus/sdk/go/variable/label-values/options.go
index b55735bdd..00d895501 100644
--- a/prometheus/sdk/go/variable/label-values/options.go
+++ b/prometheus/sdk/go/variable/label-values/options.go
@@ -27,7 +27,11 @@ func LabelName(labelName string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = promDatasource.Selector(datasourceName)
+		sel, err := promDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/prometheus/sdk/go/variable/promql/options.go b/prometheus/sdk/go/variable/promql/options.go
index 7e831e3f2..c85ec71c5 100644
--- a/prometheus/sdk/go/variable/promql/options.go
+++ b/prometheus/sdk/go/variable/promql/options.go
@@ -33,7 +33,11 @@ func LabelName(labelName string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = promDatasource.Selector(datasourceName)
+		sel, err := promDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/pyroscope/go.mod b/pyroscope/go.mod
index 4ee1e06ba..255165459 100644
--- a/pyroscope/go.mod
+++ b/pyroscope/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/pyroscope
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/pyroscope/go.sum b/pyroscope/go.sum
index ad0f63fad..0820626e3 100644
--- a/pyroscope/go.sum
+++ b/pyroscope/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/pyroscope/sdk/go/datasource/datasource.go b/pyroscope/sdk/go/datasource/datasource.go
index dc43b8e7a..51925bfcc 100644
--- a/pyroscope/sdk/go/datasource/datasource.go
+++ b/pyroscope/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func Pyroscope(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/pyroscope/sdk/go/query/options.go b/pyroscope/sdk/go/query/options.go
index 288ab20a6..9eae4e407 100644
--- a/pyroscope/sdk/go/query/options.go
+++ b/pyroscope/sdk/go/query/options.go
@@ -13,11 +13,17 @@
 
 package query
 
-import "github.com/perses/plugins/pyroscope/sdk/go/datasource"
+import (
+	"github.com/perses/plugins/pyroscope/sdk/go/datasource"
+)
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = datasource.Selector(datasourceName)
+		sel, err := datasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/splunk/go.mod b/splunk/go.mod
index a9f4bbc72..6be472a33 100644
--- a/splunk/go.mod
+++ b/splunk/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/splunk
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/splunk/go.sum b/splunk/go.sum
index ad0f63fad..0820626e3 100644
--- a/splunk/go.sum
+++ b/splunk/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/splunk/sdk/go/datasource/datasource.go b/splunk/sdk/go/datasource/datasource.go
index d48044650..d892abb4a 100644
--- a/splunk/sdk/go/datasource/datasource.go
+++ b/splunk/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func Splunk(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/splunk/sdk/go/query/log/options.go b/splunk/sdk/go/query/log/options.go
index 3f4c67614..0d5c4f65b 100644
--- a/splunk/sdk/go/query/log/options.go
+++ b/splunk/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(spl string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = splunkDatasource.Selector(datasourceName)
+		sel, err := splunkDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/splunk/sdk/go/query/time-series/options.go b/splunk/sdk/go/query/time-series/options.go
index f86e68690..897f5cb66 100644
--- a/splunk/sdk/go/query/time-series/options.go
+++ b/splunk/sdk/go/query/time-series/options.go
@@ -26,7 +26,11 @@ func Query(spl string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = splunkDatasource.Selector(datasourceName)
+		sel, err := splunkDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/tempo/go.mod b/tempo/go.mod
index 9052e0c7d..93f0a46f2 100644
--- a/tempo/go.mod
+++ b/tempo/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/tempo
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/tempo/go.sum b/tempo/go.sum
index ad0f63fad..0820626e3 100644
--- a/tempo/go.sum
+++ b/tempo/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/tempo/sdk/go/datasource/datasource.go b/tempo/sdk/go/datasource/datasource.go
index f7ed4b7ca..d8f3bb0f5 100644
--- a/tempo/sdk/go/datasource/datasource.go
+++ b/tempo/sdk/go/datasource/datasource.go
@@ -55,9 +55,6 @@ func Tempo(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/tempo/sdk/go/query/options.go b/tempo/sdk/go/query/options.go
index 20e1ee09b..8ce707427 100644
--- a/tempo/sdk/go/query/options.go
+++ b/tempo/sdk/go/query/options.go
@@ -13,7 +13,9 @@
 
 package query
 
-import "github.com/perses/plugins/tempo/sdk/go/datasource"
+import (
+	"github.com/perses/plugins/tempo/sdk/go/datasource"
+)
 
 func Expr(expr string) Option {
 	return func(builder *Builder) error {
@@ -24,7 +26,11 @@ func Expr(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = datasource.Selector(datasourceName)
+		sel, err := datasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/victorialogs/go.mod b/victorialogs/go.mod
index 52b5cb8a0..c64c2c018 100644
--- a/victorialogs/go.mod
+++ b/victorialogs/go.mod
@@ -3,7 +3,7 @@ module github.com/perses/plugins/victorialogs
 go 1.27.1
 
 require (
-	github.com/perses/perses v0.55.0-beta.3
+	github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10
 	github.com/perses/spec v0.3.0-beta.10
 )
 
@@ -20,9 +20,9 @@ require (
 	github.com/perses/common v0.31.2 // indirect
 	github.com/prometheus/client_golang v1.24.1 // indirect
 	github.com/prometheus/client_model v0.6.3 // indirect
-	github.com/prometheus/common v0.71.0 // indirect
+	github.com/prometheus/common v0.72.0 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
-	github.com/zitadel/oidc/v3 v3.51.3 // indirect
+	github.com/zitadel/oidc/v3 v3.51.10 // indirect
 	github.com/zitadel/schema v1.3.2 // indirect
 	go.yaml.in/yaml/v2 v2.4.4 // indirect
 	golang.org/x/net v0.59.0 // indirect
diff --git a/victorialogs/go.sum b/victorialogs/go.sum
index ad0f63fad..0820626e3 100644
--- a/victorialogs/go.sum
+++ b/victorialogs/go.sum
@@ -24,6 +24,10 @@ github.com/perses/common v0.31.2 h1:klsl0KfWn6wVVG4rDJvsTvFO8Owf5ed4nj2VjbQST60=
 github.com/perses/common v0.31.2/go.mod h1:KgLB0ojBFzg93UwTNK8uAE1yuGexBiwqHiAvTFcHRDI=
 github.com/perses/perses v0.55.0-beta.3 h1:LMTE3/SnPGDpKMc58MVUufxTH9tehvCFJtx3E5d9F74=
 github.com/perses/perses v0.55.0-beta.3/go.mod h1:0UJkSSi6uH2DssOjY8BHnn3kjvnbj3ukAblF1R8K0Lw=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f h1:8YnYP8oVgRbag9FcDcTIMOEAXdOqeEnMvO+rbPCL554=
+github.com/perses/perses v0.55.0-beta.3.0.20261006163335-153b920a7f0f/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10 h1:a/+D1uuqPQt4o8aG+G9JFZFjtYiKwbb1OJ6KdyYkH1c=
+github.com/perses/perses v0.55.0-beta.3.0.20261007092956-ddff411f6a10/go.mod h1:TTJ+l4AB/5h4htfy/aEDzICv1mYgSfmavpHKCT31lmw=
 github.com/perses/spec v0.3.0-beta.10 h1:DWqHHP3TIq0ekDZpdK6lqV394K6tWC5ZdYq1nO25spw=
 github.com/perses/spec v0.3.0-beta.10/go.mod h1:p08A4KJtH/7yP/nWdf7As/l0RE74kTYLKIP/8mvqC9E=
 github.com/prometheus/client_golang v1.24.1 h1:JnJkREXzWxUdCuPFpIWZiPispT9xVV59uiuyR2bPlnU=
@@ -32,12 +36,16 @@ github.com/prometheus/client_model v0.6.3 h1:O0jaTVAYNxTHYInEPFJt5I3+sN8zqBtVMPT
 github.com/prometheus/client_model v0.6.3/go.mod h1:gpN5P9S7Rr6Yr92PiQ+Ixvhf6JZEkF1dnxsYL2aPBEM=
 github.com/prometheus/common v0.71.0 h1:9KDAKb7Mj3HEVKyFCK6Dc/HIwlBzZIN2l7/lrHl3KK8=
 github.com/prometheus/common v0.71.0/go.mod h1:CLJ5H8TEsGX8bl31BdMkfhIZ+QmZ9tBPPotUxUbfcmk=
+github.com/prometheus/common v0.72.0 h1:tAYsE+sPJxIncDAobm4H5aQjmox9ZxEIIqPbiffa8G4=
+github.com/prometheus/common v0.72.0/go.mod h1:77NWqAQ2tXT7BIK40qjJdw5Acrsrg1TlHAnsQi3i6mk=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
 github.com/zitadel/oidc/v3 v3.51.3 h1:jkEQ2k60amW6vwvzMwrGO7mw7vGxNp6BSsEH0AH6Gas=
 github.com/zitadel/oidc/v3 v3.51.3/go.mod h1:KQmYte+zOePAeVwR3LM153dxWBC9orWZAIa4w9r1ZhU=
+github.com/zitadel/oidc/v3 v3.51.10 h1:T25zVbBFJwhMIv9eH6aWJW54rUUrdE1iQl8Z9ByTw6U=
+github.com/zitadel/oidc/v3 v3.51.10/go.mod h1:yqb3jGISsGVoZ9rU3AjG3CwtJ2WewSptbisqQuA8Shc=
 github.com/zitadel/schema v1.3.2 h1:gfJvt7dOMfTmxzhscZ9KkapKo3Nei3B6cAxjav+lyjI=
 github.com/zitadel/schema v1.3.2/go.mod h1:IZmdfF9Wu62Zu6tJJTH3UsArevs3Y4smfJIj3L8fzxw=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
diff --git a/victorialogs/sdk/go/datasource/datasource.go b/victorialogs/sdk/go/datasource/datasource.go
index 5bf6066dd..4590b602d 100644
--- a/victorialogs/sdk/go/datasource/datasource.go
+++ b/victorialogs/sdk/go/datasource/datasource.go
@@ -57,9 +57,6 @@ func VictoriaLogs(options ...Option) datasource.Option {
 	}
 }
 
-func Selector(datasourceName string) *datasource.Selector {
-	return &datasource.Selector{
-		Kind: PluginKind,
-		Name: datasourceName,
-	}
+func Selector(name string) (*datasource.Selector, error) {
+	return datasource.NewSelector(PluginKind, name)
 }
diff --git a/victorialogs/sdk/go/query/log/options.go b/victorialogs/sdk/go/query/log/options.go
index 6282e98c6..04e855e1e 100644
--- a/victorialogs/sdk/go/query/log/options.go
+++ b/victorialogs/sdk/go/query/log/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = victorialogsDatasource.Selector(datasourceName)
+		sel, err := victorialogsDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/victorialogs/sdk/go/query/time-series/options.go b/victorialogs/sdk/go/query/time-series/options.go
index 807e272f7..7dc06bf2c 100644
--- a/victorialogs/sdk/go/query/time-series/options.go
+++ b/victorialogs/sdk/go/query/time-series/options.go
@@ -26,7 +26,11 @@ func Query(expr string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = victorialogsDatasource.Selector(datasourceName)
+		sel, err := victorialogsDatasource.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/victorialogs/sdk/go/variable/field-names/options.go b/victorialogs/sdk/go/variable/field-names/options.go
index 44b738209..8b24a63d7 100644
--- a/victorialogs/sdk/go/variable/field-names/options.go
+++ b/victorialogs/sdk/go/variable/field-names/options.go
@@ -19,7 +19,11 @@ import (
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = ds.Selector(datasourceName)
+		sel, err := ds.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }
diff --git a/victorialogs/sdk/go/variable/field-values/options.go b/victorialogs/sdk/go/variable/field-values/options.go
index 7ba13f7d4..e33740118 100644
--- a/victorialogs/sdk/go/variable/field-values/options.go
+++ b/victorialogs/sdk/go/variable/field-values/options.go
@@ -26,7 +26,11 @@ func Field(field string) Option {
 
 func Datasource(datasourceName string) Option {
 	return func(builder *Builder) error {
-		builder.Datasource = ds.Selector(datasourceName)
+		sel, err := ds.Selector(datasourceName)
+		if err != nil {
+			return err
+		}
+		builder.Datasource = sel
 		return nil
 	}
 }