Add comprehensive godoc documentation to all packages
- Add package-level documentation with usage examples and architecture details - Document all public types, functions, and methods following godoc conventions - Remove unused logger.Error type and NewError function - Apply consistent documentation style across all packages Packages updated: - apitls: TLS certificate management with automatic renewal - config: Environment-based configuration system - config/depenv: Deployment environment handling - ekko: Enhanced Echo web framework wrapper - kafka: Kafka client wrapper with TLS support - logger: Structured logging with OpenTelemetry integration - tracing: OpenTelemetry distributed tracing setup - types: Shared data structures for NTP Pool project - xff/fastlyxff: Fastly CDN IP range management All tests pass after documentation changes.
This commit is contained in:
parent
09b52f92d7
commit
694f8ba1d3
@ -1,3 +1,14 @@
|
|||||||
|
// Package apitls provides TLS certificate management with automatic renewal support.
|
||||||
|
//
|
||||||
|
// This package handles TLS certificate provisioning and management for secure
|
||||||
|
// inter-service communication within the NTP Pool project infrastructure.
|
||||||
|
// It provides both server and client certificate management through the
|
||||||
|
// CertificateProvider interface and includes a trusted CA certificate pool
|
||||||
|
// for validating certificates.
|
||||||
|
//
|
||||||
|
// The package integrates with certman for automatic certificate renewal
|
||||||
|
// and includes embedded CA certificates for establishing trust relationships
|
||||||
|
// between services.
|
||||||
package apitls
|
package apitls
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -13,11 +24,32 @@ import (
|
|||||||
//go:embed ca.pem
|
//go:embed ca.pem
|
||||||
var caBytes []byte
|
var caBytes []byte
|
||||||
|
|
||||||
|
// CertificateProvider defines the interface for providing TLS certificates
|
||||||
|
// for both server and client connections. Implementations should handle
|
||||||
|
// certificate retrieval, caching, and renewal as needed.
|
||||||
|
//
|
||||||
|
// This interface supports both server-side certificate provisioning
|
||||||
|
// (via GetCertificate) and client-side certificate authentication
|
||||||
|
// (via GetClientCertificate).
|
||||||
type CertificateProvider interface {
|
type CertificateProvider interface {
|
||||||
|
// GetCertificate retrieves a server certificate based on the client hello information.
|
||||||
|
// This method is typically used in tls.Config.GetCertificate for server-side TLS.
|
||||||
GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error)
|
GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error)
|
||||||
|
|
||||||
|
// GetClientCertificate retrieves a client certificate for mutual TLS authentication.
|
||||||
|
// This method is used in tls.Config.GetClientCertificate for client-side TLS.
|
||||||
GetClientCertificate(certRequestInfo *tls.CertificateRequestInfo) (*tls.Certificate, error)
|
GetClientCertificate(certRequestInfo *tls.CertificateRequestInfo) (*tls.Certificate, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CAPool returns a certificate pool containing trusted CA certificates
|
||||||
|
// for validating TLS connections within the NTP Pool infrastructure.
|
||||||
|
//
|
||||||
|
// The CA certificates are embedded in the binary and include the trusted
|
||||||
|
// certificate authorities used for inter-service communication.
|
||||||
|
// This pool should be used in tls.Config.RootCAs for client connections
|
||||||
|
// or tls.Config.ClientCAs for server connections requiring client certificates.
|
||||||
|
//
|
||||||
|
// Returns an error if the embedded CA certificates cannot be parsed or loaded.
|
||||||
func CAPool() (*x509.CertPool, error) {
|
func CAPool() (*x509.CertPool, error) {
|
||||||
capool := x509.NewCertPool()
|
capool := x509.NewCertPool()
|
||||||
if !capool.AppendCertsFromPEM(caBytes) {
|
if !capool.AppendCertsFromPEM(caBytes) {
|
||||||
|
@ -1,5 +1,18 @@
|
|||||||
// Package config provides NTP Pool specific
|
// Package config provides environment-based configuration management for NTP Pool services.
|
||||||
// configuration tools.
|
//
|
||||||
|
// This package handles configuration loading from environment variables and provides
|
||||||
|
// utilities for constructing URLs for web and management interfaces. It supports
|
||||||
|
// deployment-specific settings including hostname configuration, TLS settings,
|
||||||
|
// and deployment modes.
|
||||||
|
//
|
||||||
|
// Configuration is loaded automatically from environment variables:
|
||||||
|
// - deployment_mode: The deployment environment (devel, production, etc.)
|
||||||
|
// - manage_hostname: Hostname for management interface
|
||||||
|
// - web_hostname: Comma-separated list of web hostnames (first is primary)
|
||||||
|
// - manage_tls: Enable TLS for management interface (yes, no, true, false)
|
||||||
|
// - web_tls: Enable TLS for web interface (yes, no, true, false)
|
||||||
|
//
|
||||||
|
// The package includes code generation for accessor methods using the accessory tool.
|
||||||
package config
|
package config
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -13,6 +26,9 @@ import (
|
|||||||
|
|
||||||
//go:generate go tool github.com/masaushi/accessory -type Config
|
//go:generate go tool github.com/masaushi/accessory -type Config
|
||||||
|
|
||||||
|
// Config holds environment-based configuration for NTP Pool services.
|
||||||
|
// It manages hostnames, TLS settings, and deployment modes loaded from
|
||||||
|
// environment variables. The struct includes code-generated accessor methods.
|
||||||
type Config struct {
|
type Config struct {
|
||||||
deploymentMode string `accessor:"getter"`
|
deploymentMode string `accessor:"getter"`
|
||||||
|
|
||||||
@ -26,6 +42,16 @@ type Config struct {
|
|||||||
valid bool `accessor:"getter"`
|
valid bool `accessor:"getter"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// New creates a new Config instance by loading configuration from environment variables.
|
||||||
|
// It automatically parses hostnames, TLS settings, and deployment mode from the environment.
|
||||||
|
// The configuration is considered valid if at least one web hostname is provided.
|
||||||
|
//
|
||||||
|
// Environment variables used:
|
||||||
|
// - deployment_mode: Deployment environment identifier
|
||||||
|
// - manage_hostname: Management interface hostname
|
||||||
|
// - web_hostname: Comma-separated web hostnames (first becomes primary)
|
||||||
|
// - manage_tls: Management interface TLS setting
|
||||||
|
// - web_tls: Web interface TLS setting
|
||||||
func New() *Config {
|
func New() *Config {
|
||||||
c := Config{}
|
c := Config{}
|
||||||
c.deploymentMode = os.Getenv("deployment_mode")
|
c.deploymentMode = os.Getenv("deployment_mode")
|
||||||
@ -46,10 +72,26 @@ func New() *Config {
|
|||||||
return &c
|
return &c
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WebURL constructs a complete URL for the web interface using the primary web hostname.
|
||||||
|
// It automatically selects HTTP or HTTPS based on the web_tls configuration setting.
|
||||||
|
//
|
||||||
|
// Parameters:
|
||||||
|
// - path: URL path component (should start with "/")
|
||||||
|
// - query: Optional URL query parameters (can be nil)
|
||||||
|
//
|
||||||
|
// Returns a complete URL string suitable for web interface requests.
|
||||||
func (c *Config) WebURL(path string, query *url.Values) string {
|
func (c *Config) WebURL(path string, query *url.Values) string {
|
||||||
return baseURL(c.webHostname, c.webTLS, path, query)
|
return baseURL(c.webHostname, c.webTLS, path, query)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ManageURL constructs a complete URL for the management interface using the management hostname.
|
||||||
|
// It automatically selects HTTP or HTTPS based on the manage_tls configuration setting.
|
||||||
|
//
|
||||||
|
// Parameters:
|
||||||
|
// - path: URL path component (should start with "/")
|
||||||
|
// - query: Optional URL query parameters (can be nil)
|
||||||
|
//
|
||||||
|
// Returns a complete URL string suitable for management interface requests.
|
||||||
func (c *Config) ManageURL(path string, query *url.Values) string {
|
func (c *Config) ManageURL(path string, query *url.Values) string {
|
||||||
return baseURL(c.manageHostname, c.webTLS, path, query)
|
return baseURL(c.manageHostname, c.webTLS, path, query)
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,19 @@
|
|||||||
|
// Package depenv provides deployment environment management for NTP Pool services.
|
||||||
|
//
|
||||||
|
// This package handles different deployment environments (development, test, production)
|
||||||
|
// and provides environment-specific configuration including API endpoints, management URLs,
|
||||||
|
// and monitoring domains. It supports string-based environment identification and
|
||||||
|
// automatic URL construction for various service endpoints.
|
||||||
|
//
|
||||||
|
// The package defines three main deployment environments:
|
||||||
|
// - DeployDevel: Development environment with dev-specific endpoints
|
||||||
|
// - DeployTest: Test/beta environment for staging
|
||||||
|
// - DeployProd: Production environment with live endpoints
|
||||||
|
//
|
||||||
|
// Environment detection supports both short and long forms:
|
||||||
|
// - "dev" or "devel" → DeployDevel
|
||||||
|
// - "test" or "beta" → DeployTest
|
||||||
|
// - "prod" → DeployProd
|
||||||
package depenv
|
package depenv
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -24,14 +40,27 @@ var apiServers = map[DeploymentEnvironment]string{
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
// DeployUndefined represents an unrecognized or unset deployment environment.
|
||||||
DeployUndefined DeploymentEnvironment = iota
|
DeployUndefined DeploymentEnvironment = iota
|
||||||
|
// DeployDevel represents the development environment.
|
||||||
DeployDevel
|
DeployDevel
|
||||||
|
// DeployTest represents the test/beta environment.
|
||||||
DeployTest
|
DeployTest
|
||||||
|
// DeployProd represents the production environment.
|
||||||
DeployProd
|
DeployProd
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// DeploymentEnvironment represents a deployment environment type.
|
||||||
|
// It provides methods for environment-specific URL construction and
|
||||||
|
// supports text marshaling/unmarshaling for configuration files.
|
||||||
type DeploymentEnvironment uint8
|
type DeploymentEnvironment uint8
|
||||||
|
|
||||||
|
// DeploymentEnvironmentFromString parses a string into a DeploymentEnvironment.
|
||||||
|
// It supports both short and long forms of environment names:
|
||||||
|
// - "dev" or "devel" → DeployDevel
|
||||||
|
// - "test" or "beta" → DeployTest
|
||||||
|
// - "prod" → DeployProd
|
||||||
|
// - any other value → DeployUndefined
|
||||||
func DeploymentEnvironmentFromString(s string) DeploymentEnvironment {
|
func DeploymentEnvironmentFromString(s string) DeploymentEnvironment {
|
||||||
switch s {
|
switch s {
|
||||||
case "devel", "dev":
|
case "devel", "dev":
|
||||||
@ -45,6 +74,8 @@ func DeploymentEnvironmentFromString(s string) DeploymentEnvironment {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// String returns the canonical string representation of the deployment environment.
|
||||||
|
// Returns "prod", "test", "devel", or panics for invalid environments.
|
||||||
func (d DeploymentEnvironment) String() string {
|
func (d DeploymentEnvironment) String() string {
|
||||||
switch d {
|
switch d {
|
||||||
case DeployProd:
|
case DeployProd:
|
||||||
@ -58,6 +89,9 @@ func (d DeploymentEnvironment) String() string {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// APIHost returns the API server URL for this deployment environment.
|
||||||
|
// It first checks the API_HOST environment variable for overrides,
|
||||||
|
// then falls back to the environment-specific default API endpoint.
|
||||||
func (d DeploymentEnvironment) APIHost() string {
|
func (d DeploymentEnvironment) APIHost() string {
|
||||||
if apiHost := os.Getenv("API_HOST"); apiHost != "" {
|
if apiHost := os.Getenv("API_HOST"); apiHost != "" {
|
||||||
return apiHost
|
return apiHost
|
||||||
@ -65,14 +99,26 @@ func (d DeploymentEnvironment) APIHost() string {
|
|||||||
return apiServers[d]
|
return apiServers[d]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ManageURL constructs a management interface URL for this deployment environment.
|
||||||
|
// It combines the environment-specific management server base URL with the provided path.
|
||||||
|
//
|
||||||
|
// The path parameter should start with "/" for proper URL construction.
|
||||||
func (d DeploymentEnvironment) ManageURL(path string) string {
|
func (d DeploymentEnvironment) ManageURL(path string) string {
|
||||||
return manageServers[d] + path
|
return manageServers[d] + path
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MonitorDomain returns the monitoring domain for this deployment environment.
|
||||||
|
// The domain follows the pattern: {environment}.mon.ntppool.dev
|
||||||
|
// For example: "devel.mon.ntppool.dev" for the development environment.
|
||||||
func (d DeploymentEnvironment) MonitorDomain() string {
|
func (d DeploymentEnvironment) MonitorDomain() string {
|
||||||
return d.String() + ".mon.ntppool.dev"
|
return d.String() + ".mon.ntppool.dev"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UnmarshalText implements the encoding.TextUnmarshaler interface.
|
||||||
|
// It allows DeploymentEnvironment to be unmarshaled from configuration files
|
||||||
|
// and other text-based formats. Empty strings are treated as valid (no-op).
|
||||||
|
//
|
||||||
|
// Returns an error if the text represents an invalid deployment environment.
|
||||||
func (d *DeploymentEnvironment) UnmarshalText(text []byte) error {
|
func (d *DeploymentEnvironment) UnmarshalText(text []byte) error {
|
||||||
s := string(text)
|
s := string(text)
|
||||||
if s == "" {
|
if s == "" {
|
||||||
|
66
ekko/ekko.go
66
ekko/ekko.go
@ -1,3 +1,32 @@
|
|||||||
|
// Package ekko provides an enhanced Echo web framework wrapper with pre-configured middleware.
|
||||||
|
//
|
||||||
|
// This package wraps the Echo web framework with a comprehensive middleware stack including:
|
||||||
|
// - OpenTelemetry distributed tracing with request context propagation
|
||||||
|
// - Prometheus metrics collection with per-service subsystems
|
||||||
|
// - Structured logging with trace ID correlation
|
||||||
|
// - Security headers (HSTS, content security policy)
|
||||||
|
// - Gzip compression for response optimization
|
||||||
|
// - Recovery middleware with detailed error logging
|
||||||
|
// - HTTP/2 support with H2C (HTTP/2 Cleartext) capability
|
||||||
|
//
|
||||||
|
// The package uses functional options pattern for flexible configuration
|
||||||
|
// and supports graceful shutdown with configurable timeouts. It's designed
|
||||||
|
// as the standard web service foundation for NTP Pool project services.
|
||||||
|
//
|
||||||
|
// Example usage:
|
||||||
|
//
|
||||||
|
// ekko, err := ekko.New("myservice",
|
||||||
|
// ekko.WithPort(8080),
|
||||||
|
// ekko.WithPrometheus(prometheus.DefaultRegisterer),
|
||||||
|
// ekko.WithEchoSetup(func(e *echo.Echo) error {
|
||||||
|
// e.GET("/health", healthHandler)
|
||||||
|
// return nil
|
||||||
|
// }),
|
||||||
|
// )
|
||||||
|
// if err != nil {
|
||||||
|
// log.Fatal(err)
|
||||||
|
// }
|
||||||
|
// err = ekko.Start(ctx)
|
||||||
package ekko
|
package ekko
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -20,6 +49,25 @@ import (
|
|||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// New creates a new Ekko instance with the specified service name and functional options.
|
||||||
|
// The name parameter is used for OpenTelemetry service identification, Prometheus metrics
|
||||||
|
// subsystem naming, and server identification headers.
|
||||||
|
//
|
||||||
|
// Default configuration includes:
|
||||||
|
// - 60 second write timeout
|
||||||
|
// - 30 second read header timeout
|
||||||
|
// - HTTP/2 support with H2C
|
||||||
|
// - Standard middleware stack (tracing, metrics, logging, security)
|
||||||
|
//
|
||||||
|
// Use functional options to customize behavior:
|
||||||
|
// - WithPort(): Set server port (required for Start())
|
||||||
|
// - WithPrometheus(): Enable Prometheus metrics
|
||||||
|
// - WithEchoSetup(): Configure routes and handlers
|
||||||
|
// - WithLogFilters(): Filter access logs
|
||||||
|
// - WithOtelMiddleware(): Custom OpenTelemetry middleware
|
||||||
|
// - WithWriteTimeout(): Custom write timeout
|
||||||
|
// - WithReadHeaderTimeout(): Custom read header timeout
|
||||||
|
// - WithGzipConfig(): Custom gzip compression settings
|
||||||
func New(name string, options ...func(*Ekko)) (*Ekko, error) {
|
func New(name string, options ...func(*Ekko)) (*Ekko, error) {
|
||||||
ek := &Ekko{
|
ek := &Ekko{
|
||||||
writeTimeout: 60 * time.Second,
|
writeTimeout: 60 * time.Second,
|
||||||
@ -32,13 +80,25 @@ func New(name string, options ...func(*Ekko)) (*Ekko, error) {
|
|||||||
return ek, nil
|
return ek, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup Echo; only intended for testing
|
// SetupEcho creates and configures an Echo instance without starting the server.
|
||||||
|
// This method is primarily intended for testing scenarios where you need access
|
||||||
|
// to the configured Echo instance without starting the HTTP server.
|
||||||
|
//
|
||||||
|
// The returned Echo instance includes all configured middleware and routes
|
||||||
|
// but requires manual server lifecycle management.
|
||||||
func (ek *Ekko) SetupEcho(ctx context.Context) (*echo.Echo, error) {
|
func (ek *Ekko) SetupEcho(ctx context.Context) (*echo.Echo, error) {
|
||||||
return ek.setup(ctx)
|
return ek.setup(ctx)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup Echo and start the server. Will return if the http server
|
// Start creates the Echo instance and starts the HTTP server with graceful shutdown support.
|
||||||
// returns or the context is done.
|
// The server runs until either an error occurs or the provided context is cancelled.
|
||||||
|
//
|
||||||
|
// The server supports HTTP/2 with H2C (HTTP/2 Cleartext) and includes a 5-second
|
||||||
|
// graceful shutdown timeout when the context is cancelled. Server configuration
|
||||||
|
// (port, timeouts, middleware) must be set via functional options during New().
|
||||||
|
//
|
||||||
|
// Returns an error if server startup fails or if shutdown doesn't complete within
|
||||||
|
// the timeout period. Returns nil for clean shutdown via context cancellation.
|
||||||
func (ek *Ekko) Start(ctx context.Context) error {
|
func (ek *Ekko) Start(ctx context.Context) error {
|
||||||
log := logger.Setup()
|
log := logger.Setup()
|
||||||
|
|
||||||
|
@ -9,6 +9,9 @@ import (
|
|||||||
slogecho "github.com/samber/slog-echo"
|
slogecho "github.com/samber/slog-echo"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// Ekko represents an enhanced Echo web server with pre-configured middleware stack.
|
||||||
|
// It encapsulates server configuration, middleware options, and lifecycle management
|
||||||
|
// for NTP Pool web services. Use New() with functional options to configure.
|
||||||
type Ekko struct {
|
type Ekko struct {
|
||||||
name string
|
name string
|
||||||
prom prometheus.Registerer
|
prom prometheus.Registerer
|
||||||
@ -22,50 +25,76 @@ type Ekko struct {
|
|||||||
readHeaderTimeout time.Duration
|
readHeaderTimeout time.Duration
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RouteFn defines a function type for configuring Echo routes and handlers.
|
||||||
|
// It receives a configured Echo instance and should register all application
|
||||||
|
// routes, middleware, and handlers. Return an error to abort server startup.
|
||||||
type RouteFn func(e *echo.Echo) error
|
type RouteFn func(e *echo.Echo) error
|
||||||
|
|
||||||
|
// WithPort sets the HTTP server port. This option is required when using Start().
|
||||||
|
// The port should be available and the process should have permission to bind to it.
|
||||||
func WithPort(port int) func(*Ekko) {
|
func WithPort(port int) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.port = port
|
ek.port = port
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithPrometheus enables Prometheus metrics collection using the provided registerer.
|
||||||
|
// Metrics include HTTP request duration, request count, and response size histograms.
|
||||||
|
// The service name is used as the metrics subsystem for namespacing.
|
||||||
func WithPrometheus(reg prometheus.Registerer) func(*Ekko) {
|
func WithPrometheus(reg prometheus.Registerer) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.prom = reg
|
ek.prom = reg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithEchoSetup configures application routes and handlers via a setup function.
|
||||||
|
// The provided function receives the configured Echo instance after all middleware
|
||||||
|
// is applied and should register routes, custom middleware, and handlers.
|
||||||
func WithEchoSetup(rfn RouteFn) func(*Ekko) {
|
func WithEchoSetup(rfn RouteFn) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.routeFn = rfn
|
ek.routeFn = rfn
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithLogFilters configures access log filtering to reduce log noise.
|
||||||
|
// Filters can exclude specific paths, methods, or status codes from access logs.
|
||||||
|
// Useful for excluding health checks, metrics endpoints, and other high-frequency requests.
|
||||||
func WithLogFilters(f []slogecho.Filter) func(*Ekko) {
|
func WithLogFilters(f []slogecho.Filter) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.logFilters = f
|
ek.logFilters = f
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithOtelMiddleware replaces the default OpenTelemetry middleware with a custom implementation.
|
||||||
|
// The default middleware provides distributed tracing for all requests. Use this option
|
||||||
|
// when you need custom trace configuration or want to disable tracing entirely.
|
||||||
func WithOtelMiddleware(mw echo.MiddlewareFunc) func(*Ekko) {
|
func WithOtelMiddleware(mw echo.MiddlewareFunc) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.otelmiddleware = mw
|
ek.otelmiddleware = mw
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithWriteTimeout configures the HTTP server write timeout.
|
||||||
|
// This is the maximum duration before timing out writes of the response.
|
||||||
|
// Default is 60 seconds. Should be longer than expected response generation time.
|
||||||
func WithWriteTimeout(t time.Duration) func(*Ekko) {
|
func WithWriteTimeout(t time.Duration) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.writeTimeout = t
|
ek.writeTimeout = t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithReadHeaderTimeout configures the HTTP server read header timeout.
|
||||||
|
// This is the amount of time allowed to read request headers.
|
||||||
|
// Default is 30 seconds. Should be sufficient for slow clients and large headers.
|
||||||
func WithReadHeaderTimeout(t time.Duration) func(*Ekko) {
|
func WithReadHeaderTimeout(t time.Duration) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.readHeaderTimeout = t
|
ek.readHeaderTimeout = t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WithGzipConfig provides custom gzip compression configuration.
|
||||||
|
// By default, gzip compression is enabled with standard settings.
|
||||||
|
// Use this option to customize compression level, skip patterns, or disable compression.
|
||||||
func WithGzipConfig(gzipConfig *middleware.GzipConfig) func(*Ekko) {
|
func WithGzipConfig(gzipConfig *middleware.GzipConfig) func(*Ekko) {
|
||||||
return func(ek *Ekko) {
|
return func(ek *Ekko) {
|
||||||
ek.gzipConfig = gzipConfig
|
ek.gzipConfig = gzipConfig
|
||||||
|
@ -1,3 +1,32 @@
|
|||||||
|
// Package kafconn provides a Kafka client wrapper with TLS support for secure log streaming.
|
||||||
|
//
|
||||||
|
// This package handles Kafka connections with mutual TLS authentication for the NTP Pool
|
||||||
|
// project's log streaming infrastructure. It provides factories for creating Kafka readers
|
||||||
|
// and writers with automatic broker discovery, TLS configuration, and connection management.
|
||||||
|
//
|
||||||
|
// The package is designed specifically for the NTP Pool pipeline infrastructure and includes
|
||||||
|
// hardcoded bootstrap servers and group configurations. It uses certman for automatic
|
||||||
|
// certificate renewal and provides compression and batching optimizations.
|
||||||
|
//
|
||||||
|
// Key features:
|
||||||
|
// - Mutual TLS authentication with automatic certificate renewal
|
||||||
|
// - Broker discovery and connection pooling
|
||||||
|
// - Reader and writer factory methods with optimized configurations
|
||||||
|
// - LZ4 compression for efficient data transfer
|
||||||
|
// - Configurable batch sizes and load balancing
|
||||||
|
//
|
||||||
|
// Example usage:
|
||||||
|
//
|
||||||
|
// tlsSetup := kafconn.TLSSetup{
|
||||||
|
// CA: "/path/to/ca.pem",
|
||||||
|
// Cert: "/path/to/client.pem",
|
||||||
|
// Key: "/path/to/client.key",
|
||||||
|
// }
|
||||||
|
// kafka, err := kafconn.NewKafka(ctx, tlsSetup)
|
||||||
|
// if err != nil {
|
||||||
|
// log.Fatal(err)
|
||||||
|
// }
|
||||||
|
// writer, err := kafka.NewWriter("logs")
|
||||||
package kafconn
|
package kafconn
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -24,12 +53,17 @@ const (
|
|||||||
// kafkaMinBatchSize = 1000
|
// kafkaMinBatchSize = 1000
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// TLSSetup contains file paths for TLS certificate configuration.
|
||||||
|
// All fields are required for establishing secure Kafka connections.
|
||||||
type TLSSetup struct {
|
type TLSSetup struct {
|
||||||
CA string
|
CA string // Path to CA certificate file for server verification
|
||||||
Key string
|
Key string // Path to client private key file
|
||||||
Cert string
|
Cert string // Path to client certificate file
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Kafka represents a configured Kafka client with TLS support.
|
||||||
|
// It manages connections, brokers, and provides factory methods for readers and writers.
|
||||||
|
// The client handles broker discovery, connection pooling, and TLS configuration automatically.
|
||||||
type Kafka struct {
|
type Kafka struct {
|
||||||
tls TLSSetup
|
tls TLSSetup
|
||||||
|
|
||||||
@ -116,6 +150,19 @@ func (k *Kafka) kafkaTransport(ctx context.Context) (*kafka.Transport, error) {
|
|||||||
return transport, nil
|
return transport, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewKafka creates a new Kafka client with TLS configuration and establishes initial connections.
|
||||||
|
// It performs broker discovery, validates TLS certificates, and prepares the client for creating
|
||||||
|
// readers and writers.
|
||||||
|
//
|
||||||
|
// The function validates TLS configuration, establishes a connection to the bootstrap server,
|
||||||
|
// discovers all available brokers, and configures transport layers for optimal performance.
|
||||||
|
//
|
||||||
|
// Parameters:
|
||||||
|
// - ctx: Context for connection establishment and timeouts
|
||||||
|
// - tls: TLS configuration with paths to CA, certificate, and key files
|
||||||
|
//
|
||||||
|
// Returns a configured Kafka client ready for creating readers and writers, or an error
|
||||||
|
// if TLS setup fails, connection cannot be established, or broker discovery fails.
|
||||||
func NewKafka(ctx context.Context, tls TLSSetup) (*Kafka, error) {
|
func NewKafka(ctx context.Context, tls TLSSetup) (*Kafka, error) {
|
||||||
l := log.New(os.Stdout, "kafka: ", log.Ldate|log.Ltime|log.LUTC|log.Lmsgprefix|log.Lmicroseconds)
|
l := log.New(os.Stdout, "kafka: ", log.Ldate|log.Ltime|log.LUTC|log.Lmsgprefix|log.Lmicroseconds)
|
||||||
|
|
||||||
@ -171,6 +218,12 @@ func NewKafka(ctx context.Context, tls TLSSetup) (*Kafka, error) {
|
|||||||
return k, nil
|
return k, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewReader creates a new Kafka reader with the client's broker list and TLS configuration.
|
||||||
|
// The provided config is enhanced with the discovered brokers and configured dialer.
|
||||||
|
// The reader supports automatic offset management, consumer group coordination, and reconnection.
|
||||||
|
//
|
||||||
|
// The caller should configure the reader's Topic, GroupID, and other consumer-specific settings
|
||||||
|
// in the provided config. The client automatically sets Brokers and Dialer fields.
|
||||||
func (k *Kafka) NewReader(config kafka.ReaderConfig) *kafka.Reader {
|
func (k *Kafka) NewReader(config kafka.ReaderConfig) *kafka.Reader {
|
||||||
config.Brokers = k.brokerAddrs()
|
config.Brokers = k.brokerAddrs()
|
||||||
config.Dialer = k.dialer
|
config.Dialer = k.dialer
|
||||||
@ -186,6 +239,16 @@ func (k *Kafka) brokerAddrs() []string {
|
|||||||
return addrs
|
return addrs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewWriter creates a new Kafka writer for the specified topic with optimized configuration.
|
||||||
|
// The writer uses LZ4 compression, least-bytes load balancing, and batching for performance.
|
||||||
|
//
|
||||||
|
// Configuration includes:
|
||||||
|
// - Batch size: 2000 messages for efficient throughput
|
||||||
|
// - Compression: LZ4 for fast compression with good ratios
|
||||||
|
// - Balancer: LeastBytes for optimal partition distribution
|
||||||
|
// - Transport: TLS-configured transport with connection pooling
|
||||||
|
//
|
||||||
|
// The writer is ready for immediate use and handles connection management automatically.
|
||||||
func (k *Kafka) NewWriter(topic string) (*kafka.Writer, error) {
|
func (k *Kafka) NewWriter(topic string) (*kafka.Writer, error) {
|
||||||
// https://pkg.go.dev/github.com/segmentio/kafka-go#Writer
|
// https://pkg.go.dev/github.com/segmentio/kafka-go#Writer
|
||||||
w := &kafka.Writer{
|
w := &kafka.Writer{
|
||||||
@ -202,6 +265,12 @@ func (k *Kafka) NewWriter(topic string) (*kafka.Writer, error) {
|
|||||||
return w, nil
|
return w, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckPartitions verifies that the Kafka connection can read partition metadata.
|
||||||
|
// This method is useful for health checks and connection validation.
|
||||||
|
//
|
||||||
|
// Returns an error if partition metadata cannot be retrieved, which typically
|
||||||
|
// indicates connection problems, authentication failures, or broker unavailability.
|
||||||
|
// Logs a warning if no partitions are available but does not return an error.
|
||||||
func (k *Kafka) CheckPartitions() error {
|
func (k *Kafka) CheckPartitions() error {
|
||||||
partitions, err := k.conn.ReadPartitions()
|
partitions, err := k.conn.ReadPartitions()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
108
logger/logger.go
108
logger/logger.go
@ -1,3 +1,25 @@
|
|||||||
|
// Package logger provides structured logging with OpenTelemetry trace integration.
|
||||||
|
//
|
||||||
|
// This package offers multiple logging configurations for different deployment scenarios:
|
||||||
|
// - Text logging to stderr with optional timestamp removal for systemd
|
||||||
|
// - OTLP (OpenTelemetry Protocol) logging for observability pipelines
|
||||||
|
// - Multi-logger setup that outputs to both text and OTLP simultaneously
|
||||||
|
// - Context-aware logging with trace ID correlation
|
||||||
|
//
|
||||||
|
// The package automatically detects systemd environments and adjusts timestamp handling
|
||||||
|
// accordingly. It supports debug level configuration via environment variables and
|
||||||
|
// provides compatibility bridges for legacy logging interfaces.
|
||||||
|
//
|
||||||
|
// Key features:
|
||||||
|
// - Automatic OpenTelemetry trace and span ID inclusion in log entries
|
||||||
|
// - Configurable log levels via DEBUG environment variable (with optional prefix)
|
||||||
|
// - Systemd-compatible output (no timestamps when INVOCATION_ID is present)
|
||||||
|
// - Thread-safe logger setup with sync.Once protection
|
||||||
|
// - Context propagation for request-scoped logging
|
||||||
|
//
|
||||||
|
// Environment variables:
|
||||||
|
// - DEBUG: Enable debug level logging (configurable prefix via ConfigPrefix)
|
||||||
|
// - INVOCATION_ID: Systemd detection for timestamp handling
|
||||||
package logger
|
package logger
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -13,6 +35,9 @@ import (
|
|||||||
"go.opentelemetry.io/contrib/bridges/otelslog"
|
"go.opentelemetry.io/contrib/bridges/otelslog"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// ConfigPrefix allows customizing the environment variable prefix for configuration.
|
||||||
|
// When set, environment variables like DEBUG become {ConfigPrefix}_DEBUG.
|
||||||
|
// This enables multiple services to have independent logging configuration.
|
||||||
var ConfigPrefix = ""
|
var ConfigPrefix = ""
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -67,10 +92,15 @@ func setupOtlpLogger() *slog.Logger {
|
|||||||
return otlpLogger
|
return otlpLogger
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetupMultiLogger will setup and make default a logger that
|
// SetupMultiLogger creates a logger that outputs to both text (stderr) and OTLP simultaneously.
|
||||||
// logs as described in Setup() as well as an OLTP logger.
|
// This is useful for services that need both human-readable logs and structured observability data.
|
||||||
// The "multi logger" is made the default the first time
|
//
|
||||||
// this function is called
|
// The multi-logger combines:
|
||||||
|
// - Text handler: Stderr output with OpenTelemetry trace integration
|
||||||
|
// - OTLP handler: Structured logs sent via OpenTelemetry Protocol
|
||||||
|
//
|
||||||
|
// On first call, this logger becomes the default logger returned by Setup().
|
||||||
|
// The function is thread-safe and uses sync.Once to ensure single initialization.
|
||||||
func SetupMultiLogger() *slog.Logger {
|
func SetupMultiLogger() *slog.Logger {
|
||||||
setupMulti.Do(func() {
|
setupMulti.Do(func() {
|
||||||
textHandler := Setup().Handler()
|
textHandler := Setup().Handler()
|
||||||
@ -89,28 +119,38 @@ func SetupMultiLogger() *slog.Logger {
|
|||||||
return multiLogger
|
return multiLogger
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetupOLTP configures and returns a logger sending logs
|
// SetupOLTP creates a logger that sends structured logs via OpenTelemetry Protocol.
|
||||||
// via OpenTelemetry (configured via the tracing package).
|
// This logger is designed for observability pipelines and log aggregation systems.
|
||||||
//
|
//
|
||||||
// This was made to work with Loki + Grafana that makes it
|
// The OTLP logger formats log messages similarly to the text logger for better
|
||||||
// hard to view the log attributes in the UI, so the log
|
// compatibility with Loki + Grafana, while still providing structured attributes.
|
||||||
// message is formatted similarly to the text logger. The
|
// Log attributes are available both in the message format and as OTLP attributes.
|
||||||
// attributes are duplicated as OLTP attributes in the
|
//
|
||||||
// log messages. https://github.com/grafana/loki/issues/14788
|
// This logger does not become the default logger and must be used explicitly.
|
||||||
|
// It requires OpenTelemetry tracing configuration to be set up via the tracing package.
|
||||||
|
//
|
||||||
|
// See: https://github.com/grafana/loki/issues/14788 for formatting rationale.
|
||||||
func SetupOLTP() *slog.Logger {
|
func SetupOLTP() *slog.Logger {
|
||||||
return setupOtlpLogger()
|
return setupOtlpLogger()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Setup returns an slog.Logger configured for text formatting
|
// Setup creates and returns the standard text logger for the application.
|
||||||
// to stderr.
|
// This is the primary logging function that most applications should use.
|
||||||
// OpenTelemetry trace_id and span_id's are logged as attributes
|
|
||||||
// when available.
|
|
||||||
// When the application is running under systemd timestamps are
|
|
||||||
// omitted. On first call the slog default logger is set to this
|
|
||||||
// logger as well.
|
|
||||||
//
|
//
|
||||||
// If SetupMultiLogger has been called Setup() will return
|
// Features:
|
||||||
// the "multi logger"
|
// - Text formatting to stderr with human-readable output
|
||||||
|
// - Automatic OpenTelemetry trace_id and span_id inclusion when available
|
||||||
|
// - Systemd compatibility: omits timestamps when INVOCATION_ID environment variable is present
|
||||||
|
// - Debug level support via DEBUG environment variable (respects ConfigPrefix)
|
||||||
|
// - Thread-safe initialization with sync.Once
|
||||||
|
//
|
||||||
|
// On first call, this logger becomes the slog default logger. If SetupMultiLogger()
|
||||||
|
// has been called previously, Setup() returns the multi-logger instead of the text logger.
|
||||||
|
//
|
||||||
|
// The logger automatically detects execution context:
|
||||||
|
// - Systemd: Removes timestamps (systemd adds its own)
|
||||||
|
// - Debug mode: Enables debug level logging based on environment variables
|
||||||
|
// - OpenTelemetry: Includes trace correlation when tracing is active
|
||||||
func Setup() *slog.Logger {
|
func Setup() *slog.Logger {
|
||||||
setupText.Do(func() {
|
setupText.Do(func() {
|
||||||
h := setupStdErrHandler()
|
h := setupStdErrHandler()
|
||||||
@ -129,15 +169,33 @@ func Setup() *slog.Logger {
|
|||||||
|
|
||||||
type loggerKey struct{}
|
type loggerKey struct{}
|
||||||
|
|
||||||
// NewContext adds the logger to the context. Use this
|
// NewContext stores a logger in the context for request-scoped logging.
|
||||||
// to for example make a request specific logger available
|
// This enables passing request-specific loggers (e.g., with request IDs,
|
||||||
// to other functions through the context
|
// user context, or other correlation data) through the call stack.
|
||||||
|
//
|
||||||
|
// Use this to create context-aware logging where different parts of the
|
||||||
|
// application can access the same enriched logger instance.
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
//
|
||||||
|
// logger := slog.With("request_id", requestID)
|
||||||
|
// ctx := logger.NewContext(ctx, logger)
|
||||||
|
// // Pass ctx to downstream functions
|
||||||
func NewContext(ctx context.Context, l *slog.Logger) context.Context {
|
func NewContext(ctx context.Context, l *slog.Logger) context.Context {
|
||||||
return context.WithValue(ctx, loggerKey{}, l)
|
return context.WithValue(ctx, loggerKey{}, l)
|
||||||
}
|
}
|
||||||
|
|
||||||
// FromContext retrieves a logger from the context. If there is none,
|
// FromContext retrieves a logger from the context.
|
||||||
// it returns the default logger
|
// If no logger is stored in the context, it returns the default logger from Setup().
|
||||||
|
//
|
||||||
|
// This function provides a safe way to access context-scoped loggers without
|
||||||
|
// needing to check for nil values. It ensures that logging is always available,
|
||||||
|
// falling back to the application's standard logger configuration.
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
//
|
||||||
|
// log := logger.FromContext(ctx)
|
||||||
|
// log.Info("processing request") // Uses context logger or default
|
||||||
func FromContext(ctx context.Context) *slog.Logger {
|
func FromContext(ctx context.Context) *slog.Logger {
|
||||||
if l, ok := ctx.Value(loggerKey{}).(*slog.Logger); ok {
|
if l, ok := ctx.Value(loggerKey{}).(*slog.Logger); ok {
|
||||||
return l
|
return l
|
||||||
|
@ -5,12 +5,24 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// stdLoggerish provides a bridge between legacy log interfaces and slog.
|
||||||
|
// It implements common logging methods (Println, Printf, Fatalf) that
|
||||||
|
// delegate to structured logging with a consistent key prefix.
|
||||||
type stdLoggerish struct {
|
type stdLoggerish struct {
|
||||||
key string
|
key string // Prefix key for all log messages
|
||||||
log *slog.Logger
|
log *slog.Logger // Underlying structured logger
|
||||||
f func(string, ...any)
|
f func(string, ...any) // Log function (Info or Debug level)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NewStdLog creates a legacy-compatible logger that bridges to structured logging.
|
||||||
|
// This is useful for third-party libraries that expect a standard log.Logger interface.
|
||||||
|
//
|
||||||
|
// Parameters:
|
||||||
|
// - key: Prefix added to all log messages for identification
|
||||||
|
// - debug: If true, logs at debug level; otherwise logs at info level
|
||||||
|
// - log: Underlying slog.Logger (uses Setup() if nil)
|
||||||
|
//
|
||||||
|
// The returned logger implements Println, Printf, and Fatalf methods.
|
||||||
func NewStdLog(key string, debug bool, log *slog.Logger) *stdLoggerish {
|
func NewStdLog(key string, debug bool, log *slog.Logger) *stdLoggerish {
|
||||||
if log == nil {
|
if log == nil {
|
||||||
log = Setup()
|
log = Setup()
|
||||||
@ -27,14 +39,18 @@ func NewStdLog(key string, debug bool, log *slog.Logger) *stdLoggerish {
|
|||||||
return sl
|
return sl
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Println logs the arguments using the configured log level with the instance key.
|
||||||
func (l stdLoggerish) Println(msg ...any) {
|
func (l stdLoggerish) Println(msg ...any) {
|
||||||
l.f(l.key, "msg", msg)
|
l.f(l.key, "msg", msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Printf logs a formatted message using the configured log level with the instance key.
|
||||||
func (l stdLoggerish) Printf(msg string, args ...any) {
|
func (l stdLoggerish) Printf(msg string, args ...any) {
|
||||||
l.f(l.key, "msg", fmt.Sprintf(msg, args...))
|
l.f(l.key, "msg", fmt.Sprintf(msg, args...))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Fatalf logs a formatted error message and panics.
|
||||||
|
// Note: This implementation panics instead of calling os.Exit for testability.
|
||||||
func (l stdLoggerish) Fatalf(msg string, args ...any) {
|
func (l stdLoggerish) Fatalf(msg string, args ...any) {
|
||||||
l.log.Error(l.key, "msg", fmt.Sprintf(msg, args...))
|
l.log.Error(l.key, "msg", fmt.Sprintf(msg, args...))
|
||||||
panic("fatal error") // todo: does this make sense at all?
|
panic("fatal error") // todo: does this make sense at all?
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
package logger
|
|
||||||
|
|
||||||
type Error struct {
|
|
||||||
Msg string
|
|
||||||
Data []any
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewError(msg string, data ...any) *Error {
|
|
||||||
return &Error{
|
|
||||||
Msg: msg,
|
|
||||||
Data: data,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (e *Error) Error() string {
|
|
||||||
return "not implemented"
|
|
||||||
}
|
|
@ -1,3 +1,36 @@
|
|||||||
|
// Package tracing provides OpenTelemetry distributed tracing setup with OTLP export support.
|
||||||
|
//
|
||||||
|
// This package handles the complete OpenTelemetry SDK initialization including:
|
||||||
|
// - Trace provider configuration with batching and resource detection
|
||||||
|
// - Log provider setup for structured log export via OTLP
|
||||||
|
// - Automatic resource discovery (service name, version, host, container, process info)
|
||||||
|
// - Support for both gRPC and HTTP OTLP exporters with TLS configuration
|
||||||
|
// - Propagation context setup for distributed tracing across services
|
||||||
|
// - Graceful shutdown handling for all telemetry components
|
||||||
|
//
|
||||||
|
// The package supports various deployment scenarios:
|
||||||
|
// - Development: Local OTLP collectors or observability backends
|
||||||
|
// - Production: Secure OTLP export with mutual TLS authentication
|
||||||
|
// - Container environments: Automatic container and Kubernetes resource detection
|
||||||
|
//
|
||||||
|
// Configuration is primarily handled via standard OpenTelemetry environment variables:
|
||||||
|
// - OTEL_SERVICE_NAME: Service identification
|
||||||
|
// - OTEL_EXPORTER_OTLP_PROTOCOL: Protocol selection (grpc, http/protobuf)
|
||||||
|
// - OTEL_TRACES_EXPORTER: Exporter type (otlp, autoexport)
|
||||||
|
// - OTEL_RESOURCE_ATTRIBUTES: Additional resource attributes
|
||||||
|
//
|
||||||
|
// Example usage:
|
||||||
|
//
|
||||||
|
// cfg := &tracing.TracerConfig{
|
||||||
|
// ServiceName: "my-service",
|
||||||
|
// Environment: "production",
|
||||||
|
// Endpoint: "https://otlp.example.com:4317",
|
||||||
|
// }
|
||||||
|
// shutdown, err := tracing.InitTracer(ctx, cfg)
|
||||||
|
// if err != nil {
|
||||||
|
// log.Fatal(err)
|
||||||
|
// }
|
||||||
|
// defer shutdown(ctx)
|
||||||
package tracing
|
package tracing
|
||||||
|
|
||||||
// todo, review:
|
// todo, review:
|
||||||
@ -43,34 +76,68 @@ var errInvalidOTLPProtocol = errors.New("invalid OTLP protocol - should be one o
|
|||||||
|
|
||||||
// https://github.com/open-telemetry/opentelemetry-go/blob/main/exporters/otlp/otlptrace/otlptracehttp/example_test.go
|
// https://github.com/open-telemetry/opentelemetry-go/blob/main/exporters/otlp/otlptrace/otlptracehttp/example_test.go
|
||||||
|
|
||||||
|
// TpShutdownFunc represents a function that gracefully shuts down telemetry providers.
|
||||||
|
// It should be called during application shutdown to ensure all telemetry data is flushed
|
||||||
|
// and exporters are properly closed. The context can be used to set shutdown timeouts.
|
||||||
type TpShutdownFunc func(ctx context.Context) error
|
type TpShutdownFunc func(ctx context.Context) error
|
||||||
|
|
||||||
|
// Tracer returns the configured OpenTelemetry tracer for the NTP Pool project.
|
||||||
|
// This tracer should be used for creating spans and distributed tracing throughout
|
||||||
|
// the application. It uses the global tracer provider set up by InitTracer/SetupSDK.
|
||||||
func Tracer() trace.Tracer {
|
func Tracer() trace.Tracer {
|
||||||
traceProvider := otel.GetTracerProvider()
|
traceProvider := otel.GetTracerProvider()
|
||||||
return traceProvider.Tracer("ntppool-tracer")
|
return traceProvider.Tracer("ntppool-tracer")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Start creates a new span with the given name and options using the configured tracer.
|
||||||
|
// This is a convenience function that wraps the standard OpenTelemetry span creation.
|
||||||
|
// It returns a new context containing the span and the span itself for further configuration.
|
||||||
|
//
|
||||||
|
// The returned context should be used for downstream operations to maintain trace correlation.
|
||||||
func Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
|
func Start(ctx context.Context, spanName string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
|
||||||
return Tracer().Start(ctx, spanName, opts...)
|
return Tracer().Start(ctx, spanName, opts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetClientCertificate defines a function type for providing client certificates for mutual TLS.
|
||||||
|
// This is used when exporting telemetry data to secured OTLP endpoints that require
|
||||||
|
// client certificate authentication.
|
||||||
type GetClientCertificate func(*tls.CertificateRequestInfo) (*tls.Certificate, error)
|
type GetClientCertificate func(*tls.CertificateRequestInfo) (*tls.Certificate, error)
|
||||||
|
|
||||||
|
// TracerConfig provides configuration options for OpenTelemetry tracing setup.
|
||||||
|
// It supplements standard OpenTelemetry environment variables with additional
|
||||||
|
// NTP Pool-specific configuration including TLS settings for secure OTLP export.
|
||||||
type TracerConfig struct {
|
type TracerConfig struct {
|
||||||
ServiceName string
|
ServiceName string // Service name for resource identification (overrides OTEL_SERVICE_NAME)
|
||||||
Environment string
|
Environment string // Deployment environment (development, staging, production)
|
||||||
Endpoint string
|
Endpoint string // OTLP endpoint hostname/port (e.g., "otlp.example.com:4317")
|
||||||
EndpointURL string
|
EndpointURL string // Complete OTLP endpoint URL (e.g., "https://otlp.example.com:4317/v1/traces")
|
||||||
|
|
||||||
CertificateProvider GetClientCertificate
|
CertificateProvider GetClientCertificate // Client certificate provider for mutual TLS
|
||||||
RootCAs *x509.CertPool
|
RootCAs *x509.CertPool // CA certificate pool for server verification
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// InitTracer initializes the OpenTelemetry SDK with the provided configuration.
|
||||||
|
// This is the main entry point for setting up distributed tracing in applications.
|
||||||
|
//
|
||||||
|
// The function configures trace and log providers, sets up OTLP exporters,
|
||||||
|
// and returns a shutdown function that must be called during application termination.
|
||||||
|
//
|
||||||
|
// Returns a shutdown function and an error. The shutdown function should be called
|
||||||
|
// with a context that has an appropriate timeout for graceful shutdown.
|
||||||
func InitTracer(ctx context.Context, cfg *TracerConfig) (TpShutdownFunc, error) {
|
func InitTracer(ctx context.Context, cfg *TracerConfig) (TpShutdownFunc, error) {
|
||||||
// todo: setup environment from cfg
|
// todo: setup environment from cfg
|
||||||
return SetupSDK(ctx, cfg)
|
return SetupSDK(ctx, cfg)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// SetupSDK performs the complete OpenTelemetry SDK initialization including resource
|
||||||
|
// discovery, exporter configuration, provider setup, and shutdown function creation.
|
||||||
|
//
|
||||||
|
// The function automatically discovers system resources (service info, host, container,
|
||||||
|
// process details) and configures both trace and log exporters. It supports multiple
|
||||||
|
// OTLP protocols (gRPC, HTTP) and handles TLS configuration for secure deployments.
|
||||||
|
//
|
||||||
|
// The returned shutdown function coordinates graceful shutdown of all telemetry
|
||||||
|
// components in the reverse order of their initialization.
|
||||||
func SetupSDK(ctx context.Context, cfg *TracerConfig) (shutdown TpShutdownFunc, err error) {
|
func SetupSDK(ctx context.Context, cfg *TracerConfig) (shutdown TpShutdownFunc, err error) {
|
||||||
if cfg == nil {
|
if cfg == nil {
|
||||||
cfg = &TracerConfig{}
|
cfg = &TracerConfig{}
|
||||||
|
@ -1,3 +1,17 @@
|
|||||||
|
// Package types provides shared data structures for the NTP Pool project.
|
||||||
|
//
|
||||||
|
// This package contains common types used across different NTP Pool services
|
||||||
|
// for data exchange, logging, and database operations. The types are designed
|
||||||
|
// to support JSON serialization for API responses and SQL database storage
|
||||||
|
// with automatic marshaling/unmarshaling.
|
||||||
|
//
|
||||||
|
// Current types include:
|
||||||
|
// - LogScoreAttributes: NTP server scoring metadata for monitoring and analysis
|
||||||
|
//
|
||||||
|
// All types implement appropriate interfaces for:
|
||||||
|
// - JSON serialization (json.Marshaler/json.Unmarshaler)
|
||||||
|
// - SQL database storage (database/sql/driver.Valuer/sql.Scanner)
|
||||||
|
// - String representation for logging and debugging
|
||||||
package types
|
package types
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -6,17 +20,26 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// LogScoreAttributes contains metadata about NTP server scoring and monitoring results.
|
||||||
|
// This structure captures both NTP protocol-specific information (leap, stratum) and
|
||||||
|
// operational data (errors, warnings, response status) for analysis and alerting.
|
||||||
|
//
|
||||||
|
// The type supports JSON serialization for API responses and database storage
|
||||||
|
// via the database/sql/driver interfaces. Fields use omitempty tags to minimize
|
||||||
|
// JSON payload size when values are at their zero state.
|
||||||
type LogScoreAttributes struct {
|
type LogScoreAttributes struct {
|
||||||
Leap int8 `json:"leap,omitempty"`
|
Leap int8 `json:"leap,omitempty"` // NTP leap indicator (0=no warning, 1=+1s, 2=-1s, 3=unsynchronized)
|
||||||
Stratum int8 `json:"stratum,omitempty"`
|
Stratum int8 `json:"stratum,omitempty"` // NTP stratum level (1=primary, 2-15=secondary, 16=unsynchronized)
|
||||||
NoResponse bool `json:"no_response,omitempty"`
|
NoResponse bool `json:"no_response,omitempty"` // True if server failed to respond to NTP queries
|
||||||
Error string `json:"error,omitempty"`
|
Error string `json:"error,omitempty"` // Error message if scoring failed
|
||||||
Warning string `json:"warning,omitempty"`
|
Warning string `json:"warning,omitempty"` // Warning message for non-fatal issues
|
||||||
|
|
||||||
FromLSID int `json:"from_ls_id,omitempty"`
|
FromLSID int `json:"from_ls_id,omitempty"` // Source log server ID for traceability
|
||||||
FromSSID int `json:"from_ss_id,omitempty"`
|
FromSSID int `json:"from_ss_id,omitempty"` // Source scoring system ID for traceability
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// String returns a JSON representation of the LogScoreAttributes for logging and debugging.
|
||||||
|
// Returns an empty string if JSON marshaling fails.
|
||||||
func (lsa *LogScoreAttributes) String() string {
|
func (lsa *LogScoreAttributes) String() string {
|
||||||
b, err := json.Marshal(lsa)
|
b, err := json.Marshal(lsa)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -25,10 +48,17 @@ func (lsa *LogScoreAttributes) String() string {
|
|||||||
return string(b)
|
return string(b)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Value implements the database/sql/driver.Valuer interface for database storage.
|
||||||
|
// It serializes the LogScoreAttributes to JSON for storage in SQL databases.
|
||||||
|
// Returns the JSON bytes or an error if marshaling fails.
|
||||||
func (lsa *LogScoreAttributes) Value() (driver.Value, error) {
|
func (lsa *LogScoreAttributes) Value() (driver.Value, error) {
|
||||||
return json.Marshal(lsa)
|
return json.Marshal(lsa)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Scan implements the database/sql.Scanner interface for reading from SQL databases.
|
||||||
|
// It deserializes JSON data from the database back into LogScoreAttributes.
|
||||||
|
// Supports both []byte and string input types, with nil values treated as no-op.
|
||||||
|
// Returns an error if the input type is unsupported or JSON unmarshaling fails.
|
||||||
func (lsa *LogScoreAttributes) Scan(value any) error {
|
func (lsa *LogScoreAttributes) Scan(value any) error {
|
||||||
var source []byte
|
var source []byte
|
||||||
_t := LogScoreAttributes{}
|
_t := LogScoreAttributes{}
|
||||||
|
@ -1,3 +1,27 @@
|
|||||||
|
// Package fastlyxff provides Fastly CDN IP range management for trusted proxy handling.
|
||||||
|
//
|
||||||
|
// This package parses Fastly's public IP ranges JSON file and generates Echo framework
|
||||||
|
// trust options for proper client IP extraction from X-Forwarded-For headers.
|
||||||
|
// It's designed specifically for services deployed behind Fastly's CDN that need
|
||||||
|
// to identify real client IPs for logging, rate limiting, and security purposes.
|
||||||
|
//
|
||||||
|
// Fastly publishes their edge server IP ranges in a JSON format that this package
|
||||||
|
// consumes to automatically configure trusted proxy ranges. This ensures that
|
||||||
|
// X-Forwarded-For headers are only trusted when they originate from legitimate
|
||||||
|
// Fastly edge servers.
|
||||||
|
//
|
||||||
|
// Key features:
|
||||||
|
// - Automatic parsing of Fastly's IP ranges JSON format
|
||||||
|
// - Support for both IPv4 and IPv6 address ranges
|
||||||
|
// - Echo framework integration via TrustOption generation
|
||||||
|
// - CIDR notation parsing and validation
|
||||||
|
//
|
||||||
|
// The JSON file typically contains IP ranges in this format:
|
||||||
|
//
|
||||||
|
// {
|
||||||
|
// "addresses": ["23.235.32.0/20", "43.249.72.0/22", ...],
|
||||||
|
// "ipv6_addresses": ["2a04:4e40::/32", "2a04:4e42::/32", ...]
|
||||||
|
// }
|
||||||
package fastlyxff
|
package fastlyxff
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -9,15 +33,29 @@ import (
|
|||||||
"github.com/labstack/echo/v4"
|
"github.com/labstack/echo/v4"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// FastlyXFF represents Fastly's published IP ranges for their CDN edge servers.
|
||||||
|
// This structure matches the JSON format provided by Fastly for their public IP ranges.
|
||||||
|
// It contains separate lists for IPv4 and IPv6 CIDR ranges.
|
||||||
type FastlyXFF struct {
|
type FastlyXFF struct {
|
||||||
IPv4 []string `json:"addresses"`
|
IPv4 []string `json:"addresses"` // IPv4 CIDR ranges (e.g., "23.235.32.0/20")
|
||||||
IPv6 []string `json:"ipv6_addresses"`
|
IPv6 []string `json:"ipv6_addresses"` // IPv6 CIDR ranges (e.g., "2a04:4e40::/32")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TrustedNets holds parsed network prefixes for efficient IP range checking.
|
||||||
|
// This type is currently unused but reserved for future optimizations
|
||||||
|
// where frequent IP range lookups might benefit from pre-parsed prefixes.
|
||||||
type TrustedNets struct {
|
type TrustedNets struct {
|
||||||
prefixes []netip.Prefix
|
prefixes []netip.Prefix // Parsed network prefixes for efficient lookups
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// New loads and parses Fastly IP ranges from a JSON file.
|
||||||
|
// The file should contain Fastly's published IP ranges in their standard JSON format.
|
||||||
|
//
|
||||||
|
// Parameters:
|
||||||
|
// - fileName: Path to the Fastly IP ranges JSON file
|
||||||
|
//
|
||||||
|
// Returns the parsed FastlyXFF structure or an error if the file cannot be
|
||||||
|
// read or the JSON format is invalid.
|
||||||
func New(fileName string) (*FastlyXFF, error) {
|
func New(fileName string) (*FastlyXFF, error) {
|
||||||
b, err := os.ReadFile(fileName)
|
b, err := os.ReadFile(fileName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -34,6 +72,19 @@ func New(fileName string) (*FastlyXFF, error) {
|
|||||||
return &d, nil
|
return &d, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EchoTrustOption converts Fastly IP ranges into Echo framework trust options.
|
||||||
|
// This method generates trust configurations that tell Echo to accept X-Forwarded-For
|
||||||
|
// headers only from Fastly's edge servers, ensuring accurate client IP extraction.
|
||||||
|
//
|
||||||
|
// The generated trust options should be used with Echo's IP extractor:
|
||||||
|
//
|
||||||
|
// options, err := fastlyRanges.EchoTrustOption()
|
||||||
|
// if err != nil {
|
||||||
|
// return err
|
||||||
|
// }
|
||||||
|
// e.IPExtractor = echo.ExtractIPFromXFFHeader(options...)
|
||||||
|
//
|
||||||
|
// Returns a slice of Echo trust options or an error if any CIDR range cannot be parsed.
|
||||||
func (xff *FastlyXFF) EchoTrustOption() ([]echo.TrustOption, error) {
|
func (xff *FastlyXFF) EchoTrustOption() ([]echo.TrustOption, error) {
|
||||||
ranges := []echo.TrustOption{}
|
ranges := []echo.TrustOption{}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user