Sync loki.process with latest Promtail code (grafana#5677)

Signed-off-by: Paschalis Tsilias <[email protected]>

component/loki/process/process.go

@@ -1,3 +1,6 @@
+// The code in this package is adapted/ported over from grafana/loki/clients/pkg/logentry.
+//
+// The last Loki commit scanned for upstream changes was 7d5475541c66a819f6f456a45f8c143a084e6831.
 package process
 
 import (

component/loki/process/stages/decolorize.go

@@ -1,7 +1,5 @@
 package stages
 
-// NOTE: This code is copied from Promtail (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"github.com/grafana/loki/pkg/logql/log"
 )

component/loki/process/stages/decolorize_test.go

@@ -1,7 +1,5 @@
 package stages
 
-// NOTE: This code is copied from Promtail (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/drop.go

@@ -1,8 +1,5 @@
 package stages
 
-// NOTE: This package is ported over from grafana/loki/clients/pkg/logentry/stages
-// (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/drop_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/extensions.go

@@ -1,8 +1,5 @@
 package stages
 
-// NOTE: This package is ported over from grafana/loki/clients/pkg/logentry/stages
-// (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"fmt"
 	"strings"

component/loki/process/stages/extensions_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/geoip.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/inspector.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"fmt"
 	"io"

component/loki/process/stages/json.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/json_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/label_drop.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"time"

component/loki/process/stages/label_drop_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/label_keep.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"time"

component/loki/process/stages/label_keep_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/labels.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/labels_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"errors"

component/loki/process/stages/logfmt.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/logfmt_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/match.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/match_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"fmt"
 	"testing"
@@ -137,6 +133,7 @@ func TestMatcher(t *testing.T) {
 		{`{foo="bar",bar!~"te.*"}`, map[string]string{"foo": "bar", "bar": "test"}, MatchActionDrop, false, false, false},
 
 		{`{foo=""}`, map[string]string{}, MatchActionKeep, false, true, false},
+		{`{foo="bar"} |= "foo" | status >= 200`, map[string]string{"foo": "bar"}, MatchActionKeep, false, false, true},
 	}
 
 	for _, tt := range tests {

component/loki/process/stages/multiline.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"errors"
@@ -81,7 +77,7 @@ type multilineState struct {
 	currentLines   uint64        // The number of lines of the current multiline block.
 }
 
-// newMulitlineStage creates a MulitlineStage from config
+// newMultilineStage creates a MulitlineStage from config
 func newMultilineStage(logger log.Logger, config MultilineConfig) (Stage, error) {
 	err := validateMultilineConfig(&config)
 	if err != nil {

component/loki/process/stages/multiline_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"sort"
 	"sync"

component/loki/process/stages/output.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"reflect"

component/loki/process/stages/output_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"strings"

component/loki/process/stages/pipeline.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"context"
 	"fmt"

component/loki/process/stages/pipeline_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"fmt"
 	"sync"

component/loki/process/stages/regex.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/regex_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"errors"

component/loki/process/stages/replace.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"errors"

component/loki/process/stages/replace_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/sampling.go

@@ -1,7 +1,5 @@
 package stages
 
-// NOTE: This code is copied from Promtail (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"fmt"
 	"math"

component/loki/process/stages/sampling_test.go

@@ -1,7 +1,5 @@
 package stages
 
-// NOTE: This code is copied from Promtail (07cbef92268aecc0f20d1791a6df390c2df5c072) with changes kept to the minimum.
-
 import (
 	"fmt"
 	"testing"

component/loki/process/stages/stage.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"fmt"
 	"os"

component/loki/process/stages/static_labels.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/static_labels_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"testing"
 	"time"

component/loki/process/stages/timestamp.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"errors"
 	"fmt"

component/loki/process/stages/timestamp_test.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"bytes"
 	"fmt"

component/loki/process/stages/util.go

@@ -1,9 +1,5 @@
 package stages
 
-// This package is ported over from grafana/loki/clients/pkg/logentry/stages.
-// We aim to port the stages in steps, to avoid introducing huge amounts of
-// new code without being able to slowly review, examine and test them.
-
 import (
 	"fmt"
 	"math"