mirror of
https://github.com/hanzoai/o11y.git
synced 2026-10-15 12:58:33 +00:00
zeekay
b9f9cdf918
Re-sync the entire SigNoz-derived Go tree to a clean fork of latest SigNoz main (upstream 3e6339019), eliminating the version-skew that broke `go build ./...` (mixed-era packages, ~14 imported-but-absent packages, partial signoz->o11y / clickhouse->datastore rebrands, self-import cycle, duplicate package decls). - pkg/ + cmd/ wholesale replaced with latest SigNoz; imports rewritten github.com/SigNoz/signoz/ -> github.com/hanzoai/o11y/. - Adopt SigNoz's CURRENT structure (resourcefilter->telemetryresourcefilter, integrationtypes->cloudintegrationtypes, roletypes/grammar/times folded in upstream); old paths dropped. - Fork deps repathed to hanzoai + bumped: signoz-otel-collector v0.144.6, clickhouse-go-mock v0.14.1, govaluate v0.1.0; expr-lang/expr => hanzoai/expr v1.17.8 (replace). go.mod reconciled from latest SigNoz; go.sum re-tidied. - ee/ + cmd/enterprise stripped — o11y stays MIT-only; community edition imports no ee packages. - Preserved o11y additions: module path github.com/hanzoai/o11y, mount.go (cloud.Register/zip mount adapter, HIP-0106), NOTICE + LICENSE (SigNoz §4c attribution retained; upstream pkg files are headerless per SigNoz convention). - Reverted o11y cosmetic renames (o11y*/datastore*) and experimental originals (authz/iamauthz, billing, zapreceiver, zapmetricreceiver) to SigNoz canonical to kill the skew; snapshots retained in git history for re-layering. go build ./... = exit 0. go vet clean except benign "unreachable code" in generated ANTLR parser files (inherited from upstream).
60 lines
1.5 KiB
Go
60 lines
1.5 KiB
Go
package factory
|
|
|
|
import (
|
|
"log/slog"
|
|
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
sdkmetric "go.opentelemetry.io/otel/metric"
|
|
sdktrace "go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
type ProviderSettings struct {
|
|
// SlogLogger is the slog logger.
|
|
Logger *slog.Logger
|
|
// MeterProvider is the meter provider.
|
|
MeterProvider sdkmetric.MeterProvider
|
|
// TracerProvider is the tracer provider.
|
|
TracerProvider sdktrace.TracerProvider
|
|
// PrometheusRegistry is the prometheus registry.
|
|
PrometheusRegisterer prometheus.Registerer
|
|
}
|
|
|
|
type ScopedProviderSettings interface {
|
|
Logger() *slog.Logger
|
|
Meter() sdkmetric.Meter
|
|
Tracer() sdktrace.Tracer
|
|
PrometheusRegisterer() prometheus.Registerer
|
|
}
|
|
|
|
type scoped struct {
|
|
logger *slog.Logger
|
|
meter sdkmetric.Meter
|
|
tracer sdktrace.Tracer
|
|
prometheusRegisterer prometheus.Registerer
|
|
}
|
|
|
|
func NewScopedProviderSettings(settings ProviderSettings, pkgName string) *scoped {
|
|
return &scoped{
|
|
logger: settings.Logger.With(slog.String("logger", pkgName)),
|
|
meter: settings.MeterProvider.Meter(pkgName),
|
|
tracer: settings.TracerProvider.Tracer(pkgName),
|
|
prometheusRegisterer: settings.PrometheusRegisterer,
|
|
}
|
|
}
|
|
|
|
func (s *scoped) Logger() *slog.Logger {
|
|
return s.logger
|
|
}
|
|
|
|
func (s *scoped) Meter() sdkmetric.Meter {
|
|
return s.meter
|
|
}
|
|
|
|
func (s *scoped) Tracer() sdktrace.Tracer {
|
|
return s.tracer
|
|
}
|
|
|
|
func (s *scoped) PrometheusRegisterer() prometheus.Registerer {
|
|
return s.prometheusRegisterer
|
|
}
|