Merge #151494 #151506 #151542

151494: roachtest: Skip rangelog endpoint in db-console/endpoints roachtest r=alyshanjahani-crl a=alyshanjahani-crl

This commit skips the rangelog endpoint on the admin server. This failure mode is described in #149866 (comment)

Part of: #149866
Release note: None

151506: sql: remove unnecessary jaeger trace test r=alyshanjahani-crl a=dhartunian

This test case was merged into the test above.

Epic: None
Release note: None

151542: netutil: Add ReadHeaderTimeout to http servers r=alyshanjahani-crl a=alyshanjahani-crl

The DB Console only expects simple GETs/POSTs/PUTs. It is a best practice to then include a read header timeout.

Epic: none
Release note: None

Co-authored-by: Alyshan Jahani <[email protected]>
Co-authored-by: David Hartunian <[email protected]>

Author: 3 people

pkg/cmd/roachtest/tests/db-console/admin_endpoints.json

@@ -82,7 +82,8 @@
     },
     {
       "url": "/_admin/v1/rangelog/{range_id}",
-      "method": "GET"
+      "method": "GET",
+      "skip": "https://github.com/cockroachdb/cockroach/issues/149866#issuecomment-3161313828"
     },
     {
       "url": "/_admin/v1/data_distribution",

pkg/sql/trace_test.go

@@ -724,44 +724,3 @@ func TestTraceTxnSampleRateAndThreshold(t *testing.T) {
 		})
 	}
 }
-
-func TestTraceTxnJaegerOutput(t *testing.T) {
-	defer leaktest.AfterTest(t)()
-	defer log.Scope(t).Close(t)
-
-	ctx := context.Background()
-	settings := cluster.MakeTestingClusterSettings()
-
-	s, db, _ := serverutils.StartServer(t, base.TestServerArgs{
-		Settings: settings,
-	})
-	defer s.Stopper().Stop(ctx)
-
-	appLogsSpy := logtestutils.NewLogSpy(
-		t,
-		// This string match is constructed from the log.SqlExec.Infof format
-		// string found in conn_executor_exec.go:logTraceAboveThreshold
-		logtestutils.MatchesF("exceeding threshold of"),
-	)
-	cleanup := log.InterceptWith(ctx, appLogsSpy)
-	defer cleanup()
-
-	sql.TraceTxnOutputJaegerJSON.Override(ctx, &settings.SV, true)
-	sql.TraceTxnThreshold.Override(ctx, &settings.SV, time.Nanosecond)
-	sql.TraceTxnSampleRate.Override(ctx, &settings.SV, 1)
-	log.FlushAllSync()
-	appLogsSpy.Reset()
-	r := sqlutils.MakeSQLRunner(db)
-
-	testutils.SucceedsSoon(t, func() error {
-		r.Exec(t, "SELECT pg_sleep(0.01)")
-		log.FlushAllSync()
-		if !appLogsSpy.Has(logtestutils.MatchesF(regexp.QuoteMeta("ExecStmt: SELECT pg_sleep(0.01)"))) {
-			return errors.New("no sql txn log found (tracing did not happen)")
-		}
-		if !appLogsSpy.Has(logtestutils.MatchesF(regexp.QuoteMeta("{\"refType\":\"CHILD_OF\",\"traceID\":\""))) {
-			return errors.New("no Jaeger JSON found")
-		}
-		return nil
-	})
-}

pkg/util/netutil/net.go

@@ -86,7 +86,8 @@ func MakeHTTPServer(
 					delete(activeConns, conn)
 				}
 			},
-			ErrorLog: httpLogger,
+			ErrorLog:          httpLogger,
+			ReadHeaderTimeout: 5 * time.Second,
 		},
 	}