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

Jump to bottom

feat(logging): automatic project detection in logging.NewClient() #9006

Merged
merged 4 commits into from
Dec 6, 2023
Merged

feat(logging): automatic project detection in logging.NewClient() #9006

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a20f15d
feat(logging): automatic project detection in logging.NewClient()
gkevinzheng Nov 14, 2023
4a1bd68
fixed testcase
gkevinzheng Nov 14, 2023
485bcaf
Used DetectProjectId as a sentinel value for automatic project detection
gkevinzheng Dec 4, 2023
d9094a0
Merge branch 'main' into logging-new-client-parent
gkevinzheng Dec 6, 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
Prev Previous commit
Next Next commit
fixed testcase
  • Loading branch information
@gkevinzheng
gkevinzheng committed Nov 14, 2023
commit 4a1bd68f7a77c1c56d90291633a4c28820256c09
16 changes: 1 addition & 15 deletions logging/logging_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ func TestNonProjectParent(t *testing.T) {
}
}

func TestNewClientParent(t *testing.T) {
func TestEmptyStringParent(t *testing.T) {
ctx := context.Background()
initLogs()
addr, err := ltesting.NewServer()
Expand Down Expand Up @@ -1069,7 +1069,6 @@ func TestNewClientParent(t *testing.T) {
t.Run(test.name, func(t *testing.T) {
// Check if toLogEntryInternal was called with the right parent
toLogEntryInternalMock := func(got logging.Entry, l *logging.Logger, parent string, skipLevels int) (*logpb.LogEntry, error) {
t.Log("The parent is ", parent)
if parent != test.want {
t.Errorf("toLogEntryInternal called with wrong parent. got: %s want: %s", parent, test.want)
}
Expand Down Expand Up @@ -1097,24 +1096,11 @@ func TestNewClientParent(t *testing.T) {
return
}

t.Log("Hello ", test.name)

cli.Logger(testLogID).LogSync(ctx, logging.Entry{Payload: "hello"})
})
}
}

func TestEmptyStringParent(t *testing.T) {
ctx := context.Background()
initLogs()

// Hopefully this works for logadmin in integration testing
c, a := newClients(ctx, "")
defer c.Close()
defer a.Close()

}

// waitFor calls f repeatedly with exponential backoff, blocking until it returns true.
// It returns false after a while (if it times out).
func waitFor(f func() bool) bool {
Expand Down
Loading