diff --git a/pkg/components/beyla.go b/pkg/components/beyla.go index 510736231..5f3649bd0 100644 --- a/pkg/components/beyla.go +++ b/pkg/components/beyla.go @@ -192,12 +192,6 @@ func attributeGroups(config *beyla.Config, ctxInfo *global.ContextInfo) { if config.Routes != nil { ctxInfo.MetricAttributeGroups.Add(attributes.GroupHTTPRoutes) } - if config.Metrics.ReportPeerInfo || config.Prometheus.ReportPeerInfo { - ctxInfo.MetricAttributeGroups.Add(attributes.GroupPeerInfo) - } - if config.Metrics.ReportTarget || config.Prometheus.ReportTarget { - ctxInfo.MetricAttributeGroups.Add(attributes.GroupTarget) - } if config.NetworkFlows.Deduper == flow.DeduperNone { ctxInfo.MetricAttributeGroups.Add(attributes.GroupNetIfaceDirection) } diff --git a/pkg/export/attributes/attr_defs.go b/pkg/export/attributes/attr_defs.go index 9e059499e..8af0be4ed 100644 --- a/pkg/export/attributes/attr_defs.go +++ b/pkg/export/attributes/attr_defs.go @@ -17,8 +17,6 @@ const ( GroupHTTPRoutes GroupNetIfaceDirection GroupNetCIDR - GroupPeerInfo // TODO Beyla 2.0: remove when we remove ReportPeerInfo configuration option - GroupTarget // TODO Beyla 2.0: remove when we remove ReportTarget configuration option GroupTraces ) @@ -36,7 +34,6 @@ func getDefinitions(groups AttrGroups) map[Section]AttrReportGroup { kubeEnabled := groups.Has(GroupKubernetes) promEnabled := groups.Has(GroupPrometheus) ifaceDirEnabled := groups.Has(GroupNetIfaceDirection) - peerInfoEnabled := groups.Has(GroupPeerInfo) cidrEnabled := groups.Has(GroupNetCIDR) // attributes to be reported exclusively for prometheus exporters @@ -121,7 +118,7 @@ func getDefinitions(groups AttrGroups) map[Section]AttrReportGroup { var serverInfo = AttrReportGroup{ Attributes: map[attr.Name]Default{ - attr.ClientAddr: Default(peerInfoEnabled), + attr.ClientAddr: false, attr.ServerAddr: true, attr.ServerPort: true, }, @@ -138,18 +135,8 @@ func getDefinitions(groups AttrGroups) map[Section]AttrReportGroup { }, } - // TODO Beyla 2.0 remove - // this just defaults the path as default when the target report is enabled - // via the deprecated BEYLA_METRICS_REPORT_TARGET config option - var deprecatedHTTPPath = AttrReportGroup{ - Disabled: !groups.Has(GroupTarget), - Attributes: map[attr.Name]Default{ - attr.HTTPUrlPath: true, - }, - } - var httpCommon = AttrReportGroup{ - SubGroups: []*AttrReportGroup{&httpRoutes, &deprecatedHTTPPath}, + SubGroups: []*AttrReportGroup{&httpRoutes}, Attributes: map[attr.Name]Default{ attr.HTTPRequestMethod: true, attr.HTTPResponseStatusCode: true, diff --git a/pkg/export/otel/metrics.go b/pkg/export/otel/metrics.go index 54d4ed1f8..c677721bc 100644 --- a/pkg/export/otel/metrics.go +++ b/pkg/export/otel/metrics.go @@ -78,14 +78,6 @@ type MetricsConfig struct { // InsecureSkipVerify is not standard, so we don't follow the same naming convention InsecureSkipVerify bool `yaml:"insecure_skip_verify" env:"BEYLA_OTEL_INSECURE_SKIP_VERIFY"` - // ReportTarget specifies whether http.target should be submitted as a metric attribute. It is disabled by - // default to avoid cardinality explosion in paths with IDs. In that case, it is recommended to group these - // requests in the Routes node - // Deprecated. Going to be removed in Beyla 2.0. Use attributes.select instead - ReportTarget bool `yaml:"report_target" env:"BEYLA_METRICS_REPORT_TARGET"` - // Deprecated. Going to be removed in Beyla 2.0. Use attributes.select instead - ReportPeerInfo bool `yaml:"report_peer" env:"BEYLA_METRICS_REPORT_PEER"` - Buckets Buckets `yaml:"buckets"` HistogramAggregation string `yaml:"histogram_aggregation" env:"OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION"` diff --git a/pkg/export/prom/prom.go b/pkg/export/prom/prom.go index 703703877..bd60927d7 100644 --- a/pkg/export/prom/prom.go +++ b/pkg/export/prom/prom.go @@ -97,11 +97,6 @@ type PrometheusConfig struct { Port int `yaml:"port" env:"BEYLA_PROMETHEUS_PORT"` Path string `yaml:"path" env:"BEYLA_PROMETHEUS_PATH"` - // Deprecated. Going to be removed in Beyla 2.0. Use attributes.select instead - ReportTarget bool `yaml:"report_target" env:"BEYLA_METRICS_REPORT_TARGET"` - // Deprecated. Going to be removed in Beyla 2.0. Use attributes.select instead - ReportPeerInfo bool `yaml:"report_peer" env:"BEYLA_METRICS_REPORT_PEER"` - DisableBuildInfo bool `yaml:"disable_build_info" env:"BEYLA_PROMETHEUS_DISABLE_BUILD_INFO"` // Features of metrics that are can be exported. Accepted values are "application" and "network". diff --git a/test/integration/configs/instrumenter-config-elixir.yml b/test/integration/configs/instrumenter-config-elixir.yml index c50973115..4cf04215a 100644 --- a/test/integration/configs/instrumenter-config-elixir.yml +++ b/test/integration/configs/instrumenter-config-elixir.yml @@ -3,4 +3,8 @@ routes: - /test/:test_id unmatched: path otel_metrics_export: - endpoint: http://otelcol:4318 \ No newline at end of file + endpoint: http://otelcol:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-go-otel-grpc.yml b/test/integration/configs/instrumenter-config-go-otel-grpc.yml index ab1fce6d6..02ed12e11 100644 --- a/test/integration/configs/instrumenter-config-go-otel-grpc.yml +++ b/test/integration/configs/instrumenter-config-go-otel-grpc.yml @@ -9,4 +9,7 @@ otel_traces_export: endpoint: http://jaeger:4318 attributes: kubernetes: - cluster_name: beyla \ No newline at end of file + cluster_name: beyla + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-go-otel.yml b/test/integration/configs/instrumenter-config-go-otel.yml index e1e169d95..c59e3b69e 100644 --- a/test/integration/configs/instrumenter-config-go-otel.yml +++ b/test/integration/configs/instrumenter-config-go-otel.yml @@ -6,4 +6,7 @@ otel_traces_export: endpoint: http://jaeger:4318 attributes: kubernetes: - cluster_name: beyla \ No newline at end of file + cluster_name: beyla + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-grpc-export.yml b/test/integration/configs/instrumenter-config-grpc-export.yml index 736b70299..7319acd96 100644 --- a/test/integration/configs/instrumenter-config-grpc-export.yml +++ b/test/integration/configs/instrumenter-config-grpc-export.yml @@ -11,3 +11,7 @@ otel_metrics_export: otel_traces_export: endpoint: http://jaeger:4317 protocol: grpc +attributes: + select: + "*": + include: ["*"] diff --git a/test/integration/configs/instrumenter-config-grpc-http2-mux.yml b/test/integration/configs/instrumenter-config-grpc-http2-mux.yml index 44cde5176..f3641279b 100644 --- a/test/integration/configs/instrumenter-config-grpc-http2-mux.yml +++ b/test/integration/configs/instrumenter-config-grpc-http2-mux.yml @@ -11,4 +11,8 @@ discovery: services: - namespace: grpc-http2-go name: server - exe_path: testserver \ No newline at end of file + exe_path: testserver +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-http2.yml b/test/integration/configs/instrumenter-config-http2.yml index 194f26994..800b5b302 100644 --- a/test/integration/configs/instrumenter-config-http2.yml +++ b/test/integration/configs/instrumenter-config-http2.yml @@ -14,4 +14,8 @@ discovery: exe_path: http2client - namespace: http2-go name: server - exe_path: http2srv \ No newline at end of file + exe_path: http2srv +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-java-host.yml b/test/integration/configs/instrumenter-config-java-host.yml index 0bcd4c4d5..723fbe783 100644 --- a/test/integration/configs/instrumenter-config-java-host.yml +++ b/test/integration/configs/instrumenter-config-java-host.yml @@ -4,3 +4,7 @@ routes: unmatched: path otel_metrics_export: endpoint: http://127.0.0.1:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-java.yml b/test/integration/configs/instrumenter-config-java.yml index a0484eb70..1b56cb5c2 100644 --- a/test/integration/configs/instrumenter-config-java.yml +++ b/test/integration/configs/instrumenter-config-java.yml @@ -10,3 +10,5 @@ attributes: include: ["*"] process_cpu_*: exclude: ["cpu_mode"] + "*": + include: ["*"] diff --git a/test/integration/configs/instrumenter-config-multiexec-host.yml b/test/integration/configs/instrumenter-config-multiexec-host.yml index 3878faa3f..cb81eb9dd 100644 --- a/test/integration/configs/instrumenter-config-multiexec-host.yml +++ b/test/integration/configs/instrumenter-config-multiexec-host.yml @@ -51,3 +51,5 @@ attributes: select: http_server_request_duration_seconds_count: exclude: ["server_address"] + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-multiexec.yml b/test/integration/configs/instrumenter-config-multiexec.yml index 302113dcd..54da7239b 100644 --- a/test/integration/configs/instrumenter-config-multiexec.yml +++ b/test/integration/configs/instrumenter-config-multiexec.yml @@ -51,3 +51,5 @@ attributes: select: http_server_request_duration_seconds_count: exclude: ["server_address"] + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-no-route.yml b/test/integration/configs/instrumenter-config-no-route.yml index 5946cc872..1b9775f2e 100644 --- a/test/integration/configs/instrumenter-config-no-route.yml +++ b/test/integration/configs/instrumenter-config-no-route.yml @@ -6,3 +6,7 @@ otel_metrics_export: endpoint: http://otelcol:4318 otel_traces_export: endpoint: http://jaeger:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-node.yml b/test/integration/configs/instrumenter-config-node.yml index 4f5243a33..3362384a5 100644 --- a/test/integration/configs/instrumenter-config-node.yml +++ b/test/integration/configs/instrumenter-config-node.yml @@ -5,4 +5,8 @@ routes: otel_metrics_export: endpoint: http://otelcol:4318 otel_traces_export: - endpoint: http://jaeger:4318 \ No newline at end of file + endpoint: http://jaeger:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-other-grpc.yml b/test/integration/configs/instrumenter-config-other-grpc.yml index f5e3ff8de..93018cfcc 100644 --- a/test/integration/configs/instrumenter-config-other-grpc.yml +++ b/test/integration/configs/instrumenter-config-other-grpc.yml @@ -17,3 +17,7 @@ otel_metrics_export: endpoint: http://otelcol:4318 otel_traces_export: endpoint: http://jaeger:4318 +attributes: + select: + "*": + include: ["*"] diff --git a/test/integration/configs/instrumenter-config-override-svcname.yml b/test/integration/configs/instrumenter-config-override-svcname.yml index bf24319e3..ba7df6167 100644 --- a/test/integration/configs/instrumenter-config-override-svcname.yml +++ b/test/integration/configs/instrumenter-config-override-svcname.yml @@ -6,4 +6,8 @@ routes: otel_metrics_export: endpoint: http://otelcol:4318 otel_traces_export: - endpoint: http://jaeger:4318 \ No newline at end of file + endpoint: http://jaeger:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-php.yml b/test/integration/configs/instrumenter-config-php.yml index e1d443179..589653910 100644 --- a/test/integration/configs/instrumenter-config-php.yml +++ b/test/integration/configs/instrumenter-config-php.yml @@ -1,4 +1,8 @@ otel_metrics_export: endpoint: http://127.0.0.1:4018 otel_traces_export: - endpoint: http://127.0.0.1:4318 \ No newline at end of file + endpoint: http://127.0.0.1:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-promscrape.yml b/test/integration/configs/instrumenter-config-promscrape.yml index e830eade4..15dfc1486 100644 --- a/test/integration/configs/instrumenter-config-promscrape.yml +++ b/test/integration/configs/instrumenter-config-promscrape.yml @@ -23,5 +23,7 @@ attributes: include: ["*"] process_network_io: include: ["*"] + "*": + include: ["*"] kubernetes: cluster_name: beyla \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config-ruby.yml b/test/integration/configs/instrumenter-config-ruby.yml index cd300f991..96c7009d6 100644 --- a/test/integration/configs/instrumenter-config-ruby.yml +++ b/test/integration/configs/instrumenter-config-ruby.yml @@ -3,4 +3,8 @@ routes: - /users/:user_id unmatched: path otel_metrics_export: - endpoint: http://otelcol:4318 \ No newline at end of file + endpoint: http://otelcol:4318 +attributes: + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/configs/instrumenter-config.yml b/test/integration/configs/instrumenter-config.yml index da3ea7466..216b62098 100644 --- a/test/integration/configs/instrumenter-config.yml +++ b/test/integration/configs/instrumenter-config.yml @@ -13,4 +13,7 @@ attributes: kubernetes: cluster_name: beyla resource_labels: - deployment.environment: ["deployment.environment"] \ No newline at end of file + deployment.environment: ["deployment.environment"] + select: + "*": + include: ["*"] \ No newline at end of file diff --git a/test/integration/docker-compose-1.16.yml b/test/integration/docker-compose-1.16.yml index f17cd8d51..3fa8c38a7 100644 --- a/test/integration/docker-compose-1.16.yml +++ b/test/integration/docker-compose-1.16.yml @@ -36,8 +36,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_HOSTNAME: "beyla" ports: diff --git a/test/integration/docker-compose-1.17.yml b/test/integration/docker-compose-1.17.yml index df71bf8b5..756cd3bab 100644 --- a/test/integration/docker-compose-1.17.yml +++ b/test/integration/docker-compose-1.17.yml @@ -41,8 +41,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_HOSTNAME: "beyla" ports: diff --git a/test/integration/docker-compose-client.yml b/test/integration/docker-compose-client.yml index fcbda4e06..b1b917bfb 100644 --- a/test/integration/docker-compose-client.yml +++ b/test/integration/docker-compose-client.yml @@ -35,8 +35,6 @@ services: BEYLA_LOG_LEVEL: "DEBUG" BEYLA_ENFORCE_SYS_CAPS: "false" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_PROCESSES_INTERVAL: "100ms" BEYLA_HOSTNAME: "beyla" diff --git a/test/integration/docker-compose-dotnet.yml b/test/integration/docker-compose-dotnet.yml index d03624097..3d76c2054 100644 --- a/test/integration/docker-compose-dotnet.yml +++ b/test/integration/docker-compose-dotnet.yml @@ -41,8 +41,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "100ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testserver: diff --git a/test/integration/docker-compose-elixir.yml b/test/integration/docker-compose-elixir.yml index e647d9767..8d8d90406 100644 --- a/test/integration/docker-compose-elixir.yml +++ b/test/integration/docker-compose-elixir.yml @@ -37,8 +37,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testserver: diff --git a/test/integration/docker-compose-go-otel-grpc.yml b/test/integration/docker-compose-go-otel-grpc.yml index b24af8cbe..6efe4287d 100644 --- a/test/integration/docker-compose-go-otel-grpc.yml +++ b/test/integration/docker-compose-go-otel-grpc.yml @@ -40,8 +40,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_PROCESSES_INTERVAL: "100ms" BEYLA_HOSTNAME: "beyla" BEYLA_EXCLUDE_OTEL_INSTRUMENTED_SERVICES: "${BEYLA_EXCLUDE_OTEL_INSTRUMENTED_SERVICES}" diff --git a/test/integration/docker-compose-go-otel.yml b/test/integration/docker-compose-go-otel.yml index 2457e1ba4..0887c181e 100644 --- a/test/integration/docker-compose-go-otel.yml +++ b/test/integration/docker-compose-go-otel.yml @@ -40,8 +40,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_PROCESSES_INTERVAL: "100ms" BEYLA_HOSTNAME: "beyla" diff --git a/test/integration/docker-compose-grpc-http2-mux.yml b/test/integration/docker-compose-grpc-http2-mux.yml index 82076f5c1..306d4ba59 100644 --- a/test/integration/docker-compose-grpc-http2-mux.yml +++ b/test/integration/docker-compose-grpc-http2-mux.yml @@ -46,8 +46,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testclient: diff --git a/test/integration/docker-compose-http2.yml b/test/integration/docker-compose-http2.yml index 76e479c78..0592191e6 100644 --- a/test/integration/docker-compose-http2.yml +++ b/test/integration/docker-compose-http2.yml @@ -46,8 +46,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testclient: diff --git a/test/integration/docker-compose-java-host.yml b/test/integration/docker-compose-java-host.yml index 01719c4df..af0f1be90 100644 --- a/test/integration/docker-compose-java-host.yml +++ b/test/integration/docker-compose-java-host.yml @@ -34,8 +34,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" ports: - "8999:8999" # Prometheus scrape port, if enabled via config diff --git a/test/integration/docker-compose-java-pid.yml b/test/integration/docker-compose-java-pid.yml index c386cf2c6..6ea7d84dd 100644 --- a/test/integration/docker-compose-java-pid.yml +++ b/test/integration/docker-compose-java-pid.yml @@ -34,8 +34,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_BPF_HIGH_REQUEST_VOLUME: "true" depends_on: diff --git a/test/integration/docker-compose-java-system-wide.yml b/test/integration/docker-compose-java-system-wide.yml index 4dab3e521..972073bf5 100644 --- a/test/integration/docker-compose-java-system-wide.yml +++ b/test/integration/docker-compose-java-system-wide.yml @@ -46,8 +46,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" #BEYLA_TRACES_REPORT_CACHE_LEN: 1 # bad setting, used for testing only #BEYLA_METRICS_REPORT_CACHE_LEN: 1 # bad setting, used for testing only diff --git a/test/integration/docker-compose-java.yml b/test/integration/docker-compose-java.yml index c469f119e..987451080 100644 --- a/test/integration/docker-compose-java.yml +++ b/test/integration/docker-compose-java.yml @@ -38,8 +38,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testserver: diff --git a/test/integration/docker-compose-multiexec-host.yml b/test/integration/docker-compose-multiexec-host.yml index aaaa14fdc..cf5505389 100644 --- a/test/integration/docker-compose-multiexec-host.yml +++ b/test/integration/docker-compose-multiexec-host.yml @@ -138,8 +138,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "INFO" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_INTERNAL_METRICS_PROMETHEUS_PATH: /metrics diff --git a/test/integration/docker-compose-multiexec.yml b/test/integration/docker-compose-multiexec.yml index b2d484199..9b6de3f9f 100644 --- a/test/integration/docker-compose-multiexec.yml +++ b/test/integration/docker-compose-multiexec.yml @@ -136,8 +136,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_INTERNAL_METRICS_PROMETHEUS_PATH: /metrics diff --git a/test/integration/docker-compose-nodeclient.yml b/test/integration/docker-compose-nodeclient.yml index 245a790b9..1179deccb 100644 --- a/test/integration/docker-compose-nodeclient.yml +++ b/test/integration/docker-compose-nodeclient.yml @@ -40,8 +40,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_HOSTNAME: "beyla" BEYLA_BPF_TRACK_REQUEST_HEADERS: "true" diff --git a/test/integration/docker-compose-nodejs.yml b/test/integration/docker-compose-nodejs.yml index 51dd3a86e..a7534bada 100644 --- a/test/integration/docker-compose-nodejs.yml +++ b/test/integration/docker-compose-nodejs.yml @@ -42,8 +42,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_BPF_TRACK_REQUEST_HEADERS: "true" depends_on: diff --git a/test/integration/docker-compose-other-grpc.yml b/test/integration/docker-compose-other-grpc.yml index 10e095dfe..a52c913d5 100644 --- a/test/integration/docker-compose-other-grpc.yml +++ b/test/integration/docker-compose-other-grpc.yml @@ -56,8 +56,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_HOSTNAME: "beyla" ports: diff --git a/test/integration/docker-compose-php-fpm-sock.yml b/test/integration/docker-compose-php-fpm-sock.yml index a5b5e5717..b28a16b67 100644 --- a/test/integration/docker-compose-php-fpm-sock.yml +++ b/test/integration/docker-compose-php-fpm-sock.yml @@ -67,8 +67,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: nginx: diff --git a/test/integration/docker-compose-php-fpm.yml b/test/integration/docker-compose-php-fpm.yml index 50206e0df..0aab59f22 100644 --- a/test/integration/docker-compose-php-fpm.yml +++ b/test/integration/docker-compose-php-fpm.yml @@ -59,8 +59,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: nginx: diff --git a/test/integration/docker-compose-python-sql.yml b/test/integration/docker-compose-python-sql.yml index 86168804c..a43b5c08c 100644 --- a/test/integration/docker-compose-python-sql.yml +++ b/test/integration/docker-compose-python-sql.yml @@ -49,8 +49,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_BPF_HTTP_REQUEST_TIMEOUT: "5s" BEYLA_PROCESSES_INTERVAL: "100ms" diff --git a/test/integration/docker-compose-python.yml b/test/integration/docker-compose-python.yml index 21110246d..36ce288fb 100644 --- a/test/integration/docker-compose-python.yml +++ b/test/integration/docker-compose-python.yml @@ -37,8 +37,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_BPF_HTTP_REQUEST_TIMEOUT: "5s" BEYLA_PROCESSES_INTERVAL: "100ms" diff --git a/test/integration/docker-compose-ruby.yml b/test/integration/docker-compose-ruby.yml index a3f7135fb..7e69d9cd8 100644 --- a/test/integration/docker-compose-ruby.yml +++ b/test/integration/docker-compose-ruby.yml @@ -38,8 +38,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" depends_on: testserver: diff --git a/test/integration/docker-compose-rust.yml b/test/integration/docker-compose-rust.yml index d1ef8ba22..09ca930a4 100644 --- a/test/integration/docker-compose-rust.yml +++ b/test/integration/docker-compose-rust.yml @@ -38,8 +38,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_HOSTNAME: "beyla" BEYLA_BPF_TRACK_REQUEST_HEADERS: "true" depends_on: diff --git a/test/integration/docker-compose.yml b/test/integration/docker-compose.yml index 201296f4f..cda9ce89d 100644 --- a/test/integration/docker-compose.yml +++ b/test/integration/docker-compose.yml @@ -46,8 +46,6 @@ services: BEYLA_BPF_BATCH_TIMEOUT: "10ms" BEYLA_LOG_LEVEL: "DEBUG" BEYLA_BPF_DEBUG: "TRUE" - BEYLA_METRICS_REPORT_TARGET: "true" - BEYLA_METRICS_REPORT_PEER: "true" BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT: 8999 BEYLA_PROCESSES_INTERVAL: "100ms" BEYLA_HOSTNAME: "beyla" diff --git a/test/integration/k8s/manifests/05-instrumented-service-otel.yml b/test/integration/k8s/manifests/05-instrumented-service-otel.yml index 52e2b346f..b2305b313 100644 --- a/test/integration/k8s/manifests/05-instrumented-service-otel.yml +++ b/test/integration/k8s/manifests/05-instrumented-service-otel.yml @@ -108,10 +108,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT value: "8999" - name: BEYLA_KUBE_METADATA_ENABLE diff --git a/test/integration/k8s/manifests/05-instrumented-service-prometheus.yml b/test/integration/k8s/manifests/05-instrumented-service-prometheus.yml index 4e5fb5251..d26db7237 100644 --- a/test/integration/k8s/manifests/05-instrumented-service-prometheus.yml +++ b/test/integration/k8s/manifests/05-instrumented-service-prometheus.yml @@ -120,10 +120,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_KUBE_METADATA_ENABLE value: "autodetect" - name: BEYLA_PROMETHEUS_FEATURES diff --git a/test/integration/k8s/manifests/06-beyla-daemonset-disable-informers.yml b/test/integration/k8s/manifests/06-beyla-daemonset-disable-informers.yml index 1ae66e07f..d1d978051 100644 --- a/test/integration/k8s/manifests/06-beyla-daemonset-disable-informers.yml +++ b/test/integration/k8s/manifests/06-beyla-daemonset-disable-informers.yml @@ -80,10 +80,6 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_OTEL_METRICS_TTL value: "30m0s" - name: BEYLA_OTEL_METRICS_FEATURES diff --git a/test/integration/k8s/manifests/06-beyla-daemonset-multi-node-l7.yml b/test/integration/k8s/manifests/06-beyla-daemonset-multi-node-l7.yml index 183de9a1d..c1e0a12b1 100644 --- a/test/integration/k8s/manifests/06-beyla-daemonset-multi-node-l7.yml +++ b/test/integration/k8s/manifests/06-beyla-daemonset-multi-node-l7.yml @@ -81,10 +81,6 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES value: "dns,k8s" - name: BEYLA_BPF_TC_L7_CP diff --git a/test/integration/k8s/manifests/06-beyla-daemonset-multi-node.yml b/test/integration/k8s/manifests/06-beyla-daemonset-multi-node.yml index ef9bc5738..fa5735e79 100644 --- a/test/integration/k8s/manifests/06-beyla-daemonset-multi-node.yml +++ b/test/integration/k8s/manifests/06-beyla-daemonset-multi-node.yml @@ -81,10 +81,6 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES value: "dns,k8s" - name: BEYLA_BPF_ENABLE_CONTEXT_PROPAGATION diff --git a/test/integration/k8s/manifests/06-beyla-daemonset-python.yml b/test/integration/k8s/manifests/06-beyla-daemonset-python.yml index cc17a6e3c..1c91ab7d1 100644 --- a/test/integration/k8s/manifests/06-beyla-daemonset-python.yml +++ b/test/integration/k8s/manifests/06-beyla-daemonset-python.yml @@ -70,9 +70,5 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES value: "dns,k8s" diff --git a/test/integration/k8s/manifests/06-beyla-daemonset.yml b/test/integration/k8s/manifests/06-beyla-daemonset.yml index d1adae82a..67817595a 100644 --- a/test/integration/k8s/manifests/06-beyla-daemonset.yml +++ b/test/integration/k8s/manifests/06-beyla-daemonset.yml @@ -84,10 +84,6 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_OTEL_METRICS_TTL value: "30m0s" - name: BEYLA_OTEL_METRICS_FEATURES diff --git a/test/integration/k8s/manifests/06-beyla-external-informer.yml b/test/integration/k8s/manifests/06-beyla-external-informer.yml index 183178cc4..e936abe31 100644 --- a/test/integration/k8s/manifests/06-beyla-external-informer.yml +++ b/test/integration/k8s/manifests/06-beyla-external-informer.yml @@ -91,10 +91,6 @@ spec: value: "10ms" - name: BEYLA_BPF_BATCH_TIMEOUT value: "10ms" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" ports: - containerPort: 8999 name: prometheus diff --git a/test/integration/k8s/manifests/06-instrumented-client-prom.template.yml b/test/integration/k8s/manifests/06-instrumented-client-prom.template.yml index 21891d556..880d11334 100644 --- a/test/integration/k8s/manifests/06-instrumented-client-prom.template.yml +++ b/test/integration/k8s/manifests/06-instrumented-client-prom.template.yml @@ -74,10 +74,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_KUBE_METADATA_ENABLE value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES diff --git a/test/integration/k8s/manifests/06-instrumented-client.template.yml b/test/integration/k8s/manifests/06-instrumented-client.template.yml index 1c3840451..45331e62b 100644 --- a/test/integration/k8s/manifests/06-instrumented-client.template.yml +++ b/test/integration/k8s/manifests/06-instrumented-client.template.yml @@ -74,10 +74,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_KUBE_METADATA_ENABLE value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES diff --git a/test/integration/k8s/manifests/06-instrumented-grpc-client-prom.template.yml b/test/integration/k8s/manifests/06-instrumented-grpc-client-prom.template.yml index 274c2186b..bb64d6f3a 100644 --- a/test/integration/k8s/manifests/06-instrumented-grpc-client-prom.template.yml +++ b/test/integration/k8s/manifests/06-instrumented-grpc-client-prom.template.yml @@ -75,10 +75,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_KUBE_METADATA_ENABLE value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES diff --git a/test/integration/k8s/manifests/06-instrumented-grpc-client.template.yml b/test/integration/k8s/manifests/06-instrumented-grpc-client.template.yml index 31e476d57..8ca7ae497 100644 --- a/test/integration/k8s/manifests/06-instrumented-grpc-client.template.yml +++ b/test/integration/k8s/manifests/06-instrumented-grpc-client.template.yml @@ -76,10 +76,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_KUBE_METADATA_ENABLE value: "true" - name: BEYLA_NAME_RESOLVER_SOURCES diff --git a/test/integration/k8s/manifests/07-instrumented-service-otel-kprobes.yml b/test/integration/k8s/manifests/07-instrumented-service-otel-kprobes.yml index 7a57907f1..97380b00f 100644 --- a/test/integration/k8s/manifests/07-instrumented-service-otel-kprobes.yml +++ b/test/integration/k8s/manifests/07-instrumented-service-otel-kprobes.yml @@ -120,10 +120,6 @@ spec: value: "DEBUG" - name: BEYLA_BPF_DEBUG value: "TRUE" - - name: BEYLA_METRICS_REPORT_TARGET - value: "true" - - name: BEYLA_METRICS_REPORT_PEER - value: "true" - name: BEYLA_INTERNAL_METRICS_PROMETHEUS_PORT value: "8999" - name: BEYLA_KUBE_METADATA_ENABLE