Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set Resource to internal trace instrumentation #1699

Merged
merged 3 commits into from
Feb 25, 2025
Merged

Set Resource to internal trace instrumentation #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aab09cc
Set Resource to internal trace instrumentation
marctc Feb 24, 2025
2225512
Delete comment
marctc Feb 24, 2025
bb1f5c0
rename to beyla
marctc Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pkg/export/otel/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@ import (
"time"

"github.com/go-logr/logr"
"github.com/google/uuid"
"github.com/hashicorp/golang-lru/v2/simplelru"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.19.0"
"google.golang.org/grpc/credentials"

Expand Down Expand Up @@ -92,6 +94,19 @@ func getResourceAttrs(hostID string, service *svc.Attrs) []attribute.KeyValue {
return attrs
}

func newResourceInternal(hostID string) *resource.Resource {
attrs := []attribute.KeyValue{
semconv.ServiceName("beyla"),
semconv.ServiceInstanceID(uuid.New().String()),
semconv.TelemetrySDKLanguageKey.String(semconv.TelemetrySDKLanguageGo.Value.AsString()),
// We set the SDK name as Beyla, so we can distinguish beyla generated metrics from other SDKs
semconv.TelemetrySDKNameKey.String("beyla"),
semconv.HostID(hostID),
}

return resource.NewWithAttributes(semconv.SchemaURL, attrs...)
}

// ReporterPool keeps an LRU cache of different OTEL reporters given a service name.
type ReporterPool[K uidGetter, T any] struct {
pool *simplelru.LRU[svc.UID, *expirable[T]]
Expand Down
15 changes: 0 additions & 15 deletions pkg/export/otel/metrics_internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,10 @@ import (
"runtime"
"time"

"github.com/google/uuid"
"go.opentelemetry.io/otel/attribute"
instrument "go.opentelemetry.io/otel/metric"
"go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/sdk/resource"
semconv "go.opentelemetry.io/otel/semconv/v1.19.0"

"github.com/grafana/beyla/v2/pkg/buildinfo"
"github.com/grafana/beyla/v2/pkg/internal/pipe/global"
Expand Down Expand Up @@ -119,19 +117,6 @@ func NewInternalMetricsReporter(ctx context.Context, ctxInfo *global.ContextInfo
}, nil
}

func newResourceInternal(hostID string) *resource.Resource {
attrs := []attribute.KeyValue{
semconv.ServiceName("beyla-internal"),
semconv.ServiceInstanceID(uuid.New().String()),
semconv.TelemetrySDKLanguageKey.String(semconv.TelemetrySDKLanguageGo.Value.AsString()),
// We set the SDK name as Beyla, so we can distinguish beyla generated metrics from other SDKs
semconv.TelemetrySDKNameKey.String("beyla"),
semconv.HostID(hostID),
}

return resource.NewWithAttributes(semconv.SchemaURL, attrs...)
}

func newInternalMeterProvider(res *resource.Resource, exporter *metric.Exporter, interval time.Duration) (*metric.MeterProvider, error) {
meterProvider := metric.NewMeterProvider(
metric.WithResource(res),
Expand Down
6 changes: 5 additions & 1 deletion pkg/export/otel/traces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,11 @@ func getTraceSettings(ctxInfo *global.ContextInfo, in trace.SpanExporter) export
if internalMetricsEnabled(ctxInfo) {
telemetryLevel = configtelemetry.LevelBasic
spanExporter := instrumentTraceExporter(in, ctxInfo.Metrics)
traceProvider = trace.NewTracerProvider(trace.WithBatcher(spanExporter))
res := newResourceInternal(ctxInfo.HostID)
traceProvider = trace.NewTracerProvider(
trace.WithBatcher(spanExporter),
trace.WithResource(res),
)
}
meterProvider := metric.NewMeterProvider()
telemetrySettings := component.TelemetrySettings{
Expand Down
Loading