Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OPIK-669: Make containers start when test instance is init #1412

Merged
merged 3 commits into from
Mar 3, 2025
Merged

OPIK-669: Make containers start when test instance is init #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b44473b
OPIK-669: Make containers start when test instance is init
thiagohora Feb 27, 2025
948888c
Merge branch 'main' into thiagohora/OPIK-669_make_containers_start_wh…
thiagohora Feb 28, 2025
7bfa97c
Merge branch 'main' into thiagohora/OPIK-669_make_containers_start_wh…
thiagohora Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions ...pik-backend/src/test/java/com/comet/opik/api/resources/v1/internal/UsageResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import com.comet.opik.api.resources.utils.TestDropwizardAppExtensionUtils;
import com.comet.opik.api.resources.utils.WireMockUtils;
import com.comet.opik.api.resources.utils.resources.ExperimentResourceClient;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.db.TransactionTemplateAsync;
import com.comet.opik.podam.PodamFactoryUtils;
import com.redis.testcontainers.RedisContainer;
Expand All @@ -27,7 +29,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.testcontainers.clickhouse.ClickHouseContainer;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.lifecycle.Startables;
Expand Down Expand Up @@ -55,35 +57,37 @@
@DisplayName("Usage Resource Test")
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Slf4j
@ExtendWith(DropwizardAppExtensionProvider.class)
class UsageResourceTest {

public static final String USAGE_RESOURCE_URL_TEMPLATE = "%s/v1/internal/usage";
public static final String TRACE_RESOURCE_URL_TEMPLATE = "%s/v1/private/traces";
private static final String EXPERIMENT_RESOURCE_URL_TEMPLATE = "%s/v1/private/experiments";
private static final String DATASET_RESOURCE_URL_TEMPLATE = "%s/v1/private/datasets";

private static final String USER = UUID.randomUUID().toString();
private final String USER = UUID.randomUUID().toString();

private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();

private static final MySQLContainer<?> MYSQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
private final MySQLContainer<?> MYSQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();

private static final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils
private final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils
.newClickHouseContainer();

@RegisterExtension
private static final TestDropwizardAppExtension app;
@RegisterApp
private final TestDropwizardAppExtension APP;

private static final WireMockUtils.WireMockRuntime wireMock;
private final WireMockUtils.WireMockRuntime wireMock;

static {
{
Startables.deepStart(REDIS, MYSQL_CONTAINER, CLICK_HOUSE_CONTAINER).join();

wireMock = WireMockUtils.startWireMock();

var databaseAnalyticsFactory = ClickHouseContainerUtils.newDatabaseAnalyticsFactory(
CLICK_HOUSE_CONTAINER, DATABASE_NAME);

app = TestDropwizardAppExtensionUtils.newTestDropwizardAppExtension(
APP = TestDropwizardAppExtensionUtils.newTestDropwizardAppExtension(
MYSQL_CONTAINER.getJdbcUrl(), databaseAnalyticsFactory, wireMock.runtimeInfo(), REDIS.getRedisURI());
}

Expand Down Expand Up @@ -121,7 +125,7 @@ void tearDownAll() {
wireMock.server().stop();
}

private static void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
private void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
AuthTestUtils.mockTargetWorkspace(wireMock.server(), apiKey, workspaceName, workspaceId, USER);
}

Expand Down
22 changes: 12 additions & 10 deletions ...ackend/src/test/java/com/comet/opik/api/resources/v1/priv/AuthenticationResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import com.comet.opik.api.resources.utils.RedisContainerUtils;
import com.comet.opik.api.resources.utils.TestDropwizardAppExtensionUtils;
import com.comet.opik.api.resources.utils.WireMockUtils;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.DatabaseAnalyticsFactory;
import com.comet.opik.utils.JsonUtils;
import com.github.tomakehurst.wiremock.client.WireMock;
Expand All @@ -24,7 +26,7 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -56,24 +58,24 @@

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@DisplayName("CheckAccess Resource Test")
@ExtendWith(DropwizardAppExtensionProvider.class)
class AuthenticationResourceTest {

public static final String URL_TEMPLATE = "%s/v1/private/auth";

private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private static final ClickHouseContainer CLICKHOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();

private static final String USER = UUID.randomUUID().toString();
private static final String WORKSPACE_ID = UUID.randomUUID().toString();
private static final String UNAUTHORISED_WORKSPACE_NAME = UUID.randomUUID().toString();

@RegisterExtension
private static final TestDropwizardAppExtension APP;
private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final ClickHouseContainer CLICKHOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
private final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
private final WireMockUtils.WireMockRuntime wireMock;

private static final WireMockUtils.WireMockRuntime wireMock;
@RegisterApp
private final TestDropwizardAppExtension APP;

static {
{
Startables.deepStart(REDIS, CLICKHOUSE_CONTAINER, MYSQL).join();

wireMock = WireMockUtils.startWireMock();
Expand Down Expand Up @@ -104,7 +106,7 @@ void setUpAll(ClientSupport client, Jdbi jdbi) throws SQLException {
ClientSupportUtils.config(client);
}

private static void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
private void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
AuthTestUtils.mockTargetWorkspace(wireMock.server(), apiKey, workspaceName, workspaceId, USER);
}

Expand Down
24 changes: 12 additions & 12 deletions .../com/comet/opik/api/resources/v1/priv/AutomationRuleEvaluatorsResourceDeprecatedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
import com.comet.opik.api.resources.utils.resources.ProjectResourceClient;
import com.comet.opik.api.resources.utils.resources.TraceResourceClient;
import com.comet.opik.domain.llm.LlmProviderFactory;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.llm.LlmModule;
import com.comet.opik.podam.PodamFactoryUtils;
import com.comet.opik.utils.JsonUtils;
Expand All @@ -43,7 +45,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -87,6 +89,7 @@

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@DisplayName("Automation Rule Evaluators Resource Test Deprecated")
@ExtendWith(DropwizardAppExtensionProvider.class)
class AutomationRuleEvaluatorsResourceDeprecatedTest {

private static final String URL_TEMPLATE = "%s/v1/private/automations/projects/%s/evaluators/";
Expand Down Expand Up @@ -143,18 +146,15 @@ class AutomationRuleEvaluatorsResourceDeprecatedTest {
private static final String WORKSPACE_ID = UUID.randomUUID().toString();
private static final String WORKSPACE_NAME = "workspace-" + UUID.randomUUID();

private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
private final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
private final WireMockUtils.WireMockRuntime wireMock;

private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
@RegisterApp
private final TestDropwizardAppExtension APP;

private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();

@RegisterExtension
private static TestDropwizardAppExtension APP;

private static final WireMockUtils.WireMockRuntime wireMock;

static {
{
Startables.deepStart(REDIS, MYSQL, CLICKHOUSE).join();

wireMock = WireMockUtils.startWireMock();
Expand Down Expand Up @@ -205,7 +205,7 @@ void setUpAll(ClientSupport client, Jdbi jdbi) {
this.projectResourceClient = new ProjectResourceClient(this.client, baseURI, factory);
}

private static void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
private void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
AuthTestUtils.mockTargetWorkspace(wireMock.server(), apiKey, workspaceName, workspaceId, USER);
}

Expand Down
20 changes: 11 additions & 9 deletions .../test/java/com/comet/opik/api/resources/v1/priv/AutomationRuleEvaluatorsResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import com.comet.opik.api.resources.utils.resources.ProjectResourceClient;
import com.comet.opik.api.resources.utils.resources.TraceResourceClient;
import com.comet.opik.domain.llm.LlmProviderFactory;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.llm.LlmModule;
import com.comet.opik.podam.PodamFactoryUtils;
import com.comet.opik.utils.JsonUtils;
Expand Down Expand Up @@ -49,7 +51,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -96,6 +98,7 @@

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@DisplayName("Automation Rule Evaluators Resource Test")
@ExtendWith(DropwizardAppExtensionProvider.class)
class AutomationRuleEvaluatorsResourceTest {

private static final String URL_TEMPLATE = "%s/v1/private/automations/evaluators/";
Expand Down Expand Up @@ -160,16 +163,15 @@ class AutomationRuleEvaluatorsResourceTest {

private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();

private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
private final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
private final WireMockUtils.WireMockRuntime wireMock;

@RegisterExtension
private static final TestDropwizardAppExtension APP;
@RegisterApp
private final TestDropwizardAppExtension APP;

private static final WireMockUtils.WireMockRuntime wireMock;

static {
{
Startables.deepStart(REDIS, MYSQL, CLICKHOUSE).join();

wireMock = WireMockUtils.startWireMock();
Expand Down
21 changes: 12 additions & 9 deletions ...ckend/src/test/java/com/comet/opik/api/resources/v1/priv/ChatCompletionsResourceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.comet.opik.api.resources.utils.resources.ChatCompletionsClient;
import com.comet.opik.api.resources.utils.resources.LlmProviderApiKeyResourceClient;
import com.comet.opik.domain.llm.LlmProviderFactory;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.llm.antropic.AnthropicModelName;
import com.comet.opik.infrastructure.llm.gemini.GeminiModelName;
import com.comet.opik.infrastructure.llm.openai.OpenaiModelName;
Expand All @@ -27,7 +29,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
Expand Down Expand Up @@ -62,23 +64,24 @@
/// - **OpenRouter**: set `OPENROUTER_API_KEY` to your OpenRouter api key
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
// Disabled because the tests require an API key to run and this seems to be failing in the CI pipeline
@ExtendWith(DropwizardAppExtensionProvider.class)
class ChatCompletionsResourceTest {

private static final String API_KEY = RandomStringUtils.randomAlphanumeric(25);
private static final String WORKSPACE_ID = UUID.randomUUID().toString();
private static final String WORKSPACE_NAME = RandomStringUtils.randomAlphanumeric(20);
private static final String USER = RandomStringUtils.randomAlphanumeric(20);

private static final RedisContainer REDIS_CONTAINER = RedisContainerUtils.newRedisContainer();
private static final MySQLContainer<?> MY_SQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
private static final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();
private final RedisContainer REDIS_CONTAINER = RedisContainerUtils.newRedisContainer();
private final MySQLContainer<?> MY_SQL_CONTAINER = MySQLContainerUtils.newMySQLContainer();
private final ClickHouseContainer CLICK_HOUSE_CONTAINER = ClickHouseContainerUtils.newClickHouseContainer();

private static final WireMockUtils.WireMockRuntime WIRE_MOCK = WireMockUtils.startWireMock();
private final WireMockUtils.WireMockRuntime WIRE_MOCK = WireMockUtils.startWireMock();

@RegisterExtension
private static final TestDropwizardAppExtension APP;
@RegisterApp
private final TestDropwizardAppExtension APP;

static {
{
Startables.deepStart(REDIS_CONTAINER, MY_SQL_CONTAINER, CLICK_HOUSE_CONTAINER).join();

var databaseAnalyticsFactory = ClickHouseContainerUtils.newDatabaseAnalyticsFactory(
Expand Down Expand Up @@ -115,7 +118,7 @@ void setUpAll(ClientSupport clientSupport, Jdbi jdbi) throws SQLException {
this.llmProviderApiKeyResourceClient = new LlmProviderApiKeyResourceClient(clientSupport);
}

private static void mockTargetWorkspace(String workspaceName, String workspaceId) {
private void mockTargetWorkspace(String workspaceName, String workspaceId) {
AuthTestUtils.mockTargetWorkspace(WIRE_MOCK.server(), API_KEY, workspaceName, workspaceId, USER);
}

Expand Down
24 changes: 12 additions & 12 deletions ...-backend/src/test/java/com/comet/opik/api/resources/v1/priv/DatasetExperimentE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import com.comet.opik.api.resources.utils.TestUtils;
import com.comet.opik.api.resources.utils.WireMockUtils;
import com.comet.opik.api.resources.utils.resources.ExperimentResourceClient;
import com.comet.opik.extensions.DropwizardAppExtensionProvider;
import com.comet.opik.extensions.RegisterApp;
import com.comet.opik.infrastructure.DatabaseAnalyticsFactory;
import com.comet.opik.podam.PodamFactoryUtils;
import com.redis.testcontainers.RedisContainer;
Expand All @@ -27,7 +29,7 @@
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.api.extension.ExtendWith;
import org.testcontainers.clickhouse.ClickHouseContainer;
import org.testcontainers.containers.MySQLContainer;
import org.testcontainers.lifecycle.Startables;
Expand All @@ -49,23 +51,21 @@

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@DisplayName("Dataset Experiments E2E Test")
@ExtendWith(DropwizardAppExtensionProvider.class)
class DatasetExperimentE2ETest {

private static final String BASE_RESOURCE_URI = "%s/v1/private/datasets";
private static final String EXPERIMENT_RESOURCE_URI = "%s/v1/private/experiments";

private static final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final RedisContainer REDIS = RedisContainerUtils.newRedisContainer();
private final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
private final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();
private final WireMockUtils.WireMockRuntime wireMock;

private static final MySQLContainer<?> MYSQL = MySQLContainerUtils.newMySQLContainer();
@RegisterApp
private final TestDropwizardAppExtension app;

private static final ClickHouseContainer CLICKHOUSE = ClickHouseContainerUtils.newClickHouseContainer();

@RegisterExtension
private static final TestDropwizardAppExtension app;

private static final WireMockUtils.WireMockRuntime wireMock;

static {
{
Startables.deepStart(MYSQL, CLICKHOUSE, REDIS).join();

wireMock = WireMockUtils.startWireMock();
Expand Down Expand Up @@ -106,7 +106,7 @@ void tearDownAll() {
wireMock.server().stop();
}

private static void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
private void mockTargetWorkspace(String apiKey, String workspaceName, String workspaceId) {
AuthTestUtils.mockTargetWorkspace(wireMock.server(), apiKey, workspaceName, workspaceId,
UUID.randomUUID().toString());
}
Expand Down
Loading
Loading