mirror of
https://github.com/luxfi/node.git
synced 2026-07-27 03:39:39 +00:00
The companion commit `7496606282` retired the gRPC fallback inside
vms/rpcchainvm/. This commit closes the loop by deleting every
remaining `//go:build grpc` file under node/, removing the dual-build
plumbing entirely. ZAP is the only wire protocol; there is no
`-tags=grpc` opt-in.
Per the "one and only one way to do everything" mandate, the
backwards-compat scaffolding (gRPC adapters, protoc stubs, connect-go
example handlers, OTLP gRPC exporter, x/sync gRPC sync engine,
keystore-over-gRPC client/server, rpcwarp gRPC signer, gRPC alias
reader) is removed forward-only — no aliases, no deprecation period.
Deletions (84 files):
- proto/pb/{aliasreader,http,io,keystore,message,messenger,net,p2p,
platformvm,rpcdb,sdk,sender,sharedmemory,signer,sync,
validatorstate,vm,warp}/ — protoc stubs (entire tree)
- proto/{p2p,platformvm,sync,vm}/*_grpc.go — gRPC type re-exports
- db/rpcdb/{grpc_server,grpc_client,grpc_test}.go — rpcdb gRPC adapter
- service/keystore/rpckeystore/ — keystore-over-gRPC (dead consumer)
- x/sync/ — entire merkledb sync engine (100% gRPC-tagged)
- internal/ids/rpcaliasreader/ — gRPC alias reader (dead consumer)
- connectproto/ — connect-go XSVM ping handler scaffolding
- vms/platformvm/warp/rpcwarp/{client,server}.go — gRPC warp signer
- vms/platformvm/network/warp.go — protobuf-based warp justification
handler (warp_zap.go retains the no-op verifier consumers expect)
- vms/components/message/message_grpc.go + message_test.go
- vms/example/xsvm/api/ping.go + vm_http_grpc.go + cmd/{run,xsvm}/
- wallet/network/primary/examples/sign-l1-validator-* (5 dead
example main packages)
- trace/{exporter_grpc,exporter_type,exporter_type_test,noop,tracer}.go
(OTLP gRPC exporter + duplicate Tracer types — trace_zap.go has
the canonical Tracer interface + no-op tracer)
- message/bft_grpc.go (Simplex BFT wrapper)
Edits (9 files): every surviving `_zap.go` drops its `//go:build !grpc`
constraint (the files are unconditional now) and drops stale
"ZAP version" / "ZAP mode" inline comments.
Doc updates:
- LLM.md ZAP Transport section: remove the `-tags=grpc` opt-in
language. Replace with "ZAP is the only wire protocol... there is
one and only one way". Update Latest Tag to v1.26.31. Update the
rpcdb topology section to reflect single-adapter state.
go.mod: connectrpc.com/connect, connectrpc.com/grpcreflect,
otlptracegrpc moved out of direct deps. google.golang.org/grpc +
protobuf demoted to indirect (still pulled transitively via luxfi/dex).
Verified:
- `go build ./...` (default, no tags) clean
- `go test ./db/rpcdb/... ./trace/... ./message/... ./vms/rpcchainvm/...
./vms/components/message/... ./vms/platformvm/network/...
./vms/example/xsvm/... ./service/keystore/... ./proto/...` clean
- `grep -rln '//go:build grpc' --include='*.go' node/` returns zero
- `grep -rln '//go:build !grpc' --include='*.go' node/` returns zero
- `grep -rln 'google.golang.org/grpc' --include='*.go' node/` returns
zero (only transitive deps remain in go.sum)
Pre-existing TestGraniteNetworkIDConfiguration failure in tests/ is
unrelated — fails on the parent commit too (verified via stash).
197 lines
4.5 KiB
Go
197 lines
4.5 KiB
Go
// Copyright (C) 2019-2025, Lux Industries Inc. All rights reserved.
|
|
// See the file LICENSE for licensing terms.
|
|
|
|
// Package trace provides tracing primitives. The package ships a
|
|
// no-op tracer suitable for ZAP-native production builds; a real
|
|
// exporter implementation lives outside the node tree and plugs in
|
|
// via the Tracer interface.
|
|
package trace
|
|
|
|
import (
|
|
"context"
|
|
"io"
|
|
)
|
|
|
|
// Config holds tracing configuration
|
|
type Config struct {
|
|
ExporterConfig ExporterConfig `json:"exporterConfig"`
|
|
TraceSampleRate float64 `json:"traceSampleRate"`
|
|
AppName string `json:"appName"`
|
|
Version string `json:"version"`
|
|
}
|
|
|
|
// ExporterConfig holds exporter configuration
|
|
type ExporterConfig struct {
|
|
Type ExporterType `json:"type"`
|
|
Endpoint string `json:"endpoint"`
|
|
Headers map[string]string `json:"headers"`
|
|
Insecure bool `json:"insecure"`
|
|
}
|
|
|
|
// ExporterType represents the type of trace exporter
|
|
type ExporterType byte
|
|
|
|
const (
|
|
Disabled ExporterType = iota
|
|
GRPC
|
|
HTTP
|
|
ZAP
|
|
)
|
|
|
|
func (t ExporterType) String() string {
|
|
switch t {
|
|
case Disabled:
|
|
return "disabled"
|
|
case GRPC:
|
|
return "grpc"
|
|
case HTTP:
|
|
return "http"
|
|
case ZAP:
|
|
return "zap"
|
|
default:
|
|
return "unknown"
|
|
}
|
|
}
|
|
|
|
func (t ExporterType) MarshalJSON() ([]byte, error) {
|
|
return []byte(`"` + t.String() + `"`), nil
|
|
}
|
|
|
|
func (t *ExporterType) UnmarshalJSON(b []byte) error {
|
|
s := string(b)
|
|
if len(s) >= 2 && s[0] == '"' && s[len(s)-1] == '"' {
|
|
s = s[1 : len(s)-1]
|
|
}
|
|
switch s {
|
|
case "disabled", "null", "":
|
|
*t = Disabled
|
|
case "grpc":
|
|
*t = GRPC
|
|
case "http":
|
|
*t = HTTP
|
|
case "zap":
|
|
*t = ZAP
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ExporterTypeFromString parses an exporter type string
|
|
func ExporterTypeFromString(s string) (ExporterType, error) {
|
|
switch s {
|
|
case "disabled", "":
|
|
return Disabled, nil
|
|
case "grpc":
|
|
return GRPC, nil
|
|
case "http":
|
|
return HTTP, nil
|
|
case "zap":
|
|
return ZAP, nil
|
|
default:
|
|
return Disabled, nil
|
|
}
|
|
}
|
|
|
|
// Tracer interface for tracing operations
|
|
type Tracer interface {
|
|
io.Closer
|
|
Start(ctx context.Context, spanName string, opts ...SpanStartOption) (context.Context, Span)
|
|
}
|
|
|
|
// Span represents a trace span
|
|
type Span interface {
|
|
End(options ...SpanEndOption)
|
|
SetStatus(code StatusCode, description string)
|
|
RecordError(err error, options ...EventOption)
|
|
AddEvent(name string, options ...EventOption)
|
|
SetAttributes(kv ...KeyValue)
|
|
}
|
|
|
|
// SpanStartOption configures span creation
|
|
type SpanStartOption interface {
|
|
applySpanStart()
|
|
}
|
|
|
|
type spanStartOption struct{}
|
|
|
|
func (spanStartOption) applySpanStart() {}
|
|
|
|
// WithAttributes returns a SpanStartOption
|
|
func WithAttributes(...KeyValue) SpanStartOption {
|
|
return spanStartOption{}
|
|
}
|
|
|
|
// SpanEndOption configures span ending
|
|
type SpanEndOption interface{}
|
|
|
|
// EventOption configures events
|
|
type EventOption interface{}
|
|
|
|
// KeyValue represents a key-value attribute pair (otel compatible name)
|
|
type KeyValue struct {
|
|
Key string
|
|
Value Value
|
|
}
|
|
|
|
// Value wraps attribute values
|
|
type Value struct {
|
|
v interface{}
|
|
}
|
|
|
|
// String creates a string attribute
|
|
func String(key, value string) KeyValue {
|
|
return KeyValue{Key: key, Value: Value{v: value}}
|
|
}
|
|
|
|
// Int creates an int attribute
|
|
func Int(key string, value int) KeyValue {
|
|
return KeyValue{Key: key, Value: Value{v: value}}
|
|
}
|
|
|
|
// Int64 creates an int64 attribute
|
|
func Int64(key string, value int64) KeyValue {
|
|
return KeyValue{Key: key, Value: Value{v: value}}
|
|
}
|
|
|
|
// Bool creates a bool attribute
|
|
func Bool(key string, value bool) KeyValue {
|
|
return KeyValue{Key: key, Value: Value{v: value}}
|
|
}
|
|
|
|
// Stringer creates a string attribute from a fmt.Stringer
|
|
func Stringer(key string, value interface{ String() string }) KeyValue {
|
|
return KeyValue{Key: key, Value: Value{v: value.String()}}
|
|
}
|
|
|
|
// StatusCode represents span status
|
|
type StatusCode int
|
|
|
|
const (
|
|
StatusUnset StatusCode = iota
|
|
StatusOK
|
|
StatusError
|
|
)
|
|
|
|
// Noop is a no-op tracer
|
|
var Noop Tracer = &noopTracer{}
|
|
|
|
type noopTracer struct{}
|
|
|
|
func (noopTracer) Close() error { return nil }
|
|
|
|
func (noopTracer) Start(ctx context.Context, _ string, _ ...SpanStartOption) (context.Context, Span) {
|
|
return ctx, noopSpan{}
|
|
}
|
|
|
|
type noopSpan struct{}
|
|
|
|
func (noopSpan) End(...SpanEndOption) {}
|
|
func (noopSpan) SetStatus(StatusCode, string) {}
|
|
func (noopSpan) RecordError(error, ...EventOption) {}
|
|
func (noopSpan) AddEvent(string, ...EventOption) {}
|
|
func (noopSpan) SetAttributes(...KeyValue) {}
|
|
|
|
// New creates a new tracer (returns Noop in the canonical ZAP build).
|
|
func New(Config) (Tracer, error) {
|
|
return Noop, nil
|
|
}
|