Merge pull request #9 from agorapulse/feature/null-remote-host

handling null remote host (on connection timeout)
agorapulse · Mar 9, 2021 · 827dd5c · 827dd5c
2 parents 9b5f0da + 444bee3
commit 827dd5c
Show file tree

Hide file tree

Showing 35 changed files with 41 additions and 36 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/examples/micronaut-log4aws-demo/micronaut-log4aws-demo.gradle b/examples/micronaut-log4aws-demo/micronaut-log4aws-demo.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...cronaut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingDemo.java b/...cronaut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingDemo.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...naut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingService.java b/...naut-log4aws-demo/src/main/java/com/agorapulse/micronaut/log4aws/demo/LoggingService.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/examples/micronaut-log4aws-demo/src/main/resources/log4j2.xml b/examples/micronaut-log4aws-demo/src/main/resources/log4j2.xml
@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020 Agorapulse.
+    Copyright 2020-2021 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/examples/micronaut-log4aws-demo/src/main/resources/sentry.properties b/examples/micronaut-log4aws-demo/src/main/resources/sentry.properties
@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020 Agorapulse.
+# Copyright 2020-2021 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/...4aws-demo/src/test/groovy/com/agorapulse/micronaut/log4aws/demo/LoggingServiceSpec.groovy b/...4aws-demo/src/test/groovy/com/agorapulse/micronaut/log4aws/demo/LoggingServiceSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020 Agorapulse.
+# Copyright 2020-2021 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/gradle/LICENSE_HEADER b/gradle/LICENSE_HEADER
@@ -1,6 +1,6 @@
 SPDX-License-Identifier: Apache-2.0
 
-Copyright ${copyrightYear} Agorapulse.
+Copyright 2020-${copyrightYear} Agorapulse.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/subprojects/micronaut-log4aws/micronaut-log4aws.gradle b/subprojects/micronaut-log4aws/micronaut-log4aws.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/AwsLambdaEventBuildHelper.java b/...t-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/AwsLambdaEventBuildHelper.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ts/micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java b/...ts/micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/subprojects/micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/LogError.java b/subprojects/micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/LogError.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/LogExceptionsInterceptor.java b/...ut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/LogExceptionsInterceptor.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ws/src/main/groovy/com/agorapulse/micronaut/log4aws/http/MicronautRequestBuildHelper.java b/...ws/src/main/groovy/com/agorapulse/micronaut/log4aws/http/MicronautRequestBuildHelper.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,12 @@ public MicronautRequestBuildHelper(HttpRequest<?> request) {
     public void helpBuildingEvent(EventBuilder eventBuilder) {
         eventBuilder.withTag("req.path", request.getPath());
         eventBuilder.withTag("req.method", request.getMethod().toString());
-        eventBuilder.withTag("req.remoteHost", request.getRemoteAddress().getHostString());
+
+        if (request.getRemoteAddress() != null) {
+            // it can be actually null on read timeout
+            eventBuilder.withTag("req.remoteHost", request.getRemoteAddress().getHostString());
+        }
+
         eventBuilder.withTag("req.serverHost", request.getServerAddress().getHostString());
         eventBuilder.withExtra("req.parameters", resolveParameters(request));
         eventBuilder.withExtra("req.headers", resolveHeaders(request));

diff --git a/...micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilter.java b/...micronaut-log4aws/src/main/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilter.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/LogErrorInterceptorSpec.groovy b/...t-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/LogErrorInterceptorSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...aut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilterSpec.groovy b/...aut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/SentryFilterSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...onaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/TestController.groovy b/...onaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/TestController.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/subprojects/micronaut-log4aws/src/test/resources/log4j2.xml b/subprojects/micronaut-log4aws/src/test/resources/log4j2.xml
@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020 Agorapulse.
+    Copyright 2020-2021 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/subprojects/micronaut-log4aws/src/test/resources/sentry.properties b/subprojects/micronaut-log4aws/src/test/resources/sentry.properties
@@ -1,7 +1,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-# Copyright 2020 Agorapulse.
+# Copyright 2020-2021 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-lambda-only/micronaut-log4aws-test-lambda-only.gradle b/testprojects/micronaut-log4aws-test-lambda-only/micronaut-log4aws-test-lambda-only.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ly/src/test/groovy/com/agorapulse/micronaut/log4aws/test/lambdaonly/LambdaOnlySpec.groovy b/...ly/src/test/groovy/com/agorapulse/micronaut/log4aws/test/lambdaonly/LambdaOnlySpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-lambda-only/src/test/resources/log4j2.xml b/testprojects/micronaut-log4aws-test-lambda-only/src/test/resources/log4j2.xml
@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020 Agorapulse.
+    Copyright 2020-2021 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-lower-case/micronaut-log4aws-test-lower-case.gradle b/testprojects/micronaut-log4aws-test-lower-case/micronaut-log4aws-test-lower-case.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...case/src/test/groovy/com/agorapulse/micronaut/log4aws/test/lowercase/LowerCaseSpec.groovy b/...case/src/test/groovy/com/agorapulse/micronaut/log4aws/test/lowercase/LowerCaseSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-lower-case/src/test/resources/log4j2.xml b/testprojects/micronaut-log4aws-test-lower-case/src/test/resources/log4j2.xml
@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020 Agorapulse.
+    Copyright 2020-2021 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-root-only/micronaut-log4aws-test-root-only.gradle b/testprojects/micronaut-log4aws-test-root-only/micronaut-log4aws-test-root-only.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t-only/src/test/groovy/com/agorapulse/micronaut/log4aws/test/rootonly/RootOnlySpec.groovy b/...t-only/src/test/groovy/com/agorapulse/micronaut/log4aws/test/rootonly/RootOnlySpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test-root-only/src/test/resources/log4j2.xml b/testprojects/micronaut-log4aws-test-root-only/src/test/resources/log4j2.xml
@@ -3,7 +3,7 @@
 
     SPDX-License-Identifier: Apache-2.0
 
-    Copyright 2020 Agorapulse.
+    Copyright 2020-2021 Agorapulse.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/testprojects/micronaut-log4aws-test/micronaut-log4aws-test.gradle b/testprojects/micronaut-log4aws-test/micronaut-log4aws-test.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...4aws-test/src/main/groovy/com/agorapulse/micronaut/log4aws/test/Log4AwsFactorySpec.groovy b/...4aws-test/src/main/groovy/com/agorapulse/micronaut/log4aws/test/Log4AwsFactorySpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...naut-log4aws-test/src/test/groovy/com/agorapulse/micronaut/log4aws/test/NoConfSpec.groovy b/...naut-log4aws-test/src/test/groovy/com/agorapulse/micronaut/log4aws/test/NoConfSpec.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020 Agorapulse.
+ * Copyright 2020-2021 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.