Fix attribute name in Beyla configuration. (grafana#2966)

Author: rafaelroquetto

CHANGELOG.md

@@ -39,6 +39,10 @@ Main (unreleased)
   - `query_sample`: better handling of truncated queries (@cristiangreco)
   - `query_sample`: add option to use TiDB sql parser (@cristiangreco)
 
+### Breaking changes
+
+- Fixed the parsing of selections, application and network filter blocks for Beyla
+
 ### Other changes
 
 - Upgrading to Prometheus v2.55.1. (@ptodev)

docs/sources/reference/components/beyla/beyla.ebpf.md

@@ -155,10 +155,10 @@ The `instance_id` block configures instance ID settings.
 #### `select`
 
 The `select` block configures which attributes to include or exclude for specific metric/trace sections.
-Each selected attribute is defined as a labeled block with the attribute name as the label.
 
 | Name      | Type           | Description                                            | Default | Required |
 | --------- | -------------- | ------------------------------------------------------ | ------- | -------- |
+| `attr`    | `string`       | The attribute name to select.                          | `[]`    | yes      |
 | `exclude` | `list(string)` | List of attributes to exclude.                         | `[]`    | no       |
 | `include` | `list(string)` | List of attributes to include. Use `*` to include all. | `[]`    | no       |
 
@@ -245,10 +245,11 @@ It contains the following blocks:
 
 #### `application`
 
-The `application` block configures filtering of application attributes. Each attribute filter is defined as a labeled block with the attribute name as the label.
+The `application` block configures filtering of application attributes.
 
-| Name        | Type     | Description                                          | Required |
-| ----------- | -------- | ---------------------------------------------------- | -------- |
+| Name        | Type     | Description                              | Required |
+| ----------- | -------- | -----------------------------------------| -------- |
+| `attr`      | `string` | The name of the attribute to match.      | yes      |
 | `match`     | `string` | String to match attribute values.        | no       |
 | `not_match` | `string` | String to exclude matching values.       | no       |
 
@@ -258,10 +259,11 @@ wildcards).
 
 #### `network` filters
 
-The `network` block configures filtering of network attributes. Each attribute filter is defined as a labeled block with the attribute name as the label.
+The `network` block configures filtering of network attributes.
 
-| Name        | Type     | Description                                          | Required |
-| ----------- | -------- | ---------------------------------------------------- | -------- |
+| Name        | Type     | Description                              | Required |
+| ----------- | -------- | ---------------------------------------- | -------- |
+| `attr`      | `string` | The name of the attribute to match.      | yes      |
 | `match`     | `string` | String to match attribute values.        | no       |
 | `not_match` | `string` | String to exclude matching values.       | no       |
 

internal/component/beyla/ebpf/args.go

@@ -57,7 +57,7 @@ type InstanceIDConfig struct {
 type Selections []Selection
 
 type Selection struct {
-	Section string   `alloy:",label"`
+	Section string   `alloy:"attr,attr"`
 	Include []string `alloy:"include,attr"`
 	Exclude []string `alloy:"exclude,attr"`
 }
@@ -132,7 +132,7 @@ type Filters struct {
 type AttributeFamilies []AttributeFamily
 
 type AttributeFamily struct {
-	Attr     string `alloy:",label"`
+	Attr     string `alloy:"attr,attr"`
 	Match    string `alloy:"match,attr,optional"`
 	NotMatch string `alloy:"not_match,attr,optional"`
 }

internal/component/beyla/ebpf/beyla_linux_test.go

@@ -39,7 +39,8 @@ func TestArguments_UnmarshalSyntax(t *testing.T) {
 				disable_informers = ["node"]
 				meta_restrict_local_node = true
 			}
-			select "sql_client_duration" {
+			select {
+				attr = "sql_client_duration"
 				include = ["*"]
 				exclude = ["db_statement"]
 			}
@@ -97,10 +98,12 @@ func TestArguments_UnmarshalSyntax(t *testing.T) {
 			heuristic_sql_detect = true
 		}
 		filters {
-			application "transport" {
+			application {
+				attr = "transport"
 				not_match = "UDP"
 			}
-			network "dst_port" {
+			network {
+				attr = "dst_port"
 				match = "53"
 			}
 		}