Rebase

CHANGELOG.md

@@ -62,6 +62,7 @@ Main (unreleased)
 
 - `mimir.rules.kubernetes` is now able to add extra labels to the Prometheus rules. (@psychomantys)
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 - Upgrade from OpenTelemetry v0.102.1 to v0.105.0.
   - [`otelcol.receiver.*`] A new `compression_algorithms` attribute to configure which 
@@ -125,7 +126,7 @@ Main (unreleased)
   - Full list of changes: https://github.com/grafana/beyla/releases/tag/v1.7.0
 
 - Enable instances connected to remotecfg-compatible servers to Register
-  themselves from the remote service. (@tpaschalis)
+  themselves to the remote service. (@tpaschalis)
 
 ### Bugfixes
 

internal/service/remotecfg/remotecfg.go

@@ -227,10 +227,8 @@ var _ service.Service = (*Service)(nil)
 func (s *Service) Run(ctx context.Context, host service.Host) error {
 	s.ctrl = host.NewController(ServiceName)
 
-	s.registerCollector()
-	defer s.unregisterCollector()
-
 	s.fetch()
+	s.registerCollector()
 
 	// Run the service's own controller.
 	go func() {
@@ -292,6 +290,7 @@ func (s *Service) Update(newConfig any) error {
 
 	// Update the args as the last step to avoid polluting any comparisons
 	s.args = newArgs
+	s.registerCollector()
 	s.mut.Unlock()
 
 	// If we've already called Run, then immediately trigger an API call with
@@ -313,14 +312,12 @@ func (s *Service) fetch() {
 }
 
 func (s *Service) registerCollector() error {
-	s.mut.RLock()
 	req := connect.NewRequest(&collectorv1.RegisterCollectorRequest{
 		Id:         s.args.ID,
 		Attributes: s.attrs,
 		Name:       s.args.Name,
 	})
 	client := s.asClient
-	s.mut.RUnlock()
 
 	_, err := client.RegisterCollector(context.Background(), req)
 	if err != nil {
@@ -329,21 +326,6 @@ func (s *Service) registerCollector() error {
 	return nil
 }
 
-func (s *Service) unregisterCollector() error {
-	s.mut.RLock()
-	req := connect.NewRequest(&collectorv1.UnregisterCollectorRequest{
-		Id: s.args.ID,
-	})
-	client := s.asClient
-	s.mut.RUnlock()
-
-	_, err := client.UnregisterCollector(context.Background(), req)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (s *Service) fetchRemote() error {
 	if !s.isEnabled() {
 		return nil

internal/service/remotecfg/remotecfg_test.go

@@ -44,9 +44,8 @@ func TestOnDiskCache(t *testing.T) {
 	client := &collectorClient{}
 	env.svc.asClient = client
 
-	var registerCalled, unregisterCalled atomic.Bool
+	var registerCalled atomic.Bool
 	client.registerCollectorFunc = buildRegisterCollectorFunc(&registerCalled)
-	client.unregisterCollectorFunc = buildUnregisterCollectorFunc(&unregisterCalled)
 
 	// Mock client to return an unparseable response.
 	client.getConfigFunc = buildGetConfigHandler("unparseable config")
@@ -83,11 +82,10 @@ func TestAPIResponse(t *testing.T) {
 	env.svc.asClient = client
 
 	// Mock client to return a valid response.
-	var registerCalled, unregisterCalled atomic.Bool
+	var registerCalled atomic.Bool
 	client.mut.Lock()
 	client.getConfigFunc = buildGetConfigHandler(cfg1)
 	client.registerCollectorFunc = buildRegisterCollectorFunc(&registerCalled)
-	client.unregisterCollectorFunc = buildUnregisterCollectorFunc(&unregisterCalled)
 	client.mut.Unlock()
 
 	// Run the service.
@@ -114,7 +112,6 @@ func TestAPIResponse(t *testing.T) {
 	}, 1*time.Second, 10*time.Millisecond)
 
 	cancel()
-	require.Eventually(t, func() bool { return unregisterCalled.Load() }, 1*time.Second, 10*time.Millisecond)
 }
 
 func buildGetConfigHandler(in string) func(context.Context, *connect.Request[collectorv1.GetConfigRequest]) (*connect.Response[collectorv1.GetConfigResponse], error) {
@@ -137,15 +134,6 @@ func buildRegisterCollectorFunc(called *atomic.Bool) func(ctx context.Context, r
 	}
 }
 
-func buildUnregisterCollectorFunc(called *atomic.Bool) func(ctx context.Context, req *connect.Request[collectorv1.UnregisterCollectorRequest]) (*connect.Response[collectorv1.UnregisterCollectorResponse], error) {
-	return func(ctx context.Context, req *connect.Request[collectorv1.UnregisterCollectorRequest]) (*connect.Response[collectorv1.UnregisterCollectorResponse], error) {
-		called.Store(true)
-		return &connect.Response[collectorv1.UnregisterCollectorResponse]{
-			Msg: &collectorv1.UnregisterCollectorResponse{},
-		}, nil
-	}
-}
-
 type testEnvironment struct {
 	t   *testing.T
 	svc *Service
@@ -216,10 +204,9 @@ func (f fakeHost) NewController(id string) service.Controller {
 }
 
 type collectorClient struct {
-	mut                     sync.RWMutex
-	getConfigFunc           func(context.Context, *connect.Request[collectorv1.GetConfigRequest]) (*connect.Response[collectorv1.GetConfigResponse], error)
-	registerCollectorFunc   func(ctx context.Context, req *connect.Request[collectorv1.RegisterCollectorRequest]) (*connect.Response[collectorv1.RegisterCollectorResponse], error)
-	unregisterCollectorFunc func(ctx context.Context, req *connect.Request[collectorv1.UnregisterCollectorRequest]) (*connect.Response[collectorv1.UnregisterCollectorResponse], error)
+	mut                   sync.RWMutex
+	getConfigFunc         func(context.Context, *connect.Request[collectorv1.GetConfigRequest]) (*connect.Response[collectorv1.GetConfigResponse], error)
+	registerCollectorFunc func(ctx context.Context, req *connect.Request[collectorv1.RegisterCollectorRequest]) (*connect.Response[collectorv1.RegisterCollectorResponse], error)
 }
 
 func (ag *collectorClient) GetConfig(ctx context.Context, req *connect.Request[collectorv1.GetConfigRequest]) (*connect.Response[collectorv1.GetConfigResponse], error) {
@@ -245,14 +232,7 @@ func (ag *collectorClient) RegisterCollector(ctx context.Context, req *connect.R
 }
 
 func (ag *collectorClient) UnregisterCollector(ctx context.Context, req *connect.Request[collectorv1.UnregisterCollectorRequest]) (*connect.Response[collectorv1.UnregisterCollectorResponse], error) {
-	ag.mut.RLock()
-	defer ag.mut.RUnlock()
-
-	if ag.unregisterCollectorFunc != nil {
-		return ag.unregisterCollectorFunc(ctx, req)
-	}
-
-	panic("unregisterCollectorFunc not set")
+	panic("unregisterCollector isn't wired yet")
 }
 
 type serviceController struct {