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

[GoogleCloudSpannerReceiver] Spanner database not found #27067

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 28 additions & 0 deletions .chloggen/spanner_database_errors.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: googlecloudspannerreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Cloud spanner receiver to not stop if a database is not found.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [14624]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext: Cloud spanner receiver will not exit if one of the databases is not found. |
It will move on to gather stats from other databases in the config list.

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [user]
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,11 @@ func (projectReader *ProjectReader) Read(ctx context.Context) ([]*metadata.Metri
for _, databaseReader := range projectReader.databaseReaders {
dataPoints, err := databaseReader.Read(ctx)
if err != nil {
if strings.Contains(err.Error(), "spanner: code = \"NotFound\"") {
// Move on to next database if current database is not found.
projectReader.logger.Warn("Could not read stats", zap.String("database", databaseReader.Name()), zap.Error(err))
continue
}
return nil, err
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package statsreader
import (
"context"
"errors"
"fmt"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -62,10 +63,12 @@ func TestProjectReader_Read(t *testing.T) {
ctx := context.Background()
logger := zaptest.NewLogger(t)
testCases := map[string]struct {
expectedError error
isErrorExpected bool
expectedError error
}{
"Happy path": {nil},
"Error occurred": {errors.New("read error")},
"Happy path": {false, nil},
"Error occurred": {true, errors.New("read error")},
"Database not found": {false, fmt.Errorf("query failed with error: %w", errors.New("spanner: code = \"NotFound\""))},
}

for name, testCase := range testCases {
Expand All @@ -84,7 +87,7 @@ func TestProjectReader_Read(t *testing.T) {

compositeReader.AssertExpectations(t)

if testCase.expectedError != nil {
if testCase.isErrorExpected {
require.Error(t, err)
} else {
require.NoError(t, err)
Expand Down