Skip to content

Commit 455d7ac

Browse files
committed
Fix log.warns
1 parent a9ac515 commit 455d7ac

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

test/architecture-tests/archunit_store/18fc8858-1308-4d5d-b92d-87817d2fab53

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Class <software.amazon.awssdk.imds.internal.AsyncHttpRequestHelper> depends on a
3131
Class <software.amazon.awssdk.imds.internal.AsyncHttpRequestHelper> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.async.AsyncResponseHandler>)
3232
Class <software.amazon.awssdk.imds.internal.AsyncHttpRequestHelper> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.async.SimpleHttpContentPublisher>)
3333
Class <software.amazon.awssdk.imds.internal.DefaultEc2MetadataAsyncClient> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.loader.DefaultSdkAsyncHttpClientBuilder>)
34-
Class <software.amazon.awssdk.imds.internal.DefaultEc2MetadataClient> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.loader.DefaultSdkHttpClientBuilder>)
3534
Class <software.amazon.awssdk.protocols.xml.AwsXmlProtocolFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.http.CombinedResponseHandler>)
3635
Class <software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.RetryPolicyAdapter>)
3736
Class <software.amazon.awssdk.services.dynamodb.DynamoDbRetryPolicy> depends on an internal API from a different module (Class <software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting>)
@@ -49,8 +48,6 @@ Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> dep
4948
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartDownloadResumeContext>)
5049
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartDownloadUtils>)
5150
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartS3AsyncClient>)
52-
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.resource.S3AccessPointResource>)
53-
Class <software.amazon.awssdk.transfer.s3.internal.GenericS3TransferManager> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.resource.S3ArnConverter>)
5451
Class <software.amazon.awssdk.transfer.s3.internal.TransferManagerFactory> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient>)
5552
Class <software.amazon.awssdk.transfer.s3.internal.model.CrtFileUpload> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.crt.S3MetaRequestPauseObservable>)
5653
Class <software.amazon.awssdk.transfer.s3.internal.model.DefaultFileDownload> depends on an internal API from a different module (Class <software.amazon.awssdk.services.s3.internal.multipart.MultipartDownloadUtils>)

test/architecture-tests/archunit_store/4195d6e3-8849-4e5a-848d-04f810577cd3

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ Method <software.amazon.awssdk.core.retry.ClockSkew.getServerTime(software.amazo
1111
Method <software.amazon.awssdk.http.FileStoreTlsKeyManagersProvider.keyManagers()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (FileStoreTlsKeyManagersProvider.java:52)
1212
Method <software.amazon.awssdk.http.SystemPropertyTlsKeyManagersProvider.keyManagers()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (SystemPropertyTlsKeyManagersProvider.java:61)
1313
Method <software.amazon.awssdk.http.apache.ApacheHttpClient$ApacheConnectionManagerFactory.getSslContext(software.amazon.awssdk.utils.AttributeMap)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (ApacheHttpClient.java:699)
14-
Method <software.amazon.awssdk.http.apache5.Apache5HttpClient$ApacheConnectionManagerFactory.getSslContext(software.amazon.awssdk.utils.AttributeMap)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (Apache5HttpClient.java:741)
1514
Method <software.amazon.awssdk.http.apache.internal.RepeatableInputStreamRequestEntity.parseContentLength(java.lang.String)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (RepeatableInputStreamRequestEntity.java:113)
1615
Method <software.amazon.awssdk.http.apache.internal.utils.ApacheUtils.noSuchMethodThrownByNormalizeUriInvoker()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (ApacheUtils.java:162)
16+
Method <software.amazon.awssdk.http.apache5.Apache5HttpClient$ApacheConnectionManagerFactory.getSslContext(software.amazon.awssdk.utils.AttributeMap)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (Apache5HttpClient.java:741)
1717
Method <software.amazon.awssdk.http.apache5.internal.RepeatableInputStreamRequestEntity.parseContentLength(java.lang.String)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (RepeatableInputStreamRequestEntity.java:131)
1818
Method <software.amazon.awssdk.http.apache5.internal.RepeatableInputStreamRequestEntity.parseContentType(java.lang.String)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (RepeatableInputStreamRequestEntity.java:143)
1919
Method <software.amazon.awssdk.http.nio.netty.internal.utils.NettyUtils.warnIfNotInEventLoop(io.netty.channel.EventLoop)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (NettyUtils.java:289)
@@ -36,16 +36,14 @@ Method <software.amazon.awssdk.protocols.xml.internal.unmarshall.XmlResponseHand
3636
Method <software.amazon.awssdk.regions.servicemetadata.EnhancedS3ServiceMetadata.profileFileSetting(java.util.function.Supplier, java.util.function.Supplier)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (EnhancedS3ServiceMetadata.java:118)
3737
Method <software.amazon.awssdk.services.s3.internal.endpoints.UseGlobalEndpointResolver.profileFileSetting(java.util.function.Supplier, java.util.function.Supplier)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (UseGlobalEndpointResolver.java:97)
3838
Method <software.amazon.awssdk.services.s3.internal.multipart.GenericMultipartHelper.cleanUpParts(java.lang.String, software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest$Builder)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (GenericMultipartHelper.java:121)
39-
Method <software.amazon.awssdk.services.s3.internal.multipart.KnownContentLengthAsyncRequestBodySubscriber.onSubscribe(org.reactivestreams.Subscription)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (KnownContentLengthAsyncRequestBodySubscriber.java:128)
40-
Method <software.amazon.awssdk.services.s3.internal.multipart.UploadWithUnknownContentLengthHelper$UnknownContentLengthAsyncRequestBodySubscriber.onSubscribe(org.reactivestreams.Subscription)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (UploadWithUnknownContentLengthHelper.java:143)
4139
Method <software.amazon.awssdk.services.s3.internal.s3express.UseS3ExpressAuthResolver.profileFileSetting(java.util.function.Supplier, java.util.function.Supplier)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (UseS3ExpressAuthResolver.java:80)
4240
Method <software.amazon.awssdk.services.s3.internal.settingproviders.DisableMultiRegionProviderChain.resolve()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (DisableMultiRegionProviderChain.java:79)
4341
Method <software.amazon.awssdk.services.s3.internal.settingproviders.UseArnRegionProviderChain.resolveUseArnRegion()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (UseArnRegionProviderChain.java:76)
4442
Method <software.amazon.awssdk.services.sqs.internal.batchmanager.ReceiveSqsMessageHelper.clear()> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (ReceiveSqsMessageHelper.java:132)
4543
Method <software.amazon.awssdk.transfer.s3.internal.AsyncBufferingSubscriber.onSubscribe(org.reactivestreams.Subscription)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (AsyncBufferingSubscriber.java:67)
4644
Method <software.amazon.awssdk.transfer.s3.internal.PauseResumeHelper.fileModified(software.amazon.awssdk.transfer.s3.model.ResumableFileUpload, software.amazon.awssdk.services.s3.S3AsyncClient)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (PauseResumeHelper.java:59)
47-
Method <software.amazon.awssdk.utils.ContentRangeParser.totalBytes(java.lang.String)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (ContentRangeParser.java:71)
4845
Method <software.amazon.awssdk.transfer.s3.progress.LoggingTransferListener.transferFailed(software.amazon.awssdk.transfer.s3.progress.TransferListener$Context$TransferFailed)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (LoggingTransferListener.java:76)
46+
Method <software.amazon.awssdk.utils.ContentRangeParser.totalBytes(java.lang.String)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (ContentRangeParser.java:71)
4947
Method <software.amazon.awssdk.utils.Logger.log(org.slf4j.event.Level, java.util.function.Supplier)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier)> in (Logger.java:205)
5048
Method <software.amazon.awssdk.utils.async.AddingTrailingDataSubscriber.onSubscribe(org.reactivestreams.Subscription)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (AddingTrailingDataSubscriber.java:73)
5149
Method <software.amazon.awssdk.utils.async.BaseSubscriberAdapter.onSubscribe(org.reactivestreams.Subscription)> calls method <software.amazon.awssdk.utils.Logger.warn(java.util.function.Supplier, java.lang.Throwable)> in (BaseSubscriberAdapter.java:99)

utils/src/main/java/software/amazon/awssdk/utils/cache/CachedSupplier.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,12 @@ private RefreshResult<T> handleFetchedSuccess(RefreshResult<T> fetch) {
323323
switch (staleValueBehavior) {
324324
case STRICT:
325325
Instant newStale = now.plusSeconds(1);
326-
log.warn(() -> "(" + cachedValueName + ") Retrieved value expiration is in the past (" + fetch.staleTime() +
326+
log.debug(() -> "(" + cachedValueName + ") Retrieved value expiration is in the past (" + fetch.staleTime() +
327327
"). Using expiration of " + newStale);
328328
return fetch.toBuilder().staleTime(newStale).build(); // Refresh again in 1 second
329329
case ALLOW:
330330
Instant newStaleTime = jitterTime(now, Duration.ofMinutes(1), Duration.ofMinutes(10));
331-
log.warn(() -> "(" + cachedValueName + ") Cached value expiration has been extended to " + newStaleTime +
331+
log.debug(() -> "(" + cachedValueName + ") Cached value expiration has been extended to " + newStaleTime +
332332
" because the downstream service returned a time in the past: " + fetch.staleTime());
333333

334334
return fetch.toBuilder()
@@ -368,7 +368,7 @@ private RefreshResult<T> handleFetchFailure(RuntimeException e) {
368368
- STATIC_STABILITY_BACKOFF_MIN.getSeconds() + 1));
369369
this.nextAllowedRefreshTime = now.plusSeconds(backoffSeconds);
370370

371-
log.warn(() -> "(" + cachedValueName + ") Credential refresh failed: " + e.getMessage()
371+
log.debug(() -> "(" + cachedValueName + ") Credential refresh failed: " + e.getMessage()
372372
+ ". Will retry after " + backoffSeconds + " seconds.", e);
373373

374374
return currentCachedValue; // Return unchanged — staleTime/prefetchTime untouched
@@ -390,7 +390,7 @@ private RefreshResult<T> handleFetchFailure(RuntimeException e) {
390390
- STATIC_STABILITY_BACKOFF_MIN.getSeconds() + 1));
391391
this.nextAllowedRefreshTime = now.plusSeconds(backoffSeconds);
392392

393-
log.warn(() -> "(" + cachedValueName + ") Credential refresh failed: " + e.getMessage()
393+
log.debug(() -> "(" + cachedValueName + ") Credential refresh failed: " + e.getMessage()
394394
+ ". Will retry after " + backoffSeconds + " seconds.", e);
395395

396396
return currentCachedValue; // Return unchanged — staleTime/prefetchTime untouched

0 commit comments

Comments
 (0)