Cleanup K8s integration tests (#328)

* Cleanup K8s integration tests

* rename some beyla files

* restore naming in beyla_kube_cache tests

* fix prometheus scrape

* Fix tests

* Fix K8s informerscache tests

* Fix cluster name

Author: mariomac

.golangci.yml

@@ -19,7 +19,7 @@ formatters:
       # put imports beginning with prefix after 3rd-party packages;
       # it's a comma-separated list of prefixes
       local-prefixes:
-        - github.com/open-telemetry/opentelemetry-ebpf-instrumentation
+        - go.opentelemetry.io/obi
 
 linters:
   exclusions:

pkg/app/request/span_getters.go

@@ -74,7 +74,7 @@ func SpanOTELGetters(name attr.Name) (attributes.Getter[*Span, attribute.KeyValu
 	case attr.SpanName:
 		getter = func(s *Span) attribute.KeyValue { return SpanNameMetric(s.TraceName()) }
 	case attr.Source:
-		getter = func(_ *Span) attribute.KeyValue { return SourceMetric("beyla") }
+		getter = func(_ *Span) attribute.KeyValue { return SourceMetric(attr.VendorPrefix) }
 	case attr.StatusCode:
 		getter = func(s *Span) attribute.KeyValue { return StatusCodeMetric(SpanStatusCode(s)) }
 	case attr.DBOperation:

pkg/components/netolly/export/printer.go

@@ -9,9 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"go.opentelemetry.io/obi/pkg/export/otel"
-
 	"go.opentelemetry.io/obi/pkg/components/netolly/ebpf"
+	attr "go.opentelemetry.io/obi/pkg/export/attributes/names"
 	"go.opentelemetry.io/obi/pkg/pipe/msg"
 	"go.opentelemetry.io/obi/pkg/pipe/swarm"
 )
@@ -37,7 +36,7 @@ func printFlow(f *ebpf.Record) {
 	sb.WriteString("transport=")
 	sb.WriteString(strconv.Itoa(int(f.Id.TransportProtocol)))
 	sb.WriteByte(' ')
-	sb.WriteString(otel.VendorPrefix)
+	sb.WriteString(attr.VendorPrefix)
 	sb.WriteString(".ip=")
 	sb.WriteString(f.Attrs.OBIIP)
 	sb.WriteString(" iface=")

pkg/export/attributes/names/attrs.go

@@ -76,6 +76,11 @@ const (
 // obi.-prefixed attributes are a var instead of a constant to allow overriding the prefix
 // from components that vendor OBI as a library
 
+// VendorPrefix allows identifying some metrics (network, internal counters...)
+// as custom metrics, since at the moment they don't follow any semantic convention for them.
+// This value can be overridden when OBI is vendored as a library (e.g. from the OTEL collector)
+var VendorPrefix = "obi"
+
 var OBIIP = Name("obi.ip")
 
 const (

pkg/export/otel/common.go

@@ -56,11 +56,6 @@ const (
 	envResourceAttrs   = "OTEL_RESOURCE_ATTRIBUTES"
 )
 
-// VendorPrefix allows identifying some metrics (network, internal counters...)
-// as custom metrics, since at the moment they don't follow any semantic convention for them.
-// This value can be overridden when OBI is vendored as a library (e.g. from the OTEL collector)
-var VendorPrefix = "obi"
-
 func omitFieldsForYAML(input any, omitFields map[string]struct{}) map[string]any {
 	result := make(map[string]any)
 

pkg/export/otel/metrics.go

@@ -988,7 +988,7 @@ func (mr *MetricsReporter) tracesResourceAttributes(service *svc.Attrs) attribut
 		semconv.ServiceNamespace(service.UID.Namespace),
 		semconv.TelemetrySDKLanguageKey.String(service.SDKLanguage.String()),
 		semconv.TelemetrySDKNameKey.String("opentelemetry-ebpf-instrumentation"),
-		request.SourceMetric("beyla"),
+		request.SourceMetric(attr.VendorPrefix),
 		semconv.OSTypeKey.String("linux"),
 	}
 

pkg/export/otel/metrics_net.go

@@ -9,6 +9,8 @@ import (
 	"log/slog"
 	"time"
 
+	attr "go.opentelemetry.io/obi/pkg/export/attributes/names"
+
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/attribute"
 	sdkmetric "go.opentelemetry.io/otel/sdk/metric"
@@ -46,7 +48,7 @@ func nmlog() *slog.Logger {
 // for network metrics.
 func getFilteredNetworkResourceAttrs(hostID string, attrSelector attributes.Selection) []attribute.KeyValue {
 	baseAttrs := []attribute.KeyValue{
-		semconv.ServiceName(VendorPrefix + "-network-flows"),
+		semconv.ServiceName(attr.VendorPrefix + "-network-flows"),
 		semconv.ServiceInstanceID(uuid.New().String()),
 		semconv.TelemetrySDKLanguageKey.String(semconv.TelemetrySDKLanguageGo.Value.AsString()),
 		semconv.TelemetrySDKNameKey.String("opentelemetry-ebpf-instrumentation"),
@@ -57,7 +59,7 @@ func getFilteredNetworkResourceAttrs(hostID string, attrSelector attributes.Sele
 		semconv.HostID(hostID),
 	}
 
-	return GetFilteredAttributesByPrefix(baseAttrs, attrSelector, extraAttrs, []string{"network.", VendorPrefix + ".network"})
+	return GetFilteredAttributesByPrefix(baseAttrs, attrSelector, extraAttrs, []string{"network.", attr.VendorPrefix + ".network"})
 }
 
 func createFilteredNetworkResource(hostID string, attrSelector attributes.Selection) *resource.Resource {

pkg/export/prom/prom.go

@@ -984,7 +984,7 @@ func (r *metricsReporter) labelValuesSpans(span *request.Span) []string {
 		span.ServiceGraphKind(),
 		span.Service.UID.Instance, // app instance ID
 		span.Service.Job(),
-		"beyla",
+		attr.VendorPrefix,
 	}
 }
 
@@ -1022,8 +1022,8 @@ func (r *metricsReporter) labelValuesTargetInfo(service *svc.Attrs) []string {
 		service.UID.Instance, // app instance ID
 		service.Job(),
 		service.SDKLanguage.String(),
-		"beyla",
-		"beyla",
+		attr.VendorPrefix,
+		attr.VendorPrefix,
 		"linux",
 	}
 
@@ -1049,15 +1049,15 @@ func (r *metricsReporter) labelValuesServiceGraph(span *request.Span) []string {
 			span.Service.UID.Namespace,
 			request.SpanHost(span),
 			span.OtherNamespace,
-			"beyla",
+			attr.VendorPrefix,
 		}
 	}
 	return []string{
 		request.SpanPeer(span),
 		span.OtherNamespace,
 		request.SpanHost(span),
 		span.Service.UID.Namespace,
-		"beyla",
+		attr.VendorPrefix,
 	}
 }
 

test/integration/configs/obi-config-go-otel-grpc.yml

@@ -9,7 +9,7 @@ otel_traces_export:
   endpoint: http://jaeger:4318
 attributes:
   kubernetes:
-    cluster_name: beyla-k8s-test-cluster
+    cluster_name: obi-k8s-test-cluster
   select:
     "*":
       include: ["*"]

test/integration/configs/obi-config-go-otel.yml

@@ -6,7 +6,7 @@ otel_traces_export:
   endpoint: http://jaeger:4318
 attributes:
   kubernetes:
-    cluster_name: beyla-k8s-test-cluster
+    cluster_name: obi-k8s-test-cluster
   select:
     "*":
       include: ["*"]