On Sun, Dec 22, 2024 at 05:02:00PM +0000, Lucas Raab wrote:
> Hello,
>
> Here's an update for loki up to the latest version. I no longer run the
> server component on OpenBSD so if someone does, I'd appreciate a test.
> The promtail log forwarder works fine.
>
> The previous patches have made it into the upstream projects so they can
> be removed. The new patch I added has an open PR:
> https://github.com/fsouza/fake-gcs-server/pull/1858
>
> Other tests?
>
> Thanks,
> Lucas
Hello,
Here's a new update for 3.4.1 which has the patch upstreamed. Same
caveats as before, tested with promtail, not with the main server. If no
one has a server running, I can commit it as-is.
Thanks,
Lucas
diff refs/heads/master refs/heads/loki
commit - 7709874615a82279aa39d02570d5bfefa0f6b531
commit + e1484c6c8761d9a46f546380e5e9dab69126c6e1
blob - 195d079f7966d95d1e2fb0decfd513143468c249
blob + e7f3aca44becde8f8315317e0f5b247e529a20dc
--- sysutils/loki/Makefile
+++ sysutils/loki/Makefile
@@ -3,8 +3,7 @@ COMMENT-promtail = tails log files and pushes them to
GH_ACCOUNT = grafana
GH_PROJECT = loki
-GH_TAGNAME = v3.1.0
-REVISION = 0
+GH_TAGNAME = v3.4.1
CATEGORIES = sysutils
blob - c64bb593ad80ea0799b49695d7e625009d5f3779
blob + 60dae92df8eb359cc5acaf6bea84fa6e34c5501a
--- sysutils/loki/distinfo
+++ sysutils/loki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (loki-3.1.0.tar.gz) = 5afHU6thSISVp2XvzNwPTc3dhjn184dC3yfj9Dqql7Y=
-SIZE (loki-3.1.0.tar.gz) = 51764140
+SHA256 (loki-3.4.1.tar.gz) = jklvmryF99T6Be+3D7/0GbxYHzQldK/bE/08TsM6d78=
+SIZE (loki-3.4.1.tar.gz) = 56749614
blob - 56e2942e53557e9d29b665d0f1b17b279d08bdbd (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_grafana_pyroscope-go_godeltaprof_internal_pprof_stub_go
+++ /dev/null
@@ -1,19 +0,0 @@
-Index:
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub.go
----
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub.go.orig
-+++ vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub.go
-@@ -3,15 +3,6 @@
-
- package pprof
-
--// unsafe is required for go:linkname
--import _ "unsafe"
--
--//go:linkname runtime_expandFinalInlineFrame
runtime/pprof.runtime_expandFinalInlineFrame
--func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr
--
--//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond
--func runtime_cyclesPerSecond() int64
--
- func Runtime_cyclesPerSecond() int64 {
- return runtime_cyclesPerSecond()
- }
blob - 38eb4e146d537496a9815dc3a75925c47d366344 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_grafana_pyroscope-go_godeltaprof_internal_pprof_stub_go20_go
+++ /dev/null
@@ -1,25 +0,0 @@
-Index:
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go20.go
----
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go20.go.orig
-+++
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go20.go
-@@ -3,7 +3,10 @@
-
- package pprof
-
--import "runtime"
-+import (
-+ "runtime"
-+ _ "unsafe"
-+)
-
- // runtime_FrameStartLine is defined in runtime/symtab.go.
- func runtime_FrameStartLine(f *runtime.Frame) int {
-@@ -14,3 +17,9 @@ func runtime_FrameStartLine(f *runtime.Frame) int {
- func runtime_FrameSymbolName(f *runtime.Frame) string {
- return f.Function
- }
-+
-+//go:linkname runtime_expandFinalInlineFrame
runtime/pprof.runtime_expandFinalInlineFrame
-+func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr
-+
-+//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond
-+func runtime_cyclesPerSecond() int64
blob - ab8381917469d45feefa863ebddb83d8cc30b839 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_grafana_pyroscope-go_godeltaprof_internal_pprof_stub_go21_go
+++ /dev/null
@@ -1,25 +0,0 @@
-Index:
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go21.go
----
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go21.go.orig
-+++
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go21.go
-@@ -1,21 +0,0 @@
--//go:build go1.21
--// +build go1.21
--
--package pprof
--
--import (
-- "runtime"
-- _ "unsafe"
--)
--
--// runtime_FrameStartLine is defined in runtime/symtab.go.
--//
--//go:noescape
--//go:linkname runtime_FrameStartLine runtime/pprof.runtime_FrameStartLine
--func runtime_FrameStartLine(f *runtime.Frame) int
--
--// runtime_FrameSymbolName is defined in runtime/symtab.go.
--//
--//go:noescape
--//go:linkname runtime_FrameSymbolName runtime/pprof.runtime_FrameSymbolName
--func runtime_FrameSymbolName(f *runtime.Frame) string
blob - dc32eb9c2651543fcd78b35bad53f6abb9ba7725 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_grafana_pyroscope-go_godeltaprof_internal_pprof_stub_go22_go
+++ /dev/null
@@ -1,31 +0,0 @@
-Index:
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go22.go
----
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go22.go.orig
-+++
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go22.go
-@@ -0,0 +1,27 @@
-+//go:build go1.21 && !go1.23
-+// +build go1.21,!go1.23
-+
-+package pprof
-+
-+import (
-+ "runtime"
-+ _ "unsafe"
-+)
-+
-+// runtime_FrameStartLine is defined in runtime/symtab.go.
-+//
-+//go:noescape
-+//go:linkname runtime_FrameStartLine runtime/pprof.runtime_FrameStartLine
-+func runtime_FrameStartLine(f *runtime.Frame) int
-+
-+// runtime_FrameSymbolName is defined in runtime/symtab.go.
-+//
-+//go:noescape
-+//go:linkname runtime_FrameSymbolName runtime/pprof.runtime_FrameSymbolName
-+func runtime_FrameSymbolName(f *runtime.Frame) string
-+
-+//go:linkname runtime_expandFinalInlineFrame
runtime/pprof.runtime_expandFinalInlineFrame
-+func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr
-+
-+//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond
-+func runtime_cyclesPerSecond() int64
blob - c96976173e0aed5cd4e5eda2a31d1d0a670bf01b (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_grafana_pyroscope-go_godeltaprof_internal_pprof_stub_go23_go
+++ /dev/null
@@ -1,31 +0,0 @@
-Index:
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go23.go
----
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go23.go.orig
-+++
vendor/github.com/grafana/pyroscope-go/godeltaprof/internal/pprof/stub_go23.go
-@@ -0,0 +1,27 @@
-+//go:build go1.23
-+// +build go1.23
-+
-+package pprof
-+
-+import (
-+ "runtime"
-+ _ "unsafe"
-+)
-+
-+// runtime_FrameStartLine is defined in runtime/symtab.go.
-+//
-+//go:noescape
-+//go:linkname runtime_FrameStartLine runtime/pprof.runtime_FrameStartLine
-+func runtime_FrameStartLine(f *runtime.Frame) int
-+
-+// runtime_FrameSymbolName is defined in runtime/symtab.go.
-+//
-+//go:noescape
-+//go:linkname runtime_FrameSymbolName runtime/pprof.runtime_FrameSymbolName
-+func runtime_FrameSymbolName(f *runtime.Frame) string
-+
-+//go:linkname runtime_expandFinalInlineFrame
runtime/pprof.runtime_expandFinalInlineFrame
-+func runtime_expandFinalInlineFrame(stk []uintptr) []uintptr
-+
-+//go:linkname runtime_cyclesPerSecond runtime/pprof.runtime_cyclesPerSecond
-+func runtime_cyclesPerSecond() int64
blob - 93484df1dfbcf6d942e75404c584bc53392191a0 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_label_go
+++ /dev/null
@@ -1,14 +0,0 @@
-Backport: https://github.com/prometheus/prometheus/pull/13759
-
-Index:
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go
----
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go.orig
-+++
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_label.go
-@@ -3,7 +3,7 @@
- // Copyright The OpenTelemetry Authors
- // SPDX-License-Identifier: Apache-2.0
-
--package prometheus // import
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
-+package prometheus // import
"github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
-
- import (
- "strings"
blob - ba99fd60e8b6ce4caddf5a98a1754109f4e7c056 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_normalize_name_go
+++ /dev/null
@@ -1,14 +0,0 @@
-Backport: https://github.com/prometheus/prometheus/pull/13759
-
-Index:
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
----
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go.orig
-+++
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/normalize_name.go
-@@ -3,7 +3,7 @@
- // Copyright The OpenTelemetry Authors
- // SPDX-License-Identifier: Apache-2.0
-
--package prometheus // import
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
-+package prometheus // import
"github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
-
- import (
- "strings"
blob - 3646f91b228c86df40e37b8df13a9b94923fa5b1 (mode 644)
blob + /dev/null
---
sysutils/loki/patches/patch-vendor_github_com_prometheus_prometheus_storage_remote_otlptranslator_prometheus_unit_to_ucum_go
+++ /dev/null
@@ -1,14 +0,0 @@
-Backport: https://github.com/prometheus/prometheus/pull/13759
-
-Index:
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go
----
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go.orig
-+++
vendor/github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus/unit_to_ucum.go
-@@ -3,7 +3,7 @@
- // Copyright The OpenTelemetry Authors
- // SPDX-License-Identifier: Apache-2.0
-
--package prometheus // import
"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus"
-+package prometheus // import
"github.com/prometheus/prometheus/storage/remote/otlptranslator/prometheus"
-
- import "strings"
-
