mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2024-12-14 10:13:10 +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>
135 lines
3.8 KiB
Go
135 lines
3.8 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.
|
|
|
|
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
|
|
|
|
package resource_test
|
|
|
|
import (
|
|
"fmt"
|
|
"io/ioutil"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"go.opentelemetry.io/otel/sdk/resource"
|
|
|
|
"golang.org/x/sys/unix"
|
|
)
|
|
|
|
func fakeUnameProvider(buf *unix.Utsname) error {
|
|
copy(buf.Sysname[:], "Mock OS")
|
|
copy(buf.Nodename[:], "DESKTOP-PC")
|
|
copy(buf.Release[:], "5.0.0")
|
|
copy(buf.Version[:], "#1 SMP Thu May 6 12:34:56 UTC 2021")
|
|
copy(buf.Machine[:], "x86_64")
|
|
|
|
return nil
|
|
}
|
|
|
|
func fakeUnameProviderWithError(buf *unix.Utsname) error {
|
|
return fmt.Errorf("Error invoking uname(2)")
|
|
}
|
|
|
|
func TestUname(t *testing.T) {
|
|
resource.SetUnameProvider(fakeUnameProvider)
|
|
|
|
uname, err := resource.Uname()
|
|
|
|
require.Equal(t, uname, "Mock OS DESKTOP-PC 5.0.0 #1 SMP Thu May 6 12:34:56 UTC 2021 x86_64")
|
|
require.NoError(t, err)
|
|
|
|
resource.SetDefaultUnameProvider()
|
|
}
|
|
|
|
func TestUnameError(t *testing.T) {
|
|
resource.SetUnameProvider(fakeUnameProviderWithError)
|
|
|
|
uname, err := resource.Uname()
|
|
|
|
require.Empty(t, uname)
|
|
require.Error(t, err)
|
|
|
|
resource.SetDefaultUnameProvider()
|
|
}
|
|
|
|
func TestCharsToString(t *testing.T) {
|
|
tt := []struct {
|
|
Name string
|
|
Bytes []byte
|
|
Expected string
|
|
}{
|
|
{"Nil array", nil, ""},
|
|
{"Empty array", []byte{}, ""},
|
|
{"Empty string (null terminated)", []byte{0x00}, ""},
|
|
{"Nonempty string (null terminated)", []byte{0x31, 0x32, 0x33, 0x00}, "123"},
|
|
{"Nonempty string (non-null terminated)", []byte{0x31, 0x32, 0x33}, "123"},
|
|
{"Nonempty string with values after null", []byte{0x31, 0x32, 0x33, 0x00, 0x34}, "123"},
|
|
}
|
|
|
|
for _, tc := range tt {
|
|
tc := tc
|
|
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
result := resource.CharsToString(tc.Bytes)
|
|
require.EqualValues(t, tc.Expected, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetFirstAvailableFile(t *testing.T) {
|
|
tempDir := t.TempDir()
|
|
|
|
file1, _ := ioutil.TempFile(tempDir, "candidate_")
|
|
file2, _ := ioutil.TempFile(tempDir, "candidate_")
|
|
|
|
filename1, filename2 := file1.Name(), file2.Name()
|
|
|
|
tt := []struct {
|
|
Name string
|
|
Candidates []string
|
|
ExpectedFileName string
|
|
ExpectedErr string
|
|
}{
|
|
{"Gets first, skip second candidate", []string{filename1, filename2}, filename1, ""},
|
|
{"Skips first, gets second candidate", []string{"does_not_exists", filename2}, filename2, ""},
|
|
{"Skips first, gets second, ignores third candidate", []string{"does_not_exists", filename2, filename1}, filename2, ""},
|
|
{"No candidates (empty slice)", []string{}, "", "no candidate file available: []"},
|
|
{"No candidates (nil slice)", nil, "", "no candidate file available: []"},
|
|
{"Single nonexisting candidate", []string{"does_not_exists"}, "", "no candidate file available: [does_not_exists]"},
|
|
{"Multiple nonexisting candidates", []string{"does_not_exists", "this_either"}, "", "no candidate file available: [does_not_exists this_either]"},
|
|
}
|
|
|
|
for _, tc := range tt {
|
|
tc := tc
|
|
|
|
t.Run(tc.Name, func(t *testing.T) {
|
|
file, err := resource.GetFirstAvailableFile(tc.Candidates)
|
|
|
|
filename := ""
|
|
if file != nil {
|
|
filename = file.Name()
|
|
}
|
|
|
|
errString := ""
|
|
if err != nil {
|
|
errString = err.Error()
|
|
}
|
|
|
|
require.Equal(t, tc.ExpectedFileName, filename)
|
|
require.Equal(t, tc.ExpectedErr, errString)
|
|
})
|
|
}
|
|
}
|