mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2024-12-10 09:50:58 +02:00
484258eb36
* Added Linux-specific detector for the os.description attribute * Generalized OS description detector with placeholder function for unimplemented OSes * Extended osDescription function to *nix OSes based on golang.org/x/sys/unix * Added WithOS resource configuration function to configure all of the OS resource attributes * Implemented osDescription funtion for Windows OS * Improved documentation header for *nix version of the osDescription function * Added support for reading os-release file * Added/updated documentation headers for *nix implementation of osDescription and related functions * Changelog update * Added support for reading macOS version information * Mock approach to test OS description attribute * Extracted common function getFirstAvailableFile to read the first available file from a list of candidates * Upgraded golang.org/x/sys * Changelog update * Fixed wrong function name in documentation header for WithOSDescription * Updated documentation header for platformOSDescription function * Renamed restoreProcessAttributesProviders test helper function The function restoreProcessAttributesProviders was renamed to simply restoreAttributesProviders to better reflect its broader scope, which not only applies to process attribute's providers. * Fixed os_linux.go overriding build tags defined inside the file The suffix on os_linux.go was overriding the build tags already defined in that file. The file was renamed to os_release_unix.go, reflecting the main function defined in the file. For consistency, os_darwin.go was renamed to os_release_darwing.go, as its primary purpose is to also define the osRelease function. * Removed use of discontinued function resource.WithoutBuiltin * Added PR number to changelog entries * Updated go.sum files after run of make lint * Linux implementation: ignore lines with an empty key * Linux implementation: avoid unquoting strings less than two chars * WIP: added tests for Linux support functions * WIP: added tests for charsToString and getFirstAvailableFile functions * Replaced os.CreateTemp with ioutil.TempFile as the former only exists in Go 1.16 * Added unameProvider type to decouple direct reference to unix.Uname function inside Uname() * Added tests for Uname() function * Replaced *os.File with io.Reader in parseOSReleaseFile to ease testing * Added tests for parseOSReleaseFile function * Darwin implementation: added tests for buildOSRelease function * Replaced *os.File with io.Reader in parsePlistFile to ease testing * Darwin implementation: added tests for parsePlistFile function * Type in documentation header for Linux osRelease function * Extracted logic for reading specific registry values into helper functions * Added basic tests for Windows version of platformOSDescription and helper functions * Manually formatted uint64 to strings to have an uniform interface for test assertions * Asserts there's no error when opening registry key for testing Co-authored-by: Robert Pająk <pellared@hotmail.com> * Simplified subtests by using a single test with multiple asserts * go.sum update after running make * Fix typo Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> * WIP: added placeholder implementation of platformOSDescription for unsupported OSes * Fixed typo on osRelease documentation header Co-authored-by: Chris Bandy <bandy.chris@gmail.com> * Fixed typo on test case name for ParsePlistFile tests Co-authored-by: Chris Bandy <bandy.chris@gmail.com> * Linter fix in changelog * go.sum updates after running make * Used strings.Replacer instead of multiple strings.ReplaceAll calls * Optimized implementation of charsToString * Safer temporary file deletion with t.TempDir() * Used t.Cleanup() for safer mocking of runtime providers in OS resource tests * Handled optionality of DisplayVersion registry key. For example, CI machine runs on: Windows Server 2019 Datacenter (1809) [Version 10.0.17763.1999] So, to not add an extra white space due to missing DisplayVersion, this value is checked to be not empty, and only in such case a trailing space is added for that component. * Workaround to handle the case of DisplayVersion registry key not present * Excluded unsupported GOOSes by negation of supported ones * go.sum update after running make Co-authored-by: Anthony Mirabella <a9@aneurysm9.com> Co-authored-by: Robert Pająk <pellared@hotmail.com> Co-authored-by: Tyler Yahn <MrAlias@users.noreply.github.com> Co-authored-by: Chris Bandy <bandy.chris@gmail.com>
103 lines
3.2 KiB
Go
103 lines
3.2 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package resource // import "go.opentelemetry.io/otel/sdk/resource"
|
|
|
|
import (
|
|
"encoding/xml"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
)
|
|
|
|
type plist struct {
|
|
XMLName xml.Name `xml:"plist"`
|
|
Dict dict `xml:"dict"`
|
|
}
|
|
|
|
type dict struct {
|
|
Key []string `xml:"key"`
|
|
String []string `xml:"string"`
|
|
}
|
|
|
|
// osRelease builds a string describing the operating system release based on the
|
|
// contents of the property list (.plist) system files. If no .plist files are found,
|
|
// or if the required properties to build the release description string are missing,
|
|
// an empty string is returned instead. The generated string resembles the output of
|
|
// the `sw_vers` commandline program, but in a single-line string. For more information
|
|
// about the `sw_vers` program, see: https://www.unix.com/man-page/osx/1/SW_VERS.
|
|
func osRelease() string {
|
|
file, err := getPlistFile()
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
defer file.Close()
|
|
|
|
values, err := parsePlistFile(file)
|
|
if err != nil {
|
|
return ""
|
|
}
|
|
|
|
return buildOSRelease(values)
|
|
}
|
|
|
|
// getPlistFile returns a *os.File pointing to one of the well-known .plist files
|
|
// available on macOS. If no file can be opened, it returns an error.
|
|
func getPlistFile() (*os.File, error) {
|
|
return getFirstAvailableFile([]string{
|
|
"/System/Library/CoreServices/SystemVersion.plist",
|
|
"/System/Library/CoreServices/ServerVersion.plist",
|
|
})
|
|
}
|
|
|
|
// parsePlistFile process the file pointed by `file` as a .plist file and returns
|
|
// a map with the key-values for each pair of correlated <key> and <string> elements
|
|
// contained in it.
|
|
func parsePlistFile(file io.Reader) (map[string]string, error) {
|
|
var v plist
|
|
|
|
err := xml.NewDecoder(file).Decode(&v)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
if len(v.Dict.Key) != len(v.Dict.String) {
|
|
return nil, fmt.Errorf("the number of <key> and <string> elements doesn't match")
|
|
}
|
|
|
|
properties := make(map[string]string, len(v.Dict.Key))
|
|
for i, key := range v.Dict.Key {
|
|
properties[key] = v.Dict.String[i]
|
|
}
|
|
|
|
return properties, nil
|
|
}
|
|
|
|
// buildOSRelease builds a string describing the OS release based on the properties
|
|
// available on the provided map. It tries to find the `ProductName`, `ProductVersion`
|
|
// and `ProductBuildVersion` properties. If some of these properties are not found,
|
|
// it returns an empty string.
|
|
func buildOSRelease(properties map[string]string) string {
|
|
productName := properties["ProductName"]
|
|
productVersion := properties["ProductVersion"]
|
|
productBuildVersion := properties["ProductBuildVersion"]
|
|
|
|
if productName == "" || productVersion == "" || productBuildVersion == "" {
|
|
return ""
|
|
}
|
|
|
|
return fmt.Sprintf("%s %s (%s)", productName, productVersion, productBuildVersion)
|
|
}
|