Skip to content

Commit 25ae6af

Browse files
committed
fix: emit valid logfmt key (#3495)
* Fix log keys to be valid for logfmt * Add changelog
1 parent 9505e2a commit 25ae6af

File tree

4 files changed

+4
-11
lines changed

4 files changed

+4
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,10 @@ v1.8.3
1616

1717
- Fix `loki.source.file` race condition that often lead to panic when using `decompression`. (@kalleep)
1818

19-
<<<<<<< HEAD
20-
=======
2119
- Fix deadlock in `loki.source.file` that can happen when targets are removed. (@kalleep)
2220

23-
### Other changes
24-
25-
- Update the zap logging adapter used by `otelcol` components to log arrays and objects. (@dehaansa)
26-
27-
- Updated Windows install script to add DisplayVersion into registry on install (@enessene)
21+
- Fix `loki.process` to emit valid logfmt. (@kalleep)
2822

29-
>>>>>>> 4b788736f (fix: deadlock in loki.source.file when target is removed (#3488))
3023
v1.8.2
3124
-----------------
3225

internal/component/loki/process/stages/eventlogmessage.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func (m *eventLogMessageStage) processEntry(extracted map[string]interface{}, ke
107107
}
108108
if Debug {
109109
level.Debug(m.logger).Log("msg", "extracted data debug in event_log_message stage",
110-
"extracted data", fmt.Sprintf("%v", extracted))
110+
"extracted_data", fmt.Sprintf("%v", extracted))
111111
}
112112
return nil
113113
}

internal/component/loki/process/stages/json.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func (j *jsonStage) processEntry(extracted map[string]interface{}, entry *string
165165
}
166166
}
167167
if Debug {
168-
level.Debug(j.logger).Log("msg", "extracted data debug in json stage", "extracted data", fmt.Sprintf("%v", extracted))
168+
level.Debug(j.logger).Log("msg", "extracted data debug in json stage", "extracted_data", fmt.Sprintf("%v", extracted))
169169
}
170170
return nil
171171
}

internal/component/loki/process/stages/replace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func (r *replaceStage) Process(labels model.LabelSet, extracted map[string]inter
125125
}
126126
}
127127
}
128-
level.Debug(r.logger).Log("msg", "extracted data debug in replace stage", "extracted data", fmt.Sprintf("%v", extracted))
128+
level.Debug(r.logger).Log("msg", "extracted data debug in replace stage", "extracted_data", fmt.Sprintf("%v", extracted))
129129
}
130130

131131
func (r *replaceStage) getReplacedEntry(matchAllIndex [][]int, input string, td map[string]string, templ *template.Template) (string, map[string]string, error) {

0 commit comments

Comments
 (0)