Skip to content

Commit c6fd37a

Browse files
committed
Merge branch 'carlosedp-prometheus'
2 parents 4db66e1 + 0245665 commit c6fd37a

File tree

6 files changed

+686
-8
lines changed

6 files changed

+686
-8
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
language: go
22
go:
3+
- 1.13.x
34
- 1.12.x
4-
- 1.11.x
55
- tip
66
env:
77
- GO111MODULE=on
88
install:
99
- make dependency
1010
script:
11-
- make test
11+
- make test
1212
after_success:
1313
- bash <(curl -s https://codecov.io/bash)
1414
matrix:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ Name | Description | Author
1212
--- | --- | ---
1313
[casbin](https://github.com/casbin/casbin) | Access control library | [hsluoyz](https://github.com/hsluoyz)
1414
session | Session middleware backed by [gorilla/sessions](https://github.com/gorilla/sessions) | [vishr](https://github.com/vishr)
15-
jaegertracing | Jaeger tracer middleware | [carlosedp](https://github.com/carlosedp)
15+
jaegertracing | Jaeger tracer middleware | [carlosedp](https://github.com/carlosedp)
16+
prometheus | Prometheus metrics | [carlosedp](https://github.com/carlosedp)

go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
module github.com/labstack/echo-contrib
22

33
require (
4+
github.com/appleboy/gofight/v2 v2.1.1
45
github.com/casbin/casbin/v2 v2.0.0
5-
github.com/casbin/casbin/v2 v2.0.0
66
github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect
77
github.com/gorilla/context v1.1.1
88
github.com/gorilla/sessions v1.1.3
99
github.com/labstack/echo/v4 v4.1.6
10+
github.com/labstack/gommon v0.2.9
1011
github.com/opentracing/opentracing-go v1.1.0
1112
github.com/pkg/errors v0.8.1 // indirect
13+
github.com/prometheus/client_golang v1.1.0
1214
github.com/stretchr/testify v1.3.0
1315
github.com/uber-go/atomic v1.4.0 // indirect
1416
github.com/uber/jaeger-client-go v2.17.0+incompatible
1517
github.com/uber/jaeger-lib v2.1.1+incompatible // indirect
1618
go.uber.org/atomic v1.4.0 // indirect
17-
golang.org/x/sys v0.0.0-20190610200419-93c9922d18ae // indirect
1819
)
1920

20-
go 1.13
21+
go 1.12

0 commit comments

Comments
 (0)