Simplify route harvest context APIs

Rename the route-harvest Java hooks so context is part of the primary Attach and ExtractRoutes calls. The route package no longer needs context-free wrappers now that every production caller supplies the harvest timeout context.

Add narrow tests for deadline-result normalization and unsupported JVM attach results so the cancellation paths remain covered.

Author: MrAlias

pkg/internal/transform/route/harvest/harvester.go

@@ -74,7 +74,7 @@ func NewRouteHarvester(cfg *services.RouteHarvestingConfig, disabled []services.
 		mux:      &sync.Mutex{},
 	}
 
-	h.javaExtractRoutes = h.java.ExtractRoutesContext
+	h.javaExtractRoutes = h.java.ExtractRoutes
 	h.nodeExtractRoutes = ExtractNodejsRoutes
 
 	return h

pkg/internal/transform/route/harvest/harvester_test.go

@@ -133,6 +133,24 @@ func TestHarvestRoutes_Timeout(t *testing.T) {
 	assert.Greater(t, elapsed, 90*time.Millisecond)
 }
 
+func TestHarvestRoutes_ContextDeadlineResultReturnsTimeout(t *testing.T) {
+	harvester := NewRouteHarvester(&services.RouteHarvestingConfig{}, []services.RouteHarvesterLanguage{}, 1*time.Second)
+	harvester.javaExtractRoutes = func(context.Context, app.PID) (*RouteHarvesterResult, error) {
+		return nil, context.DeadlineExceeded
+	}
+
+	fileInfo := createTestFileInfo(svc.InstrumentableJava)
+
+	result, err := harvester.HarvestRoutes(fileInfo)
+
+	require.Error(t, err)
+	assert.Nil(t, result)
+
+	var harvestErr *HarvestError
+	require.ErrorAs(t, err, &harvestErr)
+	assert.Equal(t, "route harvesting timed out", harvestErr.Message)
+}
+
 func TestHarvestRoutes_Panic(t *testing.T) {
 	harvester := NewRouteHarvester(&services.RouteHarvestingConfig{}, []services.RouteHarvesterLanguage{}, 1*time.Second)
 	harvester.javaExtractRoutes = panicExtractRoutes

pkg/internal/transform/route/harvest/java.go

@@ -30,7 +30,7 @@ type JavaRoutes struct {
 type JavaAttacher interface {
 	Init()
 	Cleanup()
-	AttachContext(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error)
+	Attach(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error)
 }
 
 type RealJavaAttacher struct {
@@ -154,11 +154,7 @@ func (h *JavaRoutes) processSymbolLine(lineBytes []byte, routes []string) []stri
 	return routes
 }
 
-func (h *JavaRoutes) ExtractRoutes(pid app.PID) (*RouteHarvesterResult, error) {
-	return h.ExtractRoutesContext(context.Background(), pid)
-}
-
-func (h *JavaRoutes) ExtractRoutesContext(ctx context.Context, pid app.PID) (*RouteHarvesterResult, error) {
+func (h *JavaRoutes) ExtractRoutes(ctx context.Context, pid app.PID) (*RouteHarvesterResult, error) {
 	var routes []string
 
 	runtime.LockOSThread()
@@ -167,7 +163,7 @@ func (h *JavaRoutes) ExtractRoutesContext(ctx context.Context, pid app.PID) (*Ro
 	h.Attacher.Init()
 	defer h.Attacher.Cleanup()
 
-	out, err := h.Attacher.AttachContext(ctx, pid, []string{"jcmd", "VM.symboltable -verbose"}, true)
+	out, err := h.Attacher.Attach(ctx, pid, []string{"jcmd", "VM.symboltable -verbose"}, true)
 	if err != nil {
 		return nil, err
 	}
@@ -220,10 +216,6 @@ func (j RealJavaAttacher) Cleanup() {
 	}
 }
 
-func (j RealJavaAttacher) Attach(pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
-	return j.Attacher.Attach(int(pid), argv, ignoreOnJ9)
-}
-
-func (j RealJavaAttacher) AttachContext(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
+func (j RealJavaAttacher) Attach(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
 	return j.Attacher.AttachContext(ctx, int(pid), argv, ignoreOnJ9)
 }

pkg/internal/transform/route/harvest/java_notlinux.go

@@ -23,11 +23,7 @@ func NewJavaRoutesHarvester() *JavaRoutes {
 	return &JavaRoutes{Attacher: fakeAttacher{}}
 }
 
-func (h *JavaRoutes) ExtractRoutes(_ app.PID) (*RouteHarvesterResult, error) {
-	return nil, nil
-}
-
-func (h *JavaRoutes) ExtractRoutesContext(_ context.Context, _ app.PID) (*RouteHarvesterResult, error) {
+func (h *JavaRoutes) ExtractRoutes(_ context.Context, _ app.PID) (*RouteHarvesterResult, error) {
 	return nil, nil
 }
 

pkg/internal/transform/route/harvest/java_test.go

@@ -422,7 +422,7 @@ func TestJavaRoutes_ExtractRoutes(t *testing.T) {
 				return NewReaderCloser(strings.NewReader(tt.mockOutput)), nil
 			}}
 
-			result, err := harvester.ExtractRoutes(tt.pid)
+			result, err := harvester.ExtractRoutes(context.Background(), tt.pid)
 
 			if tt.expectedError {
 				require.Error(t, err)
@@ -458,7 +458,7 @@ Header: ...
 		return NewReaderCloser(strings.NewReader(symbolTableOutput)), nil
 	}}
 
-	result, err := harvester.ExtractRoutes(1234)
+	result, err := harvester.ExtractRoutes(context.Background(), 1234)
 
 	require.NoError(t, err)
 	require.NotNil(t, result)
@@ -478,7 +478,7 @@ Header: ...
 	assert.Equal(t, expectedRoutes, result.Routes)
 }
 
-func TestJavaRoutes_ExtractRoutesContext_ClosesReaderOnCancellation(t *testing.T) {
+func TestJavaRoutes_ExtractRoutes_ClosesReaderOnCancellation(t *testing.T) {
 	harvester := NewJavaRoutesHarvester()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -494,7 +494,7 @@ func TestJavaRoutes_ExtractRoutesContext_ClosesReaderOnCancellation(t *testing.T
 
 	errCh := make(chan error, 1)
 	go func() {
-		_, err := harvester.ExtractRoutesContext(ctx, 1234)
+		_, err := harvester.ExtractRoutes(ctx, 1234)
 		errCh <- err
 	}()
 
@@ -520,6 +520,20 @@ func TestJavaRoutes_ExtractRoutesContext_ClosesReaderOnCancellation(t *testing.T
 	}
 }
 
+func TestJavaRoutes_ExtractRoutes_ReturnsPartialResultWhenAttachIsUnsupported(t *testing.T) {
+	harvester := NewJavaRoutesHarvester()
+	harvester.Attacher = FakeJavaAttacher{attachFunc: func(context.Context, app.PID, []string, bool) (io.ReadCloser, error) {
+		return nil, nil
+	}}
+
+	result, err := harvester.ExtractRoutes(context.Background(), 1234)
+
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	assert.Nil(t, result.Routes)
+	assert.Equal(t, PartialRoutes, result.Kind)
+}
+
 func TestRegexPatterns(t *testing.T) {
 	t.Run("validURLPath regex", func(t *testing.T) {
 		validPaths := []string{
@@ -663,11 +677,7 @@ func (j FakeJavaAttacher) Init() {
 func (j FakeJavaAttacher) Cleanup() {
 }
 
-func (j FakeJavaAttacher) Attach(pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
-	return j.AttachContext(context.Background(), pid, argv, ignoreOnJ9)
-}
-
-func (j FakeJavaAttacher) AttachContext(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
+func (j FakeJavaAttacher) Attach(ctx context.Context, pid app.PID, argv []string, ignoreOnJ9 bool) (io.ReadCloser, error) {
 	return j.attachFunc(ctx, pid, argv, ignoreOnJ9)
 }