Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
knusbaum committed Jun 25, 2020
1 parent 05ec5c4 commit 8bde7e3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
3 changes: 2 additions & 1 deletion ddtrace/tracer/startup_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ package tracer
import (
"bufio"
"os"
"strings"
)

func osName() string {
Expand All @@ -22,7 +23,7 @@ func osName() string {
name = strings.Trim(parts[1], "\"")
}
}
return version
return name
}
return "Linux (Unknown Distribution)"
}
Expand Down
8 changes: 4 additions & 4 deletions ddtrace/tracer/startup_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@ func osVersion() string {
version.WriteString(fmt.Sprintf("%d", maj))
min, _, err := k.GetIntegerValue("CurrentMinorVersionNumber")
if err == nil {
version.WriteString(fmt.Sprintf(".%d", min))
version.WriteString(fmt.Sprintf(".%d", min))
}
} else {
version.WriteString("(Unknown Version)")
version.WriteString("(Unknown Version)")
}

ed, _, err := k.GetStringValue("EditionID")
if err == nil {
version.WriteString(" " + ed)
} else {
version.WriteString(" (Unknown Edition)")
version.WriteString(" (Unknown Edition)")
}

build, _, err := k.GetStringValue("CurrentBuild")
if err == nil {
version.WriteString(" Build " + build)
} else {
version.WriteString(" (Unknown Build)")
version.WriteString(" (Unknown Build)")
}
return version.String()
}

0 comments on commit 8bde7e3

Please sign in to comment.