revert unneeded changes

Author: korniltsev-grafanista

internal/component/pyroscope/receive_http/receive_http.go

@@ -14,7 +14,6 @@ import (
 	"github.com/go-kit/log"
 	"github.com/gorilla/mux"
 	pyroutil "github.com/grafana/alloy/internal/component/pyroscope/util"
-	"github.com/grafana/alloy/internal/component/pyroscope/util/tracelog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/prometheus/model/labels"
 	"go.opentelemetry.io/otel/trace"
@@ -171,7 +170,7 @@ func (c *Component) Push(ctx context.Context, req *connect.Request[pushv1.PushRe
 
 	ctx, sp := c.tracer.Start(ctx, "/push.v1.PusherService/Push")
 	defer sp.End()
-	l := tracelog.TraceLog(c.logger, sp)
+	l := pyroutil.TraceLog(c.logger, sp)
 
 	var wg sync.WaitGroup
 	var errs error
@@ -225,7 +224,7 @@ func (c *Component) handleIngest(w http.ResponseWriter, r *http.Request) {
 	ctx, sp := c.tracer.Start(ctx, "/ingest")
 	defer sp.End()
 
-	l := tracelog.TraceLog(c.logger, sp)
+	l := pyroutil.TraceLog(c.logger, sp)
 
 	// Parse labels early
 	var lbls labels.Labels

internal/component/pyroscope/util/internal/cmd/playground/main.go

@@ -95,7 +95,7 @@ func main() {
 	}
 }
 
-func newJava(ps pids, w pyroscope.Appendable) interface{ Run(context.Context) error } {
+func newJava(ps pids, w pyroscope.Appendable) *java.Component {
 	args := java.DefaultArguments()
 	args.ForwardTo = []pyroscope.Appendable{w}
 	for _, pid := range ps {

internal/component/pyroscope/util/tracelog/log.go renamed to internal/component/pyroscope/util/log.go

@@ -1,4 +1,4 @@
-package tracelog
+package util
 
 import (
 	"github.com/go-kit/log"

internal/component/pyroscope/write/write.go

@@ -22,7 +22,6 @@ import (
 	"github.com/grafana/alloy/internal/component/common/config"
 	"github.com/grafana/alloy/internal/component/pyroscope"
 	"github.com/grafana/alloy/internal/component/pyroscope/util"
-	"github.com/grafana/alloy/internal/component/pyroscope/util/tracelog"
 	"github.com/grafana/alloy/internal/featuregate"
 	"github.com/grafana/alloy/internal/useragent"
 	"github.com/grafana/dskit/backoff"
@@ -261,7 +260,7 @@ func (f *fanOutClient) Push(
 		dl                    any
 		ok                    bool
 		reqSize, profileCount = requestSize(req)
-		l                     = tracelog.TraceLog(f.logger, sp)
+		l                     = util.TraceLog(f.logger, sp)
 		st                    = time.Now()
 	)
 	if dl, ok = ctx.Deadline(); !ok {
@@ -467,7 +466,7 @@ func (f *fanOutClient) AppendIngest(ctx context.Context, profile *pyroscope.Inco
 		dl                    any
 		ok                    bool
 		reqSize, profileCount = int64(len(profile.RawBody)), int64(1)
-		l                     = tracelog.TraceLog(f.logger, sp)
+		l                     = util.TraceLog(f.logger, sp)
 		st                    = time.Now()
 	)
 	if dl, ok = ctx.Deadline(); !ok {