Add reported name field to Source, deprecate the odigos.io/reported-name annotation

api/config/crd/bases/odigos.io_sources.yaml

@@ -51,6 +51,12 @@ spec:
               disableInstrumentation:
                 description: DisableInstrumentation excludes this workload from auto-instrumentation.
                 type: boolean
+              reportedName:
+                description: |-
+                  ReportedName determines the "service.name" resource attribute which will be reported by the instrumentations of this source.
+                  If not set, the workload name will be used.
+                  It is not valid for namespace sources.
+                type: string
               workload:
                 description: |-
                   Workload represents the workload or namespace to be instrumented.

api/odigos/v1alpha1/source_types.go

@@ -53,6 +53,10 @@ type SourceSpec struct {
 	// DisableInstrumentation excludes this workload from auto-instrumentation.
 	// +kubebuilder:validation:Optional
 	DisableInstrumentation bool `json:"disableInstrumentation,omitempty"`
+	// ReportedName determines the "service.name" resource attribute which will be reported by the instrumentations of this source.
+	// If not set, the workload name will be used.
+	// It is not valid for namespace sources.
+	ReportedName string `json:"reportedName,omitempty"`
 }
 
 type SourceStatus struct {

common/consts/consts.go

@@ -5,19 +5,21 @@ import (
 )
 
 const (
-	CurrentNamespaceEnvVar       = "CURRENT_NS"
-	OdigosVersionEnvVarName      = "ODIGOS_VERSION"
-	OdigosTierEnvVarName         = "ODIGOS_TIER"
-	DefaultOdigosNamespace       = "odigos-system"
-	OdigosConfigurationName      = "odigos-config"
-	OdigosEffectiveConfigName    = "effective-config"
-	OdigosConfigurationFileName  = "config.yaml"
-	OTLPPort                     = 4317
-	OTLPHttpPort                 = 4318
-	PprofOdigosPort              = 6060
-	OdigosInstrumentationLabel   = "odigos-instrumentation"
-	InstrumentationEnabled       = "enabled"
-	InstrumentationDisabled      = "disabled"
+	CurrentNamespaceEnvVar      = "CURRENT_NS"
+	OdigosVersionEnvVarName     = "ODIGOS_VERSION"
+	OdigosTierEnvVarName        = "ODIGOS_TIER"
+	DefaultOdigosNamespace      = "odigos-system"
+	OdigosConfigurationName     = "odigos-config"
+	OdigosEffectiveConfigName   = "effective-config"
+	OdigosConfigurationFileName = "config.yaml"
+	OTLPPort                    = 4317
+	OTLPHttpPort                = 4318
+	PprofOdigosPort             = 6060
+	OdigosInstrumentationLabel  = "odigos-instrumentation"
+	InstrumentationEnabled      = "enabled"
+	InstrumentationDisabled     = "disabled"
+
+	// Deprecated: reported name is set via the Source CR.
 	OdigosReportedNameAnnotation = "odigos.io/reported-name"
 	RolloutTriggerAnnotation     = "rollout-trigger"
 

docs/api-reference/odigos.io.v1alpha1.mdx

@@ -2489,6 +2489,19 @@ This field is required upon creation and cannot be modified.</p>
    <p>DisableInstrumentation excludes this workload from auto-instrumentation.</p>
 </td>
 </tr>
+<tr>
+<td>
+<code>reportedName</code> <B>[Required]</B>
+</td>
+<td>
+<code>string</code>
+</td>
+<td>
+   <p>ReportedName determines the &quot;service.name&quot; resource attribute which will be reported by the instrumentations of this source.
+If not set, the workload name will be used.
+It is not valid for namespace sources.</p>
+</td>
+</tr>
 </tbody>
 </table>
 

helm/odigos/templates/crds/odigos.io_sources.yaml

@@ -51,6 +51,12 @@ spec:
               disableInstrumentation:
                 description: DisableInstrumentation excludes this workload from auto-instrumentation.
                 type: boolean
+              reportedName:
+                description: |-
+                  ReportedName determines the "service.name" resource attribute which will be reported by the instrumentations of this source.
+                  If not set, the workload name will be used.
+                  It is not valid for namespace sources.
+                type: string
               workload:
                 description: |-
                   Workload represents the workload or namespace to be instrumented.

instrumentor/controllers/instrumentationconfig/common.go

@@ -1,18 +1,14 @@
 package instrumentationconfig
 
 import (
-	"context"
-	"fmt"
-
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	"github.com/odigos-io/odigos/api/odigos/v1alpha1/instrumentationrules"
 	"github.com/odigos-io/odigos/common"
 	"github.com/odigos-io/odigos/instrumentor/controllers/utils"
 	"github.com/odigos-io/odigos/k8sutils/pkg/workload"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func updateInstrumentationConfigForWorkload(ic *odigosv1alpha1.InstrumentationConfig, rules *odigosv1alpha1.InstrumentationRuleList, serviceName string) error {
+func updateInstrumentationConfigForWorkload(ic *odigosv1alpha1.InstrumentationConfig, rules *odigosv1alpha1.InstrumentationRuleList) error {
 
 	workloadName, workloadKind, err := workload.ExtractWorkloadInfoFromRuntimeObjectName(ic.Name)
 	if err != nil {
@@ -24,8 +20,6 @@ func updateInstrumentationConfigForWorkload(ic *odigosv1alpha1.InstrumentationCo
 		Kind:      workloadKind,
 	}
 
-	ic.Spec.ServiceName = serviceName
-
 	sdkConfigs := make([]odigosv1alpha1.SdkConfig, 0, len(ic.Status.RuntimeDetailsByContainer))
 
 	// create an empty sdk config for each detected programming language
@@ -283,12 +277,3 @@ func boolPtr(b bool) *bool {
 	return &b
 }
 
-func resolveServiceName(ctx context.Context, k8sClient client.Client, workloadName string, namespace string, kind workload.WorkloadKind) (string, error) {
-	objectKey := client.ObjectKey{Name: workloadName, Namespace: namespace}
-	obj, err := workload.GetWorkloadObject(ctx, objectKey, kind, k8sClient)
-
-	if err != nil {
-		return "", fmt.Errorf("failed to get workload object to resolve reported service name annotation. will use fallback service name: %w", err)
-	}
-	return workload.ExtractServiceNameFromAnnotations(obj.GetAnnotations(), workloadName), nil
-}

instrumentor/controllers/instrumentationconfig/common_test.go

@@ -27,7 +27,7 @@ func TestUpdateInstrumentationConfigForWorkload_SingleLanguage(t *testing.T) {
 		},
 	}
 	rules := &odigosv1.InstrumentationRuleList{}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -60,7 +60,7 @@ func TestUpdateInstrumentationConfigForWorkload_MultipleLanguages(t *testing.T)
 		},
 	}
 	rules := &odigosv1.InstrumentationRuleList{}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -101,7 +101,7 @@ func TestUpdateInstrumentationConfigForWorkload_IgnoreUnknownLanguage(t *testing
 		},
 	}
 	rules := &odigosv1.InstrumentationRuleList{}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -126,7 +126,7 @@ func TestUpdateInstrumentationConfigForWorkload_NoLanguages(t *testing.T) {
 		},
 	}
 	rules := &odigosv1.InstrumentationRuleList{}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -156,7 +156,7 @@ func TestUpdateInstrumentationConfigForWorkload_SameLanguageMultipleContainers(t
 		},
 	}
 	rules := &odigosv1.InstrumentationRuleList{}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -199,7 +199,7 @@ func TestUpdateInstrumentationConfigForWorkload_SingleMatchingRule(t *testing.T)
 			},
 		},
 	}
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -259,7 +259,7 @@ func TestUpdateInstrumentationConfigForWorkload_InWorkloadList(t *testing.T) {
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -309,7 +309,7 @@ func TestUpdateInstrumentationConfigForWorkload_NotInWorkloadList(t *testing.T)
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -354,7 +354,7 @@ func TestUpdateInstrumentationConfigForWorkload_DisabledRule(t *testing.T) {
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -411,7 +411,7 @@ func TestUpdateInstrumentationConfigForWorkload_MultipleDefaultRules(t *testing.
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -496,7 +496,7 @@ func TestUpdateInstrumentationConfigForWorkload_RuleForLibrary(t *testing.T) {
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}
@@ -553,7 +553,7 @@ func TestUpdateInstrumentationConfigForWorkload_LibraryRuleOtherLanguage(t *test
 		},
 	}
 
-	err := updateInstrumentationConfigForWorkload(&ic, rules, "service-name")
+	err := updateInstrumentationConfigForWorkload(&ic, rules)
 	if err != nil {
 		t.Errorf("Expected nil error, got %v", err)
 	}

instrumentor/controllers/instrumentationconfig/instrumentationconfig_controller.go

@@ -21,7 +21,6 @@ import (
 
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	"github.com/odigos-io/odigos/k8sutils/pkg/utils"
-	"github.com/odigos-io/odigos/k8sutils/pkg/workload"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -42,24 +41,13 @@ func (r *InstrumentationConfigReconciler) Reconcile(ctx context.Context, req ctr
 		return ctrl.Result{}, client.IgnoreNotFound(err)
 	}
 
-	workloadName, workloadKind, err := workload.ExtractWorkloadInfoFromRuntimeObjectName(ic.Name)
-	if err != nil {
-		return ctrl.Result{}, err
-	}
-
-	serviceName, err := resolveServiceName(ctx, r.Client, workloadName, ic.Namespace, workloadKind)
-	if err != nil {
-		logger.Error(err, "Failed to resolve service name", "workload", workloadName, "kind", workloadKind)
-		return ctrl.Result{}, err
-	}
-
 	instrumentationRules := &odigosv1.InstrumentationRuleList{}
 	err = r.Client.List(ctx, instrumentationRules)
 	if client.IgnoreNotFound(err) != nil {
 		return ctrl.Result{}, err
 	}
 
-	err = updateInstrumentationConfigForWorkload(&ic, instrumentationRules, serviceName)
+	err = updateInstrumentationConfigForWorkload(&ic, instrumentationRules)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

instrumentor/controllers/instrumentationconfig/instrumentationrule_controller.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	"github.com/odigos-io/odigos/k8sutils/pkg/workload"
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -33,18 +32,7 @@ func (r *InstrumentationRuleReconciler) Reconcile(ctx context.Context, req ctrl.
 
 	for _, ic := range instrumentationConfigs.Items {
 		currIc := ic
-		workloadName, workloadKind, err := workload.ExtractWorkloadInfoFromRuntimeObjectName(ic.Name)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
-
-		serviceName, err := resolveServiceName(ctx, r.Client, workloadName, ic.Namespace, workloadKind)
-		if err != nil {
-			logger.Error(err, "error resolving service name", "workload", ic.Name)
-			continue
-		}
-
-		err = updateInstrumentationConfigForWorkload(&currIc, instrumentationRules, serviceName)
+		err = updateInstrumentationConfigForWorkload(&currIc, instrumentationRules)
 		if err != nil {
 			logger.Error(err, "error updating instrumentation config", "workload", ic.Name)
 			continue

instrumentor/controllers/instrumentationconfig/manager.go

@@ -3,7 +3,6 @@ package instrumentationconfig
 import (
 	odigosv1alpha1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	instrumentorpredicate "github.com/odigos-io/odigos/instrumentor/controllers/utils/predicates"
-	appsv1 "k8s.io/api/apps/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 )
@@ -35,39 +34,12 @@ func SetupWithManager(mgr ctrl.Manager) error {
 		return err
 	}
 
-	// Watch for Deployment changes using DeploymentReconciler
+	// Watch for Source changes to update InstrumentationConfig
 	if err := builder.
 		ControllerManagedBy(mgr).
-		Named("instrumentor-instrumentationconfig-deployment").
-		For(&appsv1.Deployment{}).
-		WithEventFilter(workloadReportedNameAnnotationChanged{}).
-		Complete(&DeploymentReconciler{
-			Client: mgr.GetClient(),
-			Scheme: mgr.GetScheme(),
-		}); err != nil {
-		return err
-	}
-
-	// Watch for StatefulSet changes using StatefulSetReconciler
-	if err := builder.
-		ControllerManagedBy(mgr).
-		Named("instrumentor-instrumentationconfig-statefulset").
-		For(&appsv1.StatefulSet{}).
-		WithEventFilter(workloadReportedNameAnnotationChanged{}).
-		Complete(&StatefulSetReconciler{
-			Client: mgr.GetClient(),
-			Scheme: mgr.GetScheme(),
-		}); err != nil {
-		return err
-	}
-
-	// Watch for DaemonSet changes using DaemonSetReconciler
-	if err := builder.
-		ControllerManagedBy(mgr).
-		Named("instrumentor-instrumentationconfig-daemonset").
-		For(&appsv1.DaemonSet{}).
-		WithEventFilter(workloadReportedNameAnnotationChanged{}).
-		Complete(&DaemonSetReconciler{
+		Named("instrumentor-instrumentationconfig-source").
+		For(&odigosv1alpha1.Source{}).
+		Complete(&SourceReconciler{
 			Client: mgr.GetClient(),
 			Scheme: mgr.GetScheme(),
 		}); err != nil {