Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ repositories {

dependencies {
implementation("org.springframework.boot:spring-boot-starter")
implementation("org.springframework.boot:spring-boot-starter-actuator")
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-aop")
compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
testImplementation("org.springframework.boot:spring-boot-starter-test")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}
Expand Down
20 changes: 20 additions & 0 deletions src/main/java/org/javaspringcourse/actuator/TimeActuator.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.javaspringcourse.actuator;

import lombok.extern.log4j.Log4j2;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.stereotype.Component;

import java.time.LocalDateTime;

@Log4j2
@Component
@Endpoint(id = "time")
public class TimeActuator {

@ReadOperation
public String time() {
log.info("Current time: {}", LocalDateTime.now());
return LocalDateTime.now().toString();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.javaspringcourse.controller;

import lombok.RequiredArgsConstructor;
import org.javaspringcourse.dto.OrderIn;
import org.javaspringcourse.dto.OrderOut;
import org.javaspringcourse.metric.counter.CounterMetric;
import org.javaspringcourse.metric.timer.TimerMetric;
import org.javaspringcourse.service.ChocolateShopService;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequiredArgsConstructor
public class ChocolateShopController {
private final ChocolateShopService chocolateShopService;

@PostMapping("/order")
@CounterMetric(name = "createOrder")
@TimerMetric(name = "createOrder")
public OrderOut createOrder(@RequestBody OrderIn order) {
return chocolateShopService.createOrder(order);
}
}
6 changes: 6 additions & 0 deletions src/main/java/org/javaspringcourse/dto/OrderIn.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.javaspringcourse.dto;

import org.javaspringcourse.model.Chocolate;

public record OrderIn(Chocolate chocolate, int count) {
}
6 changes: 6 additions & 0 deletions src/main/java/org/javaspringcourse/dto/OrderOut.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.javaspringcourse.dto;

import org.javaspringcourse.model.Chocolate;

public record OrderOut(int orderId, Chocolate chocolate, int count) {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package org.javaspringcourse.metric.counter;

import io.micrometer.core.instrument.MeterRegistry;
import lombok.RequiredArgsConstructor;
import org.aspectj.lang.annotation.After;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.stereotype.Component;

@Aspect
@Component
@RequiredArgsConstructor
public class CounterAspect {
private final MeterRegistry meterRegistry;

@After("@annotation(counter)")
public void counterMetric(CounterMetric counter) {
meterRegistry.counter("shop.api-request.counter.all").increment();
meterRegistry.counter("shop.api-request.counter." + counter.name()).increment();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.javaspringcourse.metric.counter;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface CounterMetric {
String name() default "";
}
27 changes: 27 additions & 0 deletions src/main/java/org/javaspringcourse/metric/timer/TimerAspect.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.javaspringcourse.metric.timer;

import io.micrometer.core.instrument.MeterRegistry;
import lombok.RequiredArgsConstructor;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.stereotype.Component;

@Aspect
@Component
@RequiredArgsConstructor
public class TimerAspect {
private final MeterRegistry meterRegistry;

@Around("@annotation(timer)")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: существует встроенная @Timed аннотация, почитай про нее

public Object timer(ProceedingJoinPoint jp, TimerMetric timer) {
return meterRegistry.timer("shop.api-request.timer." + timer.name()).record(() ->
{
try {
return jp.proceed();
} catch (Throwable e) {
throw new RuntimeException(e);
}
});
}
}
12 changes: 12 additions & 0 deletions src/main/java/org/javaspringcourse/metric/timer/TimerMetric.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.javaspringcourse.metric.timer;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
public @interface TimerMetric {
String name() default "";
}
7 changes: 7 additions & 0 deletions src/main/java/org/javaspringcourse/model/Chocolate.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package org.javaspringcourse.model;

public enum Chocolate {
KitKat,
Snickers,
Twix
}
12 changes: 12 additions & 0 deletions src/main/java/org/javaspringcourse/model/OrderEntity.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package org.javaspringcourse.model;

import lombok.Builder;
import lombok.Data;

@Data
@Builder
public class OrderEntity {
private int orderId;
private Chocolate chocolateType;
private int count;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package org.javaspringcourse.service;

import io.micrometer.core.instrument.MeterRegistry;
import lombok.RequiredArgsConstructor;
import org.javaspringcourse.dto.OrderIn;
import org.javaspringcourse.dto.OrderOut;
import org.javaspringcourse.model.OrderEntity;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;

@Service
@RequiredArgsConstructor
public class ChocolateShopService {
private final List<OrderEntity> orders = new ArrayList<OrderEntity>();
private final MeterRegistry meterRegistry;

public OrderOut createOrder(OrderIn orderIn) {
var order = OrderEntity.builder()
.orderId(orders.size())
.chocolateType(orderIn.chocolate())
.count(orderIn.count())
.build();
orders.add(order);

meterRegistry.counter("shop.order.counter." + orderIn.chocolate()).increment(orderIn.count()); // TODO стоит выделить в ивент

return toDto(order);
}

private OrderOut toDto(OrderEntity order) {
return new OrderOut(order.getOrderId(), order.getChocolateType(), order.getCount());
}
}
1 change: 0 additions & 1 deletion src/main/resources/application.properties

This file was deleted.

5 changes: 5 additions & 0 deletions src/main/resources/application.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
management:
endpoints:
web:
exposure:
include: '*'