diff --git a/Dockerfile.core b/Dockerfile.core index da5f22d..d8779e4 100644 --- a/Dockerfile.core +++ b/Dockerfile.core @@ -1,5 +1,5 @@ FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/maven:3.8.3-openjdk-17-slim as builder -ARG ARTIFACT_VERSION=2.0.9-RELEASE +ARG ARTIFACT_VERSION=3.0.0-RELEASE RUN mkdir -p /build WORKDIR /build COPY . /build @@ -7,7 +7,7 @@ RUN mvn clean install RUN mvn clean verify -DskipTests -Dartifact.version=${ARTIFACT_VERSION} FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/openjdk:17-slim-bullseye -ARG ARTIFACT_VERSION=2.0.9-RELEASE +ARG ARTIFACT_VERSION=3.0.0-RELEASE RUN mkdir -p /usr/local RUN apt-get update -y && apt-get -y install fontconfig libpng-dev WORKDIR /usr/local/ diff --git a/Dockerfile.proxy b/Dockerfile.proxy index 08608ef..6ea378b 100644 --- a/Dockerfile.proxy +++ b/Dockerfile.proxy @@ -1,5 +1,5 @@ FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/maven:3.8.3-openjdk-17-slim as builder -ARG ARTIFACT_VERSION=2.0.9-RELEASE +ARG ARTIFACT_VERSION=3.0.0-RELEASE RUN mkdir -p /build WORKDIR /build COPY . /build @@ -7,7 +7,7 @@ RUN mvn clean install -DskipTests RUN mvn clean verify -DskipTests -Dartifact.version=${ARTIFACT_VERSION} FROM 193044292705.dkr.ecr.ap-south-1.amazonaws.com/common/openjdk:17-slim-bullseye -ARG ARTIFACT_VERSION=2.0.9-RELEASE +ARG ARTIFACT_VERSION=3.0.0-RELEASE RUN mkdir -p /usr/local RUN apt-get update -y && apt-get -y install fontconfig libpng-dev WORKDIR /usr/local/ diff --git a/litmus-cache/pom.xml b/litmus-cache/pom.xml index 5743322..9dacba8 100644 --- a/litmus-cache/pom.xml +++ b/litmus-cache/pom.xml @@ -4,11 +4,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-cache - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-cache diff --git a/litmus-client/pom.xml b/litmus-client/pom.xml index 9b252f3..3c8caa8 100644 --- a/litmus-client/pom.xml +++ b/litmus-client/pom.xml @@ -5,11 +5,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-client - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-client @@ -43,7 +43,7 @@ com.navi.medici litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE diff --git a/litmus-client/src/main/java/com/navi/medici/litmus/DefaultLitmus.java b/litmus-client/src/main/java/com/navi/medici/litmus/DefaultLitmus.java index 7af8d3d..9190770 100644 --- a/litmus-client/src/main/java/com/navi/medici/litmus/DefaultLitmus.java +++ b/litmus-client/src/main/java/com/navi/medici/litmus/DefaultLitmus.java @@ -27,6 +27,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.BiFunction; import lombok.extern.log4j.Log4j2; @@ -167,7 +168,7 @@ public class DefaultLitmus implements Litmus { .register(this.config.getMeterRegistry()) .increment(); - if (config.isEnableClickStream()) { + if (config.isEnableClickStream() && Objects.requireNonNull(litmusExperiment).isEnableClickStream() ) { this.eventDispatcher.publish(context, litmusExperiment, enabled, null); } diff --git a/litmus-client/src/main/resources/app.properties b/litmus-client/src/main/resources/app.properties index bebafdc..3b06660 100644 --- a/litmus-client/src/main/resources/app.properties +++ b/litmus-client/src/main/resources/app.properties @@ -1 +1 @@ -litmus.client.version=2.0.9-RELEASE \ No newline at end of file +litmus.client.version=3.0.0-RELEASE \ No newline at end of file diff --git a/litmus-core/pom.xml b/litmus-core/pom.xml index 116bd73..63d60b0 100644 --- a/litmus-core/pom.xml +++ b/litmus-core/pom.xml @@ -5,11 +5,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-core - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-core @@ -31,19 +31,19 @@ com.navi.medici litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-db - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-util - 2.0.9-RELEASE + 3.0.0-RELEASE @@ -61,13 +61,13 @@ com.navi.medici litmus-cache - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-util - 2.0.9-RELEASE + 3.0.0-RELEASE diff --git a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java index 5598cef..8540ffb 100644 --- a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java +++ b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java @@ -193,6 +193,7 @@ public class ExperimentServiceImpl implements ExperimentService { .vertical(litmusExperimentRequest.getVertical()) .startTime(litmusExperimentRequest.getStartTime()) .endTime(litmusExperimentRequest.getEndTime()) + .enableClickstream(litmusExperimentRequest.isEnableClickStream()) .build(); diff --git a/litmus-db/pom.xml b/litmus-db/pom.xml index 470ccf3..d23f6cc 100644 --- a/litmus-db/pom.xml +++ b/litmus-db/pom.xml @@ -4,11 +4,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-db - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-db @@ -31,7 +31,7 @@ com.navi.medici litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE com.vladmihalcea diff --git a/litmus-db/src/main/java/com/navi/medici/entity/ExperimentEntity.java b/litmus-db/src/main/java/com/navi/medici/entity/ExperimentEntity.java index c5309ce..7619b01 100644 --- a/litmus-db/src/main/java/com/navi/medici/entity/ExperimentEntity.java +++ b/litmus-db/src/main/java/com/navi/medici/entity/ExperimentEntity.java @@ -66,6 +66,9 @@ public class ExperimentEntity extends BaseEntity { @Column(name = "vertical") String vertical; + @Column(name = "enable_click_stream") + boolean enableClickstream; + String createdBy; String updatedBy; diff --git a/litmus-liquibase/pom.xml b/litmus-liquibase/pom.xml index b4690dc..4bad2dc 100644 --- a/litmus-liquibase/pom.xml +++ b/litmus-liquibase/pom.xml @@ -4,11 +4,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-liquibase - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-liquibase diff --git a/litmus-liquibase/src/main/resources/db/changelog/202311301505-add-is-clickstream-enable-column.sql b/litmus-liquibase/src/main/resources/db/changelog/202311301505-add-is-clickstream-enable-column.sql new file mode 100644 index 0000000..4cdeeec --- /dev/null +++ b/litmus-liquibase/src/main/resources/db/changelog/202311301505-add-is-clickstream-enable-column.sql @@ -0,0 +1,5 @@ +--liquibase formatted sql + +--changeset author:chandresh id:202311301506 +ALTER TABLE experiments +ADD COLUMN enable_click_stream VARCHAR; \ No newline at end of file diff --git a/litmus-mock/pom.xml b/litmus-mock/pom.xml index 864b80d..c8d3075 100644 --- a/litmus-mock/pom.xml +++ b/litmus-mock/pom.xml @@ -4,11 +4,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-mock - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-mock @@ -16,13 +16,13 @@ com.navi.medici litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-client - 2.0.9-RELEASE + 3.0.0-RELEASE diff --git a/litmus-model/pom.xml b/litmus-model/pom.xml index 399e7cb..b2722d9 100644 --- a/litmus-model/pom.xml +++ b/litmus-model/pom.xml @@ -5,11 +5,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-model diff --git a/litmus-model/src/main/java/com/navi/medici/request/v1/LitmusExperiment.java b/litmus-model/src/main/java/com/navi/medici/request/v1/LitmusExperiment.java index a067879..5d06b51 100644 --- a/litmus-model/src/main/java/com/navi/medici/request/v1/LitmusExperiment.java +++ b/litmus-model/src/main/java/com/navi/medici/request/v1/LitmusExperiment.java @@ -56,6 +56,9 @@ public class LitmusExperiment { @JsonProperty("vertical") String vertical; + @JsonProperty("enable_click_stream") + boolean enableClickStream = true; + public boolean isEnabled() { return enabled; } diff --git a/litmus-proxy/pom.xml b/litmus-proxy/pom.xml index 8eb6e65..21aa2c2 100644 --- a/litmus-proxy/pom.xml +++ b/litmus-proxy/pom.xml @@ -4,11 +4,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-proxy - 2.0.9-RELEASE + 3.0.0-RELEASE jar litmus-proxy @@ -17,19 +17,19 @@ com.navi.medici litmus-model - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-client - 2.0.9-RELEASE + 3.0.0-RELEASE com.navi.medici litmus-util - 2.0.9-RELEASE + 3.0.0-RELEASE diff --git a/litmus-util/pom.xml b/litmus-util/pom.xml index b5051cc..3756c82 100644 --- a/litmus-util/pom.xml +++ b/litmus-util/pom.xml @@ -5,11 +5,11 @@ litmus com.navi.medici - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-util - 2.0.9-RELEASE + 3.0.0-RELEASE litmus-util diff --git a/pom.xml b/pom.xml index bda0fc6..b4079ff 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.navi.medici litmus - 2.0.9-RELEASE + 3.0.0-RELEASE pom litmus