Adjust other provider

internal/mode/static/telemetry/collector.go

@@ -107,7 +107,10 @@ func (c DataCollectorImpl) Collect(ctx context.Context) (Data, error) {
 		return Data{}, fmt.Errorf("failed to collect cluster information: %w", err)
 	}
 
-	nodeCount := len(clusterInfo.Nodes.Items)
+	nodeCount, err := CollectNodeCount(ctx, c.cfg.K8sClientReader)
+	if err != nil {
+		return Data{}, fmt.Errorf("failed to collect node count: %w", err)
+	}
 
 	graphResourceCount, err := collectGraphResourceCount(c.cfg.GraphGetter, c.cfg.ConfigurationGetter)
 	if err != nil {
@@ -274,7 +277,6 @@ type clusterInformation struct {
 	Platform  string
 	Version   string
 	ClusterID string
-	Nodes     v1.NodeList
 }
 
 func collectClusterInformation(ctx context.Context, k8sClient client.Reader) (clusterInformation, error) {
@@ -289,8 +291,6 @@ func collectClusterInformation(ctx context.Context, k8sClient client.Reader) (cl
 		return clusterInformation{}, errors.New("failed to collect cluster information: NodeList length is zero")
 	}
 
-	clusterInfo.Nodes = nodes
-
 	var clusterID string
 	if clusterID, err = CollectClusterID(ctx, k8sClient); err != nil {
 		return clusterInformation{}, fmt.Errorf("failed to collect cluster information: %w", err)

internal/mode/static/telemetry/collector_test.go

@@ -541,7 +541,7 @@ var _ = Describe("Collector", Ordered, func() {
 			})
 
 			When("platform is none of the above", func() {
-				It("marks the platform as 'other: ' with whatever was in the providerID's providerName", func() {
+				It("marks the platform as 'other_' with whatever was in the providerID's providerName", func() {
 					nodes := &v1.NodeList{
 						Items: []v1.Node{
 							{
@@ -562,14 +562,14 @@ var _ = Describe("Collector", Ordered, func() {
 
 					k8sClientReader.ListCalls(createListCallsFunc(nodes))
 					expData.ClusterVersion = "1.29.2"
-					expData.ClusterPlatform = "other: other-cloud-provider"
+					expData.ClusterPlatform = "other_other-cloud-provider"
 
 					data, err := dataCollector.Collect(ctx)
 
 					Expect(err).To(BeNil())
 					Expect(expData).To(Equal(data))
 				})
-				It("marks the platform as 'other: ' when providerID is empty", func() {
+				It("marks the platform as 'other' when providerID is empty", func() {
 					nodes := &v1.NodeList{
 						Items: []v1.Node{
 							{
@@ -587,14 +587,14 @@ var _ = Describe("Collector", Ordered, func() {
 
 					k8sClientReader.ListCalls(createListCallsFunc(nodes))
 					expData.ClusterVersion = "1.29.2"
-					expData.ClusterPlatform = "other: "
+					expData.ClusterPlatform = "other"
 
 					data, err := dataCollector.Collect(ctx)
 
 					Expect(err).To(BeNil())
 					Expect(expData).To(Equal(data))
 				})
-				It("marks the platform as 'other: ' when providerID is missing '://' separator", func() {
+				It("marks the platform as 'other' when providerID is missing '://' separator", func() {
 					nodes := &v1.NodeList{
 						Items: []v1.Node{
 							{
@@ -615,7 +615,7 @@ var _ = Describe("Collector", Ordered, func() {
 
 					k8sClientReader.ListCalls(createListCallsFunc(nodes))
 					expData.ClusterVersion = "1.29.2"
-					expData.ClusterPlatform = "other: "
+					expData.ClusterPlatform = "other"
 
 					data, err := dataCollector.Collect(ctx)
 

internal/mode/static/telemetry/platform.go

@@ -38,6 +38,7 @@ const (
 	platformK3S       = "k3s"
 	platformOpenShift = "openshift"
 	platformRancher   = "rancher"
+	platformOther     = "other"
 )
 
 var multiDistributionPlatformExtractors = []platformExtractor{
@@ -76,10 +77,14 @@ func getPlatform(node v1.Node, namespaces v1.NamespaceList) string {
 
 	var providerName string
 	if prefix, _, found := strings.Cut(node.Spec.ProviderID, "://"); found {
-		providerName = prefix
+		providerName = strings.TrimSpace(prefix)
 	}
 
-	return "other: " + providerName
+	if providerName == "" {
+		return platformOther
+	}
+
+	return platformOther + "_" + providerName
 }
 
 func openShiftExtractor(state k8sState) (string, bool) {