prepare patch v1.8.1 on release branch (#3275)

* Alloy configuration of syslog rfc3164 default year behavior (#3271)

(cherry picked from commit 1631806)

* fix: Ensure the remoteCfg service doesn't immediately stop if not configured (#3232)

* Ensure the remoteCfg service doesn't immediately stop if not configured

* Add changelog

(cherry picked from commit 5c7c950)

* No longer register metrics in isEnabled but do it while holding a write (#3272)

(cherry picked from commit 34bfe71)

* Add changelog for kalle's fix

* fix: panic when using minimal url for `prometheus.postgres.exporter` (#3226)

* Handle minimal url

* Remove unused function

(cherry picked from commit 0858356)

---------

Co-authored-by: Karl Persson <[email protected]>

Author: dehaansa

Diff for: CHANGELOG.md

@@ -7,6 +7,19 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+v1.8.1
+-----------------
+
+### Bugfixes
+
+- `rfc3164_default_to_current_year` argument was not fully added to `loki.source.syslog` (@dehaansa)
+
+- Fix issue with `remoteCfg` service stopping immediately and logging noop error if not configured (@dehaansa)
+
+- Fix potential race condition in `remoteCfg` service metrics registration (@kalleep)
+
+- Fix panic in `prometheus.exporter.postgres` when using minimal url as data source name. (@kalleep)
+
 v1.8.0
 -----------------
 

Diff for: internal/component/loki/source/syslog/types.go

@@ -13,16 +13,17 @@ import (
 
 // ListenerConfig defines a syslog listener.
 type ListenerConfig struct {
-	ListenAddress        string              `alloy:"address,attr"`
-	ListenProtocol       string              `alloy:"protocol,attr,optional"`
-	IdleTimeout          time.Duration       `alloy:"idle_timeout,attr,optional"`
-	LabelStructuredData  bool                `alloy:"label_structured_data,attr,optional"`
-	Labels               map[string]string   `alloy:"labels,attr,optional"`
-	UseIncomingTimestamp bool                `alloy:"use_incoming_timestamp,attr,optional"`
-	UseRFC5424Message    bool                `alloy:"use_rfc5424_message,attr,optional"`
-	MaxMessageLength     int                 `alloy:"max_message_length,attr,optional"`
-	TLSConfig            config.TLSConfig    `alloy:"tls_config,block,optional"`
-	SyslogFormat         config.SysLogFormat `alloy:"syslog_format,attr,optional"`
+	ListenAddress               string              `alloy:"address,attr"`
+	ListenProtocol              string              `alloy:"protocol,attr,optional"`
+	IdleTimeout                 time.Duration       `alloy:"idle_timeout,attr,optional"`
+	LabelStructuredData         bool                `alloy:"label_structured_data,attr,optional"`
+	Labels                      map[string]string   `alloy:"labels,attr,optional"`
+	UseIncomingTimestamp        bool                `alloy:"use_incoming_timestamp,attr,optional"`
+	UseRFC5424Message           bool                `alloy:"use_rfc5424_message,attr,optional"`
+	RFC3164DefaultToCurrentYear bool                `alloy:"rfc3164_default_to_current_year,attr,optional"`
+	MaxMessageLength            int                 `alloy:"max_message_length,attr,optional"`
+	TLSConfig                   config.TLSConfig    `alloy:"tls_config,block,optional"`
+	SyslogFormat                config.SysLogFormat `alloy:"syslog_format,attr,optional"`
 }
 
 // DefaultListenerConfig provides the default arguments for a syslog listener.
@@ -65,16 +66,17 @@ func (sc ListenerConfig) Convert() (*scrapeconfig.SyslogTargetConfig, error) {
 	}
 
 	return &scrapeconfig.SyslogTargetConfig{
-		ListenAddress:        sc.ListenAddress,
-		ListenProtocol:       sc.ListenProtocol,
-		IdleTimeout:          sc.IdleTimeout,
-		LabelStructuredData:  sc.LabelStructuredData,
-		Labels:               lbls,
-		UseIncomingTimestamp: sc.UseIncomingTimestamp,
-		UseRFC5424Message:    sc.UseRFC5424Message,
-		MaxMessageLength:     sc.MaxMessageLength,
-		TLSConfig:            *sc.TLSConfig.Convert(),
-		SyslogFormat:         syslogFormat,
+		ListenAddress:               sc.ListenAddress,
+		ListenProtocol:              sc.ListenProtocol,
+		IdleTimeout:                 sc.IdleTimeout,
+		LabelStructuredData:         sc.LabelStructuredData,
+		Labels:                      lbls,
+		UseIncomingTimestamp:        sc.UseIncomingTimestamp,
+		UseRFC5424Message:           sc.UseRFC5424Message,
+		RFC3164DefaultToCurrentYear: sc.RFC3164DefaultToCurrentYear,
+		MaxMessageLength:            sc.MaxMessageLength,
+		TLSConfig:                   *sc.TLSConfig.Convert(),
+		SyslogFormat:                syslogFormat,
 	}, nil
 }
 

Diff for: internal/component/prometheus/exporter/postgres/postgres.go

@@ -2,15 +2,13 @@ package postgres
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/grafana/alloy/internal/component"
 	"github.com/grafana/alloy/internal/component/prometheus/exporter"
 	"github.com/grafana/alloy/internal/featuregate"
 	"github.com/grafana/alloy/internal/static/integrations"
 	"github.com/grafana/alloy/internal/static/integrations/postgres_exporter"
 	"github.com/grafana/alloy/syntax/alloytypes"
-	"github.com/lib/pq"
 	config_util "github.com/prometheus/common/config"
 )
 
@@ -30,37 +28,6 @@ func createExporter(opts component.Options, args component.Arguments, defaultIns
 	return integrations.NewIntegrationWithInstanceKey(opts.Logger, a.convert(opts.ID), defaultInstanceKey)
 }
 
-func parsePostgresURL(url string) (map[string]string, error) {
-	raw, err := pq.ParseURL(url)
-	if err != nil {
-		return nil, err
-	}
-
-	res := map[string]string{}
-
-	unescaper := strings.NewReplacer(`\'`, `'`, `\\`, `\`)
-
-	for _, keypair := range strings.Split(raw, " ") {
-		parts := strings.SplitN(keypair, "=", 2)
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("unexpected keypair %s from pq", keypair)
-		}
-
-		key := parts[0]
-		value := parts[1]
-
-		// Undo all the transformations ParseURL did: remove wrapping
-		// quotes and then unescape the escaped characters.
-		value = strings.TrimPrefix(value, "'")
-		value = strings.TrimSuffix(value, "'")
-		value = unescaper.Replace(value)
-
-		res[key] = value
-	}
-
-	return res, nil
-}
-
 // DefaultArguments holds the default arguments for the prometheus.exporter.postgres
 // component.
 var DefaultArguments = Arguments{

Diff for: internal/component/prometheus/exporter/postgres/postgres_test.go

@@ -115,19 +115,3 @@ func TestRiverConfigValidate(t *testing.T) {
 		})
 	}
 }
-
-func TestParsePostgresURL(t *testing.T) {
-	dsn := "postgresql://linus:42secret@localhost:5432/postgres?sslmode=disable"
-	expected := map[string]string{
-		"dbname":   "postgres",
-		"host":     "localhost",
-		"password": "42secret",
-		"port":     "5432",
-		"sslmode":  "disable",
-		"user":     "linus",
-	}
-
-	actual, err := parsePostgresURL(dsn)
-	require.NoError(t, err)
-	require.Equal(t, actual, expected)
-}

Diff for: internal/service/remotecfg/noop.go

@@ -10,17 +10,19 @@ import (
 
 type noopClient struct{}
 
+var errNoopClient = errors.New("noop client")
+
 // GetConfig returns the collector's configuration.
 func (c noopClient) GetConfig(context.Context, *connect.Request[collectorv1.GetConfigRequest]) (*connect.Response[collectorv1.GetConfigResponse], error) {
-	return nil, errors.New("noop client")
+	return nil, errNoopClient
 }
 
 // RegisterCollector checks in the current collector to the API on startup.
 func (c noopClient) RegisterCollector(context.Context, *connect.Request[collectorv1.RegisterCollectorRequest]) (*connect.Response[collectorv1.RegisterCollectorResponse], error) {
-	return nil, errors.New("noop client")
+	return nil, errNoopClient
 }
 
 // UnregisterCollector checks out the current collector to the API on shutdown.
 func (c noopClient) UnregisterCollector(context.Context, *connect.Request[collectorv1.UnregisterCollectorRequest]) (*connect.Response[collectorv1.UnregisterCollectorResponse], error) {
-	return nil, errors.New("noop client")
+	return nil, errNoopClient
 }

Diff for: internal/service/remotecfg/remotecfg.go

@@ -282,7 +282,7 @@ func (s *Service) Run(ctx context.Context, host service.Host) error {
 
 	s.fetch()
 	err := s.registerCollector()
-	if err != nil {
+	if err != nil && err != errNoopClient {
 		return err
 	}
 
@@ -302,7 +302,7 @@ func (s *Service) Run(ctx context.Context, host service.Host) error {
 		select {
 		case <-s.ticker.C:
 			err := s.fetchRemote()
-			if err != nil {
+			if err != nil && err != errNoopClient {
 				level.Error(s.opts.Logger).Log("msg", "failed to fetch remote configuration from the API", "err", err)
 			}
 		case <-s.updateTickerChan:
@@ -354,11 +354,16 @@ func (s *Service) Update(newConfig any) error {
 	// Update the args as the last step to avoid polluting any comparisons
 	s.args = newArgs
 	err = s.registerCollector()
-	s.mut.Unlock()
 	if err != nil {
+		s.mut.Unlock()
 		return err
 	}
 
+	if s.metrics == nil {
+		s.registerMetrics()
+	}
+	s.mut.Unlock()
+
 	// If we've already called Run, then immediately trigger an API call with
 	// the updated Arguments, and/or fall back to the updated cache location.
 	if s.ctrl != nil && s.ctrl.Ready() {
@@ -546,11 +551,7 @@ func (s *Service) setLastLoadedCfgHash(h string) {
 func (s *Service) isEnabled() bool {
 	s.mut.RLock()
 	defer s.mut.RUnlock()
-	enabled := s.args.URL != "" && s.asClient != nil
-	if enabled && s.metrics == nil {
-		s.registerMetrics()
-	}
-	return enabled
+	return s.args.URL != "" && s.asClient != nil
 }
 
 func (s *Service) setPollFrequency(t time.Duration) {

Diff for: internal/static/integrations/postgres_exporter/postgres_exporter.go

@@ -88,6 +88,10 @@ func (c *Config) InstanceKey(_ string) (string, error) {
 }
 
 func parsePostgresURL(url string) (map[string]string, error) {
+	if url == "postgresql://" || url == "postgres://" {
+		return map[string]string{}, nil
+	}
+
 	raw, err := pq.ParseURL(url)
 	if err != nil {
 		return nil, err
@@ -97,10 +101,10 @@ func parsePostgresURL(url string) (map[string]string, error) {
 
 	unescaper := strings.NewReplacer(`\'`, `'`, `\\`, `\`)
 
-	for _, keypair := range strings.Split(raw, " ") {
+	for keypair := range strings.SplitSeq(raw, " ") {
 		parts := strings.SplitN(keypair, "=", 2)
 		if len(parts) != 2 {
-			panic(fmt.Sprintf("unexpected keypair %s from pq", keypair))
+			return nil, fmt.Errorf("unexpected keypair %s from pq", keypair)
 		}
 
 		key := parts[0]

Diff for: internal/static/integrations/postgres_exporter/postgres_exporter_test.go

@@ -8,19 +8,29 @@ import (
 )
 
 func Test_ParsePostgresURL(t *testing.T) {
-	dsn := "postgresql://linus:42secret@localhost:5432/postgres?sslmode=disable"
-	expected := map[string]string{
-		"dbname":   "postgres",
-		"host":     "localhost",
-		"password": "42secret",
-		"port":     "5432",
-		"sslmode":  "disable",
-		"user":     "linus",
-	}
+	t.Run("with valid url", func(t *testing.T) {
+		dsn := "postgresql://linus:42secret@localhost:5432/postgres?sslmode=disable"
+		expected := map[string]string{
+			"dbname":   "postgres",
+			"host":     "localhost",
+			"password": "42secret",
+			"port":     "5432",
+			"sslmode":  "disable",
+			"user":     "linus",
+		}
+
+		actual, err := parsePostgresURL(dsn)
+		require.NoError(t, err)
+		require.Equal(t, actual, expected)
+	})
 
-	actual, err := parsePostgresURL(dsn)
-	require.NoError(t, err)
-	require.Equal(t, actual, expected)
+	t.Run("with minimal url", func(t *testing.T) {
+		minimal := "postgres://"
+		expected := map[string]string{}
+		actual, err := parsePostgresURL(minimal)
+		require.NoError(t, err)
+		require.Equal(t, actual, expected)
+	})
 }
 
 func Test_getDataSourceNames(t *testing.T) {