Skip to content

Commit

Permalink
fix(otel): respect default resources schema url
Browse files Browse the repository at this point in the history
  • Loading branch information
lukasmalkmus committed Jul 8, 2024
1 parent 500c38e commit 4e177e0
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions axiom/otel/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,13 @@ import (
"time"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/sdk/resource"
"go.opentelemetry.io/otel/sdk/trace"

// Keep in sync with
// https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/resource/builtin.go#L14.
// https://github.com/open-telemetry/opentelemetry-go/blob/main/sdk/resource/builtin.go#L16.
semconv "go.opentelemetry.io/otel/semconv/v1.26.0"

"github.com/axiomhq/axiom-go/internal/version"
Expand All @@ -28,11 +27,6 @@ func init() {
}
}

// UserAgentAttribute returns a new OpenTelemetry axiom-go user agent attribute.
func UserAgentAttribute() attribute.KeyValue {
return semconv.UserAgentOriginal(userAgent)
}

// TraceExporter configures and returns a new exporter for OpenTelemetry spans.
func TraceExporter(ctx context.Context, dataset string, options ...TraceOption) (trace.SpanExporter, error) {
config := defaultTraceConfig()
Expand Down Expand Up @@ -101,10 +95,12 @@ func TracerProvider(ctx context.Context, dataset, serviceName, serviceVersion st
}

rs, err := resource.Merge(resource.Default(), resource.NewWithAttributes(
semconv.SchemaURL,
// HINT(lukasmalkmus): [resource.Merge] will use the schema URL from the
// first resource, which is what we want to achieve here.
"",
semconv.ServiceNameKey.String(serviceName),
semconv.ServiceVersionKey.String(serviceVersion),
UserAgentAttribute(),
semconv.UserAgentOriginal(userAgent),
))
if err != nil {
return nil, err
Expand Down

0 comments on commit 4e177e0

Please sign in to comment.