APP-6696 pass new AgentInfo.PlatformTags in config/reader.go

config/reader.go

@@ -1,6 +1,7 @@
 package config
 
 import (
+ "bufio"
  "bytes"
  "context"
  "encoding/json"
@@ -11,6 +12,7 @@ import (
  "os"
  "path/filepath"
  "runtime"
+ "strings"
  "time"
 
  "github.com/a8m/envsubst"
@@ -42,6 +44,50 @@ const (
  LocalPackagesSuffix = "-local"
 )
 
+func parseOsRelease(body *bufio.Reader) map[string]string {
+ ret := make(map[string]string)
+ for {
+ line, err := body.ReadString('\n')
+ if err != nil {
+ return ret
+ }
+ key, value, _ := strings.Cut(line, "=")
+ // note: we trim `value` rather than `line` because os_version value is quoted sometimes.
+ ret[key] = strings.Trim(value, "\n\"")
+ }
+}
+
+// append key:value pair to orig if value is non-empty.
+func appendPairIfNonempty(orig []string, key, value string) []string {
+ if value != "" {
+ return append(orig, key+":"+value)
+ }
+ return orig
+}
+
+// This reads the granular platform constraints (os version, distro, etc).
+// This further constrains the basic runtime.GOOS/GOARCH stuff in getAgentInfo
+// so module authors can publish builds with ABI or SDK dependencies. The
+// list of tags returned by this function is expected to grow.
+func readExtendedPlatformTags() []string {
+ // TODO(APP-6696): CI in multiple environments (alpine + mac), darwin support.
+ tags := make([]string, 0, 3)
+ if runtime.GOOS == "linux" {
+ if body, err := os.Open("/etc/os-release"); err != nil {
+ if !os.IsNotExist(err) {
+ logging.Global().Errorw("can't open /etc/os-release, modules may not load correctly", "err", err)
+ }
+ } else {
+ defer body.Close() //nolint:errcheck
+ osRelease := parseOsRelease(bufio.NewReader(body))
+ tags = appendPairIfNonempty(tags, "distro", osRelease["ID"])
+ tags = appendPairIfNonempty(tags, "os_version", osRelease["VERSION_ID"])
+ tags = appendPairIfNonempty(tags, "codename", osRelease["VERSION_CODENAME"])
+ }
+ }
+ return tags
+}
+
 func getAgentInfo() (*apppb.AgentInfo, error) {
  hostname, err := os.Hostname()
  if err != nil {
@@ -70,12 +116,13 @@ func getAgentInfo() (*apppb.AgentInfo, error) {
  platform := fmt.Sprintf("%s/%s", runtime.GOOS, arch)
 
  return &apppb.AgentInfo{
- Host: hostname,
- Ips: ips,
- Os: runtime.GOOS,
- Version: Version,
- GitRevision: GitRevision,
- Platform: &platform,
+ Host: hostname,
+ Ips: ips,
+ Os: runtime.GOOS,
+ Version: Version,
+ GitRevision: GitRevision,
+ Platform: &platform,
+ PlatformTags: readExtendedPlatformTags(),
  }, nil
 }
 

config/reader_test.go

@@ -5,6 +5,7 @@ import (
  "fmt"
  "io/fs"
  "os"
+ "runtime"
  "strings"
  "testing"
  "time"
@@ -394,3 +395,18 @@ func TestReadTLSFromCache(t *testing.T) {
  test.That(t, err, test.ShouldBeNil)
  })
 }
+
+func TestReadExtendedPlatformTags(t *testing.T) {
+ if runtime.GOOS != "linux" {
+ t.Skip("skipping platform tags test on non-linux")
+ }
+ tags := readExtendedPlatformTags()
+ test.That(t, len(tags), test.ShouldBeGreaterThanOrEqualTo, 2)
+}
+
+func TestAppendPairIfNonempty(t *testing.T) {
+ arr := make([]string, 0, 1)
+ arr = appendPairIfNonempty(arr, "x", "y")
+ arr = appendPairIfNonempty(arr, "a", "")
+ test.That(t, arr, test.ShouldResemble, []string{"x:y"})
+}

go.mod

@@ -85,7 +85,7 @@ require (
  go.uber.org/atomic v1.11.0
  go.uber.org/multierr v1.11.0
  go.uber.org/zap v1.27.0
- go.viam.com/api v0.1.348
+ go.viam.com/api v0.1.349-0.20241020221202-d70a1c788662
  go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2
  go.viam.com/utils v0.1.106
  goji.io v2.0.2+incompatible

go.sum

@@ -1645,8 +1645,8 @@ go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-go.viam.com/api v0.1.348 h1:pLT6UiYaAvt8ckx2KA38MvyBU1s/KoiGn4/vzC/T2uU=
-go.viam.com/api v0.1.348/go.mod h1:5lpVRxMsKFCaahqsnJfPGwJ9baoQ6PIKQu3lxvy6Wtw=
+go.viam.com/api v0.1.349-0.20241020221202-d70a1c788662 h1:XWqxF4TOwCRbhwpicIrBY6DA3Xd6TbPzBDW2EtuG9Wk=
+go.viam.com/api v0.1.349-0.20241020221202-d70a1c788662/go.mod h1:5lpVRxMsKFCaahqsnJfPGwJ9baoQ6PIKQu3lxvy6Wtw=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2 h1:oBiK580EnEIzgFLU4lHOXmGAE3MxnVbeR7s1wp/F3Ps=
 go.viam.com/test v1.1.1-0.20220913152726-5da9916c08a2/go.mod h1:XM0tej6riszsiNLT16uoyq1YjuYPWlRBweTPRDanIts=
 go.viam.com/utils v0.1.106 h1:LcmVUBBV7ipzl4to4RJ4knj5bVdATU8reO77HNMimdA=