Skip to content

Commit 3ea8b75

Browse files
authored
fix: disable telemetry on bucket & datastore -heavy jobs (#4824)
For jobs that need to read/write the entire database, we don't want spans generated for each bucket/datastore read.
1 parent fc9a6e6 commit 3ea8b75

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

go/cmd/exporter/exporter.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/google/osv.dev/go/osv/clients"
1717
"github.com/ossf/osv-schema/bindings/go/osvschema"
1818
"go.opentelemetry.io/otel"
19+
"google.golang.org/api/option"
1920
)
2021

2122
const gcsProtoPrefix = "all/pb/"
@@ -49,7 +50,7 @@ func main() {
4950
ctx, cancel := context.WithCancel(ctx)
5051
defer cancel()
5152

52-
storageClient, err := storage.NewClient(ctx)
53+
storageClient, err := storage.NewClient(ctx, option.WithTelemetryDisabled())
5354
if err != nil {
5455
logger.FatalContext(ctx, "failed to create storage client", slog.Any("err", err))
5556
}

go/cmd/generatesitemap/generatesitemap.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"github.com/google/osv.dev/go/osv/clients"
2222
"github.com/ossf/osv-schema/bindings/go/osvschema"
2323
"go.opentelemetry.io/otel"
24+
"google.golang.org/api/option"
2425
"google.golang.org/protobuf/proto"
2526
)
2627

@@ -86,7 +87,7 @@ func main() {
8687
ctx, cancel := context.WithCancel(ctx)
8788
defer cancel()
8889

89-
storageClient, err := storage.NewClient(ctx)
90+
storageClient, err := storage.NewClient(ctx, option.WithTelemetryDisabled())
9091
if err != nil {
9192
logger.FatalContext(ctx, "failed to create storage client", slog.Any("err", err))
9293
}

go/cmd/relations/relations.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"github.com/google/osv.dev/go/logger"
3030
"github.com/google/osv.dev/go/osv/clients"
3131
"go.opentelemetry.io/otel"
32+
"google.golang.org/api/option"
3233
)
3334

3435
type gClients struct {
@@ -97,11 +98,11 @@ func setupClients(ctx context.Context) (gClients, error) {
9798
}
9899

99100
// Initialize clients
100-
dsClient, err := datastore.NewClient(ctx, projectID)
101+
dsClient, err := datastore.NewClient(ctx, projectID, option.WithTelemetryDisabled())
101102
if err != nil {
102103
return gClients{}, fmt.Errorf("failed to create datastore client: %w", err)
103104
}
104-
storageClient, err := storage.NewClient(ctx)
105+
storageClient, err := storage.NewClient(ctx, option.WithTelemetryDisabled())
105106
if err != nil {
106107
dsClient.Close()
107108
return gClients{}, fmt.Errorf("failed to create storage client: %w", err)

0 commit comments

Comments
 (0)