From edca82eaf21277e412b6aeca8fe66816c4ffa4ed Mon Sep 17 00:00:00 2001
From: Mike Arpaia <mike@arpaia.co>
Date: Mon, 27 Nov 2017 15:56:09 -0700
Subject: [PATCH] Revert "add remote ip address to service logs (#1635)"
 (#1651)

This reverts commit 11707132bd2ead72c6f84395357e461b9e83c48d.
---
 server/service/handler.go         | 1 -
 server/service/logging_osquery.go | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/server/service/handler.go b/server/service/handler.go
index 02c5f7867a..d9f7753705 100644
--- a/server/service/handler.go
+++ b/server/service/handler.go
@@ -334,7 +334,6 @@ func makeKolideKitHandlers(e KolideEndpoints, opts []kithttp.ServerOption) *koli
 func MakeHandler(svc kolide.Service, jwtKey string, logger kitlog.Logger) http.Handler {
 	kolideAPIOptions := []kithttp.ServerOption{
 		kithttp.ServerBefore(
-			kithttp.PopulateRequestContext, // populate the request context with common fields
 			setRequestsContexts(svc, jwtKey),
 		),
 		kithttp.ServerErrorLogger(logger),
diff --git a/server/service/logging_osquery.go b/server/service/logging_osquery.go
index ca4e642ffb..6e36451d5a 100644
--- a/server/service/logging_osquery.go
+++ b/server/service/logging_osquery.go
@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"time"
 
-	kithttp "github.com/go-kit/kit/transport/http"
 	"github.com/kolide/fleet/server/kolide"
 )
 
@@ -18,7 +17,6 @@ func (mw loggingMiddleware) EnrollAgent(ctx context.Context, enrollSecret string
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "EnrollAgent",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -37,7 +35,6 @@ func (mw loggingMiddleware) AuthenticateHost(ctx context.Context, nodeKey string
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "AuthenticateHost",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -56,7 +53,6 @@ func (mw loggingMiddleware) GetClientConfig(ctx context.Context) (*kolide.Osquer
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "GetClientConfig",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -76,7 +72,6 @@ func (mw loggingMiddleware) GetDistributedQueries(ctx context.Context) (map[stri
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "GetDistributedQueries",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -94,7 +89,6 @@ func (mw loggingMiddleware) SubmitDistributedQueryResults(ctx context.Context, r
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitDistributedQueryResults",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -112,7 +106,6 @@ func (mw loggingMiddleware) SubmitStatusLogs(ctx context.Context, logs []kolide.
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitStatusLogs",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)
@@ -130,7 +123,6 @@ func (mw loggingMiddleware) SubmitResultLogs(ctx context.Context, logs []json.Ra
 	defer func(begin time.Time) {
 		_ = mw.logger.Log(
 			"method", "SubmitResultLogs",
-			"ip_addr", ctx.Value(kithttp.ContextKeyRequestRemoteAddr).(string),
 			"err", err,
 			"took", time.Since(begin),
 		)