Skip to content

Commit 6cc5c73

Browse files
ViBiOhViBiOh
committed
chore(deps): Bumping deps
Signed-off-by: Vincent Boutour <bob@vibioh.fr>
1 parent 434b19e commit 6cc5c73

7 files changed

Lines changed: 432 additions & 26 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ Usage of exas:
130130
-storagePartSize uint
131131
[storage] PartSize configuration {EXAS_STORAGE_PART_SIZE} (default 5242880)
132132
-tracerRate string
133-
[tracer] Jaeger sample rate, 'always', 'never' or a float value {EXAS_TRACER_RATE} (default "always")
133+
[tracer] OpenTracing sample rate, 'always', 'never' or a float value {EXAS_TRACER_RATE} (default "always")
134134
-tracerURL string
135-
[tracer] Jaeger endpoint URL (e.g. http://jaeger:14268/api/traces) {EXAS_TRACER_URL}
135+
[tracer] OpenTracing gRPC endpoint (e.g. otel-exporter:4317) {EXAS_TRACER_URL}
136136
-url string
137137
[alcotest] URL to check {EXAS_URL}
138138
-userAgent string

‎go.mod‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,23 @@ go 1.20
55
require (
66
github.com/ViBiOh/absto v1.2.7
77
github.com/ViBiOh/flags v1.2.0
8-
github.com/ViBiOh/httputils/v4 v4.53.7
8+
github.com/ViBiOh/httputils/v4 v4.54.0
99
github.com/prometheus/client_golang v1.14.0
1010
github.com/streadway/amqp v1.0.0
1111
go.opentelemetry.io/otel/trace v1.14.0
1212
)
1313

1414
require (
1515
github.com/beorn7/perks v1.0.1 // indirect
16+
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
1617
github.com/cespare/xxhash/v2 v2.2.0 // indirect
1718
github.com/dustin/go-humanize v1.0.1 // indirect
1819
github.com/felixge/httpsnoop v1.0.3 // indirect
1920
github.com/go-logr/logr v1.2.3 // indirect
2021
github.com/go-logr/stdr v1.2.2 // indirect
2122
github.com/golang/protobuf v1.5.2 // indirect
2223
github.com/google/uuid v1.3.0 // indirect
24+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
2325
github.com/json-iterator/go v1.1.12 // indirect
2426
github.com/klauspost/compress v1.15.15 // indirect
2527
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
@@ -30,21 +32,26 @@ require (
3032
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3133
github.com/modern-go/reflect2 v1.0.2 // indirect
3234
github.com/prometheus/client_model v0.3.0 // indirect
33-
github.com/prometheus/common v0.40.0 // indirect
35+
github.com/prometheus/common v0.41.0 // indirect
3436
github.com/prometheus/procfs v0.8.0 // indirect
3537
github.com/rs/xid v1.4.0 // indirect
3638
github.com/sirupsen/logrus v1.9.0 // indirect
3739
github.com/zeebo/xxh3 v1.0.2 // indirect
38-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect
40+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
3941
go.opentelemetry.io/otel v1.14.0 // indirect
40-
go.opentelemetry.io/otel/exporters/jaeger v1.13.0 // indirect
41-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
42-
go.opentelemetry.io/otel/sdk v1.13.0 // indirect
42+
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.14.0 // indirect
43+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.14.0 // indirect
44+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.14.0 // indirect
45+
go.opentelemetry.io/otel/metric v0.37.0 // indirect
46+
go.opentelemetry.io/otel/sdk v1.14.0 // indirect
47+
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
4348
golang.org/x/crypto v0.6.0 // indirect
4449
golang.org/x/net v0.7.0 // indirect
4550
golang.org/x/sys v0.5.0 // indirect
4651
golang.org/x/term v0.5.0 // indirect
4752
golang.org/x/text v0.7.0 // indirect
53+
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
54+
google.golang.org/grpc v1.53.0 // indirect
4855
google.golang.org/protobuf v1.28.1 // indirect
4956
gopkg.in/ini.v1 v1.67.0 // indirect
5057
)

‎go.sum‎

Lines changed: 413 additions & 14 deletions
Large diffs are not rendered by default.

‎infra/api.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
EXAS_GEOCODE_URL: "https://nominatim.openstreetmap.org"
4040
EXAS_LOGGER_JSON: "true"
4141
EXAS_STORAGE_FILE_SYSTEM_DIRECTORY: "/data"
42-
EXAS_TRACER_URL: http://jaeger.monitoring:14268/api/traces
42+
EXAS_TRACER_URL: otel-collector.monitoring:4317
4343
OTEL_SERVICE_NAME: exas
4444
secrets:
4545
EXAS_AMQP_URI: AgAKGKHFZX3fmvKHTN20cCmpP/HVG8tOe/l1Mb/5HPGzxtL6DQDCbljiEETk1iNYoKuLP3b0BnvXM1KMm7L+QcaN2dPyIAkEdQRNRklRan/qZtjBYbZIX3WcaQY4i3Sr6OtzqkWg7cBjmM9Bt187+YuZlOtoy1siunTLWkdgvxwroB+mHIGIbiuiwuoruo9j05a9mGyjM5K/Vj+r/hOPoZcp3ml+CKzDxkUXbBw2ktZ123DHHnU0BqheK8crL9/mEYovvVaSdNQ6aPJUSvUNPnFfBc64/Ar2j9TkI5yEoJvtOmzv7W1mT5fRZzzjyHkUXq52SaIHSwxfjHcsFN7VFxxs8i16k07L4/sQzt2TpSEpTpMNbCWBTZZGysEVPKiqobJGk10bHog+GIpfV16OgBtgKsEN7FKBjBDPlvi51RO3I0s39abV8xGJvgKc6E0uCERy0JJr5kyiDBkeIrZjnLWeYLPvVT2nuQ6qBCTscBcb9Bo2q9sWp4UK2mI1RL/S3wzYenx/RMrWO8CuR0UXPzdZfpiKrWIkdJhG/qBgM0ejrgp6jDofQp/Xtj6Ap3c/VifsqPUAs3RriVRwkkDX4ko3XDO5Iv/SNz1u8R3Ur/hG5EMKSH98Of4a8lkkTbHO/i4CVL8pxaHKsOj+T2hxdZj6zmhP9lB8JyjZ2E/j5TFKMuopV/cwl1hI1GzbgmMbTF0YrOiEaFzrfod5F/1NVqHXU8gWtQKq1L5FGUUcHphWi23JxFjeymGTa4spfcld5lplQ7s=

‎pkg/exas/amqp.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (a App) AmqpHandler(ctx context.Context, message amqp.Delivery) (err error)
3535
}
3636

3737
ctx, end := tracer.StartSpan(ctx, a.tracer, "amqp")
38-
defer end()
38+
defer end(&err)
3939

4040
var item absto.Item
4141
if err = json.Unmarshal(message.Body, &item); err != nil {

‎pkg/exas/exas.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func (a App) Handler() http.Handler {
8484

8585
func (a App) get(ctx context.Context, input io.Reader) (exif model.Exif, err error) {
8686
ctx, end := tracer.StartSpan(ctx, a.tracer, "exiftool")
87-
defer end()
87+
defer end(&err)
8888

8989
cmd := exec.Command("./exiftool", "-json", "-")
9090

‎pkg/geocode/geocode.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (a App) Close() {
8888
// GetGeocoding of given exif data
8989
func (a App) GetGeocoding(ctx context.Context, exif model.Exif) (geocode model.Geocode, err error) {
9090
ctx, end := tracer.StartSpan(ctx, a.tracer, "geocode")
91-
defer end()
91+
defer end(&err)
9292

9393
geocode.Latitude, geocode.Longitude, err = extractCoordinates(exif.Data)
9494
if err != nil {

0 commit comments

Comments
 (0)