Skip to content

Commit b40e13e

Browse files
authored
Merge branch 'dev' into be/dev/fix_front/#205
2 parents fdbb975 + a49dea2 commit b40e13e

File tree

137 files changed

+1758
-1839
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+1758
-1839
lines changed

src/backend/auth-server/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
"mysql2": "^3.12.0",
4040
"reflect-metadata": "^0.2.2",
4141
"rxjs": "^7.8.1",
42-
"typeorm": "^0.3.20",
43-
"prom-client": "^15.1.3"
42+
"typeorm": "^0.3.20"
4443
},
4544
"devDependencies": {
4645
"@eslint/eslintrc": "^3.2.0",

src/backend/auth-server/src/auth/auth.controller.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
UsePipes,
1010
ValidationPipe,
1111
VERSION_NEUTRAL,
12-
Get
1312
} from "@nestjs/common";
1413
import { AuthService } from "./auth.service";
1514
import { Authorization } from "./decorator/authorization.decorator";
@@ -29,13 +28,6 @@ import { ApiBasicAuth, ApiBearerAuth, ApiOperation } from "@nestjs/swagger";
2928
@Controller({ path: "api/auth", version: VERSION_NEUTRAL })
3029
export class AuthController {
3130
constructor(private readonly authService: AuthService) {}
32-
33-
@Get('metrics')
34-
async getMetrics(@Res() res: Response) {
35-
const metrics = await this.authService.getMetrics();
36-
res.setHeader('Content-Type', 'text/plain');
37-
res.send(metrics);
38-
}
3931

4032
@Post("login")
4133
@ApiBasicAuth()

src/backend/auth-server/src/auth/auth.service.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ import {
2222
RAW_TOKEN_TYPE,
2323
} from "./constants/constants";
2424
import { ENV_KEY } from "./constants/env-key.constant";
25-
import * as client from 'prom-client';
2625

2726
@Injectable()
2827
export class AuthService {
2928
private readonly redis: Redis;
30-
private readonly register: client.Registry;
3129

3230
constructor(
3331
private readonly configService: ConfigService,
@@ -37,13 +35,6 @@ export class AuthService {
3735
private readonly userService: ClientProxy,
3836
) {
3937
this.redis = this.redisService.getOrThrow();
40-
this.register = new client.Registry();
41-
this.register.setDefaultLabels({ app: 'nestjs-prometheus' });
42-
client.collectDefaultMetrics({ register: this.register });
43-
}
44-
45-
getMetrics(): Promise<string> {
46-
return this.register.metrics();
4738
}
4839

4940
async login(rawToken: string, device: DeviceType) {

src/backend/chat-server/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ repositories {
1919

2020
dependencies {
2121
implementation 'io.github.dnovitski:logback-awslogs-appender:1.7.2'
22-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
23-
implementation 'io.micrometer:micrometer-registry-prometheus'
2422
implementation 'org.springframework.boot:spring-boot-starter-web'
2523
implementation 'org.springframework.boot:spring-boot-starter-websocket'
2624
implementation 'org.springframework.kafka:spring-kafka'

src/backend/chat-server/src/main/resources/application.properties

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,4 @@ spring.profiles.active=dev
1010
spring.kafka.consumer.group-id=my-group-${server.port}
1111
spring.kafka.producer.key-serializer=org.apache.kafka.common.serialization.StringSerializer
1212
spring.kafka.producer.value-serializer=org.apache.kafka.common.serialization.StringSerializer
13-
spring.kafka.consumer.auto-offset-reset=earliest
14-
15-
# Actuator ????? ?? ??
16-
management.endpoints.web.exposure.include=health,metrics,prometheus
17-
18-
# Prometheus ??? ?? ???
19-
management.prometheus.metrics.export.enabled=true
20-
management.metrics.web.server.request.auto-timeouts=true
21-
22-
# ????? ??? ?? ??? ??? ??
23-
# Actuator ???? ?? (???? 8080)
24-
management.server.port=8080
13+
spring.kafka.consumer.auto-offset-reset=earliest

src/backend/friend-server/friend.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from fastapi import FastAPI, HTTPException, Depends, Header
22
from fastapi.middleware.cors import CORSMiddleware
33
from pydantic import BaseModel
4-
from prometheus_fastapi_instrumentator import Instrumentator
54
import aiomysql
65
import aioredis
76
import json
@@ -20,8 +19,6 @@
2019
allow_headers=["*"],
2120
)
2221

23-
# Prometheus Instrumentator 설정
24-
Instrumentator().instrument(app).expose(app, endpoint="/metrics")
2522

2623
# Kafka 설정
2724
KAFKA_TOPIC = "invitation"

src/backend/friend-server/requirements.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,4 @@ aiomysql==0.2.0
55
aioredis==2.0.1
66
pydantic==2.10.6
77
pydantic_core==2.27.2
8-
cryptography==44.0.0
9-
prometheus-fastapi-instrumentator==7.0.2
8+
cryptography==44.0.0

src/backend/history-server/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,9 @@ repositories {
1818
}
1919

2020
dependencies {
21-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
2221
implementation 'org.springframework.boot:spring-boot-starter-web'
2322
implementation 'org.springframework.boot:spring-boot-starter-websocket'
2423
implementation 'org.springframework.kafka:spring-kafka'
25-
implementation 'io.micrometer:micrometer-registry-prometheus'
2624
implementation 'org.projectlombok:lombok'
2725
implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
2826
testImplementation 'org.springframework.kafka:spring-kafka-test'
-4.78 MB
Binary file not shown.

src/backend/history-server/src/main/resources/application.properties

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,4 @@ spring.data.mongodb.database=chatDB
1515

1616

1717

18-
spring.kafka.consumer.auto-offset-reset=earliest
19-
20-
# Actuator ????? ?? ??
21-
management.endpoints.web.exposure.include=health,metrics,prometheus
22-
23-
# Prometheus ??? ?? ???
24-
management.prometheus.metrics.export.enabled=true
25-
management.metrics.web.server.request.auto-timeouts=true
26-
27-
# ????? ??? ?? ??? ??? ??
28-
# Actuator ???? ?? (???? 8080)
29-
management.server.port=8080
18+
spring.kafka.consumer.auto-offset-reset=earliest

0 commit comments

Comments
 (0)