cleanup

Signed-off-by: Said Altury <Said.Altury@ibm.com>

Author: SaidAltury-ibm

go.mod

@@ -58,7 +58,6 @@ require (
 	github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20250313153527-832db18b9478 // indirect
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
 	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/VictoriaMetrics/fastcache v1.12.2 // indirect
 	github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
 	github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
 	github.com/benbjohnson/clock v1.3.5 // indirect
@@ -117,7 +116,6 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/gopacket v1.1.19 // indirect
 	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
@@ -250,7 +248,6 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/sykesm/zap-logfmt v0.0.4 // indirect
-	github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect

go.sum

@@ -658,8 +658,6 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go
 github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
 github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/VictoriaMetrics/fastcache v1.12.2 h1:N0y9ASrJ0F6h0QaC3o6uJb3NIZ9VKLjCM7NQbSmF7WI=
-github.com/VictoriaMetrics/fastcache v1.12.2/go.mod h1:AmC+Nzz1+3G2eCPapF6UcsnkThDcMsQicp4xDukwJYI=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/ajstarks/deck v0.0.0-20200831202436-30c9fc6549a9/go.mod h1:JynElWSGnm/4RlzPXRlREEwqTHAN3T56Bv2ITsFT3gY=
@@ -670,7 +668,6 @@ github.com/alecthomas/kingpin/v2 v2.4.0 h1:f48lwail6p8zpO1bC4TxtqACaGqHYA22qkHjH
 github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE=
 github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 h1:t3eaIm0rUkzbrIewtiFmMK5RXHej2XnoXNhxVsAYUfg=
 github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs=
-github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
@@ -828,7 +825,6 @@ github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHk
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
 github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/fsouza/go-dockerclient v1.12.0 h1:S2f2crEUbBNCFiF06kR/GvioEB8EMsb3Td/bpawD+aU=
@@ -953,7 +949,6 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
 github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -1543,7 +1538,6 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
@@ -1555,8 +1549,6 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/sykesm/zap-logfmt v0.0.4 h1:U2WzRvmIWG1wDLCFY3sz8UeEmsdHQjHFNlIdmroVFaI=
 github.com/sykesm/zap-logfmt v0.0.4/go.mod h1:AuBd9xQjAe3URrWT1BBDk2v2onAZHkZkWRMiYZXiZWA=
-github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
-github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
 github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
 github.com/tedsuo/ifrit v0.0.0-20230330192023-5cba443a66c4/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0=
 github.com/tedsuo/ifrit v0.0.0-20230516164442-7862c310ad26 h1:mWCRvpoEMVlslxEvvptKgIUb35va9yj9Oq5wGw/er5I=
@@ -1994,7 +1986,6 @@ golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=

integration/nwo/txgen/service/metrics/collector.go

@@ -20,46 +20,38 @@ func NewCollector(p metrics.Provider) *collector {
 		supportsGetters: supportsGetters,
 
 		TotalTransferRequests: p.NewCounter(metrics.CounterOpts{
-			Namespace: "tx_gen",
-			Name:      "total_transfer",
-			Help:      "Total transfer requests executed",
+			Name: "total_transfer",
+			Help: "Total transfer requests executed",
 		}),
 		TotalSuccessTransferRequests: p.NewCounter(metrics.CounterOpts{
-			Namespace: "tx_gen",
-			Name:      "success_transfer",
-			Help:      "Success transfer requests executed",
+			Name: "success_transfer",
+			Help: "Success transfer requests executed",
 		}),
 		TransferDuration: p.NewHistogram(metrics.HistogramOpts{
-			Namespace: "tx_gen",
-			Name:      "transfer_duration",
-			Help:      "Duration of transfer requests executed",
+			Name: "transfer_duration",
+			Help: "Duration of transfer requests executed",
 		}),
 
 		TotalWithdrawRequests: p.NewCounter(metrics.CounterOpts{
-			Namespace: "tx_gen",
-			Name:      "total_withdraw",
-			Help:      "Total withdraw requests executed",
+			Name: "total_withdraw",
+			Help: "Total withdraw requests executed",
 		}),
 		TotalSuccessWithdrawRequests: p.NewCounter(metrics.CounterOpts{
-			Namespace: "tx_gen",
-			Name:      "success_withdraw",
-			Help:      "Success withdraw requests executed",
+			Name: "success_withdraw",
+			Help: "Success withdraw requests executed",
 		}),
 		WithdrawDuration: p.NewHistogram(metrics.HistogramOpts{
-			Namespace: "tx_gen",
-			Name:      "withdraw_duration",
-			Help:      "Duration of withdraw requests executed",
+			Name: "withdraw_duration",
+			Help: "Duration of withdraw requests executed",
 		}),
 
 		ActiveRequests: p.NewGauge(metrics.GaugeOpts{
-			Namespace: "tx_gen",
-			Name:      "active_requests",
-			Help:      "Currently active requests",
+			Name: "active_requests",
+			Help: "Currently active requests",
 		}),
 		TotalRequests: p.NewGauge(metrics.GaugeOpts{
-			Namespace: "tx_gen",
-			Name:      "total_transfer",
-			Help:      "Total requests executed (issue/transfer/balance/initiate)",
+			Name: "total_transfer",
+			Help: "Total requests executed (issue/transfer/balance/initiate)",
 		}),
 	}
 }

integration/nwo/txgen/service/metrics/metrics.go

@@ -39,19 +39,16 @@ func NewMetrics(p metrics.Provider) *Metrics {
 		supportsGetters: supportsGetters,
 
 		RequestsSent: p.NewCounter(metrics.CounterOpts{
-			Namespace:  "tx_gen",
 			Name:       "sent",
 			Help:       "Total transfer requests executed",
 			LabelNames: []string{OperationLabel},
 		}),
 		RequestsReceived: p.NewCounter(metrics.CounterOpts{
-			Namespace:  "tx_gen",
 			Name:       "received",
 			Help:       "Success transfer requests executed",
 			LabelNames: []string{OperationLabel, SuccessLabel},
 		}),
 		RequestDuration: p.NewHistogram(metrics.HistogramOpts{
-			Namespace:  "tx_gen",
 			Name:       "duration",
 			Help:       "Duration of transfer requests executed",
 			Buckets:    utils.ExponentialBucketTimeRange(0, 50*time.Second, 15),

token/core/zkatdlog/nogh/v1/metrics.go

@@ -12,13 +12,11 @@ import (
 
 var (
 	zkIssueDurationOpts = metrics.HistogramOpts{
-		Namespace:  "token_sdk_zkatdlog_nogh",
 		Name:       "issue_duration",
 		Help:       "Duration of zk issue token",
 		LabelNames: []string{"network", "channel", "namespace"},
 	}
 	zkTransferDurationOpts = metrics.HistogramOpts{
-		Namespace:  "token_sdk_zkatdlog_nogh",
 		Name:       "transfer_duration",
 		Help:       "Duration of zk transfer token",
 		LabelNames: []string{"network", "channel", "namespace"},

token/services/certifier/interactive/metrics.go

@@ -12,7 +12,6 @@ import (
 
 var (
 	certifiedTokens = metrics.CounterOpts{
-		Namespace:  "certification_interactive",
 		Name:       "certified_tokens",
 		Help:       "The number of tokens certified.",
 		LabelNames: []string{"network", "channel", "namespace"},

token/services/identity/idemix/cache/metrics.go

@@ -12,7 +12,6 @@ import (
 
 var (
 	LevelOpts = metrics.GaugeOpts{
-		Namespace:  "idemix",
 		Name:       "cache_level",
 		Help:       "Level of the idemix cache",
 		LabelNames: []string{"network", "channel", "namespace"},

token/services/identity/wallet/metrics.go

@@ -12,7 +12,6 @@ import (
 
 var (
 	CacheLevelOpts = metrics.GaugeOpts{
-		Namespace:  "wallet",
 		Name:       "recipient_data_cache_level",
 		Help:       "Level of the wallet recipient data cache",
 		LabelNames: []string{"network", "channel", "namespace"},

token/services/selector/sherdlock/metrics.go

@@ -24,7 +24,6 @@ type Metrics struct {
 func newMetrics(p metrics.Provider) *Metrics {
 	return &Metrics{
 		UnspentTokensInvocations: p.NewCounter(metrics.CounterOpts{
-			Namespace:  "sherdlock",
 			Name:       "unspent_tokens_invocations",
 			Help:       "The number of invocations",
 			LabelNames: []string{fetcherTypeLabel},

token/services/ttx/metrics.go

@@ -17,19 +17,16 @@ var (
 	spKey = reflect.TypeOf((*Metrics)(nil))
 
 	endorsedTransactions = metrics.CounterOpts{
-		Namespace:  "ttx",
 		Name:       "endorsed_transactions",
 		Help:       "The number of endorsed transactions.",
 		LabelNames: []string{"network", "channel", "namespace"},
 	}
 	auditApprovedTransactions = metrics.CounterOpts{
-		Namespace:  "ttx",
 		Name:       "audit_approved_transactions",
 		Help:       "The number of approved transactions by the auditor.",
 		LabelNames: []string{"network", "channel", "namespace"},
 	}
 	acceptedTransactions = metrics.CounterOpts{
-		Namespace:  "ttx",
 		Name:       "accepted_transactions",
 		Help:       "The number of accepted transactions.",
 		LabelNames: []string{"network", "channel", "namespace"},