Skip to content

Commit 3ef3a73

Browse files
V1.12.0 rc3 (#4933)
* fix(loki.source.podlogs): set validation scheme (#4931) * set validation scheme * database_observability: mark mysql component as public preview (#4919) Followup of #4763 * fix changelog * database_observability: log explain plan fetch error at debug (#4935) In case of sql syntax error, this message is logged repeatedly and there's no actionable outcome. Downgrade to debug level to reduce noise. --------- Co-authored-by: Cristian Greco <[email protected]>
1 parent 7c2947c commit 3ef3a73

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal API changes are not present.
1010
Main (unreleased)
1111
-----------------
1212

13-
v1.12.0-rc.2
13+
v1.12.0-rc.3
1414
-----------------
1515

1616
### Breaking changes

internal/component/database_observability/mysql/collector/explain_plans.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ func (c *ExplainPlans) Name() string {
457457
}
458458

459459
func (c *ExplainPlans) Start(ctx context.Context) error {
460-
level.Info(c.logger).Log("msg", "collector started")
460+
level.Debug(c.logger).Log("msg", "collector started")
461461

462462
c.running.Store(true)
463463
ctx, cancel := context.WithCancel(ctx)
@@ -585,7 +585,7 @@ func (c *ExplainPlans) fetchExplainPlans(ctx context.Context) error {
585585

586586
byteExplainPlanJSON, err := c.fetchExplainPlanJSON(ctx, *qi)
587587
if err != nil {
588-
level.Error(logger).Log("msg", "failed to fetch explain plan json bytes", "err", err)
588+
level.Debug(logger).Log("msg", "failed to fetch explain plan json bytes", "err", err)
589589
for _, code := range unrecoverableSQLCodes {
590590
if strings.Contains(err.Error(), fmt.Sprintf("Error %s", code)) {
591591
nonRecoverableFailureOccurred = true

internal/component/database_observability/mysql/component.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const selectServerInfo = `SELECT @@server_uuid, VERSION()`
3939
func init() {
4040
component.Register(component.Registration{
4141
Name: name,
42-
Stability: featuregate.StabilityExperimental,
42+
Stability: featuregate.StabilityPublicPreview,
4343
Args: Arguments{},
4444
Exports: Exports{},
4545

internal/component/database_observability/postgres/collector/explain_plan.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func (c *ExplainPlan) Name() string {
271271
}
272272

273273
func (c *ExplainPlan) Start(ctx context.Context) error {
274-
level.Info(c.logger).Log("msg", "collector started")
274+
level.Debug(c.logger).Log("msg", "collector started")
275275

276276
c.running.Store(true)
277277
ctx, cancel := context.WithCancel(ctx)
@@ -424,7 +424,7 @@ func (c *ExplainPlan) fetchExplainPlans(ctx context.Context) error {
424424

425425
byteExplainPlanJSON, err := c.fetchExplainPlanJSON(ctx, *qi)
426426
if err != nil {
427-
level.Error(logger).Log("msg", "failed to fetch explain plan json bytes", "err", err)
427+
level.Debug(logger).Log("msg", "failed to fetch explain plan json bytes", "err", err)
428428
for _, code := range unrecoverablePostgresSQLErrors {
429429
if strings.Contains(err.Error(), code) {
430430
nonRecoverableFailureOccurred = true

internal/component/loki/source/podlogs/relabel.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ func convertRelabelConfig(in []*promv1.RelabelConfig) ([]*relabel.Config, error)
3939
outRule.Action = relabel.Action(strings.ToLower(inRule.Action))
4040
}
4141

42+
// TODO: add support for choosing validation scheme: https://github.com/grafana/alloy/issues/4122
43+
outRule.NameValidationScheme = model.LegacyValidation
44+
4245
res = append(res, &outRule)
4346
}
4447

0 commit comments

Comments
 (0)