diff --git a/src/internal/connector/exchange/api/contacts.go b/src/internal/connector/exchange/api/contacts.go index 9b08fcd82..1c5555ca1 100644 --- a/src/internal/connector/exchange/api/contacts.go +++ b/src/internal/connector/exchange/api/contacts.go @@ -3,7 +3,6 @@ package api import ( "context" "fmt" - "os" "github.com/alcionai/clues" "github.com/microsoft/kiota-abstractions-go/serialization" @@ -16,7 +15,6 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph/api" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" - "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/selectors" ) @@ -221,16 +219,6 @@ func NewContactPager( builder := gs.Client().UsersById(user).ContactFoldersById(directoryID).Contacts() - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } - return &contactPager{gs, builder, options}, nil } @@ -276,16 +264,6 @@ func getContactDeltaBuilder( options *users.ItemContactFoldersItemContactsDeltaRequestBuilderGetRequestConfiguration, ) *users.ItemContactFoldersItemContactsDeltaRequestBuilder { builder := gs.Client().UsersById(user).ContactFoldersById(directoryID).Contacts().Delta() - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } - return builder } diff --git a/src/internal/connector/exchange/api/events.go b/src/internal/connector/exchange/api/events.go index 67f47fc22..8edeffaba 100644 --- a/src/internal/connector/exchange/api/events.go +++ b/src/internal/connector/exchange/api/events.go @@ -3,7 +3,6 @@ package api import ( "context" "fmt" - "os" "time" "github.com/alcionai/clues" @@ -18,7 +17,6 @@ import ( "github.com/alcionai/corso/src/internal/connector/graph/api" "github.com/alcionai/corso/src/pkg/backup/details" "github.com/alcionai/corso/src/pkg/fault" - "github.com/alcionai/corso/src/pkg/logger" "github.com/alcionai/corso/src/pkg/path" ) @@ -281,15 +279,6 @@ func NewEventPager( } builder := gs.Client().UsersById(user).CalendarsById(calendarID).Events() - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } return &eventPager{gs, builder, options}, nil } @@ -367,16 +356,6 @@ func getEventDeltaBuilder( rawURL := fmt.Sprintf(eventBetaDeltaURLTemplate, user, calendarID) builder := users.NewItemCalendarsItemEventsDeltaRequestBuilder(rawURL, gs.Adapter()) - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } - return builder } diff --git a/src/internal/connector/exchange/api/mail.go b/src/internal/connector/exchange/api/mail.go index 232a49601..fb9f98e84 100644 --- a/src/internal/connector/exchange/api/mail.go +++ b/src/internal/connector/exchange/api/mail.go @@ -3,7 +3,6 @@ package api import ( "context" "fmt" - "os" "github.com/alcionai/clues" "github.com/microsoft/kiota-abstractions-go/serialization" @@ -383,16 +382,6 @@ func NewMailPager( builder := gs.Client().UsersById(user).MailFoldersById(directoryID).Messages() - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } - return &mailPager{gs, builder, options}, nil } @@ -438,17 +427,6 @@ func getMailDeltaBuilder( options *users.ItemMailFoldersItemMessagesDeltaRequestBuilderGetRequestConfiguration, ) *users.ItemMailFoldersItemMessagesDeltaRequestBuilder { builder := gs.Client().UsersById(user).MailFoldersById(directoryID).Messages().Delta() - - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := builder.ToGetRequestInformation(ctx, options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } - return builder } @@ -502,16 +480,6 @@ func (p *mailDeltaPager) setNext(nextLink string) { func (p *mailDeltaPager) reset(ctx context.Context) { p.builder = p.gs.Client().UsersById(p.user).MailFoldersById(p.directoryID).Messages().Delta() - - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - gri, err := p.builder.ToGetRequestInformation(ctx, p.options) - if err != nil { - logger.CtxErr(ctx, err).Error("getting builder info") - } else { - logger.Ctx(ctx). - Infow("builder path-parameters", "path_parameters", gri.PathParameters) - } - } } func (p *mailDeltaPager) valuesIn(pl api.PageLinker) ([]getIDAndAddtler, error) { diff --git a/src/internal/connector/exchange/api/shared.go b/src/internal/connector/exchange/api/shared.go index 6a9b45cdb..87d579140 100644 --- a/src/internal/connector/exchange/api/shared.go +++ b/src/internal/connector/exchange/api/shared.go @@ -3,7 +3,6 @@ package api import ( "context" "fmt" - "os" "github.com/alcionai/clues" @@ -169,15 +168,6 @@ func getItemsAddedAndRemovedFromContainer( deltaLink = "" // to make sure we don't use an old value } - if len(os.Getenv("CORSO_URL_LOGGING")) > 0 { - if !api.IsNextLinkValid(nextLink) || !api.IsNextLinkValid(deltaLink) { - logger.Ctx(ctx). - With("next_link", graph.LoggableURL(nextLink)). - With("delta_link", graph.LoggableURL(deltaLink)). - Info("invalid link from M365") - } - } - // the deltaLink is kind of like a cursor for overall data state. // once we run through pages of nextLinks, the last query will // produce a deltaLink instead (if supported), which we'll use on