Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minimal java inspection improvement #2478

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Minimal java inspection improvement #2478

Changes from 9 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f15bce8
chore: removal for inject instrumentation label when cli uninstall
AvihuHenya Jan 29, 2025
d604681
chore: add java edge cases
AvihuHenya Feb 4, 2025
a74d85b
Revert "chore: add java edge cases"
AvihuHenya Feb 4, 2025
eb27436
chore: delete old print
AvihuHenya Feb 4, 2025
1c08609
Merge branch 'main' of https://github.com/odigos-io/odigos
AvihuHenya Feb 4, 2025
040f831
Merge branch 'main' of https://github.com/odigos-io/odigos
AvihuHenya Feb 5, 2025
766be2b
Merge branch 'main' of https://github.com/odigos-io/odigos
AvihuHenya Feb 11, 2025
3549339
Merge branch 'main' of https://github.com/odigos-io/odigos
AvihuHenya Feb 12, 2025
92cccc4
chore: update inspect test to include only base path
AvihuHenya Feb 19, 2025
77af47d
introduces a regex (`.*/java(?:w)?(?:\d+)?$`) that matches
AvihuHenya Feb 20, 2025
c7cb822
improved exe regex
AvihuHenya Feb 20, 2025
839ef97
Merge branch 'main' into minimal-java-inspection-improvement
AvihuHenya Feb 20, 2025
fde1450
update debug.dockerfile
AvihuHenya Feb 20, 2025
391dbd7
Merge branch 'minimal-java-inspection-improvement' of github.com:Avih…
AvihuHenya Feb 20, 2025
b0c6e77
Merge branch 'main' into minimal-java-inspection-improvement
AvihuHenya Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions procdiscovery/pkg/inspectors/java/java.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package java

import (
"path/filepath"
"regexp"
"strings"

"github.com/hashicorp/go-version"

Expand All @@ -18,7 +18,7 @@ const JavaVersionRegex = `\d+\.\d+\.\d+\+\d+`
var re = regexp.MustCompile(JavaVersionRegex)

func (j *JavaInspector) Inspect(proc *process.Details) (common.ProgrammingLanguage, bool) {
if strings.Contains(proc.ExePath, processName) || strings.Contains(proc.CmdLine, processName) {
if filepath.Base(proc.ExePath) == processName {
return common.JavaProgrammingLanguage, true
}

Expand Down
Loading