Skip to content

Commit

Permalink
Lowered IMDS fetching log level (#219)
Browse files Browse the repository at this point in the history
* lowered imds fetching log level

* license and style

Co-authored-by: Anuraag Agrawal <[email protected]>
  • Loading branch information
willarmiros and Anuraag Agrawal authored Oct 2, 2020
1 parent 9d1072a commit 53bbaa0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private static String fetchString(String httpMethod, URL url, String token, bool
try {
connection = (HttpURLConnection) url.openConnection();
} catch (Exception e) {
logger.warn("Error connecting to IMDS.", e);
logger.debug("Error connecting to IMDS.", e);
return "";
}

Expand Down Expand Up @@ -161,7 +161,7 @@ private static String fetchString(String httpMethod, URL url, String token, bool
if (e instanceof SocketTimeoutException) {
logger.debug("Timed out trying to connect to IMDS, likely not operating in EC2 environment");
} else {
logger.warn("Error connecting to IMDS.", e);
logger.debug("Error connecting to IMDS.", e);
}
return "";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License").
* You may not use this file except in compliance with the License.
* A copy of the License is located at
*
* http://aws.amazon.com/apache2.0
*
* or in the "license" file accompanying this file. This file is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
* express or implied. See the License for the specific language governing
* permissions and limitations under the License.
*/

package com.amazonaws.xray.slf4j;

import com.amazonaws.xray.AWSXRay;
Expand Down Expand Up @@ -25,7 +40,10 @@ public void setupAWSXRay() {
Mockito.doReturn(true).when(blankEmitter).sendSubsegment(Mockito.any());
SLF4JSegmentListener segmentListener = new SLF4JSegmentListener();

AWSXRay.setGlobalRecorder(AWSXRayRecorderBuilder.standard().withEmitter(blankEmitter).withSegmentListener(segmentListener).build());
AWSXRay.setGlobalRecorder(AWSXRayRecorderBuilder.standard()
.withEmitter(blankEmitter)
.withSegmentListener(segmentListener)
.build());
AWSXRay.clearTraceEntity();
MDC.clear();
}
Expand Down

0 comments on commit 53bbaa0

Please sign in to comment.