Merge pull request #38 from damsallem/main

Fix the parsing of metaKey to resolve namespaces
criteo · Feb 21, 2024 · 3441cf9 · 3441cf9
2 parents a030629 + 08c4244
commit 3441cf9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/aerospike/config.go b/pkg/aerospike/config.go
@@ -64,7 +64,7 @@ var (
 		TLSTag:                            "tls",
 		TLSHostnameMetaKey:                "tls-hostname",
 		NamespaceMetaKey:                  "",
-		NamespaceMetaKeyPrefix:            "",
+		NamespaceMetaKeyPrefix:            "aerospike-monitoring-",
 		MonitoringSet:                     "monitoring",
 		LatencyKeyPrefix:                  "monitoring_latency_",
 		DurabilityKeyPrefix:               "monitoring_durability_",

diff --git a/pkg/aerospike/discovery.go b/pkg/aerospike/discovery.go
@@ -96,8 +96,10 @@ func (conf AerospikeProbeConfig) getNamespacesFromEntry(logger log.Logger, entry
 		if !ready {
 			continue
 		}
-		ns := strings.Split(metaKey, "-")[2] // MetaKey is like : "aerospike-monitoring-closeststore"
-		namespaces[ns] = struct{}{}
+		ns := metaKey[len(conf.AerospikeEndpointConfig.NamespaceMetaKeyPrefix):] // MetaKey is like : "aerospike-monitoring-closeststore"
+		if len(ns) > 0 {
+			namespaces[ns] = struct{}{}
+		}
 	}
 
 	// DEPRECATED way to get namespaces in case of fallback required or empty namespaces with the new method