Add metric missing features and remove unneeded validations (#4094)

Author: marctc

CHANGELOG.md

@@ -53,6 +53,8 @@ Main (unreleased)
 
 - `pyroscope.java` now supports configuring the `log_level` and `quiet` flags on async-profiler. (@deltamualpha)
 
+- Add `application_host` and `network_inter_zone` features to `beyla.ebpf` component. (@marctc)
+
 ### Bugfixes
 
 - Fix issues with propagating cluster peers change notifications to components configured with remotecfg. (@dehaansa)

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

@@ -417,7 +417,9 @@ The `metrics` block configures which metrics Beyla collects.
 * `application_process` exports metrics about the processes that run the instrumented application.
 * `application_service_graph` exports application-level service graph metrics.
 * `application_span` exports application-level metrics in traces span metrics format.
+* `application_host` exports application-level host metrics for host-based pricing.
 * `network` exports network-level metrics.
+* `network_inter_zone` exports network-level inter-zone metrics.
 
 `instrumentations` is a list of instrumentations to enable for the metrics. The following instrumentations are available:
 

internal/component/beyla/ebpf/beyla_linux.go

@@ -329,7 +329,7 @@ func (args Metrics) hasNetworkFeature() bool {
 func (args Metrics) hasAppFeature() bool {
 	for _, feature := range args.Features {
 		switch feature {
-		case "application", "application_span", "application_service_graph", "application_process":
+		case "application", "application_host", "application_span", "application_service_graph", "application_process":
 			return true
 		}
 	}
@@ -347,9 +347,9 @@ func (args Metrics) Validate() error {
 	}
 
 	validFeatures := map[string]struct{}{
-		"application": {}, "application_span": {},
+		"application": {}, "application_span": {}, "application_host": {},
 		"application_service_graph": {}, "application_process": {},
-		"network": {},
+		"network": {}, "network_inter_zone": {},
 	}
 	for _, feature := range args.Features {
 		if _, ok := validFeatures[feature]; !ok {
@@ -627,12 +627,8 @@ func (a *Arguments) Convert() (*beyla.Config, error) {
 }
 
 func (args *Arguments) Validate() error {
-	hasNetworkFeature := args.Metrics.hasNetworkFeature()
 	hasAppFeature := args.Metrics.hasAppFeature()
 
-	isTracingEnabled := args.TracePrinter != "" && args.TracePrinter != string(debug.TracePrinterDisabled)
-	hasOutputConfig := args.Output != nil && args.Output.Traces != nil
-
 	if args.TracePrinter == "" {
 		args.TracePrinter = string(debug.TracePrinterDisabled)
 	} else if !debug.TracePrinter(args.TracePrinter).Valid() {
@@ -664,11 +660,6 @@ func (args *Arguments) Validate() error {
 			return fmt.Errorf("invalid exclude_services configuration: %s", err.Error())
 		}
 	}
-
-	if !hasNetworkFeature && !hasAppFeature && !isTracingEnabled && !hasOutputConfig {
-		return fmt.Errorf("either metrics.features must include at least one of: [network, application, application_span, application_service_graph, application_process], or tracing must be enabled via trace_printer or output section")
-	}
-
 	return nil
 }
 

internal/component/beyla/ebpf/beyla_linux_test.go

@@ -618,9 +618,15 @@ func TestMetrics_Validate(t *testing.T) {
 			wantErr: `metrics.instrumentations: invalid value "invalid"`,
 		},
 		{
-			name: "valid features",
+			name: "valid application features",
 			args: Metrics{
-				Features: []string{"application", "network"},
+				Features: []string{"application", "application_span", "application_service_graph", "application_process", "application_host"},
+			},
+		},
+		{
+			name: "valid network features",
+			args: Metrics{
+				Features: []string{"network", "network_inter_zone"},
 			},
 		},
 		{
@@ -652,9 +658,8 @@ func TestArguments_Validate(t *testing.T) {
 		wantErr string
 	}{
 		{
-			name:    "empty arguments",
-			args:    Arguments{},
-			wantErr: "either metrics.features must include at least one of: [network, application, application_span, application_service_graph, application_process], or tracing must be enabled",
+			name: "empty arguments",
+			args: Arguments{},
 		},
 		{
 			name: "valid network-only configuration",
@@ -758,14 +763,6 @@ func TestArguments_Validate(t *testing.T) {
 				// No metrics features defined
 			},
 		},
-		{
-			name: "invalid configuration with disabled tracing and no metrics",
-			args: Arguments{
-				TracePrinter: "disabled",
-				// No metrics features and disabled tracing
-			},
-			wantErr: "either metrics.features must include at least one of: [network, application, application_span, application_service_graph, application_process], or tracing must be enabled",
-		},
 	}
 
 	for _, tt := range tests {