From 0c885361ee11d6eea216270a1e15f2ccdc6072ff Mon Sep 17 00:00:00 2001 From: guoguangwu Date: Wed, 28 Jun 2023 21:54:39 +0800 Subject: [PATCH] chore: pkg imported more than once --- sdk/messaging/azeventhubs/internal/cbs.go | 3 +-- sdk/messaging/azeventhubs/internal/links.go | 7 +++---- sdk/messaging/azeventhubs/internal/links_recover.go | 5 ++--- sdk/messaging/azeventhubs/producer_client.go | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sdk/messaging/azeventhubs/internal/cbs.go b/sdk/messaging/azeventhubs/internal/cbs.go index 4d41921d35fd..103f71a9a923 100644 --- a/sdk/messaging/azeventhubs/internal/cbs.go +++ b/sdk/messaging/azeventhubs/internal/cbs.go @@ -6,7 +6,6 @@ package internal import ( "context" - "github.com/Azure/azure-sdk-for-go/sdk/internal/log" azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/amqpwrap" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/auth" @@ -36,7 +35,7 @@ func NegotiateClaim(ctx context.Context, audience string, conn amqpwrap.AMQPClie // or interrupted, leaving $cbs still open by some dangling receiver or sender. The only way // to fix this is to restart the connection. if IsNotAllowedError(err) { - log.Writef(exported.EventAuth, "Not allowed to open, connection will be reset: %s", err) + azlog.Writef(exported.EventAuth, "Not allowed to open, connection will be reset: %s", err) return amqpwrap.ErrConnResetNeeded } diff --git a/sdk/messaging/azeventhubs/internal/links.go b/sdk/messaging/azeventhubs/internal/links.go index adf4976f2a60..b20fa6f62fdb 100644 --- a/sdk/messaging/azeventhubs/internal/links.go +++ b/sdk/messaging/azeventhubs/internal/links.go @@ -8,7 +8,6 @@ import ( "fmt" "sync" - "github.com/Azure/azure-sdk-for-go/sdk/internal/log" azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/amqpwrap" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/exported" @@ -22,7 +21,7 @@ type AMQPLink interface { // LinksForPartitionClient are the functions that the PartitionClient uses within Links[T] // (for unit testing only) type LinksForPartitionClient[LinkT AMQPLink] interface { - Retry(ctx context.Context, eventName log.Event, operation string, partitionID string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[LinkT]) error) error + Retry(ctx context.Context, eventName azlog.Event, operation string, partitionID string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[LinkT]) error) error Close(ctx context.Context) error } @@ -76,11 +75,11 @@ func NewLinks[LinkT AMQPLink](ns NamespaceForAMQPLinks, managementPath string, e return l } -func (l *Links[LinkT]) RetryManagement(ctx context.Context, eventName log.Event, operation string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[amqpwrap.RPCLink]) error) error { +func (l *Links[LinkT]) RetryManagement(ctx context.Context, eventName azlog.Event, operation string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[amqpwrap.RPCLink]) error) error { return l.mr.Retry(ctx, eventName, operation, "", retryOptions, fn) } -func (l *Links[LinkT]) Retry(ctx context.Context, eventName log.Event, operation string, partitionID string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[LinkT]) error) error { +func (l *Links[LinkT]) Retry(ctx context.Context, eventName azlog.Event, operation string, partitionID string, retryOptions exported.RetryOptions, fn func(ctx context.Context, lwid LinkWithID[LinkT]) error) error { return l.lr.Retry(ctx, eventName, operation, partitionID, retryOptions, fn) } diff --git a/sdk/messaging/azeventhubs/internal/links_recover.go b/sdk/messaging/azeventhubs/internal/links_recover.go index 0725a2b42dcc..b1da12ccd8fe 100644 --- a/sdk/messaging/azeventhubs/internal/links_recover.go +++ b/sdk/messaging/azeventhubs/internal/links_recover.go @@ -7,7 +7,6 @@ import ( "context" "errors" - "github.com/Azure/azure-sdk-for-go/sdk/internal/log" azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/amqpwrap" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/exported" @@ -98,7 +97,7 @@ func (l LinkRetrier[LinkT]) RecoverIfNeeded(ctx context.Context, err error) erro var awErr amqpwrap.Error if !errors.As(err, &awErr) { - log.Writef(exported.EventConn, "RecoveryKindLink, but not an amqpwrap.Error: %T,%v", err, err) + azlog.Writef(exported.EventConn, "RecoveryKindLink, but not an amqpwrap.Error: %T,%v", err, err) return nil } @@ -112,7 +111,7 @@ func (l LinkRetrier[LinkT]) RecoverIfNeeded(ctx context.Context, err error) erro var awErr amqpwrap.Error if !errors.As(err, &awErr) { - log.Writef(exported.EventConn, "RecoveryKindConn, but not an amqpwrap.Error: %T,%v", err, err) + azlog.Writef(exported.EventConn, "RecoveryKindConn, but not an amqpwrap.Error: %T,%v", err, err) return nil } diff --git a/sdk/messaging/azeventhubs/producer_client.go b/sdk/messaging/azeventhubs/producer_client.go index 5597a2e6c8f2..c4165fb947ab 100644 --- a/sdk/messaging/azeventhubs/producer_client.go +++ b/sdk/messaging/azeventhubs/producer_client.go @@ -12,7 +12,6 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore" "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" - "github.com/Azure/azure-sdk-for-go/sdk/internal/log" azlog "github.com/Azure/azure-sdk-for-go/sdk/internal/log" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal" "github.com/Azure/azure-sdk-for-go/sdk/messaging/azeventhubs/internal/amqpwrap" @@ -171,7 +170,7 @@ func (pc *ProducerClient) SendEventDataBatch(ctx context.Context, batch *EventDa partID := getPartitionID(batch.partitionID) err = pc.links.Retry(ctx, exported.EventProducer, "SendEventDataBatch", partID, pc.retryOptions, func(ctx context.Context, lwid internal.LinkWithID[amqpwrap.AMQPSenderCloser]) error { - log.Writef(EventProducer, "[%s] Sending message with ID %v to partition %q", lwid.String(), amqpMessage.Properties.MessageID, partID) + azlog.Writef(EventProducer, "[%s] Sending message with ID %v to partition %q", lwid.String(), amqpMessage.Properties.MessageID, partID) return lwid.Link().Send(ctx, amqpMessage, nil) }) return internal.TransformError(err)