Skip to content

Commit f35482e

Browse files
ekkinoxekkinox
authored
feat(httpserver): Updated dependencies (#141)
1 parent 7990a76 commit f35482e

File tree

6 files changed

+135
-552
lines changed

6 files changed

+135
-552
lines changed

‎httpserver/factory_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,15 +1966,15 @@ func TestCreateWithRequestMetricsAndWithNormalization(t *testing.T) {
19661966
assert.Contains(t, rec.Body.String(), `baz`)
19671967

19681968
expectedCounterMetric := `
1969-
# HELP namespace_subsystem_requests_total Number of processed HTTP requests
1970-
# TYPE namespace_subsystem_requests_total counter
1971-
namespace_subsystem_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1
1969+
# HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests
1970+
# TYPE namespace_subsystem_httpserver_requests_total counter
1971+
namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1
19721972
`
19731973

19741974
err = testutil.GatherAndCompare(
19751975
registry,
19761976
strings.NewReader(expectedCounterMetric),
1977-
"namespace_subsystem_requests_total",
1977+
"namespace_subsystem_httpserver_requests_total",
19781978
)
19791979
assert.NoError(t, err)
19801980
}
@@ -2009,15 +2009,15 @@ func TestCreateWithRequestMetricsAndWithoutNormalization(t *testing.T) {
20092009
assert.Contains(t, rec.Body.String(), `baz`)
20102010

20112011
expectedCounterMetric := `
2012-
# HELP namespace_subsystem_requests_total Number of processed HTTP requests
2013-
# TYPE namespace_subsystem_requests_total counter
2014-
namespace_subsystem_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1
2012+
# HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests
2013+
# TYPE namespace_subsystem_httpserver_requests_total counter
2014+
namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1
20152015
`
20162016

20172017
err = testutil.GatherAndCompare(
20182018
registry,
20192019
strings.NewReader(expectedCounterMetric),
2020-
"namespace_subsystem_requests_total",
2020+
"namespace_subsystem_httpserver_requests_total",
20212021
)
20222022
assert.NoError(t, err)
20232023
}

‎httpserver/go.mod‎

Lines changed: 36 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ module github.com/ankorstore/yokai/httpserver
33
go 1.20
44

55
require (
6-
github.com/ankorstore/yokai/config v1.1.0
7-
github.com/ankorstore/yokai/generate v1.0.0
8-
github.com/ankorstore/yokai/healthcheck v1.0.0
9-
github.com/ankorstore/yokai/log v1.1.0
10-
github.com/ankorstore/yokai/trace v1.0.0
11-
github.com/go-errors/errors v1.4.2
12-
github.com/labstack/echo/v4 v4.11.1
13-
github.com/labstack/gommon v0.4.0
6+
github.com/ankorstore/yokai/config v1.3.0
7+
github.com/ankorstore/yokai/generate v1.1.0
8+
github.com/ankorstore/yokai/healthcheck v1.1.0
9+
github.com/ankorstore/yokai/log v1.2.0
10+
github.com/ankorstore/yokai/trace v1.2.0
11+
github.com/go-errors/errors v1.5.1
12+
github.com/labstack/echo/v4 v4.11.4
13+
github.com/labstack/gommon v0.4.2
1414
github.com/prometheus/client_golang v1.19.0
15-
github.com/rs/zerolog v1.29.1
16-
github.com/stretchr/testify v1.8.4
17-
go.opentelemetry.io/otel v1.16.0
18-
go.opentelemetry.io/otel/sdk v1.16.0
19-
go.opentelemetry.io/otel/trace v1.16.0
15+
github.com/rs/zerolog v1.32.0
16+
github.com/stretchr/testify v1.9.0
17+
go.opentelemetry.io/otel v1.24.0
18+
go.opentelemetry.io/otel/sdk v1.24.0
19+
go.opentelemetry.io/otel/trace v1.24.0
2020
)
2121

2222
require (
@@ -25,52 +25,49 @@ require (
2525
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2727
github.com/fsnotify/fsnotify v1.7.0 // indirect
28-
github.com/go-logr/logr v1.2.4 // indirect
28+
github.com/go-logr/logr v1.4.1 // indirect
2929
github.com/go-logr/stdr v1.2.2 // indirect
3030
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
31-
github.com/golang/protobuf v1.5.3 // indirect
32-
github.com/google/uuid v1.4.0 // indirect
33-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
31+
github.com/golang/protobuf v1.5.4 // indirect
32+
github.com/google/uuid v1.6.0 // indirect
33+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
3434
github.com/hashicorp/hcl v1.0.0 // indirect
3535
github.com/magiconair/properties v1.8.7 // indirect
3636
github.com/mattn/go-colorable v0.1.13 // indirect
37-
github.com/mattn/go-isatty v0.0.19 // indirect
37+
github.com/mattn/go-isatty v0.0.20 // indirect
3838
github.com/mitchellh/mapstructure v1.5.0 // indirect
39-
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
39+
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
4040
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
41-
github.com/prometheus/client_model v0.5.0 // indirect
41+
github.com/prometheus/client_model v0.6.0 // indirect
4242
github.com/prometheus/common v0.48.0 // indirect
43-
github.com/prometheus/procfs v0.12.0 // indirect
43+
github.com/prometheus/procfs v0.13.0 // indirect
4444
github.com/sagikazarmark/locafero v0.4.0 // indirect
4545
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
4646
github.com/sourcegraph/conc v0.3.0 // indirect
4747
github.com/spf13/afero v1.11.0 // indirect
4848
github.com/spf13/cast v1.6.0 // indirect
4949
github.com/spf13/pflag v1.0.5 // indirect
5050
github.com/spf13/viper v1.18.2 // indirect
51-
github.com/stretchr/objx v0.5.0 // indirect
51+
github.com/stretchr/objx v0.5.2 // indirect
5252
github.com/subosito/gotenv v1.6.0 // indirect
5353
github.com/valyala/bytebufferpool v1.0.0 // indirect
5454
github.com/valyala/fasttemplate v1.2.2 // indirect
55-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
56-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
57-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
58-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
59-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
60-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
61-
go.uber.org/atomic v1.9.0 // indirect
62-
go.uber.org/multierr v1.9.0 // indirect
63-
golang.org/x/crypto v0.18.0 // indirect
64-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
65-
golang.org/x/net v0.20.0 // indirect
66-
golang.org/x/sys v0.16.0 // indirect
55+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
56+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
57+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
58+
go.opentelemetry.io/otel/metric v1.24.0 // indirect
59+
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
60+
go.uber.org/multierr v1.11.0 // indirect
61+
golang.org/x/crypto v0.21.0 // indirect
62+
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
63+
golang.org/x/net v0.22.0 // indirect
64+
golang.org/x/sys v0.18.0 // indirect
6765
golang.org/x/text v0.14.0 // indirect
6866
golang.org/x/time v0.5.0 // indirect
69-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
70-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
71-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
72-
google.golang.org/grpc v1.59.0 // indirect
73-
google.golang.org/protobuf v1.32.0 // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
68+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
69+
google.golang.org/grpc v1.62.1 // indirect
70+
google.golang.org/protobuf v1.33.0 // indirect
7471
gopkg.in/ini.v1 v1.67.0 // indirect
7572
gopkg.in/yaml.v3 v3.0.1 // indirect
7673
)

0 commit comments

Comments
 (0)