Victor Lyuboslavsky
aaac4b1dfe
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #38889 PLEASE READ BELOW before looking at file changes Before converting individual files/packages to slog, we generally need to make these 2 changes to make the conversion easier: - Replace uses of `kitlog.With` since they are not fully compatible with our kitlog adapter - Directly use the kitlog adapter logger type instead of the kitlog interface, which will let us have direct access to the underlying slog logger: `*logging.Logger` Note: that I did not replace absolutely all uses of `kitlog.Logger`, but I did remove all uses of `kitlog.With` except for these due to complexity: - server/logging/filesystem.go and the other log writers (webhook, firehose, kinesis, lambda, pubsub, nats) - server/datastore/mysql/nanomdm_storage.go (adapter pattern) - server/vulnerabilities/nvd/* (cascades to CLI tools) - server/service/osquery_utils/queries.go (callback type signatures cascade broadly) - cmd/maintained-apps/ (standalone, so can be transitioned later all at once) Most of the changes in this PR follow these patterns: - `kitlog.Logger` type → `*logging.Logger` - `kitlog.With(logger, ...)` → `logger.With(...)` - `kitlog.NewNopLogger() → logging.NewNopLogger()`, including similar variations such as `logging.NewLogfmtLogger(w)` and `logging.NewJSONLogger(w)` - removed many now-unused kitlog imports Unique changes that the PR review should focus on: - server/platform/logging/kitlog_adapter.go: Core adapter changes - server/platform/logging/logging.go: New convenience functions - server/service/integration_logger_test.go: Test changes for slog # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. - Was added in previous PR ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Refactor** * Migrated the codebase to a unified internal structured logging system for more consistent, reliable logs and observability. * No user-facing functionality changed; runtime behavior and APIs remain compatible. * **Tests** * Updated tests to use the new logging helpers to ensure consistent test logging and validation. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
58 lines
1.6 KiB
Go
58 lines
1.6 KiB
Go
// Package launcher provides a gRPC server to handle launcher requests.
|
|
package launcher
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
|
|
kithttp "github.com/go-kit/kit/transport/http"
|
|
launcher "github.com/kolide/launcher/pkg/service"
|
|
grpc "google.golang.org/grpc"
|
|
|
|
"github.com/fleetdm/fleet/v4/server/fleet"
|
|
"github.com/fleetdm/fleet/v4/server/health"
|
|
"github.com/fleetdm/fleet/v4/server/platform/logging"
|
|
)
|
|
|
|
// Handler extends the grpc.Server, providing Handler that allows us to serve
|
|
// both gRPC and http traffic.
|
|
type Handler struct {
|
|
*grpc.Server
|
|
}
|
|
|
|
// New creates a gRPC server to handle remote requests from launcher.
|
|
func New(
|
|
tls fleet.OsqueryService,
|
|
logger *logging.Logger,
|
|
grpcServer *grpc.Server,
|
|
healthCheckers map[string]health.Checker,
|
|
) *Handler {
|
|
var svc launcher.KolideService
|
|
{
|
|
svc = &launcherWrapper{
|
|
tls: tls,
|
|
logger: logger,
|
|
healthCheckers: healthCheckers,
|
|
}
|
|
svc = launcher.LoggingMiddleware(logger)(svc)
|
|
}
|
|
endpoints := launcher.MakeServerEndpoints(svc)
|
|
server := launcher.NewGRPCServer(endpoints, logger)
|
|
launcher.RegisterGRPCServer(grpcServer, server)
|
|
return &Handler{grpcServer}
|
|
}
|
|
|
|
// Handler will route gRPC traffic to the gRPC server, other http traffic
|
|
// will be routed to normal http handler functions.
|
|
func (hgrpc *Handler) Handler(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
if r.ProtoMajor == 2 && strings.Contains(r.Header.Get("Content-Type"), "application/grpc") {
|
|
ctx := r.Context()
|
|
ctx = kithttp.PopulateRequestContext(ctx, r)
|
|
hgrpc.ServeHTTP(w, r.WithContext(ctx))
|
|
} else {
|
|
next.ServeHTTP(w, r)
|
|
}
|
|
})
|
|
}
|