Skip to content

Commit

Permalink
Pkg updates (#621)
Browse files Browse the repository at this point in the history
* update vendors

* adopt interface changes from opentelementry upgrade

* upgrade openapi

* use new otel interfaces

* Fix prom exporter setup

* Fixup missing prom labels

* Update backend.go

simplified count calls

* Using sync counters

* additional fixups; rm total suffix

still broken due to open-telemetry/opentelemetry-go#3369

* Update to latest otel version

* test fixup; increase time

* fixup rebase

* log /w unhealthy err type

* filter client error metric for access type

* naming

* request metrics endpoint seems to be more stable
  • Loading branch information
Marcel Ludwig committed Dec 30, 2022
1 parent 51b9640 commit e66e509
Show file tree
Hide file tree
Showing 810 changed files with 57,606 additions and 42,406 deletions.
5 changes: 5 additions & 0 deletions Makefile
Expand Up @@ -4,6 +4,11 @@
build:
go build -race -v -o couper main.go

.PHONY: update-modules
update-modules:
go get -u
go mod tidy

docker-telemetry:
docker compose -f telemetry/docker-compose.yaml pull
docker compose -f telemetry/docker-compose.yaml up --build
Expand Down
5 changes: 4 additions & 1 deletion command/run.go
Expand Up @@ -93,7 +93,7 @@ func (r *Run) Execute(args Args, config *config.Couper, logEntry *logrus.Entry)
}
errors.SetLogger(logEntry)

telemetry.InitExporter(r.context, &telemetry.Options{
err = telemetry.InitExporter(r.context, &telemetry.Options{
MetricsCollectPeriod: time.Second * 2,
Metrics: config.Settings.TelemetryMetrics,
MetricsEndpoint: config.Settings.TelemetryMetricsEndpoint,
Expand All @@ -103,6 +103,9 @@ func (r *Run) Execute(args Args, config *config.Couper, logEntry *logrus.Entry)
Traces: config.Settings.TelemetryTraces,
TracesEndpoint: config.Settings.TelemetryTracesEndpoint,
}, memStore, logEntry)
if err != nil {
return err
}

if limitFn != nil {
limitFn(logEntry)
Expand Down
86 changes: 42 additions & 44 deletions go.mod
Expand Up @@ -3,75 +3,73 @@ module github.com/avenga/couper
go 1.19

require (
github.com/agext/levenshtein v1.2.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/docker/go-units v0.4.0
github.com/docker/go-units v0.5.0
github.com/fatih/color v1.13.0
github.com/getkin/kin-openapi v0.107.0
github.com/getkin/kin-openapi v0.110.0
github.com/hashicorp/hcl/v2 v2.12.0
github.com/jimlambrt/go-oauth-pkce-code-verifier v0.0.0-20201220003123-6363600dffda
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/prometheus/client_golang v1.12.1
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.32.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rs/xid v1.3.0
github.com/russellhaering/gosaml2 v0.7.0
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_model v0.3.0
github.com/rs/xid v1.4.0
github.com/russellhaering/gosaml2 v0.8.1
github.com/russellhaering/goxmldsig v1.2.0
github.com/sirupsen/logrus v1.8.1
github.com/zclconf/go-cty v1.10.1-0.20220623211957-834994b84991
go.opentelemetry.io/otel v1.4.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.27.0
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.27.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.4.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.4.0
go.opentelemetry.io/otel/exporters/prometheus v0.27.0
go.opentelemetry.io/otel/metric v0.27.0
go.opentelemetry.io/otel/sdk v1.4.0
go.opentelemetry.io/otel/sdk/metric v0.27.0
go.opentelemetry.io/otel/trace v1.4.0
golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b
golang.org/x/net v0.0.0-20211209124913-491a49abca63
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/grpc v1.44.0
github.com/sirupsen/logrus v1.9.0
github.com/zclconf/go-cty v1.12.1
go.opentelemetry.io/otel v1.11.2
go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.34.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.34.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2
go.opentelemetry.io/otel/exporters/prometheus v0.34.0
go.opentelemetry.io/otel/metric v0.34.0
go.opentelemetry.io/otel/sdk v1.11.2
go.opentelemetry.io/otel/sdk/metric v0.34.0
go.opentelemetry.io/otel/trace v1.11.2
golang.org/x/crypto v0.2.0
golang.org/x/net v0.2.0
google.golang.org/grpc v1.51.0
)

require (
github.com/algolia/algoliasearch-client-go/v3 v3.26.0
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/google/go-cmp v0.5.7
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
)

require (
github.com/agext/levenshtein v1.2.3 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
github.com/beevik/etree v1.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.2 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/swag v0.19.15 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/invopop/yaml v0.1.0 // indirect
github.com/jonboulle/clockwork v0.2.2 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.13.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/jonboulle/clockwork v0.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattermost/xml-roundtrip-validator v0.1.0 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.4.0 // indirect
go.opentelemetry.io/otel/internal/metric v0.27.0 // indirect
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
google.golang.org/genproto v0.0.0-20221109142239-94d6d90a7d66 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down

0 comments on commit e66e509

Please sign in to comment.