[processor/resourcedetection]: add additional os properties (#40257)

<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
Ex. Adding a feature - Explain what this achieves.-->
#### Description

Add properties which are missing in
https://github.com/open-telemetry/semantic-conventions/blob/45e91aedff7d347955ba09269b871f8fd9049ce3/docs/resource/os.md,
and the logic for getting `os.name` and `os.build.id` is also comes from
here.


<!-- Issue number (e.g. #1234) or full URL to issue, if applicable. -->
#### Link to tracking issue

Implementation
#39941

<!--Describe what testing was performed and which tests were added.-->
#### Testing

`TestDetectOSNameAndBuildID` in
`processor/resourcedetectionprocessor/internal/system/system_test.go`

<!--Describe the documentation added.-->
#### Documentation

<!--Please delete paragraphs that you did not use before submitting.-->

Author: minimAluminiumalism

.chloggen/add_additional_os_ properties_to_resource_detection.yaml

@@ -0,0 +1,27 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
+component: resourcedetectionprocessor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Add additional OS properties to resource detection: `os.build.id` and `os.name`"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+issues: [39941]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# If your change doesn't affect end users or the exported elements of any package,
+# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []

internal/metadataproviders/system/metadata.go

@@ -4,7 +4,9 @@
 package system // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/metadataproviders/system"
 
 import (
+	"bytes"
 	"context"
+	"encoding/xml"
 	"fmt"
 	"net"
 	"os"
@@ -77,6 +79,12 @@ type Provider interface {
 
 	// CPUInfo returns the host's CPU info
 	CPUInfo(ctx context.Context) ([]cpu.InfoStat, error)
+
+	// OSName returns the OS name according to semantic conventions.
+	OSName(ctx context.Context) (string, error)
+
+	// OSBuildID returns the OS build ID according to semantic conventions.
+	OSBuildID(ctx context.Context) (string, error)
 }
 
 type systemMetadataProvider struct {
@@ -178,6 +186,85 @@ func (p systemMetadataProvider) OSDescription(ctx context.Context) (string, erro
 	return p.fromOption(ctx, resource.WithOSDescription(), string(conventions.OSDescriptionKey))
 }
 
+// OSName returns the OS name from host metadata.
+func (p systemMetadataProvider) OSName(ctx context.Context) (string, error) {
+	info, err := host.InfoWithContext(ctx)
+	if err != nil {
+		return "", fmt.Errorf("OSName failed to get platform: %w", err)
+	}
+	return info.Platform, nil
+}
+
+// OSBuildID returns the OS build ID based on the platform.
+func (p systemMetadataProvider) OSBuildID(ctx context.Context) (string, error) {
+	info, err := host.InfoWithContext(ctx)
+	if err != nil {
+		return "", fmt.Errorf("OSBuildID failed to get host info: %w", err)
+	}
+	switch runtime.GOOS {
+	case "darwin":
+		// macOS: read ProductBuildVersion from SystemVersion.plist
+		data, err := os.ReadFile("/System/Library/CoreServices/SystemVersion.plist")
+		if err != nil {
+			return info.KernelVersion, nil
+		}
+		if v := parsePlistValue(data, "ProductBuildVersion"); v != "" {
+			return v, nil
+		}
+		return info.KernelVersion, nil
+	case "linux":
+		// Linux: read BUILD_ID from /etc/os-release
+		data, err := os.ReadFile("/etc/os-release")
+		if err != nil {
+			return info.KernelVersion, nil
+		}
+		if v := parseOSReleaseValue(data, "BUILD_ID"); v != "" {
+			return v, nil
+		}
+		return info.KernelVersion, nil
+	default:
+		return info.KernelVersion, nil
+	}
+}
+
+// parsePlistValue parses the XML plist and returns the <string> value after the given <key>.
+func parsePlistValue(data []byte, key string) string {
+	decoder := xml.NewDecoder(bytes.NewReader(data))
+	var currKey string
+	for {
+		tok, err := decoder.Token()
+		if err != nil {
+			break
+		}
+		if se, ok := tok.(xml.StartElement); ok {
+			if se.Name.Local == "key" {
+				var k string
+				if err2 := decoder.DecodeElement(&k, &se); err2 == nil {
+					currKey = k
+				}
+			} else if se.Name.Local == "string" && currKey == key {
+				var v string
+				if err2 := decoder.DecodeElement(&v, &se); err2 == nil {
+					return v
+				}
+			}
+		}
+	}
+	return ""
+}
+
+// parseOSReleaseValue parses key=value pairs from os-release data.
+func parseOSReleaseValue(data []byte, key string) string {
+	lines := strings.Split(string(data), "\n")
+	prefix := key + "="
+	for _, line := range lines {
+		if strings.HasPrefix(line, prefix) {
+			return strings.Trim(line[len(prefix):], `"`)
+		}
+	}
+	return ""
+}
+
 func (systemMetadataProvider) HostArch() (string, error) {
 	return internal.GOARCHtoHostArch(runtime.GOARCH), nil
 }

processor/resourcedetectionprocessor/internal/system/documentation.md

@@ -19,6 +19,8 @@
 | host.ip | IP addresses for the host | Any Slice | false |
 | host.mac | MAC addresses for the host | Any Slice | false |
 | host.name | The host.name | Any Str | true |
+| os.build.id | The os.build.id | Any Str | false |
 | os.description | Human readable OS version information. | Any Str | false |
+| os.name | The os.name | Any Str | false |
 | os.type | The os.type | Any Str | true |
 | os.version | The os.version | Any Str | false |

processor/resourcedetectionprocessor/internal/system/internal/metadata/generated_config.go

@@ -23,8 +23,12 @@ all_set:
       enabled: true
     host.name:
       enabled: true
+    os.build.id:
+      enabled: true
     os.description:
       enabled: true
+    os.name:
+      enabled: true
     os.type:
       enabled: true
     os.version:
@@ -53,8 +57,12 @@ none_set:
       enabled: false
     host.name:
       enabled: false
+    os.build.id:
+      enabled: false
     os.description:
       enabled: false
+    os.name:
+      enabled: false
     os.type:
       enabled: false
     os.version:

processor/resourcedetectionprocessor/internal/system/internal/metadata/generated_config_test.go

@@ -23,6 +23,14 @@ resource_attributes:
     description: The os.version
     type: string
     enabled: false
+  os.build.id:
+    description: The os.build.id
+    type: string
+    enabled: false
+  os.name:
+    description: The os.name
+    type: string
+    enabled: false
   host.arch:
     description: The host.arch
     type: string

processor/resourcedetectionprocessor/internal/system/internal/metadata/generated_resource.go

@@ -153,6 +153,20 @@ func (d *Detector) Detect(ctx context.Context) (resource pcommon.Resource, schem
 			d.rb.SetHostIP(hostIPAttribute)
 			d.rb.SetHostMac(hostMACAttribute)
 			d.rb.SetOsDescription(osDescription)
+			if d.cfg.ResourceAttributes.OsName.Enabled {
+				if osName, err2 := d.provider.OSName(ctx); err2 == nil {
+					d.rb.SetOsName(osName)
+				} else {
+					d.logger.Warn("failed to get OS name", zap.Error(err2))
+				}
+			}
+			if d.cfg.ResourceAttributes.OsBuildID.Enabled {
+				if osBuildID, err2 := d.provider.OSBuildID(ctx); err2 == nil {
+					d.rb.SetOsBuildID(osBuildID)
+				} else {
+					d.logger.Warn("failed to get OS build id", zap.Error(err2))
+				}
+			}
 			if len(cpuInfo) > 0 {
 				setHostCPUInfo(d, cpuInfo[0])
 			}

processor/resourcedetectionprocessor/internal/system/internal/metadata/generated_resource_test.go

@@ -88,6 +88,18 @@ func (m *mockMetadata) CPUInfo(_ context.Context) ([]cpu.InfoStat, error) {
 	return args.Get(0).([]cpu.InfoStat), args.Error(1)
 }
 
+// OSName returns a mock OS name.
+func (m *mockMetadata) OSName(_ context.Context) (string, error) {
+	args := m.MethodCalled("OSName")
+	return args.String(0), args.Error(1)
+}
+
+// OSBuildID returns a mock OS build ID.
+func (m *mockMetadata) OSBuildID(_ context.Context) (string, error) {
+	args := m.MethodCalled("OSBuildID")
+	return args.String(0), args.Error(1)
+}
+
 var (
 	testIPsAttribute = []any{"192.168.1.140", "fe80::abc2:4a28:737a:609e"}
 	testIPsAddresses = []net.IP{net.ParseIP(testIPsAttribute[0].(string)), net.ParseIP(testIPsAttribute[1].(string))}
@@ -405,6 +417,28 @@ func TestDetectCPUInfo(t *testing.T) {
 	assert.Equal(t, expected, res.Attributes().AsRaw())
 }
 
+func TestDetectOSNameAndBuildID(t *testing.T) {
+	md := &mockMetadata{}
+	md.On("FQDN").Return("fqdn", nil)
+	md.On("OSDescription").Return("desc", nil)
+	md.On("OSType").Return("type", nil)
+	md.On("OSVersion").Return("ver", nil)
+	md.On("OSName").Return("MyOS", nil)
+	md.On("OSBuildID").Return("Build123", nil)
+	md.On("HostArch").Return("amd64", nil)
+
+	cfg := metadata.DefaultResourceAttributesConfig()
+	cfg.OsName.Enabled = true
+	cfg.OsBuildID.Enabled = true
+	detector := newTestDetector(md, []string{"dns"}, cfg)
+	res, _, err := detector.Detect(context.Background())
+	require.NoError(t, err)
+	attrs := res.Attributes().AsRaw()
+	assert.Equal(t, "MyOS", attrs["os.name"])
+	assert.Equal(t, "Build123", attrs["os.build.id"])
+	md.AssertExpectations(t)
+}
+
 func newTestDetector(mock *mockMetadata, hostnameSources []string, resCfg metadata.ResourceAttributesConfig) *Detector {
 	return &Detector{
 		provider: mock,