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

fix(outputs.bigquery): Correct use of auto-detected project ID #14416

Merged
merged 4 commits into from
Dec 11, 2023
Merged

fix(outputs.bigquery): Correct use of auto-detected project ID #14416

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b40c95f
fix(outputs.bigquery): Correctly use auto-detected project ID.
Hipska Dec 8, 2023
6386d53
chore(outputs.bigquery): Set telegraf user agent
Hipska Dec 8, 2023
3dbae3f
Add tests
Hipska Dec 8, 2023
2ff3b62
Linter fix
Hipska Dec 8, 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
12 changes: 8 additions & 4 deletions plugins/outputs/bigquery/bigquery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (

"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/config"
"github.com/influxdata/telegraf/internal"
"github.com/influxdata/telegraf/plugins/outputs"
)

Expand Down Expand Up @@ -75,7 +76,7 @@ func (s *BigQuery) Connect() error {
defer cancel()

// Check if the compact table exists
_, err := s.client.DatasetInProject(s.Project, s.Dataset).Table(s.CompactTable).Metadata(ctx)
_, err := s.client.Dataset(s.Dataset).Table(s.CompactTable).Metadata(ctx)
if err != nil {
return fmt.Errorf("compact table: %w", err)
}
Expand All @@ -102,7 +103,10 @@ func (s *BigQuery) setUpDefaultClient() error {
credentialsOption = option.WithCredentials(creds)
}

client, err := bigquery.NewClient(ctx, s.Project, credentialsOption)
client, err := bigquery.NewClient(ctx, s.Project,
credentialsOption,
option.WithUserAgent(internal.ProductToken()),
)
s.client = client
return err
}
Expand Down Expand Up @@ -136,7 +140,7 @@ func (s *BigQuery) writeCompact(metrics []telegraf.Metric) error {
defer cancel()

// Always returns an instance, even if table doesn't exist (anymore).
inserter := s.client.DatasetInProject(s.Project, s.Dataset).Table(s.CompactTable).Inserter()
inserter := s.client.Dataset(s.Dataset).Table(s.CompactTable).Inserter()

var compactValues []*bigquery.ValuesSaver
for _, m := range metrics {
Expand Down Expand Up @@ -269,7 +273,7 @@ func (s *BigQuery) insertToTable(metricName string, metrics []bigquery.ValueSave
defer cancel()

tableName := s.metricToTable(metricName)
table := s.client.DatasetInProject(s.Project, s.Dataset).Table(tableName)
table := s.client.Dataset(s.Dataset).Table(tableName)
inserter := table.Inserter()

if err := inserter.Put(ctx, metrics); err != nil {
Expand Down
31 changes: 31 additions & 0 deletions plugins/outputs/bigquery/bigquery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,24 @@ func TestWriteCompact(t *testing.T) {
require.NoError(t, b.Close())
}

func TestAutoDetect(t *testing.T) {
srv := localBigQueryServer(t)
defer srv.Close()

b := &BigQuery{
Dataset: "test-dataset",
Timeout: defaultTimeout,
CompactTable: "test-metrics",
}

credentialsJson := []byte(`{ "type": "service_account", "project_id": "test-project"}`)

require.NoError(t, b.Init())
require.NoError(t, b.setUpTestClientWithJSON(srv.URL, credentialsJson))
Hipska marked this conversation as resolved.
Show resolved Hide resolved
require.NoError(t, b.Connect())
require.NoError(t, b.Close())
}

func (b *BigQuery) setUpTestClient(endpointURL string) error {
noAuth := option.WithoutAuthentication()
endpoint := option.WithEndpoint(endpointURL)
Expand All @@ -228,6 +246,19 @@ func (b *BigQuery) setUpTestClient(endpointURL string) error {
return nil
}

func (b *BigQuery) setUpTestClientWithJSON(endpointURL string, credentialsJson []byte) error {
noAuth := option.WithoutAuthentication()
endpoint := option.WithEndpoint(endpointURL)
credentials := option.WithCredentialsJSON(credentialsJson)

ctx := context.Background()

c, err := bigquery.NewClient(ctx, b.Project, credentials, noAuth, endpoint)

b.client = c
return err
}

func localBigQueryServer(t *testing.T) *httptest.Server {
srv := httptest.NewServer(http.NotFoundHandler())

Expand Down
Loading