App metrics attribute selectors

docs/sources/network/quickstart.md

@@ -220,14 +220,15 @@ Beyla only includes a subset of the available attributes to avoid leading to
 a [cardinality explosion](/blog/2022/02/15/what-are-cardinality-spikes-and-why-do-they-matter/) in
 the metrics storage, especially if some attributes like `src.address` or `dst.address` capture the IP addresses of the external traffic.
 
-The `attributes.allow` YAML subsection makes it possible to select the attributes to report:
+The `attributes.select.<metric-name>.include` YAML subsection makes it possible to select the attributes to report:
 
 ```yaml
 network:
   enable: true
 attributes:
   allow:
     beyla.network.flow.bytes:
+      include:
       - k8s.src.owner.name
       - k8s.src.namespace
       - k8s.dst.owner.name

pkg/beyla/config.go

@@ -11,8 +11,8 @@ import (
 	"gopkg.in/yaml.v3"
 
 	ebpfcommon "github.com/grafana/beyla/pkg/internal/ebpf/common"
-	"github.com/grafana/beyla/pkg/internal/export/attr"
 	"github.com/grafana/beyla/pkg/internal/export/debug"
+	"github.com/grafana/beyla/pkg/internal/export/metric"
 	"github.com/grafana/beyla/pkg/internal/export/otel"
 	"github.com/grafana/beyla/pkg/internal/export/prom"
 	"github.com/grafana/beyla/pkg/internal/imetrics"
@@ -164,9 +164,9 @@ func (t TracesReceiverConfig) Enabled() bool {
 // Attributes configures the decoration of some extra attributes that will be
 // added to each span
 type Attributes struct {
-	Kubernetes transform.KubernetesDecorator    `yaml:"kubernetes"`
-	InstanceID traces.InstanceIDConfig          `yaml:"instance_id"`
-	Allow      attr.AllowedAttributesDefinition `yaml:"allow"`
+	Kubernetes transform.KubernetesDecorator `yaml:"kubernetes"`
+	InstanceID traces.InstanceIDConfig       `yaml:"instance_id"`
+	Select     metric.Selection              `yaml:"select"`
 }
 
 type ConfigError string

pkg/beyla/config_test.go

@@ -12,10 +12,10 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ebpfcommon "github.com/grafana/beyla/pkg/internal/ebpf/common"
+	"github.com/grafana/beyla/pkg/internal/export/metric"
 	"github.com/grafana/beyla/pkg/internal/export/otel"
 	"github.com/grafana/beyla/pkg/internal/export/prom"
 	"github.com/grafana/beyla/pkg/internal/imetrics"
-	"github.com/grafana/beyla/pkg/internal/metricname"
 	"github.com/grafana/beyla/pkg/internal/netolly/transform/cidr"
 	"github.com/grafana/beyla/pkg/internal/traces"
 	"github.com/grafana/beyla/pkg/transform"
@@ -43,8 +43,10 @@ attributes:
     informers_sync_timeout: 30s
   instance_id:
     dns: true
-  allow:
-    global: ["foo", "bar"]
+  select:
+    beyla.network.flow:
+      include: ["foo", "bar"]
+      exclude: ["baz", "bae"]
 network:
   enable: true
   cidrs:
@@ -150,8 +152,11 @@ network:
 				Enable:               transform.EnabledTrue,
 				InformersSyncTimeout: 30 * time.Second,
 			},
-			Allow: map[metricname.Normal][]string{
-				"global": {"foo", "bar"},
+			Select: metric.Selection{
+				metric.BeylaNetworkFlow.Section: metric.InclusionLists{
+					Include: []string{"foo", "bar"},
+					Exclude: []string{"baz", "bae"},
+				},
 			},
 		},
 		Routes: &transform.RoutesConfig{},

pkg/components/beyla.go

@@ -9,8 +9,10 @@ import (
 	"github.com/grafana/beyla/pkg/beyla"
 	"github.com/grafana/beyla/pkg/internal/appolly"
 	"github.com/grafana/beyla/pkg/internal/connector"
+	"github.com/grafana/beyla/pkg/internal/export/metric"
 	"github.com/grafana/beyla/pkg/internal/imetrics"
 	"github.com/grafana/beyla/pkg/internal/netolly/agent"
+	"github.com/grafana/beyla/pkg/internal/netolly/flow"
 	"github.com/grafana/beyla/pkg/internal/pipe/global"
 )
 
@@ -95,5 +97,31 @@ func buildCommonContextInfo(
 		slog.Debug("not reporting internal metrics")
 		ctxInfo.Metrics = imetrics.NoopReporter{}
 	}
+
+	attributeGroups(config, ctxInfo)
+
 	return ctxInfo
 }
+
+// attributeGroups specifies, based in the provided configuration, which groups of attributes
+// need to be enabled by default for the diverse metrics
+func attributeGroups(config *beyla.Config, ctxInfo *global.ContextInfo) {
+	if ctxInfo.K8sEnabled {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupKubernetes)
+	}
+	if config.Routes != nil {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupHTTPRoutes)
+	}
+	if config.Metrics.ReportPeerInfo || config.Prometheus.ReportPeerInfo {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupPeerInfo)
+	}
+	if config.Metrics.ReportTarget || config.Prometheus.ReportTarget {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupTarget)
+	}
+	if config.NetworkFlows.Deduper == flow.DeduperNone {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupNetIfaceDirection)
+	}
+	if config.NetworkFlows.CIDRs.Enabled() {
+		ctxInfo.MetricAttributeGroups.Add(metric.GroupNetCIDR)
+	}
+}