From b8609c0c5649ad5e4cb2130230ca180645842817 Mon Sep 17 00:00:00 2001
From: Piotr Gwizdala <17101802+thampiotr@users.noreply.github.com>
Date: Thu, 16 May 2024 15:26:02 +0100
Subject: [PATCH] Fix lint

---
 go.mod                                                     | 2 +-
 internal/component/discovery/discovery.go                  | 2 --
 internal/component/loki/process/stages/multiline.go        | 1 +
 internal/component/loki/source/file/decompresser.go        | 7 ++-----
 .../loki/source/journal/internal/target/journaltarget.go   | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 7fe0ed323d..3d989c142a 100644
--- a/go.mod
+++ b/go.mod
@@ -720,7 +720,7 @@ replace (
 // TODO: remove replace directive once:
 // * There is a release of Prometheus which addresses https://github.com/prometheus/prometheus/issues/14049,
 // for example, via this implementation: https://github.com/grafana/prometheus/pull/34
-replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20240514135907-13889ba362e6 // thampiotr/v0.51_expose_staleness_disabling branch
+replace github.com/prometheus/prometheus => github.com/grafana/prometheus v1.8.2-0.20240514135907-13889ba362e6 // staleness_disabling_v0.51 branch
 
 replace gopkg.in/yaml.v2 => github.com/rfratto/go-yaml v0.0.0-20211119180816-77389c3526dc
 
diff --git a/internal/component/discovery/discovery.go b/internal/component/discovery/discovery.go
index 58046931e5..c01e249298 100644
--- a/internal/component/discovery/discovery.go
+++ b/internal/component/discovery/discovery.go
@@ -13,8 +13,6 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 
 	"github.com/grafana/alloy/internal/component"
-
-	"github.com/grafana/alloy/internal/alloy/logging/level"
 )
 
 // Target refers to a singular discovered endpoint found by a discovery
diff --git a/internal/component/loki/process/stages/multiline.go b/internal/component/loki/process/stages/multiline.go
index ba3c68d9fe..f754909754 100644
--- a/internal/component/loki/process/stages/multiline.go
+++ b/internal/component/loki/process/stages/multiline.go
@@ -13,6 +13,7 @@ import (
 	"github.com/prometheus/common/model"
 
 	"github.com/grafana/alloy/internal/component/common/loki"
+	"github.com/grafana/alloy/internal/runtime/logging/level"
 )
 
 // Configuration errors.
diff --git a/internal/component/loki/source/file/decompresser.go b/internal/component/loki/source/file/decompresser.go
index 45d7139ea4..f9dd45d4ad 100644
--- a/internal/component/loki/source/file/decompresser.go
+++ b/internal/component/loki/source/file/decompresser.go
@@ -19,19 +19,16 @@ import (
 	"unsafe"
 
 	"github.com/go-kit/log"
-	"github.com/grafana/alloy/internal/component/common/loki"
-	"github.com/grafana/alloy/internal/component/common/loki/positions"
-	"github.com/grafana/alloy/internal/runtime/logging/level"
-	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/v3/pkg/logproto"
 	"github.com/prometheus/common/model"
 	"go.uber.org/atomic"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/ianaindex"
 	"golang.org/x/text/transform"
-	"github.com/grafana/alloy/internal/alloy/logging/level"
+
 	"github.com/grafana/alloy/internal/component/common/loki"
 	"github.com/grafana/alloy/internal/component/common/loki/positions"
+	"github.com/grafana/alloy/internal/runtime/logging/level"
 )
 
 func supportedCompressedFormats() map[string]struct{} {
diff --git a/internal/component/loki/source/journal/internal/target/journaltarget.go b/internal/component/loki/source/journal/internal/target/journaltarget.go
index ecd2f92c9f..7cd6904ff8 100644
--- a/internal/component/loki/source/journal/internal/target/journaltarget.go
+++ b/internal/component/loki/source/journal/internal/target/journaltarget.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/go-kit/log"
-	"github.com/grafana/alloy/internal/alloy/logging/level"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig"
 	"github.com/grafana/loki/v3/clients/pkg/promtail/targets/target"
 	"github.com/grafana/loki/v3/pkg/logproto"