diff --git a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java index 5a96f3c9..b0cdbefc 100644 --- a/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java +++ b/aws-xray-recorder-sdk-core/src/main/java/com/amazonaws/xray/plugins/EC2MetadataFetcher.java @@ -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 ""; } @@ -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 ""; } diff --git a/aws-xray-recorder-sdk-log4j/src/test/java/com.amazonaws.xray.log4j/Log4JSegmentListenerTest.java b/aws-xray-recorder-sdk-log4j/src/test/java/com/amazonaws/xray/log4j/Log4JSegmentListenerTest.java similarity index 100% rename from aws-xray-recorder-sdk-log4j/src/test/java/com.amazonaws.xray.log4j/Log4JSegmentListenerTest.java rename to aws-xray-recorder-sdk-log4j/src/test/java/com/amazonaws/xray/log4j/Log4JSegmentListenerTest.java diff --git a/aws-xray-recorder-sdk-slf4j/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java b/aws-xray-recorder-sdk-slf4j/src/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java similarity index 85% rename from aws-xray-recorder-sdk-slf4j/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java rename to aws-xray-recorder-sdk-slf4j/src/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java index 533dc42c..addea7b8 100644 --- a/aws-xray-recorder-sdk-slf4j/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java +++ b/aws-xray-recorder-sdk-slf4j/src/test/java/com/amazonaws/xray/slf4j/SLF4JSegmentListenerTest.java @@ -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; @@ -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(); }