From 8bde7e3692eafcc3d02a3e71ef81c2e6f12d4e66 Mon Sep 17 00:00:00 2001 From: Kyle Nusbaum Date: Wed, 24 Jun 2020 16:59:48 -0500 Subject: [PATCH] fixes --- ddtrace/tracer/startup_linux.go | 3 ++- ddtrace/tracer/startup_windows.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ddtrace/tracer/startup_linux.go b/ddtrace/tracer/startup_linux.go index a8ccc16834..c83332842f 100644 --- a/ddtrace/tracer/startup_linux.go +++ b/ddtrace/tracer/startup_linux.go @@ -8,6 +8,7 @@ package tracer import ( "bufio" "os" + "strings" ) func osName() string { @@ -22,7 +23,7 @@ func osName() string { name = strings.Trim(parts[1], "\"") } } - return version + return name } return "Linux (Unknown Distribution)" } diff --git a/ddtrace/tracer/startup_windows.go b/ddtrace/tracer/startup_windows.go index c5d17d2441..8d46d49fcf 100644 --- a/ddtrace/tracer/startup_windows.go +++ b/ddtrace/tracer/startup_windows.go @@ -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() }