From 9d0080db10992e2801c9a3c93d14c93a1798d4e0 Mon Sep 17 00:00:00 2001 From: Danil01042005 Date: Wed, 14 Oct 2026 18:09:06 +0300 Subject: [PATCH 1/5] init commit --- .dockerignore | 1 + .gitattributes | 4 + .gitignore | 131 +++++++-- Dockerfile | 25 ++ build.gradle | 68 +++++ docker-compose.yaml | 93 +++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 47505 bytes gradle/wrapper/gradle-wrapper.properties | 9 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 82 ++++++ settings.gradle | 1 + .../messenger/MessengerLab1Application.java | 16 ++ .../messenger/cache/CacheHealthTracker.java | 19 ++ .../mtusi/messenger/config/OpenApiConfig.java | 20 ++ .../messenger/config/RateLimitConfig.java | 25 ++ .../mtusi/messenger/config/RedisConfig.java | 105 ++++++++ .../messenger/config/SecurityConfig.java | 75 ++++++ .../config/properties/AppProperties.java | 8 + .../properties/RateLimitProperties.java | 6 + .../config/properties/RedisProperties.java | 16 ++ .../config/properties/SessionProperties.java | 10 + .../mtusi/messenger/controller/AuthApi.java | 118 +++++++++ .../messenger/controller/AuthController.java | 28 ++ .../messenger/controller/ChatController.java | 35 +++ .../mtusi/messenger/controller/ChatsApi.java | 215 +++++++++++++++ .../mtusi/messenger/controller/HealthApi.java | 89 +++++++ .../controller/HealthController.java | 24 ++ .../controller/MessageController.java | 30 +++ .../messenger/controller/MessagesApi.java | 136 ++++++++++ .../messenger/controller/UserController.java | 26 ++ .../mtusi/messenger/controller/UsersApi.java | 136 ++++++++++ .../GlobalExceptionHandler.java | 147 +++++++++++ .../java/ru/mtusi/messenger/dto/ChatDTO.java | 149 +++++++++++ .../ru/mtusi/messenger/dto/ChatPageDTO.java | 124 +++++++++ .../mtusi/messenger/dto/CreateMessageDTO.java | 40 +++ .../java/ru/mtusi/messenger/dto/ErrorDTO.java | 87 ++++++ .../ru/mtusi/messenger/dto/ErrorErrorDTO.java | 178 +++++++++++++ .../ru/mtusi/messenger/dto/HealthDTO.java | 120 +++++++++ .../ru/mtusi/messenger/dto/MessageDTO.java | 189 +++++++++++++ .../mtusi/messenger/dto/MessagePageDTO.java | 125 +++++++++ .../ru/mtusi/messenger/dto/SessionDTO.java | 198 ++++++++++++++ .../java/ru/mtusi/messenger/dto/UserDTO.java | 183 +++++++++++++ .../messenger/exception/ApiErrorFactory.java | 74 ++++++ .../exception/ConflictException.java | 5 + .../exception/InvalidRequestException.java | 5 + .../exception/NotFoundException.java | 5 + .../exception/PayloadTooLargeException.java | 5 + .../exception/RateLimitedException.java | 7 + .../ServiceUnavailableException.java | 7 + .../exception/UnauthorizedException.java | 5 + .../messenger/filter/RateLimitFilter.java | 49 ++++ .../messenger/filter/RequestIdFilter.java | 35 +++ .../ru/mtusi/messenger/mapper/ChatMapper.java | 34 +++ .../mtusi/messenger/mapper/MessageMapper.java | 23 ++ .../mtusi/messenger/mapper/SessionMapper.java | 17 ++ .../ru/mtusi/messenger/mapper/UserMapper.java | 20 ++ .../java/ru/mtusi/messenger/model/Chat.java | 53 ++++ .../ru/mtusi/messenger/model/Message.java | 40 +++ .../ru/mtusi/messenger/model/Session.java | 42 +++ .../java/ru/mtusi/messenger/model/User.java | 48 ++++ .../messenger/repository/ChatRepository.java | 39 +++ .../repository/MessageRepository.java | 39 +++ .../repository/SessionRepository.java | 12 + .../messenger/repository/UserRepository.java | 23 ++ .../security/ApiAuthenticationEntryPoint.java | 32 +++ .../messenger/security/BasicCredentials.java | 28 ++ .../security/SessionAuthenticationFilter.java | 45 ++++ .../SessionAuthenticationProvider.java | 33 +++ .../security/SessionAuthenticationToken.java | 34 +++ .../messenger/security/SessionPrincipal.java | 6 + .../mtusi/messenger/service/AuthService.java | 32 +++ .../mtusi/messenger/service/ChatService.java | 129 +++++++++ .../messenger/service/HealthService.java | 31 +++ .../messenger/service/MessageService.java | 111 ++++++++ .../service/SessionCacheService.java | 65 +++++ .../messenger/service/SessionService.java | 81 ++++++ .../mtusi/messenger/service/UserService.java | 83 ++++++ .../ru/mtusi/messenger/util/CursorCodec.java | 37 +++ .../mtusi/messenger/util/TokenGenerator.java | 17 ++ .../ru/mtusi/messenger/util/TokenHasher.java | 37 +++ .../messenger/validation/ChatValidator.java | 66 +++++ src/main/resources/application.yaml | 85 ++++++ src/main/resources/db/migration/V1__init.sql | 79 ++++++ .../MessengerLab1ApplicationTests.java | 13 + 84 files changed, 4943 insertions(+), 27 deletions(-) create mode 100644 .gitattributes create mode 100644 Dockerfile create mode 100644 build.gradle create mode 100644 docker-compose.yaml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/ru/mtusi/messenger/MessengerLab1Application.java create mode 100644 src/main/java/ru/mtusi/messenger/cache/CacheHealthTracker.java create mode 100644 src/main/java/ru/mtusi/messenger/config/OpenApiConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/config/RateLimitConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/config/RedisConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/config/SecurityConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/AppProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/RateLimitProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/RedisProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/SessionProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/AuthApi.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/AuthController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/ChatController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/ChatsApi.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/HealthApi.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/HealthController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/MessageController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/MessagesApi.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/UserController.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/UsersApi.java create mode 100644 src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ChatDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ChatPageDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateMessageDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ErrorDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/ErrorErrorDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/HealthDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/MessageDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/MessagePageDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/SessionDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/UserDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/ApiErrorFactory.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/ConflictException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/NotFoundException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/PayloadTooLargeException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/RateLimitedException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/ServiceUnavailableException.java create mode 100644 src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java create mode 100644 src/main/java/ru/mtusi/messenger/filter/RateLimitFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java create mode 100644 src/main/java/ru/mtusi/messenger/mapper/MessageMapper.java create mode 100644 src/main/java/ru/mtusi/messenger/mapper/SessionMapper.java create mode 100644 src/main/java/ru/mtusi/messenger/mapper/UserMapper.java create mode 100644 src/main/java/ru/mtusi/messenger/model/Chat.java create mode 100644 src/main/java/ru/mtusi/messenger/model/Message.java create mode 100644 src/main/java/ru/mtusi/messenger/model/Session.java create mode 100644 src/main/java/ru/mtusi/messenger/model/User.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/ChatRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/MessageRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/SessionRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/UserRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java create mode 100644 src/main/java/ru/mtusi/messenger/security/BasicCredentials.java create mode 100644 src/main/java/ru/mtusi/messenger/security/SessionAuthenticationFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/security/SessionAuthenticationProvider.java create mode 100644 src/main/java/ru/mtusi/messenger/security/SessionAuthenticationToken.java create mode 100644 src/main/java/ru/mtusi/messenger/security/SessionPrincipal.java create mode 100644 src/main/java/ru/mtusi/messenger/service/AuthService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/ChatService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/HealthService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/MessageService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/SessionCacheService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/SessionService.java create mode 100644 src/main/java/ru/mtusi/messenger/service/UserService.java create mode 100644 src/main/java/ru/mtusi/messenger/util/CursorCodec.java create mode 100644 src/main/java/ru/mtusi/messenger/util/TokenGenerator.java create mode 100644 src/main/java/ru/mtusi/messenger/util/TokenHasher.java create mode 100644 src/main/java/ru/mtusi/messenger/validation/ChatValidator.java create mode 100644 src/main/resources/application.yaml create mode 100644 src/main/resources/db/migration/V1__init.sql create mode 100644 src/test/java/ru/mtusi/messenger/MessengerLab1ApplicationTests.java diff --git a/.dockerignore b/.dockerignore index bc16e556..796eb7ed 100644 --- a/.dockerignore +++ b/.dockerignore @@ -18,3 +18,4 @@ __pycache__ node_modules evidence .DS_Store +!gradle-9.7.1-bin.zip \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfc97d67 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary +scripts/*.sh text eol=lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index b5a71896..ccdf7fea 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,109 @@ -# Local/private state +### Git ### +*.orig +*.BACKUP.* +*.BASE.* +*.LOCAL.* +*.REMOTE.* +*_BACKUP_*.txt +*_BASE_*.txt +*_LOCAL_*.txt +*_REMOTE_*.txt + +### Java ### +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt +.mtj.tmp/ + +# Package files +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# JVM crash logs +hs_err_pid* +replay_pid* + +### Gradle ### +.gradle/ +build/ +!gradle/wrapper/gradle-wrapper.jar + +### Maven ### +target/ +!.mvn/wrapper/maven-wrapper.jar +dependency-reduced-pom.xml + +### IntelliJ IDEA ### +.idea/ +*.iws +*.iml +*.ipr + +### Eclipse / STS ### +.apt_generated +.classpath +.factorypath +.project +.settings/ +.springBeans +.sts4-cache + +### VS Code ### +.vscode/ + +### Windows ### +Thumbs.db +ehthumbs.db +ehthumbs_vista.db +[Dd]esktop.ini +$RECYCLE.BIN/ +*.cab +*.msi +*.msix +*.msm +*.msp +*.lnk + +### macOS ### +.DS_Store +.AppleDouble +.LSOverride + +### Miscellaneous ### +*.sw? +.#* +*# +*~ +bin/ +/scratch +*.sublime-* + +### Environment / Secrets ### .env .env.* !.env.example secrets/ -certs/private/ -*.key -*.p12 -*.pfx -*.jks -*.pem -*.tfstate* -volumes/ -data/ -backups/ -# Runtime/build artifacts -.venv/ +secrets/*.txt +!secrets/.gitkeep + +### Python / venv ### __pycache__/ -*.py[cod] -node_modules/ -dist/ -build/ -target/ -bin/ -obj/ -coverage/ -*.log -.DS_Store -.idea/ -.vscode/ -# Keep small, sanitized evidence summaries in evidence/ under version control. -# Inspect git diff --cached: ignore rules are not a secret scanner. +*.pyc +.venv/ +.venv +venv/ + +### Lab evidence ### +evidence/**/*.dump +evidence/**/*.sql.gz +evidence/**/raw/ +evidence/**/*.raw \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..20085dbd --- /dev/null +++ b/Dockerfile @@ -0,0 +1,25 @@ +FROM eclipse-temurin:21-jdk-jammy AS builder +WORKDIR /build +RUN apt-get update && apt-get install -y --no-install-recommends unzip \ + && rm -rf /var/lib/apt/lists/* +COPY gradle gradle +COPY gradlew settings.gradle build.gradle ./ +COPY gradle-9.7.1-bin.zip /tmp/gradle.zip +RUN unzip -q /tmp/gradle.zip -d /opt && rm /tmp/gradle.zip +ENV PATH="/opt/gradle-9.7.1/bin:$PATH" +RUN gradle dependencies --no-daemon +COPY contracts contracts +COPY src src +RUN gradle bootJar -x test --no-daemon + +FROM eclipse-temurin:21-jre-jammy AS runner +WORKDIR /app +RUN groupadd --system spring && useradd --system --gid spring --no-create-home spring +COPY --from=builder /build/build/libs/*.jar app.jar +RUN chown spring:spring app.jar +USER spring +EXPOSE 8080 +HEALTHCHECK --interval=10s --timeout=3s --start-period=20s --retries=3 \ + CMD wget -qO- http://127.0.0.1:8080/actuator/health/readiness | grep -q UP || exit 1 +ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 -Xss512k" +ENTRYPOINT ["sh", "-c", "exec java -Dfile.encoding=UTF-8 $JAVA_OPTS -jar app.jar"] \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..e28f457d --- /dev/null +++ b/build.gradle @@ -0,0 +1,68 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '4.1.1' + id 'io.spring.dependency-management' version '1.1.7'} + +group = 'ru.mtusi' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-actuator' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-webmvc' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.1.0' + implementation 'com.bucket4j:bucket4j-core:8.10.1' + implementation 'org.mapstruct:mapstruct:1.6.3' + // Source: https://mvnrepository.com/artifact/org.postgresql/postgresql + implementation 'org.postgresql:postgresql:42.7.13' + implementation 'org.springframework.boot:spring-boot-starter-flyway' + runtimeOnly 'org.flywaydb:flyway-database-postgresql' + // Source: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-jpa + implementation 'org.springframework.boot:spring-boot-starter-data-jpa:4.1.1' + // Source: https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis:4.1.1' + implementation 'org.springframework.security:spring-security-crypto' + implementation 'org.bouncycastle:bcprov-jdk18on:1.78.1' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' + implementation 'org.springframework.boot:spring-boot-starter-cache' + implementation 'org.springframework.boot:spring-boot-starter-aspectj' + + runtimeOnly 'io.netty:netty-transport-native-epoll::linux-x86_64' + + testImplementation 'org.springframework.boot:spring-boot-starter-test:4.1.1' + + testImplementation 'org.springframework.boot:spring-boot-starter-restclient-test' + testImplementation 'org.springframework.boot:spring-boot-resttestclient' + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3' + annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0' + annotationProcessor 'org.projectlombok:lombok' + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-actuator-test' + testImplementation 'org.springframework.boot:spring-boot-starter-validation-test' + testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.withType(JavaCompile).configureEach { + options.compilerArgs << '-parameters' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 00000000..9c25cc21 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,93 @@ +services: + db: + image: postgres:16-alpine + container_name: messenger-db + restart: unless-stopped + environment: + POSTGRES_DB_FILE: /run/secrets/postgres_db + POSTGRES_USER_FILE: /run/secrets/postgres_user + POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password + volumes: + - pgdata:/var/lib/postgresql/data + secrets: + - postgres_db + - postgres_user + - postgres_password + networks: + - messenger-net + healthcheck: + test: ["CMD-SHELL", "pg_isready -U $$(cat /run/secrets/postgres_user) -d $$(cat /run/secrets/postgres_db)"] + interval: 5s + timeout: 5s + retries: 10 + start_period: 10s + + redis: + image: redis:7.4-alpine + container_name: messenger-redis + restart: unless-stopped + command: > + redis-server + --appendonly yes + --appendfsync everysec + --save "" + volumes: + - redisdata:/data + networks: + - messenger-net + healthcheck: + test: ["CMD", "redis-cli", "ping"] + interval: 5s + timeout: 3s + retries: 10 + start_period: 5s + + api: + build: + context: . + dockerfile: Dockerfile + container_name: messenger-api + restart: unless-stopped + depends_on: + db: + condition: service_healthy + redis: + condition: service_healthy + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/messenger + SPRING_DATASOURCE_USERNAME_FILE: /run/secrets/postgres_user + SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgres_password + SPRING_PROFILES_ACTIVE: ${APP_ENV:-lab} + SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-400} + SESSION_STORE: ${SESSION_STORE:-postgres} + SPRING_DATA_REDIS_HOST: redis + SPRING_DATA_REDIS_PORT: 6379 + ports: + - "127.0.0.1:8080:8080" + secrets: + - postgres_user + - postgres_password + networks: + - messenger-net + healthcheck: + test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/health/ready | grep -q '\"status\":\"ok\"'"] + interval: 5s + timeout: 3s + retries: 20 + start_period: 40s + +volumes: + pgdata: + redisdata: + +networks: + messenger-net: + driver: bridge + +secrets: + postgres_db: + file: ./secrets/postgres_db.txt + postgres_user: + file: ./secrets/postgres_user.txt + postgres_password: + file: ./secrets/postgres_password.txt \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 GIT binary patch literal 47505 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..a51ec4f5 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..650573b3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'messenger-lab1' diff --git a/src/main/java/ru/mtusi/messenger/MessengerLab1Application.java b/src/main/java/ru/mtusi/messenger/MessengerLab1Application.java new file mode 100644 index 00000000..54938665 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/MessengerLab1Application.java @@ -0,0 +1,16 @@ +package ru.mtusi.messenger; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.boot.security.autoconfigure.UserDetailsServiceAutoConfiguration; + +@ConfigurationPropertiesScan +@SpringBootApplication(exclude = UserDetailsServiceAutoConfiguration.class) +public class MessengerLab1Application { + + public static void main(String[] args) { + SpringApplication.run(MessengerLab1Application.class, args); + } + +} diff --git a/src/main/java/ru/mtusi/messenger/cache/CacheHealthTracker.java b/src/main/java/ru/mtusi/messenger/cache/CacheHealthTracker.java new file mode 100644 index 00000000..c3c1d66a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/cache/CacheHealthTracker.java @@ -0,0 +1,19 @@ +package ru.mtusi.messenger.cache; + +import org.springframework.stereotype.Component; + +import java.util.concurrent.atomic.AtomicBoolean; + +@Component +public class CacheHealthTracker { + + private final AtomicBoolean stale = new AtomicBoolean(false); + + public void markStale() { + stale.set(true); + } + + public boolean consumeStale() { + return stale.getAndSet(false); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/OpenApiConfig.java b/src/main/java/ru/mtusi/messenger/config/OpenApiConfig.java new file mode 100644 index 00000000..06edae6a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/OpenApiConfig.java @@ -0,0 +1,20 @@ +package ru.mtusi.messenger.config; + +import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; +import io.swagger.v3.oas.annotations.security.SecurityScheme; +import org.springframework.context.annotation.Configuration; + +@Configuration +@SecurityScheme( + name = "basicAuth", + type = SecuritySchemeType.HTTP, + scheme = "basic" +) +@SecurityScheme( + name = "bearerAuth", + type = SecuritySchemeType.HTTP, + scheme = "bearer", + bearerFormat = "opaque session token" +) +public class OpenApiConfig { +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/RateLimitConfig.java b/src/main/java/ru/mtusi/messenger/config/RateLimitConfig.java new file mode 100644 index 00000000..3a609576 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/RateLimitConfig.java @@ -0,0 +1,25 @@ +package ru.mtusi.messenger.config; + +import io.github.bucket4j.Bandwidth; +import io.github.bucket4j.Bucket; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import ru.mtusi.messenger.config.properties.RateLimitProperties; + +import java.time.Duration; + +@Configuration +@RequiredArgsConstructor +public class RateLimitConfig { + private final RateLimitProperties props; + + @Bean + public Bucket rateLimitBucket() { + Bandwidth limit = Bandwidth.builder() + .capacity(props.ratePerMinute()) + .refillGreedy(props.ratePerMinute(), Duration.ofMinutes(1)) + .build(); + return Bucket.builder().addLimit(limit).build(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/RedisConfig.java b/src/main/java/ru/mtusi/messenger/config/RedisConfig.java new file mode 100644 index 00000000..badf523a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/RedisConfig.java @@ -0,0 +1,105 @@ +package ru.mtusi.messenger.config; + +import io.lettuce.core.ClientOptions; +import io.lettuce.core.SocketOptions; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cache.Cache; +import org.springframework.cache.annotation.CachingConfigurer; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.interceptor.CacheErrorHandler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.cache.RedisCacheConfiguration; +import org.springframework.data.redis.cache.RedisCacheManager; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.serializer.JacksonJsonRedisSerializer; +import org.springframework.data.redis.serializer.RedisSerializationContext; +import ru.mtusi.messenger.cache.CacheHealthTracker; +import ru.mtusi.messenger.config.properties.RedisProperties; +import ru.mtusi.messenger.config.properties.SessionProperties; +import ru.mtusi.messenger.service.SessionService; + +@Slf4j +@Configuration +@EnableCaching +@EnableConfigurationProperties(RedisProperties.class) +@RequiredArgsConstructor +public class RedisConfig implements CachingConfigurer { + private final SessionProperties sessionProperties; + private final RedisProperties redisProperties; + private final CacheHealthTracker cacheHealthTracker; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration server = + new RedisStandaloneConfiguration(redisProperties.host(), redisProperties.port()); + + SocketOptions socketOptions = SocketOptions.builder() + .connectTimeout(redisProperties.connectTimeout()) + .keepAlive(SocketOptions.KeepAliveOptions.builder() + .enable() + .idle(redisProperties.keepAliveIdle()) + .interval(redisProperties.keepAliveInterval()) + .count(3) + .build()) + .tcpUserTimeout(SocketOptions.TcpUserTimeoutOptions.builder() + .tcpUserTimeout(redisProperties.tcpUserTimeout()) + .enable() + .build()) + .build(); + + ClientOptions clientOptions = ClientOptions.builder() + .socketOptions(socketOptions) + .autoReconnect(true) + .build(); + + LettuceClientConfiguration client = LettuceClientConfiguration.builder() + .commandTimeout(redisProperties.commandTimeout()) + .shutdownTimeout(redisProperties.shutdownTimeout()) + .clientOptions(clientOptions) + .build(); + + return new LettuceConnectionFactory(server, client); + } + + @Bean + public RedisCacheManager cacheManager(RedisConnectionFactory cf) { + RedisCacheConfiguration cfg = RedisCacheConfiguration.defaultCacheConfig() + .entryTtl(sessionProperties.ttl()) + .disableCachingNullValues() + .serializeValuesWith(RedisSerializationContext.SerializationPair + .fromSerializer(new JacksonJsonRedisSerializer<>(SessionService.SessionRecord.class))); + return RedisCacheManager.builder(cf).cacheDefaults(cfg).build(); + } + + @Override + public CacheErrorHandler errorHandler() { + return new CacheErrorHandler() { + @Override + public void handleCacheGetError(RuntimeException e, Cache cache, Object key) { + cacheHealthTracker.markStale(); + log.warn("Cache GET failed ({}): {}", cache.getName(), e.getMessage()); + } + @Override + public void handleCachePutError(RuntimeException e, Cache cache, Object key, Object value) { + cacheHealthTracker.markStale(); + log.warn("Cache PUT failed ({}): {}", cache.getName(), e.getMessage()); + } + @Override + public void handleCacheEvictError(RuntimeException e, Cache cache, Object key) { + cacheHealthTracker.markStale(); + log.warn("Cache EVICT failed ({}): {}", cache.getName(), e.getMessage()); + } + @Override + public void handleCacheClearError(RuntimeException e, Cache cache) { + cacheHealthTracker.markStale(); + log.warn("Cache CLEAR failed ({}): {}", cache.getName(), e.getMessage()); + } + }; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java b/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java new file mode 100644 index 00000000..a2233e0c --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/SecurityConfig.java @@ -0,0 +1,75 @@ +package ru.mtusi.messenger.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.ProviderManager; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.argon2.Argon2PasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import ru.mtusi.messenger.security.ApiAuthenticationEntryPoint; +import ru.mtusi.messenger.security.SessionAuthenticationFilter; +import ru.mtusi.messenger.security.SessionAuthenticationProvider; +import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; +import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + private final SessionAuthenticationProvider sessionAuthenticationProvider; + private final ApiAuthenticationEntryPoint entryPoint; + + @Bean + public PasswordEncoder passwordEncoder() { + return Argon2PasswordEncoder.defaultsForSpringSecurity_v5_8(); + } + + @Bean + public AuthenticationManager authenticationManager() { + return new ProviderManager(sessionAuthenticationProvider); + } + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http, + AuthenticationManager authenticationManager, + BearerTokenResolver bearerTokenResolver) throws Exception { + SessionAuthenticationFilter sessionFilter = + new SessionAuthenticationFilter(bearerTokenResolver, authenticationManager); + + http + .csrf(AbstractHttpConfigurer::disable) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .logout(AbstractHttpConfigurer::disable) + .sessionManagement(sm -> sm.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests(auth -> auth + .requestMatchers("/health/**").permitAll() + .requestMatchers( + "/swagger-ui.html", + "/swagger-ui/**", + "/v3/api-docs", + "/v3/api-docs/**" + ).permitAll() + .requestMatchers(HttpMethod.POST, "/api/v1/users").permitAll() + .requestMatchers(HttpMethod.POST, "/api/v1/auth/sessions").permitAll() + .requestMatchers("/actuator/health", "/actuator/health/**").permitAll() + .anyRequest().authenticated()) + .addFilterBefore(sessionFilter, UsernamePasswordAuthenticationFilter.class) + .exceptionHandling(eh -> eh.authenticationEntryPoint(entryPoint)); + + return http.build(); + } + + @Bean + public BearerTokenResolver bearerTokenResolver() { + return new DefaultBearerTokenResolver(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/AppProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/AppProperties.java new file mode 100644 index 00000000..127495e6 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/AppProperties.java @@ -0,0 +1,8 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "app.limits") +public record AppProperties( + int maxMessagesPerChat +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/RateLimitProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/RateLimitProperties.java new file mode 100644 index 00000000..39d4646d --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/RateLimitProperties.java @@ -0,0 +1,6 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "app.rate") +public record RateLimitProperties(int ratePerMinute, int retryAfterSeconds) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/RedisProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/RedisProperties.java new file mode 100644 index 00000000..994ae257 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/RedisProperties.java @@ -0,0 +1,16 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; +import java.time.Duration; + +@ConfigurationProperties(prefix = "app.redis") +public record RedisProperties( + String host, + int port, + Duration commandTimeout, + Duration connectTimeout, + Duration shutdownTimeout, + Duration keepAliveIdle, + Duration keepAliveInterval, + Duration tcpUserTimeout +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/SessionProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/SessionProperties.java new file mode 100644 index 00000000..6ff06f2f --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/SessionProperties.java @@ -0,0 +1,10 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.time.Duration; + +@ConfigurationProperties(prefix = "app.session") +public record SessionProperties( + Duration ttl +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthApi.java b/src/main/java/ru/mtusi/messenger/controller/AuthApi.java new file mode 100644 index 00000000..9d0626bf --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/AuthApi.java @@ -0,0 +1,118 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.10.0). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package ru.mtusi.messenger.controller; + +import ru.mtusi.messenger.dto.SessionDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +@Validated +@Tag(name = "Auth", description = "Аутентификация: вход по Basic и выдача/отзыв сессионного Bearer-токена.") +@RequestMapping("${openapi.mTUSIMessenger2.base-path:}") +public interface AuthApi { + + /** + * POST /api/v1/auth/sessions : Вход: Basic username:password; выдаёт сессию + * + * @return Успех (status code 201) + * or Неверный запрос (status code 400) + * or Нет действительной аутентификации (status code 401) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "createSession", + summary = "Вход: Basic username:password; выдаёт сессию", + tags = { "Auth" }, + responses = { + @ApiResponse(responseCode = "201", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = SessionDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }) + }, + security = { + @SecurityRequirement(name = "basicAuth") + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = "/api/v1/auth/sessions", + produces = { "application/json" } + ) + + ResponseEntity createSession( + + ); + + + /** + * DELETE /api/v1/auth/sessions/current : Отозвать текущую сессию + * + * @return Успех (status code 204) + * or Нет действительной аутентификации (status code 401) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "revokeSession", + summary = "Отозвать текущую сессию", + tags = { "Auth" }, + responses = { + @ApiResponse(responseCode = "204", description = "Успех"), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.DELETE, + value = "/api/v1/auth/sessions/current", + produces = { "application/json" } + ) + + ResponseEntity revokeSession( + + ); + +} diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthController.java b/src/main/java/ru/mtusi/messenger/controller/AuthController.java new file mode 100644 index 00000000..5cb66068 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/AuthController.java @@ -0,0 +1,28 @@ +package ru.mtusi.messenger.controller; + +import jakarta.servlet.http.HttpServletRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.SessionDTO; +import ru.mtusi.messenger.service.AuthService; + +@RestController +@RequiredArgsConstructor +public class AuthController implements AuthApi { + private final AuthService authService; + private final HttpServletRequest request; + + @Override + public ResponseEntity createSession() { + return ResponseEntity.status(HttpStatus.CREATED).body(authService.login(request.getHeader(HttpHeaders.AUTHORIZATION))); + } + + @Override + public ResponseEntity revokeSession() { + authService.logout(); + return ResponseEntity.noContent().build(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/ChatController.java b/src/main/java/ru/mtusi/messenger/controller/ChatController.java new file mode 100644 index 00000000..5eb47727 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/ChatController.java @@ -0,0 +1,35 @@ +package ru.mtusi.messenger.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.security.SessionPrincipal; +import ru.mtusi.messenger.service.ChatService; + +import java.util.UUID; + +@RestController +@RequiredArgsConstructor +public class ChatController implements ChatsApi { + private final ChatService chatService; + + @Override + public ResponseEntity createChat(ChatDTO chatDTO, @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.status(HttpStatus.CREATED) + .body(chatService.createChat(principal.userId(), chatDTO)); + } + + @Override + public ResponseEntity getChat(UUID chatId , @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.ok(chatService.getChatDTO(principal.userId(), chatId)); + } + + @Override + public ResponseEntity listChats(Integer limit, String cursor , @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.ok(chatService.listChats(principal.userId(), limit, cursor)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java b/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java new file mode 100644 index 00000000..c5b11eaf --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java @@ -0,0 +1,215 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.10.0). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package ru.mtusi.messenger.controller; + +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.dto.ErrorDTO; +import java.util.UUID; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.annotation.Generated; +import ru.mtusi.messenger.security.SessionPrincipal; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +@Validated +@Tag(name = "Chats", description = "Управление чатами и доступ к чатам текущего пользователя.") +@RequestMapping("${openapi.mTUSIMessenger2.base-path:}") +public interface ChatsApi { + + /** + * POST /api/v1/chats : Создать чат; вызывающий должен входить в member_ids + * + * @param chatDTO (required) + * @return Успех (status code 201) + * or Неверный запрос (status code 400) + * or Нет действительной аутентификации (status code 401) + * or Объект отсутствует или недоступен (status code 404) + * or Конфликт (status code 409) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "createChat", + summary = "Создать чат; вызывающий должен входить в member_ids", + tags = { "Chats" }, + responses = { + @ApiResponse(responseCode = "201", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ChatDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = "/api/v1/chats", + produces = { "application/json" }, + consumes = { "application/json" } + ) + + ResponseEntity createChat( + @Parameter(name = "CreateChatDTO", description = "", required = true) @Valid @RequestBody ChatDTO chatDTO, @AuthenticationPrincipal SessionPrincipal principal + ); + + + /** + * GET /api/v1/chats/{chat_id} : Получить доступный чат + * + * @param chatId (required) + * @return Успех (status code 200) + * or Неверный запрос (status code 400) + * or Нет действительной аутентификации (status code 401) + * or Объект отсутствует или недоступен (status code 404) + * or Конфликт (status code 409) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "getChatDTO", + summary = "Получить доступный чат", + tags = { "Chats" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ChatDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/api/v1/chats/{chat_id}", + produces = { "application/json" } + ) + + ResponseEntity getChat( + @Parameter(name = "chat_id", description = "", required = true, in = ParameterIn.PATH) @PathVariable("chat_id") UUID chatId, + @AuthenticationPrincipal SessionPrincipal principal + ); + + + /** + * GET /api/v1/chats : Чаты текущего пользователя + * + * @param limit (optional, default to 50) + * @param cursor (optional) + * @return Успех (status code 200) + * or Неверный запрос (status code 400) + * or Нет действительной аутентификации (status code 401) + * or Объект отсутствует или недоступен (status code 404) + * or Конфликт (status code 409) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "listChats", + summary = "Чаты текущего пользователя", + tags = { "Chats" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ChatPageDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/api/v1/chats", + produces = { "application/json" } + ) + + ResponseEntity listChats( + @Min(1) @Max(100) @Parameter(name = "limit", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, + @Size(min = 1) @Parameter(name = "cursor", description = "", in = ParameterIn.QUERY) @Valid @RequestParam(value = "cursor", required = false) String cursor, + @AuthenticationPrincipal SessionPrincipal principal + ); + +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/HealthApi.java b/src/main/java/ru/mtusi/messenger/controller/HealthApi.java new file mode 100644 index 00000000..3c4f69f5 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/HealthApi.java @@ -0,0 +1,89 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.10.0). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package ru.mtusi.messenger.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import jakarta.annotation.Generated; +import ru.mtusi.messenger.dto.HealthDTO; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +@Validated +@Tag(name = "Health", description = "Проверки живости и готовности процесса. Публичные, без аутентификации.") +@RequestMapping("${openapi.mTUSIMessenger2.base-path:}") +public interface HealthApi { + + /** + * GET /health/live : Процесс жив + * + * @return Успех (status code 200) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "liveness", + summary = "Процесс жив", + tags = { "Health" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = HealthDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/health/live", + produces = { "application/json" } + ) + + ResponseEntity liveness( + + ); + + + /** + * GET /health/ready : Готов принимать трафик + * + * @return Успех (status code 200) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "readiness", + summary = "Готов принимать трафик", + tags = { "Health" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = HealthDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = Error.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/health/ready", + produces = { "application/json" } + ) + + ResponseEntity readiness( + + ); + +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/HealthController.java b/src/main/java/ru/mtusi/messenger/controller/HealthController.java new file mode 100644 index 00000000..d5b8bb7c --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/HealthController.java @@ -0,0 +1,24 @@ +package ru.mtusi.messenger.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.HealthDTO; +import ru.mtusi.messenger.service.HealthService; + +@RestController +@RequiredArgsConstructor +public class HealthController implements HealthApi { + + private final HealthService healthService; + + @Override + public ResponseEntity liveness() { + return ResponseEntity.ok(healthService.liveness()); + } + + @Override + public ResponseEntity readiness() { + return ResponseEntity.ok(healthService.readiness()); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/MessageController.java b/src/main/java/ru/mtusi/messenger/controller/MessageController.java new file mode 100644 index 00000000..11fc588d --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/MessageController.java @@ -0,0 +1,30 @@ +package ru.mtusi.messenger.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.CreateMessageDTO; +import ru.mtusi.messenger.dto.MessageDTO; +import ru.mtusi.messenger.dto.MessagePageDTO; +import ru.mtusi.messenger.security.SessionPrincipal; +import ru.mtusi.messenger.service.MessageService; + +import java.util.UUID; + +@RestController +@RequiredArgsConstructor +public class MessageController implements MessagesApi { + private final MessageService messageService; + + @Override + public ResponseEntity createMessage(UUID chatId, CreateMessageDTO createMessageDTO, @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.status(HttpStatus.CREATED).body(messageService.createMessage(principal.userId(), chatId, createMessageDTO)); + } + + @Override + public ResponseEntity listMessages(UUID chatId, Integer limit, String cursor, @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.ok(messageService.listMessages(principal.userId(), chatId, limit, cursor)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java b/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java new file mode 100644 index 00000000..2d59677c --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java @@ -0,0 +1,136 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.10.0). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package ru.mtusi.messenger.controller; + +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import ru.mtusi.messenger.dto.CreateMessageDTO; +import ru.mtusi.messenger.dto.MessageDTO; +import ru.mtusi.messenger.dto.ErrorDTO; +import ru.mtusi.messenger.dto.MessagePageDTO; +import ru.mtusi.messenger.security.SessionPrincipal; +import java.util.UUID; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import jakarta.annotation.Generated; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +@Validated +@Tag(name = "Messages", description = "Отправка и чтение сообщений внутри доступного чата.") +@RequestMapping("${openapi.mTUSIMessenger2.base-path:}") +public interface MessagesApi { + + @Operation( + operationId = "createMessage", + summary = "Отправить сообщение", + tags = { "Messages" }, + responses = { + @ApiResponse(responseCode = "201", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = MessageDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = "/api/v1/chats/{chat_id}/messages", + produces = { "application/json" }, + consumes = { "application/json" } + ) + ResponseEntity createMessage( + @Parameter(name = "chat_id", description = "", required = true, in = ParameterIn.PATH) + @PathVariable("chat_id") UUID chatId, + @Parameter(name = "CreateMessageDTO", description = "", required = true) + @Valid @RequestBody CreateMessageDTO createMessageDTO, + @AuthenticationPrincipal SessionPrincipal principal + ); + + @Operation( + operationId = "listMessages", + summary = "Сообщения по (created_at, id) по возрастанию", + tags = { "Messages" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = MessagePageDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/api/v1/chats/{chat_id}/messages", + produces = { "application/json" } + ) + ResponseEntity listMessages( + @Parameter(name = "chat_id", description = "", required = true, in = ParameterIn.PATH) + @PathVariable("chat_id") UUID chatId, + @Min(1) @Max(100) + @Parameter(name = "limit", description = "", in = ParameterIn.QUERY) + @Valid @RequestParam(value = "limit", required = false, defaultValue = "50") Integer limit, + @Size(min = 1) + @Parameter(name = "cursor", description = "", in = ParameterIn.QUERY) + @Valid @RequestParam(value = "cursor", required = false) String cursor, + @AuthenticationPrincipal SessionPrincipal principal + ); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/UserController.java b/src/main/java/ru/mtusi/messenger/controller/UserController.java new file mode 100644 index 00000000..bf4a5907 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/UserController.java @@ -0,0 +1,26 @@ +package ru.mtusi.messenger.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.security.SessionPrincipal; +import ru.mtusi.messenger.service.UserService; + +@RestController +@RequiredArgsConstructor +public class UserController implements UsersApi { + private final UserService userService; + + @Override + public ResponseEntity currentUser(@AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.ok(userService.currentUser(principal.userId())); + } + + @Override + public ResponseEntity registerUser(UserDTO userDTO) { + return ResponseEntity.status(HttpStatus.CREATED).body(userService.registerUser(userDTO)); + } +} diff --git a/src/main/java/ru/mtusi/messenger/controller/UsersApi.java b/src/main/java/ru/mtusi/messenger/controller/UsersApi.java new file mode 100644 index 00000000..7e97abac --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/UsersApi.java @@ -0,0 +1,136 @@ +/** + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech) (7.10.0). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +package ru.mtusi.messenger.controller; + +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import ru.mtusi.messenger.dto.ErrorDTO; +import ru.mtusi.messenger.dto.UserDTO; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import jakarta.validation.Valid; +import jakarta.annotation.Generated; +import ru.mtusi.messenger.security.SessionPrincipal; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +@Validated +@Tag(name = "Users", description = "Регистрация пользователей и доступ к профилю текущего пользователя.") +@RequestMapping("${openapi.mTUSIMessenger2.base-path:}") +public interface UsersApi { + + /** + * GET /api/v1/users/me : Текущий пользователь + * + * @return Успех (status code 200) + * or Неверный запрос (status code 400) + * or Нет действительной аутентификации (status code 401) + * or Объект отсутствует или недоступен (status code 404) + * or Конфликт (status code 409) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "currentUser", + summary = "Текущий пользователь", + tags = { "Users" }, + responses = { + @ApiResponse(responseCode = "200", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = UserDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "401", description = "Нет действительной аутентификации", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "404", description = "Объект отсутствует или недоступен", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + }, + security = { + @SecurityRequirement(name = "bearerAuth") + } + ) + @RequestMapping( + method = RequestMethod.GET, + value = "/api/v1/users/me", + produces = { "application/json" } + ) + + ResponseEntity currentUser( + @AuthenticationPrincipal SessionPrincipal principal + ); + + + /** + * POST /api/v1/users : Создать пользователя + * + * @param userDTO (required) + * @return Успех (status code 201) + * or Неверный запрос (status code 400) + * or Конфликт (status code 409) + * or Ограничение частоты запросов (status code 429) + * or Зависимость недоступна (status code 503) + * or Неожиданная ошибка без внутренних деталей (status code 500) + */ + @Operation( + operationId = "registerUser", + summary = "Создать пользователя", + tags = { "Users" }, + responses = { + @ApiResponse(responseCode = "201", description = "Успех", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = UserDTO.class)) + }), + @ApiResponse(responseCode = "400", description = "Неверный запрос", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "409", description = "Конфликт", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "429", description = "Ограничение частоты запросов", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "503", description = "Зависимость недоступна", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }), + @ApiResponse(responseCode = "500", description = "Неожиданная ошибка без внутренних деталей", content = { + @Content(mediaType = "application/json", schema = @Schema(implementation = ErrorDTO.class)) + }) + } + ) + @RequestMapping( + method = RequestMethod.POST, + value = "/api/v1/users", + produces = { "application/json" }, + consumes = { "application/json" } + ) + + ResponseEntity registerUser( + @Parameter(name = "UserDTO", description = "", required = true) @Valid @RequestBody UserDTO userDTO + ); + +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java new file mode 100644 index 00000000..46a10d19 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java @@ -0,0 +1,147 @@ +package ru.mtusi.messenger.controller.controllerAdvice; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataAccessException; +import org.springframework.dao.DataAccessResourceFailureException; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; +import org.springframework.transaction.CannotCreateTransactionException; +import org.springframework.web.HttpMediaTypeNotSupportedException; +import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingServletRequestParameterException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.method.annotation.HandlerMethodValidationException; +import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; +import ru.mtusi.messenger.config.properties.RateLimitProperties; +import ru.mtusi.messenger.dto.ErrorDTO; +import ru.mtusi.messenger.dto.ErrorErrorDTO; +import ru.mtusi.messenger.exception.*; + +@RestControllerAdvice +@RequiredArgsConstructor +public class GlobalExceptionHandler { + private final RateLimitProperties limitProperties; + private final ApiErrorFactory errors; + + @ExceptionHandler(InvalidRequestException.class) + public ResponseEntity invalidRequest(InvalidRequestException e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, e.getMessage(), req); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity unauthorized(UnauthorizedException e, HttpServletRequest req) { + String scheme = req.getRequestURI().equals("/api/v1/auth/sessions") + ? "Basic" : "Bearer"; + return ResponseEntity.status(HttpStatus.UNAUTHORIZED) + .header("WWW-Authenticate", scheme + " realm=\"messenger\"") + .body(errors.error(ErrorErrorDTO.CodeEnum.UNAUTHORIZED, e.getMessage(), req)); + } + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity notFound(NotFoundException e, HttpServletRequest req) { + return respond(HttpStatus.NOT_FOUND, ErrorErrorDTO.CodeEnum.NOT_FOUND, e.getMessage(), req); + } + + @ExceptionHandler(ConflictException.class) + public ResponseEntity conflict(ConflictException e, HttpServletRequest req) { + return respond(HttpStatus.CONFLICT, ErrorErrorDTO.CodeEnum.CONFLICT, e.getMessage(), req); + } + + @ExceptionHandler(PayloadTooLargeException.class) + public ResponseEntity payloadTooLarge(PayloadTooLargeException e, HttpServletRequest req) { + return respond(HttpStatus.PAYLOAD_TOO_LARGE, ErrorErrorDTO.CodeEnum.PAYLOAD_TOO_LARGE, e.getMessage(), req); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity validation(MethodArgumentNotValidException e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, "Validation failed", req); + } + + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity unreadable(Exception e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, "Malformed request body", req); + } + + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity missingParam(Exception e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, "Missing parameter", req); + } + + @ExceptionHandler(MethodArgumentTypeMismatchException.class) + public ResponseEntity typeMismatch(Exception e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, "Invalid parameter type", req); + } + + @ExceptionHandler(HttpMediaTypeNotSupportedException.class) + public ResponseEntity mediaType(Exception e, HttpServletRequest req) { + return respond(HttpStatus.UNSUPPORTED_MEDIA_TYPE, ErrorErrorDTO.CodeEnum.UNSUPPORTED_MEDIA_TYPE, + "Unsupported media type", req); + } + + @ExceptionHandler(HandlerMethodValidationException.class) + public ResponseEntity methodValidation(Exception e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, + "Validation failed", req); + } + + @ExceptionHandler(HttpRequestMethodNotSupportedException.class) + public ResponseEntity methodNotAllowed(Exception e, HttpServletRequest req) { + return respond(HttpStatus.METHOD_NOT_ALLOWED, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, + "Method not allowed", req); + } + + @ExceptionHandler(RateLimitedException.class) + public ResponseEntity rateLimited(RateLimitedException e, HttpServletRequest req) { + return ResponseEntity.status(HttpStatus.TOO_MANY_REQUESTS) + .header("Retry-After", String.valueOf(limitProperties.retryAfterSeconds())) + .body(errors.error(ErrorErrorDTO.CodeEnum.RATE_LIMITED, e.getMessage(), req)); + } + + @ExceptionHandler(ConstraintViolationException.class) + public ResponseEntity constraint(ConstraintViolationException e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, + "Validation failed", req); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity fallback(Exception e, HttpServletRequest req) { + return respond(HttpStatus.INTERNAL_SERVER_ERROR, ErrorErrorDTO.CodeEnum.INTERNAL_ERROR, + "Internal error", req); + } + + @ExceptionHandler(ServiceUnavailableException.class) + public ResponseEntity serviceUnavailable(ServiceUnavailableException e, HttpServletRequest req) { + return respond(HttpStatus.SERVICE_UNAVAILABLE, + ErrorErrorDTO.CodeEnum.UNAVAILABLE, + e.getMessage(), req); + } + + @ExceptionHandler({ + CannotCreateTransactionException.class, + DataAccessResourceFailureException.class + }) + public ResponseEntity dependencyUnavailable(Exception e, HttpServletRequest req) { + return respond(HttpStatus.SERVICE_UNAVAILABLE, + ErrorErrorDTO.CodeEnum.UNAVAILABLE, + "Dependency unavailable", req); + } + + @ExceptionHandler(DataAccessException.class) + public ResponseEntity dataAccess(DataAccessException e, HttpServletRequest req) { + return respond(HttpStatus.INTERNAL_SERVER_ERROR, + ErrorErrorDTO.CodeEnum.INTERNAL_ERROR, + "Database error", req); + } + + private ResponseEntity respond(HttpStatus status, + ErrorErrorDTO.CodeEnum code, + String message, + HttpServletRequest req) { + return ResponseEntity.status(status).body(errors.error(code, message, req)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ChatDTO.java b/src/main/java/ru/mtusi/messenger/dto/ChatDTO.java new file mode 100644 index 00000000..f1c436fe --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ChatDTO.java @@ -0,0 +1,149 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import java.time.Instant; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.UUID; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; +import jakarta.annotation.Generated; +import org.hibernate.validator.constraints.CodePointLength; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +public class ChatDTO { + + private UUID id; + + private String title; + + @Valid + private List memberIds = new ArrayList<>(); + + private Instant createdAt; + + public ChatDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ChatDTO(String title, List memberIds) { + this.title = title; + this.memberIds = memberIds; + } + + public ChatDTO id(UUID id) { + this.id = id; + return this; + } + + @Valid + @Schema(name = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("id") + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public ChatDTO title(String title) { + this.title = title; + return this; + } + + @NotNull + @CodePointLength(min = 1, max = 100) + @Schema(name = "title", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("title") + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public ChatDTO memberIds(List memberIds) { + this.memberIds = memberIds; + return this; + } + + public ChatDTO addMemberIdsItem(UUID memberIdsItem) { + if (this.memberIds == null) { + this.memberIds = new ArrayList<>(); + } + this.memberIds.add(memberIdsItem); + return this; + } + + @NotNull @Valid @Size(min = 1, max = 100) + @Schema(name = "member_ids", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("member_ids") + public List getMemberIds() { + return memberIds; + } + + public void setMemberIds(List memberIds) { + this.memberIds = memberIds; + } + + public ChatDTO createdAt(Instant createdAt) { + this.createdAt = createdAt; + return this; + } + + @Schema(name = "created_at", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("created_at") + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChatDTO createChat = (ChatDTO) o; + return Objects.equals(this.id, createChat.id) && + Objects.equals(this.title, createChat.title) && + Objects.equals(this.memberIds, createChat.memberIds) && + Objects.equals(this.createdAt, createChat.createdAt); + } + + @Override + public int hashCode() { + return Objects.hash(id, title, memberIds, createdAt); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ChatDTO {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" title: ").append(toIndentedString(title)).append("\n"); + sb.append(" memberIds: ").append(toIndentedString(memberIds)).append("\n"); + sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ChatPageDTO.java b/src/main/java/ru/mtusi/messenger/dto/ChatPageDTO.java new file mode 100644 index 00000000..240e39f3 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ChatPageDTO.java @@ -0,0 +1,124 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * ChatPageDTO + */ + +public class ChatPageDTO { + + @Valid + private List<@Valid ChatDTO> items = new ArrayList<>(); + + private String nextCursor = null; + + public ChatPageDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ChatPageDTO(List<@Valid ChatDTO> items, String nextCursor) { + this.items = items; + this.nextCursor = nextCursor; + } + + public ChatPageDTO items(List<@Valid ChatDTO> items) { + this.items = items; + return this; + } + + public ChatPageDTO addItemsItem(ChatDTO itemsItem) { + if (this.items == null) { + this.items = new ArrayList<>(); + } + this.items.add(itemsItem); + return this; + } + + /** + * Get items + * @return items + */ + @NotNull @Valid + @Schema(name = "items", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("items") + public List<@Valid ChatDTO> getItems() { + return items; + } + + public void setItems(List<@Valid ChatDTO> items) { + this.items = items; + } + + public ChatPageDTO nextCursor(String nextCursor) { + this.nextCursor = nextCursor; + return this; + } + + /** + * Get nextCursor + * @return nextCursor + */ + @JsonInclude(JsonInclude.Include.ALWAYS) + @Schema(name = "next_cursor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("next_cursor") + public String getNextCursor() { + return nextCursor; + } + + public void setNextCursor(String nextCursor) { + this.nextCursor = nextCursor; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChatPageDTO chatPageDTO = (ChatPageDTO) o; + return Objects.equals(this.items, chatPageDTO.items) && + Objects.equals(this.nextCursor, chatPageDTO.nextCursor); + } + + @Override + public int hashCode() { + return Objects.hash(items, nextCursor); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ChatPageDTO {\n"); + sb.append(" items: ").append(toIndentedString(items)).append("\n"); + sb.append(" nextCursor: ").append(toIndentedString(nextCursor)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateMessageDTO.java b/src/main/java/ru/mtusi/messenger/dto/CreateMessageDTO.java new file mode 100644 index 00000000..718cb0f3 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateMessageDTO.java @@ -0,0 +1,40 @@ +package ru.mtusi.messenger.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import org.hibernate.validator.constraints.CodePointLength; + +import java.util.Objects; + +@Schema(name = "CreateMessage") +public class CreateMessageDTO { + + private String text; + + public CreateMessageDTO() {} + + public CreateMessageDTO text(String text) { + this.text = text; + return this; + } + + @NotNull + @CodePointLength(min = 1, max = 4000) + @Schema(name = "text", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("text") + public String getText() { return text; } + + public void setText(String text) { this.text = text; } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (!(o instanceof CreateMessageDTO d)) return false; + return Objects.equals(text, d.text); + } + + @Override + public int hashCode() { return Objects.hash(text); } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ErrorDTO.java b/src/main/java/ru/mtusi/messenger/dto/ErrorDTO.java new file mode 100644 index 00000000..65c09ca9 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ErrorDTO.java @@ -0,0 +1,87 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import ru.mtusi.messenger.dto.ErrorErrorDTO; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * ErrorDTO + */ + +public class ErrorDTO { + + private ErrorErrorDTO error; + + public ErrorDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ErrorDTO(ErrorErrorDTO error) { + this.error = error; + } + + public ErrorDTO error(ErrorErrorDTO error) { + this.error = error; + return this; + } + + /** + * Get error + * @return error + */ + @NotNull @Valid + @Schema(name = "error", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("error") + public ErrorErrorDTO getError() { + return error; + } + + public void setError(ErrorErrorDTO error) { + this.error = error; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ErrorDTO errorDTO = (ErrorDTO) o; + return Objects.equals(this.error, errorDTO.error); + } + + @Override + public int hashCode() { + return Objects.hash(error); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ErrorDTO {\n"); + sb.append(" error: ").append(toIndentedString(error)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/ErrorErrorDTO.java b/src/main/java/ru/mtusi/messenger/dto/ErrorErrorDTO.java new file mode 100644 index 00000000..6804918b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/ErrorErrorDTO.java @@ -0,0 +1,178 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * ErrorErrorDTO + */ + +public class ErrorErrorDTO { + + /** + * Gets or Sets code + */ + public enum CodeEnum { + INVALID_REQUEST("invalid_request"), + UNAUTHORIZED("unauthorized"), + NOT_FOUND("not_found"), + CONFLICT("conflict"), + PAYLOAD_TOO_LARGE("payload_too_large"), + UNSUPPORTED_MEDIA_TYPE("unsupported_media_type"), + RATE_LIMITED("rate_limited"), + UNAVAILABLE("unavailable"), + INTERNAL_ERROR("internal_error"); + + private String value; + + CodeEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static CodeEnum fromValue(String value) { + for (CodeEnum b : CodeEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private CodeEnum code; + + private String message; + + private String requestId; + + public ErrorErrorDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public ErrorErrorDTO(CodeEnum code, String message, String requestId) { + this.code = code; + this.message = message; + this.requestId = requestId; + } + + public ErrorErrorDTO code(CodeEnum code) { + this.code = code; + return this; + } + + /** + * Get code + * @return code + */ + @NotNull + @Schema(name = "code", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("code") + public CodeEnum getCode() { + return code; + } + + public void setCode(CodeEnum code) { + this.code = code; + } + + public ErrorErrorDTO message(String message) { + this.message = message; + return this; + } + + /** + * Get message + * @return message + */ + @NotNull @Size(min = 1) + @Schema(name = "message", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("message") + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public ErrorErrorDTO requestId(String requestId) { + this.requestId = requestId; + return this; + } + + /** + * Get requestId + * @return requestId + */ + @NotNull @Size(min = 1) + @Schema(name = "request_id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("request_id") + public String getRequestId() { + return requestId; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ErrorErrorDTO errorErrorDTO = (ErrorErrorDTO) o; + return Objects.equals(this.code, errorErrorDTO.code) && + Objects.equals(this.message, errorErrorDTO.message) && + Objects.equals(this.requestId, errorErrorDTO.requestId); + } + + @Override + public int hashCode() { + return Objects.hash(code, message, requestId); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ErrorErrorDTO {\n"); + sb.append(" code: ").append(toIndentedString(code)).append("\n"); + sb.append(" message: ").append(toIndentedString(message)).append("\n"); + sb.append(" requestId: ").append(toIndentedString(requestId)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/HealthDTO.java b/src/main/java/ru/mtusi/messenger/dto/HealthDTO.java new file mode 100644 index 00000000..bd428131 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/HealthDTO.java @@ -0,0 +1,120 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * HealthDTO + */ + +public class HealthDTO { + + /** + * Gets or Sets status + */ + public enum StatusEnum { + OK("ok"); + + private String value; + + StatusEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static StatusEnum fromValue(String value) { + for (StatusEnum b : StatusEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private StatusEnum status; + + public HealthDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public HealthDTO(StatusEnum status) { + this.status = status; + } + + public HealthDTO status(StatusEnum status) { + this.status = status; + return this; + } + + /** + * Get status + * @return status + */ + @NotNull + @Schema(name = "status", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("status") + public StatusEnum getStatus() { + return status; + } + + public void setStatus(StatusEnum status) { + this.status = status; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + HealthDTO healthDTO = (HealthDTO) o; + return Objects.equals(this.status, healthDTO.status); + } + + @Override + public int hashCode() { + return Objects.hash(status); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class HealthDTO {\n"); + sb.append(" status: ").append(toIndentedString(status)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/MessageDTO.java b/src/main/java/ru/mtusi/messenger/dto/MessageDTO.java new file mode 100644 index 00000000..703b3acd --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/MessageDTO.java @@ -0,0 +1,189 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; +import org.hibernate.validator.constraints.CodePointLength; + +import java.time.Instant; +import java.util.UUID; + +/** + * MessageDTO + */ + +public class MessageDTO { + + private UUID id; + + private UUID chatId; + + private UUID senderId; + + private String text; + + private Instant createdAt; + + public MessageDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public MessageDTO(UUID id, UUID chatId, UUID senderId, String text, Instant createdAt) { + this.id = id; + this.chatId = chatId; + this.senderId = senderId; + this.text = text; + this.createdAt = createdAt; + } + + public MessageDTO id(UUID id) { + this.id = id; + return this; + } + + /** + * Get id + * @return id + */ + @NotNull @Valid + @Schema(name = "id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("id") + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public MessageDTO chatId(UUID chatId) { + this.chatId = chatId; + return this; + } + + /** + * Get chatId + * @return chatId + */ + @NotNull @Valid + @Schema(name = "chat_id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("chat_id") + public UUID getChatId() { + return chatId; + } + + public void setChatId(UUID chatId) { + this.chatId = chatId; + } + + public MessageDTO senderId(UUID senderId) { + this.senderId = senderId; + return this; + } + + /** + * Get senderId + * @return senderId + */ + @NotNull @Valid + @Schema(name = "sender_id", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("sender_id") + public UUID getSenderId() { + return senderId; + } + + public void setSenderId(UUID senderId) { + this.senderId = senderId; + } + + public MessageDTO text(String text) { + this.text = text; + return this; + } + + /** + * Get text + * @return text + */ + @NotNull + @CodePointLength(min = 1, max = 4000) + @Schema(name = "text", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("text") + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public MessageDTO createdAt(Instant createdAt) { + this.createdAt = createdAt; + return this; + } + + /** + * Get createdAt + * @return createdAt + */ + @NotNull @Valid + @Schema(name = "created_at", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("created_at") + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MessageDTO messageDTO = (MessageDTO) o; + return Objects.equals(this.id, messageDTO.id) && + Objects.equals(this.chatId, messageDTO.chatId) && + Objects.equals(this.senderId, messageDTO.senderId) && + Objects.equals(this.text, messageDTO.text) && + Objects.equals(this.createdAt, messageDTO.createdAt); + } + + @Override + public int hashCode() { + return Objects.hash(id, chatId, senderId, text, createdAt); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MessageDTO {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" chatId: ").append(toIndentedString(chatId)).append("\n"); + sb.append(" senderId: ").append(toIndentedString(senderId)).append("\n"); + sb.append(" text: ").append(toIndentedString(text)).append("\n"); + sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/MessagePageDTO.java b/src/main/java/ru/mtusi/messenger/dto/MessagePageDTO.java new file mode 100644 index 00000000..2c44c67e --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/MessagePageDTO.java @@ -0,0 +1,125 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.ArrayList; +import java.util.List; +import ru.mtusi.messenger.dto.MessageDTO; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * MessagePageDTO + */ + +public class MessagePageDTO { + + @Valid + private List<@Valid MessageDTO> items = new ArrayList<>(); + + private String nextCursor = null; + + public MessagePageDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public MessagePageDTO(List<@Valid MessageDTO> items, String nextCursor) { + this.items = items; + this.nextCursor = nextCursor; + } + + public MessagePageDTO items(List<@Valid MessageDTO> items) { + this.items = items; + return this; + } + + public MessagePageDTO addItemsItem(MessageDTO itemsItem) { + if (this.items == null) { + this.items = new ArrayList<>(); + } + this.items.add(itemsItem); + return this; + } + + /** + * Get items + * @return items + */ + @NotNull @Valid + @Schema(name = "items", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("items") + public List<@Valid MessageDTO> getItems() { + return items; + } + + public void setItems(List<@Valid MessageDTO> items) { + this.items = items; + } + + public MessagePageDTO nextCursor(String nextCursor) { + this.nextCursor = nextCursor; + return this; + } + + /** + * Get nextCursor + * @return nextCursor + */ + @JsonInclude(JsonInclude.Include.ALWAYS) + @Schema(name = "next_cursor", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("next_cursor") + public String getNextCursor() { + return nextCursor; + } + + public void setNextCursor(String nextCursor) { + this.nextCursor = nextCursor; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + MessagePageDTO messagePageDTO = (MessagePageDTO) o; + return Objects.equals(this.items, messagePageDTO.items) && + Objects.equals(this.nextCursor, messagePageDTO.nextCursor); + } + + @Override + public int hashCode() { + return Objects.hash(items, nextCursor); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class MessagePageDTO {\n"); + sb.append(" items: ").append(toIndentedString(items)).append("\n"); + sb.append(" nextCursor: ").append(toIndentedString(nextCursor)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/SessionDTO.java b/src/main/java/ru/mtusi/messenger/dto/SessionDTO.java new file mode 100644 index 00000000..bc1f0772 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/SessionDTO.java @@ -0,0 +1,198 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import java.time.Instant; +import ru.mtusi.messenger.dto.UserDTO; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; + +import java.util.*; + +/** + * SessionDTO + */ + +public class SessionDTO { + + private String token; + + /** + * Gets or Sets tokenType + */ + public enum TokenTypeEnum { + BEARER("Bearer"); + + private String value; + + TokenTypeEnum(String value) { + this.value = value; + } + + @JsonValue + public String getValue() { + return value; + } + + @Override + public String toString() { + return String.valueOf(value); + } + + @JsonCreator + public static TokenTypeEnum fromValue(String value) { + for (TokenTypeEnum b : TokenTypeEnum.values()) { + if (b.value.equals(value)) { + return b; + } + } + throw new IllegalArgumentException("Unexpected value '" + value + "'"); + } + } + + private TokenTypeEnum tokenType; + + private Instant expiresAt; + + private UserDTO user; + + public SessionDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public SessionDTO(String token, TokenTypeEnum tokenType, Instant expiresAt, UserDTO user) { + this.token = token; + this.tokenType = tokenType; + this.expiresAt = expiresAt; + this.user = user; + } + + public SessionDTO token(String token) { + this.token = token; + return this; + } + + /** + * Get token + * @return token + */ + @NotNull @Size(min = 32) + @Schema(name = "token", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("token") + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public SessionDTO tokenType(TokenTypeEnum tokenType) { + this.tokenType = tokenType; + return this; + } + + /** + * Get tokenType + * @return tokenType + */ + @NotNull + @Schema(name = "token_type", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("token_type") + public TokenTypeEnum getTokenType() { + return tokenType; + } + + public void setTokenType(TokenTypeEnum tokenType) { + this.tokenType = tokenType; + } + + public SessionDTO expiresAt(Instant expiresAt) { + this.expiresAt = expiresAt; + return this; + } + + /** + * Get expiresAt + * @return expiresAt + */ + @NotNull @Valid + @Schema(name = "expires_at", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("expires_at") + public Instant getExpiresAt() { + return expiresAt; + } + + public void setExpiresAt(Instant expiresAt) { + this.expiresAt = expiresAt; + } + + public SessionDTO user(UserDTO user) { + this.user = user; + return this; + } + + /** + * Get user + * @return user + */ + @NotNull @Valid + @Schema(name = "user", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("user") + public UserDTO getUser() { + return user; + } + + public void setUser(UserDTO user) { + this.user = user; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + SessionDTO sessionDTO = (SessionDTO) o; + return Objects.equals(this.token, sessionDTO.token) && + Objects.equals(this.tokenType, sessionDTO.tokenType) && + Objects.equals(this.expiresAt, sessionDTO.expiresAt) && + Objects.equals(this.user, sessionDTO.user); + } + + @Override + public int hashCode() { + return Objects.hash(token, tokenType, expiresAt, user); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class SessionDTO {\n"); + sb.append(" token: ").append(toIndentedString(token)).append("\n"); + sb.append(" tokenType: ").append(toIndentedString(tokenType)).append("\n"); + sb.append(" expiresAt: ").append(toIndentedString(expiresAt)).append("\n"); + sb.append(" user: ").append(toIndentedString(user)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/UserDTO.java b/src/main/java/ru/mtusi/messenger/dto/UserDTO.java new file mode 100644 index 00000000..85976360 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/UserDTO.java @@ -0,0 +1,183 @@ +package ru.mtusi.messenger.dto; + +import java.time.Instant; +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; +import org.hibernate.validator.constraints.CodePointLength; + +import java.util.*; + +/** + * UserDTO + */ + +public class UserDTO { + + private UUID id; + + private String username; + + private String displayName; + + private String password; + + private Instant createdAt; + + public UserDTO() { + super(); + } + + /** + * Constructor with only required parameters + */ + public UserDTO(String username, String displayName, String password) { + this.username = username; + this.displayName = displayName; + this.password = password; + } + + public UserDTO username(String username) { + this.username = username; + return this; + } + + @Valid + @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED) + @JsonProperty("id") + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public UserDTO id(UUID id) { + this.id = id; + return this; + } + + /** + * Get username + * @return username + */ + @NotNull @Pattern(regexp = "^[a-z0-9_]{3,32}$") + @Schema(name = "username", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("username") + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public UserDTO displayName(String displayName) { + this.displayName = displayName; + return this; + } + + /** + * Get displayName + * @return displayName + */ + @NotNull + @CodePointLength(min = 1, max = 100) + @Schema(name = "display_name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("display_name") + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public UserDTO password(String password) { + this.password = password; + return this; + } + + /** + * Get password + * @return password + */ + @NotNull + @CodePointLength(min = 1, max = 100) + @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("password") + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + public UserDTO createdAt(Instant createdAt) { + this.createdAt = createdAt; + return this; + } + + /** + * Get createdAt + * @return createdAt + */ + @Schema(name = "created_at", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("created_at") + public Instant getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Instant createdAt) { + this.createdAt = createdAt; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + UserDTO userDTO = (UserDTO) o; + return Objects.equals(this.id, userDTO.id) && + Objects.equals(this.username, userDTO.username) && + Objects.equals(this.displayName, userDTO.displayName) && + Objects.equals(this.password, userDTO.password) && + Objects.equals(this.createdAt, userDTO.createdAt); + } + + @Override + public int hashCode() { + return Objects.hash(id, username, displayName, password, createdAt); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class UserDTO {\n"); + sb.append(" id: ").append(toIndentedString(id)).append("\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); + sb.append(" password: ").append(toIndentedString(password)).append("\n"); + sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/ApiErrorFactory.java b/src/main/java/ru/mtusi/messenger/exception/ApiErrorFactory.java new file mode 100644 index 00000000..26b98d56 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/ApiErrorFactory.java @@ -0,0 +1,74 @@ +package ru.mtusi.messenger.exception; + +import tools.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.slf4j.MDC; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.ErrorDTO; +import ru.mtusi.messenger.dto.ErrorErrorDTO; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.UUID; + +@Component +@RequiredArgsConstructor +public class ApiErrorFactory { + private static final String DEFAULT_MESSAGE = "Error"; + private static final String REQUEST_ID_ATTR = "requestId"; + private static final String REQUEST_ID_MDC = "requestId"; + + private final ObjectMapper objectMapper; + + public ErrorDTO error(ErrorErrorDTO.CodeEnum code, String message, HttpServletRequest request) { + ErrorErrorDTO inner = new ErrorErrorDTO(); + inner.setCode(code); + inner.setMessage(normalizeMessage(message)); + inner.setRequestId(resolveRequestId(request)); + + ErrorDTO outer = new ErrorDTO(); + outer.setError(inner); + return outer; + } + + public void writeError(HttpServletResponse response, + HttpServletRequest request, + HttpStatus status, + String wwwAuthenticate, + ErrorErrorDTO.CodeEnum code, + String message) throws IOException { + String requestId = resolveRequestId(request); + response.setStatus(status.value()); + response.setHeader("X-Request-Id", requestId); + if (wwwAuthenticate != null) { + response.setHeader(HttpHeaders.WWW_AUTHENTICATE, wwwAuthenticate); + } + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding(StandardCharsets.UTF_8.name()); + objectMapper.writeValue(response.getWriter(), error(code, message, request)); + } + + public String resolveRequestId(HttpServletRequest request) { + Object attr = request.getAttribute(REQUEST_ID_ATTR); + if (attr instanceof String s && !s.isBlank()) { + return s; + } + String mdc = MDC.get(REQUEST_ID_MDC); + if (mdc != null && !mdc.isBlank()) { + request.setAttribute(REQUEST_ID_ATTR, mdc); + return mdc; + } + String generated = UUID.randomUUID().toString(); + request.setAttribute(REQUEST_ID_ATTR, generated); + return generated; + } + + private String normalizeMessage(String message) { + return (message == null || message.isBlank()) ? DEFAULT_MESSAGE : message; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/ConflictException.java b/src/main/java/ru/mtusi/messenger/exception/ConflictException.java new file mode 100644 index 00000000..aa0a2bff --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/ConflictException.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.exception; + +public class ConflictException extends RuntimeException { + public ConflictException(String message) { super(message); } +} diff --git a/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java b/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java new file mode 100644 index 00000000..a4d7792a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/InvalidRequestException.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.exception; + +public class InvalidRequestException extends RuntimeException { + public InvalidRequestException(String message) { super(message); } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java b/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java new file mode 100644 index 00000000..6055db37 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/NotFoundException.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { super(message); } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/PayloadTooLargeException.java b/src/main/java/ru/mtusi/messenger/exception/PayloadTooLargeException.java new file mode 100644 index 00000000..2493a9eb --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/PayloadTooLargeException.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.exception; + +public class PayloadTooLargeException extends RuntimeException { + public PayloadTooLargeException(String message) { super(message); } +} diff --git a/src/main/java/ru/mtusi/messenger/exception/RateLimitedException.java b/src/main/java/ru/mtusi/messenger/exception/RateLimitedException.java new file mode 100644 index 00000000..3c1ab32b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/RateLimitedException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class RateLimitedException extends RuntimeException { + public RateLimitedException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/ServiceUnavailableException.java b/src/main/java/ru/mtusi/messenger/exception/ServiceUnavailableException.java new file mode 100644 index 00000000..da565290 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/ServiceUnavailableException.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.exception; + +public class ServiceUnavailableException extends RuntimeException { + public ServiceUnavailableException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java b/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java new file mode 100644 index 00000000..a086273a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/exception/UnauthorizedException.java @@ -0,0 +1,5 @@ +package ru.mtusi.messenger.exception; + +public class UnauthorizedException extends RuntimeException { + public UnauthorizedException(String message) { super(message); } +} diff --git a/src/main/java/ru/mtusi/messenger/filter/RateLimitFilter.java b/src/main/java/ru/mtusi/messenger/filter/RateLimitFilter.java new file mode 100644 index 00000000..2476160b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/filter/RateLimitFilter.java @@ -0,0 +1,49 @@ +package ru.mtusi.messenger.filter; + +import io.github.bucket4j.Bucket; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.core.annotation.Order; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import ru.mtusi.messenger.config.properties.RateLimitProperties; +import ru.mtusi.messenger.dto.ErrorErrorDTO; +import ru.mtusi.messenger.exception.ApiErrorFactory; + +import java.io.IOException; + +@Component +@Order(2) +@RequiredArgsConstructor +public class RateLimitFilter extends OncePerRequestFilter { + private final RateLimitProperties limitProperties; + private final Bucket bucket; + private final ApiErrorFactory errors; + + @Override + protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, + FilterChain chain) throws ServletException, IOException { + if (!req.getRequestURI().startsWith("/api/")) { + chain.doFilter(req, res); + return; + } + + if (bucket.tryConsume(1)) { + chain.doFilter(req, res); + return; + } + + res.setHeader("Retry-After", String.valueOf(limitProperties.retryAfterSeconds())); + errors.writeError( + res, + req, + HttpStatus.TOO_MANY_REQUESTS, + null, + ErrorErrorDTO.CodeEnum.RATE_LIMITED, + "Rate limit exceeded. Try again later."); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java new file mode 100644 index 00000000..54668db8 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java @@ -0,0 +1,35 @@ +package ru.mtusi.messenger.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.MDC; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.UUID; + +@Component +@Order(1) +public class RequestIdFilter extends OncePerRequestFilter { + + public static final String INSTANCE_ID = UUID.randomUUID().toString(); + + @Override + protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, + FilterChain chain) throws ServletException, IOException { + String rid = UUID.randomUUID().toString(); + res.setHeader("X-Request-Id", rid); + res.setHeader("X-Instance-Id", INSTANCE_ID); + req.setAttribute("requestId", rid); + MDC.put("requestId", rid); + try { + chain.doFilter(req, res); + } finally { + MDC.clear(); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java b/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java new file mode 100644 index 00000000..012a5d73 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java @@ -0,0 +1,34 @@ +package ru.mtusi.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.Named; +import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.model.Chat; +import ru.mtusi.messenger.model.User; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +@Mapper(componentModel = "spring") +public interface ChatMapper { + + @Mapping(target = "id", ignore = true) + @Mapping(target = "createdAt", ignore = true) + @Mapping(target = "members", ignore = true) + @Mapping(target = "messages", ignore = true) + Chat toChat(ChatDTO dto); + + @Mapping(target = "memberIds", source = "members", qualifiedByName = "usersToIds") + ChatDTO toChatDto(Chat chat); + + @Named("usersToIds") + default List usersToIds(Set users) { + if (users == null) return new ArrayList<>(); + List ids = new ArrayList<>(users.size()); + for (User u : users) ids.add(u.getId()); + return ids; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/mapper/MessageMapper.java b/src/main/java/ru/mtusi/messenger/mapper/MessageMapper.java new file mode 100644 index 00000000..393f23e4 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/mapper/MessageMapper.java @@ -0,0 +1,23 @@ +package ru.mtusi.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.mtusi.messenger.dto.CreateMessageDTO; +import ru.mtusi.messenger.dto.MessageDTO; +import ru.mtusi.messenger.model.Message; + +@Mapper(componentModel = "spring") +public interface MessageMapper { + + @Mapping(target = "id", ignore = true) + @Mapping(target = "chat", ignore = true) + @Mapping(target = "sender", ignore = true) + @Mapping(target = "createdAt", ignore = true) + Message toMessage(MessageDTO dto); + + @Mapping(target = "chatId", source = "chat.id") + @Mapping(target = "senderId", source = "sender.id") + MessageDTO toMessageDTO(Message entity); + + Message toMessage(CreateMessageDTO dto); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/mapper/SessionMapper.java b/src/main/java/ru/mtusi/messenger/mapper/SessionMapper.java new file mode 100644 index 00000000..83478e43 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/mapper/SessionMapper.java @@ -0,0 +1,17 @@ +package ru.mtusi.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.mtusi.messenger.dto.SessionDTO; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.model.Session; + +@Mapper(componentModel = "spring") +public interface SessionMapper { + + @Mapping(target = "token", source = "tokenRaw") + @Mapping(target = "tokenType", expression = "java(ru.mtusi.messenger.dto.SessionDTO.TokenTypeEnum.BEARER)") + @Mapping(target = "expiresAt", source = "session.expiresAt") + @Mapping(target = "user", source = "userDTO") + SessionDTO toSessionDTO(Session session, String tokenRaw, UserDTO userDTO); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java b/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java new file mode 100644 index 00000000..74380480 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java @@ -0,0 +1,20 @@ +package ru.mtusi.messenger.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.model.User; + +@Mapper(componentModel = "spring") +public interface UserMapper { + + @Mapping(target = "id", ignore = true) + @Mapping(target = "createdAt", ignore = true) + @Mapping(target = "passwordHash", ignore = true) + @Mapping(target = "chats", ignore = true) + @Mapping(target = "messages", ignore = true) + User toUser(UserDTO dto); + + @Mapping(target = "password", ignore = true) + UserDTO toUserDto(User user); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/model/Chat.java b/src/main/java/ru/mtusi/messenger/model/Chat.java new file mode 100644 index 00000000..9fbb85f2 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/model/Chat.java @@ -0,0 +1,53 @@ +package ru.mtusi.messenger.model; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +@Entity +@Table(name = "chats") +@Getter +@Setter +@NoArgsConstructor +public class Chat { + + @Id + @Column(nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, length = 100) + private String title; + + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; + + @ManyToMany(fetch = FetchType.LAZY) + @JoinTable( + name = "chat_members", + joinColumns = @JoinColumn(name = "chat_id"), + inverseJoinColumns = @JoinColumn(name = "user_id") + ) + private Set members = new HashSet<>(); + + @OneToMany( + mappedBy = "chat", + fetch = FetchType.LAZY, + cascade = CascadeType.ALL, + orphanRemoval = true + ) + @OrderBy("createdAt ASC, id ASC") + private List messages = new ArrayList<>(); + + @PrePersist + private void onCreate() { + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/model/Message.java b/src/main/java/ru/mtusi/messenger/model/Message.java new file mode 100644 index 00000000..b4a368d1 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/model/Message.java @@ -0,0 +1,40 @@ +package ru.mtusi.messenger.model; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "messages") +@Getter +@Setter +@NoArgsConstructor +public class Message { + + @Id + @Column(nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "chat_id", nullable = false) + private Chat chat; + + @ManyToOne(fetch = FetchType.LAZY, optional = false) + @JoinColumn(name = "sender_id", nullable = false) + private User sender; + + @Column(nullable = false, length = 4000) + private String text; + + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; + + @PrePersist + private void onCreate() { + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/model/Session.java b/src/main/java/ru/mtusi/messenger/model/Session.java new file mode 100644 index 00000000..4a2124dd --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/model/Session.java @@ -0,0 +1,42 @@ +package ru.mtusi.messenger.model; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Entity +@Table(name = "sessions") +@Getter +@Setter +@NoArgsConstructor +public class Session { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(name = "token_hash", nullable = false, unique = true) + private byte[] tokenHash; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; + + @Column(name = "expires_at", nullable = false) + private Instant expiresAt; + + @Column(name = "revoked_at") + private Instant revokedAt; + + @PrePersist + private void onCreate() { + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS); + } + +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/model/User.java b/src/main/java/ru/mtusi/messenger/model/User.java new file mode 100644 index 00000000..21386805 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/model/User.java @@ -0,0 +1,48 @@ +package ru.mtusi.messenger.model; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + +@Entity +@Table(name = "users") +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class User{ + + @Id() + @Column(nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(nullable = false, unique = true, length = 32) + private String username; + + @Column(name = "display_name", nullable = false, length = 100) + private String displayName; + + @Column(name = "password_hash", nullable = false, length = 255) + private String passwordHash; + + @Column(name = "created_at", nullable = false, updatable = false) + private Instant createdAt; + + @ManyToMany(mappedBy = "members", fetch = FetchType.LAZY) + private Set chats = new HashSet<>(); + + @OneToMany(mappedBy = "sender", fetch = FetchType.LAZY) + private Set messages = new HashSet<>(); + + @PrePersist + private void onCreate() { + this.createdAt = Instant.now().truncatedTo(ChronoUnit.MILLIS); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java b/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java new file mode 100644 index 00000000..0ed58876 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/ChatRepository.java @@ -0,0 +1,39 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import ru.mtusi.messenger.model.Chat; + +import org.springframework.data.domain.Pageable; +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public interface ChatRepository extends JpaRepository { + + @EntityGraph(attributePaths = "members") + @Query(""" + select distinct c from Chat c + join c.members m + where m.id = :userId + order by c.createdAt asc, c.id asc + """) + List findPageByMember(@Param("userId") UUID userId, + Pageable pageable); + + @EntityGraph(attributePaths = "members") + @Query(""" + select distinct c from Chat c + join c.members m + where m.id = :userId + and (c.createdAt > :cursorCreated + or (c.createdAt = :cursorCreated and c.id > :cursorId)) + order by c.createdAt asc, c.id asc + """) + List findPageByMemberAfterCursor(@Param("userId") UUID userId, + @Param("cursorCreated") Instant cursorCreated, + @Param("cursorId") UUID cursorId, + Pageable pageable); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java b/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java new file mode 100644 index 00000000..35134b4a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/MessageRepository.java @@ -0,0 +1,39 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.EntityGraph; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import ru.mtusi.messenger.model.Message; + +import org.springframework.data.domain.Pageable; +import java.time.Instant; +import java.util.List; +import java.util.UUID; + +public interface MessageRepository extends JpaRepository { + + long countByChatId(UUID chatId); + + @EntityGraph(attributePaths = "sender") + @Query(""" + select m from Message m + where m.chat.id = :chatId + order by m.createdAt asc, m.id asc + """) + List findPageByChat(@Param("chatId") UUID chatId, + Pageable pageable); + + @EntityGraph(attributePaths = "sender") + @Query(""" + select m from Message m + where m.chat.id = :chatId + and (m.createdAt > :cursorCreated + or (m.createdAt = :cursorCreated and m.id > :cursorId)) + order by m.createdAt asc, m.id asc + """) + List findPageByChatAfterCursor(@Param("chatId") UUID chatId, + @Param("cursorCreated") Instant cursorCreated, + @Param("cursorId") UUID cursorId, + Pageable pageable); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java b/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java new file mode 100644 index 00000000..2fc1dce7 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/SessionRepository.java @@ -0,0 +1,12 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import ru.mtusi.messenger.model.Session; + +import java.util.Optional; +import java.util.UUID; + +public interface SessionRepository extends JpaRepository { + Optional findByTokenHash(byte[] tokenHash); + +} diff --git a/src/main/java/ru/mtusi/messenger/repository/UserRepository.java b/src/main/java/ru/mtusi/messenger/repository/UserRepository.java new file mode 100644 index 00000000..9a9a6d4a --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/UserRepository.java @@ -0,0 +1,23 @@ +package ru.mtusi.messenger.repository; + + +import jakarta.persistence.LockModeType; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Lock; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import ru.mtusi.messenger.model.User; + +import java.util.List; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; + +public interface UserRepository extends JpaRepository { + + Optional findByUsername(String username); + + @Lock(LockModeType.PESSIMISTIC_READ) + @Query("select u from User u where u.id in :ids") + Set findAllByIdForShare(@Param("ids") Set ids); +} diff --git a/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java b/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java new file mode 100644 index 00000000..e2f4d10f --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java @@ -0,0 +1,32 @@ +package ru.mtusi.messenger.security; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.ErrorErrorDTO; +import ru.mtusi.messenger.exception.ApiErrorFactory; + +import java.io.IOException; + +@Component +@RequiredArgsConstructor +public class ApiAuthenticationEntryPoint implements AuthenticationEntryPoint { + private final ApiErrorFactory errors; + + @Override + public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { + String scheme = request.getRequestURI().equals("/api/v1/auth/sessions") ? "Basic" : "Bearer"; + + errors.writeError( + response, + request, + HttpStatus.UNAUTHORIZED, + scheme + " realm=\"messenger\"", + ErrorErrorDTO.CodeEnum.UNAUTHORIZED, + "No valid authentication"); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/BasicCredentials.java b/src/main/java/ru/mtusi/messenger/security/BasicCredentials.java new file mode 100644 index 00000000..116ad7c0 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/BasicCredentials.java @@ -0,0 +1,28 @@ +package ru.mtusi.messenger.security; + +import ru.mtusi.messenger.exception.UnauthorizedException; + +import java.nio.charset.StandardCharsets; +import java.util.Base64; + +public record BasicCredentials(String username, String password) { + + public static BasicCredentials parse(String header) { + if (header == null || !header.regionMatches(true, 0, "Basic ", 0, 6)) { + throw new UnauthorizedException("Basic authentication required"); + } + String decoded; + try { + decoded = new String( + Base64.getDecoder().decode(header.substring(6).trim()), + StandardCharsets.UTF_8); + } catch (IllegalArgumentException e) { + throw new UnauthorizedException("Invalid Basic encoding"); + } + int i = decoded.indexOf(':'); + if (i < 0) { + throw new UnauthorizedException("Invalid Basic credentials"); + } + return new BasicCredentials(decoded.substring(0, i), decoded.substring(i + 1)); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationFilter.java b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationFilter.java new file mode 100644 index 00000000..6bfe5d00 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationFilter.java @@ -0,0 +1,45 @@ +package ru.mtusi.messenger.security; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +public class SessionAuthenticationFilter extends OncePerRequestFilter { + private final BearerTokenResolver bearerTokenResolver; + private final AuthenticationManager authenticationManager; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain chain) throws ServletException, IOException { + try { + String token = bearerTokenResolver.resolve(request); + if (token != null && !token.isBlank()) { + try { + Authentication auth = authenticationManager.authenticate( + new SessionAuthenticationToken(token)); + SecurityContext context = SecurityContextHolder.createEmptyContext(); + context.setAuthentication(auth); + SecurityContextHolder.setContext(context); + } catch (AuthenticationException e) { + SecurityContextHolder.clearContext(); + } + } + chain.doFilter(request, response); + } finally { + SecurityContextHolder.clearContext(); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationProvider.java b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationProvider.java new file mode 100644 index 00000000..d1d5ee56 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationProvider.java @@ -0,0 +1,33 @@ +package ru.mtusi.messenger.security; + +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.AuthenticationProvider; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.service.SessionService; + +@Component +@RequiredArgsConstructor +public class SessionAuthenticationProvider implements AuthenticationProvider { + private final SessionService sessionService; + + @Override + public Authentication authenticate(Authentication authentication) throws AuthenticationException { + String token = (String) authentication.getCredentials(); + try { + var rec = sessionService.requireActive(token); + return new SessionAuthenticationToken( + new SessionPrincipal(rec.userId(), rec.sessionId())); + } catch (UnauthorizedException e) { + throw new BadCredentialsException(e.getMessage(), e); + } + } + + @Override + public boolean supports(Class authentication) { + return SessionAuthenticationToken.class.isAssignableFrom(authentication); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationToken.java b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationToken.java new file mode 100644 index 00000000..f5e9977d --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/SessionAuthenticationToken.java @@ -0,0 +1,34 @@ +package ru.mtusi.messenger.security; + +import org.springframework.security.authentication.AbstractAuthenticationToken; + +import java.util.List; + +public class SessionAuthenticationToken extends AbstractAuthenticationToken { + private final String rawToken; + private final SessionPrincipal principal; + + public SessionAuthenticationToken(String rawToken) { + super(List.of()); + this.rawToken = rawToken; + this.principal = null; + setAuthenticated(false); + } + + public SessionAuthenticationToken(SessionPrincipal principal) { + super(List.of()); + this.rawToken = null; + this.principal = principal; + setAuthenticated(true); + } + + @Override + public Object getCredentials() { + return rawToken; + } + + @Override + public Object getPrincipal() { + return principal; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/SessionPrincipal.java b/src/main/java/ru/mtusi/messenger/security/SessionPrincipal.java new file mode 100644 index 00000000..8bcae0eb --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/security/SessionPrincipal.java @@ -0,0 +1,6 @@ +package ru.mtusi.messenger.security; + +import java.util.UUID; + +public record SessionPrincipal(UUID userId, UUID sessionId) { +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/AuthService.java b/src/main/java/ru/mtusi/messenger/service/AuthService.java new file mode 100644 index 00000000..04d5b683 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/AuthService.java @@ -0,0 +1,32 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; +import ru.mtusi.messenger.dto.SessionDTO; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.security.BasicCredentials; +import ru.mtusi.messenger.security.SessionPrincipal; + +@Service +@RequiredArgsConstructor +public class AuthService { + private final UserService userService; + private final SessionService sessionService; + + public SessionDTO login(String authorizationHeader) { + var creds = BasicCredentials.parse(authorizationHeader); + UserDTO userDTO = userService.authenticate(creds.username(), creds.password()); + return sessionService.createSession(userDTO); + } + + public void logout() { + Authentication auth = SecurityContextHolder.getContext().getAuthentication(); + if (auth == null || !(auth.getPrincipal() instanceof SessionPrincipal sp)) { + throw new UnauthorizedException("No active session"); + } + sessionService.revoke(sp.sessionId()); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/ChatService.java b/src/main/java/ru/mtusi/messenger/service/ChatService.java new file mode 100644 index 00000000..c8b69b7b --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/ChatService.java @@ -0,0 +1,129 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.mapper.ChatMapper; +import ru.mtusi.messenger.model.Chat; +import ru.mtusi.messenger.model.User; +import ru.mtusi.messenger.repository.ChatRepository; +import ru.mtusi.messenger.validation.ChatValidator; +import ru.mtusi.messenger.util.CursorCodec; + +import java.util.*; + +@Service +@Slf4j +@RequiredArgsConstructor +public class ChatService { + private final ChatMapper chatMapper; + private final ChatValidator chatValidator; + private final ChatRepository chatRepository; + + @Transactional + public ChatDTO createChat(UUID caller, ChatDTO chatDTO) { + Set members = chatValidator.validateCreate(caller, chatDTO); + Chat chat = buildChat(chatDTO, members); + chat = persistChat(chat); + return chatMapper.toChatDto(chat); + } + + private Chat buildChat(ChatDTO chatDTO, Set members) { + Chat chat = chatMapper.toChat(chatDTO); + chat.setMembers(members); + return chat; + } + + private Chat persistChat(Chat chat) { + try { + return chatRepository.saveAndFlush(chat); + } catch (DataIntegrityViolationException e) { + throw new InvalidRequestException("Cannot create chat: invalid data"); + } + } + + @Transactional(readOnly = true) + public ChatDTO getChatDTO(UUID caller, UUID chatId) { + Chat chat = requireChatForMember(caller, chatId); + return chatMapper.toChatDto(chat); + } + + @Transactional(readOnly = true) + public Chat getChat(UUID caller, UUID chatId) { + return requireChatForMember(caller, chatId); + } + + private Chat requireChatForMember(UUID caller, UUID chatId) { + Chat chat = chatRepository.findById(chatId) + .orElseThrow(() -> new NotFoundException("Chat not found")); + if (chat.getMembers().stream().noneMatch(m -> m.getId().equals(caller))) { + throw new NotFoundException("Chat not found"); + } + return chat; + } + + @Transactional(readOnly = true) + public ChatPageDTO listChats(UUID userId, Integer limit, String cursor) { + int size = resolveSize(limit); + CursorCodec.Cursor decoded = parseChatsCursor(cursor); + List rows = loadChatPage(userId, decoded, size); + return buildPage(rows, size); + } + + private int resolveSize(Integer limit) { + return (limit == null) ? 50 : limit; + } + + private List loadChatPage(UUID userId, CursorCodec.Cursor cursor, int size) { + if (cursor == null) { + return chatRepository.findPageByMember(userId, Pageable.ofSize(size + 1)); + } + return chatRepository.findPageByMemberAfterCursor( + userId, + cursor.boundary().createdAt(), + cursor.boundary().id(), + Pageable.ofSize(size + 1)); + } + + private CursorCodec.Cursor parseChatsCursor(String cursor) { + if (cursor == null || cursor.isBlank()) { + return null; + } + CursorCodec.Cursor decoded = CursorCodec.decode(cursor); + if (decoded.scopeId() != null) { + throw new InvalidRequestException("Invalid cursor"); + } + return decoded; + } + + private ChatPageDTO buildPage(List rows, int size) { + List items = rows.stream() + .limit(size) + .map(chatMapper::toChatDto) + .toList(); + + ChatPageDTO page = new ChatPageDTO(); + page.setItems(items); + page.setNextCursor(buildNextCursor(rows, size)); + return page; + } + + private String buildNextCursor(List rows, int size) { + if (rows.size() <= size) { + return null; + } + Chat last = rows.get(size - 1); + return CursorCodec.encode(null, boundaryOf(last)); + } + + private CursorCodec.PageBoundary boundaryOf(Chat chat) { + return new CursorCodec.PageBoundary(chat.getCreatedAt(), chat.getId()); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/HealthService.java b/src/main/java/ru/mtusi/messenger/service/HealthService.java new file mode 100644 index 00000000..3269338c --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/HealthService.java @@ -0,0 +1,31 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Service; +import ru.mtusi.messenger.dto.HealthDTO; +import ru.mtusi.messenger.exception.ServiceUnavailableException; + +@Service +@RequiredArgsConstructor +public class HealthService { + + private final JdbcTemplate jdbcTemplate; + + public HealthDTO readiness() { + try { + jdbcTemplate.queryForObject("SELECT 1", Integer.class); + } catch (Exception e) { + throw new ServiceUnavailableException("Database unavailable"); + } + HealthDTO h = new HealthDTO(); + h.setStatus(HealthDTO.StatusEnum.OK); + return h; + } + + public HealthDTO liveness() { + HealthDTO h = new HealthDTO(); + h.setStatus(HealthDTO.StatusEnum.OK); + return h; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/MessageService.java b/src/main/java/ru/mtusi/messenger/service/MessageService.java new file mode 100644 index 00000000..637862e7 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/MessageService.java @@ -0,0 +1,111 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.config.properties.AppProperties; +import ru.mtusi.messenger.dto.CreateMessageDTO; +import ru.mtusi.messenger.dto.MessageDTO; +import ru.mtusi.messenger.dto.MessagePageDTO; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.exception.PayloadTooLargeException; +import ru.mtusi.messenger.mapper.ChatMapper; +import ru.mtusi.messenger.mapper.MessageMapper; +import ru.mtusi.messenger.model.Chat; +import ru.mtusi.messenger.model.Message; +import ru.mtusi.messenger.model.User; +import ru.mtusi.messenger.repository.MessageRepository; +import ru.mtusi.messenger.util.CursorCodec; + +import java.util.List; +import java.util.UUID; + +@Service +@Slf4j +@RequiredArgsConstructor +public class MessageService { + private final ChatMapper chatMapper; + private final MessageRepository messageRepository; + private final ChatService chatService; + private final UserService userService; + private final MessageMapper messageMapper; + private final AppProperties appProperties; + + @Transactional + public MessageDTO createMessage(UUID senderId, UUID chatId, CreateMessageDTO createMessageDTO) { + Chat chat = chatService.getChat(senderId, chatId);; + validateCreate(chatId, createMessageDTO); + User sender = userService.getReferenceUserById(senderId); + Message message = buildMessage(createMessageDTO, sender, chat); + try { + message = messageRepository.saveAndFlush(message); + } catch (DataIntegrityViolationException e) { + throw new NotFoundException("Cannot create message: referenced entity is missing"); + } + + log.info("Created message id={} in chat={}", message.getId(), chatId); + return messageMapper.toMessageDTO(message); + } + + private void validateCreate(UUID chatId, CreateMessageDTO dto) { + if (dto.getText() == null || dto.getText().isBlank()) { + throw new InvalidRequestException("Empty text"); + } + if (messageRepository.countByChatId(chatId) >= appProperties.maxMessagesPerChat()) { + throw new PayloadTooLargeException("Chat history limit reached"); + } + } + + private Message buildMessage(CreateMessageDTO createMessageDTO, User sender, Chat chat) { + Message message = messageMapper.toMessage(createMessageDTO); + message.setChat(chat); + message.setSender(sender); + return message; + } + + @Transactional(readOnly = true) + public MessagePageDTO listMessages(UUID userId, UUID chatId, Integer limit, String cursor) { + int size = (limit == null) ? 50 : limit; + chatService.getChatDTO(userId, chatId); + CursorCodec.Cursor decoded = parseMessagesCursor(cursor, chatId); + List rows = (decoded == null) ? messageRepository.findPageByChat(chatId, Pageable.ofSize(size + 1)) + : messageRepository.findPageByChatAfterCursor(chatId, decoded.boundary().createdAt(), decoded.boundary().id(), Pageable.ofSize(size + 1)); + return buildPage(rows, size, chatId); + } + + private CursorCodec.Cursor parseMessagesCursor(String cursor, UUID chatId) { + if (cursor == null || cursor.isBlank()) { + return null; + } + CursorCodec.Cursor decoded = CursorCodec.decode(cursor); + if (decoded.scopeId() == null || !decoded.scopeId().equals(chatId)) { + throw new InvalidRequestException("Cursor from another chat"); + } + return decoded; + } + + private MessagePageDTO buildPage(List rows, int size, UUID chatId) { + List items = rows.stream() + .limit(size) + .map(messageMapper::toMessageDTO) + .toList(); + + MessagePageDTO page = new MessagePageDTO(); + page.setItems(items); + page.setNextCursor(buildNextCursor(rows, size, chatId)); + return page; + } + + private String buildNextCursor(List rows, int size, UUID chatId) { + if (rows.size() <= size) { + return null; + } + Message last = rows.get(size - 1); + return CursorCodec.encode(chatId, new CursorCodec.PageBoundary( + last.getCreatedAt(), last.getId())); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/SessionCacheService.java b/src/main/java/ru/mtusi/messenger/service/SessionCacheService.java new file mode 100644 index 00000000..8573e426 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/SessionCacheService.java @@ -0,0 +1,65 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.cache.Cache; +import org.springframework.cache.CacheManager; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.cache.CacheHealthTracker; +import ru.mtusi.messenger.repository.SessionRepository; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SessionCacheService { + + public static final String SESSIONS = "sessions"; + + private final SessionRepository sessionRepository; + private final CacheManager cacheManager; + private final CacheHealthTracker cacheHealthTracker; + + @Cacheable(value = SESSIONS, key = "#hex", unless = "#result == null") + @Transactional(readOnly = true) + public SessionService.SessionRecord lookupByHash(String hex) { + byte[] hash = hexToBytes(hex); + return sessionRepository.findByTokenHash(hash) + .filter(s -> s.getRevokedAt() == null) + .map(s -> new SessionService.SessionRecord( + s.getId(), s.getUserId(), s.getExpiresAt())) + .orElse(null); + } + + @CacheEvict(value = SESSIONS, key = "#hex") + public void evict(String hex) { + } + + public void dropCacheIfStale() { + if (!cacheHealthTracker.consumeStale()) { + return; + } + try { + Cache cache = cacheManager.getCache(SESSIONS); + if (cache != null) { + cache.clear(); + } + log.info("Cache '{}' cleared after stale flag", SESSIONS); + } catch (RuntimeException e) { + log.warn("Cache clear failed: {}", e.getMessage()); + cacheHealthTracker.markStale(); + } + } + + private static byte[] hexToBytes(String hex) { + int len = hex.length(); + byte[] out = new byte[len / 2]; + for (int i = 0; i < len; i += 2) { + out[i / 2] = (byte) ((Character.digit(hex.charAt(i), 16) << 4) + + Character.digit(hex.charAt(i + 1), 16)); + } + return out; + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/SessionService.java b/src/main/java/ru/mtusi/messenger/service/SessionService.java new file mode 100644 index 00000000..fe6f5557 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/SessionService.java @@ -0,0 +1,81 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.config.properties.SessionProperties; +import ru.mtusi.messenger.dto.SessionDTO; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.mapper.SessionMapper; +import ru.mtusi.messenger.model.Session; +import ru.mtusi.messenger.repository.SessionRepository; +import ru.mtusi.messenger.util.TokenGenerator; +import ru.mtusi.messenger.util.TokenHasher; + +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.UUID; + +@Slf4j +@RequiredArgsConstructor +@Service +public class SessionService { + private final TokenGenerator tokenGenerator; + private final TokenHasher tokenHasher; + private final SessionProperties sessionProperties; + private final SessionRepository sessionRepository; + private final SessionMapper sessionMapper; + private final SessionCacheService sessionCacheService; + + @Transactional + public SessionDTO createSession(UserDTO userDTO) { + String token = tokenGenerator.generate(); + Session session = sessionRepository.save(buildSession(userDTO,token)); + return sessionMapper.toSessionDTO(session, token, userDTO); + } + + public SessionRecord requireActive(String token) { + sessionCacheService.dropCacheIfStale(); + String hex = tokenHasher.hash(token); + SessionRecord record = sessionCacheService.lookupByHash(hex); + requireNotExpired(record, hex); + return record; + } + + private void requireNotExpired(SessionRecord record, String hex) { + if (record == null || isExpired(record)) { + sessionCacheService.evict(hex); + throw new UnauthorizedException("Invalid or expired session"); + } + } + + private boolean isExpired(SessionRecord record) { + return record.expiresAt().isBefore(Instant.now()); + } + + @Transactional + public void revoke(UUID sessionId) { + sessionRepository.findById(sessionId).ifPresent(this::markRevokedAndEvict); + } + + private void markRevokedAndEvict(Session session) { + if (session.getRevokedAt() == null) { + session.setRevokedAt(Instant.now().truncatedTo(ChronoUnit.MILLIS)); + } + sessionCacheService.evict(tokenHasher.hash(session.getTokenHash())); + } + + private Session buildSession(UserDTO userDTO, String token) { + Session session = new Session(); + session.setUserId(userDTO.getId()); + session.setTokenHash(tokenHasher.sha256(token)); + session.setExpiresAt(Instant.now() + .plus(sessionProperties.ttl()) + .truncatedTo(ChronoUnit.MILLIS)); + return session; + } + + public record SessionRecord(UUID sessionId, UUID userId, Instant expiresAt) {} +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/UserService.java b/src/main/java/ru/mtusi/messenger/service/UserService.java new file mode 100644 index 00000000..37bce670 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/UserService.java @@ -0,0 +1,83 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataIntegrityViolationException; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.exception.ConflictException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.exception.UnauthorizedException; +import ru.mtusi.messenger.mapper.UserMapper; +import ru.mtusi.messenger.model.User; +import ru.mtusi.messenger.repository.UserRepository; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Slf4j +public class UserService { + private final PasswordEncoder passwordEncoder; + private final UserMapper userMapper; + private final UserRepository userRepository; + + @Transactional + public Set requireUsers(Collection ids) { + Set uniqueIds = new HashSet<>(ids); + Set users = userRepository.findAllByIdForShare(uniqueIds); + if (users.size() != uniqueIds.size()) { + throw new NotFoundException("Users not found: " + findMissing(uniqueIds, users)); + } + return users; + } + + private Set findMissing(Set requested, Set found) { + Set foundIds = found.stream() + .map(User::getId) + .collect(Collectors.toSet()); + + Set missing = new HashSet<>(requested); + missing.removeAll(foundIds); + return missing; + } + + @Transactional(readOnly = true) + public UserDTO authenticate(String username, String password) { + User user = userRepository.findByUsername(username).orElseThrow(() -> new UnauthorizedException("Bad credentials")); + + if (!passwordEncoder.matches(password, user.getPasswordHash())) { + throw new UnauthorizedException("Bad credentials"); + } + return userMapper.toUserDto(user); + } + + @Transactional + public UserDTO registerUser(UserDTO userDTO) { + User user = userMapper.toUser(userDTO); + user.setPasswordHash(passwordEncoder.encode(userDTO.getPassword())); + try { + return userMapper.toUserDto(userRepository.saveAndFlush(user)); + } catch (DataIntegrityViolationException exception) { + throw new ConflictException("Username already exists"); + } + } + + @Transactional(readOnly = true) + public UserDTO currentUser(UUID userId) { + return userMapper.toUserDto(userRepository.findById(userId).orElseThrow(() -> + new NotFoundException("User not found") + )); + } + + @Transactional + public User getReferenceUserById(UUID senderId) { + return userRepository.getReferenceById(senderId); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/util/CursorCodec.java b/src/main/java/ru/mtusi/messenger/util/CursorCodec.java new file mode 100644 index 00000000..860d4029 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/util/CursorCodec.java @@ -0,0 +1,37 @@ +package ru.mtusi.messenger.util; + +import ru.mtusi.messenger.exception.InvalidRequestException; + +import java.nio.charset.StandardCharsets; +import java.time.Instant; +import java.util.Base64; +import java.util.UUID; + +public final class CursorCodec { + + private CursorCodec() {} + + public record PageBoundary(Instant createdAt, UUID id) {} + + public record Cursor(UUID scopeId, PageBoundary boundary) {} + + public static String encode(UUID scopeId, PageBoundary boundary) { + String raw = (scopeId == null ? "" : scopeId.toString()) + + "|" + boundary.createdAt() + "|" + boundary.id(); + return Base64.getUrlEncoder().withoutPadding() + .encodeToString(raw.getBytes(StandardCharsets.UTF_8)); + } + + public static Cursor decode(String cursor) { + try { + String raw = new String(Base64.getUrlDecoder().decode(cursor), StandardCharsets.UTF_8); + String[] p = raw.split("\\|", -1); + UUID scopeId = p[0].isEmpty() ? null : UUID.fromString(p[0]); + PageBoundary boundary = new PageBoundary( + Instant.parse(p[1]), UUID.fromString(p[2])); + return new Cursor(scopeId, boundary); + } catch (Exception e) { + throw new InvalidRequestException("Invalid cursor"); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/util/TokenGenerator.java b/src/main/java/ru/mtusi/messenger/util/TokenGenerator.java new file mode 100644 index 00000000..fa000c45 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/util/TokenGenerator.java @@ -0,0 +1,17 @@ +package ru.mtusi.messenger.util; + +import org.springframework.stereotype.Component; + +import java.security.SecureRandom; +import java.util.Base64; + +@Component +public class TokenGenerator { + private final SecureRandom rng = new SecureRandom(); + + public String generate() { + byte[] raw = new byte[32]; + rng.nextBytes(raw); + return Base64.getUrlEncoder().withoutPadding().encodeToString(raw); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/util/TokenHasher.java b/src/main/java/ru/mtusi/messenger/util/TokenHasher.java new file mode 100644 index 00000000..c63ea7f6 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/util/TokenHasher.java @@ -0,0 +1,37 @@ +package ru.mtusi.messenger.util; + +import org.springframework.stereotype.Component; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +@Component("tokenHasher") +public class TokenHasher { + + public byte[] sha256(String token) { + try { + return MessageDigest.getInstance("SHA-256") + .digest(token.getBytes(StandardCharsets.UTF_8)); + } catch (NoSuchAlgorithmException e) { + throw new IllegalStateException("SHA-256 not available", e); + } + } + + public String hash(String token) { + return toHex(sha256(token)); + } + + public String hash(byte[] bytes) { + return toHex(bytes); + } + + private String toHex(byte[] bytes) { + StringBuilder sb = new StringBuilder(bytes.length * 2); + for (byte b : bytes) { + sb.append(Character.forDigit((b >> 4) & 0xF, 16)); + sb.append(Character.forDigit(b & 0xF, 16)); + } + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java b/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java new file mode 100644 index 00000000..b954e5b8 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java @@ -0,0 +1,66 @@ +package ru.mtusi.messenger.validation; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.exception.InvalidRequestException; +import ru.mtusi.messenger.exception.NotFoundException; +import ru.mtusi.messenger.model.User; +import ru.mtusi.messenger.service.UserService; + +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +@Component +@RequiredArgsConstructor +public class ChatValidator { + + private final UserService userService; + + public Set validateCreate(UUID caller, ChatDTO chatDTO) { + List memberIds = chatDTO.getMemberIds(); + String title = chatDTO.getTitle(); + + requireNotBlank(title, "Title must not be blank"); + requireNonEmpty(memberIds, "member_ids must not be empty"); + requireNoDuplicates(memberIds, "member_ids contains duplicates"); + requireContains(memberIds, caller, "Вызывающий должен быть участником"); + + return requireAllUsersExist(memberIds); + } + + private void requireNotBlank(String value, String message) { + if (value == null || value.trim().isEmpty()) { + throw new InvalidRequestException(message); + } + } + + private void requireNonEmpty(List ids, String message) { + if (ids == null || ids.isEmpty()) { + throw new InvalidRequestException(message); + } + } + + private void requireNoDuplicates(List ids, String message) { + Set unique = new HashSet<>(ids); + if (unique.size() != ids.size()) { + throw new InvalidRequestException(message); + } + } + + private void requireContains(List ids, UUID value, String message) { + if (!ids.contains(value)) { + throw new InvalidRequestException(message); + } + } + + private Set requireAllUsersExist(List ids) { + try { + return userService.requireUsers(ids); + } catch (NotFoundException e) { + throw new InvalidRequestException(e.getMessage()); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 00000000..3f85cde9 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,85 @@ +spring: + application: + name: messenger-lab2 + config: + import: "optional:configtree:/run/secrets/" + lifecycle: + timeout-per-shutdown-phase: 10s + jackson: + default-property-inclusion: non_null + deserialization: + fail-on-unknown-properties: true + datasource: + driver-class-name: org.postgresql.Driver + url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/messenger} + username: ${SPRING_DATASOURCE_USERNAME:messenger} + password: ${SPRING_DATASOURCE_PASSWORD:change-me-local-only} + hikari: + connection-timeout: 2000 + validation-timeout: 1000 + maximum-pool-size: 10 + minimum-idle: 2 + idle-timeout: 60000 + max-lifetime: 1800000 + jpa: + hibernate: + ddl-auto: validate + open-in-view: false + properties: + hibernate: + jdbc: + time_zone: UTC + dialect: org.hibernate.dialect.PostgreSQLDialect + flyway: + enabled: true + locations: classpath:db/migration + data: + redis: + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} + cache: + type: redis + +server: + address: ${APP_HOST:0.0.0.0} + port: ${APP_PORT:8080} + shutdown: graceful + +management: + endpoints: + web: + exposure: + include: health,metrics,caches + endpoint: + health: + probes: + enabled: true + show-details: always + caches: + enabled: true + + +app: + limits: + max-messages-per-chat: ${MAX_MESSAGES_PER_CHAT:10000} + rate: + rate-per-minute: ${RATE_PER_MINUTE:600} + retry-after-seconds: ${RETRY_AFTER_SECONDS:60} + session: + ttl: ${SESSION_TTL_SECONDS:400}s + redis: + host: ${SPRING_DATA_REDIS_HOST:localhost} + port: ${SPRING_DATA_REDIS_PORT:6379} + command-timeout: ${REDIS_COMMAND_TIMEOUT:500ms} + connect-timeout: ${REDIS_CONNECT_TIMEOUT:500ms} + shutdown-timeout: ${REDIS_SHUTDOWN_TIMEOUT:100ms} + keep-alive-idle: ${REDIS_KEEP_ALIVE_IDLE:30s} + keep-alive-interval: ${REDIS_KEEP_ALIVE_INTERVAL:10s} + tcp-user-timeout: ${REDIS_TCP_USER_TIMEOUT:10s} + +logging: + pattern: + console: "%d{ISO8601} %-5level [%X{requestId}] %logger{20} - %msg%n" + level: + org.springframework.cache: TRACE + org.springframework.cache.interceptor: TRACE \ No newline at end of file diff --git a/src/main/resources/db/migration/V1__init.sql b/src/main/resources/db/migration/V1__init.sql new file mode 100644 index 00000000..dc3eb522 --- /dev/null +++ b/src/main/resources/db/migration/V1__init.sql @@ -0,0 +1,79 @@ +CREATE EXTENSION IF NOT EXISTS "uuid-ossp"; + +-- ---------- users ---------- +CREATE TABLE users ( + id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), + username VARCHAR(32) NOT NULL, + display_name VARCHAR(100) NOT NULL, + password_hash VARCHAR(255) NOT NULL, + created_at TIMESTAMPTZ NOT NULL, + CONSTRAINT uq_users_username UNIQUE (username), + CONSTRAINT ck_users_username_format + CHECK (username ~ '^[a-z0-9_]{3,32}$'), + CONSTRAINT ck_users_display_name_not_blank + CHECK (length(btrim(display_name)) > 0) +); + +-- ---------- chats ---------- +CREATE TABLE chats ( + id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), + title VARCHAR(100) NOT NULL, + created_at TIMESTAMPTZ NOT NULL, + CONSTRAINT ck_chats_title_not_blank CHECK (length(btrim(title)) > 0) +); + +-- ---------- chat_members ---------- +CREATE TABLE chat_members ( + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + PRIMARY KEY (chat_id, user_id) +); + +-- ---------- messages ---------- +CREATE TABLE messages ( + id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + sender_id UUID NOT NULL REFERENCES users(id) ON DELETE RESTRICT, + text VARCHAR(4000) NOT NULL, + created_at TIMESTAMPTZ NOT NULL, + CONSTRAINT ck_messages_text_not_blank CHECK (length(btrim(text)) > 0) +); + +-- ---------- sessions ---------- +CREATE TABLE sessions ( + id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + token_hash BYTEA NOT NULL, + created_at TIMESTAMPTZ NOT NULL, + expires_at TIMESTAMPTZ NOT NULL, + revoked_at TIMESTAMPTZ, + CONSTRAINT uq_sessions_token_hash UNIQUE (token_hash), + CONSTRAINT ck_sessions_expiry CHECK (expires_at > created_at), + CONSTRAINT ck_sessions_token_len CHECK (octet_length(token_hash) = 32) +); + +-- ========================================================= +-- Indexes (critical for keyset pagination & EXPLAIN on lab5) +-- ========================================================= + +-- Keyset pagination: ORDER BY created_at ASC, id ASC (JPQL uses ASC) +CREATE INDEX idx_messages_chat_created_asc_id + ON messages (chat_id, created_at ASC, id ASC); + +-- "My chats" list (listChats) +CREATE INDEX idx_chat_members_user + ON chat_members (user_id); + +-- For chats list pagination: ORDER BY created_at ASC, id ASC +CREATE INDEX idx_chats_created_asc_id + ON chats (created_at ASC, id ASC); + +-- Active sessions per user (logout-all / audit) +CREATE INDEX idx_sessions_user_active + ON sessions (user_id) + WHERE revoked_at IS NULL; + +-- Cleanup of expired sessions +CREATE INDEX idx_sessions_expires_active + ON sessions (expires_at) + WHERE revoked_at IS NULL; \ No newline at end of file diff --git a/src/test/java/ru/mtusi/messenger/MessengerLab1ApplicationTests.java b/src/test/java/ru/mtusi/messenger/MessengerLab1ApplicationTests.java new file mode 100644 index 00000000..2da5d512 --- /dev/null +++ b/src/test/java/ru/mtusi/messenger/MessengerLab1ApplicationTests.java @@ -0,0 +1,13 @@ +package ru.mtusi.messenger; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class MessengerLab1ApplicationTests { + + @Test + void contextLoads() { + } + +} -- 2.54.0 From 4918969c6ba1c12e3ecdd48f4c0e0f2dc961aa8b Mon Sep 17 00:00:00 2001 From: Danil01042005 Date: Thu, 15 Oct 2026 13:04:16 +0300 Subject: [PATCH 2/5] complete level 5 track 1 --- REPORT.md | 202 ++++++++++++++++-- build.gradle | 1 + docker-compose.load.yml | 23 ++ docker-compose.override.yml | 7 + docker-compose.yaml | 102 +++++++-- evidence/lab3/B1.json | 17 ++ evidence/lab3/B2-c32.json | 17 ++ evidence/lab3/B2-improved-warmup.json | 17 ++ evidence/lab3/B2-improved.json | 17 ++ evidence/lab3/B2-keepalive.json | 17 ++ evidence/lab3/B2-sync-off.json | 17 ++ evidence/lab3/B2-warmup.json | 17 ++ evidence/lab3/B2.json | 17 ++ evidence/lab3/C1.json | 17 ++ evidence/lab3/C2.json | 17 ++ nginx.conf | 45 ++++ scripts/restart.cmd | 3 + scripts/restart.ps1 | 3 + scripts/restart.sh | 7 + scripts/stop-one.cmd | 3 + scripts/stop-one.ps1 | 14 ++ scripts/stop-one.sh | 8 + .../properties/IdempotencyProperties.java | 10 + .../config/properties/InstanceProperties.java | 7 + .../mtusi/messenger/controller/AuthApi.java | 3 +- .../messenger/controller/AuthController.java | 3 +- .../controller/HealthController.java | 1 - .../controller/MessageController.java | 4 +- .../messenger/controller/MessagesApi.java | 2 + .../GlobalExceptionHandler.java | 7 + .../messenger/filter/InstanceIdFilter.java | 30 +++ .../messenger/filter/RequestIdFilter.java | 6 +- .../mtusi/messenger/model/IdempotencyKey.java | 47 ++++ .../repository/IdempotencyRepository.java | 39 ++++ .../messenger/service/IdempotencyService.java | 63 ++++++ .../messenger/service/MessageService.java | 19 +- .../IdempotencyPayloadConverter.java | 29 +++ .../validation/IdempotencyValidator.java | 39 ++++ src/main/resources/application.yaml | 10 +- src/main/resources/db/migration/V1__init.sql | 23 +- 40 files changed, 877 insertions(+), 53 deletions(-) create mode 100644 docker-compose.load.yml create mode 100644 docker-compose.override.yml create mode 100644 evidence/lab3/B1.json create mode 100644 evidence/lab3/B2-c32.json create mode 100644 evidence/lab3/B2-improved-warmup.json create mode 100644 evidence/lab3/B2-improved.json create mode 100644 evidence/lab3/B2-keepalive.json create mode 100644 evidence/lab3/B2-sync-off.json create mode 100644 evidence/lab3/B2-warmup.json create mode 100644 evidence/lab3/B2.json create mode 100644 evidence/lab3/C1.json create mode 100644 evidence/lab3/C2.json create mode 100644 nginx.conf create mode 100644 scripts/restart.cmd create mode 100644 scripts/restart.ps1 create mode 100755 scripts/restart.sh create mode 100644 scripts/stop-one.cmd create mode 100644 scripts/stop-one.ps1 create mode 100755 scripts/stop-one.sh create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/IdempotencyProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/config/properties/InstanceProperties.java create mode 100644 src/main/java/ru/mtusi/messenger/filter/InstanceIdFilter.java create mode 100644 src/main/java/ru/mtusi/messenger/model/IdempotencyKey.java create mode 100644 src/main/java/ru/mtusi/messenger/repository/IdempotencyRepository.java create mode 100644 src/main/java/ru/mtusi/messenger/service/IdempotencyService.java create mode 100644 src/main/java/ru/mtusi/messenger/util/converter/IdempotencyPayloadConverter.java create mode 100644 src/main/java/ru/mtusi/messenger/validation/IdempotencyValidator.java diff --git a/REPORT.md b/REPORT.md index c2679005..7ce3bce4 100644 --- a/REPORT.md +++ b/REPORT.md @@ -1,37 +1,203 @@ # Отчёт — лабораторная 3 -- Автор, группа: TODO -- Целевая оценка; выбранный трек 5, если нужен: TODO +- Автор, группа: Иванов Данил, БВТ2301 +- Целевая оценка: **5** трек 1 - Commit/PR: TODO после публикации -- Использованные источники, библиотеки и помощь ИИ: TODO +- Источники: официальная документация Spring Boot 4.1, Docker Compose v2, nginx 1.27, PostgreSQL 16, HikariCP, MapStruct 1.6; помощь ИИ — консультации по архитектуре и отладке, все решения проверены экспериментально ## Запуск из чистого clone -TODO: версии runtime/образов, prerequisites, команды создания локальных secrets/.env, build, миграций, запуска, ожидания готовности, тестов и остановки. Указать необходимые действия оператора. Не вставлять секреты. Отдельно указать безопасную остановку и команду намеренного удаления учебных данных. +**Prerequisites:** Docker Desktop 4.x, Python 3.11+, PowerShell 5.1+ (Windows) или bash (Linux/macOS). + +**Создание секретов (один раз):** +```powershell +New-Item -ItemType Directory -Force -Path secrets +"messenger" | Out-File -NoNewline secrets/postgres_db.txt +"messenger" | Out-File -NoNewline secrets/postgres_user.txt +"change-me-local" | Out-File -NoNewline secrets/postgres_password.txt +``` + +**Сборка и запуск:** +```powershell +docker compose --env-file .env up -d --build +Start-Sleep -Seconds 45 +docker compose ps +``` + +Ожидаем: `lab3-migrate-1` → `Exited (0)`, `lab3-api-1/2` → `Up (healthy)`, `lab3-lb-1`, `lab3-db-1`, `lab3-redis-1` → `Up`. + +**Публичный smoke:** +```powershell +.venv\Scripts\python.exe tests\smoke.py --base-url "http://127.0.0.1:8080" +``` + +**Проверки уровня 3–4:** +```powershell +.venv\Scripts\python.exe tests\smoke.py --base-url "http://127.0.0.1:8080" +.venv\Scripts\python.exe tests\resilience.py --mode persistence --action-script "scripts/restart.cmd" --base-url "http://127.0.0.1:8080" +.venv\Scripts\python.exe tests\resilience.py --mode failover --action-script "scripts/stop-one.cmd" --base-url "http://127.0.0.1:8080" +``` + +**Безопасная остановка (volumes сохраняются):** +```powershell +docker compose --env-file .env down +``` + +**Удаление учебных данных:** +```powershell +docker compose --env-file .env down -v +``` ## Архитектура и решения -TODO: схема процессов/хранилищ, источник истины, транзакционные границы, ограничения. Что перенесено из lab2, что изменено в этой работе. Соответствие переменных из .env.example реальной конфигурации. +**Топология:** +``` +client → nginx (LB, 127.0.0.1:8080) → api-1 / api-2 (Spring Boot 4.1.1, Java 21) + ↓ + PostgreSQL 16 — общая БД (данные, сессии, idempotency_keys) + Redis 7.4 — общий кэш +``` + +**Ключевые решения:** + +- **LB** — nginx 1.27.5, upstream с `zone api_backend 64k` + `resolve` + Docker DNS `127.0.0.11 valid=10s ipv6=off`. `max_fails=1 fail_timeout=15s`, `proxy_next_upstream` на 502/503/504. Это позволяет nginx видеть смену IP реплик без перезапуска. +- **X-Instance-Id** — вычисляется из `/etc/hostname` (short container ID), выставляется `InstanceIdFilter` с `@Order(HIGHEST_PRECEDENCE)` — раньше Spring Security, поэтому присутствует и на 401. Конфиг в `InstanceProperties` (`app.instance.id`). +- **X-Request-Id** — генерируется `RequestIdFilter`, попадает в MDC и в тело ошибок через `ApiErrorFactory`. +- **Идемпотентность** — таблица `idempotency_keys`, PK `(user_id, method, chat_id, idempotency_key)`, `ON CONFLICT DO NOTHING`, `response_body JSONB`. Гонка решается atomic insert + read-after-conflict. Логика вынесена в отдельный `IdempotencyService` + `IdempotencyValidator` + `IdempotencyPayloadConverter`. +- **Миграции** — отдельный сервис `migrate` (`SPRING_FLYWAY_ENABLED=true`). `api` стартует с `SPRING_FLYWAY_ENABLED=false` после `service_completed_successfully`. +- **Сессии** — в PostgreSQL. Токен переживает рестарт api и переключение между репликами. +- **Graceful shutdown** — `server.shutdown: graceful` + `spring.lifecycle.timeout-per-shutdown-phase: 30s` + `stop_grace_period: 40s` в compose. + +**Что изменено относительно lab2:** добавлены X-Instance-Id, Idempotency-Key и таблица `idempotency_keys` (в той же V1-миграции), вынесена идемпотентность в отдельный сервис, добавлен nginx-LB, миграции вынесены в отдельный контейнер. + +**Соответствие .env.example:** `RATE_PER_MINUTE`, `SESSION_TTL_SECONDS`, `APP_ENV`, `SESSION_STORE` — через переменные окружения; секреты — файлами в `./secrets/`. ## Доказательства критериев -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл доказательства | -| --- | --- | --- | --- | -| Публичный smoke | make test | TODO | TODO | -| Остальные пункты уровня 3 | TODO | TODO | TODO | -| Все пункты уровня 4, если заявлен | TODO | TODO | TODO | -| Выбранный трек 5, если заявлен | TODO | TODO | TODO | - -TODO: добавить отдельную строку для каждого заявленного критерия. PASS без команды и наблюдения не является доказательством. Проверка инфраструктурного hook требует подтверждения, какие реальные процессы/хранилища перезапущены. +| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл | +|---|---|---|---| +| Публичный smoke | `.venv\Scripts\python.exe tests\smoke.py --base-url "http://127.0.0.1:8080"` | `PASS: lab3 public API scenario` | `evidence/lab3/smoke.log` | +| ≥2 реплики за LB | `curl -sD- http://127.0.0.1:8080/health/live` × 10 | Чередующиеся `X-Instance-Id: f9f3f663628c` / `df7af5422a83` | `evidence/lab3/nginx-B2.log` | +| Одна сессия, разные реплики | 20 запросов с одним Bearer-токеном | Ответы приходят с обоих `X-Instance-Id`, пользователь не перелогинивается | `evidence/lab3/nginx-B1.log` | +| X-Request-Id на всех ответах | `curl -sD- http://127.0.0.1:8080/api/v1/users/me` | Header `X-Request-Id` присутствует на 401 | `evidence/lab3/nginx-C1.log` | +| X-Instance-Id на 401 | `curl -sD- http://127.0.0.1:8080/api/v1/users/me` без токена | `X-Instance-Id` есть на 401 (фильтр раньше Security) | `evidence/lab3/nginx-C1.log` | +| Idempotency-Key обязателен | POST /messages без header | HTTP 400, `code=invalid_request` | `evidence/lab3/idempotency-required.log` | +| Idempotency-Key повтор | 3× POST с key=k1 | Один и тот же `id` сообщения | `evidence/lab3/idempotency-repeat.log` | +| Idempotency-Key другой body → 409 | POST key=k1, body=DIFFERENT | HTTP 409, `code=conflict` | `evidence/lab3/idempotency-conflict.log` | +| Идемпотентность race-safe (2 реплики, 20 параллельных) | 20 одновременных POST с одним ключом | Один `message_id` в БД, `count=1` | `evidence/lab3/idempotency-race.log` | +| Failover (`make test-failover`) | `.venv\...\resilience.py --mode failover --action-script scripts/stop-one.cmd` | `observed_instances_before=2`, `successful_writes=7`, `failed_attempts=0`, `first_recovery_seconds=4.234` | `evidence/lab3/failover.log` | +| Persistence (`make test-persistence`) | `.venv\...\resilience.py --mode persistence --action-script scripts/restart.cmd` | Данные и старый токен сохранены | `evidence/lab3/persistence.log` | +| Graceful shutdown | `docker stop ` | `Commencing graceful shutdown` + `Graceful shutdown complete` | `evidence/lab3/api-.log` | +| LB исключает backend при rolling | 2 последовательные замены реплик под нагрузкой | 502/503/504 = 0 за прогон | `evidence/lab3/nginx-rolling-access.log` | +| CPU/RAM limits | `docker inspect lab3-api-1 --format '{{.HostConfig.NanoCpus}} {{.HostConfig.Memory}}'` | `1000000000 536870912` (1 CPU / 512 MiB) | `evidence/lab3/limits.txt` | +| Нет `container_name`, нет ports у api | `docker compose ps --format 'table {{.Name}}\t{{.Ports}}'` | `lab3-api-1` / `lab3-api-2` — только `8080/tcp`, `lab3-lb-1` — `127.0.0.1:8080->80/tcp` | `evidence/lab3/ports.txt` | +| Rolling update под нагрузкой | 2 замены под нагрузкой 90с/conc=3 | `error_ratio=0.00106`, 502=1, 504=7 | `evidence/lab3/load-rolling.json` | ## Эксперименты и отказы -TODO: гипотеза, hardware/лимиты, версии, объём данных, профиль нагрузки, concurrency/arrival rate, длительность/прогрев, повторы, успешные RPS, ошибки, p50/p95/p99, CPU/RAM. Сохранить raw summary без tokens и объяснить ограничения измерения. +### Failover -| Воздействие | Что ожидаем | Что наблюдали | Время восстановления / потеря данных | -| --- | --- | --- | --- | -| TODO | TODO | TODO | TODO | +**Профиль:** `resilience.py --mode failover --action-script scripts/stop-one.cmd`, одна реплика остановлена. + +| Воздействие | Ожидали | Наблюдали | +|---|---|---| +| `docker stop ` под нагрузкой | Оставшаяся реплика обслуживает без 5xx | `observed_instances_before=2`, `successful_writes=7`, `failed_attempts=0`, восстановление 4.2 сек | + +### Persistence + +**Профиль:** `restart.cmd` (перезапуск `db`, `redis`, `api`, `lb`). + +| Воздействие | Ожидали | Наблюдали | +|---|---|---| +| `docker compose restart` | Данные и старый токен сохранены | `users/me` возвращает `alice` со старым Bearer, сообщения на месте | + +### Rolling update + +**Профиль:** `load.py --duration 90 --concurrency 3` внутри docker-сети. + +**Стратегия:** поочерёдный `docker stop ` + `docker start ` (тот же контейнер и IP) + ожидание `healthy` перед следующей заменой. Так `nginx resolve valid=10s` успевает переключиться без 502-шторма. + +| Метрика | Значение | +|---|---| +| successful_requests | 3768 | +| failed_requests | 4 | +| error_ratio | **0.00106** | +| successful_rps | 41.6 | +| p50 / p95 / p99 | 37 / 177 / 315 ms | +| 502 за прогон | 1 (одна транзиентная) | +| 504 за прогон | ~7 (клиентский timeout) | + +## Трек 1. Цена масштабирования (уровень 5) + +**Гипотеза:** при фиксированном суммарном CPU/RAM добавление API-реплик даёт ускорение только до saturation point, где узкое место — один из общих ресурсов (БД, пул, LB, CPU). После точки RPS не растёт, p95 деградирует. + +**Методика:** `load.py`, профиль POST /messages, клиент в docker-сети (`http://lb:80`). Перед каждым замером — прогрев JVM 20с при concurrency 2. Лог nginx обнулялся. Одиночные прогоны на одном узле Docker Desktop. + +### Серия A — фиксированный суммарный CPU (2 ядра) + +| Конфигурация | CPU/rep | RAM/rep | RPS | p50 | p95 | p99 | error | DB conn | CPU db | +|---|---|---|---|---|---|---|---|---|---| +| C1 (1 реплика) | 2.0 | 1G | **104.8** | 68 | 186 | 298 | 0 | 10 | 2.65% | +| C2 (2 реплики) | 1.0 | 512M | **53.3** | 113 | 333 | 487 | 0.25% | 19 | 2.71% | +| C3 (4 реплики) | 0.5 | 256M | **не рабочая** (504 на bootstrap) | — | — | — | — | — | — | + +**Вывод:** при фиксированных 2 CPU добавление реплик не ускоряет, а замедляет в 2 раза. Причина — per-replica CPU throttle: Spring Boot на 1 ядре не разворачивает JIT и GC эффективно. На 0.5 ядра — полностью отказывает (не может обслужить даже `POST /users` за `proxy_read_timeout=3s`). + +### Серия B — рост ресурсов при 2 репликах + +| Конфигурация | CPU/rep | RPS | p50 | p95 | p99 | error | +|---|---|---|---|---|---|---| +| B1 (2 × 1 CPU) | 1.0 | **60.3** | 105 | 302 | 493 | 0 | +| B2 (2 × 2 CPU) | 2.0 | **154.7** | 41 | 107 | 185 | 0 | + +**Вывод:** рост per-replica CPU с 1 до 2 ядер даёт 2.5× рост RPS. Плато ещё не достигнуто по CPU. + +### Saturation point + +На конфигурации B2 (2 реплики × 2 CPU, concurrency 8) RPS упирается в диапазон **135–155**, при этом: + +- **CPU обоих процессов < 2%** → узкое место не CPU. +- **DB connections 9–24 из 50** → не пул Hikari. +- **Concurrency 8 → 32 не помогает** (136.8 RPS, p95 растёт в 3 раза) → не клиент. +- **`synchronous_commit=off` не помогает** (134.4 RPS, CPU БД падает до 0.01%) → не fsync. + +**Узкое место — виртуализованный сетевой стек Docker Desktop на Windows.** RTT между контейнерами ~11 мс, bridge-latency ~128 μs (по данным issue-трекера Docker и независимых бенчмарков). В Linux bare metal / Kubernetes потолок снимается без изменения архитектуры. + +### Перепробованные улучшения + +| Улучшение | RPS до | RPS после | Δ | +|---|---|---|---| +| Hikari pool 10 → 50 | 154.7 | 135.0 | −13% (шум) | +| `synchronous_commit=off` | 154.7 | 134.4 | −13% (шум) | +| Concurrency 8 → 32 | 135.0 | 136.8 | +1% | +| Nginx upstream `keepalive 64` | 134.4 | 142.0 | +6% (шум) | + +Разброс в пределах ±15% между идентичными конфигурациями. **Подтверждённого улучшения, сдвигающего потолок, не найдено.** + +### Что это доказывает для гипотезы + +**Saturation point существует и найден.** Но он находится **не там, где предсказывала гипотеза** — не в БД, не в пуле соединений, не в LB. Он в **среде измерения**, поверх которой работает весь стенд. Из этого следует: при переносе стенда на production-среду (Linux bare metal, Kubernetes) потолок сдвигается, и только после этого становятся видны ограничения следующих уровней — БД и пула. ## Ограничения и следующие шаги -TODO: какие отказы выдерживаются и какие нет; что не реализовано; где учебное упрощение; какое улучшение подтверждено, а какое пока гипотеза. +**Что доказано:** +- Все критерии уровня 3 и 4 — PASS. +- Saturation point существует, локализован. +- Идемпотентность race-safe, graceful shutdown, failover и rolling — работают. + +**Что не проверено:** +- Серия B с суммарным CPU > 4 ядер — плато по CPU не достигнуто. +- Hikari pool > 50 — не проверено. +- Отказ узла (трек 2) — не рассматривался. + +**Учебные упрощения:** +- Один узел Docker Desktop — БД, API, LB конкурируют за CPU хоста и делят виртуализованную сеть. +- Closed-loop бенчмарк, coordinated omission не устранён. +- Одиночные прогоны. Медиана из 3 прогонов рекомендована для повышения достоверности, но не проводилась из-за времени. + +**Следующие шаги в production-среде (за пределами стенда):** +1. Переезд на Linux bare metal или Kubernetes — устранение накладных расходов виртуализованной сети. +2. PgBouncer между API и PostgreSQL — стандарт для high-volume write-нагрузки в финансовых системах. +3. Горизонтальный шардинг БД (TiDB, CockroachDB) — масштабирование записи за пределы одного узла. +4. Асинхронный `synchronous_commit` — только для некритичных операций; в проде изменяет RPO и недопустим без идемпотентного replay. +``` \ No newline at end of file diff --git a/build.gradle b/build.gradle index e28f457d..3f15f0ab 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'org.springframework.boot:spring-boot-starter-aspectj' + implementation 'org.springframework.boot:spring-boot-starter-jackson' runtimeOnly 'io.netty:netty-transport-native-epoll::linux-x86_64' diff --git a/docker-compose.load.yml b/docker-compose.load.yml new file mode 100644 index 00000000..53675285 --- /dev/null +++ b/docker-compose.load.yml @@ -0,0 +1,23 @@ +services: + loadgen: + image: python:3.12-slim + working_dir: /app + volumes: + - .:/app + networks: + - messenger-net + entrypoint: ["python", "tests/load.py"] + command: + - "--base-url" + - "http://lb:80" + - "--duration" + - "90" + - "--concurrency" + - "8" + - "--output" + - "evidence/lab3/load-rolling.json" + +networks: + messenger-net: + external: true + name: lab3_messenger-net \ No newline at end of file diff --git a/docker-compose.override.yml b/docker-compose.override.yml new file mode 100644 index 00000000..2ee35f5e --- /dev/null +++ b/docker-compose.override.yml @@ -0,0 +1,7 @@ +services: + api: + deploy: + resources: + limits: + cpus: '2.0' # Значение по умолчанию, будем менять + memory: 1G diff --git a/docker-compose.yaml b/docker-compose.yaml index 9c25cc21..ccb83caa 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,7 +1,6 @@ services: db: image: postgres:16-alpine - container_name: messenger-db restart: unless-stopped environment: POSTGRES_DB_FILE: /run/secrets/postgres_db @@ -21,10 +20,17 @@ services: timeout: 5s retries: 10 start_period: 10s + deploy: + resources: + limits: + cpus: '1.0' + memory: 1G + reservations: + cpus: '0.25' + memory: 256M redis: image: redis:7.4-alpine - container_name: messenger-redis restart: unless-stopped command: > redis-server @@ -41,34 +47,85 @@ services: timeout: 3s retries: 10 start_period: 5s + deploy: + resources: + limits: + cpus: '0.5' + memory: 256M + reservations: + cpus: '0.1' + memory: 64M - api: + migrate: build: context: . dockerfile: Dockerfile - container_name: messenger-api - restart: unless-stopped - depends_on: - db: - condition: service_healthy - redis: - condition: service_healthy + entrypoint: ["sh", "-c"] + command: + - "exec java -Dfile.encoding=UTF-8 -Dspring.main.web-application-type=none -jar app.jar" environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/messenger + SPRING_DATASOURCE_USERNAME_FILE: /run/secrets/postgres_user + SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgres_password + SPRING_FLYWAY_ENABLED: "true" + secrets: + - postgres_user + - postgres_password + depends_on: + db: + condition: service_healthy + restart: "no" + networks: + - messenger-net + deploy: + resources: + limits: + cpus: '0.5' + memory: 512M + reservations: + cpus: '0.1' + memory: 128M + + api: + stop_grace_period: 40s + build: + context: . + dockerfile: Dockerfile + restart: unless-stopped + depends_on: + migrate: + condition: service_completed_successfully + redis: + condition: service_healthy + entrypoint: + - "sh" + - "-c" + - "export INSTANCE_ID=\"$$(cat /etc/hostname)\"; exec java -Dfile.encoding=UTF-8 $$JAVA_OPTS -jar app.jar" + environment: + RATE_PER_MINUTE: ${RATE_PER_MINUTE:-100000} SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/messenger SPRING_DATASOURCE_USERNAME_FILE: /run/secrets/postgres_user SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgres_password SPRING_PROFILES_ACTIVE: ${APP_ENV:-lab} + SPRING_FLYWAY_ENABLED: "false" SESSION_TTL_SECONDS: ${SESSION_TTL_SECONDS:-400} SESSION_STORE: ${SESSION_STORE:-postgres} SPRING_DATA_REDIS_HOST: redis SPRING_DATA_REDIS_PORT: 6379 - ports: - - "127.0.0.1:8080:8080" secrets: - postgres_user - postgres_password networks: - messenger-net + deploy: + replicas: 2 + resources: + limits: + cpus: '1.0' + memory: 512M + reservations: + cpus: '0.25' + memory: 256M healthcheck: test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/health/ready | grep -q '\"status\":\"ok\"'"] interval: 5s @@ -76,6 +133,27 @@ services: retries: 20 start_period: 40s + lb: + image: nginx:1.27-alpine + restart: unless-stopped + ports: + - "127.0.0.1:8080:80" + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + depends_on: + api: + condition: service_healthy + networks: + - messenger-net + deploy: + resources: + limits: + cpus: '0.5' + memory: 128M + reservations: + cpus: '0.1' + memory: 32M + volumes: pgdata: redisdata: diff --git a/evidence/lab3/B1.json b/evidence/lab3/B1.json new file mode 100644 index 00000000..28aaf5e6 --- /dev/null +++ b/evidence/lab3/B1.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.123, + "concurrency": 8, + "successful_requests": 3628, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 60.343, + "successful_latency_ms": { + "p50": 105.429, + "p95": 301.881, + "p99": 492.908 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-c32.json b/evidence/lab3/B2-c32.json new file mode 100644 index 00000000..1cb55423 --- /dev/null +++ b/evidence/lab3/B2-c32.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.141, + "concurrency": 32, + "successful_requests": 8229, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 136.829, + "successful_latency_ms": { + "p50": 196.007, + "p95": 520.87, + "p99": 697.232 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-improved-warmup.json b/evidence/lab3/B2-improved-warmup.json new file mode 100644 index 00000000..cdc6fdd1 --- /dev/null +++ b/evidence/lab3/B2-improved-warmup.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 20.0, + "elapsed_seconds": 20.022, + "concurrency": 2, + "successful_requests": 1849, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 92.349, + "successful_latency_ms": { + "p50": 17.978, + "p95": 39.728, + "p99": 57.86 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-improved.json b/evidence/lab3/B2-improved.json new file mode 100644 index 00000000..dd77e883 --- /dev/null +++ b/evidence/lab3/B2-improved.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.13, + "concurrency": 8, + "successful_requests": 8119, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 135.024, + "successful_latency_ms": { + "p50": 42.124, + "p95": 174.422, + "p99": 196.827 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-keepalive.json b/evidence/lab3/B2-keepalive.json new file mode 100644 index 00000000..c1c9f3f6 --- /dev/null +++ b/evidence/lab3/B2-keepalive.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.177, + "concurrency": 8, + "successful_requests": 8545, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 141.997, + "successful_latency_ms": { + "p50": 36.182, + "p95": 171.914, + "p99": 197.476 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-sync-off.json b/evidence/lab3/B2-sync-off.json new file mode 100644 index 00000000..d615d8c2 --- /dev/null +++ b/evidence/lab3/B2-sync-off.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.089, + "concurrency": 8, + "successful_requests": 8075, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 134.385, + "successful_latency_ms": { + "p50": 43.937, + "p95": 173.574, + "p99": 199.855 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2-warmup.json b/evidence/lab3/B2-warmup.json new file mode 100644 index 00000000..2b7b8ee3 --- /dev/null +++ b/evidence/lab3/B2-warmup.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 20.0, + "elapsed_seconds": 20.019, + "concurrency": 2, + "successful_requests": 2096, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 104.701, + "successful_latency_ms": { + "p50": 16.722, + "p95": 30.34, + "p99": 48.623 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/B2.json b/evidence/lab3/B2.json new file mode 100644 index 00000000..d5823da5 --- /dev/null +++ b/evidence/lab3/B2.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.11, + "concurrency": 8, + "successful_requests": 9299, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 154.701, + "successful_latency_ms": { + "p50": 41.105, + "p95": 107.021, + "p99": 185.487 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/C1.json b/evidence/lab3/C1.json new file mode 100644 index 00000000..aa3a06ee --- /dev/null +++ b/evidence/lab3/C1.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.052, + "concurrency": 8, + "successful_requests": 6294, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 104.809, + "successful_latency_ms": { + "p50": 67.891, + "p95": 186.199, + "p99": 298.196 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/C2.json b/evidence/lab3/C2.json new file mode 100644 index 00000000..8571d091 --- /dev/null +++ b/evidence/lab3/C2.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 60.0, + "elapsed_seconds": 60.138, + "concurrency": 8, + "successful_requests": 3206, + "failed_requests": 8, + "error_ratio": 0.002489, + "successful_rps": 53.31, + "successful_latency_ms": { + "p50": 113.08, + "p95": 333.086, + "p99": 487.002 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/nginx.conf b/nginx.conf new file mode 100644 index 00000000..fd126a43 --- /dev/null +++ b/nginx.conf @@ -0,0 +1,45 @@ +worker_processes auto; + +events { + worker_connections 1024; +} + +http { + access_log /tmp/access.log; + error_log /tmp/error.log warn; + + resolver 127.0.0.11 valid=10s ipv6=off; + resolver_timeout 5s; + + upstream api_backend { + zone api_backend 64k; + server api:8080 resolve max_fails=1 fail_timeout=15s; + keepalive 64; + } + + server { + listen 80; + server_name _; + + client_max_body_size 1m; + + location / { + proxy_pass http://api_backend; + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-Host $http_host; + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + + proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_next_upstream_tries 3; + + proxy_connect_timeout 1s; + proxy_send_timeout 10s; + proxy_read_timeout 10s; + } + } +} \ No newline at end of file diff --git a/scripts/restart.cmd b/scripts/restart.cmd new file mode 100644 index 00000000..3a2b38b9 --- /dev/null +++ b/scripts/restart.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0restart.ps1" +exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/scripts/restart.ps1 b/scripts/restart.ps1 new file mode 100644 index 00000000..79cdd7ed --- /dev/null +++ b/scripts/restart.ps1 @@ -0,0 +1,3 @@ +$ErrorActionPreference = 'Stop' + +docker compose --env-file .env restart db redis api lb \ No newline at end of file diff --git a/scripts/restart.sh b/scripts/restart.sh new file mode 100755 index 00000000..53860b4b --- /dev/null +++ b/scripts/restart.sh @@ -0,0 +1,7 @@ +#!/bin/sh +set -eu + +# Restart API and state stores. Volumes are untouched -> data, sessions +# and idempotency keys survive. +# migrate is one-shot (exited 0) and is intentionally not restarted here. +docker compose --env-file .env restart db redis api lb \ No newline at end of file diff --git a/scripts/stop-one.cmd b/scripts/stop-one.cmd new file mode 100644 index 00000000..b192ddc3 --- /dev/null +++ b/scripts/stop-one.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -NoProfile -ExecutionPolicy Bypass -File "%~dp0stop-one.ps1" +exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/scripts/stop-one.ps1 b/scripts/stop-one.ps1 new file mode 100644 index 00000000..f44e6444 --- /dev/null +++ b/scripts/stop-one.ps1 @@ -0,0 +1,14 @@ +$ErrorActionPreference = 'Stop' + +if (-not $env:TARGET_INSTANCE_ID) { + Write-Error "TARGET_INSTANCE_ID is not set" + exit 2 +} + +$id = $env:TARGET_INSTANCE_ID +$logDir = "evidence\lab3" +New-Item -ItemType Directory -Force -Path $logDir | Out-Null + +docker stop $id | Out-Null +docker logs $id 2>&1 | Out-File -Encoding utf8 "$logDir\api-$id.log" +Write-Host "saved $logDir\api-$id.log" \ No newline at end of file diff --git a/scripts/stop-one.sh b/scripts/stop-one.sh new file mode 100755 index 00000000..5136f241 --- /dev/null +++ b/scripts/stop-one.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -eu + +: "${TARGET_INSTANCE_ID:?test provides target API instance alias}" + +# X-Instance-Id = short container ID (lab3 implementation detail). +# docker stop resolves short IDs natively. +docker stop "$TARGET_INSTANCE_ID" \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/IdempotencyProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/IdempotencyProperties.java new file mode 100644 index 00000000..1d1efe46 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/IdempotencyProperties.java @@ -0,0 +1,10 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "app.idempotency") +public record IdempotencyProperties( + int keyMaxLength, + String keyPattern, + int retentionHours +) {} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/properties/InstanceProperties.java b/src/main/java/ru/mtusi/messenger/config/properties/InstanceProperties.java new file mode 100644 index 00000000..e5f51dd5 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/properties/InstanceProperties.java @@ -0,0 +1,7 @@ +package ru.mtusi.messenger.config.properties; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "app.instance") +public record InstanceProperties(String id) { +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthApi.java b/src/main/java/ru/mtusi/messenger/controller/AuthApi.java index 9d0626bf..f7600f1c 100644 --- a/src/main/java/ru/mtusi/messenger/controller/AuthApi.java +++ b/src/main/java/ru/mtusi/messenger/controller/AuthApi.java @@ -5,6 +5,7 @@ */ package ru.mtusi.messenger.controller; +import jakarta.servlet.http.HttpServletRequest; import ru.mtusi.messenger.dto.SessionDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -69,7 +70,7 @@ public interface AuthApi { ) ResponseEntity createSession( - + HttpServletRequest request ); diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthController.java b/src/main/java/ru/mtusi/messenger/controller/AuthController.java index 5cb66068..9369fa3a 100644 --- a/src/main/java/ru/mtusi/messenger/controller/AuthController.java +++ b/src/main/java/ru/mtusi/messenger/controller/AuthController.java @@ -13,10 +13,9 @@ import ru.mtusi.messenger.service.AuthService; @RequiredArgsConstructor public class AuthController implements AuthApi { private final AuthService authService; - private final HttpServletRequest request; @Override - public ResponseEntity createSession() { + public ResponseEntity createSession(HttpServletRequest request) { return ResponseEntity.status(HttpStatus.CREATED).body(authService.login(request.getHeader(HttpHeaders.AUTHORIZATION))); } diff --git a/src/main/java/ru/mtusi/messenger/controller/HealthController.java b/src/main/java/ru/mtusi/messenger/controller/HealthController.java index d5b8bb7c..765d8b1d 100644 --- a/src/main/java/ru/mtusi/messenger/controller/HealthController.java +++ b/src/main/java/ru/mtusi/messenger/controller/HealthController.java @@ -9,7 +9,6 @@ import ru.mtusi.messenger.service.HealthService; @RestController @RequiredArgsConstructor public class HealthController implements HealthApi { - private final HealthService healthService; @Override diff --git a/src/main/java/ru/mtusi/messenger/controller/MessageController.java b/src/main/java/ru/mtusi/messenger/controller/MessageController.java index 11fc588d..02f462c2 100644 --- a/src/main/java/ru/mtusi/messenger/controller/MessageController.java +++ b/src/main/java/ru/mtusi/messenger/controller/MessageController.java @@ -19,8 +19,8 @@ public class MessageController implements MessagesApi { private final MessageService messageService; @Override - public ResponseEntity createMessage(UUID chatId, CreateMessageDTO createMessageDTO, @AuthenticationPrincipal SessionPrincipal principal) { - return ResponseEntity.status(HttpStatus.CREATED).body(messageService.createMessage(principal.userId(), chatId, createMessageDTO)); + public ResponseEntity createMessage(UUID chatId, String idempotencyKey, CreateMessageDTO createMessageDTO, @AuthenticationPrincipal SessionPrincipal principal) { + return ResponseEntity.status(HttpStatus.CREATED).body(messageService.createMessage(principal.userId(), chatId, createMessageDTO, idempotencyKey)); } @Override diff --git a/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java b/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java index 2d59677c..a8ebb18f 100644 --- a/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java +++ b/src/main/java/ru/mtusi/messenger/controller/MessagesApi.java @@ -78,6 +78,8 @@ public interface MessagesApi { ResponseEntity createMessage( @Parameter(name = "chat_id", description = "", required = true, in = ParameterIn.PATH) @PathVariable("chat_id") UUID chatId, + @Parameter(name = "Idempotency-Key", required = true, in = ParameterIn.HEADER) + @RequestHeader(value = "Idempotency-Key", required = true) String idempotencyKey, @Parameter(name = "CreateMessageDTO", description = "", required = true) @Valid @RequestBody CreateMessageDTO createMessageDTO, @AuthenticationPrincipal SessionPrincipal principal diff --git a/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java index 46a10d19..19292511 100644 --- a/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java +++ b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java @@ -12,6 +12,7 @@ import org.springframework.transaction.CannotCreateTransactionException; import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException; import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.MissingRequestHeaderException; import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -138,6 +139,12 @@ public class GlobalExceptionHandler { "Database error", req); } + @ExceptionHandler(MissingRequestHeaderException.class) + public ResponseEntity missingHeader(MissingRequestHeaderException e, HttpServletRequest req) { + return respond(HttpStatus.BAD_REQUEST, ErrorErrorDTO.CodeEnum.INVALID_REQUEST, + "Missing header: " + e.getHeaderName(), req); + } + private ResponseEntity respond(HttpStatus status, ErrorErrorDTO.CodeEnum code, String message, diff --git a/src/main/java/ru/mtusi/messenger/filter/InstanceIdFilter.java b/src/main/java/ru/mtusi/messenger/filter/InstanceIdFilter.java new file mode 100644 index 00000000..36721da6 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/filter/InstanceIdFilter.java @@ -0,0 +1,30 @@ +package ru.mtusi.messenger.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; +import ru.mtusi.messenger.config.properties.InstanceProperties; + +import java.io.IOException; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +@RequiredArgsConstructor +public class InstanceIdFilter extends OncePerRequestFilter { + + private final InstanceProperties props; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain chain) throws ServletException, IOException { + response.setHeader("X-Instance-Id", props.id()); + chain.doFilter(request, response); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java index 54668db8..b6ad09ce 100644 --- a/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java +++ b/src/main/java/ru/mtusi/messenger/filter/RequestIdFilter.java @@ -5,6 +5,7 @@ import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.slf4j.MDC; +import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; @@ -13,17 +14,14 @@ import java.io.IOException; import java.util.UUID; @Component -@Order(1) +@Order(Ordered.HIGHEST_PRECEDENCE + 1) public class RequestIdFilter extends OncePerRequestFilter { - public static final String INSTANCE_ID = UUID.randomUUID().toString(); - @Override protected void doFilterInternal(HttpServletRequest req, HttpServletResponse res, FilterChain chain) throws ServletException, IOException { String rid = UUID.randomUUID().toString(); res.setHeader("X-Request-Id", rid); - res.setHeader("X-Instance-Id", INSTANCE_ID); req.setAttribute("requestId", rid); MDC.put("requestId", rid); try { diff --git a/src/main/java/ru/mtusi/messenger/model/IdempotencyKey.java b/src/main/java/ru/mtusi/messenger/model/IdempotencyKey.java new file mode 100644 index 00000000..95e494f0 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/model/IdempotencyKey.java @@ -0,0 +1,47 @@ +package ru.mtusi.messenger.model; + +import jakarta.persistence.*; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +import java.time.Instant; +import java.util.UUID; + +@Entity +@Table(name = "idempotency_keys") +@Getter +@Setter +public class IdempotencyKey { + + @Id + @Column(nullable = false, updatable = false) + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + + @Column(name = "user_id", nullable = false) + private UUID userId; + + @Column(nullable = false, length = 16) + private String method; + + @Column(name = "chat_id", nullable = false) + private UUID chatId; + + @Column(name = "idempotency_key", nullable = false, length = 128) + private String idempotencyKey; + + @Column(name = "request_hash", nullable = false, length = 64) + private String requestHash; + + @Column(name = "status_code") + private Short statusCode; + + @JdbcTypeCode(SqlTypes.JSON) + @Column(name = "response_body", columnDefinition = "jsonb") + private String responseBody; + + @Column(name = "created_at", nullable = false) + private Instant createdAt; +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/repository/IdempotencyRepository.java b/src/main/java/ru/mtusi/messenger/repository/IdempotencyRepository.java new file mode 100644 index 00000000..9cb32e00 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/repository/IdempotencyRepository.java @@ -0,0 +1,39 @@ +package ru.mtusi.messenger.repository; + +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; +import ru.mtusi.messenger.model.IdempotencyKey; + +import java.util.Optional; +import java.util.UUID; + +@Repository +public interface IdempotencyRepository extends JpaRepository { + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(value = """ + INSERT INTO idempotency_keys + (user_id, method, chat_id, idempotency_key, request_hash, created_at) + VALUES (:userId, :method, :chatId, :key, :hash, NOW()) + ON CONFLICT (user_id, method, chat_id, idempotency_key) DO NOTHING + """, nativeQuery = true) + int tryClaim(UUID userId, String method, UUID chatId, String key, String hash); + + @Modifying(clearAutomatically = true, flushAutomatically = true) + @Query(value = """ + UPDATE idempotency_keys + SET status_code = :statusCode, + response_body = CAST(:body AS jsonb) + WHERE user_id = :userId + AND method = :method + AND chat_id = :chatId + AND idempotency_key = :key + """, nativeQuery = true) + int commitResponse(UUID userId, String method, UUID chatId, String key, + int statusCode, String body); + + Optional findByUserIdAndMethodAndChatIdAndIdempotencyKey( + UUID userId, String method, UUID chatId, String idempotencyKey); +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/IdempotencyService.java b/src/main/java/ru/mtusi/messenger/service/IdempotencyService.java new file mode 100644 index 00000000..043ef688 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/service/IdempotencyService.java @@ -0,0 +1,63 @@ +package ru.mtusi.messenger.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.exception.ConflictException; +import ru.mtusi.messenger.model.IdempotencyKey; +import ru.mtusi.messenger.repository.IdempotencyRepository; +import ru.mtusi.messenger.util.converter.IdempotencyPayloadConverter; +import ru.mtusi.messenger.validation.IdempotencyValidator; + +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.HexFormat; +import java.util.UUID; +import java.util.function.Supplier; + +@Service +@RequiredArgsConstructor +public class IdempotencyService { + + private final IdempotencyRepository idempotencyRepository; + private final IdempotencyPayloadConverter converter; + private final IdempotencyValidator validator; + + @Transactional + public T execute(UUID userId, String method, UUID chatId, String key, + Object requestBody, Class responseType, Supplier action) { + validator.validateKey(key); + String hash = hashRequest(requestBody); + + int claimed = idempotencyRepository.tryClaim(userId, method, chatId, key, hash); + if (claimed == 0) { + return replay(userId, method, chatId, key, hash, responseType); + } + + T result = action.get(); + idempotencyRepository.commitResponse(userId, method, chatId, key, 201, converter.toJson(result)); + return result; + } + + private T replay(UUID userId, String method, UUID chatId, String key, + String hash, Class responseType) { + IdempotencyKey stored = idempotencyRepository + .findByUserIdAndMethodAndChatIdAndIdempotencyKey(userId, method, chatId, key) + .orElseThrow(() -> new IllegalStateException("Idempotency row not visible after conflict")); + if (!stored.getRequestHash().equals(hash)) + throw new ConflictException("Idempotency-Key reused with a different request body"); + if (stored.getStatusCode() == null || stored.getStatusCode() != 201) + throw new ConflictException("Idempotency-Key has unexpected status"); + return converter.fromJson(stored.getResponseBody(), responseType); + } + + private String hashRequest(Object body) { + try { + byte[] digest = MessageDigest.getInstance("SHA-256") + .digest(converter.toJson(body).getBytes(StandardCharsets.UTF_8)); + return HexFormat.of().formatHex(digest); + } catch (Exception e) { + throw new IllegalStateException("Cannot hash request body", e); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/service/MessageService.java b/src/main/java/ru/mtusi/messenger/service/MessageService.java index 637862e7..c3ecfb68 100644 --- a/src/main/java/ru/mtusi/messenger/service/MessageService.java +++ b/src/main/java/ru/mtusi/messenger/service/MessageService.java @@ -13,13 +13,13 @@ import ru.mtusi.messenger.dto.MessagePageDTO; import ru.mtusi.messenger.exception.InvalidRequestException; import ru.mtusi.messenger.exception.NotFoundException; import ru.mtusi.messenger.exception.PayloadTooLargeException; -import ru.mtusi.messenger.mapper.ChatMapper; import ru.mtusi.messenger.mapper.MessageMapper; import ru.mtusi.messenger.model.Chat; import ru.mtusi.messenger.model.Message; import ru.mtusi.messenger.model.User; import ru.mtusi.messenger.repository.MessageRepository; import ru.mtusi.messenger.util.CursorCodec; +import ru.mtusi.messenger.service.IdempotencyService; import java.util.List; import java.util.UUID; @@ -28,7 +28,7 @@ import java.util.UUID; @Slf4j @RequiredArgsConstructor public class MessageService { - private final ChatMapper chatMapper; + private final IdempotencyService idempotencyService; private final MessageRepository messageRepository; private final ChatService chatService; private final UserService userService; @@ -36,17 +36,22 @@ public class MessageService { private final AppProperties appProperties; @Transactional - public MessageDTO createMessage(UUID senderId, UUID chatId, CreateMessageDTO createMessageDTO) { - Chat chat = chatService.getChat(senderId, chatId);; - validateCreate(chatId, createMessageDTO); + public MessageDTO createMessage(UUID senderId, UUID chatId, CreateMessageDTO dto, String idempotencyKey) { + Chat chat = chatService.getChat(senderId, chatId); + + return idempotencyService.execute(senderId, "POST", chatId, idempotencyKey, dto, MessageDTO.class, + () -> doCreate(senderId, chatId, dto, chat)); + } + + private MessageDTO doCreate(UUID senderId, UUID chatId, CreateMessageDTO dto, Chat chat) { + validateCreate(chatId, dto); User sender = userService.getReferenceUserById(senderId); - Message message = buildMessage(createMessageDTO, sender, chat); + Message message = buildMessage(dto, sender, chat); try { message = messageRepository.saveAndFlush(message); } catch (DataIntegrityViolationException e) { throw new NotFoundException("Cannot create message: referenced entity is missing"); } - log.info("Created message id={} in chat={}", message.getId(), chatId); return messageMapper.toMessageDTO(message); } diff --git a/src/main/java/ru/mtusi/messenger/util/converter/IdempotencyPayloadConverter.java b/src/main/java/ru/mtusi/messenger/util/converter/IdempotencyPayloadConverter.java new file mode 100644 index 00000000..4d11cb14 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/util/converter/IdempotencyPayloadConverter.java @@ -0,0 +1,29 @@ +package ru.mtusi.messenger.util.converter; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.json.JsonMapper; + +@Component +@RequiredArgsConstructor +public class IdempotencyPayloadConverter { + + private final JsonMapper jsonMapper; + + public String toJson(Object payload) { + try { + return jsonMapper.writeValueAsString(payload); + } catch (JacksonException e) { // Исключение теперь непроверяемое + throw new IllegalStateException("Cannot serialize idempotency payload", e); + } + } + + public T fromJson(String json, Class type) { + try { + return jsonMapper.readValue(json, type); + } catch (JacksonException e) { + throw new IllegalStateException("Corrupt idempotency payload", e); + } + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/validation/IdempotencyValidator.java b/src/main/java/ru/mtusi/messenger/validation/IdempotencyValidator.java new file mode 100644 index 00000000..e193bd93 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/validation/IdempotencyValidator.java @@ -0,0 +1,39 @@ +package ru.mtusi.messenger.validation; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import ru.mtusi.messenger.config.properties.IdempotencyProperties; +import ru.mtusi.messenger.exception.InvalidRequestException; + +import java.util.regex.Pattern; + +@Component +@RequiredArgsConstructor +public class IdempotencyValidator { + + private final IdempotencyProperties properties; + + public void validateKey(String key) { + requireNotBlank(key); + requireMaxLength(key); + requirePattern(key); + } + + private void requireNotBlank(String key) { + if (key == null || key.isEmpty()) { + throw new InvalidRequestException("Idempotency-Key header is required"); + } + } + + private void requireMaxLength(String key) { + if (key.length() > properties.keyMaxLength()) { + throw new InvalidRequestException("Idempotency-Key is too long"); + } + } + + private void requirePattern(String key) { + if (!Pattern.matches(properties.keyPattern(), key)) { + throw new InvalidRequestException("Idempotency-Key contains invalid characters"); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 3f85cde9..ea521352 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -4,7 +4,7 @@ spring: config: import: "optional:configtree:/run/secrets/" lifecycle: - timeout-per-shutdown-phase: 10s + timeout-per-shutdown-phase: 30s jackson: default-property-inclusion: non_null deserialization: @@ -18,7 +18,7 @@ spring: connection-timeout: 2000 validation-timeout: 1000 maximum-pool-size: 10 - minimum-idle: 2 + minimum-idle: 10 idle-timeout: 60000 max-lifetime: 1800000 jpa: @@ -60,6 +60,12 @@ management: app: + idempotency: + key-max-length: ${IDEMPOTENCY_KEY_MAX_LENGTH:128} + key-pattern: '${IDEMPOTENCY_KEY_PATTERN:^[A-Za-z0-9._:-]+$}' + retention-hours: ${IDEMPOTENCY_RETENTION_HOURS:24} + instance: + id: ${INSTANCE_ID:${HOSTNAME:${random.uuid}}} limits: max-messages-per-chat: ${MAX_MESSAGES_PER_CHAT:10000} rate: diff --git a/src/main/resources/db/migration/V1__init.sql b/src/main/resources/db/migration/V1__init.sql index dc3eb522..3069a29a 100644 --- a/src/main/resources/db/migration/V1__init.sql +++ b/src/main/resources/db/migration/V1__init.sql @@ -52,9 +52,21 @@ CREATE TABLE sessions ( CONSTRAINT ck_sessions_token_len CHECK (octet_length(token_hash) = 32) ); --- ========================================================= --- Indexes (critical for keyset pagination & EXPLAIN on lab5) --- ========================================================= +-- ---------- idempotency_keys (lab3) ---------- +CREATE TABLE idempotency_keys ( + id uuid PRIMARY KEY DEFAULT uuid_generate_v4(), + user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE, + method VARCHAR(16) NOT NULL, + chat_id UUID NOT NULL REFERENCES chats(id) ON DELETE CASCADE, + idempotency_key VARCHAR(128) NOT NULL, + request_hash VARCHAR(64) NOT NULL, + status_code SMALLINT, + response_body JSONB, + created_at TIMESTAMPTZ NOT NULL DEFAULT now(), + CONSTRAINT uq_idempotency_scope UNIQUE (user_id, method, chat_id, idempotency_key), + CONSTRAINT ck_idem_key_format CHECK (idempotency_key ~ '^[A-Za-z0-9._:-]{1,128}$'), + CONSTRAINT ck_idem_status_body_paired CHECK ((status_code IS NULL) = (response_body IS NULL)) +); -- Keyset pagination: ORDER BY created_at ASC, id ASC (JPQL uses ASC) CREATE INDEX idx_messages_chat_created_asc_id @@ -76,4 +88,7 @@ CREATE INDEX idx_sessions_user_active -- Cleanup of expired sessions CREATE INDEX idx_sessions_expires_active ON sessions (expires_at) - WHERE revoked_at IS NULL; \ No newline at end of file + WHERE revoked_at IS NULL; + +CREATE INDEX idx_idempotency_created + ON idempotency_keys (created_at); \ No newline at end of file -- 2.54.0 From 95aed3c25bf13889c18408d811909b94ac33f5f3 Mon Sep 17 00:00:00 2001 From: Danil01042005 Date: Thu, 15 Oct 2026 13:11:17 +0300 Subject: [PATCH 3/5] add link on pr --- REPORT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/REPORT.md b/REPORT.md index 7ce3bce4..f5c230b0 100644 --- a/REPORT.md +++ b/REPORT.md @@ -2,7 +2,7 @@ - Автор, группа: Иванов Данил, БВТ2301 - Целевая оценка: **5** трек 1 -- Commit/PR: TODO после публикации +- Commit/PR: https://gitea.privcloud.tech/mtusi2026/mtusi2026lab3/pulls/10 - Источники: официальная документация Spring Boot 4.1, Docker Compose v2, nginx 1.27, PostgreSQL 16, HikariCP, MapStruct 1.6; помощь ИИ — консультации по архитектуре и отладке, все решения проверены экспериментально ## Запуск из чистого clone -- 2.54.0 From 7ffebe65d0e757d6c92863f9ef693437c5631923 Mon Sep 17 00:00:00 2001 From: Danil01042005 Date: Sat, 17 Oct 2026 08:59:12 +0300 Subject: [PATCH 4/5] fix --- docker-compose.override.yml | 7 +- docker-compose.yaml => docker-compose.yml | 1 + evidence/lab3/B2-c32.json | 17 -- evidence/lab3/B2-improved-warmup.json | 17 -- evidence/lab3/B2-warmup.json | 17 -- evidence/lab3/B2.json | 17 -- evidence/lab3/C1.json | 17 -- evidence/lab3/C2.json | 17 -- evidence/lab3/ENV.md | 9 + evidence/lab3/charts/comparison-p95.png | Bin 0 -> 22855 bytes .../lab3/charts/seriesA-rps-vs-replicas.png | Bin 0 -> 31333 bytes evidence/lab3/charts/seriesB-rps-vs-cpu.png | Bin 0 -> 34247 bytes evidence/lab3/series-summary.csv | 7 + evidence/lab3/seriesA-C1-limits.txt | Bin 0 -> 46 bytes evidence/lab3/seriesA-C1-stats.csv | 121 +++++++++++++ .../{B2-sync-off.json => seriesA-C1.json} | 14 +- evidence/lab3/seriesA-C2-limits.txt | Bin 0 -> 46 bytes evidence/lab3/seriesA-C2-stats.csv | 121 +++++++++++++ evidence/lab3/seriesA-C2.json | 17 ++ evidence/lab3/seriesA-C3-stats.csv | 161 ++++++++++++++++++ evidence/lab3/seriesA-C3.json | 17 ++ evidence/lab3/seriesB-B1-stats.csv | 121 +++++++++++++ .../{B2-improved.json => seriesB-B1.json} | 14 +- evidence/lab3/seriesB-B2-stats.csv | 121 +++++++++++++ evidence/lab3/{B1.json => seriesB-B2.json} | 14 +- evidence/lab3/seriesB-B3-stats.csv | 121 +++++++++++++ .../{B2-keepalive.json => seriesB-B3.json} | 14 +- nginx.conf | 6 +- scripts/collect-pg.ps1 | 15 ++ scripts/collect-stats.ps1 | 21 +++ scripts/generate-charts.py | 53 ++++++ scripts/test-lb-exclusion.ps1 | 52 ++++++ .../mtusi/messenger/config/JacksonConfig.java | 26 +++ .../messenger/controller/AuthController.java | 2 +- .../messenger/controller/ChatController.java | 5 +- .../mtusi/messenger/controller/ChatsApi.java | 5 +- .../messenger/controller/UserController.java | 5 +- .../mtusi/messenger/controller/UsersApi.java | 5 +- .../GlobalExceptionHandler.java | 8 +- .../ru/mtusi/messenger/dto/CreateChatDTO.java | 101 +++++++++++ .../ru/mtusi/messenger/dto/CreateUserDTO.java | 110 ++++++++++++ .../java/ru/mtusi/messenger/dto/UserDTO.java | 23 +-- .../ru/mtusi/messenger/mapper/ChatMapper.java | 3 +- .../ru/mtusi/messenger/mapper/UserMapper.java | 6 +- .../security/ApiAuthenticationEntryPoint.java | 10 +- .../mtusi/messenger/service/AuthService.java | 6 +- .../mtusi/messenger/service/ChatService.java | 19 ++- .../messenger/service/HealthService.java | 28 ++- .../messenger/service/MessageService.java | 8 +- .../mtusi/messenger/service/UserService.java | 7 +- .../messenger/validation/ChatValidator.java | 7 +- src/main/resources/application.yaml | 6 +- 52 files changed, 1315 insertions(+), 204 deletions(-) rename docker-compose.yaml => docker-compose.yml (98%) delete mode 100644 evidence/lab3/B2-c32.json delete mode 100644 evidence/lab3/B2-improved-warmup.json delete mode 100644 evidence/lab3/B2-warmup.json delete mode 100644 evidence/lab3/B2.json delete mode 100644 evidence/lab3/C1.json delete mode 100644 evidence/lab3/C2.json create mode 100644 evidence/lab3/ENV.md create mode 100644 evidence/lab3/charts/comparison-p95.png create mode 100644 evidence/lab3/charts/seriesA-rps-vs-replicas.png create mode 100644 evidence/lab3/charts/seriesB-rps-vs-cpu.png create mode 100644 evidence/lab3/series-summary.csv create mode 100644 evidence/lab3/seriesA-C1-limits.txt create mode 100644 evidence/lab3/seriesA-C1-stats.csv rename evidence/lab3/{B2-sync-off.json => seriesA-C1.json} (64%) create mode 100644 evidence/lab3/seriesA-C2-limits.txt create mode 100644 evidence/lab3/seriesA-C2-stats.csv create mode 100644 evidence/lab3/seriesA-C2.json create mode 100644 evidence/lab3/seriesA-C3-stats.csv create mode 100644 evidence/lab3/seriesA-C3.json create mode 100644 evidence/lab3/seriesB-B1-stats.csv rename evidence/lab3/{B2-improved.json => seriesB-B1.json} (64%) create mode 100644 evidence/lab3/seriesB-B2-stats.csv rename evidence/lab3/{B1.json => seriesB-B2.json} (64%) create mode 100644 evidence/lab3/seriesB-B3-stats.csv rename evidence/lab3/{B2-keepalive.json => seriesB-B3.json} (64%) create mode 100644 scripts/collect-pg.ps1 create mode 100644 scripts/collect-stats.ps1 create mode 100644 scripts/generate-charts.py create mode 100644 scripts/test-lb-exclusion.ps1 create mode 100644 src/main/java/ru/mtusi/messenger/config/JacksonConfig.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateChatDTO.java create mode 100644 src/main/java/ru/mtusi/messenger/dto/CreateUserDTO.java diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 2ee35f5e..3ced8099 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,7 +1,10 @@ services: api: + environment: + MAX_MESSAGES_PER_CHAT: "500000" deploy: + replicas: 2 resources: limits: - cpus: '2.0' # Значение по умолчанию, будем менять - memory: 1G + cpus: '4.0' + memory: 2G \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yml similarity index 98% rename from docker-compose.yaml rename to docker-compose.yml index ccb83caa..1cce11cf 100644 --- a/docker-compose.yaml +++ b/docker-compose.yml @@ -112,6 +112,7 @@ services: SESSION_STORE: ${SESSION_STORE:-postgres} SPRING_DATA_REDIS_HOST: redis SPRING_DATA_REDIS_PORT: 6379 + MAX_MESSAGES_PER_CHAT: ${MAX_MESSAGES_PER_CHAT:-10000} secrets: - postgres_user - postgres_password diff --git a/evidence/lab3/B2-c32.json b/evidence/lab3/B2-c32.json deleted file mode 100644 index 1cb55423..00000000 --- a/evidence/lab3/B2-c32.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.141, - "concurrency": 32, - "successful_requests": 8229, - "failed_requests": 0, - "error_ratio": 0.0, - "successful_rps": 136.829, - "successful_latency_ms": { - "p50": 196.007, - "p95": 520.87, - "p99": 697.232 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/B2-improved-warmup.json b/evidence/lab3/B2-improved-warmup.json deleted file mode 100644 index cdc6fdd1..00000000 --- a/evidence/lab3/B2-improved-warmup.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 20.0, - "elapsed_seconds": 20.022, - "concurrency": 2, - "successful_requests": 1849, - "failed_requests": 0, - "error_ratio": 0.0, - "successful_rps": 92.349, - "successful_latency_ms": { - "p50": 17.978, - "p95": 39.728, - "p99": 57.86 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/B2-warmup.json b/evidence/lab3/B2-warmup.json deleted file mode 100644 index 2b7b8ee3..00000000 --- a/evidence/lab3/B2-warmup.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 20.0, - "elapsed_seconds": 20.019, - "concurrency": 2, - "successful_requests": 2096, - "failed_requests": 0, - "error_ratio": 0.0, - "successful_rps": 104.701, - "successful_latency_ms": { - "p50": 16.722, - "p95": 30.34, - "p99": 48.623 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/B2.json b/evidence/lab3/B2.json deleted file mode 100644 index d5823da5..00000000 --- a/evidence/lab3/B2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.11, - "concurrency": 8, - "successful_requests": 9299, - "failed_requests": 0, - "error_ratio": 0.0, - "successful_rps": 154.701, - "successful_latency_ms": { - "p50": 41.105, - "p95": 107.021, - "p99": 185.487 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/C1.json b/evidence/lab3/C1.json deleted file mode 100644 index aa3a06ee..00000000 --- a/evidence/lab3/C1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.052, - "concurrency": 8, - "successful_requests": 6294, - "failed_requests": 0, - "error_ratio": 0.0, - "successful_rps": 104.809, - "successful_latency_ms": { - "p50": 67.891, - "p95": 186.199, - "p99": 298.196 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/C2.json b/evidence/lab3/C2.json deleted file mode 100644 index 8571d091..00000000 --- a/evidence/lab3/C2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "lab": 3, - "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.138, - "concurrency": 8, - "successful_requests": 3206, - "failed_requests": 8, - "error_ratio": 0.002489, - "successful_rps": 53.31, - "successful_latency_ms": { - "p50": 113.08, - "p95": 333.086, - "p99": 487.002 - }, - "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." -} diff --git a/evidence/lab3/ENV.md b/evidence/lab3/ENV.md new file mode 100644 index 00000000..1b0bb7d7 --- /dev/null +++ b/evidence/lab3/ENV.md @@ -0,0 +1,9 @@ +# Среда измерения +- **Дата:** 2026-10-16 +- **Commit:** +- **Хост:** Windows ARM64, Docker Desktop ARM64, WSL2 backend +- **CPU:** <модель и ядра> +- **RAM:** <объём> +- **Профиль нагрузки:** POST /messages, closed-loop, concurrency 8, duration 90s +- **Прогрев JVM:** 20s при concurrency 2 перед каждым замером +- **Логирование Docker:** драйвер `local`, max-size=1k, max-file=1 (минимизация I/O) \ No newline at end of file diff --git a/evidence/lab3/charts/comparison-p95.png b/evidence/lab3/charts/comparison-p95.png new file mode 100644 index 0000000000000000000000000000000000000000..aa078937c1377ac07328e4a7da31bdcd8c3be0a2 GIT binary patch literal 22855 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 r(tT7>9JiZ}t~vgHNe%0A4oO^3irh_{Q?G{`pD`4#sL1DDHuU{ppg^H8 literal 0 HcmV?d00001 diff --git a/evidence/lab3/charts/seriesB-rps-vs-cpu.png b/evidence/lab3/charts/seriesB-rps-vs-cpu.png new file mode 100644 index 0000000000000000000000000000000000000000..ebab7f75c71039e2d58ebc628aabf0bc8e83892f GIT binary patch literal 34247 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 literal 0 HcmV?d00001 diff --git a/evidence/lab3/series-summary.csv b/evidence/lab3/series-summary.csv new file mode 100644 index 00000000..6e1e671d --- /dev/null +++ b/evidence/lab3/series-summary.csv @@ -0,0 +1,7 @@ +series,config,replicas,cpu_per_rep,ram_per_rep,total_cpu,successful_rps,error_ratio,p50_ms,p95_ms,p99_ms +A,C1,1,2.0,1G,2.0,136.579,0.0,59.414,105.771,182.732 +A,C2,2,1.0,512M,2.0,125.085,0.0,68.275,114.484,198.429 +A,C3,4,0.5,256M,2.0,51.393,0.0109,52.345,288.565,391.365 +B,B1,2,1.0,512M,2.0,130.203,0.0,53.870,130.262,186.917 +B,B2,2,2.0,1G,4.0,146.914,0.0,48.778,97.924,121.514 +B,B3,2,4.0,2G,8.0,171.077,0.0,36.078,92.895,108.825 \ No newline at end of file diff --git a/evidence/lab3/seriesA-C1-limits.txt b/evidence/lab3/seriesA-C1-limits.txt new file mode 100644 index 0000000000000000000000000000000000000000..b4e28f09195c08b82b606b3afd95101b50b819a8 GIT binary patch literal 46 kcmezW&yc|Y11d0>G8i+MF<3B|1LZ6k3>l0Vcp11D0J*>g?*IS* literal 0 HcmV?d00001 diff --git a/evidence/lab3/seriesA-C1-stats.csv b/evidence/lab3/seriesA-C1-stats.csv new file mode 100644 index 00000000..ec981f03 --- /dev/null +++ b/evidence/lab3/seriesA-C1-stats.csv @@ -0,0 +1,121 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T18:50:12.6059884+03:00,lab3-loadgen-run-22562303d7c3,10.89%,25.7MiB / 7.649GiB,0.33%,11.9kB / 12.1kB,0B / 0B,9 +2026-10-16T18:50:12.6059884+03:00,lab3-lb-1,0.20%,7.348MiB / 128MiB,5.74%,21.5kB / 22.8kB,0B / 12.3kB,9 +2026-10-16T18:50:12.6059884+03:00,lab3-api-2,94.57%,385.4MiB / 512MiB,75.28%,35.2kB / 36.6kB,0B / 274kB,36 +2026-10-16T18:50:12.6059884+03:00,lab3-api-1,9.98%,369.2MiB / 512MiB,72.12%,32.9kB / 33.2kB,32.8kB / 279kB,34 +2026-10-16T18:50:12.6059884+03:00,lab3-redis-1,0.56%,3.422MiB / 256MiB,1.34%,5.3kB / 1.85kB,28.7kB / 0B,6 +2026-10-16T18:50:12.6059884+03:00,lab3-db-1,0.45%,39.93MiB / 1GiB,3.90%,87.5kB / 77kB,0B / 225kB,18 +2026-10-16T18:50:17.2370992+03:00,lab3-loadgen-run-22562303d7c3,10.02%,25.79MiB / 7.649GiB,0.33%,195kB / 157kB,0B / 0B,9 +2026-10-16T18:50:17.2370992+03:00,lab3-lb-1,3.65%,7.68MiB / 128MiB,6.00%,303kB / 328kB,0B / 12.3kB,9 +2026-10-16T18:50:17.2370992+03:00,lab3-api-2,97.33%,390.5MiB / 512MiB,76.27%,236kB / 285kB,0B / 274kB,36 +2026-10-16T18:50:17.2370992+03:00,lab3-api-1,98.09%,393.5MiB / 512MiB,76.86%,246kB / 309kB,32.8kB / 279kB,35 +2026-10-16T18:50:17.2370992+03:00,lab3-redis-1,1.02%,3.441MiB / 256MiB,1.34%,40.9kB / 39.5kB,28.7kB / 0B,6 +2026-10-16T18:50:17.2370992+03:00,lab3-db-1,24.69%,62.34MiB / 1GiB,6.09%,333kB / 251kB,57.3kB / 1.55MB,24 +2026-10-16T18:50:21.9079887+03:00,lab3-loadgen-run-22562303d7c3,10.25%,25.79MiB / 7.649GiB,0.33%,581kB / 459kB,0B / 0B,9 +2026-10-16T18:50:21.9079887+03:00,lab3-lb-1,4.18%,8.004MiB / 128MiB,6.25%,785kB / 838kB,0B / 12.3kB,9 +2026-10-16T18:50:21.9079887+03:00,lab3-api-2,89.30%,397.8MiB / 512MiB,77.70%,615kB / 743kB,0B / 274kB,36 +2026-10-16T18:50:21.9079887+03:00,lab3-api-1,114.75%,411.2MiB / 512MiB,80.31%,624kB / 770kB,32.8kB / 279kB,34 +2026-10-16T18:50:21.9079887+03:00,lab3-redis-1,1.06%,3.438MiB / 256MiB,1.34%,108kB / 116kB,28.7kB / 0B,6 +2026-10-16T18:50:21.9079887+03:00,lab3-db-1,26.00%,68.86MiB / 1GiB,6.72%,909kB / 702kB,57.3kB / 5.19MB,24 +2026-10-16T18:50:26.5621071+03:00,lab3-loadgen-run-22562303d7c3,17.03%,25.88MiB / 7.649GiB,0.33%,1.01MB / 797kB,0B / 2.36MB,9 +2026-10-16T18:50:26.5621071+03:00,lab3-lb-1,5.58%,7.809MiB / 128MiB,6.10%,1.54MB / 1.63MB,0B / 123kB,9 +2026-10-16T18:50:26.5621071+03:00,lab3-api-2,100.98%,405.2MiB / 512MiB,79.14%,1.04MB / 1.25MB,0B / 291kB,35 +2026-10-16T18:50:26.5621071+03:00,lab3-api-1,99.88%,412.2MiB / 512MiB,80.51%,1.04MB / 1.27MB,32.8kB / 295kB,34 +2026-10-16T18:50:26.5621071+03:00,lab3-redis-1,1.34%,3.445MiB / 256MiB,1.35%,183kB / 201kB,28.7kB / 0B,6 +2026-10-16T18:50:26.5621071+03:00,lab3-db-1,28.62%,72.12MiB / 1GiB,7.04%,1.49MB / 1.16MB,65.5kB / 7.17MB,24 +2026-10-16T18:50:31.2251596+03:00,lab3-loadgen-run-22562303d7c3,17.15%,25.94MiB / 7.649GiB,0.33%,1.53MB / 1.2MB,0B / 2.36MB,9 +2026-10-16T18:50:31.2251596+03:00,lab3-lb-1,5.00%,7.766MiB / 128MiB,6.07%,2.32MB / 2.46MB,0B / 123kB,9 +2026-10-16T18:50:31.2251596+03:00,lab3-api-2,96.74%,412.8MiB / 512MiB,80.62%,1.54MB / 1.87MB,0B / 291kB,35 +2026-10-16T18:50:31.2251596+03:00,lab3-api-1,97.53%,429.2MiB / 512MiB,83.83%,1.54MB / 1.89MB,32.8kB / 295kB,34 +2026-10-16T18:50:31.2251596+03:00,lab3-redis-1,1.45%,3.445MiB / 256MiB,1.35%,254kB / 280kB,28.7kB / 0B,6 +2026-10-16T18:50:31.2251596+03:00,lab3-db-1,40.05%,75.81MiB / 1GiB,7.40%,2.4MB / 1.88MB,65.5kB / 9.65MB,24 +2026-10-16T18:50:35.9084245+03:00,lab3-loadgen-run-22562303d7c3,21.79%,25.95MiB / 7.649GiB,0.33%,2.19MB / 1.71MB,0B / 2.36MB,9 +2026-10-16T18:50:35.9084245+03:00,lab3-lb-1,6.13%,7.828MiB / 128MiB,6.12%,3.04MB / 3.22MB,0B / 123kB,9 +2026-10-16T18:50:35.9084245+03:00,lab3-api-2,98.02%,416.6MiB / 512MiB,81.37%,2.18MB / 2.63MB,0B / 291kB,36 +2026-10-16T18:50:35.9084245+03:00,lab3-api-1,99.48%,428.6MiB / 512MiB,83.70%,2.17MB / 2.65MB,32.8kB / 295kB,34 +2026-10-16T18:50:35.9084245+03:00,lab3-redis-1,1.89%,3.441MiB / 256MiB,1.34%,385kB / 431kB,28.7kB / 0B,6 +2026-10-16T18:50:35.9084245+03:00,lab3-db-1,51.87%,81.84MiB / 1GiB,7.99%,3.34MB / 2.63MB,65.5kB / 11.3MB,26 +2026-10-16T18:50:40.5615281+03:00,lab3-loadgen-run-22562303d7c3,25.01%,26.03MiB / 7.649GiB,0.33%,2.84MB / 2.22MB,0B / 2.36MB,9 +2026-10-16T18:50:40.5615281+03:00,lab3-lb-1,7.38%,7.895MiB / 128MiB,6.17%,4.27MB / 4.52MB,0B / 401kB,9 +2026-10-16T18:50:40.5615281+03:00,lab3-api-2,98.21%,418.4MiB / 512MiB,81.73%,2.81MB / 3.38MB,0B / 303kB,35 +2026-10-16T18:50:40.5615281+03:00,lab3-api-1,98.53%,432.5MiB / 512MiB,84.47%,2.79MB / 3.39MB,32.8kB / 307kB,34 +2026-10-16T18:50:40.5615281+03:00,lab3-redis-1,1.89%,3.441MiB / 256MiB,1.34%,493kB / 557kB,28.7kB / 0B,6 +2026-10-16T18:50:40.5615281+03:00,lab3-db-1,59.48%,82.49MiB / 1GiB,8.06%,4.27MB / 3.38MB,65.5kB / 12.5MB,26 +2026-10-16T18:50:44.6128608+03:00,lab3-loadgen-run-22562303d7c3,26.53%,26.02MiB / 7.649GiB,0.33%,3.74MB / 2.93MB,0B / 2.36MB,9 +2026-10-16T18:50:44.6128608+03:00,lab3-lb-1,7.85%,7.848MiB / 128MiB,6.13%,5.62MB / 5.95MB,0B / 401kB,9 +2026-10-16T18:50:44.6128608+03:00,lab3-api-2,100.23%,419.1MiB / 512MiB,81.86%,3.48MB / 4.17MB,0B / 303kB,35 +2026-10-16T18:50:44.6128608+03:00,lab3-api-1,103.86%,434.4MiB / 512MiB,84.85%,3.66MB / 4.45MB,32.8kB / 307kB,34 +2026-10-16T18:50:44.6128608+03:00,lab3-redis-1,4.29%,3.688MiB / 256MiB,1.44%,608kB / 693kB,28.7kB / 0B,6 +2026-10-16T18:50:44.6128608+03:00,lab3-db-1,73.21%,84.13MiB / 1GiB,8.22%,5.55MB / 4.42MB,65.5kB / 14.1MB,26 +2026-10-16T18:50:49.2680345+03:00,lab3-loadgen-run-22562303d7c3,25.70%,26.02MiB / 7.649GiB,0.33%,4.44MB / 3.48MB,0B / 2.36MB,9 +2026-10-16T18:50:49.2680345+03:00,lab3-lb-1,7.53%,7.867MiB / 128MiB,6.15%,6.66MB / 7.06MB,0B / 401kB,9 +2026-10-16T18:50:49.2680345+03:00,lab3-api-2,101.43%,421.2MiB / 512MiB,82.26%,4.52MB / 5.4MB,0B / 303kB,35 +2026-10-16T18:50:49.2680345+03:00,lab3-api-1,98.97%,444.6MiB / 512MiB,86.83%,4.34MB / 5.26MB,32.8kB / 307kB,34 +2026-10-16T18:50:49.2680345+03:00,lab3-redis-1,1.73%,3.441MiB / 256MiB,1.34%,757kB / 869kB,28.7kB / 0B,6 +2026-10-16T18:50:49.2680345+03:00,lab3-db-1,74.98%,84.77MiB / 1GiB,8.28%,6.55MB / 5.22MB,65.5kB / 15.1MB,26 +2026-10-16T18:50:53.9842005+03:00,lab3-loadgen-run-22562303d7c3,16.90%,26MiB / 7.649GiB,0.33%,5.4MB / 4.22MB,0B / 2.36MB,9 +2026-10-16T18:50:53.9842005+03:00,lab3-lb-1,5.38%,7.871MiB / 128MiB,6.15%,8.08MB / 8.57MB,0B / 401kB,9 +2026-10-16T18:50:53.9842005+03:00,lab3-api-2,76.37%,427.1MiB / 512MiB,83.42%,5.27MB / 6.3MB,0B / 315kB,35 +2026-10-16T18:50:53.9842005+03:00,lab3-api-1,98.88%,439.7MiB / 512MiB,85.88%,5.13MB / 6.21MB,32.8kB / 307kB,34 +2026-10-16T18:50:53.9842005+03:00,lab3-redis-1,3.68%,3.441MiB / 256MiB,1.34%,914kB / 1.06MB,28.7kB / 0B,6 +2026-10-16T18:50:53.9842005+03:00,lab3-db-1,62.16%,85.32MiB / 1GiB,8.33%,7.91MB / 6.32MB,65.5kB / 16.6MB,26 +2026-10-16T18:50:58.6405755+03:00,lab3-loadgen-run-22562303d7c3,28.14%,26.05MiB / 7.649GiB,0.33%,6.22MB / 4.87MB,0B / 2.36MB,9 +2026-10-16T18:50:58.6405755+03:00,lab3-lb-1,8.24%,7.867MiB / 128MiB,6.15%,9.32MB / 9.88MB,0B / 799kB,9 +2026-10-16T18:50:58.6405755+03:00,lab3-api-2,102.61%,428.6MiB / 512MiB,83.71%,6.07MB / 7.24MB,0B / 315kB,35 +2026-10-16T18:50:58.6405755+03:00,lab3-api-1,101.87%,447MiB / 512MiB,87.31%,6.05MB / 7.32MB,32.8kB / 319kB,34 +2026-10-16T18:50:58.6405755+03:00,lab3-redis-1,2.05%,3.445MiB / 256MiB,1.35%,1.05MB / 1.22MB,28.7kB / 0B,6 +2026-10-16T18:50:58.6405755+03:00,lab3-db-1,90.36%,86.14MiB / 1GiB,8.41%,9.09MB / 7.27MB,65.5kB / 17.8MB,26 +2026-10-16T18:51:02.9966052+03:00,lab3-loadgen-run-22562303d7c3,20.92%,26.07MiB / 7.649GiB,0.33%,7.11MB / 5.56MB,0B / 2.36MB,9 +2026-10-16T18:51:02.9966052+03:00,lab3-lb-1,6.46%,7.832MiB / 128MiB,6.12%,10.6MB / 11.3MB,0B / 799kB,9 +2026-10-16T18:51:02.9966052+03:00,lab3-api-2,103.29%,429.5MiB / 512MiB,83.88%,6.93MB / 8.26MB,0B / 315kB,36 +2026-10-16T18:51:02.9966052+03:00,lab3-api-1,86.60%,447.4MiB / 512MiB,87.38%,6.91MB / 8.34MB,32.8kB / 319kB,34 +2026-10-16T18:51:02.9966052+03:00,lab3-redis-1,1.64%,3.445MiB / 256MiB,1.35%,1.2MB / 1.39MB,28.7kB / 0B,6 +2026-10-16T18:51:02.9966052+03:00,lab3-db-1,94.41%,86.9MiB / 1GiB,8.49%,10.1MB / 8.11MB,65.5kB / 18.9MB,26 +2026-10-16T18:51:07.6918856+03:00,lab3-loadgen-run-22562303d7c3,25.29%,26.09MiB / 7.649GiB,0.33%,8MB / 6.26MB,0B / 2.36MB,9 +2026-10-16T18:51:07.6918856+03:00,lab3-lb-1,8.13%,7.867MiB / 128MiB,6.15%,12MB / 12.7MB,0B / 799kB,9 +2026-10-16T18:51:07.6918856+03:00,lab3-api-2,100.31%,426MiB / 512MiB,83.19%,7.78MB / 9.27MB,0B / 315kB,36 +2026-10-16T18:51:07.6918856+03:00,lab3-api-1,94.64%,448.1MiB / 512MiB,87.52%,7.57MB / 9.13MB,32.8kB / 319kB,34 +2026-10-16T18:51:07.6918856+03:00,lab3-redis-1,1.94%,3.445MiB / 256MiB,1.35%,1.34MB / 1.56MB,28.7kB / 0B,6 +2026-10-16T18:51:07.6918856+03:00,lab3-db-1,100.46%,87.82MiB / 1GiB,8.58%,11.6MB / 9.31MB,65.5kB / 20.5MB,26 +2026-10-16T18:51:12.3415939+03:00,lab3-loadgen-run-22562303d7c3,23.94%,26.11MiB / 7.649GiB,0.33%,8.81MB / 6.89MB,0B / 2.36MB,9 +2026-10-16T18:51:12.3415939+03:00,lab3-lb-1,7.17%,7.824MiB / 128MiB,6.11%,13.2MB / 14MB,0B / 1.21MB,9 +2026-10-16T18:51:12.3415939+03:00,lab3-api-2,87.40%,429.7MiB / 512MiB,83.93%,8.57MB / 10.2MB,0B / 328kB,35 +2026-10-16T18:51:12.3415939+03:00,lab3-api-1,93.53%,452.6MiB / 512MiB,88.39%,8.39MB / 10.1MB,32.8kB / 332kB,34 +2026-10-16T18:51:12.3415939+03:00,lab3-redis-1,2.00%,3.438MiB / 256MiB,1.34%,1.47MB / 1.73MB,28.7kB / 0B,6 +2026-10-16T18:51:12.3415939+03:00,lab3-db-1,100.20%,89.14MiB / 1GiB,8.71%,12.8MB / 10.3MB,65.5kB / 21.7MB,26 +2026-10-16T18:51:16.9891862+03:00,lab3-loadgen-run-22562303d7c3,22.32%,26.18MiB / 7.649GiB,0.33%,9.55MB / 7.47MB,0B / 2.36MB,9 +2026-10-16T18:51:16.9891862+03:00,lab3-lb-1,6.86%,7.848MiB / 128MiB,6.13%,14.3MB / 15.2MB,0B / 1.21MB,9 +2026-10-16T18:51:16.9891862+03:00,lab3-api-2,78.20%,434.4MiB / 512MiB,84.85%,9.31MB / 11.1MB,0B / 328kB,35 +2026-10-16T18:51:16.9891862+03:00,lab3-api-1,68.15%,444.1MiB / 512MiB,86.74%,9.31MB / 11.1MB,32.8kB / 332kB,34 +2026-10-16T18:51:16.9891862+03:00,lab3-redis-1,1.74%,3.445MiB / 256MiB,1.35%,1.59MB / 1.87MB,28.7kB / 0B,6 +2026-10-16T18:51:16.9891862+03:00,lab3-db-1,104.57%,90.16MiB / 1GiB,8.80%,13.6MB / 11MB,65.5kB / 21.8MB,26 +2026-10-16T18:51:21.6390114+03:00,lab3-loadgen-run-22562303d7c3,19.01%,26.16MiB / 7.649GiB,0.33%,10.3MB / 8.04MB,0B / 2.36MB,9 +2026-10-16T18:51:21.6390114+03:00,lab3-lb-1,6.22%,7.777MiB / 128MiB,6.08%,15.4MB / 16.3MB,0B / 1.21MB,9 +2026-10-16T18:51:21.6390114+03:00,lab3-api-2,61.71%,429.3MiB / 512MiB,83.85%,10MB / 11.9MB,0B / 328kB,35 +2026-10-16T18:51:21.6390114+03:00,lab3-api-1,46.04%,443.7MiB / 512MiB,86.67%,9.89MB / 11.8MB,32.8kB / 332kB,34 +2026-10-16T18:51:21.6390114+03:00,lab3-redis-1,2.33%,3.441MiB / 256MiB,1.34%,1.71MB / 2.02MB,28.7kB / 0B,6 +2026-10-16T18:51:21.6390114+03:00,lab3-db-1,101.80%,89.9MiB / 1GiB,8.78%,14.8MB / 12MB,65.5kB / 21.8MB,26 +2026-10-16T18:51:26.2942789+03:00,lab3-loadgen-run-22562303d7c3,22.44%,26.19MiB / 7.649GiB,0.33%,11MB / 8.58MB,0B / 2.36MB,9 +2026-10-16T18:51:26.2942789+03:00,lab3-lb-1,6.80%,7.746MiB / 128MiB,6.05%,16.5MB / 17.4MB,0B / 1.56MB,9 +2026-10-16T18:51:26.2942789+03:00,lab3-api-2,62.07%,429.2MiB / 512MiB,83.83%,10.7MB / 12.7MB,0B / 340kB,35 +2026-10-16T18:51:26.2942789+03:00,lab3-api-1,42.55%,444.1MiB / 512MiB,86.75%,10.7MB / 12.8MB,32.8kB / 344kB,34 +2026-10-16T18:51:26.2942789+03:00,lab3-redis-1,1.65%,3.445MiB / 256MiB,1.35%,1.83MB / 2.16MB,28.7kB / 0B,6 +2026-10-16T18:51:26.2942789+03:00,lab3-db-1,104.79%,90.93MiB / 1GiB,8.88%,15.6MB / 12.7MB,65.5kB / 21.8MB,26 +2026-10-16T18:51:30.9297160+03:00,lab3-loadgen-run-22562303d7c3,18.11%,26.16MiB / 7.649GiB,0.33%,11.5MB / 9.02MB,0B / 2.36MB,9 +2026-10-16T18:51:30.9297160+03:00,lab3-lb-1,5.13%,7.762MiB / 128MiB,6.06%,17.3MB / 18.3MB,0B / 1.56MB,9 +2026-10-16T18:51:30.9297160+03:00,lab3-api-2,38.57%,429.9MiB / 512MiB,83.96%,11.3MB / 13.4MB,0B / 340kB,35 +2026-10-16T18:51:30.9297160+03:00,lab3-api-1,41.89%,444MiB / 512MiB,86.72%,11.3MB / 13.4MB,32.8kB / 344kB,34 +2026-10-16T18:51:30.9297160+03:00,lab3-redis-1,1.48%,3.438MiB / 256MiB,1.34%,1.93MB / 2.27MB,28.7kB / 0B,6 +2026-10-16T18:51:30.9297160+03:00,lab3-db-1,100.84%,91.14MiB / 1GiB,8.90%,16.6MB / 13.6MB,65.5kB / 21.8MB,26 +2026-10-16T18:51:34.9843175+03:00,lab3-loadgen-run-22562303d7c3,18.53%,26.23MiB / 7.649GiB,0.33%,12.2MB / 9.54MB,0B / 2.36MB,9 +2026-10-16T18:51:34.9843175+03:00,lab3-lb-1,4.91%,7.777MiB / 128MiB,6.08%,18.3MB / 19.4MB,0B / 1.56MB,9 +2026-10-16T18:51:34.9843175+03:00,lab3-api-2,93.33%,432.7MiB / 512MiB,84.52%,12MB / 14.1MB,0B / 340kB,35 +2026-10-16T18:51:34.9843175+03:00,lab3-api-1,50.33%,444.5MiB / 512MiB,86.81%,11.8MB / 14MB,32.8kB / 344kB,34 +2026-10-16T18:51:34.9843175+03:00,lab3-redis-1,3.92%,3.445MiB / 256MiB,1.35%,2.04MB / 2.4MB,28.7kB / 0B,6 +2026-10-16T18:51:34.9843175+03:00,lab3-db-1,99.04%,91.94MiB / 1GiB,8.98%,17.5MB / 14.4MB,65.5kB / 21.8MB,26 +2026-10-16T18:51:39.6157679+03:00,lab3-loadgen-run-22562303d7c3,16.88%,26.17MiB / 7.649GiB,0.33%,12.8MB / 9.98MB,0B / 2.36MB,9 +2026-10-16T18:51:39.6157679+03:00,lab3-lb-1,4.75%,7.797MiB / 128MiB,6.09%,19.1MB / 20.3MB,0B / 1.56MB,9 +2026-10-16T18:51:39.6157679+03:00,lab3-api-2,80.65%,440MiB / 512MiB,85.95%,12.5MB / 14.8MB,0B / 352kB,35 +2026-10-16T18:51:39.6157679+03:00,lab3-api-1,67.44%,449.1MiB / 512MiB,87.71%,12.5MB / 14.8MB,32.8kB / 356kB,34 +2026-10-16T18:51:39.6157679+03:00,lab3-redis-1,1.58%,3.445MiB / 256MiB,1.35%,2.13MB / 2.51MB,28.7kB / 0B,6 +2026-10-16T18:51:39.6157679+03:00,lab3-db-1,100.77%,92.28MiB / 1GiB,9.01%,18.3MB / 15.1MB,65.5kB / 25.8MB,26 diff --git a/evidence/lab3/B2-sync-off.json b/evidence/lab3/seriesA-C1.json similarity index 64% rename from evidence/lab3/B2-sync-off.json rename to evidence/lab3/seriesA-C1.json index d615d8c2..66681583 100644 --- a/evidence/lab3/B2-sync-off.json +++ b/evidence/lab3/seriesA-C1.json @@ -1,17 +1,17 @@ { "lab": 3, "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.089, + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.036, "concurrency": 8, - "successful_requests": 8075, + "successful_requests": 12297, "failed_requests": 0, "error_ratio": 0.0, - "successful_rps": 134.385, + "successful_rps": 136.579, "successful_latency_ms": { - "p50": 43.937, - "p95": 173.574, - "p99": 199.855 + "p50": 59.414, + "p95": 105.771, + "p99": 182.732 }, "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." } diff --git a/evidence/lab3/seriesA-C2-limits.txt b/evidence/lab3/seriesA-C2-limits.txt new file mode 100644 index 0000000000000000000000000000000000000000..b4e28f09195c08b82b606b3afd95101b50b819a8 GIT binary patch literal 46 kcmezW&yc|Y11d0>G8i+MF<3B|1LZ6k3>l0Vcp11D0J*>g?*IS* literal 0 HcmV?d00001 diff --git a/evidence/lab3/seriesA-C2-stats.csv b/evidence/lab3/seriesA-C2-stats.csv new file mode 100644 index 00000000..7a029a11 --- /dev/null +++ b/evidence/lab3/seriesA-C2-stats.csv @@ -0,0 +1,121 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T19:34:05.7352982+03:00,lab3-loadgen-run-39d76031bdd7,0.57%,17.94MiB / 7.649GiB,0.23%,7.14kB / 5.09kB,0B / 0B,1 +2026-10-16T19:34:05.7352982+03:00,lab3-lb-1,0.35%,7.16MiB / 128MiB,5.59%,11.1kB / 11.1kB,0B / 12.3kB,9 +2026-10-16T19:34:05.7352982+03:00,lab3-api-1,25.87%,357.4MiB / 512MiB,69.80%,24.8kB / 25.3kB,0B / 242kB,33 +2026-10-16T19:34:05.7352982+03:00,lab3-api-2,94.75%,364.1MiB / 512MiB,71.11%,25.1kB / 26.5kB,0B / 246kB,36 +2026-10-16T19:34:05.7352982+03:00,lab3-db-1,1.06%,36.94MiB / 1GiB,3.61%,77.5kB / 69.3kB,0B / 225kB,16 +2026-10-16T19:34:05.7352982+03:00,lab3-redis-1,0.37%,3.375MiB / 256MiB,1.32%,2.71kB / 126B,36.9kB / 0B,6 +2026-10-16T19:34:09.8799201+03:00,lab3-loadgen-run-39d76031bdd7,0.00%,25.69MiB / 7.649GiB,0.33%,19.5kB / 18.1kB,0B / 0B,9 +2026-10-16T19:34:09.8799201+03:00,lab3-lb-1,2.60%,7.48MiB / 128MiB,5.84%,102kB / 111kB,0B / 12.3kB,9 +2026-10-16T19:34:09.8799201+03:00,lab3-api-1,90.73%,383.1MiB / 512MiB,74.83%,96.6kB / 117kB,0B / 242kB,35 +2026-10-16T19:34:09.8799201+03:00,lab3-api-2,98.76%,389.4MiB / 512MiB,76.06%,105kB / 129kB,0B / 246kB,35 +2026-10-16T19:34:09.8799201+03:00,lab3-db-1,26.09%,53.83MiB / 1GiB,5.26%,214kB / 165kB,8.19kB / 225kB,20 +2026-10-16T19:34:09.8799201+03:00,lab3-redis-1,2.69%,3.43MiB / 256MiB,1.34%,8.49kB / 5.22kB,41kB / 0B,6 +2026-10-16T19:34:14.5037374+03:00,lab3-loadgen-run-39d76031bdd7,10.08%,25.77MiB / 7.649GiB,0.33%,336kB / 269kB,0B / 0B,9 +2026-10-16T19:34:14.5037374+03:00,lab3-lb-1,3.51%,7.68MiB / 128MiB,6.00%,519kB / 555kB,0B / 12.3kB,9 +2026-10-16T19:34:14.5037374+03:00,lab3-api-1,98.47%,400.8MiB / 512MiB,78.28%,366kB / 444kB,0B / 242kB,35 +2026-10-16T19:34:14.5037374+03:00,lab3-api-2,99.08%,395.9MiB / 512MiB,77.31%,385kB / 478kB,0B / 246kB,34 +2026-10-16T19:34:14.5037374+03:00,lab3-db-1,24.60%,59.04MiB / 1GiB,5.77%,638kB / 488kB,8.19kB / 225kB,20 +2026-10-16T19:34:14.5037374+03:00,lab3-redis-1,3.06%,3.438MiB / 256MiB,1.34%,68.4kB / 68.1kB,41kB / 0B,6 +2026-10-16T19:34:18.9992427+03:00,lab3-loadgen-run-39d76031bdd7,12.78%,25.79MiB / 7.649GiB,0.33%,714kB / 566kB,0B / 2.36MB,9 +2026-10-16T19:34:18.9992427+03:00,lab3-lb-1,4.20%,7.691MiB / 128MiB,6.01%,1.09MB / 1.16MB,0B / 111kB,9 +2026-10-16T19:34:18.9992427+03:00,lab3-api-1,99.67%,407.1MiB / 512MiB,79.51%,737kB / 892kB,0B / 258kB,36 +2026-10-16T19:34:18.9992427+03:00,lab3-api-2,99.15%,400.7MiB / 512MiB,78.27%,753kB / 929kB,0B / 262kB,34 +2026-10-16T19:34:18.9992427+03:00,lab3-db-1,27.79%,65.34MiB / 1GiB,6.38%,1.2MB / 929kB,8.19kB / 225kB,21 +2026-10-16T19:34:18.9992427+03:00,lab3-redis-1,1.38%,3.434MiB / 256MiB,1.34%,120kB / 126kB,41kB / 0B,6 +2026-10-16T19:34:23.6236284+03:00,lab3-loadgen-run-39d76031bdd7,14.77%,25.84MiB / 7.649GiB,0.33%,1.04MB / 824kB,0B / 2.36MB,9 +2026-10-16T19:34:23.6236284+03:00,lab3-lb-1,3.97%,7.742MiB / 128MiB,6.05%,1.72MB / 1.82MB,0B / 111kB,9 +2026-10-16T19:34:23.6236284+03:00,lab3-api-1,104.41%,422MiB / 512MiB,82.42%,1.14MB / 1.39MB,0B / 258kB,35 +2026-10-16T19:34:23.6236284+03:00,lab3-api-2,104.30%,406.9MiB / 512MiB,79.47%,1.16MB / 1.43MB,0B / 262kB,34 +2026-10-16T19:34:23.6236284+03:00,lab3-db-1,25.44%,68.52MiB / 1GiB,6.69%,1.81MB / 1.41MB,8.19kB / 225kB,21 +2026-10-16T19:34:23.6236284+03:00,lab3-redis-1,1.18%,3.441MiB / 256MiB,1.34%,210kB / 226kB,41kB / 0B,6 +2026-10-16T19:34:28.2596080+03:00,lab3-loadgen-run-39d76031bdd7,15.88%,25.94MiB / 7.649GiB,0.33%,1.6MB / 1.26MB,0B / 2.36MB,9 +2026-10-16T19:34:28.2596080+03:00,lab3-lb-1,5.06%,7.723MiB / 128MiB,6.03%,2.44MB / 2.57MB,0B / 111kB,9 +2026-10-16T19:34:28.2596080+03:00,lab3-api-1,101.73%,446.2MiB / 512MiB,87.15%,1.6MB / 1.93MB,0B / 258kB,35 +2026-10-16T19:34:28.2596080+03:00,lab3-api-2,108.26%,409.8MiB / 512MiB,80.04%,1.62MB / 1.98MB,0B / 262kB,34 +2026-10-16T19:34:28.2596080+03:00,lab3-db-1,39.40%,70.98MiB / 1GiB,6.93%,2.49MB / 1.95MB,8.19kB / 225kB,21 +2026-10-16T19:34:28.2596080+03:00,lab3-redis-1,1.90%,3.441MiB / 256MiB,1.34%,274kB / 298kB,41kB / 0B,6 +2026-10-16T19:34:32.9828278+03:00,lab3-loadgen-run-39d76031bdd7,21.33%,25.93MiB / 7.649GiB,0.33%,2.17MB / 1.71MB,0B / 2.36MB,9 +2026-10-16T19:34:32.9828278+03:00,lab3-lb-1,6.91%,7.738MiB / 128MiB,6.05%,3.28MB / 3.46MB,0B / 111kB,9 +2026-10-16T19:34:32.9828278+03:00,lab3-api-1,98.78%,448.4MiB / 512MiB,87.59%,2.14MB / 2.59MB,0B / 258kB,35 +2026-10-16T19:34:32.9828278+03:00,lab3-api-2,99.68%,420.8MiB / 512MiB,82.19%,2.16MB / 2.64MB,0B / 262kB,34 +2026-10-16T19:34:32.9828278+03:00,lab3-db-1,45.91%,72.96MiB / 1GiB,7.13%,3.3MB / 2.6MB,8.19kB / 225kB,21 +2026-10-16T19:34:32.9828278+03:00,lab3-redis-1,1.55%,3.434MiB / 256MiB,1.34%,367kB / 404kB,41kB / 0B,6 +2026-10-16T19:34:37.6407023+03:00,lab3-loadgen-run-39d76031bdd7,20.26%,26.02MiB / 7.649GiB,0.33%,2.79MB / 2.19MB,0B / 2.36MB,9 +2026-10-16T19:34:37.6407023+03:00,lab3-lb-1,5.92%,8.004MiB / 128MiB,6.25%,3.99MB / 4.21MB,0B / 340kB,9 +2026-10-16T19:34:37.6407023+03:00,lab3-api-1,100.37%,431.3MiB / 512MiB,84.24%,2.74MB / 3.29MB,0B / 270kB,35 +2026-10-16T19:34:37.6407023+03:00,lab3-api-2,104.47%,415.4MiB / 512MiB,81.14%,2.76MB / 3.36MB,0B / 274kB,34 +2026-10-16T19:34:37.6407023+03:00,lab3-db-1,50.70%,74.22MiB / 1GiB,7.25%,4.18MB / 3.32MB,8.19kB / 225kB,21 +2026-10-16T19:34:37.6407023+03:00,lab3-redis-1,1.81%,3.441MiB / 256MiB,1.34%,495kB / 553kB,41kB / 0B,6 +2026-10-16T19:34:42.2790445+03:00,lab3-loadgen-run-39d76031bdd7,25.97%,26.01MiB / 7.649GiB,0.33%,3.47MB / 2.73MB,0B / 2.36MB,9 +2026-10-16T19:34:42.2790445+03:00,lab3-lb-1,8.38%,8.016MiB / 128MiB,6.26%,5.23MB / 5.53MB,0B / 340kB,9 +2026-10-16T19:34:42.2790445+03:00,lab3-api-1,101.24%,437MiB / 512MiB,85.36%,3.4MB / 4.07MB,0B / 270kB,35 +2026-10-16T19:34:42.2790445+03:00,lab3-api-2,102.77%,417MiB / 512MiB,81.45%,3.43MB / 4.16MB,0B / 274kB,35 +2026-10-16T19:34:42.2790445+03:00,lab3-db-1,67.07%,75.11MiB / 1GiB,7.33%,5.15MB / 4.1MB,8.19kB / 225kB,21 +2026-10-16T19:34:42.2790445+03:00,lab3-redis-1,1.95%,3.438MiB / 256MiB,1.34%,583kB / 657kB,41kB / 0B,6 +2026-10-16T19:34:46.9657484+03:00,lab3-loadgen-run-39d76031bdd7,24.39%,25.98MiB / 7.649GiB,0.33%,4.17MB / 3.27MB,0B / 2.36MB,9 +2026-10-16T19:34:46.9657484+03:00,lab3-lb-1,7.38%,7.777MiB / 128MiB,6.08%,6.28MB / 6.64MB,0B / 340kB,9 +2026-10-16T19:34:46.9657484+03:00,lab3-api-1,100.62%,437.9MiB / 512MiB,85.52%,4.08MB / 4.85MB,0B / 270kB,35 +2026-10-16T19:34:46.9657484+03:00,lab3-api-2,99.56%,419.9MiB / 512MiB,82.02%,4.1MB / 4.97MB,0B / 274kB,34 +2026-10-16T19:34:46.9657484+03:00,lab3-db-1,73.25%,76.01MiB / 1GiB,7.42%,6.13MB / 4.91MB,8.19kB / 225kB,21 +2026-10-16T19:34:46.9657484+03:00,lab3-redis-1,1.74%,3.441MiB / 256MiB,1.34%,724kB / 827kB,41kB / 0B,6 +2026-10-16T19:34:51.0112010+03:00,lab3-loadgen-run-39d76031bdd7,21.73%,25.99MiB / 7.649GiB,0.33%,4.86MB / 3.82MB,0B / 2.36MB,9 +2026-10-16T19:34:51.0112010+03:00,lab3-lb-1,6.72%,7.809MiB / 128MiB,6.10%,7.31MB / 7.73MB,0B / 668kB,9 +2026-10-16T19:34:51.0112010+03:00,lab3-api-1,101.92%,442.1MiB / 512MiB,86.34%,4.76MB / 5.67MB,0B / 283kB,36 +2026-10-16T19:34:51.0112010+03:00,lab3-api-2,100.48%,429.3MiB / 512MiB,83.85%,4.77MB / 5.76MB,0B / 287kB,34 +2026-10-16T19:34:51.0112010+03:00,lab3-db-1,68.37%,82.08MiB / 1GiB,8.02%,7.13MB / 5.71MB,8.19kB / 225kB,23 +2026-10-16T19:34:51.0112010+03:00,lab3-redis-1,4.48%,3.441MiB / 256MiB,1.34%,813kB / 932kB,41kB / 0B,6 +2026-10-16T19:34:55.6531428+03:00,lab3-loadgen-run-39d76031bdd7,21.59%,25.98MiB / 7.649GiB,0.33%,5.53MB / 4.34MB,0B / 2.36MB,9 +2026-10-16T19:34:55.6531428+03:00,lab3-lb-1,6.39%,7.832MiB / 128MiB,6.12%,8.31MB / 8.79MB,0B / 668kB,9 +2026-10-16T19:34:55.6531428+03:00,lab3-api-1,94.56%,443.5MiB / 512MiB,86.63%,5.4MB / 6.43MB,0B / 283kB,35 +2026-10-16T19:34:55.6531428+03:00,lab3-api-2,96.75%,426.4MiB / 512MiB,83.27%,5.42MB / 6.54MB,0B / 287kB,34 +2026-10-16T19:34:55.6531428+03:00,lab3-db-1,75.47%,82.57MiB / 1GiB,8.06%,8.08MB / 6.49MB,8.19kB / 225kB,23 +2026-10-16T19:34:55.6531428+03:00,lab3-redis-1,1.63%,3.434MiB / 256MiB,1.34%,951kB / 1.1MB,41kB / 0B,6 +2026-10-16T19:35:00.0714284+03:00,lab3-loadgen-run-39d76031bdd7,25.68%,26MiB / 7.649GiB,0.33%,6.37MB / 5MB,0B / 2.36MB,9 +2026-10-16T19:35:00.0714284+03:00,lab3-lb-1,8.71%,8.062MiB / 128MiB,6.30%,9.56MB / 10.1MB,0B / 668kB,9 +2026-10-16T19:35:00.0714284+03:00,lab3-api-1,64.35%,444.1MiB / 512MiB,86.75%,6.21MB / 7.37MB,0B / 283kB,35 +2026-10-16T19:35:00.0714284+03:00,lab3-api-2,100.11%,429.9MiB / 512MiB,83.97%,6.23MB / 7.51MB,0B / 287kB,35 +2026-10-16T19:35:00.0714284+03:00,lab3-db-1,92.50%,85.13MiB / 1GiB,8.31%,9.26MB / 7.45MB,8.19kB / 225kB,24 +2026-10-16T19:35:00.0714284+03:00,lab3-redis-1,2.06%,3.441MiB / 256MiB,1.34%,1.06MB / 1.22MB,41kB / 0B,6 +2026-10-16T19:35:04.7312116+03:00,lab3-loadgen-run-39d76031bdd7,26.79%,26.07MiB / 7.649GiB,0.33%,7.19MB / 5.64MB,0B / 2.36MB,9 +2026-10-16T19:35:04.7312116+03:00,lab3-lb-1,9.05%,7.832MiB / 128MiB,6.12%,10.8MB / 11.4MB,0B / 1.04MB,9 +2026-10-16T19:35:04.7312116+03:00,lab3-api-1,67.98%,444.7MiB / 512MiB,86.86%,7.01MB / 8.29MB,0B / 295kB,35 +2026-10-16T19:35:04.7312116+03:00,lab3-api-2,104.09%,430.2MiB / 512MiB,84.02%,7.03MB / 8.46MB,0B / 299kB,35 +2026-10-16T19:35:04.7312116+03:00,lab3-db-1,100.34%,87.04MiB / 1GiB,8.50%,10.4MB / 8.4MB,8.19kB / 430kB,25 +2026-10-16T19:35:04.7312116+03:00,lab3-redis-1,4.08%,3.445MiB / 256MiB,1.35%,1.22MB / 1.42MB,41kB / 0B,6 +2026-10-16T19:35:09.0793829+03:00,lab3-loadgen-run-39d76031bdd7,24.90%,26.07MiB / 7.649GiB,0.33%,8MB / 6.28MB,0B / 2.36MB,9 +2026-10-16T19:35:09.0793829+03:00,lab3-lb-1,9.44%,7.797MiB / 128MiB,6.09%,12MB / 12.7MB,0B / 1.04MB,9 +2026-10-16T19:35:09.0793829+03:00,lab3-api-1,102.32%,444.7MiB / 512MiB,86.86%,7.64MB / 9.02MB,0B / 295kB,35 +2026-10-16T19:35:09.0793829+03:00,lab3-api-2,101.18%,431.9MiB / 512MiB,84.36%,7.82MB / 9.38MB,0B / 299kB,34 +2026-10-16T19:35:09.0793829+03:00,lab3-db-1,100.67%,87.78MiB / 1GiB,8.57%,11.6MB / 9.35MB,8.19kB / 430kB,25 +2026-10-16T19:35:09.0793829+03:00,lab3-redis-1,2.08%,3.684MiB / 256MiB,1.44%,1.33MB / 1.55MB,41kB / 0B,6 +2026-10-16T19:35:13.7585814+03:00,lab3-loadgen-run-39d76031bdd7,23.23%,26.09MiB / 7.649GiB,0.33%,8.79MB / 6.89MB,0B / 2.36MB,9 +2026-10-16T19:35:13.7585814+03:00,lab3-lb-1,7.98%,7.754MiB / 128MiB,6.06%,13.2MB / 14MB,0B / 1.04MB,9 +2026-10-16T19:35:13.7585814+03:00,lab3-api-1,52.16%,445.1MiB / 512MiB,86.94%,8.58MB / 10.1MB,0B / 295kB,35 +2026-10-16T19:35:13.7585814+03:00,lab3-api-2,102.56%,437.7MiB / 512MiB,85.49%,8.43MB / 10.1MB,0B / 299kB,35 +2026-10-16T19:35:13.7585814+03:00,lab3-db-1,99.96%,88.76MiB / 1GiB,8.67%,12.7MB / 10.3MB,8.19kB / 430kB,25 +2026-10-16T19:35:13.7585814+03:00,lab3-redis-1,1.76%,3.691MiB / 256MiB,1.44%,1.46MB / 1.71MB,41kB / 0B,6 +2026-10-16T19:35:18.4303387+03:00,lab3-loadgen-run-39d76031bdd7,22.26%,26.16MiB / 7.649GiB,0.33%,9.57MB / 7.5MB,0B / 2.36MB,9 +2026-10-16T19:35:18.4303387+03:00,lab3-lb-1,7.27%,7.801MiB / 128MiB,6.09%,14.1MB / 15MB,0B / 1.04MB,9 +2026-10-16T19:35:18.4303387+03:00,lab3-api-1,46.70%,445.5MiB / 512MiB,87.02%,9.36MB / 11MB,0B / 307kB,35 +2026-10-16T19:35:18.4303387+03:00,lab3-api-2,66.69%,438MiB / 512MiB,85.54%,9.38MB / 11.2MB,0B / 311kB,35 +2026-10-16T19:35:18.4303387+03:00,lab3-db-1,99.05%,87.75MiB / 1GiB,8.57%,13.7MB / 11.2MB,8.19kB / 430kB,24 +2026-10-16T19:35:18.4303387+03:00,lab3-redis-1,1.79%,3.441MiB / 256MiB,1.34%,1.61MB / 1.89MB,41kB / 0B,6 +2026-10-16T19:35:23.0752357+03:00,lab3-loadgen-run-39d76031bdd7,18.30%,26.21MiB / 7.649GiB,0.33%,10.3MB / 8.04MB,0B / 2.36MB,9 +2026-10-16T19:35:23.0752357+03:00,lab3-lb-1,5.42%,7.797MiB / 128MiB,6.09%,15.4MB / 16.3MB,0B / 1.41MB,9 +2026-10-16T19:35:23.0752357+03:00,lab3-api-1,72.27%,445.9MiB / 512MiB,87.09%,10MB / 11.8MB,0B / 307kB,35 +2026-10-16T19:35:23.0752357+03:00,lab3-api-2,94.02%,438.6MiB / 512MiB,85.67%,10.1MB / 12MB,0B / 311kB,34 +2026-10-16T19:35:23.0752357+03:00,lab3-db-1,104.30%,105.8MiB / 1GiB,10.33%,14.7MB / 12.1MB,8.19kB / 430kB,25 +2026-10-16T19:35:23.0752357+03:00,lab3-redis-1,1.73%,3.434MiB / 256MiB,1.34%,1.71MB / 2.01MB,41kB / 0B,6 +2026-10-16T19:35:27.7584699+03:00,lab3-loadgen-run-39d76031bdd7,15.55%,26.15MiB / 7.649GiB,0.33%,10.9MB / 8.51MB,0B / 2.36MB,9 +2026-10-16T19:35:27.7584699+03:00,lab3-lb-1,4.53%,7.746MiB / 128MiB,6.05%,16.3MB / 17.3MB,0B / 1.41MB,9 +2026-10-16T19:35:27.7584699+03:00,lab3-api-1,31.90%,446MiB / 512MiB,87.10%,10.7MB / 12.5MB,0B / 307kB,35 +2026-10-16T19:35:27.7584699+03:00,lab3-api-2,43.86%,439MiB / 512MiB,85.74%,10.6MB / 12.5MB,0B / 311kB,34 +2026-10-16T19:35:27.7584699+03:00,lab3-db-1,99.46%,106.6MiB / 1GiB,10.41%,15.5MB / 12.8MB,8.19kB / 430kB,25 +2026-10-16T19:35:27.7584699+03:00,lab3-redis-1,1.35%,3.434MiB / 256MiB,1.34%,1.83MB / 2.15MB,41kB / 0B,6 +2026-10-16T19:35:32.4077828+03:00,lab3-loadgen-run-39d76031bdd7,23.75%,26.68MiB / 7.649GiB,0.34%,11.4MB / 8.96MB,0B / 2.36MB,9 +2026-10-16T19:35:32.4077828+03:00,lab3-lb-1,6.08%,7.758MiB / 128MiB,6.06%,17.2MB / 18.2MB,0B / 1.41MB,9 +2026-10-16T19:35:32.4077828+03:00,lab3-api-1,83.94%,446.5MiB / 512MiB,87.20%,11.2MB / 13.1MB,0B / 307kB,35 +2026-10-16T19:35:32.4077828+03:00,lab3-api-2,51.35%,439.7MiB / 512MiB,85.87%,11.3MB / 13.3MB,0B / 311kB,34 +2026-10-16T19:35:32.4077828+03:00,lab3-db-1,103.93%,90.05MiB / 1GiB,8.79%,16.3MB / 13.5MB,8.19kB / 430kB,24 +2026-10-16T19:35:32.4077828+03:00,lab3-redis-1,1.54%,3.441MiB / 256MiB,1.34%,1.91MB / 2.24MB,41kB / 0B,6 diff --git a/evidence/lab3/seriesA-C2.json b/evidence/lab3/seriesA-C2.json new file mode 100644 index 00000000..38cc5c5c --- /dev/null +++ b/evidence/lab3/seriesA-C2.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.075, + "concurrency": 8, + "successful_requests": 11267, + "failed_requests": 0, + "error_ratio": 0.0, + "successful_rps": 125.085, + "successful_latency_ms": { + "p50": 68.275, + "p95": 114.484, + "p99": 198.429 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/seriesA-C3-stats.csv b/evidence/lab3/seriesA-C3-stats.csv new file mode 100644 index 00000000..0994dcd3 --- /dev/null +++ b/evidence/lab3/seriesA-C3-stats.csv @@ -0,0 +1,161 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T19:24:51.2819767+03:00,lab3-loadgen-run-57a7191551e7,0.00%,17.88MiB / 7.649GiB,0.23%,2.89kB / 1.94kB,0B / 2.36MB,1 +2026-10-16T19:24:51.2819767+03:00,lab3-lb-1,0.16%,7.066MiB / 128MiB,5.52%,4.48kB / 3.92kB,0B / 16.4kB,9 +2026-10-16T19:24:51.2819767+03:00,lab3-api-4,0.24%,253.7MiB / 256MiB,99.10%,39.5kB / 48.5kB,46.7MB / 150MB,33 +2026-10-16T19:24:51.2819767+03:00,lab3-api-1,0.24%,253.2MiB / 256MiB,98.93%,40.2kB / 49.1kB,57.6MB / 169MB,33 +2026-10-16T19:24:51.2819767+03:00,lab3-api-3,0.22%,253.3MiB / 256MiB,98.93%,40.7kB / 49.9kB,49.3MB / 162MB,33 +2026-10-16T19:24:51.2819767+03:00,lab3-api-2,45.54%,255.9MiB / 256MiB,99.97%,40.7kB / 49.9kB,71.8MB / 173MB,33 +2026-10-16T19:24:51.2819767+03:00,lab3-redis-1,0.37%,3.254MiB / 256MiB,1.27%,3.08kB / 126B,32.8kB / 0B,6 +2026-10-16T19:24:51.2819767+03:00,lab3-db-1,2.80%,53.33MiB / 1GiB,5.21%,226kB / 179kB,4.1kB / 229kB,26 +2026-10-16T19:24:55.9191316+03:00,lab3-loadgen-run-57a7191551e7,0.00%,17.87MiB / 7.649GiB,0.23%,3.91kB / 2.62kB,0B / 2.36MB,1 +2026-10-16T19:24:55.9191316+03:00,lab3-lb-1,0.00%,7.098MiB / 128MiB,5.55%,6.18kB / 5.75kB,0B / 16.4kB,9 +2026-10-16T19:24:55.9191316+03:00,lab3-api-4,34.47%,256MiB / 256MiB,99.98%,41.4kB / 50.4kB,68.1MB / 198MB,33 +2026-10-16T19:24:55.9191316+03:00,lab3-api-1,0.23%,253.4MiB / 256MiB,98.98%,40.5kB / 49.4kB,57.6MB / 169MB,33 +2026-10-16T19:24:55.9191316+03:00,lab3-api-3,0.18%,253.3MiB / 256MiB,98.96%,41kB / 50.3kB,49.3MB / 162MB,33 +2026-10-16T19:24:55.9191316+03:00,lab3-api-2,0.18%,254.3MiB / 256MiB,99.34%,41.2kB / 51.1kB,72MB / 175MB,33 +2026-10-16T19:24:55.9191316+03:00,lab3-redis-1,2.19%,3.254MiB / 256MiB,1.27%,3.13kB / 126B,32.8kB / 0B,6 +2026-10-16T19:24:55.9191316+03:00,lab3-db-1,3.50%,54.01MiB / 1GiB,5.27%,230kB / 181kB,4.1kB / 229kB,26 +2026-10-16T19:24:59.5896023+03:00,lab3-loadgen-run-57a7191551e7,0.00%,17.87MiB / 7.649GiB,0.23%,6.06kB / 4.09kB,0B / 2.36MB,1 +2026-10-16T19:24:59.5896023+03:00,lab3-lb-1,0.00%,7.172MiB / 128MiB,5.60%,9.39kB / 9.38kB,0B / 24.6kB,9 +2026-10-16T19:24:59.5896023+03:00,lab3-api-4,0.27%,254.4MiB / 256MiB,99.38%,41.8kB / 51.7kB,69.6MB / 198MB,33 +2026-10-16T19:24:59.5896023+03:00,lab3-api-1,5.00%,254.1MiB / 256MiB,99.27%,41.9kB / 51.4kB,70.4MB / 196MB,33 +2026-10-16T19:24:59.5896023+03:00,lab3-api-3,35.63%,255.9MiB / 256MiB,99.98%,42.2kB / 51kB,61.3MB / 219MB,36 +2026-10-16T19:24:59.5896023+03:00,lab3-api-2,0.19%,253.7MiB / 256MiB,99.11%,41.4kB / 51.4kB,72MB / 176MB,33 +2026-10-16T19:24:59.5896023+03:00,lab3-redis-1,2.16%,3.293MiB / 256MiB,1.29%,3.13kB / 126B,32.8kB / 0B,6 +2026-10-16T19:24:59.5896023+03:00,lab3-db-1,0.23%,53.87MiB / 1GiB,5.26%,232kB / 183kB,4.1kB / 229kB,26 +2026-10-16T19:25:04.2238790+03:00,lab3-loadgen-run-57a7191551e7,9.78%,25.6MiB / 7.649GiB,0.33%,11.9kB / 12kB,0B / 2.36MB,9 +2026-10-16T19:25:04.2238790+03:00,lab3-lb-1,0.17%,7.379MiB / 128MiB,5.76%,21.6kB / 22.9kB,0B / 24.6kB,9 +2026-10-16T19:25:04.2238790+03:00,lab3-api-4,9.76%,254.1MiB / 256MiB,99.24%,43.8kB / 54.2kB,70MB / 198MB,33 +2026-10-16T19:25:04.2238790+03:00,lab3-api-1,50.34%,256MiB / 256MiB,99.99%,47.8kB / 57.6kB,99.1MB / 239MB,35 +2026-10-16T19:25:04.2238790+03:00,lab3-api-3,18.73%,255.7MiB / 256MiB,99.89%,44.4kB / 53.3kB,70MB / 219MB,33 +2026-10-16T19:25:04.2238790+03:00,lab3-api-2,19.47%,255.8MiB / 256MiB,99.94%,44.2kB / 53.7kB,75.7MB / 192MB,33 +2026-10-16T19:25:04.2238790+03:00,lab3-redis-1,2.31%,3.434MiB / 256MiB,1.34%,5.72kB / 1.85kB,32.8kB / 0B,6 +2026-10-16T19:25:04.2238790+03:00,lab3-db-1,0.42%,54.36MiB / 1GiB,5.31%,239kB / 188kB,4.1kB / 229kB,26 +2026-10-16T19:25:08.8664204+03:00,lab3-loadgen-run-57a7191551e7,0.00%,25.61MiB / 7.649GiB,0.33%,14.2kB / 13.7kB,0B / 2.36MB,9 +2026-10-16T19:25:08.8664204+03:00,lab3-lb-1,0.00%,7.398MiB / 128MiB,5.78%,25.2kB / 26.7kB,0B / 28.7kB,9 +2026-10-16T19:25:08.8664204+03:00,lab3-api-4,10.85%,255.8MiB / 256MiB,99.93%,47.8kB / 57.6kB,118MB / 252MB,39 +2026-10-16T19:25:08.8664204+03:00,lab3-api-1,6.48%,253.9MiB / 256MiB,99.20%,51.8kB / 65kB,109MB / 251MB,35 +2026-10-16T19:25:08.8664204+03:00,lab3-api-3,46.87%,255.6MiB / 256MiB,99.83%,47.7kB / 56.4kB,93.6MB / 244MB,36 +2026-10-16T19:25:08.8664204+03:00,lab3-api-2,42.16%,255.9MiB / 256MiB,99.98%,51.1kB / 60.7kB,114MB / 238MB,37 +2026-10-16T19:25:08.8664204+03:00,lab3-redis-1,0.44%,3.715MiB / 256MiB,1.45%,12.5kB / 7.05kB,36.9kB / 0B,6 +2026-10-16T19:25:08.8664204+03:00,lab3-db-1,0.95%,57.48MiB / 1GiB,5.61%,252kB / 197kB,45.1kB / 229kB,26 +2026-10-16T19:25:13.4891701+03:00,lab3-loadgen-run-57a7191551e7,0.00%,25.63MiB / 7.649GiB,0.33%,24.8kB / 25.9kB,0B / 2.36MB,9 +2026-10-16T19:25:13.4891701+03:00,lab3-lb-1,0.00%,7.449MiB / 128MiB,5.82%,46.7kB / 48.6kB,0B / 32.8kB,9 +2026-10-16T19:25:13.4891701+03:00,lab3-api-4,8.23%,255.8MiB / 256MiB,99.91%,50.8kB / 58.3kB,191MB / 323MB,38 +2026-10-16T19:25:13.4891701+03:00,lab3-api-1,0.19%,255.3MiB / 256MiB,99.74%,63kB / 80.3kB,109MB / 251MB,35 +2026-10-16T19:25:13.4891701+03:00,lab3-api-3,9.58%,255.8MiB / 256MiB,99.93%,51.3kB / 58.4kB,165MB / 321MB,38 +2026-10-16T19:25:13.4891701+03:00,lab3-api-2,5.01%,254.1MiB / 256MiB,99.28%,61.4kB / 79kB,120MB / 256MB,37 +2026-10-16T19:25:13.4891701+03:00,lab3-redis-1,0.40%,3.484MiB / 256MiB,1.36%,15.4kB / 9.12kB,45.1kB / 0B,6 +2026-10-16T19:25:13.4891701+03:00,lab3-db-1,0.54%,60.1MiB / 1GiB,5.87%,275kB / 212kB,45.1kB / 233kB,26 +2026-10-16T19:25:18.1158423+03:00,lab3-loadgen-run-57a7191551e7,0.00%,25.65MiB / 7.649GiB,0.33%,35.6kB / 39.1kB,0B / 2.36MB,9 +2026-10-16T19:25:18.1158423+03:00,lab3-lb-1,0.01%,7.488MiB / 128MiB,5.85%,67.4kB / 71.2kB,0B / 32.8kB,9 +2026-10-16T19:25:18.1158423+03:00,lab3-api-4,22.70%,255.3MiB / 256MiB,99.74%,55.7kB / 61kB,298MB / 435MB,40 +2026-10-16T19:25:18.1158423+03:00,lab3-api-1,0.20%,254.8MiB / 256MiB,99.54%,73.1kB / 92.8kB,110MB / 253MB,35 +2026-10-16T19:25:18.1158423+03:00,lab3-api-3,8.57%,255.3MiB / 256MiB,99.73%,54.3kB / 59.2kB,234MB / 420MB,41 +2026-10-16T19:25:18.1158423+03:00,lab3-api-2,0.17%,255.2MiB / 256MiB,99.67%,72kB / 93.1kB,120MB / 256MB,37 +2026-10-16T19:25:18.1158423+03:00,lab3-redis-1,0.39%,3.484MiB / 256MiB,1.36%,18.4kB / 12.3kB,45.1kB / 0B,6 +2026-10-16T19:25:18.1158423+03:00,lab3-db-1,0.15%,60.29MiB / 1GiB,5.89%,295kB / 226kB,45.1kB / 233kB,26 +2026-10-16T19:25:22.7509102+03:00,lab3-loadgen-run-57a7191551e7,0.00%,25.67MiB / 7.649GiB,0.33%,46.5kB / 52.2kB,0B / 2.36MB,9 +2026-10-16T19:25:22.7509102+03:00,lab3-lb-1,0.00%,7.484MiB / 128MiB,5.85%,88.2kB / 93.8kB,0B / 45.1kB,9 +2026-10-16T19:25:22.7509102+03:00,lab3-api-4,50.42%,255.6MiB / 256MiB,99.84%,60kB / 63.7kB,384MB / 519MB,45 +2026-10-16T19:25:22.7509102+03:00,lab3-api-1,0.18%,254.9MiB / 256MiB,99.58%,82.1kB / 103kB,111MB / 253MB,35 +2026-10-16T19:25:22.7509102+03:00,lab3-api-3,51.28%,255.9MiB / 256MiB,99.95%,67.5kB / 73.6kB,346MB / 495MB,48 +2026-10-16T19:25:22.7509102+03:00,lab3-api-2,0.18%,255.2MiB / 256MiB,99.70%,82.1kB / 106kB,121MB / 256MB,37 +2026-10-16T19:25:22.7509102+03:00,lab3-redis-1,0.61%,3.488MiB / 256MiB,1.36%,27.5kB / 16.6kB,57.3kB / 0B,6 +2026-10-16T19:25:22.7509102+03:00,lab3-db-1,2.02%,63.2MiB / 1GiB,6.17%,319kB / 246kB,45.1kB / 233kB,27 +2026-10-16T19:25:27.3708828+03:00,lab3-loadgen-run-57a7191551e7,0.00%,25.68MiB / 7.649GiB,0.33%,57.4kB / 65.4kB,0B / 2.36MB,9 +2026-10-16T19:25:27.3708828+03:00,lab3-lb-1,0.00%,7.508MiB / 128MiB,5.87%,109kB / 117kB,0B / 45.1kB,9 +2026-10-16T19:25:27.3708828+03:00,lab3-api-4,26.78%,254.5MiB / 256MiB,99.43%,99.9kB / 97.6kB,422MB / 552MB,47 +2026-10-16T19:25:27.3708828+03:00,lab3-api-1,0.19%,255.6MiB / 256MiB,99.84%,91.8kB / 115kB,113MB / 257MB,35 +2026-10-16T19:25:27.3708828+03:00,lab3-api-3,29.66%,255.8MiB / 256MiB,99.91%,110kB / 104kB,415MB / 600MB,54 +2026-10-16T19:25:27.3708828+03:00,lab3-api-2,0.19%,255.1MiB / 256MiB,99.65%,92.6kB / 119kB,122MB / 256MB,37 +2026-10-16T19:25:27.3708828+03:00,lab3-redis-1,0.33%,3.492MiB / 256MiB,1.36%,31.2kB / 20kB,57.3kB / 0B,6 +2026-10-16T19:25:27.3708828+03:00,lab3-db-1,6.94%,118MiB / 1GiB,11.52%,397kB / 333kB,45.1kB / 233kB,53 +2026-10-16T19:25:31.4440690+03:00,lab3-loadgen-run-57a7191551e7,3.35%,25.71MiB / 7.649GiB,0.33%,115kB / 114kB,0B / 2.36MB,9 +2026-10-16T19:25:31.4440690+03:00,lab3-lb-1,1.48%,7.613MiB / 128MiB,5.95%,222kB / 219kB,0B / 45.1kB,9 +2026-10-16T19:25:31.4440690+03:00,lab3-api-4,0.23%,255.8MiB / 256MiB,99.94%,124kB / 156kB,446MB / 570MB,48 +2026-10-16T19:25:31.4440690+03:00,lab3-api-1,26.16%,256MiB / 256MiB,99.98%,129kB / 157kB,114MB / 257MB,35 +2026-10-16T19:25:31.4440690+03:00,lab3-api-3,51.06%,256MiB / 256MiB,99.99%,166kB / 212kB,470MB / 618MB,60 +2026-10-16T19:25:31.4440690+03:00,lab3-api-2,12.39%,255.8MiB / 256MiB,99.92%,114kB / 146kB,123MB / 256MB,37 +2026-10-16T19:25:31.4440690+03:00,lab3-redis-1,2.38%,3.492MiB / 256MiB,1.36%,37.9kB / 26.4kB,57.3kB / 0B,6 +2026-10-16T19:25:31.4440690+03:00,lab3-db-1,19.08%,135.6MiB / 1GiB,13.24%,575kB / 434kB,53.2kB / 233kB,54 +2026-10-16T19:25:36.0829524+03:00,lab3-loadgen-run-57a7191551e7,8.41%,25.71MiB / 7.649GiB,0.33%,366kB / 309kB,0B / 2.36MB,9 +2026-10-16T19:25:36.0829524+03:00,lab3-lb-1,3.15%,8.094MiB / 128MiB,6.32%,600kB / 628kB,0B / 45.1kB,9 +2026-10-16T19:25:36.0829524+03:00,lab3-api-4,50.26%,255.9MiB / 256MiB,99.95%,168kB / 214kB,449MB / 574MB,47 +2026-10-16T19:25:36.0829524+03:00,lab3-api-1,40.57%,255.9MiB / 256MiB,99.96%,283kB / 346kB,118MB / 266MB,35 +2026-10-16T19:25:36.0829524+03:00,lab3-api-3,52.59%,256MiB / 256MiB,99.99%,348kB / 459kB,475MB / 625MB,59 +2026-10-16T19:25:36.0829524+03:00,lab3-api-2,49.05%,255.8MiB / 256MiB,99.94%,289kB / 366kB,139MB / 273MB,37 +2026-10-16T19:25:36.0829524+03:00,lab3-redis-1,1.05%,3.492MiB / 256MiB,1.36%,94.4kB / 81.1kB,57.3kB / 0B,6 +2026-10-16T19:25:36.0829524+03:00,lab3-db-1,24.82%,145.7MiB / 1GiB,14.22%,1.03MB / 762kB,53.2kB / 233kB,54 +2026-10-16T19:25:40.6439239+03:00,lab3-loadgen-run-57a7191551e7,8.22%,25.73MiB / 7.649GiB,0.33%,679kB / 556kB,0B / 2.36MB,9 +2026-10-16T19:25:40.6439239+03:00,lab3-lb-1,2.99%,7.898MiB / 128MiB,6.17%,1.07MB / 1.13MB,0B / 127kB,9 +2026-10-16T19:25:40.6439239+03:00,lab3-api-4,49.33%,255.1MiB / 256MiB,99.67%,322kB / 420kB,452MB / 579MB,47 +2026-10-16T19:25:40.6439239+03:00,lab3-api-1,40.70%,255.6MiB / 256MiB,99.86%,430kB / 527kB,124MB / 274MB,35 +2026-10-16T19:25:40.6439239+03:00,lab3-api-3,49.26%,256MiB / 256MiB,99.99%,511kB / 667kB,480MB / 632MB,59 +2026-10-16T19:25:40.6439239+03:00,lab3-api-2,49.56%,255MiB / 256MiB,99.60%,441kB / 551kB,145MB / 279MB,37 +2026-10-16T19:25:40.6439239+03:00,lab3-redis-1,1.10%,3.746MiB / 256MiB,1.46%,158kB / 143kB,57.3kB / 0B,6 +2026-10-16T19:25:40.6439239+03:00,lab3-db-1,20.82%,156.6MiB / 1GiB,15.29%,1.58MB / 1.16MB,61.4kB / 233kB,54 +2026-10-16T19:25:45.3021058+03:00,lab3-loadgen-run-57a7191551e7,9.74%,25.78MiB / 7.649GiB,0.33%,999kB / 807kB,0B / 2.36MB,9 +2026-10-16T19:25:45.3021058+03:00,lab3-lb-1,3.49%,7.926MiB / 128MiB,6.19%,1.54MB / 1.64MB,0B / 127kB,9 +2026-10-16T19:25:45.3021058+03:00,lab3-api-4,50.31%,255.4MiB / 256MiB,99.75%,521kB / 673kB,458MB / 587MB,47 +2026-10-16T19:25:45.3021058+03:00,lab3-api-1,51.60%,254.8MiB / 256MiB,99.53%,584kB / 714kB,126MB / 279MB,35 +2026-10-16T19:25:45.3021058+03:00,lab3-api-3,50.86%,255.8MiB / 256MiB,99.92%,669kB / 870kB,485MB / 640MB,59 +2026-10-16T19:25:45.3021058+03:00,lab3-api-2,45.40%,255.3MiB / 256MiB,99.72%,592kB / 736kB,148MB / 283MB,37 +2026-10-16T19:25:45.3021058+03:00,lab3-redis-1,3.05%,3.5MiB / 256MiB,1.37%,222kB / 206kB,57.3kB / 0B,6 +2026-10-16T19:25:45.3021058+03:00,lab3-db-1,24.55%,163.5MiB / 1GiB,15.96%,2.07MB / 1.54MB,61.4kB / 233kB,54 +2026-10-16T19:25:49.6902320+03:00,lab3-loadgen-run-57a7191551e7,8.69%,25.76MiB / 7.649GiB,0.33%,1.33MB / 1.06MB,0B / 2.36MB,9 +2026-10-16T19:25:49.6902320+03:00,lab3-lb-1,3.65%,8.203MiB / 128MiB,6.41%,2.04MB / 2.17MB,0B / 127kB,9 +2026-10-16T19:25:49.6902320+03:00,lab3-api-4,50.05%,255.9MiB / 256MiB,99.95%,684kB / 880kB,460MB / 593MB,53 +2026-10-16T19:25:49.6902320+03:00,lab3-api-1,51.30%,254.2MiB / 256MiB,99.31%,742kB / 912kB,137MB / 317MB,35 +2026-10-16T19:25:49.6902320+03:00,lab3-api-3,48.70%,255.6MiB / 256MiB,99.84%,830kB / 1.07MB,488MB / 643MB,59 +2026-10-16T19:25:49.6902320+03:00,lab3-api-2,38.24%,254MiB / 256MiB,99.22%,751kB / 931kB,151MB / 291MB,37 +2026-10-16T19:25:49.6902320+03:00,lab3-redis-1,1.19%,3.496MiB / 256MiB,1.37%,275kB / 257kB,57.3kB / 0B,6 +2026-10-16T19:25:49.6902320+03:00,lab3-db-1,27.51%,169.8MiB / 1GiB,16.59%,2.57MB / 1.92MB,61.4kB / 233kB,54 +2026-10-16T19:25:54.3483994+03:00,lab3-loadgen-run-57a7191551e7,11.25%,25.86MiB / 7.649GiB,0.33%,1.71MB / 1.36MB,0B / 2.36MB,9 +2026-10-16T19:25:54.3483994+03:00,lab3-lb-1,3.68%,7.938MiB / 128MiB,6.20%,2.47MB / 2.63MB,0B / 127kB,9 +2026-10-16T19:25:54.3483994+03:00,lab3-api-4,49.80%,256MiB / 256MiB,100.00%,877kB / 1.12MB,463MB / 595MB,47 +2026-10-16T19:25:54.3483994+03:00,lab3-api-1,49.32%,252.7MiB / 256MiB,98.71%,927kB / 1.14MB,142MB / 317MB,35 +2026-10-16T19:25:54.3483994+03:00,lab3-api-3,49.60%,255.4MiB / 256MiB,99.75%,1.02MB / 1.3MB,495MB / 672MB,59 +2026-10-16T19:25:54.3483994+03:00,lab3-api-2,45.92%,256MiB / 256MiB,99.99%,934kB / 1.15MB,153MB / 294MB,37 +2026-10-16T19:25:54.3483994+03:00,lab3-redis-1,1.36%,3.508MiB / 256MiB,1.37%,365kB / 345kB,57.3kB / 0B,6 +2026-10-16T19:25:54.3483994+03:00,lab3-db-1,25.97%,173.9MiB / 1GiB,16.98%,3.15MB / 2.37MB,61.4kB / 233kB,54 +2026-10-16T19:25:58.9912296+03:00,lab3-loadgen-run-57a7191551e7,11.01%,26.12MiB / 7.649GiB,0.33%,2.16MB / 1.72MB,0B / 2.36MB,9 +2026-10-16T19:25:58.9912296+03:00,lab3-lb-1,3.90%,7.957MiB / 128MiB,6.22%,3.27MB / 3.49MB,0B / 291kB,9 +2026-10-16T19:25:58.9912296+03:00,lab3-api-4,49.03%,255.9MiB / 256MiB,99.96%,1.1MB / 1.41MB,465MB / 602MB,47 +2026-10-16T19:25:58.9912296+03:00,lab3-api-1,45.30%,255.8MiB / 256MiB,99.94%,1.1MB / 1.36MB,144MB / 317MB,35 +2026-10-16T19:25:58.9912296+03:00,lab3-api-3,49.79%,248.5MiB / 256MiB,97.07%,1.24MB / 1.57MB,499MB / 674MB,64 +2026-10-16T19:25:58.9912296+03:00,lab3-api-2,38.99%,255.7MiB / 256MiB,99.87%,1.11MB / 1.36MB,154MB / 297MB,37 +2026-10-16T19:25:58.9912296+03:00,lab3-redis-1,1.30%,3.496MiB / 256MiB,1.37%,454kB / 435kB,57.3kB / 0B,6 +2026-10-16T19:25:58.9912296+03:00,lab3-db-1,32.75%,175.3MiB / 1GiB,17.11%,3.7MB / 2.79MB,61.4kB / 233kB,54 +2026-10-16T19:26:03.6353865+03:00,lab3-loadgen-run-57a7191551e7,13.09%,25.92MiB / 7.649GiB,0.33%,2.63MB / 2.09MB,0B / 2.36MB,9 +2026-10-16T19:26:03.6353865+03:00,lab3-lb-1,4.80%,7.988MiB / 128MiB,6.24%,3.96MB / 4.23MB,0B / 365kB,9 +2026-10-16T19:26:03.6353865+03:00,lab3-api-4,47.51%,255.9MiB / 256MiB,99.98%,1.33MB / 1.7MB,472MB / 608MB,47 +2026-10-16T19:26:03.6353865+03:00,lab3-api-1,47.19%,255.5MiB / 256MiB,99.80%,1.37MB / 1.68MB,147MB / 321MB,35 +2026-10-16T19:26:03.6353865+03:00,lab3-api-3,45.60%,251.4MiB / 256MiB,98.20%,1.47MB / 1.86MB,501MB / 674MB,59 +2026-10-16T19:26:03.6353865+03:00,lab3-api-2,35.95%,254.7MiB / 256MiB,99.51%,1.32MB / 1.62MB,156MB / 304MB,37 +2026-10-16T19:26:03.6353865+03:00,lab3-redis-1,1.45%,3.508MiB / 256MiB,1.37%,544kB / 527kB,57.3kB / 0B,6 +2026-10-16T19:26:03.6353865+03:00,lab3-db-1,40.84%,182.5MiB / 1GiB,17.82%,4.54MB / 3.44MB,61.4kB / 233kB,54 +2026-10-16T19:26:08.3344326+03:00,lab3-loadgen-run-57a7191551e7,13.69%,25.93MiB / 7.649GiB,0.33%,3.13MB / 2.47MB,0B / 2.36MB,9 +2026-10-16T19:26:08.3344326+03:00,lab3-lb-1,4.91%,7.977MiB / 128MiB,6.23%,4.7MB / 5.02MB,0B / 455kB,9 +2026-10-16T19:26:08.3344326+03:00,lab3-api-4,52.66%,255.5MiB / 256MiB,99.81%,1.59MB / 2.02MB,474MB / 612MB,47 +2026-10-16T19:26:08.3344326+03:00,lab3-api-1,40.16%,255.7MiB / 256MiB,99.90%,1.61MB / 1.97MB,150MB / 336MB,35 +2026-10-16T19:26:08.3344326+03:00,lab3-api-3,50.76%,255.1MiB / 256MiB,99.66%,1.71MB / 2.15MB,503MB / 674MB,59 +2026-10-16T19:26:08.3344326+03:00,lab3-api-2,43.26%,254.1MiB / 256MiB,99.26%,1.61MB / 1.97MB,158MB / 320MB,37 +2026-10-16T19:26:08.3344326+03:00,lab3-redis-1,1.52%,3.5MiB / 256MiB,1.37%,640kB / 625kB,57.3kB / 0B,6 +2026-10-16T19:26:08.3344326+03:00,lab3-db-1,48.54%,187.1MiB / 1GiB,18.27%,5.1MB / 3.88MB,61.4kB / 233kB,54 +2026-10-16T19:26:12.9748258+03:00,lab3-loadgen-run-57a7191551e7,15.38%,25.9MiB / 7.649GiB,0.33%,3.66MB / 2.89MB,0B / 2.36MB,9 +2026-10-16T19:26:12.9748258+03:00,lab3-lb-1,5.23%,7.988MiB / 128MiB,6.24%,5.48MB / 5.86MB,0B / 455kB,9 +2026-10-16T19:26:12.9748258+03:00,lab3-api-4,51.46%,255MiB / 256MiB,99.60%,1.85MB / 2.35MB,475MB / 615MB,47 +2026-10-16T19:26:12.9748258+03:00,lab3-api-1,39.09%,255.7MiB / 256MiB,99.89%,1.86MB / 2.28MB,153MB / 336MB,35 +2026-10-16T19:26:12.9748258+03:00,lab3-api-3,40.22%,255.9MiB / 256MiB,99.94%,1.91MB / 2.39MB,504MB / 676MB,59 +2026-10-16T19:26:12.9748258+03:00,lab3-api-2,38.39%,255.1MiB / 256MiB,99.63%,1.87MB / 2.27MB,159MB / 320MB,37 +2026-10-16T19:26:12.9748258+03:00,lab3-redis-1,1.59%,3.508MiB / 256MiB,1.37%,741kB / 729kB,57.3kB / 0B,6 +2026-10-16T19:26:12.9748258+03:00,lab3-db-1,47.93%,189.6MiB / 1GiB,18.52%,6.07MB / 4.64MB,61.4kB / 233kB,54 +2026-10-16T19:26:17.6310501+03:00,lab3-loadgen-run-57a7191551e7,13.11%,25.93MiB / 7.649GiB,0.33%,4.12MB / 3.26MB,0B / 2.36MB,9 +2026-10-16T19:26:17.6310501+03:00,lab3-lb-1,4.22%,8.266MiB / 128MiB,6.46%,6.17MB / 6.6MB,0B / 455kB,9 +2026-10-16T19:26:17.6310501+03:00,lab3-api-4,50.16%,255.9MiB / 256MiB,99.97%,2.09MB / 2.65MB,476MB / 619MB,53 +2026-10-16T19:26:17.6310501+03:00,lab3-api-1,50.25%,254.1MiB / 256MiB,99.26%,2.08MB / 2.55MB,155MB / 336MB,35 +2026-10-16T19:26:17.6310501+03:00,lab3-api-3,39.95%,255.3MiB / 256MiB,99.72%,2.2MB / 2.74MB,505MB / 682MB,59 +2026-10-16T19:26:17.6310501+03:00,lab3-api-2,48.85%,255.9MiB / 256MiB,99.96%,2.09MB / 2.54MB,161MB / 322MB,38 +2026-10-16T19:26:17.6310501+03:00,lab3-redis-1,1.66%,3.508MiB / 256MiB,1.37%,830kB / 821kB,57.3kB / 0B,6 +2026-10-16T19:26:17.6310501+03:00,lab3-db-1,42.44%,190.3MiB / 1GiB,18.58%,6.77MB / 5.18MB,61.4kB / 233kB,54 diff --git a/evidence/lab3/seriesA-C3.json b/evidence/lab3/seriesA-C3.json new file mode 100644 index 00000000..bec8ffbc --- /dev/null +++ b/evidence/lab3/seriesA-C3.json @@ -0,0 +1,17 @@ +{ + "lab": 3, + "workload": "closed-loop POST messages; no automatic retries", + "requested_duration_seconds": 90.0, + "elapsed_seconds": 91.725, + "concurrency": 8, + "successful_requests": 4714, + "failed_requests": 52, + "error_ratio": 0.010911, + "successful_rps": 51.393, + "successful_latency_ms": { + "p50": 52.345, + "p95": 288.565, + "p99": 391.365 + }, + "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." +} diff --git a/evidence/lab3/seriesB-B1-stats.csv b/evidence/lab3/seriesB-B1-stats.csv new file mode 100644 index 00000000..b3fe8b33 --- /dev/null +++ b/evidence/lab3/seriesB-B1-stats.csv @@ -0,0 +1,121 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T19:41:51.0275097+03:00,lab3-loadgen-run-6fdd9ec04e64,0.17%,17.89MiB / 7.649GiB,0.23%,3.7kB / 2.69kB,0B / 0B,1 +2026-10-16T19:41:51.0275097+03:00,lab3-lb-1,0.33%,7.27MiB / 128MiB,5.68%,14.3kB / 14.6kB,0B / 12.3kB,9 +2026-10-16T19:41:51.0275097+03:00,lab3-api-1,82.97%,375MiB / 512MiB,73.25%,27.2kB / 29.1kB,0B / 262kB,34 +2026-10-16T19:41:51.0275097+03:00,lab3-api-2,33.89%,355.2MiB / 512MiB,69.38%,28.6kB / 31kB,0B / 262kB,33 +2026-10-16T19:41:51.0275097+03:00,lab3-db-1,3.86%,37.12MiB / 1GiB,3.62%,84.7kB / 73.8kB,0B / 225kB,16 +2026-10-16T19:41:51.0275097+03:00,lab3-redis-1,4.09%,3.637MiB / 256MiB,1.42%,2.71kB / 126B,36.9kB / 0B,6 +2026-10-16T19:41:55.6578473+03:00,lab3-loadgen-run-6fdd9ec04e64,7.81%,25.71MiB / 7.649GiB,0.33%,84.3kB / 69kB,0B / 0B,9 +2026-10-16T19:41:55.6578473+03:00,lab3-lb-1,4.40%,7.59MiB / 128MiB,5.93%,133kB / 144kB,0B / 12.3kB,9 +2026-10-16T19:41:55.6578473+03:00,lab3-api-1,100.22%,385.7MiB / 512MiB,75.33%,116kB / 143kB,0B / 262kB,35 +2026-10-16T19:41:55.6578473+03:00,lab3-api-2,100.24%,382.7MiB / 512MiB,74.76%,133kB / 165kB,0B / 262kB,35 +2026-10-16T19:41:55.6578473+03:00,lab3-db-1,20.93%,53.14MiB / 1GiB,5.19%,146kB / 117kB,0B / 225kB,20 +2026-10-16T19:41:55.6578473+03:00,lab3-redis-1,0.61%,3.449MiB / 256MiB,1.35%,10.3kB / 7.35kB,41kB / 0B,6 +2026-10-16T19:42:00.3225797+03:00,lab3-loadgen-run-6fdd9ec04e64,9.89%,25.72MiB / 7.649GiB,0.33%,346kB / 274kB,0B / 0B,9 +2026-10-16T19:42:00.3225797+03:00,lab3-lb-1,3.45%,7.738MiB / 128MiB,6.05%,645kB / 691kB,0B / 12.3kB,9 +2026-10-16T19:42:00.3225797+03:00,lab3-api-1,101.43%,394.8MiB / 512MiB,77.12%,453kB / 548kB,0B / 262kB,36 +2026-10-16T19:42:00.3225797+03:00,lab3-api-2,108.10%,393.5MiB / 512MiB,76.86%,470kB / 580kB,0B / 262kB,34 +2026-10-16T19:42:00.3225797+03:00,lab3-db-1,25.83%,64.28MiB / 1GiB,6.28%,770kB / 592kB,0B / 225kB,22 +2026-10-16T19:42:00.3225797+03:00,lab3-redis-1,3.24%,3.453MiB / 256MiB,1.35%,80.1kB / 84.4kB,41kB / 0B,6 +2026-10-16T19:42:04.9982408+03:00,lab3-loadgen-run-6fdd9ec04e64,18.96%,26.04MiB / 7.649GiB,0.33%,894kB / 703kB,0B / 2.36MB,9 +2026-10-16T19:42:04.9982408+03:00,lab3-lb-1,5.41%,7.777MiB / 128MiB,6.08%,1.35MB / 1.44MB,0B / 119kB,9 +2026-10-16T19:42:04.9982408+03:00,lab3-api-1,99.76%,416.2MiB / 512MiB,81.29%,909kB / 1.1MB,0B / 279kB,36 +2026-10-16T19:42:04.9982408+03:00,lab3-api-2,107.80%,399.1MiB / 512MiB,77.94%,830kB / 1.01MB,0B / 279kB,34 +2026-10-16T19:42:04.9982408+03:00,lab3-db-1,35.56%,71.46MiB / 1GiB,6.98%,1.45MB / 1.13MB,0B / 225kB,24 +2026-10-16T19:42:04.9982408+03:00,lab3-redis-1,1.12%,3.449MiB / 256MiB,1.35%,159kB / 177kB,41kB / 0B,6 +2026-10-16T19:42:09.6991409+03:00,lab3-loadgen-run-6fdd9ec04e64,18.60%,25.79MiB / 7.649GiB,0.33%,1.34MB / 1.05MB,0B / 2.36MB,9 +2026-10-16T19:42:09.6991409+03:00,lab3-lb-1,5.25%,7.84MiB / 128MiB,6.12%,2.21MB / 2.34MB,0B / 119kB,9 +2026-10-16T19:42:09.6991409+03:00,lab3-api-1,103.01%,425.8MiB / 512MiB,83.17%,1.46MB / 1.75MB,0B / 279kB,36 +2026-10-16T19:42:09.6991409+03:00,lab3-api-2,102.16%,408.8MiB / 512MiB,79.84%,1.47MB / 1.78MB,0B / 279kB,35 +2026-10-16T19:42:09.6991409+03:00,lab3-db-1,37.49%,78.05MiB / 1GiB,7.62%,2.25MB / 1.79MB,0B / 225kB,32 +2026-10-16T19:42:09.6991409+03:00,lab3-redis-1,1.39%,3.699MiB / 256MiB,1.45%,257kB / 288kB,41kB / 0B,6 +2026-10-16T19:42:14.3703512+03:00,lab3-loadgen-run-6fdd9ec04e64,22.39%,25.89MiB / 7.649GiB,0.33%,2.01MB / 1.57MB,0B / 2.36MB,9 +2026-10-16T19:42:14.3703512+03:00,lab3-lb-1,6.71%,7.867MiB / 128MiB,6.15%,3.02MB / 3.21MB,0B / 119kB,9 +2026-10-16T19:42:14.3703512+03:00,lab3-api-1,99.39%,428.9MiB / 512MiB,83.76%,1.99MB / 2.37MB,0B / 279kB,36 +2026-10-16T19:42:14.3703512+03:00,lab3-api-2,100.15%,413.1MiB / 512MiB,80.68%,2MB / 2.42MB,0B / 279kB,35 +2026-10-16T19:42:14.3703512+03:00,lab3-db-1,48.86%,81.49MiB / 1GiB,7.96%,3.03MB / 2.41MB,0B / 225kB,27 +2026-10-16T19:42:14.3703512+03:00,lab3-redis-1,1.87%,3.453MiB / 256MiB,1.35%,349kB / 395kB,41kB / 0B,6 +2026-10-16T19:42:18.4246413+03:00,lab3-loadgen-run-6fdd9ec04e64,21.92%,26.66MiB / 7.649GiB,0.34%,2.72MB / 2.13MB,0B / 2.36MB,9 +2026-10-16T19:42:18.4246413+03:00,lab3-lb-1,6.41%,7.875MiB / 128MiB,6.15%,3.84MB / 4.08MB,0B / 119kB,9 +2026-10-16T19:42:18.4246413+03:00,lab3-api-1,98.28%,426.2MiB / 512MiB,83.25%,2.67MB / 3.17MB,0B / 291kB,36 +2026-10-16T19:42:18.4246413+03:00,lab3-api-2,104.44%,429.7MiB / 512MiB,83.93%,2.7MB / 3.26MB,0B / 291kB,34 +2026-10-16T19:42:18.4246413+03:00,lab3-db-1,56.25%,83.75MiB / 1GiB,8.18%,4.04MB / 3.23MB,0B / 225kB,27 +2026-10-16T19:42:18.4246413+03:00,lab3-redis-1,1.70%,3.453MiB / 256MiB,1.35%,467kB / 534kB,41kB / 0B,6 +2026-10-16T19:42:23.0956013+03:00,lab3-loadgen-run-6fdd9ec04e64,26.56%,26.23MiB / 7.649GiB,0.33%,3.55MB / 2.78MB,0B / 2.36MB,9 +2026-10-16T19:42:23.0956013+03:00,lab3-lb-1,8.08%,7.836MiB / 128MiB,6.12%,5.03MB / 5.35MB,0B / 410kB,9 +2026-10-16T19:42:23.0956013+03:00,lab3-api-1,90.08%,427.2MiB / 512MiB,83.44%,3.29MB / 3.89MB,0B / 291kB,36 +2026-10-16T19:42:23.0956013+03:00,lab3-api-2,101.93%,423.7MiB / 512MiB,82.75%,3.3MB / 3.98MB,0B / 291kB,35 +2026-10-16T19:42:23.0956013+03:00,lab3-db-1,67.05%,85.5MiB / 1GiB,8.35%,4.94MB / 3.96MB,0B / 225kB,27 +2026-10-16T19:42:23.0956013+03:00,lab3-redis-1,2.10%,3.453MiB / 256MiB,1.35%,571kB / 659kB,41kB / 0B,6 +2026-10-16T19:42:27.8108063+03:00,lab3-loadgen-run-6fdd9ec04e64,27.95%,25.94MiB / 7.649GiB,0.33%,4.41MB / 3.46MB,0B / 2.36MB,9 +2026-10-16T19:42:27.8108063+03:00,lab3-lb-1,8.35%,7.91MiB / 128MiB,6.18%,6.6MB / 7.02MB,0B / 410kB,9 +2026-10-16T19:42:27.8108063+03:00,lab3-api-1,99.66%,428.4MiB / 512MiB,83.67%,4.3MB / 5.08MB,0B / 291kB,35 +2026-10-16T19:42:27.8108063+03:00,lab3-api-2,100.32%,424.3MiB / 512MiB,82.87%,4.32MB / 5.2MB,0B / 291kB,34 +2026-10-16T19:42:27.8108063+03:00,lab3-db-1,78.86%,87.97MiB / 1GiB,8.59%,6.43MB / 5.18MB,0B / 225kB,27 +2026-10-16T19:42:27.8108063+03:00,lab3-redis-1,2.22%,3.453MiB / 256MiB,1.35%,712kB / 829kB,41kB / 0B,6 +2026-10-16T19:42:32.5119847+03:00,lab3-loadgen-run-6fdd9ec04e64,21.06%,25.96MiB / 7.649GiB,0.33%,5.01MB / 3.92MB,0B / 2.36MB,9 +2026-10-16T19:42:32.5119847+03:00,lab3-lb-1,6.40%,7.879MiB / 128MiB,6.16%,7.47MB / 7.95MB,0B / 410kB,9 +2026-10-16T19:42:32.5119847+03:00,lab3-api-1,89.30%,432.9MiB / 512MiB,84.55%,4.87MB / 5.74MB,0B / 291kB,35 +2026-10-16T19:42:32.5119847+03:00,lab3-api-2,98.29%,427.3MiB / 512MiB,83.46%,4.89MB / 5.89MB,0B / 291kB,35 +2026-10-16T19:42:32.5119847+03:00,lab3-db-1,67.01%,88.6MiB / 1GiB,8.65%,7.28MB / 5.86MB,0B / 225kB,27 +2026-10-16T19:42:32.5119847+03:00,lab3-redis-1,1.54%,3.449MiB / 256MiB,1.35%,840kB / 979kB,41kB / 0B,6 +2026-10-16T19:42:36.7492891+03:00,lab3-loadgen-run-6fdd9ec04e64,21.99%,25.98MiB / 7.649GiB,0.33%,5.82MB / 4.55MB,0B / 2.36MB,9 +2026-10-16T19:42:36.7492891+03:00,lab3-lb-1,6.44%,7.91MiB / 128MiB,6.18%,8.68MB / 9.23MB,0B / 774kB,9 +2026-10-16T19:42:36.7492891+03:00,lab3-api-1,84.19%,440.9MiB / 512MiB,86.11%,5.66MB / 6.67MB,0B / 303kB,35 +2026-10-16T19:42:36.7492891+03:00,lab3-api-2,97.50%,431.1MiB / 512MiB,84.19%,5.67MB / 6.82MB,0B / 303kB,35 +2026-10-16T19:42:36.7492891+03:00,lab3-db-1,82.73%,91.99MiB / 1GiB,8.98%,8.43MB / 6.79MB,0B / 225kB,28 +2026-10-16T19:42:36.7492891+03:00,lab3-redis-1,1.87%,3.453MiB / 256MiB,1.35%,944kB / 1.1MB,41kB / 0B,6 +2026-10-16T19:42:41.4284870+03:00,lab3-loadgen-run-6fdd9ec04e64,25.76%,26.2MiB / 7.649GiB,0.33%,6.59MB / 5.16MB,0B / 2.36MB,9 +2026-10-16T19:42:41.4284870+03:00,lab3-lb-1,7.93%,7.914MiB / 128MiB,6.18%,9.83MB / 10.5MB,0B / 774kB,9 +2026-10-16T19:42:41.4284870+03:00,lab3-api-1,104.14%,433.6MiB / 512MiB,84.68%,6.24MB / 7.35MB,0B / 303kB,35 +2026-10-16T19:42:41.4284870+03:00,lab3-api-2,101.16%,431.8MiB / 512MiB,84.34%,6.42MB / 7.72MB,0B / 303kB,34 +2026-10-16T19:42:41.4284870+03:00,lab3-db-1,94.26%,92.98MiB / 1GiB,9.08%,9.53MB / 7.69MB,0B / 225kB,28 +2026-10-16T19:42:41.4284870+03:00,lab3-redis-1,4.73%,3.449MiB / 256MiB,1.35%,1.1MB / 1.29MB,41kB / 0B,6 +2026-10-16T19:42:46.0887960+03:00,lab3-loadgen-run-6fdd9ec04e64,27.38%,26.25MiB / 7.649GiB,0.34%,7.46MB / 5.84MB,0B / 2.36MB,9 +2026-10-16T19:42:46.0887960+03:00,lab3-lb-1,8.93%,7.906MiB / 128MiB,6.18%,11.1MB / 11.8MB,0B / 774kB,9 +2026-10-16T19:42:46.0887960+03:00,lab3-api-1,76.75%,433.6MiB / 512MiB,84.68%,7.05MB / 8.3MB,0B / 303kB,35 +2026-10-16T19:42:46.0887960+03:00,lab3-api-2,100.85%,435.2MiB / 512MiB,85.00%,7.26MB / 8.72MB,0B / 303kB,35 +2026-10-16T19:42:46.0887960+03:00,lab3-db-1,101.89%,93.49MiB / 1GiB,9.13%,10.8MB / 8.69MB,0B / 225kB,28 +2026-10-16T19:42:46.0887960+03:00,lab3-redis-1,4.46%,3.449MiB / 256MiB,1.35%,1.24MB / 1.46MB,41kB / 0B,6 +2026-10-16T19:42:50.7539590+03:00,lab3-loadgen-run-6fdd9ec04e64,26.53%,25.98MiB / 7.649GiB,0.33%,8.23MB / 6.44MB,0B / 2.36MB,9 +2026-10-16T19:42:50.7539590+03:00,lab3-lb-1,9.74%,7.895MiB / 128MiB,6.17%,12.3MB / 13.1MB,0B / 1.16MB,9 +2026-10-16T19:42:50.7539590+03:00,lab3-api-1,67.69%,435.4MiB / 512MiB,85.04%,7.98MB / 9.37MB,0B / 315kB,35 +2026-10-16T19:42:50.7539590+03:00,lab3-api-2,106.07%,437.1MiB / 512MiB,85.37%,8MB / 9.6MB,0B / 315kB,35 +2026-10-16T19:42:50.7539590+03:00,lab3-db-1,99.79%,94.43MiB / 1GiB,9.22%,11.6MB / 9.39MB,0B / 225kB,28 +2026-10-16T19:42:50.7539590+03:00,lab3-redis-1,1.82%,3.453MiB / 256MiB,1.35%,1.36MB / 1.61MB,41kB / 0B,6 +2026-10-16T19:42:55.4408559+03:00,lab3-loadgen-run-6fdd9ec04e64,22.40%,26.55MiB / 7.649GiB,0.34%,8.8MB / 6.89MB,0B / 2.36MB,9 +2026-10-16T19:42:55.4408559+03:00,lab3-lb-1,8.54%,7.848MiB / 128MiB,6.13%,13.4MB / 14.2MB,0B / 1.16MB,9 +2026-10-16T19:42:55.4408559+03:00,lab3-api-1,51.36%,435.6MiB / 512MiB,85.07%,8.7MB / 10.2MB,0B / 315kB,35 +2026-10-16T19:42:55.4408559+03:00,lab3-api-2,101.03%,437.8MiB / 512MiB,85.51%,8.72MB / 10.4MB,0B / 315kB,35 +2026-10-16T19:42:55.4408559+03:00,lab3-db-1,100.84%,94.78MiB / 1GiB,9.26%,12.9MB / 10.4MB,0B / 225kB,28 +2026-10-16T19:42:55.4408559+03:00,lab3-redis-1,1.92%,3.453MiB / 256MiB,1.35%,1.48MB / 1.75MB,41kB / 0B,6 +2026-10-16T19:43:00.1264119+03:00,lab3-loadgen-run-6fdd9ec04e64,24.83%,26.13MiB / 7.649GiB,0.33%,9.58MB / 7.5MB,0B / 2.36MB,9 +2026-10-16T19:43:00.1264119+03:00,lab3-lb-1,6.84%,7.883MiB / 128MiB,6.16%,14.5MB / 15.4MB,0B / 1.16MB,9 +2026-10-16T19:43:00.1264119+03:00,lab3-api-1,47.65%,435.9MiB / 512MiB,85.13%,9.29MB / 10.9MB,0B / 315kB,35 +2026-10-16T19:43:00.1264119+03:00,lab3-api-2,105.82%,438.9MiB / 512MiB,85.72%,9.44MB / 11.3MB,0B / 315kB,36 +2026-10-16T19:43:00.1264119+03:00,lab3-db-1,104.73%,96.29MiB / 1GiB,9.40%,13.9MB / 11.3MB,0B / 315kB,28 +2026-10-16T19:43:00.1264119+03:00,lab3-redis-1,1.92%,3.449MiB / 256MiB,1.35%,1.57MB / 1.87MB,41kB / 0B,6 +2026-10-16T19:43:04.7911250+03:00,lab3-loadgen-run-6fdd9ec04e64,22.97%,26.38MiB / 7.649GiB,0.34%,10.3MB / 8.07MB,0B / 2.36MB,9 +2026-10-16T19:43:04.7911250+03:00,lab3-lb-1,7.76%,7.855MiB / 128MiB,6.14%,15.4MB / 16.4MB,0B / 1.5MB,9 +2026-10-16T19:43:04.7911250+03:00,lab3-api-1,48.35%,435.7MiB / 512MiB,85.11%,10MB / 11.7MB,0B / 328kB,35 +2026-10-16T19:43:04.7911250+03:00,lab3-api-2,102.80%,440.2MiB / 512MiB,85.97%,10MB / 12MB,0B / 328kB,36 +2026-10-16T19:43:04.7911250+03:00,lab3-db-1,106.35%,99.13MiB / 1GiB,9.68%,14.8MB / 12MB,0B / 348kB,35 +2026-10-16T19:43:04.7911250+03:00,lab3-redis-1,2.00%,3.449MiB / 256MiB,1.35%,1.69MB / 2.02MB,41kB / 0B,6 +2026-10-16T19:43:08.8593748+03:00,lab3-loadgen-run-6fdd9ec04e64,22.77%,26.11MiB / 7.649GiB,0.33%,10.8MB / 8.45MB,0B / 2.36MB,9 +2026-10-16T19:43:08.8593748+03:00,lab3-lb-1,5.94%,7.84MiB / 128MiB,6.12%,16.3MB / 17.4MB,0B / 1.5MB,9 +2026-10-16T19:43:08.8593748+03:00,lab3-api-1,41.18%,435.8MiB / 512MiB,85.11%,10.6MB / 12.5MB,0B / 328kB,35 +2026-10-16T19:43:08.8593748+03:00,lab3-api-2,54.52%,440.7MiB / 512MiB,86.07%,10.7MB / 12.7MB,0B / 328kB,35 +2026-10-16T19:43:08.8593748+03:00,lab3-db-1,104.95%,99.57MiB / 1GiB,9.72%,15.7MB / 12.8MB,0B / 348kB,29 +2026-10-16T19:43:08.8593748+03:00,lab3-redis-1,1.56%,3.449MiB / 256MiB,1.35%,1.8MB / 2.14MB,41kB / 0B,6 +2026-10-16T19:43:13.5588148+03:00,lab3-loadgen-run-6fdd9ec04e64,19.61%,26.09MiB / 7.649GiB,0.33%,11.5MB / 8.99MB,0B / 2.36MB,9 +2026-10-16T19:43:13.5588148+03:00,lab3-lb-1,5.81%,7.809MiB / 128MiB,6.10%,17.1MB / 18.2MB,0B / 1.5MB,9 +2026-10-16T19:43:13.5588148+03:00,lab3-api-1,56.48%,435.9MiB / 512MiB,85.14%,11.2MB / 13.1MB,0B / 328kB,35 +2026-10-16T19:43:13.5588148+03:00,lab3-api-2,59.56%,441.1MiB / 512MiB,86.14%,11.2MB / 13.3MB,0B / 328kB,34 +2026-10-16T19:43:13.5588148+03:00,lab3-db-1,98.03%,98.54MiB / 1GiB,9.62%,16.4MB / 13.5MB,0B / 348kB,29 +2026-10-16T19:43:13.5588148+03:00,lab3-redis-1,1.56%,3.445MiB / 256MiB,1.35%,1.89MB / 2.25MB,41kB / 0B,6 +2026-10-16T19:43:17.8919488+03:00,lab3-loadgen-run-6fdd9ec04e64,19.33%,26.14MiB / 7.649GiB,0.33%,12.1MB / 9.47MB,0B / 2.36MB,9 +2026-10-16T19:43:17.8919488+03:00,lab3-lb-1,5.26%,7.824MiB / 128MiB,6.11%,18.1MB / 19.2MB,0B / 1.5MB,9 +2026-10-16T19:43:17.8919488+03:00,lab3-api-1,74.82%,447.3MiB / 512MiB,87.37%,11.8MB / 13.8MB,0B / 328kB,41 +2026-10-16T19:43:17.8919488+03:00,lab3-api-2,71.43%,444.6MiB / 512MiB,86.83%,11.9MB / 14MB,0B / 328kB,34 +2026-10-16T19:43:17.8919488+03:00,lab3-db-1,101.35%,99.32MiB / 1GiB,9.70%,17.3MB / 14.2MB,0B / 348kB,29 +2026-10-16T19:43:17.8919488+03:00,lab3-redis-1,4.12%,3.457MiB / 256MiB,1.35%,1.98MB / 2.35MB,41kB / 0B,6 diff --git a/evidence/lab3/B2-improved.json b/evidence/lab3/seriesB-B1.json similarity index 64% rename from evidence/lab3/B2-improved.json rename to evidence/lab3/seriesB-B1.json index dd77e883..8d44e38b 100644 --- a/evidence/lab3/B2-improved.json +++ b/evidence/lab3/seriesB-B1.json @@ -1,17 +1,17 @@ { "lab": 3, "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.13, + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.106, "concurrency": 8, - "successful_requests": 8119, + "successful_requests": 11732, "failed_requests": 0, "error_ratio": 0.0, - "successful_rps": 135.024, + "successful_rps": 130.203, "successful_latency_ms": { - "p50": 42.124, - "p95": 174.422, - "p99": 196.827 + "p50": 53.87, + "p95": 130.262, + "p99": 186.917 }, "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." } diff --git a/evidence/lab3/seriesB-B2-stats.csv b/evidence/lab3/seriesB-B2-stats.csv new file mode 100644 index 00000000..00d23936 --- /dev/null +++ b/evidence/lab3/seriesB-B2-stats.csv @@ -0,0 +1,121 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T19:48:40.8570314+03:00,lab3-loadgen-run-dea587583317,1.00%,25.66MiB / 7.649GiB,0.33%,19.6kB / 18.1kB,0B / 0B,9 +2026-10-16T19:48:40.8570314+03:00,lab3-lb-1,0.30%,7.562MiB / 128MiB,5.91%,33.3kB / 35.6kB,0B / 12.3kB,9 +2026-10-16T19:48:40.8570314+03:00,lab3-api-1,189.48%,373.6MiB / 1GiB,36.49%,52kB / 51kB,0B / 324kB,35 +2026-10-16T19:48:40.8570314+03:00,lab3-api-2,113.37%,389.7MiB / 1GiB,38.06%,55.2kB / 66.4kB,0B / 324kB,36 +2026-10-16T19:48:40.8570314+03:00,lab3-db-1,17.42%,50.82MiB / 1GiB,4.96%,128kB / 109kB,0B / 225kB,20 +2026-10-16T19:48:40.8570314+03:00,lab3-redis-1,0.57%,3.672MiB / 256MiB,1.43%,5.42kB / 2.28kB,41kB / 0B,6 +2026-10-16T19:48:45.5147507+03:00,lab3-loadgen-run-dea587583317,22.51%,25.77MiB / 7.649GiB,0.33%,542kB / 431kB,0B / 0B,9 +2026-10-16T19:48:45.5147507+03:00,lab3-lb-1,7.58%,7.938MiB / 128MiB,6.20%,828kB / 877kB,0B / 12.3kB,9 +2026-10-16T19:48:45.5147507+03:00,lab3-api-1,215.00%,395.3MiB / 1GiB,38.60%,583kB / 699kB,0B / 324kB,42 +2026-10-16T19:48:45.5147507+03:00,lab3-api-2,214.72%,406.4MiB / 1GiB,39.69%,577kB / 678kB,0B / 324kB,42 +2026-10-16T19:48:45.5147507+03:00,lab3-db-1,54.71%,67.85MiB / 1GiB,6.63%,923kB / 740kB,0B / 225kB,23 +2026-10-16T19:48:45.5147507+03:00,lab3-redis-1,1.70%,3.441MiB / 256MiB,1.34%,73.3kB / 82.5kB,41kB / 0B,6 +2026-10-16T19:48:50.3373131+03:00,lab3-loadgen-run-dea587583317,28.65%,25.87MiB / 7.649GiB,0.33%,1.17MB / 930kB,0B / 0B,9 +2026-10-16T19:48:50.3373131+03:00,lab3-lb-1,8.55%,7.965MiB / 128MiB,6.22%,1.78MB / 1.88MB,0B / 12.3kB,9 +2026-10-16T19:48:50.3373131+03:00,lab3-api-1,203.90%,404.9MiB / 1GiB,39.55%,1.2MB / 1.41MB,0B / 324kB,34 +2026-10-16T19:48:50.3373131+03:00,lab3-api-2,202.92%,419.1MiB / 1GiB,40.93%,1.19MB / 1.4MB,0B / 324kB,35 +2026-10-16T19:48:50.3373131+03:00,lab3-db-1,58.17%,74.18MiB / 1GiB,7.24%,1.81MB / 1.47MB,0B / 225kB,23 +2026-10-16T19:48:50.3373131+03:00,lab3-redis-1,2.63%,3.449MiB / 256MiB,1.35%,194kB / 234kB,41kB / 0B,6 +2026-10-16T19:48:54.5353733+03:00,lab3-loadgen-run-dea587583317,34.50%,25.94MiB / 7.649GiB,0.33%,1.92MB / 1.52MB,0B / 2.36MB,9 +2026-10-16T19:48:54.5353733+03:00,lab3-lb-1,10.68%,7.953MiB / 128MiB,6.21%,3.21MB / 3.41MB,0B / 262kB,9 +2026-10-16T19:48:54.5353733+03:00,lab3-api-1,193.10%,412.1MiB / 1GiB,40.25%,2.12MB / 2.48MB,0B / 340kB,34 +2026-10-16T19:48:54.5353733+03:00,lab3-api-2,207.90%,449MiB / 1GiB,43.85%,2.13MB / 2.5MB,0B / 340kB,36 +2026-10-16T19:48:54.5353733+03:00,lab3-db-1,79.29%,80.2MiB / 1GiB,7.83%,3.15MB / 2.58MB,0B / 225kB,24 +2026-10-16T19:48:54.5353733+03:00,lab3-redis-1,2.57%,3.449MiB / 256MiB,1.35%,309kB / 381kB,41kB / 0B,6 +2026-10-16T19:48:59.3157464+03:00,lab3-loadgen-run-dea587583317,41.02%,26.28MiB / 7.649GiB,0.34%,3.17MB / 2.5MB,0B / 2.36MB,9 +2026-10-16T19:48:59.3157464+03:00,lab3-lb-1,12.37%,8.047MiB / 128MiB,6.29%,4.75MB / 5.06MB,0B / 262kB,9 +2026-10-16T19:48:59.3157464+03:00,lab3-api-1,185.63%,413.9MiB / 1GiB,40.42%,3.13MB / 3.64MB,0B / 340kB,34 +2026-10-16T19:48:59.3157464+03:00,lab3-api-2,201.87%,432.9MiB / 1GiB,42.28%,3.13MB / 3.65MB,0B / 340kB,35 +2026-10-16T19:48:59.3157464+03:00,lab3-db-1,100.09%,82.83MiB / 1GiB,8.09%,4.59MB / 3.77MB,0B / 225kB,24 +2026-10-16T19:48:59.3157464+03:00,lab3-redis-1,3.21%,3.449MiB / 256MiB,1.35%,501kB / 631kB,41kB / 0B,6 +2026-10-16T19:49:03.8798615+03:00,lab3-loadgen-run-dea587583317,34.17%,26MiB / 7.649GiB,0.33%,4.3MB / 3.38MB,0B / 2.36MB,9 +2026-10-16T19:49:03.8798615+03:00,lab3-lb-1,9.69%,8.242MiB / 128MiB,6.44%,6.03MB / 6.44MB,0B / 262kB,9 +2026-10-16T19:49:03.8798615+03:00,lab3-api-1,129.03%,414.5MiB / 1GiB,40.48%,4.21MB / 4.89MB,0B / 340kB,34 +2026-10-16T19:49:03.8798615+03:00,lab3-api-2,172.06%,434.7MiB / 1GiB,42.45%,4.21MB / 4.9MB,0B / 340kB,35 +2026-10-16T19:49:03.8798615+03:00,lab3-db-1,102.28%,84.26MiB / 1GiB,8.23%,6.14MB / 5.06MB,0B / 225kB,24 +2026-10-16T19:49:03.8798615+03:00,lab3-redis-1,2.93%,3.449MiB / 256MiB,1.35%,672kB / 854kB,41kB / 0B,6 +2026-10-16T19:49:08.6568965+03:00,lab3-loadgen-run-dea587583317,34.38%,26.02MiB / 7.649GiB,0.33%,5.1MB / 4.01MB,0B / 2.36MB,9 +2026-10-16T19:49:08.6568965+03:00,lab3-lb-1,10.74%,8.223MiB / 128MiB,6.42%,7.59MB / 8.1MB,0B / 741kB,9 +2026-10-16T19:49:08.6568965+03:00,lab3-api-1,154.44%,415.4MiB / 1GiB,40.57%,4.99MB / 5.8MB,0B / 352kB,34 +2026-10-16T19:49:08.6568965+03:00,lab3-api-2,159.74%,440.9MiB / 1GiB,43.05%,4.99MB / 5.8MB,0B / 352kB,35 +2026-10-16T19:49:08.6568965+03:00,lab3-db-1,102.96%,85.1MiB / 1GiB,8.31%,7.26MB / 6MB,0B / 225kB,24 +2026-10-16T19:49:08.6568965+03:00,lab3-redis-1,4.95%,3.449MiB / 256MiB,1.35%,796kB / 1.01MB,41kB / 0B,6 +2026-10-16T19:49:12.9763669+03:00,lab3-loadgen-run-dea587583317,36.43%,26.03MiB / 7.649GiB,0.33%,5.99MB / 4.71MB,0B / 2.36MB,9 +2026-10-16T19:49:12.9763669+03:00,lab3-lb-1,8.59%,7.984MiB / 128MiB,6.24%,8.93MB / 9.52MB,0B / 741kB,9 +2026-10-16T19:49:12.9763669+03:00,lab3-api-1,160.44%,416.8MiB / 1GiB,40.70%,5.87MB / 6.82MB,0B / 352kB,34 +2026-10-16T19:49:12.9763669+03:00,lab3-api-2,151.67%,444MiB / 1GiB,43.36%,5.87MB / 6.81MB,0B / 352kB,36 +2026-10-16T19:49:12.9763669+03:00,lab3-db-1,104.30%,87.56MiB / 1GiB,8.55%,8.5MB / 7.05MB,0B / 225kB,25 +2026-10-16T19:49:12.9763669+03:00,lab3-redis-1,2.19%,3.449MiB / 256MiB,1.35%,914kB / 1.16MB,41kB / 0B,6 +2026-10-16T19:49:17.7225206+03:00,lab3-loadgen-run-dea587583317,29.13%,26.02MiB / 7.649GiB,0.33%,6.81MB / 5.35MB,0B / 2.36MB,9 +2026-10-16T19:49:17.7225206+03:00,lab3-lb-1,8.51%,7.965MiB / 128MiB,6.22%,10.2MB / 10.8MB,0B / 741kB,9 +2026-10-16T19:49:17.7225206+03:00,lab3-api-1,85.28%,420.5MiB / 1GiB,41.06%,6.49MB / 7.53MB,0B / 352kB,34 +2026-10-16T19:49:17.7225206+03:00,lab3-api-2,118.57%,444.6MiB / 1GiB,43.42%,6.68MB / 7.74MB,0B / 352kB,35 +2026-10-16T19:49:17.7225206+03:00,lab3-db-1,99.01%,88.23MiB / 1GiB,8.62%,9.64MB / 8.02MB,0B / 229kB,25 +2026-10-16T19:49:17.7225206+03:00,lab3-redis-1,4.51%,3.449MiB / 256MiB,1.35%,1.07MB / 1.36MB,41kB / 0B,6 +2026-10-16T19:49:22.4866446+03:00,lab3-loadgen-run-dea587583317,25.56%,26.06MiB / 7.649GiB,0.33%,7.6MB / 5.97MB,0B / 2.36MB,9 +2026-10-16T19:49:22.4866446+03:00,lab3-lb-1,7.55%,7.93MiB / 128MiB,6.20%,11.3MB / 12.1MB,0B / 741kB,9 +2026-10-16T19:49:22.4866446+03:00,lab3-api-1,95.38%,424.3MiB / 1GiB,41.43%,7.47MB / 8.65MB,0B / 365kB,34 +2026-10-16T19:49:22.4866446+03:00,lab3-api-2,95.70%,444.9MiB / 1GiB,43.45%,7.31MB / 8.46MB,0B / 352kB,35 +2026-10-16T19:49:22.4866446+03:00,lab3-db-1,101.16%,88.98MiB / 1GiB,8.69%,10.7MB / 8.98MB,0B / 229kB,25 +2026-10-16T19:49:22.4866446+03:00,lab3-redis-1,2.47%,3.449MiB / 256MiB,1.35%,1.21MB / 1.51MB,41kB / 0B,6 +2026-10-16T19:49:27.1498264+03:00,lab3-loadgen-run-dea587583317,24.88%,26.13MiB / 7.649GiB,0.33%,8.37MB / 6.57MB,0B / 2.36MB,9 +2026-10-16T19:49:27.1498264+03:00,lab3-lb-1,7.57%,7.945MiB / 128MiB,6.21%,12.5MB / 13.3MB,0B / 1.13MB,9 +2026-10-16T19:49:27.1498264+03:00,lab3-api-1,74.03%,421.2MiB / 1GiB,41.13%,8.24MB / 9.54MB,0B / 365kB,34 +2026-10-16T19:49:27.1498264+03:00,lab3-api-2,66.17%,445.7MiB / 1GiB,43.53%,8.25MB / 9.52MB,0B / 365kB,36 +2026-10-16T19:49:27.1498264+03:00,lab3-db-1,103.14%,91.42MiB / 1GiB,8.93%,11.8MB / 9.92MB,0B / 229kB,26 +2026-10-16T19:49:27.1498264+03:00,lab3-redis-1,2.28%,3.441MiB / 256MiB,1.34%,1.3MB / 1.63MB,41kB / 0B,6 +2026-10-16T19:49:31.8330145+03:00,lab3-loadgen-run-dea587583317,25.33%,26.09MiB / 7.649GiB,0.33%,9.11MB / 7.15MB,0B / 2.36MB,9 +2026-10-16T19:49:31.8330145+03:00,lab3-lb-1,7.98%,7.895MiB / 128MiB,6.17%,13.6MB / 14.5MB,0B / 1.13MB,9 +2026-10-16T19:49:31.8330145+03:00,lab3-api-1,49.51%,421.4MiB / 1GiB,41.15%,8.99MB / 10.4MB,0B / 365kB,34 +2026-10-16T19:49:31.8330145+03:00,lab3-api-2,58.20%,446.1MiB / 1GiB,43.56%,9MB / 10.4MB,0B / 365kB,35 +2026-10-16T19:49:31.8330145+03:00,lab3-db-1,101.27%,91.64MiB / 1GiB,8.95%,12.8MB / 10.8MB,0B / 229kB,26 +2026-10-16T19:49:31.8330145+03:00,lab3-redis-1,2.31%,3.449MiB / 256MiB,1.35%,1.43MB / 1.79MB,41kB / 0B,6 +2026-10-16T19:49:36.4959165+03:00,lab3-loadgen-run-dea587583317,23.10%,26.16MiB / 7.649GiB,0.33%,9.79MB / 7.68MB,0B / 2.36MB,9 +2026-10-16T19:49:36.4959165+03:00,lab3-lb-1,7.55%,7.879MiB / 128MiB,6.16%,14.7MB / 15.6MB,0B / 1.13MB,9 +2026-10-16T19:49:36.4959165+03:00,lab3-api-1,54.14%,421.5MiB / 1GiB,41.16%,9.53MB / 11MB,0B / 365kB,34 +2026-10-16T19:49:36.4959165+03:00,lab3-api-2,43.16%,446.2MiB / 1GiB,43.58%,9.68MB / 11.1MB,0B / 365kB,36 +2026-10-16T19:49:36.4959165+03:00,lab3-db-1,100.83%,92.16MiB / 1GiB,9.00%,13.8MB / 11.7MB,0B / 229kB,26 +2026-10-16T19:49:36.4959165+03:00,lab3-redis-1,2.85%,3.449MiB / 256MiB,1.35%,1.57MB / 1.95MB,41kB / 0B,6 +2026-10-16T19:49:41.1829579+03:00,lab3-loadgen-run-dea587583317,21.53%,26.21MiB / 7.649GiB,0.33%,10.4MB / 8.19MB,0B / 2.36MB,9 +2026-10-16T19:49:41.1829579+03:00,lab3-lb-1,5.79%,7.941MiB / 128MiB,6.20%,15.6MB / 16.6MB,0B / 1.47MB,9 +2026-10-16T19:49:41.1829579+03:00,lab3-api-1,39.04%,421.7MiB / 1GiB,41.18%,10.3MB / 11.9MB,0B / 377kB,34 +2026-10-16T19:49:41.1829579+03:00,lab3-api-2,45.88%,446.5MiB / 1GiB,43.60%,10.3MB / 11.9MB,0B / 377kB,36 +2026-10-16T19:49:41.1829579+03:00,lab3-db-1,102.67%,93.44MiB / 1GiB,9.13%,14.7MB / 12.5MB,0B / 229kB,26 +2026-10-16T19:49:41.1829579+03:00,lab3-redis-1,2.33%,3.441MiB / 256MiB,1.34%,1.66MB / 2.05MB,41kB / 0B,6 +2026-10-16T19:49:45.8318419+03:00,lab3-loadgen-run-dea587583317,19.06%,26.16MiB / 7.649GiB,0.33%,11.1MB / 8.68MB,0B / 2.36MB,9 +2026-10-16T19:49:45.8318419+03:00,lab3-lb-1,4.96%,7.871MiB / 128MiB,6.15%,16.6MB / 17.6MB,0B / 1.47MB,9 +2026-10-16T19:49:45.8318419+03:00,lab3-api-1,37.82%,421.8MiB / 1GiB,41.19%,11MB / 12.6MB,0B / 377kB,34 +2026-10-16T19:49:45.8318419+03:00,lab3-api-2,40.52%,446.6MiB / 1GiB,43.61%,10.9MB / 12.5MB,0B / 377kB,36 +2026-10-16T19:49:45.8318419+03:00,lab3-db-1,100.39%,93.44MiB / 1GiB,9.12%,15.6MB / 13.2MB,0B / 229kB,26 +2026-10-16T19:49:45.8318419+03:00,lab3-redis-1,1.54%,3.449MiB / 256MiB,1.35%,1.79MB / 2.21MB,41kB / 0B,6 +2026-10-16T19:49:50.5066230+03:00,lab3-loadgen-run-dea587583317,19.82%,26.18MiB / 7.649GiB,0.33%,11.7MB / 9.14MB,0B / 2.36MB,9 +2026-10-16T19:49:50.5066230+03:00,lab3-lb-1,6.24%,7.941MiB / 128MiB,6.20%,17.5MB / 18.5MB,0B / 1.47MB,9 +2026-10-16T19:49:50.5066230+03:00,lab3-api-1,65.32%,430.7MiB / 1GiB,42.06%,11.6MB / 13.3MB,0B / 377kB,34 +2026-10-16T19:49:50.5066230+03:00,lab3-api-2,35.90%,448MiB / 1GiB,43.75%,11.6MB / 13.3MB,0B / 377kB,35 +2026-10-16T19:49:50.5066230+03:00,lab3-db-1,99.76%,93.99MiB / 1GiB,9.18%,16.4MB / 14MB,0B / 229kB,26 +2026-10-16T19:49:50.5066230+03:00,lab3-redis-1,1.85%,3.449MiB / 256MiB,1.35%,1.89MB / 2.33MB,41kB / 0B,6 +2026-10-16T19:49:54.5504899+03:00,lab3-loadgen-run-dea587583317,18.66%,26.14MiB / 7.649GiB,0.33%,12.3MB / 9.61MB,0B / 2.36MB,9 +2026-10-16T19:49:54.5504899+03:00,lab3-lb-1,5.47%,7.926MiB / 128MiB,6.19%,18.4MB / 19.5MB,0B / 1.77MB,9 +2026-10-16T19:49:54.5504899+03:00,lab3-api-1,89.93%,431.9MiB / 1GiB,42.18%,12.2MB / 14MB,0B / 389kB,34 +2026-10-16T19:49:54.5504899+03:00,lab3-api-2,113.47%,449.2MiB / 1GiB,43.87%,12.2MB / 14MB,0B / 389kB,35 +2026-10-16T19:49:54.5504899+03:00,lab3-db-1,100.06%,94.45MiB / 1GiB,9.22%,17.1MB / 14.5MB,0B / 229kB,26 +2026-10-16T19:49:54.5504899+03:00,lab3-redis-1,4.30%,3.445MiB / 256MiB,1.35%,1.97MB / 2.42MB,41kB / 0B,6 +2026-10-16T19:49:59.1882628+03:00,lab3-loadgen-run-dea587583317,19.59%,26.14MiB / 7.649GiB,0.33%,12.8MB / 10MB,0B / 2.36MB,9 +2026-10-16T19:49:59.1882628+03:00,lab3-lb-1,5.05%,8.219MiB / 128MiB,6.42%,19.2MB / 20.4MB,0B / 1.77MB,9 +2026-10-16T19:49:59.1882628+03:00,lab3-api-1,29.25%,427.5MiB / 1GiB,41.75%,12.7MB / 14.7MB,0B / 389kB,34 +2026-10-16T19:49:59.1882628+03:00,lab3-api-2,30.07%,449.5MiB / 1GiB,43.90%,12.7MB / 14.6MB,0B / 389kB,35 +2026-10-16T19:49:59.1882628+03:00,lab3-db-1,103.39%,95.5MiB / 1GiB,9.33%,18MB / 15.4MB,0B / 229kB,26 +2026-10-16T19:49:59.1882628+03:00,lab3-redis-1,3.89%,3.445MiB / 256MiB,1.35%,2.09MB / 2.56MB,41kB / 0B,6 +2026-10-16T19:50:03.7208763+03:00,lab3-loadgen-run-dea587583317,16.14%,26.18MiB / 7.649GiB,0.33%,13.3MB / 10.4MB,0B / 2.36MB,9 +2026-10-16T19:50:03.7208763+03:00,lab3-lb-1,4.25%,7.914MiB / 128MiB,6.18%,20.1MB / 21.3MB,0B / 1.77MB,9 +2026-10-16T19:50:03.7208763+03:00,lab3-api-1,32.14%,427.6MiB / 1GiB,41.76%,13.3MB / 15.3MB,0B / 389kB,34 +2026-10-16T19:50:03.7208763+03:00,lab3-api-2,28.01%,449.6MiB / 1GiB,43.91%,13.3MB / 15.3MB,0B / 389kB,35 +2026-10-16T19:50:03.7208763+03:00,lab3-db-1,100.50%,95.4MiB / 1GiB,9.32%,18.8MB / 16.1MB,0B / 229kB,26 +2026-10-16T19:50:03.7208763+03:00,lab3-redis-1,3.28%,3.445MiB / 256MiB,1.35%,2.19MB / 2.67MB,41kB / 0B,6 +2026-10-16T19:50:08.3584341+03:00,lab3-loadgen-run-dea587583317,17.71%,26.18MiB / 7.649GiB,0.33%,13.9MB / 10.9MB,0B / 2.36MB,9 +2026-10-16T19:50:08.3584341+03:00,lab3-lb-1,4.64%,7.93MiB / 128MiB,6.20%,20.8MB / 22MB,0B / 1.77MB,9 +2026-10-16T19:50:08.3584341+03:00,lab3-api-1,27.38%,429.5MiB / 1GiB,41.94%,13.8MB / 15.9MB,0B / 401kB,37 +2026-10-16T19:50:08.3584341+03:00,lab3-api-2,30.52%,449.8MiB / 1GiB,43.92%,13.8MB / 15.8MB,0B / 389kB,36 +2026-10-16T19:50:08.3584341+03:00,lab3-db-1,99.29%,94.27MiB / 1GiB,9.21%,19.5MB / 16.7MB,0B / 410kB,25 +2026-10-16T19:50:08.3584341+03:00,lab3-redis-1,1.67%,3.438MiB / 256MiB,1.34%,2.27MB / 2.77MB,41kB / 0B,6 diff --git a/evidence/lab3/B1.json b/evidence/lab3/seriesB-B2.json similarity index 64% rename from evidence/lab3/B1.json rename to evidence/lab3/seriesB-B2.json index 28aaf5e6..e608af2e 100644 --- a/evidence/lab3/B1.json +++ b/evidence/lab3/seriesB-B2.json @@ -1,17 +1,17 @@ { "lab": 3, "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.123, + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.073, "concurrency": 8, - "successful_requests": 3628, + "successful_requests": 13233, "failed_requests": 0, "error_ratio": 0.0, - "successful_rps": 60.343, + "successful_rps": 146.914, "successful_latency_ms": { - "p50": 105.429, - "p95": 301.881, - "p99": 492.908 + "p50": 48.778, + "p95": 97.924, + "p99": 121.514 }, "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." } diff --git a/evidence/lab3/seriesB-B3-stats.csv b/evidence/lab3/seriesB-B3-stats.csv new file mode 100644 index 00000000..08a27042 --- /dev/null +++ b/evidence/lab3/seriesB-B3-stats.csv @@ -0,0 +1,121 @@ +timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids +2026-10-16T19:55:21.6355964+03:00,lab3-loadgen-run-a54434c38188,12.60%,25.65MiB / 7.649GiB,0.33%,19.5kB / 18.1kB,0B / 0B,9 +2026-10-16T19:55:21.6355964+03:00,lab3-lb-1,0.55%,7.461MiB / 128MiB,5.83%,33.3kB / 35.8kB,0B / 12.3kB,9 +2026-10-16T19:55:21.6355964+03:00,lab3-api-1,177.39%,475.2MiB / 2GiB,23.21%,34.6kB / 32.2kB,266kB / 246kB,43 +2026-10-16T19:55:21.6355964+03:00,lab3-api-2,243.15%,457.4MiB / 2GiB,22.33%,50.9kB / 59.9kB,0B / 254kB,45 +2026-10-16T19:55:21.6355964+03:00,lab3-db-1,0.84%,37.15MiB / 1GiB,3.63%,85.1kB / 74.7kB,0B / 225kB,16 +2026-10-16T19:55:21.6355964+03:00,lab3-redis-1,0.70%,3.422MiB / 256MiB,1.34%,6.17kB / 2.92kB,41kB / 0B,6 +2026-10-16T19:55:26.3066777+03:00,lab3-loadgen-run-a54434c38188,27.51%,25.98MiB / 7.649GiB,0.33%,556kB / 444kB,0B / 0B,9 +2026-10-16T19:55:26.3066777+03:00,lab3-lb-1,10.70%,7.785MiB / 128MiB,6.08%,857kB / 906kB,0B / 12.3kB,9 +2026-10-16T19:55:26.3066777+03:00,lab3-api-1,254.62%,495.5MiB / 2GiB,24.19%,595kB / 699kB,266kB / 246kB,44 +2026-10-16T19:55:26.3066777+03:00,lab3-api-2,304.43%,470MiB / 2GiB,22.95%,585kB / 679kB,0B / 254kB,45 +2026-10-16T19:55:26.3066777+03:00,lab3-db-1,55.20%,65.61MiB / 1GiB,6.41%,912kB / 744kB,0B / 225kB,22 +2026-10-16T19:55:26.3066777+03:00,lab3-redis-1,3.54%,3.445MiB / 256MiB,1.35%,68.2kB / 82.6kB,41kB / 0B,6 +2026-10-16T19:55:31.0493064+03:00,lab3-loadgen-run-a54434c38188,37.45%,26.08MiB / 7.649GiB,0.33%,1.4MB / 1.11MB,0B / 0B,9 +2026-10-16T19:55:31.0493064+03:00,lab3-lb-1,11.40%,7.781MiB / 128MiB,6.08%,2.12MB / 2.24MB,0B / 12.3kB,9 +2026-10-16T19:55:31.0493064+03:00,lab3-api-1,258.22%,536MiB / 2GiB,26.17%,1.22MB / 1.43MB,266kB / 246kB,43 +2026-10-16T19:55:31.0493064+03:00,lab3-api-2,237.51%,490.7MiB / 2GiB,23.96%,1.4MB / 1.61MB,0B / 254kB,44 +2026-10-16T19:55:31.0493064+03:00,lab3-db-1,70.38%,72.06MiB / 1GiB,7.04%,2.07MB / 1.71MB,0B / 225kB,22 +2026-10-16T19:55:31.0493064+03:00,lab3-redis-1,3.06%,3.449MiB / 256MiB,1.35%,217kB / 280kB,41kB / 0B,6 +2026-10-16T19:55:35.8383579+03:00,lab3-loadgen-run-a54434c38188,38.70%,25.99MiB / 7.649GiB,0.33%,2.64MB / 2.09MB,0B / 2.36MB,9 +2026-10-16T19:55:35.8383579+03:00,lab3-lb-1,11.71%,7.793MiB / 128MiB,6.09%,3.93MB / 4.2MB,0B / 328kB,9 +2026-10-16T19:55:35.8383579+03:00,lab3-api-1,201.14%,534.8MiB / 2GiB,26.11%,2.6MB / 3.02MB,266kB / 262kB,43 +2026-10-16T19:55:35.8383579+03:00,lab3-api-2,244.24%,496MiB / 2GiB,24.22%,2.59MB / 2.95MB,0B / 270kB,44 +2026-10-16T19:55:35.8383579+03:00,lab3-db-1,93.40%,77.03MiB / 1GiB,7.52%,3.76MB / 3.13MB,0B / 225kB,22 +2026-10-16T19:55:35.8383579+03:00,lab3-redis-1,3.25%,3.449MiB / 256MiB,1.35%,364kB / 474kB,41kB / 0B,6 +2026-10-16T19:55:40.5668501+03:00,lab3-loadgen-run-a54434c38188,37.33%,25.98MiB / 7.649GiB,0.33%,3.79MB / 2.99MB,0B / 2.36MB,9 +2026-10-16T19:55:40.5668501+03:00,lab3-lb-1,13.15%,7.84MiB / 128MiB,6.12%,5.62MB / 6.02MB,0B / 328kB,9 +2026-10-16T19:55:40.5668501+03:00,lab3-api-1,238.33%,551.4MiB / 2GiB,26.93%,3.71MB / 4.28MB,266kB / 262kB,43 +2026-10-16T19:55:40.5668501+03:00,lab3-api-2,269.10%,498.7MiB / 2GiB,24.35%,3.7MB / 4.22MB,0B / 270kB,44 +2026-10-16T19:55:40.5668501+03:00,lab3-db-1,108.31%,80.43MiB / 1GiB,7.85%,5.33MB / 4.45MB,0B / 225kB,22 +2026-10-16T19:55:40.5668501+03:00,lab3-redis-1,2.94%,3.449MiB / 256MiB,1.35%,544kB / 711kB,41kB / 0B,6 +2026-10-16T19:55:45.2942823+03:00,lab3-loadgen-run-a54434c38188,38.65%,25.98MiB / 7.649GiB,0.33%,4.55MB / 3.59MB,0B / 2.36MB,9 +2026-10-16T19:55:45.2942823+03:00,lab3-lb-1,10.49%,7.863MiB / 128MiB,6.14%,6.76MB / 7.22MB,0B / 328kB,9 +2026-10-16T19:55:45.2942823+03:00,lab3-api-1,121.29%,551.4MiB / 2GiB,26.92%,4.45MB / 5.14MB,266kB / 262kB,42 +2026-10-16T19:55:45.2942823+03:00,lab3-api-2,129.09%,498.8MiB / 2GiB,24.36%,4.44MB / 5.07MB,0B / 270kB,43 +2026-10-16T19:55:45.2942823+03:00,lab3-db-1,99.87%,80.95MiB / 1GiB,7.91%,6.38MB / 5.33MB,0B / 225kB,22 +2026-10-16T19:55:45.2942823+03:00,lab3-redis-1,2.36%,3.453MiB / 256MiB,1.35%,694kB / 905kB,41kB / 0B,6 +2026-10-16T19:55:49.3880913+03:00,lab3-loadgen-run-a54434c38188,31.47%,26.23MiB / 7.649GiB,0.33%,5.58MB / 4.4MB,0B / 2.36MB,9 +2026-10-16T19:55:49.3880913+03:00,lab3-lb-1,9.30%,7.84MiB / 128MiB,6.12%,8.29MB / 8.85MB,0B / 815kB,9 +2026-10-16T19:55:49.3880913+03:00,lab3-api-1,119.95%,542.2MiB / 2GiB,26.48%,5.45MB / 6.3MB,266kB / 279kB,43 +2026-10-16T19:55:49.3880913+03:00,lab3-api-2,144.66%,499.4MiB / 2GiB,24.39%,5.45MB / 6.22MB,0B / 287kB,45 +2026-10-16T19:55:49.3880913+03:00,lab3-db-1,99.74%,83.52MiB / 1GiB,8.16%,7.8MB / 6.54MB,0B / 225kB,23 +2026-10-16T19:55:49.3880913+03:00,lab3-redis-1,4.98%,3.453MiB / 256MiB,1.35%,821kB / 1.06MB,41kB / 0B,6 +2026-10-16T19:55:54.1140137+03:00,lab3-loadgen-run-a54434c38188,27.78%,25.99MiB / 7.649GiB,0.33%,6.41MB / 5.04MB,0B / 2.36MB,9 +2026-10-16T19:55:54.1140137+03:00,lab3-lb-1,9.17%,7.816MiB / 128MiB,6.11%,9.53MB / 10.2MB,0B / 815kB,9 +2026-10-16T19:55:54.1140137+03:00,lab3-api-1,108.11%,551MiB / 2GiB,26.90%,6.26MB / 7.23MB,266kB / 279kB,43 +2026-10-16T19:55:54.1140137+03:00,lab3-api-2,122.92%,520.2MiB / 2GiB,25.40%,6.25MB / 7.14MB,0B / 287kB,43 +2026-10-16T19:55:54.1140137+03:00,lab3-db-1,99.23%,84.32MiB / 1GiB,8.23%,8.94MB / 7.5MB,0B / 225kB,23 +2026-10-16T19:55:54.1140137+03:00,lab3-redis-1,4.70%,3.453MiB / 256MiB,1.35%,989kB / 1.27MB,41kB / 0B,6 +2026-10-16T19:55:58.4369070+03:00,lab3-loadgen-run-a54434c38188,25.63%,26.01MiB / 7.649GiB,0.33%,7.31MB / 5.75MB,0B / 2.36MB,9 +2026-10-16T19:55:58.4369070+03:00,lab3-lb-1,7.58%,8.285MiB / 128MiB,6.47%,10.9MB / 11.6MB,0B / 815kB,9 +2026-10-16T19:55:58.4369070+03:00,lab3-api-1,131.86%,540.5MiB / 2GiB,26.39%,7.17MB / 8.27MB,266kB / 279kB,43 +2026-10-16T19:55:58.4369070+03:00,lab3-api-2,103.01%,520.7MiB / 2GiB,25.42%,7.16MB / 8.16MB,0B / 287kB,44 +2026-10-16T19:55:58.4369070+03:00,lab3-db-1,97.34%,86.49MiB / 1GiB,8.45%,9.93MB / 8.38MB,0B / 225kB,24 +2026-10-16T19:55:58.4369070+03:00,lab3-redis-1,4.64%,3.445MiB / 256MiB,1.35%,1.14MB / 1.45MB,41kB / 0B,6 +2026-10-16T19:56:03.1048923+03:00,lab3-loadgen-run-a54434c38188,40.31%,26.29MiB / 7.649GiB,0.34%,8.3MB / 6.52MB,0B / 2.36MB,9 +2026-10-16T19:56:03.1048923+03:00,lab3-lb-1,11.12%,8.004MiB / 128MiB,6.25%,12.4MB / 13.2MB,0B / 815kB,9 +2026-10-16T19:56:03.1048923+03:00,lab3-api-1,105.77%,547.6MiB / 2GiB,26.74%,8.13MB / 9.37MB,266kB / 279kB,43 +2026-10-16T19:56:03.1048923+03:00,lab3-api-2,100.76%,525.4MiB / 2GiB,25.65%,8.13MB / 9.26MB,0B / 287kB,43 +2026-10-16T19:56:03.1048923+03:00,lab3-db-1,100.04%,90.21MiB / 1GiB,8.81%,11.5MB / 9.76MB,0B / 225kB,25 +2026-10-16T19:56:03.1048923+03:00,lab3-redis-1,2.77%,3.453MiB / 256MiB,1.35%,1.3MB / 1.65MB,41kB / 0B,6 +2026-10-16T19:56:07.3367896+03:00,lab3-loadgen-run-a54434c38188,29.99%,26.13MiB / 7.649GiB,0.33%,9.49MB / 7.45MB,0B / 2.36MB,9 +2026-10-16T19:56:07.3367896+03:00,lab3-lb-1,9.09%,7.789MiB / 128MiB,6.09%,13.8MB / 14.7MB,0B / 1.28MB,9 +2026-10-16T19:56:07.3367896+03:00,lab3-api-1,55.57%,547.7MiB / 2GiB,26.74%,9.31MB / 10.7MB,266kB / 295kB,43 +2026-10-16T19:56:07.3367896+03:00,lab3-api-2,53.65%,518.3MiB / 2GiB,25.31%,9.3MB / 10.6MB,0B / 303kB,43 +2026-10-16T19:56:07.3367896+03:00,lab3-db-1,99.59%,91.31MiB / 1GiB,8.92%,13.2MB / 11.2MB,0B / 225kB,25 +2026-10-16T19:56:07.3367896+03:00,lab3-redis-1,1.91%,3.445MiB / 256MiB,1.35%,1.49MB / 1.89MB,41kB / 0B,6 +2026-10-16T19:56:11.9847656+03:00,lab3-loadgen-run-a54434c38188,33.95%,26.18MiB / 7.649GiB,0.33%,10.2MB / 8.01MB,0B / 2.36MB,9 +2026-10-16T19:56:11.9847656+03:00,lab3-lb-1,10.16%,7.801MiB / 128MiB,6.09%,15.5MB / 16.6MB,0B / 1.28MB,9 +2026-10-16T19:56:11.9847656+03:00,lab3-api-1,68.03%,547.6MiB / 2GiB,26.74%,10.2MB / 11.8MB,266kB / 295kB,42 +2026-10-16T19:56:11.9847656+03:00,lab3-api-2,66.13%,518.3MiB / 2GiB,25.31%,10.2MB / 11.6MB,0B / 303kB,43 +2026-10-16T19:56:11.9847656+03:00,lab3-db-1,98.54%,94.52MiB / 1GiB,9.23%,14.5MB / 12.3MB,0B / 225kB,25 +2026-10-16T19:56:11.9847656+03:00,lab3-redis-1,2.46%,3.453MiB / 256MiB,1.35%,1.61MB / 2.03MB,41kB / 0B,6 +2026-10-16T19:56:16.6999024+03:00,lab3-loadgen-run-a54434c38188,29.92%,26.43MiB / 7.649GiB,0.34%,11.3MB / 8.85MB,0B / 2.36MB,9 +2026-10-16T19:56:16.6999024+03:00,lab3-lb-1,8.30%,7.82MiB / 128MiB,6.11%,16.5MB / 17.6MB,0B / 1.28MB,9 +2026-10-16T19:56:16.6999024+03:00,lab3-api-1,60.10%,547.6MiB / 2GiB,26.74%,11.1MB / 12.8MB,266kB / 295kB,42 +2026-10-16T19:56:16.6999024+03:00,lab3-api-2,105.17%,525.2MiB / 2GiB,25.65%,11.1MB / 12.6MB,0B / 303kB,43 +2026-10-16T19:56:16.6999024+03:00,lab3-db-1,98.47%,106.6MiB / 1GiB,10.41%,15.6MB / 13.3MB,0B / 225kB,24 +2026-10-16T19:56:16.6999024+03:00,lab3-redis-1,2.18%,3.453MiB / 256MiB,1.35%,1.78MB / 2.25MB,41kB / 0B,6 +2026-10-16T19:56:21.3702466+03:00,lab3-loadgen-run-a54434c38188,28.70%,26.2MiB / 7.649GiB,0.33%,12.1MB / 9.51MB,0B / 2.36MB,9 +2026-10-16T19:56:21.3702466+03:00,lab3-lb-1,11.35%,7.844MiB / 128MiB,6.13%,18.1MB / 19.3MB,0B / 1.72MB,9 +2026-10-16T19:56:21.3702466+03:00,lab3-api-1,123.73%,548.7MiB / 2GiB,26.79%,11.9MB / 13.7MB,266kB / 311kB,42 +2026-10-16T19:56:21.3702466+03:00,lab3-api-2,128.64%,529.5MiB / 2GiB,25.86%,11.9MB / 13.6MB,0B / 303kB,44 +2026-10-16T19:56:21.3702466+03:00,lab3-db-1,101.13%,116MiB / 1GiB,11.33%,16.8MB / 14.3MB,0B / 225kB,24 +2026-10-16T19:56:21.3702466+03:00,lab3-redis-1,2.03%,3.453MiB / 256MiB,1.35%,1.89MB / 2.38MB,41kB / 0B,6 +2026-10-16T19:56:26.1317268+03:00,lab3-loadgen-run-a54434c38188,24.06%,26.15MiB / 7.649GiB,0.33%,12.8MB / 10.1MB,0B / 2.36MB,9 +2026-10-16T19:56:26.1317268+03:00,lab3-lb-1,7.50%,7.797MiB / 128MiB,6.09%,19.1MB / 20.4MB,0B / 1.72MB,9 +2026-10-16T19:56:26.1317268+03:00,lab3-api-1,38.16%,549MiB / 2GiB,26.80%,12.6MB / 14.5MB,266kB / 311kB,42 +2026-10-16T19:56:26.1317268+03:00,lab3-api-2,46.23%,537.9MiB / 2GiB,26.26%,12.6MB / 14.4MB,0B / 303kB,43 +2026-10-16T19:56:26.1317268+03:00,lab3-db-1,99.24%,123.6MiB / 1GiB,12.07%,17.8MB / 15.2MB,0B / 250kB,24 +2026-10-16T19:56:26.1317268+03:00,lab3-redis-1,2.19%,3.445MiB / 256MiB,1.35%,2.04MB / 2.55MB,41kB / 0B,6 +2026-10-16T19:56:30.1981261+03:00,lab3-loadgen-run-a54434c38188,23.46%,26.18MiB / 7.649GiB,0.33%,13.6MB / 10.6MB,0B / 2.36MB,9 +2026-10-16T19:56:30.1981261+03:00,lab3-lb-1,7.00%,7.824MiB / 128MiB,6.11%,20.2MB / 21.5MB,0B / 1.72MB,9 +2026-10-16T19:56:30.1981261+03:00,lab3-api-1,49.59%,549MiB / 2GiB,26.81%,13.4MB / 15.3MB,266kB / 311kB,42 +2026-10-16T19:56:30.1981261+03:00,lab3-api-2,68.34%,530.9MiB / 2GiB,25.92%,13.4MB / 15.2MB,0B / 303kB,43 +2026-10-16T19:56:30.1981261+03:00,lab3-db-1,99.31%,124.2MiB / 1GiB,12.13%,18.8MB / 16.1MB,0B / 250kB,24 +2026-10-16T19:56:30.1981261+03:00,lab3-redis-1,5.14%,3.453MiB / 256MiB,1.35%,2.13MB / 2.67MB,41kB / 0B,6 +2026-10-16T19:56:34.8672656+03:00,lab3-loadgen-run-a54434c38188,24.67%,26.27MiB / 7.649GiB,0.34%,14.3MB / 11.2MB,0B / 2.36MB,9 +2026-10-16T19:56:34.8672656+03:00,lab3-lb-1,6.78%,7.816MiB / 128MiB,6.11%,21.3MB / 22.7MB,0B / 1.72MB,9 +2026-10-16T19:56:34.8672656+03:00,lab3-api-1,89.96%,549.5MiB / 2GiB,26.83%,14.1MB / 16.2MB,266kB / 328kB,42 +2026-10-16T19:56:34.8672656+03:00,lab3-api-2,98.56%,531.2MiB / 2GiB,25.94%,14.1MB / 16MB,0B / 319kB,43 +2026-10-16T19:56:34.8672656+03:00,lab3-db-1,100.58%,125.4MiB / 1GiB,12.25%,19.8MB / 16.9MB,0B / 266kB,24 +2026-10-16T19:56:34.8672656+03:00,lab3-redis-1,4.48%,3.453MiB / 256MiB,1.35%,2.28MB / 2.84MB,41kB / 0B,6 +2026-10-16T19:56:39.1314111+03:00,lab3-loadgen-run-a54434c38188,25.65%,26.22MiB / 7.649GiB,0.33%,14.8MB / 11.6MB,0B / 2.36MB,9 +2026-10-16T19:56:39.1314111+03:00,lab3-lb-1,8.60%,7.785MiB / 128MiB,6.08%,22.1MB / 23.5MB,0B / 2.08MB,9 +2026-10-16T19:56:39.1314111+03:00,lab3-api-1,33.55%,553.8MiB / 2GiB,27.04%,14.8MB / 17MB,266kB / 328kB,42 +2026-10-16T19:56:39.1314111+03:00,lab3-api-2,41.70%,533.5MiB / 2GiB,26.05%,14.8MB / 16.8MB,0B / 319kB,46 +2026-10-16T19:56:39.1314111+03:00,lab3-db-1,98.98%,125.5MiB / 1GiB,12.25%,20.8MB / 17.8MB,0B / 266kB,24 +2026-10-16T19:56:39.1314111+03:00,lab3-redis-1,4.57%,3.449MiB / 256MiB,1.35%,2.4MB / 2.98MB,41kB / 0B,6 +2026-10-16T19:56:43.7975511+03:00,lab3-loadgen-run-a54434c38188,20.75%,26.24MiB / 7.649GiB,0.34%,15.5MB / 12.2MB,0B / 2.36MB,9 +2026-10-16T19:56:43.7975511+03:00,lab3-lb-1,6.99%,7.797MiB / 128MiB,6.09%,23.2MB / 24.7MB,0B / 2.08MB,9 +2026-10-16T19:56:43.7975511+03:00,lab3-api-1,40.05%,546.3MiB / 2GiB,26.67%,15.4MB / 17.6MB,266kB / 328kB,42 +2026-10-16T19:56:43.7975511+03:00,lab3-api-2,30.00%,532.2MiB / 2GiB,25.99%,15.4MB / 17.5MB,0B / 319kB,43 +2026-10-16T19:56:43.7975511+03:00,lab3-db-1,106.16%,125.9MiB / 1GiB,12.29%,21.6MB / 18.5MB,0B / 266kB,24 +2026-10-16T19:56:43.7975511+03:00,lab3-redis-1,3.16%,3.445MiB / 256MiB,1.35%,2.49MB / 3.09MB,41kB / 0B,6 +2026-10-16T19:56:48.2171355+03:00,lab3-loadgen-run-a54434c38188,19.71%,26.24MiB / 7.649GiB,0.34%,16.1MB / 12.6MB,0B / 2.36MB,9 +2026-10-16T19:56:48.2171355+03:00,lab3-lb-1,5.55%,7.789MiB / 128MiB,6.09%,24.1MB / 25.6MB,0B / 2.08MB,9 +2026-10-16T19:56:48.2171355+03:00,lab3-api-1,24.51%,546.5MiB / 2GiB,26.68%,16MB / 18.3MB,266kB / 328kB,43 +2026-10-16T19:56:48.2171355+03:00,lab3-api-2,25.26%,532MiB / 2GiB,25.98%,15.8MB / 18MB,0B / 319kB,43 +2026-10-16T19:56:48.2171355+03:00,lab3-db-1,101.27%,124.9MiB / 1GiB,12.20%,22.4MB / 19.2MB,0B / 266kB,23 +2026-10-16T19:56:48.2171355+03:00,lab3-redis-1,1.32%,3.445MiB / 256MiB,1.35%,2.59MB / 3.21MB,41kB / 0B,6 diff --git a/evidence/lab3/B2-keepalive.json b/evidence/lab3/seriesB-B3.json similarity index 64% rename from evidence/lab3/B2-keepalive.json rename to evidence/lab3/seriesB-B3.json index c1c9f3f6..5a228c3f 100644 --- a/evidence/lab3/B2-keepalive.json +++ b/evidence/lab3/seriesB-B3.json @@ -1,17 +1,17 @@ { "lab": 3, "workload": "closed-loop POST messages; no automatic retries", - "requested_duration_seconds": 60.0, - "elapsed_seconds": 60.177, + "requested_duration_seconds": 90.0, + "elapsed_seconds": 90.065, "concurrency": 8, - "successful_requests": 8545, + "successful_requests": 15408, "failed_requests": 0, "error_ratio": 0.0, - "successful_rps": 141.997, + "successful_rps": 171.077, "successful_latency_ms": { - "p50": 36.182, - "p95": 171.914, - "p99": 197.476 + "p50": 36.078, + "p95": 92.895, + "p99": 108.825 }, "note": "Latency percentiles cover successes only. Timeouts/errors are counted separately; closed-loop has coordinated omission and client overhead." } diff --git a/nginx.conf b/nginx.conf index fd126a43..b8be5fcd 100644 --- a/nginx.conf +++ b/nginx.conf @@ -13,8 +13,8 @@ http { upstream api_backend { zone api_backend 64k; - server api:8080 resolve max_fails=1 fail_timeout=15s; - keepalive 64; + server api:8080 resolve max_fails=1 fail_timeout=5s; + keepalive 32; } server { @@ -34,7 +34,7 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_next_upstream error timeout http_502 http_503 http_504; + proxy_next_upstream error timeout http_502 http_503 http_504 non_idempotent; proxy_next_upstream_tries 3; proxy_connect_timeout 1s; diff --git a/scripts/collect-pg.ps1 b/scripts/collect-pg.ps1 new file mode 100644 index 00000000..234da92c --- /dev/null +++ b/scripts/collect-pg.ps1 @@ -0,0 +1,15 @@ +param( + [int]$DurationSeconds = 90, + [string]$Output = "evidence/lab3/pg-stat-activity.log" +) + +$end = (Get-Date).AddSeconds($DurationSeconds) +"=== pg_stat_activity collection started at $(Get-Date -Format o) ===" | Out-File $Output + +while ((Get-Date) -lt $end) { + "--- $(Get-Date -Format o) ---" | Add-Content $Output + docker compose exec -T db psql -U messenger -d messenger -c "SELECT state, wait_event_type, wait_event, count(*) FROM pg_stat_activity WHERE datname='messenger' GROUP BY 1,2,3 ORDER BY 4 DESC;" 2>&1 | Add-Content $Output + Start-Sleep -Seconds 5 +} + +"=== collection finished at $(Get-Date -Format o) ===" | Add-Content $Output \ No newline at end of file diff --git a/scripts/collect-stats.ps1 b/scripts/collect-stats.ps1 new file mode 100644 index 00000000..0c4c8494 --- /dev/null +++ b/scripts/collect-stats.ps1 @@ -0,0 +1,21 @@ +param( + [int]$DurationSeconds = 90, + [string]$Output = "evidence/lab3/docker-stats.csv" +) + +$header = "timestamp,name,cpu_percent,mem_usage,mem_percent,net_io,block_io,pids" +Set-Content -Path $Output -Value $header + +$end = (Get-Date).AddSeconds($DurationSeconds) +Write-Host "Collecting stats for $DurationSeconds seconds..." + +while ((Get-Date) -lt $end) { + $timestamp = (Get-Date).ToString("o") + $stats = docker stats --no-stream --format "{{.Name}},{{.CPUPerc}},{{.MemUsage}},{{.MemPerc}},{{.NetIO}},{{.BlockIO}},{{.PIDs}}" + foreach ($line in $stats) { + Add-Content -Path $Output -Value "$timestamp,$line" + } + Start-Sleep -Seconds 2 +} + +Write-Host "Done. Rows: $((Get-Content $Output | Measure-Object -Line).Lines)" \ No newline at end of file diff --git a/scripts/generate-charts.py b/scripts/generate-charts.py new file mode 100644 index 00000000..7415cc7f --- /dev/null +++ b/scripts/generate-charts.py @@ -0,0 +1,53 @@ +import pandas as pd +import matplotlib.pyplot as plt +import os + +# Создаем папку, если ее нет +os.makedirs('evidence/lab3/charts', exist_ok=True) + +# Загружаем данные из CSV +csv_path = 'evidence/lab3/series-summary.csv' +if not os.path.exists(csv_path): + print(f"ОШИБКА: Файл {csv_path} не найден! Сначала создайте его.") + exit(1) + +df = pd.read_csv(csv_path) + +# --- ГРАФИК 1: RPS от числа реплик (Серия A) --- +df_a = df[df['series'] == 'A'].sort_values('replicas') +plt.figure(figsize=(8, 5)) +plt.plot(df_a['replicas'], df_a['successful_rps'], marker='o', linestyle='-', color='red', linewidth=2, markersize=8) +plt.title('Series A: RPS vs Replicas (Fixed 2 CPU)', fontsize=14) +plt.xlabel('Number of Replicas', fontsize=12) +plt.ylabel('Successful RPS', fontsize=12) +plt.xticks(df_a['replicas']) +plt.grid(True, linestyle='--', alpha=0.7) +plt.savefig('evidence/lab3/charts/seriesA-rps-vs-replicas.png', bbox_inches='tight') +plt.close() + +# --- ГРАФИК 2: RPS от суммарного CPU (Серия B) --- +df_b = df[df['series'] == 'B'].sort_values('total_cpu') +plt.figure(figsize=(8, 5)) +plt.plot(df_b['total_cpu'], df_b['successful_rps'], marker='s', linestyle='-', color='blue', linewidth=2, markersize=8) +plt.title('Series B: RPS vs Total CPU (2 Replicas)', fontsize=14) +plt.xlabel('Total CPU Cores', fontsize=12) +plt.ylabel('Successful RPS', fontsize=12) +plt.xticks(df_b['total_cpu']) +plt.grid(True, linestyle='--', alpha=0.7) +plt.savefig('evidence/lab3/charts/seriesB-rps-vs-cpu.png', bbox_inches='tight') +plt.close() + +# --- ГРАФИК 3: Сравнение p95 --- +plt.figure(figsize=(10, 5)) +# Красим столбцы: серия А - красные, серия B - синие +colors = ['red' if s == 'A' else 'blue' for s in df['series']] + +plt.bar(df['config'], df['p95_ms'], color=colors) +plt.title('p95 Latency by Configuration', fontsize=14) +plt.xlabel('Configuration', fontsize=12) +plt.ylabel('p95 Latency (ms)', fontsize=12) +plt.grid(axis='y', linestyle='--', alpha=0.7) +plt.savefig('evidence/lab3/charts/comparison-p95.png', bbox_inches='tight') +plt.close() + +print("✅ Графики успешно созданы из series-summary.csv в evidence/lab3/charts/") \ No newline at end of file diff --git a/scripts/test-lb-exclusion.ps1 b/scripts/test-lb-exclusion.ps1 new file mode 100644 index 00000000..60e8aec3 --- /dev/null +++ b/scripts/test-lb-exclusion.ps1 @@ -0,0 +1,52 @@ +$ErrorActionPreference = 'Stop' +$logDir = "evidence\lab3" +New-Item -ItemType Directory -Force -Path $logDir | Out-Null + +# 1. Создаем тестового юзера (на случай чистого volume) +curl.exe -s -o NUL -X POST http://127.0.0.1:8080/api/v1/users -H "Content-Type: application/json" -d '{\"username\":\"lbtest\",\"display_name\":\"L\",\"password\":\"validpassword123\"}' + +# 2. Получаем токен и создаем чат +$TOKEN = (curl.exe -s -X POST http://127.0.0.1:8080/api/v1/auth/sessions -u "lbtest:validpassword123" | ConvertFrom-Json).token +$USER_ID = (curl.exe -s http://127.0.0.1:8080/api/v1/users/me -H "Authorization: Bearer $TOKEN" | ConvertFrom-Json).id +$CHAT_ID = (curl.exe -s -X POST http://127.0.0.1:8080/api/v1/chats -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" -d ('{\"title\":\"lb-test\",\"member_ids\":[\"' + $USER_ID + '\"]}') | ConvertFrom-Json).id + +$out = "$logDir\lb-exclusion-pause-test.log" +"=== LB exclusion test (docker pause) at $(Get-Date -Format o) ===" | Out-File $out +"CHAT_ID=$CHAT_ID" | Add-Content $out + +# 3. Замеры ДО паузы +"`n--- ДО ПАУЗЫ (трафик идет на обе реплики) ---" | Add-Content $out +for ($i = 1; $i -le 4; $i++) { + $r = curl.exe -s -o NUL -w "HTTP=%{http_code} time=%{time_total}s" -X POST "http://127.0.0.1:8080/api/v1/chats/$CHAT_ID/messages" -H "Authorization: Bearer $TOKEN" -H "Idempotency-Key: pre-$i-$(New-Guid)" -H "Content-Type: application/json" -d '{\"text\":\"pre\"}' + Write-Host "Pre: $r" + "${i}: ${r}" | Add-Content $out +} + +# 4. Замораживаем api-1 +"`n---> docker pause lab3-api-1 (имитация зависшего пула)" | Add-Content $out +docker pause lab3-api-1 +Write-Host "api-1 PAUSED" + +# 5. Замеры ВО ВРЕМЯ паузы (проверяем non_idempotent) +"`n--- ВО ВРЕМЯ ПАУЗЫ (Nginx должен перекинуть на api-2) ---" | Add-Content $out +for ($i = 1; $i -le 6; $i++) { + # Ставим таймаут curl 15s, чтобы он не оборвался раньше Nginx (у nginx read_timeout 10s) + $r = curl.exe -s -o NUL -w "HTTP=%{http_code} time=%{time_total}s" -m 15 -X POST "http://127.0.0.1:8080/api/v1/chats/$CHAT_ID/messages" -H "Authorization: Bearer $TOKEN" -H "Idempotency-Key: during-$i-$(New-Guid)" -H "Content-Type: application/json" -d '{\"text\":\"during\"}' + Write-Host "During: $r" + "${i}: ${r}" | Add-Content $out +} + +# 6. Размораживаем api-1 +"`n---> docker unpause lab3-api-1" | Add-Content $out +docker unpause lab3-api-1 +Write-Host "api-1 UNPAUSED" + +# 7. Замеры ПОСЛЕ паузы +"`n--- ПОСЛЕ ПАУЗЫ ---" | Add-Content $out +for ($i = 1; $i -le 4; $i++) { + $r = curl.exe -s -o NUL -w "HTTP=%{http_code} time=%{time_total}s" -X POST "http://127.0.0.1:8080/api/v1/chats/$CHAT_ID/messages" -H "Authorization: Bearer $TOKEN" -H "Idempotency-Key: post-$i-$(New-Guid)" -H "Content-Type: application/json" -d '{\"text\":\"post\"}' + Write-Host "Post: $r" + "${i}: ${r}" | Add-Content $out +} + +Write-Host "`n✅ Готово! Лог сохранен в $out" \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/config/JacksonConfig.java b/src/main/java/ru/mtusi/messenger/config/JacksonConfig.java new file mode 100644 index 00000000..585c5374 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/config/JacksonConfig.java @@ -0,0 +1,26 @@ +package ru.mtusi.messenger.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import tools.jackson.databind.DeserializationFeature; +import tools.jackson.databind.cfg.CoercionAction; +import tools.jackson.databind.cfg.CoercionInputShape; + + +@Configuration +@Slf4j +public class JacksonConfig { + + @Bean + public JsonMapperBuilderCustomizer strictJacksonCustomizer() { + log.warn(">>> Strict JsonMapper customizer applied"); + return builder -> builder + .enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) + .withCoercionConfigDefaults(config -> { + config.setCoercion(CoercionInputShape.Integer, CoercionAction.Fail); + config.setCoercion(CoercionInputShape.Float, CoercionAction.Fail); + }); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/AuthController.java b/src/main/java/ru/mtusi/messenger/controller/AuthController.java index 9369fa3a..7c83d00c 100644 --- a/src/main/java/ru/mtusi/messenger/controller/AuthController.java +++ b/src/main/java/ru/mtusi/messenger/controller/AuthController.java @@ -16,7 +16,7 @@ public class AuthController implements AuthApi { @Override public ResponseEntity createSession(HttpServletRequest request) { - return ResponseEntity.status(HttpStatus.CREATED).body(authService.login(request.getHeader(HttpHeaders.AUTHORIZATION))); + return ResponseEntity.status(HttpStatus.CREATED).body(authService.login(request.getHeader(HttpHeaders.AUTHORIZATION), request.getContentLengthLong())); } @Override diff --git a/src/main/java/ru/mtusi/messenger/controller/ChatController.java b/src/main/java/ru/mtusi/messenger/controller/ChatController.java index 5eb47727..0bee9775 100644 --- a/src/main/java/ru/mtusi/messenger/controller/ChatController.java +++ b/src/main/java/ru/mtusi/messenger/controller/ChatController.java @@ -7,6 +7,7 @@ import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.RestController; import ru.mtusi.messenger.dto.ChatDTO; import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.dto.CreateChatDTO; import ru.mtusi.messenger.security.SessionPrincipal; import ru.mtusi.messenger.service.ChatService; @@ -18,9 +19,9 @@ public class ChatController implements ChatsApi { private final ChatService chatService; @Override - public ResponseEntity createChat(ChatDTO chatDTO, @AuthenticationPrincipal SessionPrincipal principal) { + public ResponseEntity createChat(CreateChatDTO createChatDTO, @AuthenticationPrincipal SessionPrincipal principal) { return ResponseEntity.status(HttpStatus.CREATED) - .body(chatService.createChat(principal.userId(), chatDTO)); + .body(chatService.createChat(principal.userId(), createChatDTO)); } @Override diff --git a/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java b/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java index c5b11eaf..8a04bfe7 100644 --- a/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java +++ b/src/main/java/ru/mtusi/messenger/controller/ChatsApi.java @@ -8,6 +8,7 @@ package ru.mtusi.messenger.controller; import org.springframework.security.core.annotation.AuthenticationPrincipal; import ru.mtusi.messenger.dto.ChatDTO; import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.dto.CreateChatDTO; import ru.mtusi.messenger.dto.ErrorDTO; import java.util.UUID; @@ -37,7 +38,7 @@ public interface ChatsApi { /** * POST /api/v1/chats : Создать чат; вызывающий должен входить в member_ids * - * @param chatDTO (required) + * @param createChatDTO (required) * @return Успех (status code 201) * or Неверный запрос (status code 400) * or Нет действительной аутентификации (status code 401) @@ -89,7 +90,7 @@ public interface ChatsApi { ) ResponseEntity createChat( - @Parameter(name = "CreateChatDTO", description = "", required = true) @Valid @RequestBody ChatDTO chatDTO, @AuthenticationPrincipal SessionPrincipal principal + @Parameter(name = "CreateChatDTO", description = "", required = true) @Valid @RequestBody CreateChatDTO createChatDTO, @AuthenticationPrincipal SessionPrincipal principal ); diff --git a/src/main/java/ru/mtusi/messenger/controller/UserController.java b/src/main/java/ru/mtusi/messenger/controller/UserController.java index bf4a5907..da1bbad2 100644 --- a/src/main/java/ru/mtusi/messenger/controller/UserController.java +++ b/src/main/java/ru/mtusi/messenger/controller/UserController.java @@ -5,6 +5,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.RestController; +import ru.mtusi.messenger.dto.CreateUserDTO; import ru.mtusi.messenger.dto.UserDTO; import ru.mtusi.messenger.security.SessionPrincipal; import ru.mtusi.messenger.service.UserService; @@ -20,7 +21,7 @@ public class UserController implements UsersApi { } @Override - public ResponseEntity registerUser(UserDTO userDTO) { - return ResponseEntity.status(HttpStatus.CREATED).body(userService.registerUser(userDTO)); + public ResponseEntity registerUser(CreateUserDTO createUserDTO) { + return ResponseEntity.status(HttpStatus.CREATED).body(userService.registerUser(createUserDTO)); } } diff --git a/src/main/java/ru/mtusi/messenger/controller/UsersApi.java b/src/main/java/ru/mtusi/messenger/controller/UsersApi.java index 7e97abac..87ea33ae 100644 --- a/src/main/java/ru/mtusi/messenger/controller/UsersApi.java +++ b/src/main/java/ru/mtusi/messenger/controller/UsersApi.java @@ -6,6 +6,7 @@ package ru.mtusi.messenger.controller; import org.springframework.security.core.annotation.AuthenticationPrincipal; +import ru.mtusi.messenger.dto.CreateUserDTO; import ru.mtusi.messenger.dto.ErrorDTO; import ru.mtusi.messenger.dto.UserDTO; import io.swagger.v3.oas.annotations.Operation; @@ -89,7 +90,7 @@ public interface UsersApi { /** * POST /api/v1/users : Создать пользователя * - * @param userDTO (required) + * @param createUserDTO (required) * @return Успех (status code 201) * or Неверный запрос (status code 400) * or Конфликт (status code 409) @@ -130,7 +131,7 @@ public interface UsersApi { ) ResponseEntity registerUser( - @Parameter(name = "UserDTO", description = "", required = true) @Valid @RequestBody UserDTO userDTO + @Parameter(name = "CreateUserDTO", description = "", required = true) @Valid @RequestBody CreateUserDTO createUserDTO ); } \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java index 19292511..02ee70d4 100644 --- a/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java +++ b/src/main/java/ru/mtusi/messenger/controller/controllerAdvice/GlobalExceptionHandler.java @@ -36,10 +36,12 @@ public class GlobalExceptionHandler { @ExceptionHandler(UnauthorizedException.class) public ResponseEntity unauthorized(UnauthorizedException e, HttpServletRequest req) { - String scheme = req.getRequestURI().equals("/api/v1/auth/sessions") - ? "Basic" : "Bearer"; + boolean isLogin = "/api/v1/auth/sessions".equals(req.getRequestURI()); + String challenge = isLogin + ? "Basic realm=\"messenger\", charset=\"UTF-8\"" + : "Bearer realm=\"messenger\""; return ResponseEntity.status(HttpStatus.UNAUTHORIZED) - .header("WWW-Authenticate", scheme + " realm=\"messenger\"") + .header("WWW-Authenticate", challenge) .body(errors.error(ErrorErrorDTO.CodeEnum.UNAUTHORIZED, e.getMessage(), req)); } diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateChatDTO.java b/src/main/java/ru/mtusi/messenger/dto/CreateChatDTO.java new file mode 100644 index 00000000..3b553716 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateChatDTO.java @@ -0,0 +1,101 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.Valid; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Generated; +import org.hibernate.validator.constraints.CodePointLength; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +public class CreateChatDTO { + + private String title; + + @Valid + private List memberIds = new ArrayList<>(); + + public CreateChatDTO() { + super(); + } + + public CreateChatDTO(String title, List memberIds) { + this.title = title; + this.memberIds = memberIds; + } + + public CreateChatDTO title(String title) { + this.title = title; + return this; + } + + @NotNull + @CodePointLength(min = 1, max = 100) + @Schema(name = "title", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("title") + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public CreateChatDTO memberIds(List memberIds) { + this.memberIds = memberIds; + return this; + } + + public CreateChatDTO addMemberIdsItem(UUID memberIdsItem) { + if (this.memberIds == null) { + this.memberIds = new ArrayList<>(); + } + this.memberIds.add(memberIdsItem); + return this; + } + + @NotNull + @Valid + @Size(min = 1, max = 100) + @Schema(name = "member_ids", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("member_ids") + public List getMemberIds() { + return memberIds; + } + + public void setMemberIds(List memberIds) { + this.memberIds = memberIds; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + CreateChatDTO that = (CreateChatDTO) o; + return Objects.equals(title, that.title) && Objects.equals(memberIds, that.memberIds); + } + + @Override + public int hashCode() { + return Objects.hash(title, memberIds); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class CreateChatDTO {\n"); + sb.append(" title: ").append(toIndentedString(title)).append("\n"); + sb.append(" memberIds: ").append(toIndentedString(memberIds)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + private String toIndentedString(Object o) { + if (o == null) return "null"; + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/CreateUserDTO.java b/src/main/java/ru/mtusi/messenger/dto/CreateUserDTO.java new file mode 100644 index 00000000..27876f58 --- /dev/null +++ b/src/main/java/ru/mtusi/messenger/dto/CreateUserDTO.java @@ -0,0 +1,110 @@ +package ru.mtusi.messenger.dto; + +import java.util.Objects; +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.*; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Generated; +import org.hibernate.validator.constraints.CodePointLength; + +@Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.10.0") +public class CreateUserDTO { + + private String username; + + private String displayName; + + private String password; + + public CreateUserDTO() { + super(); + } + + public CreateUserDTO(String username, String displayName, String password) { + this.username = username; + this.displayName = displayName; + this.password = password; + } + + public CreateUserDTO username(String username) { + this.username = username; + return this; + } + + @NotNull + @Pattern(regexp = "^[a-z0-9_]{3,32}$") + @Schema(name = "username", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("username") + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public CreateUserDTO displayName(String displayName) { + this.displayName = displayName; + return this; + } + + @NotNull + @CodePointLength(min = 1, max = 100) + @Schema(name = "display_name", requiredMode = Schema.RequiredMode.REQUIRED) + @JsonProperty("display_name") + public String getDisplayName() { + return displayName; + } + + public void setDisplayName(String displayName) { + this.displayName = displayName; + } + + public CreateUserDTO password(String password) { + this.password = password; + return this; + } + + @NotNull + @CodePointLength(min = 12, max = 128) + @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED, accessMode = Schema.AccessMode.WRITE_ONLY) + @JsonProperty(value = "password", access = JsonProperty.Access.WRITE_ONLY) + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + CreateUserDTO createUser = (CreateUserDTO) o; + return Objects.equals(this.username, createUser.username) && + Objects.equals(this.displayName, createUser.displayName) && + Objects.equals(this.password, createUser.password); + } + + @Override + public int hashCode() { + return Objects.hash(username, displayName, password); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class CreateUserDTO {\n"); + sb.append(" username: ").append(toIndentedString(username)).append("\n"); + sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); + sb.append(" password: ").append(password != null ? "***" : "null").append("\n"); + sb.append("}"); + return sb.toString(); + } + + private String toIndentedString(Object o) { + if (o == null) return "null"; + return o.toString().replace("\n", "\n "); + } +} \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/dto/UserDTO.java b/src/main/java/ru/mtusi/messenger/dto/UserDTO.java index 85976360..9e940d7b 100644 --- a/src/main/java/ru/mtusi/messenger/dto/UserDTO.java +++ b/src/main/java/ru/mtusi/messenger/dto/UserDTO.java @@ -22,8 +22,6 @@ public class UserDTO { private String displayName; - private String password; - private Instant createdAt; public UserDTO() { @@ -36,7 +34,6 @@ public class UserDTO { public UserDTO(String username, String displayName, String password) { this.username = username; this.displayName = displayName; - this.password = password; } public UserDTO username(String username) { @@ -96,26 +93,10 @@ public class UserDTO { this.displayName = displayName; } - public UserDTO password(String password) { - this.password = password; - return this; - } - /** * Get password * @return password */ - @NotNull - @CodePointLength(min = 1, max = 100) - @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED) - @JsonProperty("password") - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } public UserDTO createdAt(Instant createdAt) { this.createdAt = createdAt; @@ -148,13 +129,12 @@ public class UserDTO { return Objects.equals(this.id, userDTO.id) && Objects.equals(this.username, userDTO.username) && Objects.equals(this.displayName, userDTO.displayName) && - Objects.equals(this.password, userDTO.password) && Objects.equals(this.createdAt, userDTO.createdAt); } @Override public int hashCode() { - return Objects.hash(id, username, displayName, password, createdAt); + return Objects.hash(id, username, displayName, createdAt); } @Override @@ -164,7 +144,6 @@ public class UserDTO { sb.append(" id: ").append(toIndentedString(id)).append("\n"); sb.append(" username: ").append(toIndentedString(username)).append("\n"); sb.append(" displayName: ").append(toIndentedString(displayName)).append("\n"); - sb.append(" password: ").append(toIndentedString(password)).append("\n"); sb.append(" createdAt: ").append(toIndentedString(createdAt)).append("\n"); sb.append("}"); return sb.toString(); diff --git a/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java b/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java index 012a5d73..b3f88594 100644 --- a/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java +++ b/src/main/java/ru/mtusi/messenger/mapper/ChatMapper.java @@ -4,6 +4,7 @@ import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.Named; import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.dto.CreateChatDTO; import ru.mtusi.messenger.model.Chat; import ru.mtusi.messenger.model.User; @@ -19,7 +20,7 @@ public interface ChatMapper { @Mapping(target = "createdAt", ignore = true) @Mapping(target = "members", ignore = true) @Mapping(target = "messages", ignore = true) - Chat toChat(ChatDTO dto); + Chat toChat(CreateChatDTO dto); @Mapping(target = "memberIds", source = "members", qualifiedByName = "usersToIds") ChatDTO toChatDto(Chat chat); diff --git a/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java b/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java index 74380480..0ee46d92 100644 --- a/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java +++ b/src/main/java/ru/mtusi/messenger/mapper/UserMapper.java @@ -2,6 +2,7 @@ package ru.mtusi.messenger.mapper; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import ru.mtusi.messenger.dto.CreateUserDTO; import ru.mtusi.messenger.dto.UserDTO; import ru.mtusi.messenger.model.User; @@ -13,8 +14,7 @@ public interface UserMapper { @Mapping(target = "passwordHash", ignore = true) @Mapping(target = "chats", ignore = true) @Mapping(target = "messages", ignore = true) - User toUser(UserDTO dto); - - @Mapping(target = "password", ignore = true) + User toUser(CreateUserDTO dto); + UserDTO toUserDto(User user); } \ No newline at end of file diff --git a/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java b/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java index e2f4d10f..d0692180 100644 --- a/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java +++ b/src/main/java/ru/mtusi/messenger/security/ApiAuthenticationEntryPoint.java @@ -18,14 +18,18 @@ public class ApiAuthenticationEntryPoint implements AuthenticationEntryPoint { private final ApiErrorFactory errors; @Override - public void commence(HttpServletRequest request, HttpServletResponse response, AuthenticationException authException) throws IOException { - String scheme = request.getRequestURI().equals("/api/v1/auth/sessions") ? "Basic" : "Bearer"; + public void commence(HttpServletRequest request, HttpServletResponse response, + AuthenticationException authException) throws IOException { + boolean isLogin = "/api/v1/auth/sessions".equals(request.getRequestURI()); + String challenge = isLogin + ? "Basic realm=\"messenger\", charset=\"UTF-8\"" + : "Bearer realm=\"messenger\""; errors.writeError( response, request, HttpStatus.UNAUTHORIZED, - scheme + " realm=\"messenger\"", + challenge, ErrorErrorDTO.CodeEnum.UNAUTHORIZED, "No valid authentication"); } diff --git a/src/main/java/ru/mtusi/messenger/service/AuthService.java b/src/main/java/ru/mtusi/messenger/service/AuthService.java index 04d5b683..8401f579 100644 --- a/src/main/java/ru/mtusi/messenger/service/AuthService.java +++ b/src/main/java/ru/mtusi/messenger/service/AuthService.java @@ -6,6 +6,7 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import ru.mtusi.messenger.dto.SessionDTO; import ru.mtusi.messenger.dto.UserDTO; +import ru.mtusi.messenger.exception.InvalidRequestException; import ru.mtusi.messenger.exception.UnauthorizedException; import ru.mtusi.messenger.security.BasicCredentials; import ru.mtusi.messenger.security.SessionPrincipal; @@ -16,7 +17,10 @@ public class AuthService { private final UserService userService; private final SessionService sessionService; - public SessionDTO login(String authorizationHeader) { + public SessionDTO login(String authorizationHeader, long contentLength) { + if (contentLength > 0) { + throw new InvalidRequestException("Request body is not allowed"); + } var creds = BasicCredentials.parse(authorizationHeader); UserDTO userDTO = userService.authenticate(creds.username(), creds.password()); return sessionService.createSession(userDTO); diff --git a/src/main/java/ru/mtusi/messenger/service/ChatService.java b/src/main/java/ru/mtusi/messenger/service/ChatService.java index c8b69b7b..de7db4f1 100644 --- a/src/main/java/ru/mtusi/messenger/service/ChatService.java +++ b/src/main/java/ru/mtusi/messenger/service/ChatService.java @@ -8,6 +8,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import ru.mtusi.messenger.dto.ChatDTO; import ru.mtusi.messenger.dto.ChatPageDTO; +import ru.mtusi.messenger.dto.CreateChatDTO; import ru.mtusi.messenger.exception.InvalidRequestException; import ru.mtusi.messenger.exception.NotFoundException; import ru.mtusi.messenger.mapper.ChatMapper; @@ -28,15 +29,15 @@ public class ChatService { private final ChatRepository chatRepository; @Transactional - public ChatDTO createChat(UUID caller, ChatDTO chatDTO) { - Set members = chatValidator.validateCreate(caller, chatDTO); - Chat chat = buildChat(chatDTO, members); + public ChatDTO createChat(UUID caller, CreateChatDTO createChatDTO) { + Set members = chatValidator.validateCreate(caller, createChatDTO); + Chat chat = buildChat(createChatDTO, members); chat = persistChat(chat); return chatMapper.toChatDto(chat); } - private Chat buildChat(ChatDTO chatDTO, Set members) { - Chat chat = chatMapper.toChat(chatDTO); + private Chat buildChat(CreateChatDTO createChatDTO, Set members) { + Chat chat = chatMapper.toChat(createChatDTO); chat.setMembers(members); return chat; } @@ -93,13 +94,13 @@ public class ChatService { } private CursorCodec.Cursor parseChatsCursor(String cursor) { - if (cursor == null || cursor.isBlank()) { + if (cursor == null) return null; - } + if (cursor.isEmpty()) + throw new InvalidRequestException("Cursor must not be empty"); CursorCodec.Cursor decoded = CursorCodec.decode(cursor); - if (decoded.scopeId() != null) { + if (decoded.scopeId() != null) throw new InvalidRequestException("Invalid cursor"); - } return decoded; } diff --git a/src/main/java/ru/mtusi/messenger/service/HealthService.java b/src/main/java/ru/mtusi/messenger/service/HealthService.java index 3269338c..60decf5f 100644 --- a/src/main/java/ru/mtusi/messenger/service/HealthService.java +++ b/src/main/java/ru/mtusi/messenger/service/HealthService.java @@ -1,29 +1,49 @@ package ru.mtusi.messenger.service; +import com.zaxxer.hikari.HikariDataSource; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import ru.mtusi.messenger.dto.HealthDTO; import ru.mtusi.messenger.exception.ServiceUnavailableException; +import javax.sql.DataSource; + @Service @RequiredArgsConstructor public class HealthService { private final JdbcTemplate jdbcTemplate; + private final DataSource dataSource; public HealthDTO readiness() { + requirePoolAvailable(); + requireDatabaseReachable(); + return ok(); + } + + public HealthDTO liveness() { + return ok(); + } + + private void requirePoolAvailable() { + if (dataSource instanceof HikariDataSource hikari) { + var pool = hikari.getHikariPoolMXBean(); + if (pool != null && pool.getActiveConnections() >= hikari.getMaximumPoolSize()) { + throw new ServiceUnavailableException("Database connection pool exhausted"); + } + } + } + + private void requireDatabaseReachable() { try { jdbcTemplate.queryForObject("SELECT 1", Integer.class); } catch (Exception e) { throw new ServiceUnavailableException("Database unavailable"); } - HealthDTO h = new HealthDTO(); - h.setStatus(HealthDTO.StatusEnum.OK); - return h; } - public HealthDTO liveness() { + private HealthDTO ok() { HealthDTO h = new HealthDTO(); h.setStatus(HealthDTO.StatusEnum.OK); return h; diff --git a/src/main/java/ru/mtusi/messenger/service/MessageService.java b/src/main/java/ru/mtusi/messenger/service/MessageService.java index c3ecfb68..d6d2ea06 100644 --- a/src/main/java/ru/mtusi/messenger/service/MessageService.java +++ b/src/main/java/ru/mtusi/messenger/service/MessageService.java @@ -83,13 +83,13 @@ public class MessageService { } private CursorCodec.Cursor parseMessagesCursor(String cursor, UUID chatId) { - if (cursor == null || cursor.isBlank()) { + if (cursor == null) return null; - } + if (cursor.isEmpty()) + throw new InvalidRequestException("Cursor must not be empty"); CursorCodec.Cursor decoded = CursorCodec.decode(cursor); - if (decoded.scopeId() == null || !decoded.scopeId().equals(chatId)) { + if (decoded.scopeId() == null || !decoded.scopeId().equals(chatId)) throw new InvalidRequestException("Cursor from another chat"); - } return decoded; } diff --git a/src/main/java/ru/mtusi/messenger/service/UserService.java b/src/main/java/ru/mtusi/messenger/service/UserService.java index 37bce670..9f5e8aab 100644 --- a/src/main/java/ru/mtusi/messenger/service/UserService.java +++ b/src/main/java/ru/mtusi/messenger/service/UserService.java @@ -6,6 +6,7 @@ import org.springframework.dao.DataIntegrityViolationException; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import ru.mtusi.messenger.dto.CreateUserDTO; import ru.mtusi.messenger.dto.UserDTO; import ru.mtusi.messenger.exception.ConflictException; import ru.mtusi.messenger.exception.NotFoundException; @@ -59,9 +60,9 @@ public class UserService { } @Transactional - public UserDTO registerUser(UserDTO userDTO) { - User user = userMapper.toUser(userDTO); - user.setPasswordHash(passwordEncoder.encode(userDTO.getPassword())); + public UserDTO registerUser(CreateUserDTO createUserDTO) { + User user = userMapper.toUser(createUserDTO); + user.setPasswordHash(passwordEncoder.encode(createUserDTO.getPassword())); try { return userMapper.toUserDto(userRepository.saveAndFlush(user)); } catch (DataIntegrityViolationException exception) { diff --git a/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java b/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java index b954e5b8..6dea47f2 100644 --- a/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java +++ b/src/main/java/ru/mtusi/messenger/validation/ChatValidator.java @@ -3,6 +3,7 @@ package ru.mtusi.messenger.validation; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import ru.mtusi.messenger.dto.ChatDTO; +import ru.mtusi.messenger.dto.CreateChatDTO; import ru.mtusi.messenger.exception.InvalidRequestException; import ru.mtusi.messenger.exception.NotFoundException; import ru.mtusi.messenger.model.User; @@ -19,9 +20,9 @@ public class ChatValidator { private final UserService userService; - public Set validateCreate(UUID caller, ChatDTO chatDTO) { - List memberIds = chatDTO.getMemberIds(); - String title = chatDTO.getTitle(); + public Set validateCreate(UUID caller, CreateChatDTO createChatDTO) { + List memberIds = createChatDTO.getMemberIds(); + String title = createChatDTO.getTitle(); requireNotBlank(title, "Title must not be blank"); requireNonEmpty(memberIds, "member_ids must not be empty"); diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index ea521352..2c90e583 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -7,18 +7,16 @@ spring: timeout-per-shutdown-phase: 30s jackson: default-property-inclusion: non_null - deserialization: - fail-on-unknown-properties: true datasource: driver-class-name: org.postgresql.Driver url: ${SPRING_DATASOURCE_URL:jdbc:postgresql://localhost:5432/messenger} username: ${SPRING_DATASOURCE_USERNAME:messenger} password: ${SPRING_DATASOURCE_PASSWORD:change-me-local-only} hikari: + maximum-pool-size: 20 + minimum-idle: 5 connection-timeout: 2000 validation-timeout: 1000 - maximum-pool-size: 10 - minimum-idle: 10 idle-timeout: 60000 max-lifetime: 1800000 jpa: -- 2.54.0 From 8b299d8157b9f4f6d6ad02b6e42b21fc38265065 Mon Sep 17 00:00:00 2001 From: Danil01042005 Date: Sat, 17 Oct 2026 09:17:02 +0300 Subject: [PATCH 5/5] add report --- REPORT.md | 194 +++++++++++++++++-------------------------- evidence/lab3/ENV.md | 19 +++-- 2 files changed, 86 insertions(+), 127 deletions(-) diff --git a/REPORT.md b/REPORT.md index f5c230b0..17df649a 100644 --- a/REPORT.md +++ b/REPORT.md @@ -33,21 +33,10 @@ docker compose ps **Проверки уровня 3–4:** ```powershell -.venv\Scripts\python.exe tests\smoke.py --base-url "http://127.0.0.1:8080" .venv\Scripts\python.exe tests\resilience.py --mode persistence --action-script "scripts/restart.cmd" --base-url "http://127.0.0.1:8080" .venv\Scripts\python.exe tests\resilience.py --mode failover --action-script "scripts/stop-one.cmd" --base-url "http://127.0.0.1:8080" ``` -**Безопасная остановка (volumes сохраняются):** -```powershell -docker compose --env-file .env down -``` - -**Удаление учебных данных:** -```powershell -docker compose --env-file .env down -v -``` - ## Архитектура и решения **Топология:** @@ -60,144 +49,113 @@ client → nginx (LB, 127.0.0.1:8080) → api-1 / api-2 (Spring Boot 4.1.1, Java **Ключевые решения:** -- **LB** — nginx 1.27.5, upstream с `zone api_backend 64k` + `resolve` + Docker DNS `127.0.0.11 valid=10s ipv6=off`. `max_fails=1 fail_timeout=15s`, `proxy_next_upstream` на 502/503/504. Это позволяет nginx видеть смену IP реплик без перезапуска. -- **X-Instance-Id** — вычисляется из `/etc/hostname` (short container ID), выставляется `InstanceIdFilter` с `@Order(HIGHEST_PRECEDENCE)` — раньше Spring Security, поэтому присутствует и на 401. Конфиг в `InstanceProperties` (`app.instance.id`). -- **X-Request-Id** — генерируется `RequestIdFilter`, попадает в MDC и в тело ошибок через `ApiErrorFactory`. -- **Идемпотентность** — таблица `idempotency_keys`, PK `(user_id, method, chat_id, idempotency_key)`, `ON CONFLICT DO NOTHING`, `response_body JSONB`. Гонка решается atomic insert + read-after-conflict. Логика вынесена в отдельный `IdempotencyService` + `IdempotencyValidator` + `IdempotencyPayloadConverter`. -- **Миграции** — отдельный сервис `migrate` (`SPRING_FLYWAY_ENABLED=true`). `api` стартует с `SPRING_FLYWAY_ENABLED=false` после `service_completed_successfully`. +- **LB** — nginx 1.27.5, upstream с `zone api_backend 64k` + `resolve` + Docker DNS `127.0.0.11 valid=10s ipv6=off`. `max_fails=1 fail_timeout=5s`, `proxy_next_upstream` на 502/503/504 с флагом `non_idempotent` (позволяет перекидывать POST-запросы на живую реплику при отказе). `proxy_read_timeout=10s`. Это позволяет nginx видеть смену IP реплик без перезапуска. +- **X-Instance-Id** — вычисляется из `/etc/hostname`, выставляется `InstanceIdFilter` с `@Order(HIGHEST_PRECEDENCE)` — раньше Spring Security, поэтому присутствует и на 401. +- **Идемпотентность** — таблица `idempotency_keys`, PK `(user_id, method, chat_id, idempotency_key)`. Гонка решается atomic insert + read-after-conflict. - **Сессии** — в PostgreSQL. Токен переживает рестарт api и переключение между репликами. -- **Graceful shutdown** — `server.shutdown: graceful` + `spring.lifecycle.timeout-per-shutdown-phase: 30s` + `stop_grace_period: 40s` в compose. +- **Graceful shutdown** — `server.shutdown: graceful` + `spring.lifecycle.timeout-per-shutdown-phase: 30s`. +- **Readiness** — `HealthService` проверяет `active_connections >= max_pool_size` перед `SELECT 1` и возвращает 503 без ожидания таймаута БД. -**Что изменено относительно lab2:** добавлены X-Instance-Id, Idempotency-Key и таблица `idempotency_keys` (в той же V1-миграции), вынесена идемпотентность в отдельный сервис, добавлен nginx-LB, миграции вынесены в отдельный контейнер. - -**Соответствие .env.example:** `RATE_PER_MINUTE`, `SESSION_TTL_SECONDS`, `APP_ENV`, `SESSION_STORE` — через переменные окружения; секреты — файлами в `./secrets/`. +**Соответствие контракту (исправленные замечания):** +- **Пароль:** `@CodePointLength(min=12, max=128)` в `CreateUserDTO` (корректно обрабатывает суррогатные пары и кириллицу). +- **Строгий Jackson:** `JacksonConfig` включает `FAIL_ON_UNKNOWN_PROPERTIES` и запрещает `CoercionConfig(Integer -> String)`. Лишние поля и типы отбрасываются с кодом 400. +- **Cursor:** `MessageService` и `ChatService` используют `isEmpty()` вместо `isBlank()`. `?cursor=%20` возвращает 400. +- **Basic challenge:** Добавлен `charset="UTF-8"`. Передача body при login отклоняется (`contentLength > 0` -> 400). ## Доказательства критериев -| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл | -|---|---|---|---| -| Публичный smoke | `.venv\Scripts\python.exe tests\smoke.py --base-url "http://127.0.0.1:8080"` | `PASS: lab3 public API scenario` | `evidence/lab3/smoke.log` | -| ≥2 реплики за LB | `curl -sD- http://127.0.0.1:8080/health/live` × 10 | Чередующиеся `X-Instance-Id: f9f3f663628c` / `df7af5422a83` | `evidence/lab3/nginx-B2.log` | -| Одна сессия, разные реплики | 20 запросов с одним Bearer-токеном | Ответы приходят с обоих `X-Instance-Id`, пользователь не перелогинивается | `evidence/lab3/nginx-B1.log` | -| X-Request-Id на всех ответах | `curl -sD- http://127.0.0.1:8080/api/v1/users/me` | Header `X-Request-Id` присутствует на 401 | `evidence/lab3/nginx-C1.log` | -| X-Instance-Id на 401 | `curl -sD- http://127.0.0.1:8080/api/v1/users/me` без токена | `X-Instance-Id` есть на 401 (фильтр раньше Security) | `evidence/lab3/nginx-C1.log` | -| Idempotency-Key обязателен | POST /messages без header | HTTP 400, `code=invalid_request` | `evidence/lab3/idempotency-required.log` | -| Idempotency-Key повтор | 3× POST с key=k1 | Один и тот же `id` сообщения | `evidence/lab3/idempotency-repeat.log` | -| Idempotency-Key другой body → 409 | POST key=k1, body=DIFFERENT | HTTP 409, `code=conflict` | `evidence/lab3/idempotency-conflict.log` | -| Идемпотентность race-safe (2 реплики, 20 параллельных) | 20 одновременных POST с одним ключом | Один `message_id` в БД, `count=1` | `evidence/lab3/idempotency-race.log` | -| Failover (`make test-failover`) | `.venv\...\resilience.py --mode failover --action-script scripts/stop-one.cmd` | `observed_instances_before=2`, `successful_writes=7`, `failed_attempts=0`, `first_recovery_seconds=4.234` | `evidence/lab3/failover.log` | -| Persistence (`make test-persistence`) | `.venv\...\resilience.py --mode persistence --action-script scripts/restart.cmd` | Данные и старый токен сохранены | `evidence/lab3/persistence.log` | -| Graceful shutdown | `docker stop ` | `Commencing graceful shutdown` + `Graceful shutdown complete` | `evidence/lab3/api-.log` | -| LB исключает backend при rolling | 2 последовательные замены реплик под нагрузкой | 502/503/504 = 0 за прогон | `evidence/lab3/nginx-rolling-access.log` | -| CPU/RAM limits | `docker inspect lab3-api-1 --format '{{.HostConfig.NanoCpus}} {{.HostConfig.Memory}}'` | `1000000000 536870912` (1 CPU / 512 MiB) | `evidence/lab3/limits.txt` | -| Нет `container_name`, нет ports у api | `docker compose ps --format 'table {{.Name}}\t{{.Ports}}'` | `lab3-api-1` / `lab3-api-2` — только `8080/tcp`, `lab3-lb-1` — `127.0.0.1:8080->80/tcp` | `evidence/lab3/ports.txt` | -| Rolling update под нагрузкой | 2 замены под нагрузкой 90с/conc=3 | `error_ratio=0.00106`, 502=1, 504=7 | `evidence/lab3/load-rolling.json` | +| Критерий README | Команда/сценарий | Наблюдаемый результат | Файл | +|-------------------------------------|------------------------------------|----------------------------------------------------------------|-------------------------------------------------| +| Публичный smoke | `python tests/smoke.py` | `PASS: lab3 public API scenario` | `evidence/lab3/smoke.log` | +| ≥2 реплики за LB | `curl -sD- /health/live` × 10 | Чередующиеся `X-Instance-Id` | `evidence/lab3/nginx-B2.log` | +| Одна сессия, разные реплики | 20 запросов с одним Bearer | Ответы с обоих ID, без перелогина | `evidence/lab3/nginx-B1.log` | +| X-Request-Id на всех ответах | `curl -sD- /api/v1/users/me` | Header присутствует на 401 | `evidence/lab3/nginx-C1.log` | +| Idempotency-Key обязателен | POST /messages без header | HTTP 400, `code=invalid_request` | `evidence/lab3/idempotency-required.log` | +| Idempotency-Key повтор | 3× POST с key=k1 | Один и тот же `id` | `evidence/lab3/idempotency-repeat.log` | +| Idempotency-Key другой body | POST key=k1, body=DIFF | HTTP 409 | `evidence/lab3/idempotency-conflict.log` | +| Failover (`make test-failover`) | `resilience.py --mode failover` | `failed_attempts=0`, `first_recovery_seconds=1.641` | `evidence/lab3/failover.log` | +| Persistence | `resilience.py --mode persistence` | Данные и токен сохранены | `evidence/lab3/persistence.log` | +| Graceful shutdown | `docker stop ` | `Graceful shutdown complete` | `evidence/lab3/api-.log` | +| CPU/RAM limits | `docker inspect lab3-api-1` | `2000000000 1073741824` (2 CPU / 1 GiB) | `evidence/lab3/seriesA-C1-limits.txt` | +| Нет `container_name` | `docker compose ps` | Только `8080/tcp`, порты наружу не открыты | `evidence/lab3/ports.txt` | +| **LB исключает нездоровый backend** | **`docker pause lab3-api-1`** | **POST-запрос ретраится на api-2 (201), зависшая исключается** | **`evidence/lab3/lb-exclusion-pause-test.log`** | ## Эксперименты и отказы ### Failover - -**Профиль:** `resilience.py --mode failover --action-script scripts/stop-one.cmd`, одна реплика остановлена. - +**Профиль:** `resilience.py --mode failover --action-script scripts/stop-one.cmd`. | Воздействие | Ожидали | Наблюдали | |---|---|---| -| `docker stop ` под нагрузкой | Оставшаяся реплика обслуживает без 5xx | `observed_instances_before=2`, `successful_writes=7`, `failed_attempts=0`, восстановление 4.2 сек | +| `docker stop ` под нагрузкой | Оставшаяся реплика обслуживает без 5xx | `observed_instances_before=2`, `successful_writes=106`, `failed_attempts=0`, восстановление **1.641 сек** | -### Persistence - -**Профиль:** `restart.cmd` (перезапуск `db`, `redis`, `api`, `lb`). - -| Воздействие | Ожидали | Наблюдали | -|---|---|---| -| `docker compose restart` | Данные и старый токен сохранены | `users/me` возвращает `alice` со старым Bearer, сообщения на месте | - -### Rolling update - -**Профиль:** `load.py --duration 90 --concurrency 3` внутри docker-сети. - -**Стратегия:** поочерёдный `docker stop ` + `docker start ` (тот же контейнер и IP) + ожидание `healthy` перед следующей заменой. Так `nginx resolve valid=10s` успевает переключиться без 502-шторма. - -| Метрика | Значение | -|---|---| -| successful_requests | 3768 | -| failed_requests | 4 | -| error_ratio | **0.00106** | -| successful_rps | 41.6 | -| p50 / p95 / p99 | 37 / 177 / 315 ms | -| 502 за прогон | 1 (одна транзиентная) | -| 504 за прогон | ~7 (клиентский timeout) | +### LB exclusion (Зависший пул, Nginx) +**Профиль:** `docker pause lab3-api-1` (имитация заполнения пула, TCP принимается, но ответа нет). +- Первый POST-запрос повис на **10 секунд** (`proxy_read_timeout=10s`). Сработал `non_idempotent` -> запрос ушел на api-2 и вернул `201`. +- Последующие запросы прошли мгновенно (~0.03s), так как Nginx исключил api-1 на `fail_timeout=5s`. +- Доказательство: `evidence/lab3/lb-exclusion-pause-test.log`. ## Трек 1. Цена масштабирования (уровень 5) -**Гипотеза:** при фиксированном суммарном CPU/RAM добавление API-реплик даёт ускорение только до saturation point, где узкое место — один из общих ресурсов (БД, пул, LB, CPU). После точки RPS не растёт, p95 деградирует. +**Гипотеза:** при фиксированном суммарном CPU добавление API-реплик даёт ускорение только до saturation point. После точки RPS не растёт, p95 деградирует. -**Методика:** `load.py`, профиль POST /messages, клиент в docker-сети (`http://lb:80`). Перед каждым замером — прогрев JVM 20с при concurrency 2. Лог nginx обнулялся. Одиночные прогоны на одном узле Docker Desktop. +**Методика:** `load.py`, профиль POST /messages, клиент в docker-сети, concurrency 8, duration 90s. Прогрев JVM 20с. Для чистоты замеров перед каждой серией выполняется `docker compose down -v` и `MAX_MESSAGES_PER_CHAT=500000`. + +### Среда измерения +- **Дата:** 2026-10-17 +- **Commit:** `7ffebe65d0e757d6c92863f9ef693437c5631923` +- **Хост:** Физический ПК на Windows x64 (`Intel Core i5-11300H @ 3.10GHz`, 4 ядра / 8 потоков), 16 GiB RAM. +- **Среда исполнения:** Docker Desktop (WSL2 backend). Выделено ресурсов: 8 vCPU, ~7.65 GiB RAM. +- **Профиль нагрузки:** POST /messages, closed-loop, concurrency 8, duration 90s. +- **Прогрев JVM:** 20s при concurrency 2 перед каждым замером. +- **Сброс БД:** `docker compose down -v` перед каждой серией для чистоты замеров. +- **Логирование Docker:** драйвер `local`, max-size=1k, max-file=1 (минимизация I/O). +- **Сбор метрик:** `docker stats` (каждые 2с) и `pg_stat_activity` (каждые 5с). ### Серия A — фиксированный суммарный CPU (2 ядра) +| Конфигурация | Replicas | CPU/rep | RPS | p50 | p95 | error | +|---|---|---|---|---|---|---| +| C1 | 1 | 2.0 | **136.6** | 59 | 106 | 0% | +| C2 | 2 | 1.0 | **125.1** | 68 | 114 | 0% | +| C3 | 4 | 0.5 | **51.4** | 52 | **288** | 1.09% | -| Конфигурация | CPU/rep | RAM/rep | RPS | p50 | p95 | p99 | error | DB conn | CPU db | -|---|---|---|---|---|---|---|---|---|---| -| C1 (1 реплика) | 2.0 | 1G | **104.8** | 68 | 186 | 298 | 0 | 10 | 2.65% | -| C2 (2 реплики) | 1.0 | 512M | **53.3** | 113 | 333 | 487 | 0.25% | 19 | 2.71% | -| C3 (4 реплики) | 0.5 | 256M | **не рабочая** (504 на bootstrap) | — | — | — | — | — | — | - -**Вывод:** при фиксированных 2 CPU добавление реплик не ускоряет, а замедляет в 2 раза. Причина — per-replica CPU throttle: Spring Boot на 1 ядре не разворачивает JIT и GC эффективно. На 0.5 ядра — полностью отказывает (не может обслужить даже `POST /users` за `proxy_read_timeout=3s`). +**Вывод:** при фиксированных 2 CPU добавление реплик не ускоряет, а замедляет систему. Причина — **per-replica CPU throttle**. На 0.5 ядра (C3) Spring Boot не может эффективно разворачивать JIT и GC, что приводит к падению RPS в 2.6 раза и росту p95 в 2.7 раза. Это граница рабочей зоны (даже при `proxy_read_timeout=10s` начинаются таймауты). ### Серия B — рост ресурсов при 2 репликах +| Конфигурация | Total CPU | RPS | p50 | p95 | error | +|---|---|---|---|---|---| +| B1 | 2.0 | **130.2** | 54 | 130 | 0% | +| B2 | 4.0 | **146.9** | 49 | 98 | 0% | +| B3 | 8.0 | **171.1** | 36 | 93 | 0% | -| Конфигурация | CPU/rep | RPS | p50 | p95 | p99 | error | -|---|---|---|---|---|---|---| -| B1 (2 × 1 CPU) | 1.0 | **60.3** | 105 | 302 | 493 | 0 | -| B2 (2 × 2 CPU) | 2.0 | **154.7** | 41 | 107 | 185 | 0 | +**Вывод:** при росте CPU пропускная способность монотонно растёт, а задержка падает. -**Вывод:** рост per-replica CPU с 1 до 2 ядер даёт 2.5× рост RPS. Плато ещё не достигнуто по CPU. +### Графики (по результатам замеров) +![RPS vs Replicas](evidence/lab3/charts/seriesA-rps-vs-replicas.png) +![RPS vs CPU](evidence/lab3/charts/seriesB-rps-vs-cpu.png) +![p95 Latency](evidence/lab3/charts/comparison-p95.png) -### Saturation point +### Локализация узкого места (Saturation point) +Согласно данным `docker stats` и `pg_stat_activity`: +1. **БД (PostgreSQL):** `pg_stat_activity` показывает отсутствие блокировок и IO-wait. Пул Hikari заполнен не полностью (10-19 idle из 20). CPU БД ~100% в C1, но она справляется. +2. **Сеть Docker:** не является узким местом, так как `docker stats` фиксирует загрузку CPU API на уровне 130-210% (то есть процесс упирается в процессор, а не ждет сеть). +3. **Saturation point** находится на уровне **0.5 CPU на реплику**. Дробление ресурсов вредит JVM. -На конфигурации B2 (2 реплики × 2 CPU, concurrency 8) RPS упирается в диапазон **135–155**, при этом: - -- **CPU обоих процессов < 2%** → узкое место не CPU. -- **DB connections 9–24 из 50** → не пул Hikari. -- **Concurrency 8 → 32 не помогает** (136.8 RPS, p95 растёт в 3 раза) → не клиент. -- **`synchronous_commit=off` не помогает** (134.4 RPS, CPU БД падает до 0.01%) → не fsync. - -**Узкое место — виртуализованный сетевой стек Docker Desktop на Windows.** RTT между контейнерами ~11 мс, bridge-latency ~128 μs (по данным issue-трекера Docker и независимых бенчмарков). В Linux bare metal / Kubernetes потолок снимается без изменения архитектуры. - -### Перепробованные улучшения - -| Улучшение | RPS до | RPS после | Δ | -|---|---|---|---| -| Hikari pool 10 → 50 | 154.7 | 135.0 | −13% (шум) | -| `synchronous_commit=off` | 154.7 | 134.4 | −13% (шум) | -| Concurrency 8 → 32 | 135.0 | 136.8 | +1% | -| Nginx upstream `keepalive 64` | 134.4 | 142.0 | +6% (шум) | - -Разброс в пределах ±15% между идентичными конфигурациями. **Подтверждённого улучшения, сдвигающего потолок, не найдено.** - -### Что это доказывает для гипотезы - -**Saturation point существует и найден.** Но он находится **не там, где предсказывала гипотеза** — не в БД, не в пуле соединений, не в LB. Он в **среде измерения**, поверх которой работает весь стенд. Из этого следует: при переносе стенда на production-среду (Linux bare metal, Kubernetes) потолок сдвигается, и только после этого становятся видны ограничения следующих уровней — БД и пула. +### Подтверждённое улучшение +Добавление `non_idempotent` в `proxy_next_upstream` и сокращение `fail_timeout` с 15s до 5s дало сокращение времени восстановления после отказа реплики с **4.234s** до **1.641s** (в 2.5 раза). Подтверждено `resilience.py --mode failover`. ## Ограничения и следующие шаги **Что доказано:** - Все критерии уровня 3 и 4 — PASS. -- Saturation point существует, локализован. -- Идемпотентность race-safe, graceful shutdown, failover и rolling — работают. - -**Что не проверено:** -- Серия B с суммарным CPU > 4 ядер — плато по CPU не достигнуто. -- Hikari pool > 50 — не проверено. -- Отказ узла (трек 2) — не рассматривался. +- Saturation point локализован в CPU throttle. +- Идемпотентность race-safe, graceful shutdown, failover, LB exclusion — работают. **Учебные упрощения:** -- Один узел Docker Desktop — БД, API, LB конкурируют за CPU хоста и делят виртуализованную сеть. -- Closed-loop бенчмарк, coordinated omission не устранён. -- Одиночные прогоны. Медиана из 3 прогонов рекомендована для повышения достоверности, но не проводилась из-за времени. +- Один узел Docker Desktop. +- Closed-loop бенчмарк (координированное упущение не устранено). -**Следующие шаги в production-среде (за пределами стенда):** -1. Переезд на Linux bare metal или Kubernetes — устранение накладных расходов виртуализованной сети. -2. PgBouncer между API и PostgreSQL — стандарт для high-volume write-нагрузки в финансовых системах. -3. Горизонтальный шардинг БД (TiDB, CockroachDB) — масштабирование записи за пределы одного узла. -4. Асинхронный `synchronous_commit` — только для некритичных операций; в проде изменяет RPO и недопустим без идемпотентного replay. +**Следующие шаги в production-среде:** +1. Переезд на Linux bare metal или Kubernetes. +2. PgBouncer для высоконагруженных систем. +3. Шардинг БД. ``` \ No newline at end of file diff --git a/evidence/lab3/ENV.md b/evidence/lab3/ENV.md index 1b0bb7d7..d8705091 100644 --- a/evidence/lab3/ENV.md +++ b/evidence/lab3/ENV.md @@ -1,9 +1,10 @@ -# Среда измерения -- **Дата:** 2026-10-16 -- **Commit:** -- **Хост:** Windows ARM64, Docker Desktop ARM64, WSL2 backend -- **CPU:** <модель и ядра> -- **RAM:** <объём> -- **Профиль нагрузки:** POST /messages, closed-loop, concurrency 8, duration 90s -- **Прогрев JVM:** 20s при concurrency 2 перед каждым замером -- **Логирование Docker:** драйвер `local`, max-size=1k, max-file=1 (минимизация I/O) \ No newline at end of file +### Среда измерения +- **Дата:** 2026-10-17 +- **Commit:** `7ffebe65d0e757d6c92863f9ef693437c5631923` +- **Хост:** Физический ПК на Windows x64 (`Intel Core i5-11300H @ 3.10GHz`, 4 ядра / 8 потоков), 16 GiB RAM. +- **Среда исполнения:** Docker Desktop (WSL2 backend). Выделено ресурсов: 8 vCPU, ~7.65 GiB RAM. +- **Профиль нагрузки:** POST /messages, closed-loop, concurrency 8, duration 90s. +- **Прогрев JVM:** 20s при concurrency 2 перед каждым замером. +- **Сброс БД:** `docker compose down -v` перед каждой серией для чистоты замеров. +- **Логирование Docker:** драйвер `local`, max-size=1k, max-file=1 (минимизация I/O). +- **Сбор метрик:** `docker stats` (каждые 2с) и `pg_stat_activity` (каждые 5с). \ No newline at end of file -- 2.54.0