Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unnecessary .nocover files #5642

Merged
merged 5 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/all-in-one/.nocover

This file was deleted.

66 changes: 26 additions & 40 deletions cmd/all-in-one/all_in_one_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,10 @@ func healthCheck(t *testing.T) {
require.Eventuallyf(
t,
func() bool {
_, err := http.Get(queryAddr + "/")
resp, err := http.Get(queryAddr + "/")
if err == nil {
resp.Body.Close()
}
return err == nil
},
10*time.Second,
Expand All @@ -85,14 +88,23 @@ func healthCheck(t *testing.T) {
t.Logf("Server detected at %s", queryAddr)
}

func checkWebUI(t *testing.T) {
resp, err := http.Get(queryAddr + "/")
func httpGet(t *testing.T, url string) (*http.Response, []byte) {
req, err := http.NewRequest(http.MethodGet, url, nil)
require.NoError(t, err)
req.Close = true // avoid persistent connections which leak goroutines

resp, err := httpClient.Do(req)
require.NoError(t, err)
require.NotNil(t, resp)
defer resp.Body.Close()
assert.Equal(t, http.StatusOK, resp.StatusCode)

bodyBytes, err := io.ReadAll(resp.Body)
require.NoError(t, err)

return resp, bodyBytes
}

func checkWebUI(t *testing.T) {
_, bodyBytes := httpGet(t, queryAddr+"/")
body := string(bodyBytes)
t.Run("Static_files", func(t *testing.T) {
pattern := regexp.MustCompile(`<link rel="shortcut icon"[^<]+href="(.*?)"`)
Expand All @@ -115,12 +127,7 @@ func checkWebUI(t *testing.T) {
func createTrace(t *testing.T) {
// Since all requests to query service are traces, creating a new trace
// is simply a matter of querying one of the endpoints.
req, err := http.NewRequest(http.MethodGet, queryAddr+getServicesURL, nil)
require.NoError(t, err)

resp, err := httpClient.Do(req)
require.NoError(t, err)
defer resp.Body.Close()
resp, _ := httpGet(t, queryAddr+getServicesURL)
traceResponse := resp.Header.Get("traceresponse")
// Expecting: [version] [trace-id] [child-id] [trace-flags]
parts := strings.Split(traceResponse, "-")
Expand All @@ -134,26 +141,18 @@ type response struct {
}

func getAPITrace(t *testing.T) {
req, err := http.NewRequest(http.MethodGet, queryAddr+getTraceURL+traceID, nil)
require.NoError(t, err)

var queryResponse response

for i := 0; i < 20; i++ {
resp, err := httpClient.Do(req)
require.NoError(t, err)

body, _ := io.ReadAll(resp.Body)

err = json.Unmarshal(body, &queryResponse)
require.NoError(t, err)
resp.Body.Close()
_, body := httpGet(t, queryAddr+getTraceURL+traceID)
require.NoError(t, json.Unmarshal(body, &queryResponse))

if len(queryResponse.Data) == 1 {
break
}
t.Logf("Trace %s not found (yet)", traceID)
time.Sleep(time.Second)
}

require.Len(t, queryResponse.Data, 1)
require.Len(t, queryResponse.Data[0].Spans, 1)
}
Expand All @@ -163,35 +162,22 @@ func getSamplingStrategy(t *testing.T) {
if os.Getenv("SKIP_SAMPLING") == "true" {
t.Skip("skipping sampling strategy check because SKIP_SAMPLING=true is set")
}
req, err := http.NewRequest(http.MethodGet, agentAddr+getSamplingStrategyURL, nil)
require.NoError(t, err)

resp, err := httpClient.Do(req)
require.NoError(t, err)

body, _ := io.ReadAll(resp.Body)
_, body := httpGet(t, agentAddr+getSamplingStrategyURL)

var queryResponse api_v2.SamplingStrategyResponse
err = jsonpb.Unmarshal(bytes.NewReader(body), &queryResponse)
require.NoError(t, err)
resp.Body.Close()
require.NoError(t, jsonpb.Unmarshal(bytes.NewReader(body), &queryResponse))

assert.NotNil(t, queryResponse.ProbabilisticSampling)
assert.EqualValues(t, 1.0, queryResponse.ProbabilisticSampling.SamplingRate)
}

func getServicesAPIV3(t *testing.T) {
req, err := http.NewRequest(http.MethodGet, queryAddr+getServicesAPIV3URL, nil)
require.NoError(t, err)
resp, err := httpClient.Do(req)
require.NoError(t, err)
body, _ := io.ReadAll(resp.Body)
_, body := httpGet(t, queryAddr+getServicesAPIV3URL)

var servicesResponse struct {
Services []string
}
err = json.Unmarshal(body, &servicesResponse)
require.NoError(t, err)
require.NoError(t, json.Unmarshal(body, &servicesResponse))
require.Len(t, servicesResponse.Services, 1)
assert.Contains(t, servicesResponse.Services[0], "jaeger")
}
14 changes: 14 additions & 0 deletions cmd/all-in-one/package_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) 2024 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package main

import (
"testing"

"github.com/jaegertracing/jaeger/pkg/testutils"
)

func TestMain(m *testing.M) {
testutils.VerifyGoLeaks(m)
}
1 change: 0 additions & 1 deletion cmd/anonymizer/app/anonymizer/.nocover

This file was deleted.

14 changes: 14 additions & 0 deletions cmd/anonymizer/app/anonymizer/package_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) 2024 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package anonymizer

import (
"testing"

"github.com/jaegertracing/jaeger/pkg/testutils"
)

func TestMain(m *testing.M) {
testutils.VerifyGoLeaks(m)
}
2 changes: 0 additions & 2 deletions cmd/internal/flags/.nocover

This file was deleted.

6 changes: 4 additions & 2 deletions cmd/internal/flags/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ func (s *AdminServer) registerPprofHandlers() {

// Close stops the HTTP server
func (s *AdminServer) Close() error {
_ = s.tlsCertWatcherCloser.Close()
return s.server.Shutdown(context.Background())
return errors.Join(
s.tlsCertWatcherCloser.Close(),
s.server.Shutdown(context.Background()),
)
}
14 changes: 9 additions & 5 deletions cmd/internal/flags/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.uber.org/zap"
"go.uber.org/zap/zaptest"
"go.uber.org/zap/zaptest/observer"

"github.com/jaegertracing/jaeger/pkg/config"
Expand Down Expand Up @@ -137,17 +138,16 @@ func TestAdminServerTLS(t *testing.T) {
v, command := config.Viperize(adminServer.AddFlags)
err := command.ParseFlags(test.serverTLSFlags)
require.NoError(t, err)
zapCore, _ := observer.New(zap.InfoLevel)
logger := zap.New(zapCore)

err = adminServer.initFromViper(v, logger)
err = adminServer.initFromViper(v, zaptest.NewLogger(t))
require.NoError(t, err)

adminServer.Serve()
defer adminServer.Close()

clientTLSCfg, err0 := test.clientTLS.Config(zap.NewNop())
require.NoError(t, err0)
defer test.clientTLS.Close()
dialer := &net.Dialer{Timeout: 2 * time.Second}
conn, clientError := tls.DialWithDialer(dialer, "tcp", fmt.Sprintf("localhost:%d", ports.CollectorAdminHTTP), clientTLSCfg)
require.NoError(t, clientError)
Expand All @@ -158,9 +158,13 @@ func TestAdminServerTLS(t *testing.T) {
TLSClientConfig: clientTLSCfg,
},
}

response, requestError := client.Get(fmt.Sprintf("https://localhost:%d", ports.CollectorAdminHTTP))
url := fmt.Sprintf("https://localhost:%d", ports.CollectorAdminHTTP)
req, err := http.NewRequest(http.MethodGet, url, nil)
require.NoError(t, err)
req.Close = true // avoid persistent connections which leak goroutines
response, requestError := client.Do(req)
require.NoError(t, requestError)
defer response.Body.Close()
require.NotNil(t, response)
})
}
Expand Down
14 changes: 14 additions & 0 deletions cmd/internal/flags/package_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
// Copyright (c) 2024 The Jaeger Authors.
// SPDX-License-Identifier: Apache-2.0

package flags

import (
"testing"

"github.com/jaegertracing/jaeger/pkg/testutils"
)

func TestMain(m *testing.M) {
testutils.VerifyGoLeaks(m)
}