diff options
| author |  Daenney <daenney@users.noreply.github.com> | 2024-03-11 15:34:34 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2024-03-11 15:34:34 +0100 |
| commit | 5e871e81a87a638b07d540c15d1b95608843255d (patch) | |
| tree | 62db65c7de651bac3d8894f4f70e0fe8de853a5e /internal | |
| parent | [chore]: Bump github.com/minio/minio-go/v7 from 7.0.67 to 7.0.69 (#2748) (diff) | |
| download | gotosocial-5e871e81a87a638b07d540c15d1b95608843255d.tar.xz | |
[chore] Update usage of OTEL libraries (#2725)
* otel to 1.24
* prometheus exporter to 0.46
* bunotel to 1.1.17
Also:
* Use schemaless URL for metrics
* Add software version to tracing schema
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/metrics/metrics.go | 9 | ||||
| -rw-r--r-- | internal/tracing/tracing.go | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index 269974623..e22a67dad 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -34,7 +34,7 @@ import ( "go.opentelemetry.io/otel/metric" sdk "go.opentelemetry.io/otel/sdk/metric" "go.opentelemetry.io/otel/sdk/resource" - semconv "go.opentelemetry.io/otel/semconv/v1.20.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" ) const ( @@ -42,7 +42,6 @@ const ( ) func Initialize(db db.DB) error { - if !config.GetMetricsEnabled() { return nil } @@ -55,8 +54,7 @@ func Initialize(db db.DB) error { r, _ := resource.Merge( resource.Default(), - resource.NewWithAttributes( - semconv.SchemaURL, + resource.NewSchemaless( semconv.ServiceName(serviceName), semconv.ServiceVersion(config.GetSoftwareVersion()), ), @@ -90,7 +88,6 @@ func Initialize(db db.DB) error { return nil }), ) - if err != nil { return err } @@ -107,7 +104,6 @@ func Initialize(db db.DB) error { return nil }), ) - if err != nil { return err } @@ -124,7 +120,6 @@ func Initialize(db db.DB) error { return nil }), ) - if err != nil { return err } diff --git a/internal/tracing/tracing.go b/internal/tracing/tracing.go index 4f37ccd09..dd1e19be9 100644 --- a/internal/tracing/tracing.go +++ b/internal/tracing/tracing.go @@ -35,7 +35,7 @@ import ( "go.opentelemetry.io/otel/sdk/resource" "go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/semconv/v1.20.0/httpconv" - semconv "go.opentelemetry.io/otel/semconv/v1.21.0" + semconv "go.opentelemetry.io/otel/semconv/v1.24.0" oteltrace "go.opentelemetry.io/otel/trace" "github.com/superseriousbusiness/gotosocial/internal/config" @@ -88,6 +88,7 @@ func Initialize() error { resource.Default(), resource.NewSchemaless( semconv.ServiceName("GoToSocial"), + semconv.ServiceVersion(config.GetSoftwareVersion()), ), ) if err != nil { @@ -164,7 +165,7 @@ func InstrumentGin() gin.HandlerFunc { status := c.Writer.Status() span.SetStatus(httpconv.ServerStatus(status)) if status > 0 { - span.SetAttributes(semconv.HTTPStatusCode(status)) + span.SetAttributes(semconv.HTTPResponseStatusCode(status)) } if len(c.Errors) > 0 { span.SetAttributes(attribute.String("gin.errors", c.Errors.String())) |