Revert "Merge branch 'main' into feature/remote-debug"

This reverts commit 6d6333058c, reversing
changes made to 446aded1f7.

client/system/static_info.go

@@ -3,7 +3,12 @@
 package system
 
 import (
+	"context"
 	"sync"
+	"time"
+
+	"github.com/netbirdio/netbird/client/system/detect_cloud"
+	"github.com/netbirdio/netbird/client/system/detect_platform"
 )
 
 var (
@@ -11,26 +16,25 @@ var (
 	once       sync.Once
 )
 
-// StaticInfo is an object that contains machine information that does not change
-type StaticInfo struct {
-	SystemSerialNumber string
-	SystemProductName  string
-	SystemManufacturer string
-	Environment        Environment
-
-	// Windows specific fields
-	OSName       string
-	OSVersion    string
-	BuildVersion string
-}
-
-func updateStaticInfo() {
+func updateStaticInfo() StaticInfo {
 	once.Do(func() {
-		staticInfo = newStaticInfo()
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		wg := sync.WaitGroup{}
+		wg.Add(3)
+		go func() {
+			staticInfo.SystemSerialNumber, staticInfo.SystemProductName, staticInfo.SystemManufacturer = sysInfo()
+			wg.Done()
+		}()
+		go func() {
+			staticInfo.Environment.Cloud = detect_cloud.Detect(ctx)
+			wg.Done()
+		}()
+		go func() {
+			staticInfo.Environment.Platform = detect_platform.Detect(ctx)
+			wg.Done()
+		}()
+		wg.Wait()
 	})
-}
-
-func getStaticInfo() StaticInfo {
-	updateStaticInfo()
 	return staticInfo
 }