Skip to content

Commit f111cc0

Browse files
mblaschkemblaschke
committed
switch to github.com/webdevops/go-common
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 45d6a17 commit f111cc0

13 files changed

+46
-22
lines changed

‎go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ require (
1111
github.com/prometheus/common v0.32.1 // indirect
1212
github.com/prometheus/procfs v0.7.3 // indirect
1313
github.com/sirupsen/logrus v1.8.1
14-
github.com/webdevops/go-prometheus-common v0.0.0-20220213124313-1d520ce7593d
1514
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
16-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
15+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
1716
google.golang.org/protobuf v1.27.1 // indirect
1817
)
1918

20-
require github.com/patrickmn/go-cache v2.1.0+incompatible
19+
require (
20+
github.com/patrickmn/go-cache v2.1.0+incompatible
21+
github.com/webdevops/go-common v0.0.0-20220406110653-237539a358b2
22+
)
2123

2224
require (
2325
github.com/beorn7/perks v1.0.1 // indirect

‎go.sum‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
3131
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3232
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3333
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
34+
github.com/Azure/azure-sdk-for-go v63.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
3435
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
3536
github.com/Azure/go-autorest/autorest v0.11.24/go.mod h1:G6kyRlFnTuSbEYkQGawPfsCswgme4iYf6rfSKUDzbCc=
3637
github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ=
3738
github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74=
3839
github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k=
40+
github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
41+
github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
3942
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
4043
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
4144
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -205,8 +208,8 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
205208
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
206209
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
207210
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
208-
github.com/webdevops/go-prometheus-common v0.0.0-20220213124313-1d520ce7593d h1:CtLs90jvYYh6b+e9xa37jX2JVEerxVQLMDpHnU85+gI=
209-
github.com/webdevops/go-prometheus-common v0.0.0-20220213124313-1d520ce7593d/go.mod h1:xlUEdI06d5YFMOtbdRoRkANLkyQFP/YI+E4UJydVCY0=
211+
github.com/webdevops/go-common v0.0.0-20220406110653-237539a358b2 h1:ZK31iWMbk0TkSCof5C8ukGmbJ86HbvN41mJilpROL20=
212+
github.com/webdevops/go-common v0.0.0-20220406110653-237539a358b2/go.mod h1:SqjH91aPqrsvnigkx6+XyuX9TYN7+ymaIcV9OJy5DhA=
210213
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
211214
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
212215
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -342,8 +345,8 @@ golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBc
342345
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
343346
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
344347
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
345-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 h1:rm+CHSpPEEW2IsXUib1ThaHIjuBVZjxNgSKmBLFfD4c=
346-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
348+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 h1:OH54vjqzRWmbJ62fjuhxy7AxFFgoHN0/DPc/UrL8cAs=
349+
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
347350
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
348351
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
349352
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎metrics_agentpool.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
9+
710
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
911
)
1012

1113
type MetricsCollectorAgentPool struct {

‎metrics_build.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ package main
22

33
import (
44
"context"
5+
"time"
6+
57
"github.com/prometheus/client_golang/prometheus"
68
log "github.com/sirupsen/logrus"
9+
prometheusCommon "github.com/webdevops/go-common/prometheus"
10+
711
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
9-
"time"
1012
)
1113

1214
type MetricsCollectorBuild struct {

‎metrics_deployment.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
9+
710
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
911
)
1012

1113
type MetricsCollectorDeployment struct {

‎metrics_general.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
7-
prometheusCommon "github.com/webdevops/go-prometheus-common"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
89
)
910

1011
type MetricsCollectorGeneral struct {

‎metrics_latest_build.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
9+
710
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
911
)
1012

1113
type MetricsCollectorLatestBuild struct {

‎metrics_project.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
9+
710
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
911
)
1012

1113
type MetricsCollectorProject struct {

‎metrics_pullrequest.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ package main
22

33
import (
44
"context"
5+
56
"github.com/prometheus/client_golang/prometheus"
67
log "github.com/sirupsen/logrus"
8+
prometheusCommon "github.com/webdevops/go-common/prometheus"
9+
710
devopsClient "github.com/webdevops/azure-devops-exporter/azure-devops-client"
8-
prometheusCommon "github.com/webdevops/go-prometheus-common"
911
)
1012

1113
type MetricsCollectorPullRequest struct {

‎metrics_query.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ package main
22

33
import (
44
"context"
5+
"strings"
6+
57
"github.com/prometheus/client_golang/prometheus"
68
log "github.com/sirupsen/logrus"
7-
prometheusCommon "github.com/webdevops/go-prometheus-common"
8-
"strings"
9+
prometheusCommon "github.com/webdevops/go-common/prometheus"
910
)
1011

1112
type MetricsCollectorQuery struct {

0 commit comments

Comments
 (0)