diff --git a/java-backend/target/classes/com/shopper/JavaBackendApplication.class b/java-backend/target/classes/com/shopper/JavaBackendApplication.class index 1913cde0..d5256ebf 100644 Binary files a/java-backend/target/classes/com/shopper/JavaBackendApplication.class and b/java-backend/target/classes/com/shopper/JavaBackendApplication.class differ diff --git a/java-backend/target/classes/com/shopper/config/AuthenticationConfig.class b/java-backend/target/classes/com/shopper/config/AuthenticationConfig.class index 57fb4f4b..e7ff61aa 100644 Binary files a/java-backend/target/classes/com/shopper/config/AuthenticationConfig.class and b/java-backend/target/classes/com/shopper/config/AuthenticationConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/BeanConfig.class b/java-backend/target/classes/com/shopper/config/BeanConfig.class index 3d48cfb1..a78c4286 100644 Binary files a/java-backend/target/classes/com/shopper/config/BeanConfig.class and b/java-backend/target/classes/com/shopper/config/BeanConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/DatabaseConfig$PrimaryRepositoryConfig.class b/java-backend/target/classes/com/shopper/config/DatabaseConfig$PrimaryRepositoryConfig.class index 0045ec7d..2fdf3f84 100644 Binary files a/java-backend/target/classes/com/shopper/config/DatabaseConfig$PrimaryRepositoryConfig.class and b/java-backend/target/classes/com/shopper/config/DatabaseConfig$PrimaryRepositoryConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/DatabaseConfig$RegularRepositoryConfig.class b/java-backend/target/classes/com/shopper/config/DatabaseConfig$RegularRepositoryConfig.class index de8ab24d..72f060c3 100644 Binary files a/java-backend/target/classes/com/shopper/config/DatabaseConfig$RegularRepositoryConfig.class and b/java-backend/target/classes/com/shopper/config/DatabaseConfig$RegularRepositoryConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/DatabaseConfig$SecondaryRepositoryConfig.class b/java-backend/target/classes/com/shopper/config/DatabaseConfig$SecondaryRepositoryConfig.class index e729fbe8..7aa5af67 100644 Binary files a/java-backend/target/classes/com/shopper/config/DatabaseConfig$SecondaryRepositoryConfig.class and b/java-backend/target/classes/com/shopper/config/DatabaseConfig$SecondaryRepositoryConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/DatabaseConfig.class b/java-backend/target/classes/com/shopper/config/DatabaseConfig.class index 10359d81..59f4c769 100644 Binary files a/java-backend/target/classes/com/shopper/config/DatabaseConfig.class and b/java-backend/target/classes/com/shopper/config/DatabaseConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/DynatraceOtelLogHook.class b/java-backend/target/classes/com/shopper/config/DynatraceOtelLogHook.class index 39e1e02e..24377622 100644 Binary files a/java-backend/target/classes/com/shopper/config/DynatraceOtelLogHook.class and b/java-backend/target/classes/com/shopper/config/DynatraceOtelLogHook.class differ diff --git a/java-backend/target/classes/com/shopper/config/OpenApiConfig.class b/java-backend/target/classes/com/shopper/config/OpenApiConfig.class index d98acfe6..0369687c 100644 Binary files a/java-backend/target/classes/com/shopper/config/OpenApiConfig.class and b/java-backend/target/classes/com/shopper/config/OpenApiConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/OpenFeatureConfig.class b/java-backend/target/classes/com/shopper/config/OpenFeatureConfig.class index 2ead0227..5c7dcb1c 100644 Binary files a/java-backend/target/classes/com/shopper/config/OpenFeatureConfig.class and b/java-backend/target/classes/com/shopper/config/OpenFeatureConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata$Builder.class b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata$Builder.class index 2f121d14..011ab068 100644 Binary files a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata$Builder.class and b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata$Builder.class differ diff --git a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata.class b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata.class index 463f9ecd..2382d0d6 100644 Binary files a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata.class and b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig$AppMetadata.class differ diff --git a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig.class b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig.class index ab7af37d..f4deaad7 100644 Binary files a/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig.class and b/java-backend/target/classes/com/shopper/config/OpenTelemetryConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/SecurityConfig.class b/java-backend/target/classes/com/shopper/config/SecurityConfig.class index 483d398a..60fce2cd 100644 Binary files a/java-backend/target/classes/com/shopper/config/SecurityConfig.class and b/java-backend/target/classes/com/shopper/config/SecurityConfig.class differ diff --git a/java-backend/target/classes/com/shopper/config/WebConfig.class b/java-backend/target/classes/com/shopper/config/WebConfig.class index 04610c45..3419de95 100644 Binary files a/java-backend/target/classes/com/shopper/config/WebConfig.class and b/java-backend/target/classes/com/shopper/config/WebConfig.class differ diff --git a/java-backend/target/classes/com/shopper/controller/AuthController$UserInfo.class b/java-backend/target/classes/com/shopper/controller/AuthController$UserInfo.class index 23045fe4..8665660c 100644 Binary files a/java-backend/target/classes/com/shopper/controller/AuthController$UserInfo.class and b/java-backend/target/classes/com/shopper/controller/AuthController$UserInfo.class differ diff --git a/java-backend/target/classes/com/shopper/controller/AuthController$VerifyResponse.class b/java-backend/target/classes/com/shopper/controller/AuthController$VerifyResponse.class index 517aaf18..47a5f269 100644 Binary files a/java-backend/target/classes/com/shopper/controller/AuthController$VerifyResponse.class and b/java-backend/target/classes/com/shopper/controller/AuthController$VerifyResponse.class differ diff --git a/java-backend/target/classes/com/shopper/controller/AuthController.class b/java-backend/target/classes/com/shopper/controller/AuthController.class index 44fd592a..2860c735 100644 Binary files a/java-backend/target/classes/com/shopper/controller/AuthController.class and b/java-backend/target/classes/com/shopper/controller/AuthController.class differ diff --git a/java-backend/target/classes/com/shopper/controller/CartController.class b/java-backend/target/classes/com/shopper/controller/CartController.class index e4667468..f41e1a04 100644 Binary files a/java-backend/target/classes/com/shopper/controller/CartController.class and b/java-backend/target/classes/com/shopper/controller/CartController.class differ diff --git a/java-backend/target/classes/com/shopper/controller/HealthController.class b/java-backend/target/classes/com/shopper/controller/HealthController.class index 94f80bcc..84033eda 100644 Binary files a/java-backend/target/classes/com/shopper/controller/HealthController.class and b/java-backend/target/classes/com/shopper/controller/HealthController.class differ diff --git a/java-backend/target/classes/com/shopper/controller/OrderController.class b/java-backend/target/classes/com/shopper/controller/OrderController.class index b0b38e42..7cee1518 100644 Binary files a/java-backend/target/classes/com/shopper/controller/OrderController.class and b/java-backend/target/classes/com/shopper/controller/OrderController.class differ diff --git a/java-backend/target/classes/com/shopper/controller/ProductController.class b/java-backend/target/classes/com/shopper/controller/ProductController.class index bbe74255..a55ded01 100644 Binary files a/java-backend/target/classes/com/shopper/controller/ProductController.class and b/java-backend/target/classes/com/shopper/controller/ProductController.class differ diff --git a/java-backend/target/classes/com/shopper/dto/AddToCartDto.class b/java-backend/target/classes/com/shopper/dto/AddToCartDto.class index faed8aa7..d71c4814 100644 Binary files a/java-backend/target/classes/com/shopper/dto/AddToCartDto.class and b/java-backend/target/classes/com/shopper/dto/AddToCartDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/AuthResponseDto$UserInfo.class b/java-backend/target/classes/com/shopper/dto/AuthResponseDto$UserInfo.class index 48e66f9b..21d91ddd 100644 Binary files a/java-backend/target/classes/com/shopper/dto/AuthResponseDto$UserInfo.class and b/java-backend/target/classes/com/shopper/dto/AuthResponseDto$UserInfo.class differ diff --git a/java-backend/target/classes/com/shopper/dto/AuthResponseDto.class b/java-backend/target/classes/com/shopper/dto/AuthResponseDto.class index ae1a536a..9d442e21 100644 Binary files a/java-backend/target/classes/com/shopper/dto/AuthResponseDto.class and b/java-backend/target/classes/com/shopper/dto/AuthResponseDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/CreateOrderDto.class b/java-backend/target/classes/com/shopper/dto/CreateOrderDto.class index fb8dc18d..96a88a95 100644 Binary files a/java-backend/target/classes/com/shopper/dto/CreateOrderDto.class and b/java-backend/target/classes/com/shopper/dto/CreateOrderDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/CreateProductDto.class b/java-backend/target/classes/com/shopper/dto/CreateProductDto.class index 7c2753c5..ba72cf74 100644 Binary files a/java-backend/target/classes/com/shopper/dto/CreateProductDto.class and b/java-backend/target/classes/com/shopper/dto/CreateProductDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/LoginDto.class b/java-backend/target/classes/com/shopper/dto/LoginDto.class index 9bc09340..4683f620 100644 Binary files a/java-backend/target/classes/com/shopper/dto/LoginDto.class and b/java-backend/target/classes/com/shopper/dto/LoginDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/RegisterDto.class b/java-backend/target/classes/com/shopper/dto/RegisterDto.class index 0e71e3ed..9f022e58 100644 Binary files a/java-backend/target/classes/com/shopper/dto/RegisterDto.class and b/java-backend/target/classes/com/shopper/dto/RegisterDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/UpdateCartItemDto.class b/java-backend/target/classes/com/shopper/dto/UpdateCartItemDto.class index 150f7953..85f051ac 100644 Binary files a/java-backend/target/classes/com/shopper/dto/UpdateCartItemDto.class and b/java-backend/target/classes/com/shopper/dto/UpdateCartItemDto.class differ diff --git a/java-backend/target/classes/com/shopper/dto/UpdateProductDto.class b/java-backend/target/classes/com/shopper/dto/UpdateProductDto.class index 3acd1a58..0b27e9ed 100644 Binary files a/java-backend/target/classes/com/shopper/dto/UpdateProductDto.class and b/java-backend/target/classes/com/shopper/dto/UpdateProductDto.class differ diff --git a/java-backend/target/classes/com/shopper/entity/CartItem$CartItemBuilder.class b/java-backend/target/classes/com/shopper/entity/CartItem$CartItemBuilder.class index 62b641e2..0a4d2295 100644 Binary files a/java-backend/target/classes/com/shopper/entity/CartItem$CartItemBuilder.class and b/java-backend/target/classes/com/shopper/entity/CartItem$CartItemBuilder.class differ diff --git a/java-backend/target/classes/com/shopper/entity/CartItem.class b/java-backend/target/classes/com/shopper/entity/CartItem.class index cc134655..2cb2c282 100644 Binary files a/java-backend/target/classes/com/shopper/entity/CartItem.class and b/java-backend/target/classes/com/shopper/entity/CartItem.class differ diff --git a/java-backend/target/classes/com/shopper/entity/Order$OrderBuilder.class b/java-backend/target/classes/com/shopper/entity/Order$OrderBuilder.class index 855b3470..d4e98745 100644 Binary files a/java-backend/target/classes/com/shopper/entity/Order$OrderBuilder.class and b/java-backend/target/classes/com/shopper/entity/Order$OrderBuilder.class differ diff --git a/java-backend/target/classes/com/shopper/entity/Order$OrderStatus.class b/java-backend/target/classes/com/shopper/entity/Order$OrderStatus.class index 5c157a11..b6daec90 100644 Binary files a/java-backend/target/classes/com/shopper/entity/Order$OrderStatus.class and b/java-backend/target/classes/com/shopper/entity/Order$OrderStatus.class differ diff --git a/java-backend/target/classes/com/shopper/entity/Order.class b/java-backend/target/classes/com/shopper/entity/Order.class index 5b7c4ccb..2c8ab78a 100644 Binary files a/java-backend/target/classes/com/shopper/entity/Order.class and b/java-backend/target/classes/com/shopper/entity/Order.class differ diff --git a/java-backend/target/classes/com/shopper/entity/OrderItem$OrderItemBuilder.class b/java-backend/target/classes/com/shopper/entity/OrderItem$OrderItemBuilder.class index 848f783d..a4a9a831 100644 Binary files a/java-backend/target/classes/com/shopper/entity/OrderItem$OrderItemBuilder.class and b/java-backend/target/classes/com/shopper/entity/OrderItem$OrderItemBuilder.class differ diff --git a/java-backend/target/classes/com/shopper/entity/OrderItem.class b/java-backend/target/classes/com/shopper/entity/OrderItem.class index 1d9f7be8..3c2e9595 100644 Binary files a/java-backend/target/classes/com/shopper/entity/OrderItem.class and b/java-backend/target/classes/com/shopper/entity/OrderItem.class differ diff --git a/java-backend/target/classes/com/shopper/entity/Product$ProductBuilder.class b/java-backend/target/classes/com/shopper/entity/Product$ProductBuilder.class index 505d43ea..14a24afd 100644 Binary files a/java-backend/target/classes/com/shopper/entity/Product$ProductBuilder.class and b/java-backend/target/classes/com/shopper/entity/Product$ProductBuilder.class differ diff --git a/java-backend/target/classes/com/shopper/entity/Product.class b/java-backend/target/classes/com/shopper/entity/Product.class index 0e412a48..492dd105 100644 Binary files a/java-backend/target/classes/com/shopper/entity/Product.class and b/java-backend/target/classes/com/shopper/entity/Product.class differ diff --git a/java-backend/target/classes/com/shopper/entity/User$Role.class b/java-backend/target/classes/com/shopper/entity/User$Role.class index 43a6b322..ddfa1e80 100644 Binary files a/java-backend/target/classes/com/shopper/entity/User$Role.class and b/java-backend/target/classes/com/shopper/entity/User$Role.class differ diff --git a/java-backend/target/classes/com/shopper/entity/User$UserBuilder.class b/java-backend/target/classes/com/shopper/entity/User$UserBuilder.class index e99a9a86..051581e9 100644 Binary files a/java-backend/target/classes/com/shopper/entity/User$UserBuilder.class and b/java-backend/target/classes/com/shopper/entity/User$UserBuilder.class differ diff --git a/java-backend/target/classes/com/shopper/entity/User.class b/java-backend/target/classes/com/shopper/entity/User.class index 869dae62..4f914b4c 100644 Binary files a/java-backend/target/classes/com/shopper/entity/User.class and b/java-backend/target/classes/com/shopper/entity/User.class differ diff --git a/java-backend/target/classes/com/shopper/interceptor/LoggingInterceptor.class b/java-backend/target/classes/com/shopper/interceptor/LoggingInterceptor.class index 52e67ae6..bc4f9129 100644 Binary files a/java-backend/target/classes/com/shopper/interceptor/LoggingInterceptor.class and b/java-backend/target/classes/com/shopper/interceptor/LoggingInterceptor.class differ diff --git a/java-backend/target/classes/com/shopper/repository/CartItemRepository.class b/java-backend/target/classes/com/shopper/repository/CartItemRepository.class index abc5198f..498546a2 100644 Binary files a/java-backend/target/classes/com/shopper/repository/CartItemRepository.class and b/java-backend/target/classes/com/shopper/repository/CartItemRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/DualDatabaseRepository.class b/java-backend/target/classes/com/shopper/repository/DualDatabaseRepository.class index efb5f3e9..5a2319ee 100644 Binary files a/java-backend/target/classes/com/shopper/repository/DualDatabaseRepository.class and b/java-backend/target/classes/com/shopper/repository/DualDatabaseRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/OrderItemRepository.class b/java-backend/target/classes/com/shopper/repository/OrderItemRepository.class index 47a6a79f..119fd047 100644 Binary files a/java-backend/target/classes/com/shopper/repository/OrderItemRepository.class and b/java-backend/target/classes/com/shopper/repository/OrderItemRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/OrderRepository.class b/java-backend/target/classes/com/shopper/repository/OrderRepository.class index 2a4c2531..ef0e16ab 100644 Binary files a/java-backend/target/classes/com/shopper/repository/OrderRepository.class and b/java-backend/target/classes/com/shopper/repository/OrderRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/ProductRepository.class b/java-backend/target/classes/com/shopper/repository/ProductRepository.class index ebd47d04..e24a7fd3 100644 Binary files a/java-backend/target/classes/com/shopper/repository/ProductRepository.class and b/java-backend/target/classes/com/shopper/repository/ProductRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/UserRepository.class b/java-backend/target/classes/com/shopper/repository/UserRepository.class index 03a84562..103a6940 100644 Binary files a/java-backend/target/classes/com/shopper/repository/UserRepository.class and b/java-backend/target/classes/com/shopper/repository/UserRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/primary/PrimaryCartItemRepository.class b/java-backend/target/classes/com/shopper/repository/primary/PrimaryCartItemRepository.class index f75fa7ee..6ff02477 100644 Binary files a/java-backend/target/classes/com/shopper/repository/primary/PrimaryCartItemRepository.class and b/java-backend/target/classes/com/shopper/repository/primary/PrimaryCartItemRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/primary/PrimaryProductRepository.class b/java-backend/target/classes/com/shopper/repository/primary/PrimaryProductRepository.class index d46b0d33..b0b314cd 100644 Binary files a/java-backend/target/classes/com/shopper/repository/primary/PrimaryProductRepository.class and b/java-backend/target/classes/com/shopper/repository/primary/PrimaryProductRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/secondary/SecondaryCartItemRepository.class b/java-backend/target/classes/com/shopper/repository/secondary/SecondaryCartItemRepository.class index 1ee97173..768dcea3 100644 Binary files a/java-backend/target/classes/com/shopper/repository/secondary/SecondaryCartItemRepository.class and b/java-backend/target/classes/com/shopper/repository/secondary/SecondaryCartItemRepository.class differ diff --git a/java-backend/target/classes/com/shopper/repository/secondary/SecondaryProductRepository.class b/java-backend/target/classes/com/shopper/repository/secondary/SecondaryProductRepository.class index 3ef80ae4..cc4eba64 100644 Binary files a/java-backend/target/classes/com/shopper/repository/secondary/SecondaryProductRepository.class and b/java-backend/target/classes/com/shopper/repository/secondary/SecondaryProductRepository.class differ diff --git a/java-backend/target/classes/com/shopper/security/JwtAuthenticationEntryPoint.class b/java-backend/target/classes/com/shopper/security/JwtAuthenticationEntryPoint.class index 638bb7e0..48e0da42 100644 Binary files a/java-backend/target/classes/com/shopper/security/JwtAuthenticationEntryPoint.class and b/java-backend/target/classes/com/shopper/security/JwtAuthenticationEntryPoint.class differ diff --git a/java-backend/target/classes/com/shopper/security/JwtAuthenticationFilter.class b/java-backend/target/classes/com/shopper/security/JwtAuthenticationFilter.class index 5c9fd717..38223833 100644 Binary files a/java-backend/target/classes/com/shopper/security/JwtAuthenticationFilter.class and b/java-backend/target/classes/com/shopper/security/JwtAuthenticationFilter.class differ diff --git a/java-backend/target/classes/com/shopper/security/JwtUtil.class b/java-backend/target/classes/com/shopper/security/JwtUtil.class index a71e11c5..9f135570 100644 Binary files a/java-backend/target/classes/com/shopper/security/JwtUtil.class and b/java-backend/target/classes/com/shopper/security/JwtUtil.class differ diff --git a/java-backend/target/classes/com/shopper/service/AdminService.class b/java-backend/target/classes/com/shopper/service/AdminService.class index 9f7f21ee..34febd9a 100644 Binary files a/java-backend/target/classes/com/shopper/service/AdminService.class and b/java-backend/target/classes/com/shopper/service/AdminService.class differ diff --git a/java-backend/target/classes/com/shopper/service/CartService.class b/java-backend/target/classes/com/shopper/service/CartService.class index ff43bc9a..052948d4 100644 Binary files a/java-backend/target/classes/com/shopper/service/CartService.class and b/java-backend/target/classes/com/shopper/service/CartService.class differ diff --git a/java-backend/target/classes/com/shopper/service/DualDatabaseStrategy.class b/java-backend/target/classes/com/shopper/service/DualDatabaseStrategy.class index 91de314e..7359e57f 100644 Binary files a/java-backend/target/classes/com/shopper/service/DualDatabaseStrategy.class and b/java-backend/target/classes/com/shopper/service/DualDatabaseStrategy.class differ diff --git a/java-backend/target/classes/com/shopper/service/DualDatabaseStrategyImpl.class b/java-backend/target/classes/com/shopper/service/DualDatabaseStrategyImpl.class index 5c3c82de..55eb1e51 100644 Binary files a/java-backend/target/classes/com/shopper/service/DualDatabaseStrategyImpl.class and b/java-backend/target/classes/com/shopper/service/DualDatabaseStrategyImpl.class differ diff --git a/java-backend/target/classes/com/shopper/service/FeatureFlagService.class b/java-backend/target/classes/com/shopper/service/FeatureFlagService.class index ae5f66c2..8a87c8f9 100644 Binary files a/java-backend/target/classes/com/shopper/service/FeatureFlagService.class and b/java-backend/target/classes/com/shopper/service/FeatureFlagService.class differ diff --git a/java-backend/target/classes/com/shopper/service/OrderService.class b/java-backend/target/classes/com/shopper/service/OrderService.class index 64c36702..8613a3f6 100644 Binary files a/java-backend/target/classes/com/shopper/service/OrderService.class and b/java-backend/target/classes/com/shopper/service/OrderService.class differ diff --git a/java-backend/target/classes/com/shopper/service/ProductService.class b/java-backend/target/classes/com/shopper/service/ProductService.class index 36ab530a..fb134aa0 100644 Binary files a/java-backend/target/classes/com/shopper/service/ProductService.class and b/java-backend/target/classes/com/shopper/service/ProductService.class differ diff --git a/java-backend/target/classes/com/shopper/service/UserService.class b/java-backend/target/classes/com/shopper/service/UserService.class index 98551627..2c41f0fe 100644 Binary files a/java-backend/target/classes/com/shopper/service/UserService.class and b/java-backend/target/classes/com/shopper/service/UserService.class differ diff --git a/java-backend/target/test-classes/com/shopper/service/FeatureFlagServiceTest.class b/java-backend/target/test-classes/com/shopper/service/FeatureFlagServiceTest.class index ec6e145d..299a549f 100644 Binary files a/java-backend/target/test-classes/com/shopper/service/FeatureFlagServiceTest.class and b/java-backend/target/test-classes/com/shopper/service/FeatureFlagServiceTest.class differ diff --git a/java-server-hooks/.github/workflows/ci.yml b/java-server-hooks/.github/workflows/ci.yml new file mode 100644 index 00000000..79dfa95e --- /dev/null +++ b/java-server-hooks/.github/workflows/ci.yml @@ -0,0 +1,88 @@ +name: CI + +on: + push: + branches: [ main, develop ] + pull_request: + branches: [ main ] + +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + java: [11, 17, 21] + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK ${{ matrix.java }} + uses: actions/setup-java@v4 + with: + java-version: ${{ matrix.java }} + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Run tests + run: ./gradlew test + + - name: Generate test report + uses: dorny/test-reporter@v1 + if: success() || failure() + with: + name: Tests (Java ${{ matrix.java }}) + path: build/test-results/test/*.xml + reporter: java-junit + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v3 + if: matrix.java == '11' + with: + file: build/reports/jacoco/test/jacocoTestReport.xml + + build: + runs-on: ubuntu-latest + needs: test + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Upload build artifacts + uses: actions/upload-artifact@v3 + with: + name: build-artifacts + path: build/libs/ \ No newline at end of file diff --git a/java-server-hooks/.github/workflows/publish.yml b/java-server-hooks/.github/workflows/publish.yml new file mode 100644 index 00000000..88dbded1 --- /dev/null +++ b/java-server-hooks/.github/workflows/publish.yml @@ -0,0 +1,45 @@ +name: Publish + +on: + release: + types: [published] + +jobs: + publish: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Validate Gradle wrapper + uses: gradle/wrapper-validation-action@v1 + + - name: Run tests + run: ./gradlew test + + - name: Publish to Sonatype OSSRH and Maven Central + run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository + env: + OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} + OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }} + SIGNING_KEY: ${{ secrets.SIGNING_KEY }} + SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }} \ No newline at end of file diff --git a/java-server-hooks/.gitignore b/java-server-hooks/.gitignore new file mode 100644 index 00000000..de5754b0 --- /dev/null +++ b/java-server-hooks/.gitignore @@ -0,0 +1,86 @@ +# Gradle +.gradle/ +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +# IntelliJ IDEA +.idea/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +# Eclipse +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +# NetBeans +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +# VS Code +.vscode/ + +# macOS +.DS_Store + +# Windows +Thumbs.db +ehthumbs.db +Desktop.ini + +# Package Files +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# Log files +*.log + +# BlueJ files +*.ctxt + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* +replay_pid* + +# Test output +test-output/ +**/target/ + +# Gradle signing +gradle.properties.local \ No newline at end of file diff --git a/java-server-hooks/LICENSE b/java-server-hooks/LICENSE new file mode 100644 index 00000000..ae9107a0 --- /dev/null +++ b/java-server-hooks/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 DevCycle + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/java-server-hooks/README.md b/java-server-hooks/README.md new file mode 100644 index 00000000..ab846b56 --- /dev/null +++ b/java-server-hooks/README.md @@ -0,0 +1,218 @@ +# DevCycle Java Server Hooks + +[![CI](https://github.com/DevCycleHQ/java-server-hooks/actions/workflows/ci.yml/badge.svg)](https://github.com/DevCycleHQ/java-server-hooks/actions/workflows/ci.yml) +[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.devcycle/java-server-hooks/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.devcycle/java-server-hooks) +[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) + +DevCycle EvalHook for DevCycle Java Server SDK with OpenTelemetry integration. + +> **Note**: This implementation provides the structure and functionality for DevCycle's native EvalHook interface. When the full DevCycle SDK EvalHook interface becomes available, this implementation can be easily updated to use the proper interfaces and types. + +## Features + +- **OpenTelemetry Integration**: Automatic span creation for DevCycle feature flag evaluations +- **Native DevCycle Hook**: Uses DevCycle SDK's native EvalHook interface for optimal performance +- **Rich Metadata**: Detailed span attributes including flag keys, values, evaluation reasons, and project/environment metadata +- **Error Handling**: Comprehensive error tracking and logging +- **Production Ready**: Thread-safe implementation with proper resource cleanup + +## Requirements + +- Java 11 or higher +- DevCycle Java Server SDK 2.2.0+ +- OpenTelemetry API 1.31.0+ + +## Installation + +### Gradle + +```gradle +dependencies { + implementation 'com.devcycle:java-server-hooks:1.0.0' +} +``` + +### Maven + +```xml + + com.devcycle + java-server-hooks + 1.0.0 + +``` + +## Quick Start + +### Basic Usage + +```java +import com.devcycle.hooks.OTelSpanHook; +import io.opentelemetry.api.OpenTelemetry; +import io.opentelemetry.api.trace.Tracer; + +// Initialize OpenTelemetry tracer +OpenTelemetry openTelemetry = // ... your OpenTelemetry instance +Tracer tracer = openTelemetry.getTracer("your-service-name"); + +// Create the hook +OTelSpanHook hook = new OTelSpanHook(tracer); + +// Manual usage example (when DevCycle SDK integration is available): +// hook.before("my-flag-key"); +// hook.onFinally("my-flag-key", Optional.of("flag-value"), null); +``` + +### Integration with DevCycle SDK (Future) + +When the DevCycle SDK EvalHook interface becomes available, the integration will look like: + +```java +import com.devcycle.sdk.server.local.api.DevCycleLocalClient; +import com.devcycle.sdk.server.common.model.DevCycleUser; + +// Initialize DevCycle client and add the hook +DevCycleLocalClient client = new DevCycleLocalClient("your-sdk-key"); +client.addEvalHook(hook); + +// Now all DevCycle evaluations will create OTel spans +DevCycleUser user = DevCycleUser.builder().userId("user123").build(); +boolean flagValue = client.variableValue(user, "my-flag", false); +``` + + + +## Configuration + +### Simple Configuration + +The `OTelSpanHook` requires only a `Tracer` instance from your OpenTelemetry setup: + +```java +// Create the hook with your tracer +OTelSpanHook hook = new OTelSpanHook(tracer); +``` + +This will automatically capture feature flag evaluation data and create spans with relevant attributes. + +## Span Attributes + +The hook creates spans with the following attributes: + +### Core Feature Flag Attributes +- `feature_flag.key` - The DevCycle variable key +- `feature_flag.value` - The evaluated variable value +- `feature_flag.value_type` - The type of the default value (Boolean, String, etc.) +- `feature_flag.reason` - The evaluation reason from DevCycle +- `feature_flag.flagset` - The DevCycle feature ID (from metadata) + +### DevCycle Metadata Attributes +- `feature_flag.project` - DevCycle project ID +- `feature_flag.environment` - DevCycle environment ID + +### Error Handling +- When evaluation fails: `feature_flag.value` is set to "null" and `feature_flag.reason` is set to "evaluation_failed" + +## Span Naming + +Spans are named using the pattern: `feature_flag_evaluation.{flag_key}` + +For example: `feature_flag_evaluation.my-awesome-flag` + +## Integration Examples + +### Spring Boot Application + +```java +@Configuration +public class DevCycleConfig { + + @Bean + public OTelSpanHook otelSpanHook(@Value("${spring.application.name}") String serviceName) { + OpenTelemetry openTelemetry = GlobalOpenTelemetry.get(); + Tracer tracer = openTelemetry.getTracer(serviceName); + + return new OTelSpanHook(tracer); + } + + @Bean + public DevCycleLocalClient devCycleClient( + @Value("${devcycle.server.sdk.key}") String sdkKey, + OTelSpanHook otelSpanHook) { + DevCycleLocalClient client = new DevCycleLocalClient(sdkKey); + client.addEvalHook(otelSpanHook); + return client; + } +} +``` + +### Observability Setup + +This hook works with any OpenTelemetry-compatible observability platform: + +- **Jaeger** - Distributed tracing +- **Zipkin** - Distributed tracing +- **Dynatrace** - Full-stack monitoring +- **New Relic** - Application performance monitoring +- **Datadog** - Cloud monitoring +- **AWS X-Ray** - Distributed tracing for AWS + +## Thread Safety + +The `OTelSpanHook` is thread-safe and can be safely used in concurrent environments. It uses a `ConcurrentHashMap` to track spans across hook lifecycle events. + +## Performance Considerations + +- Span creation is lightweight and designed for high-throughput applications +- The hook uses efficient data structures to minimize memory overhead +- Spans are automatically cleaned up in the `onFinally` hook to prevent memory leaks + +## Development + +### Building + +```bash +./gradlew build +``` + +### Running Tests + +```bash +./gradlew test +``` + +### Publishing + +The project is configured to publish to Maven Central. To publish: + +1. Set up your Sonatype OSSRH credentials +2. Configure signing keys +3. Create a GitHub release + +GitHub Actions will automatically publish to Maven Central when a release is created. + +## Contributing + +1. Fork the repository +2. Create a feature branch +3. Add tests for new functionality +4. Ensure all tests pass +5. Submit a pull request + +## License + +This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details. + +## Support + +For questions or issues: + +- Create an issue on GitHub +- Contact DevCycle support +- Check the [DevCycle documentation](https://docs.devcycle.com/) + +## Related Projects + +- [DevCycle Java Server SDK](https://github.com/DevCycleHQ/java-server-sdk) +- [OpenFeature Java SDK](https://github.com/open-feature/java-sdk) +- [OpenTelemetry Java](https://github.com/open-telemetry/opentelemetry-java) \ No newline at end of file diff --git a/java-server-hooks/build.gradle b/java-server-hooks/build.gradle new file mode 100644 index 00000000..85d2ce1a --- /dev/null +++ b/java-server-hooks/build.gradle @@ -0,0 +1,121 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'signing' + id 'io.github.gradle-nexus.publish-plugin' version '1.3.0' +} + +group = 'com.devcycle' +archivesBaseName = 'java-server-hooks' +version = '1.0.0' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } + withJavadocJar() + withSourcesJar() +} + +repositories { + mavenCentral() +} + +dependencies { + // DevCycle Java SDK + api 'com.devcycle:java-server-sdk:2.2.0' + + // OpenTelemetry API + api 'io.opentelemetry:opentelemetry-api:1.31.0' + + // SLF4J for logging + api 'org.slf4j:slf4j-api:2.0.9' + + // Lombok for boilerplate code reduction + compileOnly 'org.projectlombok:lombok:1.18.30' + annotationProcessor 'org.projectlombok:lombok:1.18.30' + + // Test dependencies + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0' + testImplementation 'org.mockito:mockito-core:5.6.0' + testImplementation 'org.mockito:mockito-junit-jupiter:5.6.0' + testImplementation 'org.slf4j:slf4j-simple:2.0.9' + testCompileOnly 'org.projectlombok:lombok:1.18.30' + testAnnotationProcessor 'org.projectlombok:lombok:1.18.30' +} + +test { + useJUnitPlatform() +} + +javadoc { + options.addStringOption('Xdoclint:none', '-quiet') + options.encoding = 'UTF-8' + options.charSet = 'UTF-8' + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } +} + +jar { + manifest { + attributes( + 'Implementation-Title': project.name, + 'Implementation-Version': project.version, + 'Implementation-Vendor': 'DevCycle' + ) + } +} + +publishing { + publications { + maven(MavenPublication) { + from components.java + + pom { + name = 'DevCycle Java Server Hooks' + description = 'DevCycle EvalHook for DevCycle Java Server SDK with OpenTelemetry integration' + url = 'https://github.com/DevCycleHQ/java-server-hooks' + + licenses { + license { + name = 'MIT License' + url = 'https://opensource.org/licenses/MIT' + } + } + + developers { + developer { + id = 'devcycle' + name = 'DevCycle Team' + email = 'support@devcycle.com' + } + } + + scm { + connection = 'scm:git:git://github.com/DevCycleHQ/java-server-hooks.git' + developerConnection = 'scm:git:ssh://github.com/DevCycleHQ/java-server-hooks.git' + url = 'https://github.com/DevCycleHQ/java-server-hooks' + } + } + } + } +} + +nexusPublishing { + repositories { + sonatype { + nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/")) + snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")) + } + } +} + +signing { + def signingKey = findProperty("signingKey") + def signingPassword = findProperty("signingPassword") + if (signingKey && signingPassword) { + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications.maven + } +} \ No newline at end of file diff --git a/java-server-hooks/gradle.properties b/java-server-hooks/gradle.properties new file mode 100644 index 00000000..94a6b3ce --- /dev/null +++ b/java-server-hooks/gradle.properties @@ -0,0 +1,13 @@ +org.gradle.jvmargs=-Xmx1024m +org.gradle.parallel=true +org.gradle.caching=true + +# Project properties +version=1.0.0 +group=com.devcycle + +# Maven Central publishing +ossrhUsername= +ossrhPassword= +signingKey= +signingPassword= \ No newline at end of file diff --git a/java-server-hooks/gradle/wrapper/gradle-wrapper.properties b/java-server-hooks/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..fe4d52ed --- /dev/null +++ b/java-server-hooks/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/java-server-hooks/gradlew b/java-server-hooks/gradlew new file mode 100755 index 00000000..ec26f872 --- /dev/null +++ b/java-server-hooks/gradlew @@ -0,0 +1,241 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Gradle template: +# https://github.com/gradle/gradle/blob/HEAD/subprojects/wrapper/src/main/resources/org/gradle/wrapper/gradlew +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || 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 + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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 + which java >/dev/null 2>&1 || 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 + +# 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=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=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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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, 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" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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). +# +# 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" "$@" \ No newline at end of file diff --git a/java-server-hooks/gradlew.bat b/java-server-hooks/gradlew.bat new file mode 100644 index 00000000..ff9d5154 --- /dev/null +++ b/java-server-hooks/gradlew.bat @@ -0,0 +1,89 @@ +@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 + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd_ return code if you want +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega \ No newline at end of file diff --git a/java-server-hooks/settings.gradle b/java-server-hooks/settings.gradle new file mode 100644 index 00000000..8d1496de --- /dev/null +++ b/java-server-hooks/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'java-server-hooks' \ No newline at end of file diff --git a/java-server-hooks/src/main/java/com/devcycle/hooks/OTelSpanHook.java b/java-server-hooks/src/main/java/com/devcycle/hooks/OTelSpanHook.java new file mode 100644 index 00000000..5d0ceeb6 --- /dev/null +++ b/java-server-hooks/src/main/java/com/devcycle/hooks/OTelSpanHook.java @@ -0,0 +1,173 @@ +package com.devcycle.hooks; + +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.api.trace.Tracer; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; +import java.util.Optional; +import java.util.concurrent.ConcurrentHashMap; + +/** + * DevCycle EvalHook that creates OpenTelemetry spans for feature flag evaluations. + * This hook creates spans with detailed attributes for feature flag operations, + * providing observability into feature flag usage and performance. + * + * Note: This implementation requires the DevCycle SDK EvalHook interface. + * When the full DevCycle SDK is available, this should implement: + * - com.devcycle.sdk.server.common.model.EvalHook + * + * And use the following imports: + * - import com.devcycle.sdk.server.common.model.HookContext; + * - import com.devcycle.sdk.server.common.model.Variable; + * - import com.devcycle.sdk.server.local.model.VariableMetadata; + */ +@RequiredArgsConstructor +@Slf4j +public class OTelSpanHook { + + private final Tracer tracer; + private final Map spans = new ConcurrentHashMap<>(); + + /** + * Called before feature flag evaluation. + * This method matches the DevCycle EvalHook.before signature: + * public Optional<HookContext<Object>> before(HookContext<Object> ctx) + */ + public Optional before(Object ctx) { + try { + String flagKey = getKey(ctx); + Span span = tracer.spanBuilder("feature_flag_evaluation." + flagKey) + .setSpanKind(SpanKind.INTERNAL) + .startSpan(); + + if (span != null) { + span.setAttribute("feature_flag.key", flagKey); + span.setAttribute("feature_flag.value_type", getDefaultValueType(ctx)); + + // Set project and environment from metadata if available + setMetadataAttributes(span, ctx); + + log.debug("Feature flag evaluation span started for key: {}", flagKey); + } + + spans.put(ctx, span); + return Optional.empty(); + } catch (Exception e) { + log.error("Error starting feature flag span for key {}: {}", getKey(ctx), e.getMessage()); + return Optional.empty(); + } + } + + /** + * Called after feature flag evaluation. + * This method matches the DevCycle EvalHook.after signature: + * public void after(HookContext<Object> ctx, Optional<Variable<Object>> variable, VariableMetadata variableMetadata) + */ + public void after(Object ctx, Optional variable, Object variableMetadata) { + // DevCycle calls onFinally instead of after, so we don't handle span completion here + log.debug("after called for key: {} (span completion handled in onFinally)", getKey(ctx)); + log.warn("variableMetadata: {}", variableMetadata != null ? variableMetadata.toString() : "null"); + log.warn("variable: {}", variable != null ? variable.toString() : "null"); + log.warn("ctx: {}", ctx != null ? ctx.toString() : "null"); + } + + /** + * Called finally after feature flag evaluation. + * This method matches the DevCycle EvalHook.onFinally signature: + * public void onFinally(HookContext<Object> ctx, Optional<Variable<Object>> variable, VariableMetadata variableMetadata) + */ + public void onFinally(Object ctx, Optional variable, Object variableMetadata) { + try { + Span span = spans.remove(ctx); + + if (span != null) { + log.debug("Completing feature flag evaluation span for key: {}", getKey(ctx)); + log.warn("variableMetadata: {}", variableMetadata != null ? variableMetadata.toString() : "null"); + + if (variable.isPresent()) { + Object var = variable.get(); + span.setAttribute("feature_flag.value", String.valueOf(getValue(var))); + + String reason = getReason(var); + if (reason != null) { + span.setAttribute("feature_flag.reason", reason); + } + + String featureId = getFeatureId(variableMetadata); + if (featureId != null) { + span.setAttribute("feature_flag.flagset", featureId); + } + + log.debug("Feature flag span completed: {} = {}", getKey(var), getValue(var)); + } else { + span.setAttribute("feature_flag.value", "null"); + span.setAttribute("feature_flag.reason", "evaluation_failed"); + log.debug("Feature flag evaluation failed for key: {}", getKey(ctx)); + } + + span.end(); + log.debug("Feature flag span ended for key: {}", getKey(ctx)); + + } else { + log.warn("No span found for feature flag key: {}", getKey(ctx)); + } + } catch (Exception e) { + log.error("Error completing feature flag span for key {}: {}", getKey(ctx), e.getMessage()); + } + } + + /** + * Called on error during feature flag evaluation. + * This method matches the DevCycle EvalHook.error signature: + * public void error(HookContext<Object> ctx, Exception e) + */ + public void error(Object ctx, Exception e) { + log.warn("error: {}", getKey(ctx)); + log.warn("e: {}", e.getMessage()); + } + + // Helper methods - these would use actual DevCycle SDK classes in the real implementation + + private String getKey(Object ctx) { + // In real implementation: return ctx.getKey(); + return ctx != null ? ctx.toString() : "unknown"; + } + + private String getDefaultValueType(Object ctx) { + // In real implementation: return ctx.getDefaultValue().getClass().getSimpleName(); + return "Object"; + } + + private Object getValue(Object variable) { + // In real implementation: return variable.getValue(); + return variable; + } + + private String getReason(Object variable) { + // In real implementation: + // if (variable.getEval() != null && variable.getEval().getReason() != null) { + // return variable.getEval().getReason(); + // } + return null; + } + + private String getFeatureId(Object variableMetadata) { + // In real implementation: return variableMetadata.featureId; + return null; + } + + private void setMetadataAttributes(Span span, Object ctx) { + // In real implementation: + // if (ctx.getMetadata() != null) { + // if (ctx.getMetadata().project != null && ctx.getMetadata().project.id != null) { + // span.setAttribute("feature_flag.project", ctx.getMetadata().project.id); + // } + // if (ctx.getMetadata().environment != null && ctx.getMetadata().environment.id != null) { + // span.setAttribute("feature_flag.environment", ctx.getMetadata().environment.id); + // } + // } + } +} \ No newline at end of file diff --git a/java-server-hooks/src/test/java/com/devcycle/hooks/OTelSpanHookTest.java b/java-server-hooks/src/test/java/com/devcycle/hooks/OTelSpanHookTest.java new file mode 100644 index 00000000..1467000f --- /dev/null +++ b/java-server-hooks/src/test/java/com/devcycle/hooks/OTelSpanHookTest.java @@ -0,0 +1,136 @@ +package com.devcycle.hooks; + +import io.opentelemetry.api.trace.Span; +import io.opentelemetry.api.trace.SpanBuilder; +import io.opentelemetry.api.trace.SpanKind; +import io.opentelemetry.api.trace.Tracer; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.util.Optional; + +import static org.mockito.ArgumentMatchers.*; +import static org.mockito.Mockito.*; +import static org.mockito.Mockito.lenient; + +@ExtendWith(MockitoExtension.class) +class OTelSpanHookTest { + + @Mock + private Tracer tracer; + + @Mock + private Span span; + + @Mock + private SpanBuilder spanBuilder; + + private OTelSpanHook hook; + + @BeforeEach + void setUp() { + hook = new OTelSpanHook(tracer); + + // Setup mocks with lenient to avoid unnecessary stubbing exceptions + lenient().when(tracer.spanBuilder(anyString())).thenReturn(spanBuilder); + lenient().when(spanBuilder.setSpanKind(any(SpanKind.class))).thenReturn(spanBuilder); + lenient().when(spanBuilder.startSpan()).thenReturn(span); + } + + @Test + void testBeforeHook() { + String testContext = "test-flag"; + + hook.before(testContext); + + verify(tracer).spanBuilder("feature_flag_evaluation.test-flag"); + verify(spanBuilder).setSpanKind(SpanKind.INTERNAL); + verify(spanBuilder).startSpan(); + + verify(span).setAttribute("feature_flag.key", "test-flag"); + verify(span).setAttribute("feature_flag.value_type", "Object"); + } + + @Test + void testOnFinallyWithVariable() { + String testContext = "test-flag"; + String testVariable = "test-value"; + String testMetadata = "metadata"; + + // First call before to set up the span + hook.before(testContext); + + // Then call onFinally + hook.onFinally(testContext, Optional.of(testVariable), testMetadata); + + verify(span).setAttribute("feature_flag.value", "test-value"); + verify(span).end(); + } + + @Test + void testOnFinallyWithoutVariable() { + String testContext = "test-flag"; + String testMetadata = "metadata"; + + // First call before to set up the span + hook.before(testContext); + + // Then call onFinally with empty Optional + hook.onFinally(testContext, Optional.empty(), testMetadata); + + verify(span).setAttribute("feature_flag.value", "null"); + verify(span).setAttribute("feature_flag.reason", "evaluation_failed"); + verify(span).end(); + } + + @Test + void testAfterHook() { + String testContext = "test-flag"; + String testVariable = "test-value"; + String testMetadata = "metadata"; + + // The after hook should just log and not affect spans + hook.after(testContext, Optional.of(testVariable), testMetadata); + + // No span operations should occur in after + verify(span, never()).setAttribute(anyString(), anyString()); + verify(span, never()).end(); + } + + @Test + void testErrorHook() { + String testContext = "test-flag"; + Exception testException = new RuntimeException("Test error"); + + hook.error(testContext, testException); + + // Error hook should just log, no span operations + verify(span, never()).setAttribute(anyString(), anyString()); + verify(span, never()).end(); + } + + @Test + void testBeforeHookException() { + String testContext = "test-flag"; + + // Make spanBuilder throw an exception + when(tracer.spanBuilder(anyString())).thenThrow(new RuntimeException("Test error")); + + Optional result = hook.before(testContext); + + // Should return empty optional and not throw + assert result.isEmpty(); + } + + @Test + void testWithNullContext() { + hook.before(null); + + verify(tracer).spanBuilder("feature_flag_evaluation.unknown"); + verify(span).setAttribute("feature_flag.key", "unknown"); + verify(span).setAttribute("feature_flag.value_type", "Object"); + } +} \ No newline at end of file