Skip to content

Commit

Permalink
use tint key text styles
Browse files Browse the repository at this point in the history
  • Loading branch information
Janelle Law committed Aug 14, 2023
1 parent 0df042e commit 2cb04ba
Show file tree
Hide file tree
Showing 127 changed files with 528 additions and 452 deletions.
16 changes: 8 additions & 8 deletions internal/alerting/syncer/syncer_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ func (a *AlertManagerSyncerV1) connect(ctx context.Context) alertops.ConfigRecon
a.lg.Debug("trying to acquire remote syncer stream")
stream, err := a.gatewayClient.SyncConfig(ctx)
if err != nil {
a.lg.Error("failed to connect to gateway", "error", err)
a.lg.Error("failed to connect to gateway", logger.Err(err))
continue
}
syncerClient = stream
Expand Down Expand Up @@ -163,11 +163,11 @@ func (a *AlertManagerSyncerV1) recvMsgs(
a.lg.Warn("remote syncer unavailable, reconnecting, ...")
break
} else {
a.lg.Error("failed to receive sync config message", "error", err, "code", st.Code())
a.lg.Error("failed to receive sync config message", logger.Err(err), "code", st.Code())
break
}
} else if err != nil {
a.lg.Error("failed to receive sync config message", "error", err)
a.lg.Error("failed to receive sync config message", logger.Err(err))
break
}
a.lg.Info("received sync config message", "ID", syncReq.SyncId)
Expand All @@ -178,7 +178,7 @@ func (a *AlertManagerSyncerV1) recvMsgs(
syncState := alertops.SyncState_Synced
for _, req := range syncReq.GetItems() {
if _, err := a.PutConfig(ctx, req); err != nil {
a.lg.Error("failed to put config", "error", err)
a.lg.Error("failed to put config", logger.Err(err))
syncState = alertops.SyncState_SyncError
}
}
Expand All @@ -192,12 +192,12 @@ func (a *AlertManagerSyncerV1) recvMsgs(
State: syncState,
SyncId: syncReq.SyncId,
}); err != nil {
a.lg.Error("failed to send sync state", "error", err)
a.lg.Error("failed to send sync state", logger.Err(err))
}
}
// close current stream & reconnect
if err := remoteSyncerClient.CloseSend(); err != nil {
a.lg.Error("failed to close stream", "error", err)
a.lg.Error("failed to close stream", logger.Err(err))
}
reconnectTimer.Reset(reconnectDur)
}
Expand All @@ -211,7 +211,7 @@ func (a *AlertManagerSyncerV1) PutConfig(ctx context.Context, incomingConfig *al
lg := a.lg.With("config-path", a.serverConfig.AlertmanagerConfigPath)
var c *config.Config
if err := yaml.Unmarshal(incomingConfig.Config, &c); err != nil {
lg.Error("failed to unmarshal config", "error", err)
lg.Error("failed to unmarshal config", logger.Err(err))
return nil, validation.Errorf("improperly formatted config : %s", err)
}
if err := os.WriteFile(a.serverConfig.AlertmanagerConfigPath, incomingConfig.GetConfig(), 0644); err != nil {
Expand All @@ -230,7 +230,7 @@ func (a *AlertManagerSyncerV1) PutConfig(ctx context.Context, incomingConfig *al
for backoffv2.Continue(b) {
err := a.alertingClient.StatusClient().Ready(ctx)
if err != nil {
lg.Warn("alerting client not yet ready", "error", err)
lg.Warn("alerting client not yet ready", logger.Err(err))
continue
}

Expand Down
9 changes: 5 additions & 4 deletions internal/bench/query_runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promauto"
config_util "github.com/prometheus/common/config"
"github.com/rancher/opni/pkg/logger"
"github.com/thanos-io/thanos/pkg/discovery/dns"
"github.com/thanos-io/thanos/pkg/extprom"
)
Expand Down Expand Up @@ -147,7 +148,7 @@ func (q *QueryRunner) QueryWorker(queryChan chan Query) {
for queryReq := range queryChan {
err := q.ExecuteQuery(context.Background(), queryReq)
if err != nil {
level.Warn(q.logger).Log("msg", "unable to execute query", "err", err)
level.Warn(q.logger).Log("msg", "unable to execute query", logger.Err(err))
}
}
}
Expand Down Expand Up @@ -245,7 +246,7 @@ func (q *QueryRunner) ExecuteQuery(ctx context.Context, queryReq Query) error {
func (q *QueryRunner) ResolveAddrsLoop(ctx context.Context) {
err := q.ResolveAddrs()
if err != nil {
level.Warn(q.logger).Log("msg", "failed update remote write servers list", "err", err)
level.Warn(q.logger).Log("msg", "failed update remote write servers list", logger.Err(err))
}
ticker := time.NewTicker(time.Minute * 5)
defer ticker.Stop()
Expand All @@ -255,7 +256,7 @@ func (q *QueryRunner) ResolveAddrsLoop(ctx context.Context) {
case <-ticker.C:
err := q.ResolveAddrs()
if err != nil {
level.Warn(q.logger).Log("msg", "failed update remote write servers list", "err", err)
level.Warn(q.logger).Log("msg", "failed update remote write servers list", logger.Err(err))
}
case <-ctx.Done():
return
Expand All @@ -270,7 +271,7 @@ func (q *QueryRunner) ResolveAddrs() error {

// If some of the dns resolution fails, log the error.
if err := q.dnsProvider.Resolve(ctx, []string{q.cfg.Endpoint}); err != nil {
level.Error(q.logger).Log("msg", "failed to resolve addresses", "err", err)
level.Error(q.logger).Log("msg", "failed to resolve addresses", logger.Err(err))
}

// Fail in case no server address is resolved.
Expand Down
3 changes: 2 additions & 1 deletion internal/bench/ring_check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/go-kit/log/level"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/prometheus/prompb"
"github.com/rancher/opni/pkg/logger"
"github.com/thanos-io/thanos/pkg/discovery/dns"
)

Expand Down Expand Up @@ -122,7 +123,7 @@ func (r *RingChecker) Check() {

rs, err := r.Ring.Get(token, ring.Write, []ring.InstanceDesc{}, nil, nil)
if err != nil {
level.Warn(r.logger).Log("msg", "unable to get token for metric", "err", err)
level.Warn(r.logger).Log("msg", "unable to get token for metric", logger.Err(err))
continue
}

Expand Down
3 changes: 2 additions & 1 deletion internal/bench/write_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
config_util "github.com/prometheus/common/config"
"github.com/prometheus/common/version"
"github.com/prometheus/prometheus/storage/remote"
"github.com/rancher/opni/pkg/logger"
)

const maxErrMsgLen = 512
Expand Down Expand Up @@ -109,7 +110,7 @@ func (c *WriteClient) Store(ctx context.Context, req []byte) error {
defer func() {
_, err := io.Copy(io.Discard, httpResp.Body)
if err != nil {
level.Error(c.logger).Log("msg", "unable to discard write request body", "err", err)
level.Error(c.logger).Log("msg", "unable to discard write request body", logger.Err(err))
}
httpResp.Body.Close()
}()
Expand Down
7 changes: 4 additions & 3 deletions internal/bench/write_runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/prompb"
"github.com/prometheus/prometheus/storage/remote"
"github.com/rancher/opni/pkg/logger"
"github.com/thanos-io/thanos/pkg/discovery/dns"
"github.com/thanos-io/thanos/pkg/extprom"
)
Expand Down Expand Up @@ -166,7 +167,7 @@ func (w *WriteBenchmarkRunner) WriteWorker(batchChan chan BatchReq) {
for batchReq := range batchChan {
err := w.SendBatch(context.Background(), batchReq.Batch)
if err != nil {
level.Warn(w.logger).Log("msg", "unable to send batch", "err", err)
level.Warn(w.logger).Log("msg", "unable to send batch", logger.Err(err))
}

// put back the series buffer
Expand Down Expand Up @@ -210,7 +211,7 @@ func (w *WriteBenchmarkRunner) ResolveAddrsLoop(ctx context.Context) {
case <-ticker.C:
err := w.ResolveAddrs()
if err != nil {
level.Warn(w.logger).Log("msg", "failed update remote write servers list", "err", err)
level.Warn(w.logger).Log("msg", "failed update remote write servers list", logger.Err(err))
}
case <-ctx.Done():
return
Expand All @@ -225,7 +226,7 @@ func (w *WriteBenchmarkRunner) ResolveAddrs() error {

// If some of the dns resolution fails, log the error.
if err := w.dnsProvider.Resolve(ctx, []string{w.cfg.Endpoint}); err != nil {
level.Error(w.logger).Log("msg", "failed to resolve addresses", "err", err)
level.Error(w.logger).Log("msg", "failed to resolve addresses", logger.Err(err))
}

// Fail in case no server address is resolved.
Expand Down
41 changes: 21 additions & 20 deletions internal/cmd/testenv/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
managementv1 "github.com/rancher/opni/pkg/apis/management/v1"
storagev1 "github.com/rancher/opni/pkg/apis/storage/v1"
"github.com/rancher/opni/pkg/dashboard"
"github.com/rancher/opni/pkg/logger"
"github.com/rancher/opni/pkg/test"
"github.com/rancher/opni/pkg/test/freeport"
"github.com/rancher/opni/pkg/test/testlog"
Expand Down Expand Up @@ -234,7 +235,7 @@ func main() {
}
dashboardSrv, err := dashboard.NewServer(&environment.GatewayConfig().Spec.Management)
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
go func() {
Expand Down Expand Up @@ -269,7 +270,7 @@ func main() {
cmd := exec.CommandContext(environment.Context(), "go", "tool", "pprof", "-http", fmt.Sprintf("localhost:%d", port), url)
session, err := testutil.StartCmd(cmd)
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
} else {
waitctx.Go(environment.Context(), func() {
<-environment.Context().Done()
Expand All @@ -295,25 +296,25 @@ func main() {
Ttl: durationpb.New(1 * time.Minute),
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
token, err := tokens.FromBootstrapToken(bt)
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
certInfo, err := client.CertsInfo(environment.Context(), &emptypb.Empty{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}

resp, err := http.Post(fmt.Sprintf("http://localhost:%d/agents", environment.GetPorts().TestEnvironment), "application/json",
strings.NewReader(fmt.Sprintf(`{"token": "%s", "pins": ["%s"]}`,
token.EncodeHex(), certInfo.Chain[len(certInfo.Chain)-1].Fingerprint)))
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
if resp.StatusCode != http.StatusOK {
Expand Down Expand Up @@ -351,7 +352,7 @@ func main() {
},
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}()
case 'U':
Expand All @@ -364,7 +365,7 @@ func main() {
opsClient := cortexops.NewCortexOpsClient(environment.ManagementClientConn())
_, err := opsClient.UninstallCluster(environment.Context(), &emptypb.Empty{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}()
case 'm':
Expand All @@ -373,7 +374,7 @@ func main() {
defer capabilityMu.Unlock()
clusters, err := client.ListClusters(environment.Context(), &managementv1.ListClustersRequest{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
for _, cluster := range clusters.Items {
Expand All @@ -385,7 +386,7 @@ func main() {
},
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}

conditionsClient := environment.NewAlertConditionsClient()
Expand All @@ -405,7 +406,7 @@ func main() {
GoldenSignal: alertingv1.GoldenSignal_Errors,
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}
}()
Expand All @@ -415,7 +416,7 @@ func main() {
defer capabilityMu.Unlock()
clusters, err := client.ListClusters(environment.Context(), &managementv1.ListClustersRequest{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
for _, cluster := range clusters.Items {
Expand All @@ -426,7 +427,7 @@ func main() {
},
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}
}()
Expand All @@ -452,7 +453,7 @@ func main() {
case 'r':
clusters, err := client.ListClusters(environment.Context(), &managementv1.ListClustersRequest{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
return
}
if _, err := client.CreateRole(environment.Context(), &corev1.Role{
Expand All @@ -463,22 +464,22 @@ func main() {
},
},
}); err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
if _, err := client.CreateRoleBinding(environment.Context(), &corev1.RoleBinding{
Id: "testenv-rb",
RoleId: "testenv-role",
Subjects: []string{"testenv"},
}); err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
for _, cluster := range clusters.Items {
cluster.Metadata.Labels["visible"] = "true"
if _, err := client.EditCluster(environment.Context(), &managementv1.EditClusterRequest{
Cluster: cluster.Reference(),
Labels: cluster.GetLabels(),
}); err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}
case 'h':
Expand All @@ -487,7 +488,7 @@ func main() {
opsClient := alertops.NewAlertingAdminClient(environment.ManagementClientConn())
_, err := opsClient.InstallCluster(environment.Context(), &emptypb.Empty{})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
} else {
_, err = opsClient.ConfigureCluster(environment.Context(), &alertops.ClusterConfiguration{
NumReplicas: 3,
Expand All @@ -501,7 +502,7 @@ func main() {
},
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}

Expand All @@ -511,7 +512,7 @@ func main() {
DeleteData: true,
})
if err != nil {
testlog.Log.Error("error", "error", err)
testlog.Log.Error("error", logger.Err(err))
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/agent/v1/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func New(ctx context.Context, conf *v1beta1.AgentConfig, opts ...AgentOption) (*
lg.Debug("starting rule stream")
go func() {
if err := agent.streamRulesToGateway(ctx); err != nil {
lg.Error("error streaming rules to gateway", "error", err)
lg.Error("error streaming rules to gateway", logger.Err(err))
}
}()
})
Expand All @@ -212,10 +212,10 @@ func New(ctx context.Context, conf *v1beta1.AgentConfig, opts ...AgentOption) (*
// })

// this will block until an error is received
lg.Warn("disconnected from gateway", "error", errF.Get())
lg.Warn("disconnected from gateway", logger.Err(errF.Get()))
agent.remoteWriteClient.Close()
} else {
lg.Warn("error connecting to gateway", "error", errF.Get())
lg.Warn("error connecting to gateway", logger.Err(errF.Get()))
}
if util.StatusCode(errF.Get()) == codes.FailedPrecondition {
// Non-retriable error, e.g. the cluster was deleted, or the metrics
Expand Down Expand Up @@ -274,7 +274,7 @@ func (a *Agent) bootstrap(ctx context.Context) (keyring.Keyring, error) {
// Keep retrying until it succeeds.
err = a.keyringStore.Put(ctx, newKeyring)
if err != nil {
lg.Error("failed to persist keyring (retry in 1 second)", "error", err)
lg.Error("failed to persist keyring (retry in 1 second)", logger.Err(err))
time.Sleep(1 * time.Second)
} else {
break
Expand Down
Loading

0 comments on commit 2cb04ba

Please sign in to comment.