pyroscope.java: add integration tests

fix package name

Revert "pyroscope.java: Fix java log level parameter (#4440)"

This reverts commit 4909877.

move the helper to pyroscope package

Author: korniltsev-grafanista

.dockerignore

@@ -7,3 +7,4 @@ internal/web/ui/build/
 packaging/windows/LICENSE
 packaging/windows/agent-windows-amd64.exe
 cmd/grafana-agent/Dockerfile
+alloy

.gitignore

@@ -33,3 +33,4 @@ node_modules
 # file of the pair will detect a dirty work tree and detect the wrong tag name.
 .tag-only
 .image-tag
+alloy

internal/cmd/integration-tests/docker-compose.yaml

@@ -122,6 +122,14 @@ services:
     networks:
       - integration-tests
 
+  pyroscope:
+    image: grafana/pyroscope
+    container_name: pyroscope
+    ports:
+      - "4040:4040"
+    networks:
+      - integration-tests
+
 networks:
   integration-tests:
     driver: bridge

internal/cmd/integration-tests/tests/pyroscope-java/config.alloy

@@ -0,0 +1,42 @@
+discovery.docker "d" {
+    host = "unix:///host-docker.sock"
+}
+
+discovery.process "p" {
+    join = discovery.docker.d.targets
+}
+
+discovery.relabel "l" {
+	targets = discovery.process.p.targets
+
+	rule {
+		source_labels = ["__meta_process_exe"]
+		regex  = "^(.*/java)$"
+		action = "keep"
+	}
+	rule {
+	    source_labels = ["__meta_docker_container_name"]
+	    regex = ".*kafka.*"
+	    action = "keep"
+	}
+	rule {
+	    source_labels = ["__meta_docker_container_name"]
+	    target_label = "service_name"
+	    replacement = "integration-test/java$1"
+	}
+}
+
+pyroscope.java "j" {
+	targets    = discovery.relabel.l.output
+	forward_to = [pyroscope.write.w.receiver]
+}
+
+pyroscope.write "w" {
+	endpoint {
+		url = "http://pyroscope:4040"
+	}
+}
+
+logging {
+	level = "debug"
+}

internal/cmd/integration-tests/tests/pyroscope-java/pyroscope_java_test.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/grafana/alloy/internal/cmd/integration-tests/common"
+	pyroutil "github.com/grafana/alloy/internal/component/pyroscope/util/test"
+	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
+	"github.com/stretchr/testify/require"
+)
+
+func TestPyroscopeJavaKafka(t *testing.T) {
+
+	require.Eventually(t, func() bool {
+		req := &querierv1.SelectMergeProfileRequest{
+			ProfileTypeID: `process_cpu:cpu:nanoseconds:cpu:nanoseconds`,
+			LabelSelector: `{service_name="integration-test/java/kafka"}`,
+			Start:         time.Now().Add(-time.Hour).UnixMilli(),
+			End:           time.Now().UnixMilli(),
+		}
+		res, err := pyroutil.Query("http://localhost:4040", req)
+		if err != nil {
+			return false
+		}
+		ss := res.String()
+		if !strings.Contains(ss, `kafka/server/KafkaRequestHandler.run`) {
+			return false
+		}
+		if !strings.Contains(ss, `libjvm.so.JavaThread::thread_main_inner`) {
+			return false
+		}
+		return true
+	}, common.DefaultTimeout, common.DefaultRetryInterval)
+
+	require.Eventually(t, func() bool {
+		req := &querierv1.SelectMergeProfileRequest{
+			ProfileTypeID: `memory:alloc_in_new_tlab_bytes:bytes:space:bytes`,
+			LabelSelector: `{service_name="integration-test/java/kafka"}`,
+			Start:         time.Now().Add(-time.Hour).UnixMilli(),
+			End:           time.Now().UnixMilli(),
+		}
+		res, err := pyroutil.Query("http://localhost:4040", req)
+		if err != nil {
+			return false
+		}
+		ss := res.String()
+		if !strings.Contains(ss, `kafka/server/KafkaRequestHandler.run`) {
+			return false
+		}
+		if strings.Contains(ss, `libjvm.so.JavaThread::thread_main_inner`) {
+			return false
+		}
+		return true
+	}, common.DefaultTimeout, common.DefaultRetryInterval)
+}

internal/cmd/integration-tests/utils.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"io"
 	"log"
@@ -14,6 +15,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/mount"
 	"github.com/docker/go-connections/nat"
 	"github.com/testcontainers/testcontainers-go"
 	"github.com/testcontainers/testcontainers-go/wait"
@@ -38,6 +40,45 @@ type fileInfo struct {
 	relPath string
 }
 
+func getDockerSocketPath() (string, error) {
+	contextCmd := exec.Command("docker", "context", "show")
+	contextOutput, err := contextCmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("failed to get docker context: %w", err)
+	}
+	contextName := strings.TrimSpace(string(contextOutput))
+
+	inspectCmd := exec.Command("docker", "context", "inspect", contextName)
+	inspectOutput, err := inspectCmd.Output()
+	if err != nil {
+		return "", fmt.Errorf("failed to inspect docker context %s: %w", contextName, err)
+	}
+
+	var contexts []struct {
+		Endpoints struct {
+			Docker struct {
+				Host string `json:"Host"`
+			} `json:"docker"`
+		} `json:"Endpoints"`
+	}
+
+	if err := json.Unmarshal(inspectOutput, &contexts); err != nil {
+		return "", fmt.Errorf("failed to parse docker context inspect output: %w", err)
+	}
+
+	if len(contexts) == 0 {
+		return "", fmt.Errorf("no docker contexts found")
+	}
+
+	host := contexts[0].Endpoints.Docker.Host
+	if !strings.HasPrefix(host, "unix://") {
+		return "", fmt.Errorf("docker host is not a unix socket: %s", host)
+	}
+
+	socketPath := strings.TrimPrefix(host, "unix://")
+	return socketPath, nil
+}
+
 func executeCommand(command string, args []string, taskDescription string) {
 	fmt.Printf("%s...\n", taskDescription)
 
@@ -89,6 +130,9 @@ func prepareContainerFiles(absTestDir string) ([]testcontainers.ContainerFile, [
 
 // Create a container request based on the test directory
 func createContainerRequest(dirName string, port int, networkName string, containerFiles []testcontainers.ContainerFile) testcontainers.ContainerRequest {
+	pyroscope := strings.Contains(dirName, "pyroscope")
+	beyla := dirName == "beyla"
+
 	natPort, err := nat.NewPort("tcp", strconv.Itoa(port))
 	if err != nil {
 		panic(fmt.Sprintf("failed to build natPort: %v", err))
@@ -108,10 +152,19 @@ func createContainerRequest(dirName string, port int, networkName string, contai
 		},
 		Privileged: true,
 	}
-
-	// Apply special configurations for specific tests
-	if dirName == "beyla" {
+	dockerSocketPath, err := getDockerSocketPath()
+	if err != nil {
+		panic(fmt.Sprintf("failed to get docker socket path: %v", err))
+	}
+	if beyla || pyroscope {
 		req.HostConfigModifier = func(hostConfig *container.HostConfig) {
+			if pyroscope {
+				hostConfig.Mounts = append(hostConfig.Mounts, mount.Mount{
+					Type:   mount.TypeBind,
+					Source: dockerSocketPath,
+					Target: "/host-docker.sock",
+				})
+			}
 			hostConfig.Privileged = true
 			hostConfig.CapAdd = []string{"SYS_ADMIN", "SYS_PTRACE", "SYS_RESOURCE"}
 			hostConfig.SecurityOpt = []string{"apparmor:unconfined"}

internal/component/pyroscope/java/loop.go

@@ -242,7 +242,10 @@ func (p *profilingLoop) start() error {
 		argv = append(argv, "--lock", cfg.Lock)
 	}
 	if cfg.LogLevel != "" {
-		argv = append(argv, "-L", cfg.LogLevel)
+		argv = append(argv, "--loglevel", cfg.LogLevel)
+	}
+	if cfg.Quiet {
+		argv = append(argv, "--quiet")
 	}
 
 	argv = append(argv,

internal/component/pyroscope/receive_http/receive_http.go

@@ -14,6 +14,7 @@ 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"
@@ -170,7 +171,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 := pyroutil.TraceLog(c.logger, sp)
+	l := tracelog.TraceLog(c.logger, sp)
 
 	var wg sync.WaitGroup
 	var errs error
@@ -224,7 +225,7 @@ func (c *Component) handleIngest(w http.ResponseWriter, r *http.Request) {
 	ctx, sp := c.tracer.Start(ctx, "/ingest")
 	defer sp.End()
 
-	l := pyroutil.TraceLog(c.logger, sp)
+	l := tracelog.TraceLog(c.logger, sp)
 
 	// Parse labels early
 	var lbls labels.Labels

internal/component/pyroscope/util/test/query.go

@@ -0,0 +1,24 @@
+package test
+
+import (
+	"context"
+	"net/http"
+
+	"connectrpc.com/connect"
+	"github.com/google/pprof/profile"
+	querierv1 "github.com/grafana/pyroscope/api/gen/proto/go/querier/v1"
+	"github.com/grafana/pyroscope/api/gen/proto/go/querier/v1/querierv1connect"
+)
+
+func Query(url string, q *querierv1.SelectMergeProfileRequest) (*profile.Profile, error) {
+	client := querierv1connect.NewQuerierServiceClient(http.DefaultClient, url)
+	res, err := client.SelectMergeProfile(context.Background(), connect.NewRequest(q))
+	if err != nil {
+		return nil, err
+	}
+	bs, err := res.Msg.MarshalVT()
+	if err != nil {
+		return nil, err
+	}
+	return profile.ParseData(bs)
+}

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

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