Skip to content

Commit 32d781c

Browse files
mblaschkemblaschke
committed
refactoring #2
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 0a1416c commit 32d781c

12 files changed

Lines changed: 29 additions & 42 deletions

‎metrics_agentpool.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
3636
"isHosted",
3737
},
3838
)
39+
prometheus.MustRegister(m.prometheus.agentPool)
3940

4041
m.prometheus.agentPoolSize = prometheus.NewGaugeVec(
4142
prometheus.GaugeOpts{
@@ -46,6 +47,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
4647
"agentPoolID",
4748
},
4849
)
50+
prometheus.MustRegister(m.prometheus.agentPoolSize)
4951

5052
m.prometheus.agentPoolAgent = prometheus.NewGaugeVec(
5153
prometheus.GaugeOpts{
@@ -65,6 +67,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
6567
"hasAssignedRequest",
6668
},
6769
)
70+
prometheus.MustRegister(m.prometheus.agentPoolAgent)
6871

6972
m.prometheus.agentPoolAgentStatus = prometheus.NewGaugeVec(
7073
prometheus.GaugeOpts{
@@ -76,6 +79,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
7679
"type",
7780
},
7881
)
82+
prometheus.MustRegister(m.prometheus.agentPoolAgentStatus)
7983

8084
m.prometheus.agentPoolAgentJob = prometheus.NewGaugeVec(
8185
prometheus.GaugeOpts{
@@ -91,6 +95,7 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
9195
"scopeID",
9296
},
9397
)
98+
prometheus.MustRegister(m.prometheus.agentPoolAgentJob)
9499

95100
m.prometheus.agentPoolQueueLength = prometheus.NewGaugeVec(
96101
prometheus.GaugeOpts{
@@ -101,12 +106,6 @@ func (m *MetricsCollectorAgentPool) Setup(collector *CollectorAgentPool) {
101106
"agentPoolID",
102107
},
103108
)
104-
105-
prometheus.MustRegister(m.prometheus.agentPool)
106-
prometheus.MustRegister(m.prometheus.agentPoolSize)
107-
prometheus.MustRegister(m.prometheus.agentPoolAgent)
108-
prometheus.MustRegister(m.prometheus.agentPoolAgentStatus)
109-
prometheus.MustRegister(m.prometheus.agentPoolAgentJob)
110109
prometheus.MustRegister(m.prometheus.agentPoolQueueLength)
111110
}
112111

‎metrics_build.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ func (m *MetricsCollectorBuild) Setup(collector *CollectorProject) {
4747
"url",
4848
},
4949
)
50+
prometheus.MustRegister(m.prometheus.build)
5051

5152
m.prometheus.buildStatus = prometheus.NewGaugeVec(
5253
prometheus.GaugeOpts{
@@ -61,6 +62,7 @@ func (m *MetricsCollectorBuild) Setup(collector *CollectorProject) {
6162
"type",
6263
},
6364
)
65+
prometheus.MustRegister(m.prometheus.buildStatus)
6466

6567
m.prometheus.buildDefinition = prometheus.NewGaugeVec(
6668
prometheus.GaugeOpts{
@@ -76,9 +78,6 @@ func (m *MetricsCollectorBuild) Setup(collector *CollectorProject) {
7678
"url",
7779
},
7880
)
79-
80-
prometheus.MustRegister(m.prometheus.build)
81-
prometheus.MustRegister(m.prometheus.buildStatus)
8281
prometheus.MustRegister(m.prometheus.buildDefinition)
8382
}
8483

‎metrics_deployment.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ func (m *MetricsCollectorDeployment) Setup(collector *CollectorProject) {
4242
"approvedBy",
4343
},
4444
)
45+
prometheus.MustRegister(m.prometheus.deployment)
4546

4647
m.prometheus.deploymentStatus = prometheus.NewGaugeVec(
4748
prometheus.GaugeOpts{
@@ -54,8 +55,6 @@ func (m *MetricsCollectorDeployment) Setup(collector *CollectorProject) {
5455
"type",
5556
},
5657
)
57-
58-
prometheus.MustRegister(m.prometheus.deployment)
5958
prometheus.MustRegister(m.prometheus.deploymentStatus)
6059
}
6160

‎metrics_general.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ func (m *MetricsCollectorGeneral) Setup(collector *CollectorGeneral) {
2828
"type",
2929
},
3030
)
31-
3231
prometheus.MustRegister(m.prometheus.stats)
3332
}
3433

‎metrics_latest_build.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ func (m *MetricsCollectorLatestBuild) Setup(collector *CollectorProject) {
4141
"url",
4242
},
4343
)
44+
prometheus.MustRegister(m.prometheus.build)
4445

4546
m.prometheus.buildStatus = prometheus.NewGaugeVec(
4647
prometheus.GaugeOpts{
@@ -54,8 +55,6 @@ func (m *MetricsCollectorLatestBuild) Setup(collector *CollectorProject) {
5455
"type",
5556
},
5657
)
57-
58-
prometheus.MustRegister(m.prometheus.build)
5958
prometheus.MustRegister(m.prometheus.buildStatus)
6059
}
6160

‎metrics_project.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ func (m *MetricsCollectorProject) Setup(collector *CollectorProject) {
3030
"projectName",
3131
},
3232
)
33-
3433
prometheus.MustRegister(m.prometheus.project)
3534
}
3635

‎metrics_pullrequest.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ func (m *MetricsCollectorPullRequest) Setup(collector *CollectorProject) {
3939
"creator",
4040
},
4141
)
42+
prometheus.MustRegister(m.prometheus.pullRequest)
4243

4344
m.prometheus.pullRequestStatus = prometheus.NewGaugeVec(
4445
prometheus.GaugeOpts{
@@ -52,6 +53,7 @@ func (m *MetricsCollectorPullRequest) Setup(collector *CollectorProject) {
5253
"type",
5354
},
5455
)
56+
prometheus.MustRegister(m.prometheus.pullRequestStatus)
5557

5658
m.prometheus.pullRequestLabel = prometheus.NewGaugeVec(
5759
prometheus.GaugeOpts{
@@ -66,9 +68,6 @@ func (m *MetricsCollectorPullRequest) Setup(collector *CollectorProject) {
6668
"active",
6769
},
6870
)
69-
70-
prometheus.MustRegister(m.prometheus.pullRequest)
71-
prometheus.MustRegister(m.prometheus.pullRequestStatus)
7271
prometheus.MustRegister(m.prometheus.pullRequestLabel)
7372
}
7473

‎metrics_query.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ func (m *MetricsCollectorQuery) Setup(collector *CollectorQuery) {
3131
"queryPath",
3232
},
3333
)
34+
prometheus.MustRegister(m.prometheus.workItemCount)
3435

3536
m.prometheus.workItemData = prometheus.NewGaugeVec(
3637
prometheus.GaugeOpts{
@@ -49,8 +50,6 @@ func (m *MetricsCollectorQuery) Setup(collector *CollectorQuery) {
4950
"closedDate",
5051
},
5152
)
52-
53-
prometheus.MustRegister(m.prometheus.workItemCount)
5453
prometheus.MustRegister(m.prometheus.workItemData)
5554
}
5655

‎metrics_release.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
4444
"url",
4545
},
4646
)
47+
prometheus.MustRegister(m.prometheus.release)
4748

4849
m.prometheus.releaseArtifact = prometheus.NewGaugeVec(
4950
prometheus.GaugeOpts{
@@ -62,6 +63,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
6263
"version",
6364
},
6465
)
66+
prometheus.MustRegister(m.prometheus.releaseArtifact)
6567

6668
m.prometheus.releaseEnvironment = prometheus.NewGaugeVec(
6769
prometheus.GaugeOpts{
@@ -79,6 +81,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
7981
"rank",
8082
},
8183
)
84+
prometheus.MustRegister(m.prometheus.releaseEnvironment)
8285

8386
m.prometheus.releaseEnvironmentStatus = prometheus.NewGaugeVec(
8487
prometheus.GaugeOpts{
@@ -93,6 +96,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
9396
"type",
9497
},
9598
)
99+
prometheus.MustRegister(m.prometheus.releaseEnvironmentStatus)
96100

97101
m.prometheus.releaseEnvironmentApproval = prometheus.NewGaugeVec(
98102
prometheus.GaugeOpts{
@@ -114,6 +118,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
114118
"approvedBy",
115119
},
116120
)
121+
prometheus.MustRegister(m.prometheus.releaseEnvironmentApproval)
117122

118123
m.prometheus.releaseDefinition = prometheus.NewGaugeVec(
119124
prometheus.GaugeOpts{
@@ -129,6 +134,7 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
129134
"url",
130135
},
131136
)
137+
prometheus.MustRegister(m.prometheus.releaseDefinition)
132138

133139
m.prometheus.releaseDefinitionEnvironment = prometheus.NewGaugeVec(
134140
prometheus.GaugeOpts{
@@ -146,13 +152,6 @@ func (m *MetricsCollectorRelease) Setup(collector *CollectorProject) {
146152
"badgeUrl",
147153
},
148154
)
149-
150-
prometheus.MustRegister(m.prometheus.release)
151-
prometheus.MustRegister(m.prometheus.releaseArtifact)
152-
prometheus.MustRegister(m.prometheus.releaseEnvironment)
153-
prometheus.MustRegister(m.prometheus.releaseEnvironmentApproval)
154-
prometheus.MustRegister(m.prometheus.releaseEnvironmentStatus)
155-
prometheus.MustRegister(m.prometheus.releaseDefinition)
156155
prometheus.MustRegister(m.prometheus.releaseDefinitionEnvironment)
157156
}
158157

‎metrics_repository.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func (m *MetricsCollectorRepository) Setup(collector *CollectorProject) {
3434
"repositoryName",
3535
},
3636
)
37+
prometheus.MustRegister(m.prometheus.repository)
3738

3839
m.prometheus.repositoryStats = prometheus.NewGaugeVec(
3940
prometheus.GaugeOpts{
@@ -46,6 +47,7 @@ func (m *MetricsCollectorRepository) Setup(collector *CollectorProject) {
4647
"type",
4748
},
4849
)
50+
prometheus.MustRegister(m.prometheus.repositoryStats)
4951

5052
m.prometheus.repositoryCommits = prometheus.NewCounterVec(
5153
prometheus.CounterOpts{
@@ -57,6 +59,8 @@ func (m *MetricsCollectorRepository) Setup(collector *CollectorProject) {
5759
"repositoryID",
5860
},
5961
)
62+
prometheus.MustRegister(m.prometheus.repositoryCommits)
63+
6064
m.prometheus.repositoryPushes = prometheus.NewCounterVec(
6165
prometheus.CounterOpts{
6266
Name: "azure_devops_repository_pushes",
@@ -67,10 +71,6 @@ func (m *MetricsCollectorRepository) Setup(collector *CollectorProject) {
6771
"repositoryID",
6872
},
6973
)
70-
71-
prometheus.MustRegister(m.prometheus.repository)
72-
prometheus.MustRegister(m.prometheus.repositoryStats)
73-
prometheus.MustRegister(m.prometheus.repositoryCommits)
7474
prometheus.MustRegister(m.prometheus.repositoryPushes)
7575
}
7676

0 commit comments

Comments
 (0)