RED-8171: Traces do not stop at @Async

build.gradle.kts

@@ -95,9 +95,9 @@ configurations {
 
 
 dependencies {
-    implementation("com.knecon.fforesight:keycloak-commons:0.24.0")
+    implementation("com.knecon.fforesight:keycloak-commons:0.25.0")
     implementation("com.knecon.fforesight:swagger-commons:0.5.0")
-    implementation("com.knecon.fforesight:tracing-commons:0.3.0")
+    implementation("com.knecon.fforesight:tracing-commons:0.5.0")
     implementation("net.logstash.logback:logstash-logback-encoder:7.4")
     implementation("ch.qos.logback:logback-classic")
     implementation("org.postgresql:postgresql:42.5.4")

src/test/java/com/knecon/fforesight/tenantusermanagement/AbstractTenantUserManagementIntegrationTest.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight;
+package com.knecon.fforesight.tenantusermanagement;
 
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,15 +16,14 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import com.knecon.fforesight.feigntestclients.external.TenantsClient;
-import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient;
-import com.knecon.fforesight.tenantusermanagement.TenantUserManagementServiceApplication;
-import com.knecon.fforesight.testcontainers.KeyCloakTestContainer;
-import com.knecon.fforesight.testcontainers.MinioTestContainer;
-import com.knecon.fforesight.testcontainers.RedisTestContainer;
-import com.knecon.fforesight.testcontainers.SpringPostgreSQLTestContainer;
-import com.knecon.fforesight.utils.TestTenantService;
-import com.knecon.fforesight.utils.TokenService;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient;
+import com.knecon.fforesight.tenantusermanagement.testcontainers.KeyCloakTestContainer;
+import com.knecon.fforesight.tenantusermanagement.testcontainers.MinioTestContainer;
+import com.knecon.fforesight.tenantusermanagement.testcontainers.RedisTestContainer;
+import com.knecon.fforesight.tenantusermanagement.testcontainers.SpringPostgreSQLTestContainer;
+import com.knecon.fforesight.tenantusermanagement.utils.TestTenantService;
+import com.knecon.fforesight.tenantusermanagement.utils.TokenService;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.BeforeEach;

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/GeneralSettingsClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.external;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.external;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/SMTPConfigurationClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.external;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.external;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/TenantsClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.external;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.external;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.external;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.external;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/external/UserPreferenceClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.external;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.external;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/feigntestclients/internal/InternalTenantsClient.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.feigntestclients.internal;
+package com.knecon.fforesight.tenantusermanagement.feigntestclients.internal;
 
 import org.springframework.cloud.openfeign.FeignClient;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/KeyCloakTestContainer.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.testcontainers;
+package com.knecon.fforesight.tenantusermanagement.testcontainers;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/MinioTestContainer.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.testcontainers;
+package com.knecon.fforesight.tenantusermanagement.testcontainers;
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;

src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/RedisTestContainer.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.testcontainers;
+package com.knecon.fforesight.tenantusermanagement.testcontainers;
 
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.utility.DockerImageName;

src/test/java/com/knecon/fforesight/tenantusermanagement/testcontainers/SpringPostgreSQLTestContainer.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.testcontainers;
+package com.knecon.fforesight.tenantusermanagement.testcontainers;
 
 import org.testcontainers.containers.PostgreSQLContainer;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/GeneralSettingsTest.java

@@ -1,11 +1,11 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.GeneralSettingsClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.GeneralSettingsClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantusermanagement.model.GeneralConfigurationModel;
 import org.junit.jupiter.api.Test;

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/IdentityTest.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/RealmTest.java

@@ -1,11 +1,11 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static dasniko.testcontainers.keycloak.ExtendableKeycloakContainer.MASTER_REALM;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
 import com.knecon.fforesight.tenantusermanagement.service.RealmService;
 import org.junit.jupiter.api.Test;
 import org.keycloak.representations.idm.RealmRepresentation;

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/SMTPConfigurationTest.java

@@ -1,12 +1,12 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.SMTPConfigurationClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.SMTPConfigurationClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantusermanagement.model.SMTPConfiguration;
 import org.junit.jupiter.api.Test;

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/StartupTest.java

@@ -1,11 +1,11 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient;
 import org.junit.jupiter.api.Test;
 
 public class StartupTest extends AbstractTenantUserManagementIntegrationTest {

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/TenantsTest.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -8,8 +8,8 @@ import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.TenantsClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantcommons.model.AzureStorageConnection;
 import com.knecon.fforesight.tenantcommons.model.DatabaseConnection;
@@ -18,7 +18,7 @@ import com.knecon.fforesight.tenantcommons.model.SearchConnection;
 import com.knecon.fforesight.tenantusermanagement.model.SearchConnectionRequest;
 import com.knecon.fforesight.tenantusermanagement.model.TenantRequest;
 import com.knecon.fforesight.tenantusermanagement.service.RealmService;
-import com.knecon.fforesight.utils.TestTenantService;
+import com.knecon.fforesight.tenantusermanagement.utils.TestTenantService;
 import feign.FeignException;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.regions.Region;

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserPreferenceTest.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -6,8 +6,8 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.UserPreferenceClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.UserPreferenceClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import org.junit.jupiter.api.Test;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/tests/UserTest.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.tests;
+package com.knecon.fforesight.tenantusermanagement.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
@@ -9,8 +9,8 @@ import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.UserClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.UserClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantusermanagement.model.CreateUserRequest;
 import com.knecon.fforesight.tenantusermanagement.model.ResetPasswordRequest;

src/test/java/com/knecon/fforesight/tenantusermanagement/utils/FeignRequestInterceptor.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.utils;
+package com.knecon.fforesight.tenantusermanagement.utils;
 
 import org.springframework.stereotype.Component;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TenantSyncUtils.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.utils;
+package com.knecon.fforesight.tenantusermanagement.utils;
 
 import static org.mockito.Mockito.when;
 
@@ -13,9 +13,9 @@ import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import com.knecon.fforesight.AbstractTenantUserManagementIntegrationTest;
-import com.knecon.fforesight.feigntestclients.external.TenantsClient;
-import com.knecon.fforesight.feigntestclients.internal.InternalTenantsClient;
+import com.knecon.fforesight.tenantusermanagement.AbstractTenantUserManagementIntegrationTest;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.internal.InternalTenantsClient;
 import com.knecon.fforesight.tenantusermanagement.TenantUserManagementServiceApplication;
 import com.knecon.fforesight.tenantusermanagement.service.KeyCloakRoleManagerService;
 import com.knecon.fforesight.tenantusermanagement.service.RealmService;

src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TestTenantService.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.utils;
+package com.knecon.fforesight.tenantusermanagement.utils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@ import java.util.UUID;
 
 import org.springframework.stereotype.Service;
 
-import com.knecon.fforesight.feigntestclients.external.TenantsClient;
+import com.knecon.fforesight.tenantusermanagement.feigntestclients.external.TenantsClient;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 import com.knecon.fforesight.tenantcommons.model.DatabaseConnection;
 import com.knecon.fforesight.tenantcommons.model.S3StorageConnection;
@@ -16,7 +16,7 @@ import com.knecon.fforesight.tenantusermanagement.api.internal.InternalTenantsRe
 import com.knecon.fforesight.tenantusermanagement.model.SearchConnectionRequest;
 import com.knecon.fforesight.tenantusermanagement.model.TenantRequest;
 import com.knecon.fforesight.tenantusermanagement.model.TenantUser;
-import com.knecon.fforesight.testcontainers.SpringPostgreSQLTestContainer;
+import com.knecon.fforesight.tenantusermanagement.testcontainers.SpringPostgreSQLTestContainer;
 import lombok.RequiredArgsConstructor;
 import software.amazon.awssdk.regions.Region;
 

src/test/java/com/knecon/fforesight/tenantusermanagement/utils/TokenService.java

@@ -1,4 +1,4 @@
-package com.knecon.fforesight.utils;
+package com.knecon.fforesight.tenantusermanagement.utils;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;