Fix some bugs

Author: simonswine

examples/language-sdk-instrumentation/java/rideshare/.pyroscope.yaml

@@ -5,7 +5,7 @@ source_code:
       language: java
       source:
         local:
-          path: src/main/java/org/example/rideshare
+          path: src/main/java
     - function_name:
         - prefix: java
       language: java
@@ -14,7 +14,7 @@ source_code:
           owner: openjdk
           repo: jdk
           ref: jdk-17+0
-          path: src/java.base/share/classes/java
+          path: src/java.base/share/classes
     - function_name:
         - prefix: org/springframework/http
         - prefix: org/springframework/web
@@ -24,4 +24,4 @@ source_code:
           owner: spring-projects
           repo: spring-framework
           ref: v5.3.20
-          path: spring-web/src/main/java/org
+          path: spring-web/src/main/java

pkg/frontend/vcs/source/find_java.go

@@ -14,27 +14,43 @@ const (
 	ExtJava = ".java"
 )
 
-// findJavaFile finds a java file in a vcs repository.
-func (ff FileFinder) findJavaFile(ctx context.Context, mappings ...*config.MappingConfig) (*vcsv1.GetFileResponse, error) {
-	sp, ctx := opentracing.StartSpanFromContext(ctx, "findJavaFile")
-	defer sp.Finish()
-	sp.SetTag("file.function_name", ff.file.FunctionName)
-	sp.SetTag("file.path", ff.file.Path)
-
-	pathSegments := strings.Split(ff.file.FunctionName, "/")
+func convertJavaFunctionNameToPath(functionName string) string {
+	pathSegments := strings.Split(functionName, "/")
 	last := len(pathSegments) - 1
 
+	// pos to cut from
+	pos := -1
+	updatePos := func(v int) {
+		if v != -1 {
+			return
+		}
+		if pos == -1 || pos > v {
+			pos = v
+		}
+	}
+
 	// find first dot in last segment
-	posDot := strings.Index(pathSegments[last], ".")
-	if posDot > 0 {
-		pathSegments[last] = pathSegments[last][:posDot]
+	updatePos(strings.Index(pathSegments[last], "."))
+
+	// find first $ in last segment
+	updatePos(strings.Index(pathSegments[last], "$"))
+
+	if pos > 0 {
+		pathSegments[last] = pathSegments[last][:pos]
 	}
-	// TODO: treat $$
 
 	pathSegments[last] = pathSegments[last] + ExtJava
+	return strings.Join(pathSegments, "/")
+}
 
-	javaPath := strings.Join(pathSegments, "/")
+// findJavaFile finds a java file in a vcs repository.
+func (ff FileFinder) findJavaFile(ctx context.Context, mappings ...*config.MappingConfig) (*vcsv1.GetFileResponse, error) {
+	sp, ctx := opentracing.StartSpanFromContext(ctx, "findJavaFile")
+	defer sp.Finish()
+	sp.SetTag("file.function_name", ff.file.FunctionName)
+	sp.SetTag("file.path", ff.file.Path)
 
+	javaPath := convertJavaFunctionNameToPath(ff.file.FunctionName)
 	for _, m := range mappings {
 		return ff.fetchMappingFile(ctx, m, javaPath)
 	}