diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index e088ceb..458ffd5 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -27,7 +27,7 @@ jobs: cache: gradle - uses: gradle/gradle-command-action@v2 with: - arguments: ${{ matrix.versions }} + arguments: ${{ matrix.versions }} --scan --parallel - name: Show Reports uses: actions/upload-artifact@v1 if: failure() diff --git a/gradle.properties b/gradle.properties index 9bbb6e1..c23684e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,8 +26,8 @@ nexusPluginVersion=1.0.0 micronautVersion = 1.3.7 sentryVersion = 6.16.0 -log4jVersion = 2.17.1 -awsLog4jVersion = 1.3.0 +log4jVersion = 2.20.0 +awsLog4jVersion = 1.5.1 systemLambdaVersion = 1.2.0 gruVersion = 0.9.4 bytebuddyVersion = 1.10.17 diff --git a/settings.gradle b/settings.gradle index b659938..089b44e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -48,6 +48,21 @@ buildscript { } } +plugins { + id 'com.gradle.enterprise' version '3.6.1' +} + +gradleEnterprise { + buildScan { + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + + buildScanPublished { scan -> + file("scan-journal.log") << "${new Date()} - ${scan.buildScanId} - ${scan.buildScanUri}\n" + } + } +} + apply plugin: 'org.kordamp.gradle.settings' projects { diff --git a/subprojects/micronaut-log4aws/micronaut-log4aws.gradle b/subprojects/micronaut-log4aws/micronaut-log4aws.gradle index d593073..f4a4756 100644 --- a/subprojects/micronaut-log4aws/micronaut-log4aws.gradle +++ b/subprojects/micronaut-log4aws/micronaut-log4aws.gradle @@ -28,21 +28,21 @@ config { dependencies { // rewrite("org.openrewrite.recipe:rewrite-micronaut:1.3.0") - annotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion") - api platform("io.micronaut:micronaut-bom:$micronautVersion") - testAnnotationProcessor platform("io.micronaut:micronaut-bom:$micronautVersion") - testImplementation platform("io.micronaut:micronaut-bom:$micronautVersion") + annotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion") + api enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion") + testAnnotationProcessor enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion") + testImplementation enforcedPlatform("io.micronaut:micronaut-bom:$micronautVersion") - annotationProcessor platform("org.apache.logging.log4j:log4j-bom:$log4jVersion") - api platform("org.apache.logging.log4j:log4j-bom:$log4jVersion") - testAnnotationProcessor platform("org.apache.logging.log4j:log4j-bom:$log4jVersion") - testImplementation platform("org.apache.logging.log4j:log4j-bom:$log4jVersion") + annotationProcessor enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion") + api enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion") + testAnnotationProcessor enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion") + testImplementation enforcedPlatform("org.apache.logging.log4j:log4j-bom:$log4jVersion") annotationProcessor "io.micronaut:micronaut-inject-java" api "io.sentry:sentry-log4j2:$sentryVersion" api group: 'com.amazonaws', name: 'aws-lambda-java-log4j2', version: awsLog4jVersion - api "org.apache.logging.log4j:log4j-slf4j18-impl:$log4jVersion" + api "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion" api "org.apache.logging.log4j:log4j-api:$log4jVersion" api "org.apache.logging.log4j:log4j-core:$log4jVersion" diff --git a/subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/MockHub.java b/subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/MockHub.java index 6ebd5a2..85079f7 100644 --- a/subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/MockHub.java +++ b/subprojects/micronaut-log4aws/src/test/groovy/com/agorapulse/micronaut/log4aws/http/MockHub.java @@ -22,8 +22,6 @@ import io.sentry.protocol.SentryId; import io.sentry.protocol.SentryTransaction; import io.sentry.protocol.User; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.*; @@ -46,7 +44,7 @@ public boolean isEnabled() { } @Override - public void captureUserFeedback(@NotNull UserFeedback userFeedback) { + public void captureUserFeedback(UserFeedback userFeedback) { System.err.printf("Got a feedback %s when scope is %s%n", userFeedback, getCurrentScope()); } @@ -66,31 +64,31 @@ public void close() { } @Override - public void addBreadcrumb(@NotNull Breadcrumb breadcrumb, @Nullable Hint hint) { + public void addBreadcrumb(Breadcrumb breadcrumb, Hint hint) { System.err.printf("Got breadcrumb %s with hint %s when scope is %s%n", breadcrumb, hint, getCurrentScope()); getCurrentScope().addBreadcrumb(breadcrumb, hint); } @Override - public void setLevel(@Nullable SentryLevel level) { + public void setLevel(SentryLevel level) { System.err.printf("New level is " + level); getCurrentScope().setLevel(level); } @Override - public void setTransaction(@Nullable String transaction) { + public void setTransaction(String transaction) { System.err.printf("New transaction is " + transaction); getCurrentScope().setTransaction(transaction); } @Override - public void setUser(@Nullable User user) { + public void setUser(User user) { System.err.printf("New user is " + user); getCurrentScope().setUser(user); } @Override - public void setFingerprint(@NotNull List fingerprint) { + public void setFingerprint(List fingerprint) { System.err.printf("New fingerprint is " + fingerprint); getCurrentScope().setFingerprint(fingerprint); } @@ -102,31 +100,31 @@ public void clearBreadcrumbs() { } @Override - public void setTag(@NotNull String key, @NotNull String value) { + public void setTag(String key, String value) { System.err.printf("Setting tag with key %s and value %s when scope is %s%n", key, value, getCurrentScope()); getCurrentScope().setTag(key, value); } @Override - public void removeTag(@NotNull String key) { + public void removeTag(String key) { System.err.printf("Removing tag with key %s when scope is %s%n", key, getCurrentScope()); getCurrentScope().removeTag(key); } @Override - public void setExtra(@NotNull String key, @NotNull String value) { + public void setExtra(String key, String value) { System.err.printf("Setting extra with key %s and value %s when scope is %s%n", key, value, getCurrentScope()); getCurrentScope().setExtra(key, value); } @Override - public void removeExtra(@NotNull String key) { + public void removeExtra(String key) { System.err.printf("Removing extra with key %s when scope is %s%n", key, getCurrentScope()); getCurrentScope().removeExtra(key); } @Override - public @NotNull SentryId getLastEventId() { + public SentryId getLastEventId() { return new SentryId(); } @@ -144,20 +142,20 @@ public void popScope() { } @Override - public void withScope(@NotNull ScopeCallback callback) { + public void withScope(ScopeCallback callback) { pushScope(); configureScope(callback); popScope(); } @Override - public void configureScope(@NotNull ScopeCallback callback) { + public void configureScope(ScopeCallback callback) { System.err.printf("Configuring scope %s%n", getCurrentScope()); callback.run(getCurrentScope()); } @Override - public void bindClient(@NotNull ISentryClient client) { + public void bindClient(ISentryClient client) { System.err.printf("Binding client %s when scope is %s%n", client, getCurrentScope()); } @@ -169,31 +167,31 @@ public void flush(long timeoutMillis) { //CHECKSTYLE:OFF @Override - public @NotNull IHub clone() { + public IHub clone() { return this; } @Override - public @NotNull SentryId captureTransaction(@NotNull SentryTransaction transaction, @Nullable TraceContext traceContext, @Nullable Hint hint, @Nullable ProfilingTraceData profilingTraceData) { + public SentryId captureTransaction(SentryTransaction transaction, TraceContext traceContext, Hint hint, ProfilingTraceData profilingTraceData) { System.err.printf("Capturing transaction %s with state %s and hint %s when scope is %s%n", transaction, profilingTraceData, hint, getCurrentScope()); return new SentryId(); } //CHECKSTYLE:ON @Override - public @NotNull ITransaction startTransaction(@NotNull TransactionContext transactionContexts, @Nullable CustomSamplingContext customSamplingContext, boolean bindToScope) { + public ITransaction startTransaction(TransactionContext transactionContexts, CustomSamplingContext customSamplingContext, boolean bindToScope) { System.err.printf("Capturing transaction with contexts %s with sampling context %s and bind to scope %s when scope is %s%n", transactionContexts, customSamplingContext, bindToScope, getCurrentScope()); return getCurrentScope().getTransaction(); } @Override - public @NotNull ITransaction startTransaction(@NotNull TransactionContext transactionContext, @NotNull TransactionOptions transactionOptions) { + public ITransaction startTransaction(TransactionContext transactionContext, TransactionOptions transactionOptions) { //System.err.printf("Capturing transaction with contexts %s with sampling context %s and bind to scope %s and start timestamp %s when scope is %s%n", transactionContext, transactionOptions, getCurrentScope()); return getCurrentScope().getTransaction(); } @Override - public @Nullable SentryTraceHeader traceHeaders() { + public SentryTraceHeader traceHeaders() { try { return new SentryTraceHeader("traceid-spanid"); } catch (InvalidSentryTraceHeaderException e) { @@ -202,22 +200,22 @@ public void flush(long timeoutMillis) { } @Override - public void setSpanContext(@NotNull Throwable throwable, @NotNull ISpan span, @NotNull String transactionName) { + public void setSpanContext(Throwable throwable, ISpan span, String transactionName) { System.err.printf("Setting span context %s to span %s with transaction name %s when scope is %s%n", throwable, span, transactionName, getCurrentScope()); } @Override - public @Nullable ISpan getSpan() { + public ISpan getSpan() { return NoOpSpan.getInstance(); } @Override - public @NotNull SentryOptions getOptions() { + public SentryOptions getOptions() { return new SentryOptions(); } @Override - public @Nullable Boolean isCrashedLastRun() { + public Boolean isCrashedLastRun() { return false; } @@ -234,41 +232,41 @@ private Scope getCurrentScope() { } @Override - public @NotNull SentryId captureEvent(@NotNull SentryEvent event, @Nullable Hint hint) { + public SentryId captureEvent(SentryEvent event, Hint hint) { System.err.printf("Got an event %s with hint %s when scope is %s%n", event, hint, getCurrentScope()); return new SentryId(); } @Override - public @NotNull SentryId captureEvent(@NotNull SentryEvent event, @Nullable Hint hint, @NotNull ScopeCallback callback) { + public SentryId captureEvent(SentryEvent event, Hint hint, ScopeCallback callback) { return null; } @Override - public @NotNull SentryId captureMessage(@NotNull String message, @NotNull SentryLevel level) { + public SentryId captureMessage(String message, SentryLevel level) { System.err.printf("Got a message %s with level %s when scope is %s%n", message, level, getCurrentScope()); return new SentryId(); } @Override - public @NotNull SentryId captureMessage(@NotNull String message, @NotNull SentryLevel level, @NotNull ScopeCallback callback) { + public SentryId captureMessage(String message, SentryLevel level, ScopeCallback callback) { return null; } @Override - public @NotNull SentryId captureEnvelope(@NotNull SentryEnvelope envelope, @Nullable Hint hint) { + public SentryId captureEnvelope(SentryEnvelope envelope, Hint hint) { System.err.printf("Got an envelope %s with hint %s when scope is %s%n", envelope, hint, getCurrentScope()); return new SentryId(); } @Override - public @NotNull SentryId captureException(@NotNull Throwable throwable, @Nullable Hint hint) { + public SentryId captureException(Throwable throwable, Hint hint) { System.err.printf("Got an envelope %s with hint %s when scope is %s%n", throwable, hint, getCurrentScope()); return new SentryId(); } @Override - public @NotNull SentryId captureException(@NotNull Throwable throwable, @Nullable Hint hint, @NotNull ScopeCallback callback) { + public SentryId captureException(Throwable throwable, Hint hint, ScopeCallback callback) { return null; }