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.

Sign up for GitHub

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

Adding File Name and Line Number to Logs #72

Merged
merged 23 commits into from
Jul 20, 2023
Merged

Adding File Name and Line Number to Logs #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
1aca9c5
wip
jaiveerk Jun 1, 2023
a199822
wip
jaiveerk Jun 1, 2023
f696ca0
wip
jaiveerk Jun 5, 2023
4516632
initial implementation working
jaiveerk Jun 5, 2023
1c5b146
moved full run to script
jaiveerk Jun 6, 2023
3b0dad2
updating readme
jaiveerk Jun 6, 2023
97f1c91
modified workflow
jaiveerk Jun 6, 2023
6a12020
re added location info
jaiveerk Jun 6, 2023
ce96132
handling not found error for purge/cleanup
jaiveerk Jun 6, 2023
c28b742
working locally
jaiveerk Jun 6, 2023
2426190
docs
jaiveerk Jun 6, 2023
45a9592
separated public and private cluster tests into multiple workflows
jaiveerk Jun 6, 2023
5f4633e
single workflow with matrix
jaiveerk Jun 6, 2023
eff1dec
Testing on fork
jaiveerk Jun 6, 2023
959e54f
workflow
jaiveerk Jun 6, 2023
b424ca3
chmod
jaiveerk Jun 6, 2023
77631f2
initial commit/merge
jaiveerk Jul 19, 2023
de04606
Added caller and line number to logs
jaiveerk Jul 19, 2023
f698a8b
Added caller and line number to logs
jaiveerk Jul 19, 2023
92505df
merge conflicts
jaiveerk Jul 19, 2023
800d4c7
imports
jaiveerk Jul 19, 2023
8d481cd
removing zapr
jaiveerk Jul 19, 2023
c76d202
comment adjustment
jaiveerk Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/go-logr/logr"
cfgv1alpha2 "github.com/openservicemesh/osm/pkg/apis/config/v1alpha2"
policyv1alpha1 "github.com/openservicemesh/osm/pkg/apis/policy/v1alpha1"
ubzap "go.uber.org/zap"
appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -43,8 +44,11 @@ func init() {
}

func getLogger(opts ...zap.Opts) logr.Logger {
// use raw opts to add caller info to logs
rawOpts := zap.RawZapOpts(ubzap.AddCaller())

// zap is the default recommended logger for controller-runtime when wanting json structured output
return zap.New(opts...)
return zap.New(append(opts, rawOpts)...)
}

func registerSchemes(s *runtime.Scheme) {
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"context"
"encoding/json"
"errors"
"strings"
"testing"

"github.com/Azure/aks-app-routing-operator/pkg/config"
Expand Down Expand Up @@ -37,6 +38,7 @@ func TestLogger(t *testing.T) {
}

assert.True(t, json.Valid(line), "line is not valid json", string(line))
assert.True(t, strings.Contains(string(line), "\"caller\":\"controller/controller_test.go"))
checked++
}

Expand Down