Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grafana-loki: 2.0.0 -> 2.1.0 #107554

Merged
merged 1 commit into from Dec 27, 2020
Merged

grafana-loki: 2.0.0 -> 2.1.0 #107554

merged 1 commit into from Dec 27, 2020

Conversation

happysalada
Copy link
Contributor

@happysalada happysalada commented Dec 25, 2020 •
edited

Motivation for this change

upgrade loki to latest version

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Here is the result of nix path-info after
/nix/store/g86z7wl67kq2vr9c25ip5l8sn92qwyw7-grafana-loki-2.1.0 442635888

@WilliButz
@globin @mmahut
When you have a moment, please check

I've removed the patch as it was for version 1.6 and the issue is now closed

I've used nixfmt so there is a slight change in the format of the topline, I hope that's not a problem

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107554 run on x86_64-linux 1

1 package built:
  • grafana-loki

@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 107554 run on x86_64-darwin 1

1 package failed to build:
  • grafana-loki
panic: foo
goroutine 62 [running]:
github.com/grafana/loki/pkg/util/server.onPanic(0x18bc120, 0x1acaa90, 0x0, 0x1fa076a)
    github.com/grafana/loki/pkg/util/server/recovery.go:41 +0x7b
github.com/grpc-ecosystem/go-grpc-middleware/recovery.WithRecoveryHandler.func1.1(0x1af4300, 0xc00003c1a0, 0x18bc120, 0x1acaa90, 0x476335, 0x184a2c3)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/options.go:33 +0x39
github.com/grpc-ecosystem/go-grpc-middleware/recovery.recoverFrom(0x1af4300, 0xc00003c1a0, 0x18bc120, 0x1acaa90, 0xc00011c550, 0x1fc12c0, 0x184a2c3)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:52 +0x5a
github.com/grpc-ecosystem/go-grpc-middleware/recovery.UnaryServerInterceptor.func1.1(0x1af4300, 0xc00003c1a0, 0xc00011e088, 0xc000181f28)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:26 +0x77
panic(0x18bc120, 0x1acaa90)
    runtime/panic.go:969 +0x1b9
github.com/grafana/loki/pkg/util/server.Test_onPanic.func3(0x1af4300, 0xc00003c1a0, 0x0, 0x0, 0xc000181ed8, 0x184a28b, 0x22bd338, 0xc00038c180)
    github.com/grafana/loki/pkg/util/server/recovery_test.go:32 +0x39
github.com/grpc-ecosystem/go-grpc-middleware/recovery.UnaryServerInterceptor.func1(0x1af4300, 0xc00003c1a0, 0x0, 0x0, 0x0, 0x1a308d8, 0x0, 0x0, 0x0, 0x0)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:30 +0xbc
github.com/grafana/loki/pkg/util/server.Test_onPanic(0xc00038c180)
    github.com/grafana/loki/pkg/util/server/recovery_test.go:31 +0x2ce
testing.tRunner(0xc00038c180, 0x1a308e0)
    testing/testing.go:1123 +0xef
created by testing.(*T).Run
    testing/testing.go:1168 +0x2b3

goroutine 1 [chan receive]:
testing.(*T).Run(0xc00038c180, 0x19fb6c6, 0xc, 0x1a308e0, 0x1094701)
    testing/testing.go:1169 +0x2da
testing.runTests.func1(0xc000102780)
    testing/testing.go:1439 +0x78
testing.tRunner(0xc000102780, 0xc0002a7de0)
    testing/testing.go:1123 +0xef
testing.runTests(0xc0001173e0, 0x2006780, 0x3, 0x3, 0xbff175d6cd919a30, 0x8bb34e3527, 0x2017de0, 0x100f8d0)
    testing/testing.go:1437 +0x2fe
testing.(*M).Run(0xc000124280, 0x0)
    testing/testing.go:1345 +0x1eb
main.main()
    _testmain.go:47 +0x138
--- PASS: Test_onPanic (0.00s)
PASS
ok      github.com/grafana/loki/pkg/util/server 0.024s
?       github.com/grafana/loki/pkg/util/validation [no test files]
?       github.com/grafana/loki/tools   [no test files]
?       github.com/grafana/loki/tools/lambda-promtail/lambda-promtail   [no test files
``panic: foo
goroutine 62 [running]:
github.com/grafana/loki/pkg/util/server.onPanic(0x18bc120, 0x1acaa90, 0x0, 0x1fa076a)
    github.com/grafana/loki/pkg/util/server/recovery.go:41 +0x7b
github.com/grpc-ecosystem/go-grpc-middleware/recovery.WithRecoveryHandler.func1.1(0x1af4300, 0xc00003c1a0, 0x18bc120, 0x1acaa90, 0x476335, 0x184a2c3)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/options.go:33 +0x39
github.com/grpc-ecosystem/go-grpc-middleware/recovery.recoverFrom(0x1af4300, 0xc00003c1a0, 0x18bc120, 0x1acaa90, 0xc00011c550, 0x1fc12c0, 0x184a2c3)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:52 +0x5a
github.com/grpc-ecosystem/go-grpc-middleware/recovery.UnaryServerInterceptor.func1.1(0x1af4300, 0xc00003c1a0, 0xc00011e088, 0xc000181f28)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:26 +0x77
panic(0x18bc120, 0x1acaa90)
    runtime/panic.go:969 +0x1b9
github.com/grafana/loki/pkg/util/server.Test_onPanic.func3(0x1af4300, 0xc00003c1a0, 0x0, 0x0, 0xc000181ed8, 0x184a28b, 0x22bd338, 0xc00038c180)
    github.com/grafana/loki/pkg/util/server/recovery_test.go:32 +0x39
github.com/grpc-ecosystem/go-grpc-middleware/recovery.UnaryServerInterceptor.func1(0x1af4300, 0xc00003c1a0, 0x0, 0x0, 0x0, 0x1a308d8, 0x0, 0x0, 0x0, 0x0)
    github.com/grpc-ecosystem/go-grpc-middleware@v1.1.0/recovery/interceptors.go:30 +0xbc
github.com/grafana/loki/pkg/util/server.Test_onPanic(0xc00038c180)
    github.com/grafana/loki/pkg/util/server/recovery_test.go:31 +0x2ce
testing.tRunner(0xc00038c180, 0x1a308e0)
    testing/testing.go:1123 +0xef
created by testing.(*T).Run
    testing/testing.go:1168 +0x2b3

goroutine 1 [chan receive]:
testing.(*T).Run(0xc00038c180, 0x19fb6c6, 0xc, 0x1a308e0, 0x1094701)
    testing/testing.go:1169 +0x2da
testing.runTests.func1(0xc000102780)
    testing/testing.go:1439 +0x78
testing.tRunner(0xc000102780, 0xc0002a7de0)
    testing/testing.go:1123 +0xef
testing.runTests(0xc0001173e0, 0x2006780, 0x3, 0x3, 0xbff175d6cd919a30, 0x8bb34e3527, 0x2017de0, 0x100f8d0)
    testing/testing.go:1437 +0x2fe
testing.(*M).Run(0xc000124280, 0x0)
    testing/testing.go:1345 +0x1eb
main.main()
    _testmain.go:47 +0x138
--- PASS: Test_onPanic (0.00s)
PASS
ok      github.com/grafana/loki/pkg/util/server 0.024s
?       github.com/grafana/loki/pkg/util/validation [no test files]
?       github.com/grafana/loki/tools   [no test files]
?       github.com/grafana/loki/tools/lambda-promtail/lambda-promtail   [no test files

@happysalada
Copy link
Contributor Author

I'm running macOs and I didn't have any problem building this
I'm not very familiar with loki tests. Perhaps
@WilliButz
@globin @mmahut
Have an idea of why this test is failing?

@SuperSandro2000
Copy link
Member

SuperSandro2000 commented Dec 25, 2020 •
edited

Have an idea of why this test is failing?

It could be a sandbox issue.

@mweinelt
Copy link
Member

Have an idea of why this test is failing?

It could be a sandbox issue.

#101986 (comment)

@happysalada
Copy link
Contributor Author

@mweinelt Thanks a lot!
Are we ok to disable the check phase on darwin then?

@Ma27 Ma27 merged commit fbbe4ad into NixOS:master Dec 27, 2020
@happysalada happysalada deleted the grafana-loki-update branch April 28, 2023 19:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 left review comments

@globin globin Awaiting requested review from globin

@kalbasit kalbasit Awaiting requested review from kalbasit

@mmahut mmahut Awaiting requested review from mmahut

@WilliButz WilliButz Awaiting requested review from WilliButz

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@happysalada @SuperSandro2000 @mweinelt @Ma27