Skip to content

Commit

Permalink
feat(httpserver): Updated dependencies (#141)
Browse files Browse the repository at this point in the history
  • Loading branch information
ekkinox committed Mar 14, 2024
1 parent 7990a76 commit f35482e
Show file tree
Hide file tree
Showing 6 changed files with 135 additions and 552 deletions.
16 changes: 8 additions & 8 deletions httpserver/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1966,15 +1966,15 @@ func TestCreateWithRequestMetricsAndWithNormalization(t *testing.T) {
assert.Contains(t, rec.Body.String(), `baz`)

expectedCounterMetric := `
# HELP namespace_subsystem_requests_total Number of processed HTTP requests
# TYPE namespace_subsystem_requests_total counter
namespace_subsystem_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1
# HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests
# TYPE namespace_subsystem_httpserver_requests_total counter
namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/:id",status="2xx"} 1
`

err = testutil.GatherAndCompare(
registry,
strings.NewReader(expectedCounterMetric),
"namespace_subsystem_requests_total",
"namespace_subsystem_httpserver_requests_total",
)
assert.NoError(t, err)
}
Expand Down Expand Up @@ -2009,15 +2009,15 @@ func TestCreateWithRequestMetricsAndWithoutNormalization(t *testing.T) {
assert.Contains(t, rec.Body.String(), `baz`)

expectedCounterMetric := `
# HELP namespace_subsystem_requests_total Number of processed HTTP requests
# TYPE namespace_subsystem_requests_total counter
namespace_subsystem_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1
# HELP namespace_subsystem_httpserver_requests_total Number of processed HTTP requests
# TYPE namespace_subsystem_httpserver_requests_total counter
namespace_subsystem_httpserver_requests_total{method="GET",path="/foo/bar/baz?page=1",status="200"} 1
`

err = testutil.GatherAndCompare(
registry,
strings.NewReader(expectedCounterMetric),
"namespace_subsystem_requests_total",
"namespace_subsystem_httpserver_requests_total",
)
assert.NoError(t, err)
}
Expand Down
75 changes: 36 additions & 39 deletions httpserver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ module github.com/ankorstore/yokai/httpserver
go 1.20

require (
github.com/ankorstore/yokai/config v1.1.0
github.com/ankorstore/yokai/generate v1.0.0
github.com/ankorstore/yokai/healthcheck v1.0.0
github.com/ankorstore/yokai/log v1.1.0
github.com/ankorstore/yokai/trace v1.0.0
github.com/go-errors/errors v1.4.2
github.com/labstack/echo/v4 v4.11.1
github.com/labstack/gommon v0.4.0
github.com/ankorstore/yokai/config v1.3.0
github.com/ankorstore/yokai/generate v1.1.0
github.com/ankorstore/yokai/healthcheck v1.1.0
github.com/ankorstore/yokai/log v1.2.0
github.com/ankorstore/yokai/trace v1.2.0
github.com/go-errors/errors v1.5.1
github.com/labstack/echo/v4 v4.11.4
github.com/labstack/gommon v0.4.2
github.com/prometheus/client_golang v1.19.0
github.com/rs/zerolog v1.29.1
github.com/stretchr/testify v1.8.4
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
go.opentelemetry.io/otel/trace v1.16.0
github.com/rs/zerolog v1.32.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/otel v1.24.0
go.opentelemetry.io/otel/sdk v1.24.0
go.opentelemetry.io/otel/trace v1.24.0
)

require (
Expand All @@ -25,52 +25,49 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/client_model v0.6.0 // indirect
github.com/prometheus/common v0.48.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.18.2 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.9.0 // indirect
golang.org/x/crypto v0.18.0 // indirect
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.22.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240311173647-c811ad7063a7 // indirect
google.golang.org/grpc v1.62.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit f35482e

Please sign in to comment.