Skip to content

all: fixes from the otel PRs to get tests passing again #3564

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

Closed
vangent wants to merge 1 commit into from
Closed

all: fixes from the otel PRs to get tests passing again #3564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions blob/s3blob/s3blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,10 @@ func (b *bucket) NewTypedWriter(ctx context.Context, key, contentType string, op
Key: aws.String(key),
Metadata: md,
}
if opts.IfNotExist {
// See https://docs.aws.amazon.com/AmazonS3/latest/userguide/conditional-writes.html
req.IfNoneMatch = aws.String("*")
}
if opts.CacheControl != "" {
req.CacheControl = aws.String(opts.CacheControl)
}
Expand Down
1 change: 0 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ require (
cloud.google.com/go/storage v1.51.0
contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
contrib.go.opencensus.io/integrations/ocsql v0.1.7
github.com/Azure/azure-amqp-common-go/v3 v3.2.3
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.1
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@ contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec h1:CSNP
contrib.go.opencensus.io/exporter/aws v0.0.0-20230502192102-15967c811cec/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA=
contrib.go.opencensus.io/exporter/stackdriver v0.13.14 h1:zBakwHardp9Jcb8sQHcHpXy/0+JIb1M8KjigCJzx7+4=
contrib.go.opencensus.io/exporter/stackdriver v0.13.14/go.mod h1:5pSSGY0Bhuk7waTHuDf4aQ8D2DrhgETRo9fy6k3Xlzc=
contrib.go.opencensus.io/integrations/ocsql v0.1.7 h1:G3k7C0/W44zcqkpRSFyjU9f6HZkbwIrL//qqnlqWZ60=
contrib.go.opencensus.io/integrations/ocsql v0.1.7/go.mod h1:8DsSdjz3F+APR+0z0WkU1aRorQCFfRxvqjUUPMbF3fE=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
Expand Down
1 change: 0 additions & 1 deletion internal/testing/alldeps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ cloud.google.com/go/storage
cloud.google.com/go/trace
contrib.go.opencensus.io/exporter/aws
contrib.go.opencensus.io/exporter/stackdriver
contrib.go.opencensus.io/integrations/ocsql
filippo.io/edwards25519
github.com/Azure/azure-amqp-common-go/v3
github.com/Azure/azure-sdk-for-go/sdk/azcore
Expand Down
2 changes: 1 addition & 1 deletion internal/testing/oteltest/exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ func (te *TestExporter) SpanStubs() tracetest.SpanStubs {

// Metrics returns the collected metrics.
func (te *TestExporter) Metrics(ctx context.Context) []metricdata.ScopeMetrics {
_ = te.metricExporter.Shutdown(ctx)
// _ = te.metricExporter.Shutdown(ctx)
return te.metricExporter.GetMetrics()
}

Expand Down
4 changes: 2 additions & 2 deletions pubsub/pubsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ func newSendBatcher(ctx context.Context, t *Topic, dt driver.Topic, opts *batche
dms := items.([]*driver.Message)
err := retry.Call(ctx, gax.Backoff{}, dt.IsRetryable, func() (err error) {
ctx2, span := t.tracer.Start(ctx, "driver.Topic.SendBatch")
defer func() { t.tracer.End(ctx, span, err) }()
defer func() { t.tracer.End(ctx2, span, err) }()
return dt.SendBatch(ctx2, dms)
})
if err != nil {
Expand Down Expand Up @@ -648,7 +648,7 @@ func (s *Subscription) getNextBatch(nMessages int) chan msgsOrError {
err := retry.Call(ctx, gax.Backoff{}, s.driver.IsRetryable, func() error {
var err error
ctx2, span := s.tracer.Start(ctx, "driver.Subscription.ReceiveBatch")
defer func() { s.tracer.End(ctx, span, err) }()
defer func() { s.tracer.End(ctx2, span, err) }()
msgs, err = s.driver.ReceiveBatch(ctx2, curMaxMessagesInBatch)
return err
})
Expand Down
Loading