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).
52 lines
1.4 KiB
Go
52 lines
1.4 KiB
Go
package instrumentation
|
|
|
|
import (
|
|
"log/slog"
|
|
|
|
"github.com/hanzoai/o11y/pkg/factory"
|
|
"github.com/prometheus/client_golang/prometheus"
|
|
sdkmetric "go.opentelemetry.io/otel/metric"
|
|
sdkresource "go.opentelemetry.io/otel/sdk/resource"
|
|
sdktrace "go.opentelemetry.io/otel/trace"
|
|
"go.uber.org/zap" //nolint:depguard
|
|
)
|
|
|
|
// Instrumentation provides the core components for application instrumentation.
|
|
type Instrumentation interface {
|
|
// Logger returns the Slog logger.
|
|
Logger() *slog.Logger
|
|
|
|
// MeterProvider returns the OpenTelemetry meter provider.
|
|
MeterProvider() sdkmetric.MeterProvider
|
|
|
|
// TracerProvider returns the OpenTelemetry tracer provider.
|
|
TracerProvider() sdktrace.TracerProvider
|
|
|
|
// PrometheusRegisterer returns the Prometheus registerer.
|
|
PrometheusRegisterer() prometheus.Registerer
|
|
|
|
// ToProviderSettings converts instrumentation to provider settings.
|
|
ToProviderSettings() factory.ProviderSettings
|
|
}
|
|
|
|
// ZapToSlogConverter defines conversion functions required for using zap interface with underlying slog provider.
|
|
type ZapToSlogConverter interface {
|
|
FieldsToAttributes(fields []zap.Field) []any
|
|
}
|
|
|
|
// Merges the input attributes with the resource attributes.
|
|
func mergeAttributes(input map[string]any, resource *sdkresource.Resource) map[string]any {
|
|
output := make(map[string]any)
|
|
|
|
for k, v := range input {
|
|
output[k] = v
|
|
}
|
|
|
|
kvs := resource.Attributes()
|
|
for _, kv := range kvs {
|
|
output[string(kv.Key)] = kv.Value
|
|
}
|
|
|
|
return output
|
|
}
|