Merge 0b40b47 into 7fda526

agorapulse · Mar 23, 2023 · 63ed3c2 · 63ed3c2
2 parents 7fda526 + 0b40b47
commit 63ed3c2
Show file tree

Hide file tree

Showing 42 changed files with 102 additions and 82 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+    Copyright 2020-2023 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-2022 Agorapulse.
+# Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+# Copyright 2020-2023 Agorapulse.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@ gitPublishPluginVersion = 2.1.3
 nexusPluginVersion=1.0.0
 
 micronautVersion = 1.3.7
-sentryVersion = 5.7.0
+sentryVersion = 6.16.0
 log4jVersion = 2.17.1
 awsLog4jVersion = 1.3.0
 systemLambdaVersion = 1.2.0

diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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/main/java/com/agorapulse/micronaut/log4aws/AwsLambdaEventProcessor.java b/...onaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/AwsLambdaEventProcessor.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,13 +19,14 @@
 
 import io.micronaut.context.annotation.Context;
 import io.sentry.EventProcessor;
+import io.sentry.Hint;
 import io.sentry.SentryEvent;
 
 @Context
 public class AwsLambdaEventProcessor implements EventProcessor {
 
     @Override
-    public SentryEvent process(SentryEvent event, Object hint) {
+    public SentryEvent process(SentryEvent event, Hint hint) {
         event.setTag("aws_region", System.getenv("AWS_REGION"));
         event.setTag("aws_default_region", System.getenv("AWS_DEFAULT_REGION"));
         event.setTag("lambda_function_name", System.getenv("AWS_LAMBDA_FUNCTION_NAME"));

diff --git a/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java b/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/Log4AwsFactory.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,7 +69,8 @@ public SentryAppender sentryAppender(
                 null,
                 null,
                 null,
-                hub
+                hub,
+                null
             )
         );
     }

diff --git a/subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/LogError.java b/subprojects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/LogError.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/src/main/java/com/agorapulse/micronaut/log4aws/LogExceptionsInterceptor.java b/...naut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/LogExceptionsInterceptor.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/java/com/agorapulse/micronaut/log4aws/function/Logging.java b/...ts/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/function/Logging.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...s/src/main/java/com/agorapulse/micronaut/log4aws/function/LoggingFunctionInitializer.java b/...s/src/main/java/com/agorapulse/micronaut/log4aws/function/LoggingFunctionInitializer.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/MDCFilter.java b/...ects/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/MDCFilter.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...s/src/main/java/com/agorapulse/micronaut/log4aws/http/MicronautRequestEventProcessor.java b/...s/src/main/java/com/agorapulse/micronaut/log4aws/http/MicronautRequestEventProcessor.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import io.micronaut.http.HttpRequest;
 import io.sentry.EventProcessor;
+import io.sentry.Hint;
 import io.sentry.SentryEvent;
 
 import java.util.Arrays;
@@ -42,7 +43,7 @@ public MicronautRequestEventProcessor(HttpRequest<?> request) {
     }
 
     @Override
-    public SentryEvent process(SentryEvent event, Object hint) {
+    public SentryEvent process(SentryEvent event, Hint hint) {
         event.setTag("req.path", request.getPath());
         event.setTag("req.method", request.getMethod().toString());
 

diff --git a/...aut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/ReactiveSentryFilter.java b/...aut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/ReactiveSentryFilter.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...s/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/SentryFilter.java b/...s/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/http/SentryFilter.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...icronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/LoggerWithTags.java b/...icronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/LoggerWithTags.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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/...cts/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/TagHelper.java b/...cts/micronaut-log4aws/src/main/java/com/agorapulse/micronaut/log4aws/slf4j/TagHelper.java
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 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-2022 Agorapulse.
+ * Copyright 2020-2023 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/http/GlobalErrorHandler.groovy b/...t-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/GlobalErrorHandler.groovy
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: Apache-2.0
  *
- * Copyright 2020-2022 Agorapulse.
+ * Copyright 2020-2023 Agorapulse.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.