feat(chunks-inspect): support structured metadata #11506

agebhar1 · 2023-12-18T09:16:50Z

What this PR does / why we need it:

Support chunk format v4 (aka structured metadata) for chunks-inspect.

Which issue(s) this PR fixes:
Fixes #10767

Special notes for your reviewer:

Checklist

Reviewed the CONTRIBUTING.md guide (required)
Documentation added
Tests updated
CHANGELOG.md updated
- If the change is worth mentioning in the release notes, add add-to-release-notes label
Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
For Helm chart changes bump the Helm chart version in production/helm/loki/Chart.yaml and update production/helm/loki/CHANGELOG.md and production/helm/loki/README.md. Example PR
If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR

github-actions · 2023-12-18T09:20:16Z

Trivy scan found the following vulnerabilities:

HIGH, Target: docker.io/grafana/loki:main-724a841 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libcrypto3 v3.1.3-r0. Fixed in v3.1.4-r0
HIGH, Target: docker.io/grafana/loki:main-724a841 (alpine 3.18.4), Type: alpine openssl: Incorrect cipher key and IV length processing in libssl3 v3.1.3-r0. Fixed in v3.1.4-r0
\nTo see more details on these vulnerabilities, and how/where to fix them, please run docker build -t grafana/loki:main-724a841 -f cmd/loki/Dockerfile .
trivy i grafana/loki:main-724a841 on your branch. If these were not introduced by your PR, please considering fixing them in via a subsequent PR. Thanks!

cstyan · 2024-01-18T00:04:53Z

cmd/chunks-inspect/loki.go

+	c, _ := chunkenc.NewByteChunk(data, 0, 0)
+	bs := c.Blocks(from, through)
+	fmt.Println("Blocks: ", len(bs))
+
+	pipeline := log.NewNoopPipeline()
+	for idx, block := range bs {
+		fmt.Println("Block  : ", idx)
+		fmt.Println("MinTime: ", time.Unix(0, block.MinTime()).UTC())
+		fmt.Println("MaxTime: ", time.Unix(0, block.MaxTime()).UTC())
+		fmt.Println("Offset : ", block.Offset())
+		iter := block.Iterator(context.Background(), pipeline.ForStream(nil))
+		for iter.Next() {
+			e := iter.Entry()
+			fmt.Println(e.Timestamp.UTC(), " ", e.Line)
+			for _, meta := range e.StructuredMetadata {
+				fmt.Println("\t", meta.Name, "=", meta.Value)
+			}
+		}
+	}
+
+	err := c.Close()
+	if err != nil {
+		return nil, err
+	}
+


this seems like a reasonable change, but looking at the structure of the rest of the code I think printing of all these details would be done in main.go, it looks to me like process just builds the details of the chunk into something that main.go prints

I haven't been keeping up with structured metadata. If it's separate from a chunk then imo we should either have a separate function to gather and return the structured metadata to main.go or an additional return value in parseLokiChunk for the metadata, perhaps with a parameter to choose whether or not you want to receive info about the structured metadata.

Thank you @cstyan for your feedback! I will restructure the code and go forward.

agebhar1 · 2024-02-04T18:35:03Z

Hi @cstyan! I've moved the output to the printFile function. The parseLokiChunk now returns only the chunk data. Is this the right direction?

cstyan · 2024-02-06T23:31:05Z

I can do another review sometime this week 👍 for now it looks like there's some linting failures

cmd/chunks-inspect/main.go:30:59: unused-parameter: parameter 'storeBlocks' seems to be unused, consider removing or renaming it as _ (revive)
func printFile(filename string, blockDetails, printLines, storeBlocks bool) {
                                                          ^
cmd/chunks-inspect/time.go:37:36: unnecessary conversion (unconvert)
		v, err := strconv.ParseInt(string(p[0]), 10, 64)
		                                 ^
cmd/chunks-inspect/time.go:44:36: unnecessary conversion (unconvert)
		v, err := strconv.ParseInt(string(p[0]), 10, 64)

agebhar1 · 2024-02-07T18:25:57Z

Thanks a lot @cstyan.

I've removed temporarily the option to store the binary (raw) block data. I suggest to add an option to save the original log data to file.

cstyan

looking at the diff it seems like there's a lot of code removal that doesn't seem relevant to the change you're wanting to make?

cstyan · 2024-02-07T20:52:44Z

cmd/chunks-inspect/loki.go

 	"encoding/binary"
 	"fmt"
-	"hash/crc32"
+	"github.com/grafana/loki/pkg/chunkenc"


I think we also have a lint rule that will say that this needs to be at the bottom of the import list with a newline in between it and the stdlib imports.

cstyan · 2024-02-07T20:55:05Z

There's still some lint failures

cmd/chunks-inspect/header.go:1: : # github.com/grafana/loki/cmd/chunks-inspect
cmd/chunks-inspect/loki.go:11:19: undefined: chunkenc
cmd/chunks-inspect/loki.go:14:21: undefined: chunkenc
cmd/chunks-inspect/loki.go:45:10: undefined: chunkenc
cmd/chunks-inspect/main.go:73:14: undefined: logql (typecheck)

I think those are viewable if you click details on the checks item here on github?

agebhar1 · 2024-02-08T18:01:40Z

I'm sorry @cstyan. Will check and fix it hopefully in a couple of days.

agebhar1 · 2024-02-11T18:47:15Z

Hello @cstyan,

I fixed the lint issues. The chunk-inspect tries to use as much as possible from the existing implementation. This should improve it's maintainability for added features like structured metadata. Reusing the implementation comes with some downsides such as the checksum for the blocks are not known anymore and also the raw block data. Instead of saving the block data it's now possible to export the original log data.

I also had a look into reading the header of the chunk with existing implementation but did not found the piece of code yet. I will try with the local storage client.

cstyan

I think we just need to merge the latest main into your branch and then we're good to go

agebhar1 · 2024-02-20T17:32:14Z

Sounds great @cstyan. I re-based the commit to latest main and updated the commit message.

cstyan · 2024-02-21T23:42:39Z

sorry @agebhar1 it looks like there was a CI change merged yesterday afternoon NA time so I think we need one more rebase on top of main 🙇

agebhar1 · 2024-02-22T06:45:30Z

No worries @cstyan. I did the rebase.

cstyan · 2024-02-23T18:35:44Z

Thanks for your patience @agebhar1, the build is green but one last thing, I don't think we should be removing the go.sum and go.mod for chunks-inspect. Could you add those back/update the go.mod to use a go 1.20 version?

agebhar1 · 2024-02-24T10:37:31Z

Hi @cstyan, if I try to add add the go.mod to the directory cmd/chunks-inspect with

module github.com/grafana/loki/cmd/chunks-inspect

go 1.20

and run go mod tidy I get the following error:

$ go mod tidy
go: finding module for package github.com/grafana/loki/pkg/logql/log
go: finding module for package github.com/golang/snappy
go: finding module for package github.com/grafana/loki/pkg/chunkenc
go: found github.com/golang/snappy in github.com/golang/snappy v0.0.4
go: found github.com/grafana/loki/pkg/chunkenc in github.com/grafana/loki v1.6.1
go: finding module for package github.com/grafana/loki/pkg/logql/log
go: github.com/grafana/loki/cmd/chunks-inspect imports
        github.com/grafana/loki/pkg/logql/log: module github.com/grafana/loki@latest found (v1.6.1), but does not contain package github.com/grafana/loki/pkg/logql/log

All other (loki, logcli, ...) usees the top level module description.

agebhar1 · 2024-06-06T06:15:00Z

@cstyan will fix it

Fixes grafana#10767.

agebhar1 · 2024-06-06T16:29:11Z

I fixed the lint error @cstyan.

cstyan · 2024-07-05T19:27:48Z

sorry, missed this for a while, lets merge and make follow up improvements if needed 👍

agebhar1 · 2024-07-06T15:48:27Z

That's awesome @cstyan 👍. I'm ready to help for future improvements.

…'clean room' implementation able to decode chunks without importing any Loki code, this update undid that implementation and we would prefer to keep it as a "clean room" type application Signed-off-by: Edward Welch <edward.welch@grafana.com>

Signed-off-by: Edward Welch <edward.welch@grafana.com>

agebhar1 requested a review from a team as a code owner December 18, 2023 09:16

pull-request-size bot added the size/M label Dec 18, 2023

cstyan reviewed Jan 18, 2024

View reviewed changes

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch 2 times, most recently from 79694b3 to 2423fba Compare February 4, 2024 18:25

pull-request-size bot added size/L and removed size/M labels Feb 4, 2024

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch from 2423fba to d803d44 Compare February 4, 2024 18:30

cstyan reviewed Feb 7, 2024

View reviewed changes

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch 2 times, most recently from 4f6dae9 to 9006fc1 Compare February 10, 2024 18:00

cstyan approved these changes Feb 20, 2024

View reviewed changes

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch from 9006fc1 to a471ec9 Compare February 20, 2024 17:30

agebhar1 changed the title ~~[WIP] feat(chunks-inspect): support structured metadata~~ feat(chunks-inspect): support structured metadata Feb 20, 2024

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch from a471ec9 to ad92220 Compare February 22, 2024 06:23

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch from ad92220 to dd0bb42 Compare May 16, 2024 17:02

pull-request-size bot added size/XXL and removed size/L labels May 16, 2024

feat(chunks-inspect): support structured metadata

d7ae1b9

Fixes grafana#10767.

agebhar1 force-pushed the feature/gh10767-chunks-inspect branch from d65a7c4 to d7ae1b9 Compare June 6, 2024 16:23

Merge branch 'main' into feature/gh10767-chunks-inspect

06e9d08

cstyan closed this Jul 5, 2024

cstyan reopened this Jul 5, 2024

cstyan merged commit 1834065 into grafana:main Jul 6, 2024
119 checks passed

This was referenced Jul 8, 2024

chore(k210): release 3.1.0 #13435

Closed

chore(k210): release 3.1.0 #13462

Closed

loki-gh-app bot mentioned this pull request Jul 15, 2024

chore(k211): release 3.1.0 #13521

Closed

loki-gh-app bot mentioned this pull request Jul 22, 2024

chore(k212): release 3.1.0 #13595

Closed

This was referenced Aug 15, 2024

chore(k215): release 3.2.0 #13905

Open

chore(k216): release 3.2.0 #13929

Open

loki-gh-app bot mentioned this pull request Sep 9, 2024

chore(k218): release 3.2.0 #14088

Merged

loki-gh-app bot mentioned this pull request Sep 23, 2024

chore(k221): release 3.2.0 #14214

Open

loki-gh-app bot mentioned this pull request Sep 30, 2024

chore(k222): release 3.2.0 #14305

Open

loki-gh-app bot mentioned this pull request Oct 7, 2024

chore(k223): release 3.2.0 #14402

Closed

This was referenced Oct 14, 2024

chore(k224): release 3.2.0 #14486

Closed

chore(k225): release 3.2.0 #14543

Closed

This was referenced Oct 21, 2024

chore(k225): release 3.2.0 #14548

Closed

chore(k226): release 3.2.0 #14625

Closed

loki-gh-app bot mentioned this pull request Nov 4, 2024

chore(k227): release 3.3.0 #14750

Merged

loki-gh-app bot mentioned this pull request Nov 11, 2024

chore(k228): release 3.2.0 #14855

Closed

loki-gh-app bot mentioned this pull request Dec 4, 2024

chore(release-3.2.x): release 3.2.3 #15273

Open

slim-bean added a commit that referenced this pull request Dec 13, 2024

chore: Reverting #11506 (#15409)

07e4df8

Signed-off-by: Edward Welch <edward.welch@grafana.com>

loki-gh-app bot mentioned this pull request Dec 20, 2024

chore(k228): release 3.2.0 #15521

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(chunks-inspect): support structured metadata #11506

feat(chunks-inspect): support structured metadata #11506

agebhar1 commented Dec 18, 2023

github-actions bot commented Dec 18, 2023

cstyan Jan 18, 2024

agebhar1 Jan 21, 2024

agebhar1 commented Feb 4, 2024

cstyan commented Feb 6, 2024

agebhar1 commented Feb 7, 2024

cstyan left a comment

cstyan Feb 7, 2024

cstyan commented Feb 7, 2024

agebhar1 commented Feb 8, 2024

agebhar1 commented Feb 11, 2024

cstyan left a comment

agebhar1 commented Feb 20, 2024

cstyan commented Feb 21, 2024

agebhar1 commented Feb 22, 2024

cstyan commented Feb 23, 2024

agebhar1 commented Feb 24, 2024

agebhar1 commented Jun 6, 2024

agebhar1 commented Jun 6, 2024

cstyan commented Jul 5, 2024 •

edited

Loading

agebhar1 commented Jul 6, 2024

feat(chunks-inspect): support structured metadata #11506

feat(chunks-inspect): support structured metadata #11506

Conversation

agebhar1 commented Dec 18, 2023

github-actions bot commented Dec 18, 2023

cstyan Jan 18, 2024

Choose a reason for hiding this comment

agebhar1 Jan 21, 2024

Choose a reason for hiding this comment

agebhar1 commented Feb 4, 2024

cstyan commented Feb 6, 2024

agebhar1 commented Feb 7, 2024

cstyan left a comment

Choose a reason for hiding this comment

cstyan Feb 7, 2024

Choose a reason for hiding this comment

cstyan commented Feb 7, 2024

agebhar1 commented Feb 8, 2024

agebhar1 commented Feb 11, 2024

cstyan left a comment

Choose a reason for hiding this comment

agebhar1 commented Feb 20, 2024

cstyan commented Feb 21, 2024

agebhar1 commented Feb 22, 2024

cstyan commented Feb 23, 2024

agebhar1 commented Feb 24, 2024

agebhar1 commented Jun 6, 2024

agebhar1 commented Jun 6, 2024

cstyan commented Jul 5, 2024 • edited Loading

agebhar1 commented Jul 6, 2024

cstyan commented Jul 5, 2024 •

edited

Loading