From f316997f52738294d7c3de7ad77bfcbdfe045751 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 21:53:29 +0800 Subject: [PATCH 01/21] build: event --- manifest-endymx/configmap.yaml | 13 +----- manifest-endymx/deployment-auth-service.yaml | 46 ------------------- ...ice.yaml => deployment-event-service.yaml} | 18 ++++---- .../deployment-favorite-service.yaml | 46 ------------------- manifest-endymx/deployment-feed-service.yaml | 46 ------------------- manifest-endymx/deployment-http-service.yaml | 46 ------------------- .../deployment-message-service.yaml | 46 ------------------- .../deployment-publish-service.yaml | 46 ------------------- .../deployment-relation-service.yaml | 46 ------------------- manifest-endymx/deployment-user-service.yaml | 46 ------------------- .../deployment-video-processor-service.yaml | 46 ------------------- manifest-endymx/sevice-auth-api.yaml | 17 ------- manifest-endymx/sevice-comment-api.yaml | 17 ------- ...avorite-api.yaml => sevice-event-api.yaml} | 6 +-- manifest-endymx/sevice-feed-api.yaml | 17 ------- manifest-endymx/sevice-http-api.yaml | 17 ------- manifest-endymx/sevice-message-api.yaml | 17 ------- manifest-endymx/sevice-publish-api.yaml | 17 ------- manifest-endymx/sevice-relation-api.yaml | 17 ------- manifest-endymx/sevice-user-api.yaml | 17 ------- src/services/msgconsumer/main.go | 6 ++- 21 files changed, 18 insertions(+), 575 deletions(-) delete mode 100644 manifest-endymx/deployment-auth-service.yaml rename manifest-endymx/{deployment-comment-service.yaml => deployment-event-service.yaml} (72%) delete mode 100644 manifest-endymx/deployment-favorite-service.yaml delete mode 100644 manifest-endymx/deployment-feed-service.yaml delete mode 100644 manifest-endymx/deployment-http-service.yaml delete mode 100644 manifest-endymx/deployment-message-service.yaml delete mode 100644 manifest-endymx/deployment-publish-service.yaml delete mode 100644 manifest-endymx/deployment-relation-service.yaml delete mode 100644 manifest-endymx/deployment-user-service.yaml delete mode 100644 manifest-endymx/deployment-video-processor-service.yaml delete mode 100644 manifest-endymx/sevice-auth-api.yaml delete mode 100644 manifest-endymx/sevice-comment-api.yaml rename manifest-endymx/{sevice-favorite-api.yaml => sevice-event-api.yaml} (68%) delete mode 100644 manifest-endymx/sevice-feed-api.yaml delete mode 100644 manifest-endymx/sevice-http-api.yaml delete mode 100644 manifest-endymx/sevice-message-api.yaml delete mode 100644 manifest-endymx/sevice-publish-api.yaml delete mode 100644 manifest-endymx/sevice-relation-api.yaml delete mode 100644 manifest-endymx/sevice-user-api.yaml diff --git a/manifest-endymx/configmap.yaml b/manifest-endymx/configmap.yaml index e1fc6e0..c434f0a 100644 --- a/manifest-endymx/configmap.yaml +++ b/manifest-endymx/configmap.yaml @@ -2,15 +2,4 @@ apiVersion: v1 kind: ConfigMap metadata: name: env-config - namespace: gugotik-service-bundle -data: - DREAM_APP_NAME: "gugotik-service-bundle" - DREAM_UNIT_NAME: "gugotik-service-bundle" - DREAM_APP_VERSION: "${CI_COMMIT_ID}" - DREAM_APP_ROOT: "/data/apps/gugotik-service-bundle" - DREAM_CFG_ACCESS_KEY: '' - DREAM_ENV: "TESTING" - DREAM_REGION_NAME: "endymx" - DREAM_SEC_APP_TOKEN: '' - DREAM_SERVICE_DISCOVERY_URI: 'consul://consul-server.consul.svc.cluster.local:8500' - DREAM_IMAGE_TAG: "${IMAGE_TAG}" \ No newline at end of file + namespace: gugotik-service-bundle \ No newline at end of file diff --git a/manifest-endymx/deployment-auth-service.yaml b/manifest-endymx/deployment-auth-service.yaml deleted file mode 100644 index 7fee81d..0000000 --- a/manifest-endymx/deployment-auth-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-auth-service - name: gugotik-auth-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-auth-service - template: - metadata: - labels: - app: gugotik-auth-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-auth-service - dream-app: gugotik-auth-service - dream-unit: gugotik-auth-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-auth-service - command: - - ./services/AuthService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37001 - containerPort: 37001 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-comment-service.yaml b/manifest-endymx/deployment-event-service.yaml similarity index 72% rename from manifest-endymx/deployment-comment-service.yaml rename to manifest-endymx/deployment-event-service.yaml index d214b1e..afa5ecc 100644 --- a/manifest-endymx/deployment-comment-service.yaml +++ b/manifest-endymx/deployment-event-service.yaml @@ -4,31 +4,31 @@ metadata: annotations: sidecar.jaegertracing.io/inject: 'true' labels: - app: gugotik-comment-service - name: gugotik-comment-service + app: gugotik-event-service + name: gugotik-event-service namespace: gugotik-service-bundle spec: selector: matchLabels: - name: gugotik-comment-service + name: gugotik-event-service template: metadata: labels: - app: gugotik-comment-service + app: gugotik-event-service branch: master version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-comment-service - dream-app: gugotik-comment-service - dream-unit: gugotik-comment-service + name: gugotik-event-service + dream-app: gugotik-event-service + dream-unit: gugotik-event-service spec: imagePullSecrets: - name: reg-cred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent - name: gugotik-comment-service + name: gugotik-event-service command: - - ./services/CommentService + - ./services/event/EventService envFrom: - configMapRef: name: env-config diff --git a/manifest-endymx/deployment-favorite-service.yaml b/manifest-endymx/deployment-favorite-service.yaml deleted file mode 100644 index d5f5eb9..0000000 --- a/manifest-endymx/deployment-favorite-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-favorite-service - name: gugotik-favorite-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-favorite-service - template: - metadata: - labels: - app: gugotik-favorite-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-favorite-service - dream-app: gugotik-favorite-service - dream-unit: gugotik-favorite-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-favorite-service - command: - - ./services/FavoriteService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37006 - containerPort: 37006 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-feed-service.yaml b/manifest-endymx/deployment-feed-service.yaml deleted file mode 100644 index c741c9f..0000000 --- a/manifest-endymx/deployment-feed-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-feed-service - name: gugotik-feed-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-feed-service - template: - metadata: - labels: - app: gugotik-feed-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-feed-service - dream-app: gugotik-feed-service - dream-unit: gugotik-feed-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-feed-service - command: - - ./services/FeedService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37004 - containerPort: 37004 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-http-service.yaml b/manifest-endymx/deployment-http-service.yaml deleted file mode 100644 index 536158f..0000000 --- a/manifest-endymx/deployment-http-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-http-service - name: gugotik-http-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-http-service - template: - metadata: - labels: - app: gugotik-http-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-http-service - dream-app: gugotik-http-service - dream-unit: gugotik-http-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-http-service - command: - - ./gateway/Gateway - envFrom: - - configMapRef: - name: env-config - ports: - - name: http-37000 - containerPort: 37000 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-message-service.yaml b/manifest-endymx/deployment-message-service.yaml deleted file mode 100644 index 526b302..0000000 --- a/manifest-endymx/deployment-message-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-message-service - name: gugotik-message-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-message-service - template: - metadata: - labels: - app: gugotik-message-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-message-service - dream-app: gugotik-message-service - dream-unit: gugotik-message-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-message-service - command: - - ./services/MessageService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37007 - containerPort: 37007 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-publish-service.yaml b/manifest-endymx/deployment-publish-service.yaml deleted file mode 100644 index 77c76bc..0000000 --- a/manifest-endymx/deployment-publish-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-publish-service - name: gugotik-publish-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-publish-service - template: - metadata: - labels: - app: gugotik-publish-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-publish-service - dream-app: gugotik-publish-service - dream-unit: gugotik-publish-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-publish-service - command: - - ./services/PublishService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37005 - containerPort: 37005 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-relation-service.yaml b/manifest-endymx/deployment-relation-service.yaml deleted file mode 100644 index 3f6941b..0000000 --- a/manifest-endymx/deployment-relation-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-relation-service - name: gugotik-relation-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-relation-service - template: - metadata: - labels: - app: gugotik-relation-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-relation-service - dream-app: gugotik-relation-service - dream-unit: gugotik-relation-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-relation-service - command: - - ./services/RelationService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37008 - containerPort: 37008 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-user-service.yaml b/manifest-endymx/deployment-user-service.yaml deleted file mode 100644 index 10287b1..0000000 --- a/manifest-endymx/deployment-user-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-user-service - name: gugotik-user-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-user-service - template: - metadata: - labels: - app: gugotik-user-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-user-service - dream-app: gugotik-user-service - dream-unit: gugotik-user-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-user-service - command: - - ./services/UserService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37001 - containerPort: 37001 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/deployment-video-processor-service.yaml b/manifest-endymx/deployment-video-processor-service.yaml deleted file mode 100644 index e59c603..0000000 --- a/manifest-endymx/deployment-video-processor-service.yaml +++ /dev/null @@ -1,46 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'true' - labels: - app: gugotik-video-service - name: gugotik-video-service - namespace: gugotik-service-bundle -spec: - selector: - matchLabels: - name: gugotik-video-service - template: - metadata: - labels: - app: gugotik-video-service - branch: master - version: ${BUILD_NUMBER}-${CI_COMMIT_ID} - name: gugotik-video-service - dream-app: gugotik-video-service - dream-unit: gugotik-video-service - spec: - imagePullSecrets: - - name: reg-cred - containers: - - image: ${IMAGE} - imagePullPolicy: IfNotPresent - name: gugotik-video-service - command: - - ./services/VideoprocessorService - envFrom: - - configMapRef: - name: env-config - ports: - - name: grpc-37001 - containerPort: 37001 - protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifest-endymx/sevice-auth-api.yaml b/manifest-endymx/sevice-auth-api.yaml deleted file mode 100644 index c9b9e7c..0000000 --- a/manifest-endymx/sevice-auth-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-auth-service - name: gugotik-auth-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37001 - protocol: TCP - targetPort: 37001 - selector: - name: gugotik-auth-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-comment-api.yaml b/manifest-endymx/sevice-comment-api.yaml deleted file mode 100644 index ae046b6..0000000 --- a/manifest-endymx/sevice-comment-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-comment-service - name: gugotik-comment-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37003 - protocol: TCP - targetPort: 37003 - selector: - name: gugotik-comment-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-favorite-api.yaml b/manifest-endymx/sevice-event-api.yaml similarity index 68% rename from manifest-endymx/sevice-favorite-api.yaml rename to manifest-endymx/sevice-event-api.yaml index c14b725..dbdb267 100644 --- a/manifest-endymx/sevice-favorite-api.yaml +++ b/manifest-endymx/sevice-event-api.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Service metadata: labels: - app: gugotik-favorite-service - name: gugotik-favorite-service + app: gugotik-event-service + name: gugotik-event-service namespace: gugotik-service-bundle spec: ports: @@ -12,6 +12,6 @@ spec: protocol: TCP targetPort: 37006 selector: - name: gugotik-favorite-service + name: gugotik-event-service branch: dev type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-feed-api.yaml b/manifest-endymx/sevice-feed-api.yaml deleted file mode 100644 index 3aaeec3..0000000 --- a/manifest-endymx/sevice-feed-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-feed-service - name: gugotik-feed-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37004 - protocol: TCP - targetPort: 37004 - selector: - name: gugotik-feed-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-http-api.yaml b/manifest-endymx/sevice-http-api.yaml deleted file mode 100644 index 6000143..0000000 --- a/manifest-endymx/sevice-http-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-http-service - name: gugotik-http-service - namespace: gugotik-service-bundle -spec: - ports: - - name: http - port: 37000 - protocol: TCP - targetPort: 37000 - selector: - name: gugotik-http-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-message-api.yaml b/manifest-endymx/sevice-message-api.yaml deleted file mode 100644 index 891ee0a..0000000 --- a/manifest-endymx/sevice-message-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-message-service - name: gugotik-message-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37007 - protocol: TCP - targetPort: 37007 - selector: - name: gugotik-message-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-publish-api.yaml b/manifest-endymx/sevice-publish-api.yaml deleted file mode 100644 index eb8f597..0000000 --- a/manifest-endymx/sevice-publish-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-publish-service - name: gugotik-publish-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37005 - protocol: TCP - targetPort: 37005 - selector: - name: gugotik-publish-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-relation-api.yaml b/manifest-endymx/sevice-relation-api.yaml deleted file mode 100644 index 41252f0..0000000 --- a/manifest-endymx/sevice-relation-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-relation-service - name: gugotik-relation-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37008 - protocol: TCP - targetPort: 37008 - selector: - name: gugotik-relation-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/sevice-user-api.yaml b/manifest-endymx/sevice-user-api.yaml deleted file mode 100644 index bf63c00..0000000 --- a/manifest-endymx/sevice-user-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-user-service - name: gugotik-user-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37002 - protocol: TCP - targetPort: 37002 - selector: - name: gugotik-user-service - branch: dev - type: ClusterIP \ No newline at end of file diff --git a/src/services/msgconsumer/main.go b/src/services/msgconsumer/main.go index 1f46d05..dac89f3 100644 --- a/src/services/msgconsumer/main.go +++ b/src/services/msgconsumer/main.go @@ -1,5 +1,9 @@ package main +import "time" + func main() { - select {} + for { + time.Sleep(time.Second * 60) + } } From b37c15259a8aca71d52f87ca327646b67ca741bd Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 21:59:21 +0800 Subject: [PATCH 02/21] build: event --- {manifest-endymx => manifests-endymx}/configmap.yaml | 0 .../deployment-event-service.yaml | 0 {manifest-endymx => manifests-endymx}/sevice-event-api.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {manifest-endymx => manifests-endymx}/configmap.yaml (100%) rename {manifest-endymx => manifests-endymx}/deployment-event-service.yaml (100%) rename {manifest-endymx => manifests-endymx}/sevice-event-api.yaml (100%) diff --git a/manifest-endymx/configmap.yaml b/manifests-endymx/configmap.yaml similarity index 100% rename from manifest-endymx/configmap.yaml rename to manifests-endymx/configmap.yaml diff --git a/manifest-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml similarity index 100% rename from manifest-endymx/deployment-event-service.yaml rename to manifests-endymx/deployment-event-service.yaml diff --git a/manifest-endymx/sevice-event-api.yaml b/manifests-endymx/sevice-event-api.yaml similarity index 100% rename from manifest-endymx/sevice-event-api.yaml rename to manifests-endymx/sevice-event-api.yaml From a417e8b443b9f60a2b267fc9d9e3d1afcacddd0e Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 22:09:10 +0800 Subject: [PATCH 03/21] build: event --- manifests-endymx/deployment-event-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml index afa5ecc..2c285c1 100644 --- a/manifests-endymx/deployment-event-service.yaml +++ b/manifests-endymx/deployment-event-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-event-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent From de47ffd552052fec1584dc2c892381b7caddbc68 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 22:52:47 +0800 Subject: [PATCH 04/21] build: all --- manifests-endymx/deployment-auth-service.yaml | 50 +++++++++++++++++++ .../deployment-comment-service.yaml | 50 +++++++++++++++++++ .../deployment-event-service.yaml | 10 ++-- .../deployment-favorite-service.yaml | 50 +++++++++++++++++++ manifests-endymx/deployment-feed-service.yaml | 50 +++++++++++++++++++ manifests-endymx/deployment-http-service.yaml | 50 +++++++++++++++++++ .../deployment-message-service.yaml | 50 +++++++++++++++++++ .../deployment-publish-service.yaml | 50 +++++++++++++++++++ .../deployment-recommend-service.yaml | 50 +++++++++++++++++++ .../deployment-relation-service.yaml | 50 +++++++++++++++++++ manifests-endymx/deployment-user-service.yaml | 50 +++++++++++++++++++ .../deployment-video-processor-service.yaml | 50 +++++++++++++++++++ manifests-endymx/sevice-auth-api.yaml | 17 +++++++ manifests-endymx/sevice-comment-api.yaml | 17 +++++++ manifests-endymx/sevice-favorite-api.yaml | 17 +++++++ manifests-endymx/sevice-feed-api.yaml | 17 +++++++ manifests-endymx/sevice-http-api.yaml | 17 +++++++ manifests-endymx/sevice-message-api.yaml | 17 +++++++ manifests-endymx/sevice-publish-api.yaml | 17 +++++++ manifests-endymx/sevice-recommend-api.yaml | 17 +++++++ manifests-endymx/sevice-relation-api.yaml | 17 +++++++ manifests-endymx/sevice-user-api.yaml | 17 +++++++ 22 files changed, 727 insertions(+), 3 deletions(-) create mode 100644 manifests-endymx/deployment-auth-service.yaml create mode 100644 manifests-endymx/deployment-comment-service.yaml create mode 100644 manifests-endymx/deployment-favorite-service.yaml create mode 100644 manifests-endymx/deployment-feed-service.yaml create mode 100644 manifests-endymx/deployment-http-service.yaml create mode 100644 manifests-endymx/deployment-message-service.yaml create mode 100644 manifests-endymx/deployment-publish-service.yaml create mode 100644 manifests-endymx/deployment-recommend-service.yaml create mode 100644 manifests-endymx/deployment-relation-service.yaml create mode 100644 manifests-endymx/deployment-user-service.yaml create mode 100644 manifests-endymx/deployment-video-processor-service.yaml create mode 100644 manifests-endymx/sevice-auth-api.yaml create mode 100644 manifests-endymx/sevice-comment-api.yaml create mode 100644 manifests-endymx/sevice-favorite-api.yaml create mode 100644 manifests-endymx/sevice-feed-api.yaml create mode 100644 manifests-endymx/sevice-http-api.yaml create mode 100644 manifests-endymx/sevice-message-api.yaml create mode 100644 manifests-endymx/sevice-publish-api.yaml create mode 100644 manifests-endymx/sevice-recommend-api.yaml create mode 100644 manifests-endymx/sevice-relation-api.yaml create mode 100644 manifests-endymx/sevice-user-api.yaml diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml new file mode 100644 index 0000000..1fe8562 --- /dev/null +++ b/manifests-endymx/deployment-auth-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-auth-service + name: gugotik-auth-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-auth-service + template: + metadata: + labels: + app: gugotik-auth-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-auth-service + dream-app: gugotik-auth-service + dream-unit: gugotik-auth-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-auth-service + command: + - ./services/AuthService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37001 + containerPort: 37001 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-comment-service.yaml b/manifests-endymx/deployment-comment-service.yaml new file mode 100644 index 0000000..4bb47c7 --- /dev/null +++ b/manifests-endymx/deployment-comment-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-comment-service + name: gugotik-comment-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-comment-service + template: + metadata: + labels: + app: gugotik-comment-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-comment-service + dream-app: gugotik-comment-service + dream-unit: gugotik-comment-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-comment-service + command: + - ./services/comment/CommentService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37003 + containerPort: 37003 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml index 2c285c1..55442d7 100644 --- a/manifests-endymx/deployment-event-service.yaml +++ b/manifests-endymx/deployment-event-service.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - sidecar.jaegertracing.io/inject: 'true' + sidecar.jaegertracing.io/inject: 'false' labels: app: gugotik-event-service name: gugotik-event-service @@ -30,8 +30,12 @@ spec: command: - ./services/event/EventService envFrom: - - configMapRef: - name: env-config + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret ports: - name: grpc-37003 containerPort: 37003 diff --git a/manifests-endymx/deployment-favorite-service.yaml b/manifests-endymx/deployment-favorite-service.yaml new file mode 100644 index 0000000..e6b165a --- /dev/null +++ b/manifests-endymx/deployment-favorite-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-favorite-service + name: gugotik-favorite-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-favorite-service + template: + metadata: + labels: + app: gugotik-favorite-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-favorite-service + dream-app: gugotik-favorite-service + dream-unit: gugotik-favorite-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-favorite-service + command: + - ./services/favorite/FavoriteService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37006 + containerPort: 37006 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml new file mode 100644 index 0000000..7ca1193 --- /dev/null +++ b/manifests-endymx/deployment-feed-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-feed-service + name: gugotik-feed-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-feed-service + template: + metadata: + labels: + app: gugotik-feed-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-feed-service + dream-app: gugotik-feed-service + dream-unit: gugotik-feed-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-feed-service + command: + - ./services/feed/FeedService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37004 + containerPort: 37004 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-http-service.yaml b/manifests-endymx/deployment-http-service.yaml new file mode 100644 index 0000000..587e27a --- /dev/null +++ b/manifests-endymx/deployment-http-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-http-service + name: gugotik-http-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-http-service + template: + metadata: + labels: + app: gugotik-http-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-http-service + dream-app: gugotik-http-service + dream-unit: gugotik-http-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-http-service + command: + - ./gateway/Gateway + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: http-37000 + containerPort: 37000 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-message-service.yaml b/manifests-endymx/deployment-message-service.yaml new file mode 100644 index 0000000..0f82650 --- /dev/null +++ b/manifests-endymx/deployment-message-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-message-service + name: gugotik-message-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-message-service + template: + metadata: + labels: + app: gugotik-message-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-message-service + dream-app: gugotik-message-service + dream-unit: gugotik-message-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-message-service + command: + - ./services/message/MessageService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37007 + containerPort: 37007 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml new file mode 100644 index 0000000..ccc6aed --- /dev/null +++ b/manifests-endymx/deployment-publish-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-publish-service + name: gugotik-publish-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-publish-service + template: + metadata: + labels: + app: gugotik-publish-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-publish-service + dream-app: gugotik-publish-service + dream-unit: gugotik-publish-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-publish-service + command: + - ./services/publish/PublishService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37005 + containerPort: 37005 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-recommend-service.yaml b/manifests-endymx/deployment-recommend-service.yaml new file mode 100644 index 0000000..2ab1d4f --- /dev/null +++ b/manifests-endymx/deployment-recommend-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-recommend-service + name: gugotik-recommend-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-recommend-service + template: + metadata: + labels: + app: gugotik-recommend-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-recommend-service + dream-app: gugotik-recommend-service + dream-unit: gugotik-recommend-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-recommend-service + command: + - ./services/recommend/RecommendService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37003 + containerPort: 37003 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-relation-service.yaml b/manifests-endymx/deployment-relation-service.yaml new file mode 100644 index 0000000..647b672 --- /dev/null +++ b/manifests-endymx/deployment-relation-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-relation-service + name: gugotik-relation-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-relation-service + template: + metadata: + labels: + app: gugotik-relation-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-relation-service + dream-app: gugotik-relation-service + dream-unit: gugotik-relation-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-relation-service + command: + - ./services/relation/RelationService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37008 + containerPort: 37008 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-user-service.yaml b/manifests-endymx/deployment-user-service.yaml new file mode 100644 index 0000000..d681d8b --- /dev/null +++ b/manifests-endymx/deployment-user-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-user-service + name: gugotik-user-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-user-service + template: + metadata: + labels: + app: gugotik-user-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-user-service + dream-app: gugotik-user-service + dream-unit: gugotik-user-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-user-service + command: + - ./services/user/UserService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37001 + containerPort: 37001 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml new file mode 100644 index 0000000..0f69b83 --- /dev/null +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-video-service + name: gugotik-video-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-video-service + template: + metadata: + labels: + app: gugotik-video-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-video-service + dream-app: gugotik-video-service + dream-unit: gugotik-video-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-video-service + command: + - ./services/videoprocessor/VideoprocessorService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: grpc-37001 + containerPort: 37001 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/sevice-auth-api.yaml b/manifests-endymx/sevice-auth-api.yaml new file mode 100644 index 0000000..c9b9e7c --- /dev/null +++ b/manifests-endymx/sevice-auth-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-auth-service + name: gugotik-auth-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37001 + protocol: TCP + targetPort: 37001 + selector: + name: gugotik-auth-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-comment-api.yaml b/manifests-endymx/sevice-comment-api.yaml new file mode 100644 index 0000000..ae046b6 --- /dev/null +++ b/manifests-endymx/sevice-comment-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-comment-service + name: gugotik-comment-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37003 + protocol: TCP + targetPort: 37003 + selector: + name: gugotik-comment-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-favorite-api.yaml b/manifests-endymx/sevice-favorite-api.yaml new file mode 100644 index 0000000..c14b725 --- /dev/null +++ b/manifests-endymx/sevice-favorite-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-favorite-service + name: gugotik-favorite-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37006 + protocol: TCP + targetPort: 37006 + selector: + name: gugotik-favorite-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-feed-api.yaml b/manifests-endymx/sevice-feed-api.yaml new file mode 100644 index 0000000..3aaeec3 --- /dev/null +++ b/manifests-endymx/sevice-feed-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-feed-service + name: gugotik-feed-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37004 + protocol: TCP + targetPort: 37004 + selector: + name: gugotik-feed-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-http-api.yaml b/manifests-endymx/sevice-http-api.yaml new file mode 100644 index 0000000..6000143 --- /dev/null +++ b/manifests-endymx/sevice-http-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-http-service + name: gugotik-http-service + namespace: gugotik-service-bundle +spec: + ports: + - name: http + port: 37000 + protocol: TCP + targetPort: 37000 + selector: + name: gugotik-http-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-message-api.yaml b/manifests-endymx/sevice-message-api.yaml new file mode 100644 index 0000000..891ee0a --- /dev/null +++ b/manifests-endymx/sevice-message-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-message-service + name: gugotik-message-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37007 + protocol: TCP + targetPort: 37007 + selector: + name: gugotik-message-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-publish-api.yaml b/manifests-endymx/sevice-publish-api.yaml new file mode 100644 index 0000000..eb8f597 --- /dev/null +++ b/manifests-endymx/sevice-publish-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-publish-service + name: gugotik-publish-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37005 + protocol: TCP + targetPort: 37005 + selector: + name: gugotik-publish-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-recommend-api.yaml b/manifests-endymx/sevice-recommend-api.yaml new file mode 100644 index 0000000..3015b97 --- /dev/null +++ b/manifests-endymx/sevice-recommend-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-recommend-service + name: gugotik-recommend-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37004 + protocol: TCP + targetPort: 37004 + selector: + name: gugotik-recommend-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-relation-api.yaml b/manifests-endymx/sevice-relation-api.yaml new file mode 100644 index 0000000..41252f0 --- /dev/null +++ b/manifests-endymx/sevice-relation-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-relation-service + name: gugotik-relation-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37008 + protocol: TCP + targetPort: 37008 + selector: + name: gugotik-relation-service + branch: dev + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-user-api.yaml b/manifests-endymx/sevice-user-api.yaml new file mode 100644 index 0000000..bf63c00 --- /dev/null +++ b/manifests-endymx/sevice-user-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-user-service + name: gugotik-user-service + namespace: gugotik-service-bundle +spec: + ports: + - name: grpc + port: 37002 + protocol: TCP + targetPort: 37002 + selector: + name: gugotik-user-service + branch: dev + type: ClusterIP \ No newline at end of file From 8d16fca8629a7569376f13298656d723e177dc09 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 23:11:44 +0800 Subject: [PATCH 05/21] build: all --- src/storage/database/gorm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/database/gorm.go b/src/storage/database/gorm.go index 4c2a260..cc6c761 100644 --- a/src/storage/database/gorm.go +++ b/src/storage/database/gorm.go @@ -30,7 +30,7 @@ func init() { PrepareStmt: true, Logger: gormLogrus, NamingStrategy: schema.NamingStrategy{ - TablePrefix: config.EnvCfg.PostgreSQLSchema, + TablePrefix: config.EnvCfg.PostgreSQLSchema + ".", }, }, ); err != nil { From 2afa284cc45da34312374dbbcdb5636e3d951fa1 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 23:35:35 +0800 Subject: [PATCH 06/21] build: all --- manifests-endymx/deployment-auth-service.yaml | 2 +- manifests-endymx/deployment-publish-service.yaml | 7 +++++++ manifests-endymx/deployment-video-processor-service.yaml | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml index 1fe8562..f4af4d1 100644 --- a/manifests-endymx/deployment-auth-service.yaml +++ b/manifests-endymx/deployment-auth-service.yaml @@ -28,7 +28,7 @@ spec: imagePullPolicy: IfNotPresent name: gugotik-auth-service command: - - ./services/AuthService + - ./services/auth/AuthService envFrom: - configMapRef: name: env-config diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml index ccc6aed..44514ff 100644 --- a/manifests-endymx/deployment-publish-service.yaml +++ b/manifests-endymx/deployment-publish-service.yaml @@ -21,6 +21,10 @@ spec: dream-app: gugotik-publish-service dream-unit: gugotik-publish-service spec: + volumes: + - name: volume + persistentVolumeClaim: + claimName: storage imagePullSecrets: - name: reg-cred containers: @@ -47,4 +51,7 @@ spec: requests: cpu: 100m memory: 8Mi + volumeMounts: + - mountPath: /data/apps/gugotik-service-bundle/data + name: volume terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml index 0f69b83..546f316 100644 --- a/manifests-endymx/deployment-video-processor-service.yaml +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -21,6 +21,10 @@ spec: dream-app: gugotik-video-service dream-unit: gugotik-video-service spec: + volumes: + - name: volume + persistentVolumeClaim: + claimName: storage imagePullSecrets: - name: reg-cred containers: @@ -47,4 +51,7 @@ spec: requests: cpu: 100m memory: 8Mi + volumeMounts: + - mountPath: /data/apps/gugotik-service-bundle/data + name: volume terminationGracePeriodSeconds: 30 \ No newline at end of file From c5599e2cd680028c3ffbbf892260d39c7a2f49d9 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Sun, 27 Aug 2023 23:42:51 +0800 Subject: [PATCH 07/21] build: all --- manifests-endymx/deployment-auth-service.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml index f4af4d1..cb9a245 100644 --- a/manifests-endymx/deployment-auth-service.yaml +++ b/manifests-endymx/deployment-auth-service.yaml @@ -30,8 +30,8 @@ spec: command: - ./services/auth/AuthService envFrom: - - configMapRef: - name: env-config + - configMapRef: + name: env-config - configMapRef: name: gugotik-env - secretRef: From 67a2587b2ca413d813ccbec2a7d030cbd9153831 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Mon, 28 Aug 2023 00:02:47 +0800 Subject: [PATCH 08/21] build: all --- manifests-endymx/deployment-feed-service.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml index 7ca1193..1931ec3 100644 --- a/manifests-endymx/deployment-feed-service.yaml +++ b/manifests-endymx/deployment-feed-service.yaml @@ -30,8 +30,8 @@ spec: command: - ./services/feed/FeedService envFrom: - - configMapRef: - name: env-config + - configMapRef: + name: env-config - configMapRef: name: gugotik-env - secretRef: From 8ae73e736234cf2ec81294dccde7293fb1659f85 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Mon, 28 Aug 2023 00:19:17 +0800 Subject: [PATCH 09/21] build: all --- manifests-endymx/sevice-auth-api.yaml | 2 +- manifests-endymx/sevice-comment-api.yaml | 2 +- manifests-endymx/sevice-event-api.yaml | 2 +- manifests-endymx/sevice-favorite-api.yaml | 2 +- manifests-endymx/sevice-feed-api.yaml | 2 +- manifests-endymx/sevice-http-api.yaml | 2 +- manifests-endymx/sevice-message-api.yaml | 2 +- manifests-endymx/sevice-publish-api.yaml | 2 +- manifests-endymx/sevice-recommend-api.yaml | 2 +- manifests-endymx/sevice-relation-api.yaml | 2 +- manifests-endymx/sevice-user-api.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests-endymx/sevice-auth-api.yaml b/manifests-endymx/sevice-auth-api.yaml index c9b9e7c..db2dcf4 100644 --- a/manifests-endymx/sevice-auth-api.yaml +++ b/manifests-endymx/sevice-auth-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37001 selector: name: gugotik-auth-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-comment-api.yaml b/manifests-endymx/sevice-comment-api.yaml index ae046b6..a33b2f1 100644 --- a/manifests-endymx/sevice-comment-api.yaml +++ b/manifests-endymx/sevice-comment-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37003 selector: name: gugotik-comment-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-event-api.yaml b/manifests-endymx/sevice-event-api.yaml index dbdb267..fb3e6af 100644 --- a/manifests-endymx/sevice-event-api.yaml +++ b/manifests-endymx/sevice-event-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37006 selector: name: gugotik-event-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-favorite-api.yaml b/manifests-endymx/sevice-favorite-api.yaml index c14b725..75d2660 100644 --- a/manifests-endymx/sevice-favorite-api.yaml +++ b/manifests-endymx/sevice-favorite-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37006 selector: name: gugotik-favorite-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-feed-api.yaml b/manifests-endymx/sevice-feed-api.yaml index 3aaeec3..689d613 100644 --- a/manifests-endymx/sevice-feed-api.yaml +++ b/manifests-endymx/sevice-feed-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37004 selector: name: gugotik-feed-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-http-api.yaml b/manifests-endymx/sevice-http-api.yaml index 6000143..265af2c 100644 --- a/manifests-endymx/sevice-http-api.yaml +++ b/manifests-endymx/sevice-http-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37000 selector: name: gugotik-http-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-message-api.yaml b/manifests-endymx/sevice-message-api.yaml index 891ee0a..952c969 100644 --- a/manifests-endymx/sevice-message-api.yaml +++ b/manifests-endymx/sevice-message-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37007 selector: name: gugotik-message-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-publish-api.yaml b/manifests-endymx/sevice-publish-api.yaml index eb8f597..604989d 100644 --- a/manifests-endymx/sevice-publish-api.yaml +++ b/manifests-endymx/sevice-publish-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37005 selector: name: gugotik-publish-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-recommend-api.yaml b/manifests-endymx/sevice-recommend-api.yaml index 3015b97..d0f0c7d 100644 --- a/manifests-endymx/sevice-recommend-api.yaml +++ b/manifests-endymx/sevice-recommend-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37004 selector: name: gugotik-recommend-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-relation-api.yaml b/manifests-endymx/sevice-relation-api.yaml index 41252f0..5111017 100644 --- a/manifests-endymx/sevice-relation-api.yaml +++ b/manifests-endymx/sevice-relation-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37008 selector: name: gugotik-relation-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-user-api.yaml b/manifests-endymx/sevice-user-api.yaml index bf63c00..cffe428 100644 --- a/manifests-endymx/sevice-user-api.yaml +++ b/manifests-endymx/sevice-user-api.yaml @@ -13,5 +13,5 @@ spec: targetPort: 37002 selector: name: gugotik-user-service - branch: dev + branch: master type: ClusterIP \ No newline at end of file From 40735bcf2c2d5aed7d09ebe44295635a3977254b Mon Sep 17 00:00:00 2001 From: amazing-compass <53112187+amazing-compass@users.noreply.github.com> Date: Tue, 29 Aug 2023 17:28:42 +0800 Subject: [PATCH 10/21] fix list bug --- src/services/relation/handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/relation/handler.go b/src/services/relation/handler.go index 3adaa99..65f0c19 100644 --- a/src/services/relation/handler.go +++ b/src/services/relation/handler.go @@ -774,7 +774,7 @@ func (r RelationServiceImpl) GetFollowList(ctx context.Context, request *relatio } } - rFollowList, err := r.idList2UserList(ctx, followIdListInt, request.ActorId, logger, span) + rFollowList, err := r.idList2UserList(ctx, followIdListInt, request.UserId, logger, span) if err != nil { resp = &relation.FollowListResponse{ StatusCode: strings.UnableToGetFollowListErrorCode, @@ -853,7 +853,7 @@ func (r RelationServiceImpl) GetFollowerList(ctx context.Context, request *relat } } - rFollowerList, err := r.idList2UserList(ctx, followerIdListInt, request.ActorId, logger, span) + rFollowerList, err := r.idList2UserList(ctx, followerIdListInt, request.UserId, logger, span) if err != nil { resp = &relation.FollowerListResponse{ StatusCode: strings.UnableToGetFollowerListErrorCode, From e6d8de3b913713bc44e999084aa65ce7ff5f7cd8 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 09:56:45 +0800 Subject: [PATCH 11/21] feat: grpc promethus --- docker-compose.yaml | 2 + go.mod | 7 ++- go.sum | 12 +++++ promethus.docker.compose.yml | 30 ++++++++++++ src/constant/config/service.go | 1 + src/services/auth/main.go | 77 ++++++++++++++++++++++++++---- src/services/comment/handler.go | 3 ++ src/services/favorite/handler.go | 3 ++ src/services/feed/handler.go | 3 ++ src/services/user/main.go | 73 ++++++++++++++++++++++++---- src/utils/prom/interceptor.go | 19 ++++++++ src/utils/prom/pack.go | 5 ++ src/web/main.go | 2 +- src/web/middleware/authenticate.go | 7 +-- 14 files changed, 218 insertions(+), 26 deletions(-) create mode 100644 promethus.docker.compose.yml create mode 100644 src/utils/prom/interceptor.go create mode 100644 src/utils/prom/pack.go diff --git a/docker-compose.yaml b/docker-compose.yaml index 56864a6..0893683 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -110,6 +110,8 @@ services: prometheus: container_name: "GuGoTik-Extra-Prometheus" image: bitnami/prometheus:latest + volumes: + - ./promethus.docker.compose.yml:/opt/bitnami/prometheus/conf/prometheus.yml ports: - "9090:9090" gorse-master: diff --git a/go.mod b/go.mod index b613fde..77bb415 100644 --- a/go.mod +++ b/go.mod @@ -9,14 +9,18 @@ require ( github.com/go-redis/redis_rate/v10 v10.0.1 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/google/uuid v1.3.0 + github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0 github.com/hashicorp/consul/api v1.24.0 github.com/joho/godotenv v1.5.1 github.com/juju/ratelimit v1.0.2 github.com/mbobakov/grpc-consul-resolver v1.5.2 + github.com/oklog/run v1.1.0 github.com/patrickmn/go-cache v2.1.0+incompatible + github.com/prometheus/client_golang v1.16.0 github.com/pyroscope-io/client v0.7.2 github.com/redis/go-redis/extra/redisotel/v9 v9.0.5 github.com/redis/go-redis/v9 v9.1.0 + github.com/robfig/cron/v3 v3.0.0 github.com/sashabaranov/go-openai v1.14.2 github.com/sirupsen/logrus v1.9.3 github.com/streadway/amqp v1.1.0 @@ -120,6 +124,7 @@ require ( github.com/gostaticanalysis/comment v1.4.2 // indirect github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect github.com/gostaticanalysis/nilerr v0.1.1 // indirect + github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect @@ -180,7 +185,6 @@ require ( github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/polyfloyd/go-errorlint v1.4.4 // indirect - github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/common v0.44.0 // indirect github.com/prometheus/procfs v0.11.1 // indirect @@ -191,7 +195,6 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/redis/go-redis/extra/rediscmd/v9 v9.0.5 // indirect github.com/rivo/uniseg v0.4.4 // indirect - github.com/robfig/cron/v3 v3.0.0 // indirect github.com/ryancurrah/gomodguard v1.3.0 // indirect github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect diff --git a/go.sum b/go.sum index b804603..5487427 100644 --- a/go.sum +++ b/go.sum @@ -161,6 +161,7 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.10.1 h1:c0g45+xCJhdgFGw7a5QAfdS4byAbud7miNWJ1WwEVf8= github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= @@ -355,6 +356,10 @@ github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3 github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0 h1:mdLirNAJBxnGgyB6pjZLcs6ue/6eZGBui6gXspfq4ks= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.0-rc.0/go.mod h1:kdXbOySqcQeTxiqglW7aahTmWZy3Pgi6SYL36yvKeyA= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 h1:o95KDiV/b1xdkumY5YbLR0/n2+wBxUpgf3HgfKgTyLI= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3/go.mod h1:hTxjzRcX49ogbTGVJ1sM5mz5s+SSgiGIyL3jjPxl32E= github.com/hashicorp/consul/api v1.24.0 h1:u2XyStA2j0jnCiVUU7Qyrt8idjRn4ORhK6DlvZ3bWhA= github.com/hashicorp/consul/api v1.24.0/go.mod h1:NZJGRFYruc/80wYowkPFCp1LbGmJC9L8izrwfyVx/Wg= github.com/hashicorp/consul/sdk v0.14.1 h1:ZiwE2bKb+zro68sWzZ1SgHF3kRMBZ94TwOCFRF4ylPs= @@ -546,6 +551,8 @@ github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nunnatsa/ginkgolinter v0.13.5 h1:fOsPB4CEZOPkyMqF4B9hoqOpooFWU7vWSVkCSscVpgU= github.com/nunnatsa/ginkgolinter v0.13.5/go.mod h1:OBHy4536xtuX3102NM63XRtOyxqZOO02chsaeDWXVO8= +github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= +github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU= @@ -894,6 +901,7 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= +golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -913,6 +921,7 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1155,6 +1164,7 @@ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEY google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200806141610-86f49bd18e98/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1181,8 +1191,10 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/grpc/examples v0.0.0-20210424002626-9572fd6faeae/go.mod h1:Ly7ZA/ARzg8fnPU9TyZIxoz33sEUuWX7txiqs8lPTgE= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/promethus.docker.compose.yml b/promethus.docker.compose.yml new file mode 100644 index 0000000..756e172 --- /dev/null +++ b/promethus.docker.compose.yml @@ -0,0 +1,30 @@ +# my global config +global: + scrape_interval: 15s # Set the scrape interval to every 15 seconds. Default is every 1 minute. + evaluation_interval: 15s # Evaluate rules every 15 seconds. The default is every 1 minute. + # scrape_timeout is set to the global default (10s). + +# Alertmanager configuration +alerting: + alertmanagers: + - static_configs: + - targets: + # - alertmanager:9093 + +# Load rules once and periodically evaluate them according to the global 'evaluation_interval'. +rule_files: +# - "first_rules.yml" +# - "second_rules.yml" + +# A scrape configuration containing exactly one endpoint to scrape: +# Here it's Prometheus itself. +scrape_configs: + # The job name is added as a label `job=` to any timeseries scraped from this config. + - job_name: "prometheus" + # metrics_path defaults to '/metrics' + # scheme defaults to 'http'. + static_configs: + - targets: ["localhost:9090"] + - targets: ["gateway:37000"] + - targets: ["auth:37099"] + - targets: ["user:37099"] \ No newline at end of file diff --git a/src/constant/config/service.go b/src/constant/config/service.go index e42f4fe..4a968d1 100644 --- a/src/constant/config/service.go +++ b/src/constant/config/service.go @@ -30,6 +30,7 @@ const RelationRpcServerPort = ":37008" const RecommendRpcServiceName = "GuGoTik-Recommend" const RecommendRpcServicePort = ":37009" +const Metrics = ":37099" const VideoProcessorRpcServiceName = "GuGoTik-VideoProcessorService" const VideoPicker = "GuGoTik-VideoPicker" diff --git a/src/services/auth/main.go b/src/services/auth/main.go index bf3f887..d416e54 100644 --- a/src/services/auth/main.go +++ b/src/services/auth/main.go @@ -9,11 +9,21 @@ import ( healthImpl "GuGoTik/src/services/health" "GuGoTik/src/utils/consul" "GuGoTik/src/utils/logging" + "GuGoTik/src/utils/prom" "context" + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/oklog/run" + _ "github.com/prometheus/client_golang/prometheus" + _ "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/prometheus/client_golang/prometheus/promhttp" + _ "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "net" + "net/http" + "os" + "syscall" ) func main() { @@ -35,10 +45,6 @@ func main() { // Configure Pyroscope profiling.InitPyroscope("GuGoTik.AuthService") - s := grpc.NewServer( - grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), - ) - log := logging.LogService(config.AuthRpcServerName) lis, err := net.Listen("tcp", config.EnvCfg.PodIpAddr+config.AuthRpcServerPort) @@ -46,16 +52,67 @@ func main() { log.Panicf("Rpc %s listen happens error: %v", config.AuthRpcServerName, err) } + srvMetrics := grpcprom.NewServerMetrics( + grpcprom.WithServerHandlingTimeHistogram( + grpcprom.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}), + ), + ) + + reg := prom.Client + reg.MustRegister(srvMetrics) + + s := grpc.NewServer( + grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), + grpc.ChainUnaryInterceptor(srvMetrics.UnaryServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + grpc.ChainStreamInterceptor(srvMetrics.StreamServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + ) + + if err := consul.RegisterConsul(config.AuthRpcServerName, config.AuthRpcServerPort); err != nil { + log.Panicf("Rpc %s register consul happens error for: %v", config.AuthRpcServerName, err) + } + log.Infof("Rpc %s is running at %s now", config.AuthRpcServerName, config.AuthRpcServerPort) + var srv AuthServiceImpl var probe healthImpl.ProbeImpl auth.RegisterAuthServiceServer(s, srv) health.RegisterHealthServer(s, &probe) - if err := consul.RegisterConsul(config.AuthRpcServerName, config.AuthRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul happens error for: %v", config.AuthRpcServerName, err) - } + srv.New() - log.Infof("Rpc %s is running at %s now", config.AuthRpcServerName, config.AuthRpcServerPort) - if err := s.Serve(lis); err != nil { - log.Panicf("Rpc %s listen happens error for: %v", config.AuthRpcServerName, err) + srvMetrics.InitializeMetrics(s) + + g := &run.Group{} + g.Add(func() error { + return s.Serve(lis) + }, func(err error) { + s.GracefulStop() + s.Stop() + log.Errorf("Rpc %s listen happens error for: %v", config.AuthRpcServerName, err) + }) + + httpSrv := &http.Server{Addr: config.EnvCfg.PodIpAddr + config.Metrics} + g.Add(func() error { + m := http.NewServeMux() + m.Handle("/metrics", promhttp.HandlerFor( + reg, + promhttp.HandlerOpts{ + EnableOpenMetrics: true, + }, + )) + httpSrv.Handler = m + log.Infof("Promethus now running") + return httpSrv.ListenAndServe() + }, func(error) { + if err := httpSrv.Close(); err != nil { + log.Errorf("Prometheus %s listen happens error for: %v", config.AuthRpcServerName, err) + } + }) + + g.Add(run.SignalHandler(context.Background(), syscall.SIGINT, syscall.SIGTERM)) + + if err := g.Run(); err != nil { + log.WithFields(logrus.Fields{ + "err": err, + }).Errorf("Error when runing http server") + os.Exit(1) } } diff --git a/src/services/comment/handler.go b/src/services/comment/handler.go index d8fa5c9..324d122 100644 --- a/src/services/comment/handler.go +++ b/src/services/comment/handler.go @@ -101,6 +101,8 @@ func produceComment(ctx context.Context, event models.RecommendEvent) { return } + headers := rabbitmq.InjectAMQPHeaders(ctx) + err = channel.Publish( strings.EventExchange, strings.VideoCommentEvent, @@ -109,6 +111,7 @@ func produceComment(ctx context.Context, event models.RecommendEvent) { amqp.Publishing{ ContentType: "text/plain", Body: data, + Headers: headers, }) if err != nil { diff --git a/src/services/favorite/handler.go b/src/services/favorite/handler.go index c7e7a6f..3a053f9 100644 --- a/src/services/favorite/handler.go +++ b/src/services/favorite/handler.go @@ -90,6 +90,8 @@ func produceFavorite(ctx context.Context, event models.RecommendEvent) { return } + headers := rabbitmq.InjectAMQPHeaders(ctx) + err = channel.Publish( strings.EventExchange, strings.FavoriteActionEvent, @@ -98,6 +100,7 @@ func produceFavorite(ctx context.Context, event models.RecommendEvent) { amqp.Publishing{ ContentType: "text/plain", Body: data, + Headers: headers, }) if err != nil { diff --git a/src/services/feed/handler.go b/src/services/feed/handler.go index 7fe2b49..cb8eb5d 100644 --- a/src/services/feed/handler.go +++ b/src/services/feed/handler.go @@ -103,6 +103,8 @@ func produceFeed(ctx context.Context, event models.RecommendEvent) { return } + headers := rabbitmq.InjectAMQPHeaders(ctx) + err = channel.Publish( strings.EventExchange, strings.VideoGetEvent, @@ -111,6 +113,7 @@ func produceFeed(ctx context.Context, event models.RecommendEvent) { amqp.Publishing{ ContentType: "text/plain", Body: data, + Headers: headers, }) if err != nil { diff --git a/src/services/user/main.go b/src/services/user/main.go index 113229b..9807506 100644 --- a/src/services/user/main.go +++ b/src/services/user/main.go @@ -11,12 +11,19 @@ import ( "GuGoTik/src/storage/database" "GuGoTik/src/utils/consul" "GuGoTik/src/utils/logging" + "GuGoTik/src/utils/prom" "context" + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/oklog/run" + "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "gorm.io/gorm/clause" "net" + "net/http" + "os" + "syscall" ) func main() { @@ -38,10 +45,6 @@ func main() { // Configure Pyroscope profiling.InitPyroscope("GuGoTik.UserService") - s := grpc.NewServer( - grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), - ) - log := logging.LogService(config.UserRpcServerName) lis, err := net.Listen("tcp", config.EnvCfg.PodIpAddr+config.UserRpcServerPort) @@ -49,18 +52,68 @@ func main() { log.Panicf("Rpc %s listen happens error: %v", config.UserRpcServerName, err) } + srvMetrics := grpcprom.NewServerMetrics( + grpcprom.WithServerHandlingTimeHistogram( + grpcprom.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}), + ), + ) + + reg := prom.Client + reg.MustRegister(srvMetrics) + + s := grpc.NewServer( + grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), + grpc.ChainUnaryInterceptor(srvMetrics.UnaryServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + grpc.ChainStreamInterceptor(srvMetrics.StreamServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + ) + + if err := consul.RegisterConsul(config.UserRpcServerName, config.UserRpcServerPort); err != nil { + log.Panicf("Rpc %s register consul hanpens error for: %v", config.UserRpcServerName, err) + } + log.Infof("Rpc %s is running at %s now", config.UserRpcServerName, config.UserRpcServerPort) + var srv UserServiceImpl var probe healthImpl.ProbeImpl user.RegisterUserServiceServer(s, srv) health.RegisterHealthServer(s, &probe) - if err := consul.RegisterConsul(config.UserRpcServerName, config.UserRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul hanpens error for: %v", config.UserRpcServerName, err) - } srv.New() createMagicUser() - log.Infof("Rpc %s is running at %s now", config.UserRpcServerName, config.UserRpcServerPort) - if err := s.Serve(lis); err != nil { - log.Panicf("Rpc %s listen hanpens error for: %v", config.UserRpcServerName, err) + srvMetrics.InitializeMetrics(s) + + g := &run.Group{} + g.Add(func() error { + return s.Serve(lis) + }, func(err error) { + s.GracefulStop() + s.Stop() + log.Errorf("Rpc %s listen happens error for: %v", config.UserRpcServerName, err) + }) + + httpSrv := &http.Server{Addr: config.EnvCfg.PodIpAddr + config.Metrics} + g.Add(func() error { + m := http.NewServeMux() + m.Handle("/metrics", promhttp.HandlerFor( + reg, + promhttp.HandlerOpts{ + EnableOpenMetrics: true, + }, + )) + httpSrv.Handler = m + log.Infof("Promethus now running") + return httpSrv.ListenAndServe() + }, func(error) { + if err := httpSrv.Close(); err != nil { + log.Errorf("Prometheus %s listen happens error for: %v", config.UserRpcServerName, err) + } + }) + + g.Add(run.SignalHandler(context.Background(), syscall.SIGINT, syscall.SIGTERM)) + + if err := g.Run(); err != nil { + log.WithFields(logrus.Fields{ + "err": err, + }).Errorf("Error when runing http server") + os.Exit(1) } } diff --git a/src/utils/prom/interceptor.go b/src/utils/prom/interceptor.go new file mode 100644 index 0000000..a3268e2 --- /dev/null +++ b/src/utils/prom/interceptor.go @@ -0,0 +1,19 @@ +package prom + +import ( + "GuGoTik/src/constant/config" + "context" + "github.com/prometheus/client_golang/prometheus" + "go.opentelemetry.io/otel/trace" +) + +func ExtractContext(ctx context.Context) prometheus.Labels { + if span := trace.SpanContextFromContext(ctx); span.IsSampled() { + return prometheus.Labels{ + "traceID": span.TraceID().String(), + "spanID": span.SpanID().String(), + "podId": config.EnvCfg.PodIpAddr, + } + } + return nil +} diff --git a/src/utils/prom/pack.go b/src/utils/prom/pack.go new file mode 100644 index 0000000..a49dcbb --- /dev/null +++ b/src/utils/prom/pack.go @@ -0,0 +1,5 @@ +package prom + +import "github.com/prometheus/client_golang/prometheus" + +var Client = prometheus.NewRegistry() diff --git a/src/web/main.go b/src/web/main.go index 1e136fc..d818a38 100644 --- a/src/web/main.go +++ b/src/web/main.go @@ -44,7 +44,7 @@ func main() { g := gin.Default() // Configure Prometheus - p := ginprometheus.NewPrometheus("gin") + p := ginprometheus.NewPrometheus("GuGoTik-WebGateway") p.Use(g) // Configure Gzip g.Use(gzip.Gzip(gzip.DefaultCompression)) diff --git a/src/web/middleware/authenticate.go b/src/web/middleware/authenticate.go index fb714a0..35bbc05 100644 --- a/src/web/middleware/authenticate.go +++ b/src/web/middleware/authenticate.go @@ -18,6 +18,10 @@ var client auth.AuthServiceClient func TokenAuthMiddleware() gin.HandlerFunc { return func(c *gin.Context) { + ctx, span := tracing.Tracer.Start(c.Request.Context(), "AuthMiddleWare") + defer span.End() + span.SetAttributes(attribute.String("podID", config.EnvCfg.PodIpAddr)) + if c.Request.URL.Path == "/douyin/user/login/" || c.Request.URL.Path == "/douyin/user/register/" || c.Request.URL.Path == "/douyin/comment/list/" || @@ -40,9 +44,6 @@ func TokenAuthMiddleware() gin.HandlerFunc { c.Next() return } - - ctx, span := tracing.Tracer.Start(c.Request.Context(), "AuthMiddleWare") - defer span.End() span.SetAttributes(attribute.String("token", token)) logger := logging.LogService("GateWay.AuthMiddleWare").WithContext(ctx) // Verify User Token From 32bfdd19d2b6e76aa79b22b1b2d45c424acc1d57 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Tue, 29 Aug 2023 16:25:18 +0800 Subject: [PATCH 12/21] feat: prod --- src/services/message/handler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/services/message/handler.go b/src/services/message/handler.go index ff6ba64..99f086f 100644 --- a/src/services/message/handler.go +++ b/src/services/message/handler.go @@ -90,8 +90,8 @@ func (c MessageServiceImpl) New() { cronRunner := cron.New(cron.WithSeconds()) - //_, err := cronRunner.AddFunc("0 0 18 * * *", sendMagicMessage) // execute every 18:00 - _, err = cronRunner.AddFunc("@every 2m", sendMagicMessage) // execute every minute [for test] + _, err = cronRunner.AddFunc("0 0 18 * * *", sendMagicMessage) // execute every 18:00 + //_, err = cronRunner.AddFunc("@every 2m", sendMagicMessage) // execute every minute [for test] if err != nil { logging.Logger.WithFields(logrus.Fields{ From 53ad5863afe957bd28e9df15062500adcbdd5653 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 11:04:19 +0800 Subject: [PATCH 13/21] feat: build --- manifests-endymx/deployment-auth-service.yaml | 3 ++ .../deployment-comment-service.yaml | 3 ++ .../deployment-event-service.yaml | 4 +- .../deployment-favorite-service.yaml | 3 ++ manifests-endymx/deployment-feed-service.yaml | 3 ++ .../deployment-message-service.yaml | 3 ++ .../deployment-msg-consumer-service.yaml | 50 +++++++++++++++++++ .../deployment-publish-service.yaml | 3 ++ .../deployment-recommend-service.yaml | 7 ++- .../deployment-relation-service.yaml | 3 ++ manifests-endymx/deployment-user-service.yaml | 7 ++- .../deployment-video-processor-service.yaml | 4 +- manifests-endymx/sevice-auth-api.yaml | 4 ++ manifests-endymx/sevice-comment-api.yaml | 4 ++ manifests-endymx/sevice-event-api.yaml | 6 +-- manifests-endymx/sevice-favorite-api.yaml | 4 ++ manifests-endymx/sevice-feed-api.yaml | 4 ++ manifests-endymx/sevice-message-api.yaml | 4 ++ manifests-endymx/sevice-msg-consumer-api.yaml | 17 +++++++ manifests-endymx/sevice-publish-api.yaml | 4 ++ manifests-endymx/sevice-recommend-api.yaml | 8 ++- manifests-endymx/sevice-relation-api.yaml | 4 ++ manifests-endymx/sevice-user-api.yaml | 4 ++ 23 files changed, 143 insertions(+), 13 deletions(-) create mode 100644 manifests-endymx/deployment-msg-consumer-service.yaml create mode 100644 manifests-endymx/sevice-msg-consumer-api.yaml diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml index cb9a245..022255f 100644 --- a/manifests-endymx/deployment-auth-service.yaml +++ b/manifests-endymx/deployment-auth-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37001 containerPort: 37001 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-comment-service.yaml b/manifests-endymx/deployment-comment-service.yaml index 4bb47c7..0989d96 100644 --- a/manifests-endymx/deployment-comment-service.yaml +++ b/manifests-endymx/deployment-comment-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37003 containerPort: 37003 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml index 55442d7..90e81c8 100644 --- a/manifests-endymx/deployment-event-service.yaml +++ b/manifests-endymx/deployment-event-service.yaml @@ -37,8 +37,8 @@ spec: - secretRef: name: gugotik-secret ports: - - name: grpc-37003 - containerPort: 37003 + - name: metrics-37099 + containerPort: 37099 protocol: TCP resources: limits: diff --git a/manifests-endymx/deployment-favorite-service.yaml b/manifests-endymx/deployment-favorite-service.yaml index e6b165a..9c70ffb 100644 --- a/manifests-endymx/deployment-favorite-service.yaml +++ b/manifests-endymx/deployment-favorite-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37006 containerPort: 37006 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml index 1931ec3..9358a92 100644 --- a/manifests-endymx/deployment-feed-service.yaml +++ b/manifests-endymx/deployment-feed-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37004 containerPort: 37004 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-message-service.yaml b/manifests-endymx/deployment-message-service.yaml index 0f82650..8f63698 100644 --- a/manifests-endymx/deployment-message-service.yaml +++ b/manifests-endymx/deployment-message-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37007 containerPort: 37007 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-msg-consumer-service.yaml b/manifests-endymx/deployment-msg-consumer-service.yaml new file mode 100644 index 0000000..574b058 --- /dev/null +++ b/manifests-endymx/deployment-msg-consumer-service.yaml @@ -0,0 +1,50 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: gugotik-msgconsumer-service + name: gugotik-msgconsumer-service + namespace: gugotik-service-bundle +spec: + selector: + matchLabels: + name: gugotik-msgconsumer-service + template: + metadata: + labels: + app: gugotik-msgconsumer-service + branch: master + version: ${BUILD_NUMBER}-${CI_COMMIT_ID} + name: gugotik-msgconsumer-service + dream-app: gugotik-msgconsumer-service + dream-unit: gugotik-msgconsumer-service + spec: + imagePullSecrets: + - name: reg-cred + containers: + - image: ${IMAGE} + imagePullPolicy: IfNotPresent + name: gugotik-msgconsumer-service + command: + - ./services/msgconsumer/MsgconsumerService + envFrom: + - configMapRef: + name: env-config + - configMapRef: + name: gugotik-env + - secretRef: + name: gugotik-secret + ports: + - name: metrics-37099 + containerPort: 37099 + protocol: TCP + resources: + limits: + cpu: 500m + memory: 256Mi + requests: + cpu: 100m + memory: 8Mi + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml index 44514ff..8d9b211 100644 --- a/manifests-endymx/deployment-publish-service.yaml +++ b/manifests-endymx/deployment-publish-service.yaml @@ -44,6 +44,9 @@ spec: - name: grpc-37005 containerPort: 37005 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-recommend-service.yaml b/manifests-endymx/deployment-recommend-service.yaml index 2ab1d4f..825f5bc 100644 --- a/manifests-endymx/deployment-recommend-service.yaml +++ b/manifests-endymx/deployment-recommend-service.yaml @@ -37,8 +37,11 @@ spec: - secretRef: name: gugotik-secret ports: - - name: grpc-37003 - containerPort: 37003 + - name: grpc-37009 + containerPort: 37009 + protocol: TCP + - name: metrics-37099 + containerPort: 37099 protocol: TCP resources: limits: diff --git a/manifests-endymx/deployment-relation-service.yaml b/manifests-endymx/deployment-relation-service.yaml index 647b672..37dbe55 100644 --- a/manifests-endymx/deployment-relation-service.yaml +++ b/manifests-endymx/deployment-relation-service.yaml @@ -40,6 +40,9 @@ spec: - name: grpc-37008 containerPort: 37008 protocol: TCP + - name: metrics-37099 + containerPort: 37099 + protocol: TCP resources: limits: cpu: 500m diff --git a/manifests-endymx/deployment-user-service.yaml b/manifests-endymx/deployment-user-service.yaml index d681d8b..cea0ba3 100644 --- a/manifests-endymx/deployment-user-service.yaml +++ b/manifests-endymx/deployment-user-service.yaml @@ -37,8 +37,11 @@ spec: - secretRef: name: gugotik-secret ports: - - name: grpc-37001 - containerPort: 37001 + - name: grpc-37002 + containerPort: 37002 + protocol: TCP + - name: metrics-37099 + containerPort: 37099 protocol: TCP resources: limits: diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml index 546f316..503a528 100644 --- a/manifests-endymx/deployment-video-processor-service.yaml +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -41,8 +41,8 @@ spec: - secretRef: name: gugotik-secret ports: - - name: grpc-37001 - containerPort: 37001 + - name: metrics-37099 + containerPort: 37099 protocol: TCP resources: limits: diff --git a/manifests-endymx/sevice-auth-api.yaml b/manifests-endymx/sevice-auth-api.yaml index db2dcf4..c9d4880 100644 --- a/manifests-endymx/sevice-auth-api.yaml +++ b/manifests-endymx/sevice-auth-api.yaml @@ -11,6 +11,10 @@ spec: port: 37001 protocol: TCP targetPort: 37001 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-auth-service branch: master diff --git a/manifests-endymx/sevice-comment-api.yaml b/manifests-endymx/sevice-comment-api.yaml index a33b2f1..63821ab 100644 --- a/manifests-endymx/sevice-comment-api.yaml +++ b/manifests-endymx/sevice-comment-api.yaml @@ -11,6 +11,10 @@ spec: port: 37003 protocol: TCP targetPort: 37003 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-comment-service branch: master diff --git a/manifests-endymx/sevice-event-api.yaml b/manifests-endymx/sevice-event-api.yaml index fb3e6af..ceb6633 100644 --- a/manifests-endymx/sevice-event-api.yaml +++ b/manifests-endymx/sevice-event-api.yaml @@ -7,10 +7,10 @@ metadata: namespace: gugotik-service-bundle spec: ports: - - name: grpc - port: 37006 + - name: metrics + port: 37099 protocol: TCP - targetPort: 37006 + targetPort: 37099 selector: name: gugotik-event-service branch: master diff --git a/manifests-endymx/sevice-favorite-api.yaml b/manifests-endymx/sevice-favorite-api.yaml index 75d2660..d1ef739 100644 --- a/manifests-endymx/sevice-favorite-api.yaml +++ b/manifests-endymx/sevice-favorite-api.yaml @@ -11,6 +11,10 @@ spec: port: 37006 protocol: TCP targetPort: 37006 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-favorite-service branch: master diff --git a/manifests-endymx/sevice-feed-api.yaml b/manifests-endymx/sevice-feed-api.yaml index 689d613..039b407 100644 --- a/manifests-endymx/sevice-feed-api.yaml +++ b/manifests-endymx/sevice-feed-api.yaml @@ -11,6 +11,10 @@ spec: port: 37004 protocol: TCP targetPort: 37004 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-feed-service branch: master diff --git a/manifests-endymx/sevice-message-api.yaml b/manifests-endymx/sevice-message-api.yaml index 952c969..3d4eae9 100644 --- a/manifests-endymx/sevice-message-api.yaml +++ b/manifests-endymx/sevice-message-api.yaml @@ -11,6 +11,10 @@ spec: port: 37007 protocol: TCP targetPort: 37007 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-message-service branch: master diff --git a/manifests-endymx/sevice-msg-consumer-api.yaml b/manifests-endymx/sevice-msg-consumer-api.yaml new file mode 100644 index 0000000..2074e02 --- /dev/null +++ b/manifests-endymx/sevice-msg-consumer-api.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: gugotik-msgconsumer-service + name: gugotik-msgconsumer-service + namespace: gugotik-service-bundle +spec: + ports: + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 + selector: + name: gugotik-msgconsumer-service + branch: master + type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-publish-api.yaml b/manifests-endymx/sevice-publish-api.yaml index 604989d..94761a4 100644 --- a/manifests-endymx/sevice-publish-api.yaml +++ b/manifests-endymx/sevice-publish-api.yaml @@ -11,6 +11,10 @@ spec: port: 37005 protocol: TCP targetPort: 37005 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-publish-service branch: master diff --git a/manifests-endymx/sevice-recommend-api.yaml b/manifests-endymx/sevice-recommend-api.yaml index d0f0c7d..3bd0bcd 100644 --- a/manifests-endymx/sevice-recommend-api.yaml +++ b/manifests-endymx/sevice-recommend-api.yaml @@ -8,9 +8,13 @@ metadata: spec: ports: - name: grpc - port: 37004 + port: 37009 protocol: TCP - targetPort: 37004 + targetPort: 37009 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-recommend-service branch: master diff --git a/manifests-endymx/sevice-relation-api.yaml b/manifests-endymx/sevice-relation-api.yaml index 5111017..3a3f0f2 100644 --- a/manifests-endymx/sevice-relation-api.yaml +++ b/manifests-endymx/sevice-relation-api.yaml @@ -11,6 +11,10 @@ spec: port: 37008 protocol: TCP targetPort: 37008 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-relation-service branch: master diff --git a/manifests-endymx/sevice-user-api.yaml b/manifests-endymx/sevice-user-api.yaml index cffe428..a9dd8a0 100644 --- a/manifests-endymx/sevice-user-api.yaml +++ b/manifests-endymx/sevice-user-api.yaml @@ -11,6 +11,10 @@ spec: port: 37002 protocol: TCP targetPort: 37002 + - name: metrics + port: 37099 + protocol: TCP + targetPort: 37099 selector: name: gugotik-user-service branch: master From 1832373be1653dbbd59a114177dcc6a7a268a89e Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 15:35:15 +0800 Subject: [PATCH 14/21] feat: build --- .gitignore | 1 + docker/basic/readme.md | 7 ++++ docker/clash/Dockerfile | 10 +++++ docker/clash/deployment-clash-service.yaml | 45 ++++++++++++++++++++++ docker/clash/readme.md | 6 +++ docker/clash/sevice-clash.yaml | 20 ++++++++++ manifest-endymx/configmap.yaml | 5 --- src/constant/config/.env.example | 4 +- src/constant/config/env.go | 1 + src/services/comment/moderation.go | 20 +++++++++- src/services/videoprocessor/summary.go | 20 +++++++++- 11 files changed, 131 insertions(+), 8 deletions(-) create mode 100644 docker/basic/readme.md create mode 100644 docker/clash/Dockerfile create mode 100644 docker/clash/deployment-clash-service.yaml create mode 100644 docker/clash/readme.md create mode 100644 docker/clash/sevice-clash.yaml delete mode 100644 manifest-endymx/configmap.yaml diff --git a/.gitignore b/.gitignore index ebba923..48975a3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ output/ log/ .env docker/basic/static +docker/clash/static docker/rabbitmq/static static/ \ No newline at end of file diff --git a/docker/basic/readme.md b/docker/basic/readme.md new file mode 100644 index 0000000..a22c9d9 --- /dev/null +++ b/docker/basic/readme.md @@ -0,0 +1,7 @@ +# 说明 +本镜像为 GuGoTik 提供基础镜像层服务 +# 功能 +- 提供 FFmpeg 环境 +- 将 static 目录下的 font.ttf 作为 GuGoTik 的水印标记 +# 集成 +本镜像推送后，将作为主 Dockerfile 的 prod 基础镜像，如果修改了请同步修改主 Dockerfile \ No newline at end of file diff --git a/docker/clash/Dockerfile b/docker/clash/Dockerfile new file mode 100644 index 0000000..e71e938 --- /dev/null +++ b/docker/clash/Dockerfile @@ -0,0 +1,10 @@ +FROM alpine:3.18.2 + +WORKDIR /clash +COPY ./static/clash /clash +COPY ./static/Country.mmdb /root/.config/clash + + +RUN apk update --no-cache \ + && apk upgrade \ + && rm -rf /var/cache/apk/* \ No newline at end of file diff --git a/docker/clash/deployment-clash-service.yaml b/docker/clash/deployment-clash-service.yaml new file mode 100644 index 0000000..f5035bc --- /dev/null +++ b/docker/clash/deployment-clash-service.yaml @@ -0,0 +1,45 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + sidecar.jaegertracing.io/inject: 'false' + labels: + app: clash + name: clash + namespace: epicmo-clash +spec: + selector: + matchLabels: + name: clash + template: + metadata: + labels: + app: clash + name: clash + spec: + containers: + - image: dreamacro/clash + imagePullPolicy: IfNotPresent + name: clash + command: + - /clash + - '-f' + - '/root/.config/clash/config.yaml' + - '-d' + - '.' + ports: + - name: http-7890 + containerPort: 7890 + protocol: TCP + - name: http-7891 + containerPort: 7891 + protocol: TCP + volumeMounts: + - name: config + mountPath: /root/.config/clash + volumes: + - name: config + configMap: + name: clash-config + defaultMode: 420 + terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/docker/clash/readme.md b/docker/clash/readme.md new file mode 100644 index 0000000..da207d6 --- /dev/null +++ b/docker/clash/readme.md @@ -0,0 +1,6 @@ +# 说明 +本镜像为 GuGoTik 提供透明网络代理功能 +# 功能 +- 提供 OpenAI 访问 +# 集成 +本镜像推送后，将作为 VideoProcess / Comment / MessageConsumer / Message 的透明网络镜像，请自行作为透明网络代理 diff --git a/docker/clash/sevice-clash.yaml b/docker/clash/sevice-clash.yaml new file mode 100644 index 0000000..4dafd1e --- /dev/null +++ b/docker/clash/sevice-clash.yaml @@ -0,0 +1,20 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: clash + name: clash + namespace: epicmo-clash +spec: + ports: + - name: http-proxy + port: 7890 + protocol: TCP + targetPort: 7890 + - name: socket-proxy + port: 7891 + protocol: TCP + targetPort: 7891 + selector: + name: clash + type: ClusterIP \ No newline at end of file diff --git a/manifest-endymx/configmap.yaml b/manifest-endymx/configmap.yaml deleted file mode 100644 index c434f0a..0000000 --- a/manifest-endymx/configmap.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: env-config - namespace: gugotik-service-bundle \ No newline at end of file diff --git a/src/constant/config/.env.example b/src/constant/config/.env.example index 57605b6..ed1eb7d 100644 --- a/src/constant/config/.env.example +++ b/src/constant/config/.env.example @@ -68,4 +68,6 @@ POD_IP= GORSE_ADDR= GORSE_APIKEY= # MagicUserId, please use output value -MAGIC_USER_ID= \ No newline at end of file +MAGIC_USER_ID= +# Configure your clash proxy +CHATGPT_PROXY= \ No newline at end of file diff --git a/src/constant/config/env.go b/src/constant/config/env.go index c9d1d3f..dcfa023 100644 --- a/src/constant/config/env.go +++ b/src/constant/config/env.go @@ -41,6 +41,7 @@ type envConfig struct { GorseAddr string `env:"GORSE_ADDR"` GorseApiKey string `env:"GORSE_APIKEY"` MagicUserId uint32 `env:"MAGIC_USER_ID" envDefault:"1"` + ChatGptProxy string `env:"CHATGPT_PROXY"` } func init() { diff --git a/src/services/comment/moderation.go b/src/services/comment/moderation.go index 84c6d74..9fa1754 100644 --- a/src/services/comment/moderation.go +++ b/src/services/comment/moderation.go @@ -8,11 +8,29 @@ import ( "github.com/sashabaranov/go-openai" "github.com/sirupsen/logrus" "go.opentelemetry.io/otel/trace" + "net/http" + url2 "net/url" "strconv" "strings" ) -var openaiClient = openai.NewClient(config.EnvCfg.ChatGPTAPIKEYS) +var openaiClient *openai.Client + +func init() { + cfg := openai.DefaultConfig(config.EnvCfg.ChatGPTAPIKEYS) + + url, err := url2.Parse(config.EnvCfg.ChatGptProxy) + if err != nil { + panic(err) + } + cfg.HTTPClient = &http.Client{ + Transport: &http.Transport{ + Proxy: http.ProxyURL(url), + }, + } + + openaiClient = openai.NewClientWithConfig(cfg) +} func RateCommentByGPT(commentContent string, logger *logrus.Entry, span trace.Span) (rate uint32, reason string, err error) { logger.WithFields(logrus.Fields{ diff --git a/src/services/videoprocessor/summary.go b/src/services/videoprocessor/summary.go index 2d7cee3..4ff2c1f 100644 --- a/src/services/videoprocessor/summary.go +++ b/src/services/videoprocessor/summary.go @@ -22,6 +22,8 @@ import ( "github.com/streadway/amqp" "go.opentelemetry.io/otel/trace" "gorm.io/gorm/clause" + "net/http" + url2 "net/url" "os/exec" "strings" "sync" @@ -29,13 +31,29 @@ import ( var userClient user.UserServiceClient var commentClient comment.CommentServiceClient -var openaiClient = openai.NewClient(config.EnvCfg.ChatGPTAPIKEYS) +var openaiClient *openai.Client var delayTime = int32(2 * 60 * 1000) //2 minutes var maxRetries = int32(3) var conn *amqp.Connection var channel *amqp.Channel +func init() { + cfg := openai.DefaultConfig(config.EnvCfg.ChatGPTAPIKEYS) + + url, err := url2.Parse(config.EnvCfg.ChatGptProxy) + if err != nil { + panic(err) + } + cfg.HTTPClient = &http.Client{ + Transport: &http.Transport{ + Proxy: http.ProxyURL(url), + }, + } + + openaiClient = openai.NewClientWithConfig(cfg) +} + func ConnectServiceClient() { userRpcConn := grpc2.Connect(config.UserRpcServerName) userClient = user.NewUserServiceClient(userRpcConn) From df3346c0d535351f78cb87ac1022dd9b739b64d3 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 16:08:54 +0800 Subject: [PATCH 15/21] feat: build --- docker/clash/Dockerfile | 6 +-- docker/clash/deployment-clash-service.yaml | 45 ------------------- docker/clash/sevice-clash.yaml | 20 --------- .../deployment-video-processor-service.yaml | 7 --- 4 files changed, 1 insertion(+), 77 deletions(-) delete mode 100644 docker/clash/deployment-clash-service.yaml delete mode 100644 docker/clash/sevice-clash.yaml diff --git a/docker/clash/Dockerfile b/docker/clash/Dockerfile index e71e938..2f77969 100644 --- a/docker/clash/Dockerfile +++ b/docker/clash/Dockerfile @@ -3,8 +3,4 @@ FROM alpine:3.18.2 WORKDIR /clash COPY ./static/clash /clash COPY ./static/Country.mmdb /root/.config/clash - - -RUN apk update --no-cache \ - && apk upgrade \ - && rm -rf /var/cache/apk/* \ No newline at end of file +COPY ./static/config.yaml /root/.config/clash \ No newline at end of file diff --git a/docker/clash/deployment-clash-service.yaml b/docker/clash/deployment-clash-service.yaml deleted file mode 100644 index f5035bc..0000000 --- a/docker/clash/deployment-clash-service.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - sidecar.jaegertracing.io/inject: 'false' - labels: - app: clash - name: clash - namespace: epicmo-clash -spec: - selector: - matchLabels: - name: clash - template: - metadata: - labels: - app: clash - name: clash - spec: - containers: - - image: dreamacro/clash - imagePullPolicy: IfNotPresent - name: clash - command: - - /clash - - '-f' - - '/root/.config/clash/config.yaml' - - '-d' - - '.' - ports: - - name: http-7890 - containerPort: 7890 - protocol: TCP - - name: http-7891 - containerPort: 7891 - protocol: TCP - volumeMounts: - - name: config - mountPath: /root/.config/clash - volumes: - - name: config - configMap: - name: clash-config - defaultMode: 420 - terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/docker/clash/sevice-clash.yaml b/docker/clash/sevice-clash.yaml deleted file mode 100644 index 4dafd1e..0000000 --- a/docker/clash/sevice-clash.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: clash - name: clash - namespace: epicmo-clash -spec: - ports: - - name: http-proxy - port: 7890 - protocol: TCP - targetPort: 7890 - - name: socket-proxy - port: 7891 - protocol: TCP - targetPort: 7891 - selector: - name: clash - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml index 503a528..7435f3d 100644 --- a/manifests-endymx/deployment-video-processor-service.yaml +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -44,13 +44,6 @@ spec: - name: metrics-37099 containerPort: 37099 protocol: TCP - resources: - limits: - cpu: 500m - memory: 256Mi - requests: - cpu: 100m - memory: 8Mi volumeMounts: - mountPath: /data/apps/gugotik-service-bundle/data name: volume From 94ea38b57f074fb8b9097218c857341769b0c616 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 16:27:33 +0800 Subject: [PATCH 16/21] feat: hostname --- manifests-endymx/deployment-auth-service.yaml | 4 ++-- manifests-endymx/deployment-comment-service.yaml | 4 ++-- manifests-endymx/deployment-event-service.yaml | 4 ++-- manifests-endymx/deployment-favorite-service.yaml | 4 ++-- manifests-endymx/deployment-feed-service.yaml | 4 ++-- manifests-endymx/deployment-http-service.yaml | 4 ++-- manifests-endymx/deployment-message-service.yaml | 4 ++-- .../deployment-msg-consumer-service.yaml | 4 ++-- manifests-endymx/deployment-publish-service.yaml | 8 ++++---- manifests-endymx/deployment-recommend-service.yaml | 4 ++-- manifests-endymx/deployment-relation-service.yaml | 4 ++-- manifests-endymx/deployment-user-service.yaml | 4 ++-- .../deployment-video-processor-service.yaml | 7 +++++++ src/services/auth/handler.go | 8 ++++++-- src/services/comment/handler.go | 4 ++++ src/services/event/main.go | 2 +- src/services/favorite/handler.go | 7 +++++++ src/services/feed/handler.go | 7 +++++++ src/services/message/handler.go | 3 +++ src/services/publish/handler.go | 3 +++ src/services/recommend/handler.go | 3 +++ src/services/relation/handler.go | 8 ++++++++ src/services/user/handler.go | 2 ++ src/services/videoprocessor/main.go | 5 ++++- src/services/videoprocessor/summary.go | 4 ++++ src/storage/cached/cache.go | 9 ++++++++- src/storage/file/fs.go | 4 ++++ src/utils/logging/logging.go | 13 ++++++++++++- src/web/about/handler.go | 2 ++ src/web/auth/handler.go | 1 + src/web/comment/handler.go | 1 + src/web/favorite/handler.go | 1 + src/web/feed/handler.go | 1 + src/web/message/handler.go | 1 + src/web/middleware/authenticate.go | 2 +- src/web/publish/handler.go | 1 + src/web/relation/handler.go | 1 + src/web/user/handler.go | 1 + 38 files changed, 120 insertions(+), 33 deletions(-) diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml index 022255f..6c57d7d 100644 --- a/manifests-endymx/deployment-auth-service.yaml +++ b/manifests-endymx/deployment-auth-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-comment-service.yaml b/manifests-endymx/deployment-comment-service.yaml index 0989d96..cc6de01 100644 --- a/manifests-endymx/deployment-comment-service.yaml +++ b/manifests-endymx/deployment-comment-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-event-service.yaml b/manifests-endymx/deployment-event-service.yaml index 90e81c8..3139809 100644 --- a/manifests-endymx/deployment-event-service.yaml +++ b/manifests-endymx/deployment-event-service.yaml @@ -43,8 +43,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-favorite-service.yaml b/manifests-endymx/deployment-favorite-service.yaml index 9c70ffb..0619085 100644 --- a/manifests-endymx/deployment-favorite-service.yaml +++ b/manifests-endymx/deployment-favorite-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml index 9358a92..69c013f 100644 --- a/manifests-endymx/deployment-feed-service.yaml +++ b/manifests-endymx/deployment-feed-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-http-service.yaml b/manifests-endymx/deployment-http-service.yaml index 587e27a..2cb3f50 100644 --- a/manifests-endymx/deployment-http-service.yaml +++ b/manifests-endymx/deployment-http-service.yaml @@ -43,8 +43,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 256Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-message-service.yaml b/manifests-endymx/deployment-message-service.yaml index 8f63698..f3df8ee 100644 --- a/manifests-endymx/deployment-message-service.yaml +++ b/manifests-endymx/deployment-message-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-msg-consumer-service.yaml b/manifests-endymx/deployment-msg-consumer-service.yaml index 574b058..a68176c 100644 --- a/manifests-endymx/deployment-msg-consumer-service.yaml +++ b/manifests-endymx/deployment-msg-consumer-service.yaml @@ -43,8 +43,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml index 8d9b211..e251225 100644 --- a/manifests-endymx/deployment-publish-service.yaml +++ b/manifests-endymx/deployment-publish-service.yaml @@ -49,11 +49,11 @@ spec: protocol: TCP resources: limits: - cpu: 500m - memory: 256Mi + cpu: 1000m + memory: 1Gi requests: - cpu: 100m - memory: 8Mi + cpu: 500m + memory: 512Mi volumeMounts: - mountPath: /data/apps/gugotik-service-bundle/data name: volume diff --git a/manifests-endymx/deployment-recommend-service.yaml b/manifests-endymx/deployment-recommend-service.yaml index 825f5bc..aad2af2 100644 --- a/manifests-endymx/deployment-recommend-service.yaml +++ b/manifests-endymx/deployment-recommend-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-relation-service.yaml b/manifests-endymx/deployment-relation-service.yaml index 37dbe55..a0dd969 100644 --- a/manifests-endymx/deployment-relation-service.yaml +++ b/manifests-endymx/deployment-relation-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 1024Mi requests: cpu: 100m - memory: 8Mi + memory: 512Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-user-service.yaml b/manifests-endymx/deployment-user-service.yaml index cea0ba3..85669b8 100644 --- a/manifests-endymx/deployment-user-service.yaml +++ b/manifests-endymx/deployment-user-service.yaml @@ -46,8 +46,8 @@ spec: resources: limits: cpu: 500m - memory: 256Mi + memory: 512Mi requests: cpu: 100m - memory: 8Mi + memory: 128Mi terminationGracePeriodSeconds: 30 \ No newline at end of file diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml index 7435f3d..b9004d0 100644 --- a/manifests-endymx/deployment-video-processor-service.yaml +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -44,6 +44,13 @@ spec: - name: metrics-37099 containerPort: 37099 protocol: TCP + resources: + limits: + cpu: 4000m + memory: 8Gi + requests: + cpu: 2000m + memory: 4Gi volumeMounts: - mountPath: /data/apps/gugotik-service-bundle/data name: volume diff --git a/src/services/auth/handler.go b/src/services/auth/handler.go index 667d375..fe7c30e 100644 --- a/src/services/auth/handler.go +++ b/src/services/auth/handler.go @@ -51,6 +51,7 @@ func (a AuthServiceImpl) New() { func (a AuthServiceImpl) Authenticate(ctx context.Context, request *auth.AuthenticateRequest) (resp *auth.AuthenticateResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "AuthenticateService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("AuthService.Authenticate").WithContext(ctx) userId, ok, err := hasToken(ctx, request.Token) @@ -98,6 +99,7 @@ func (a AuthServiceImpl) Authenticate(ctx context.Context, request *auth.Authent func (a AuthServiceImpl) Register(ctx context.Context, request *auth.RegisterRequest) (resp *auth.RegisterResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "RegisterService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("AuthService.Register").WithContext(ctx) resp = &auth.RegisterResponse{} @@ -239,6 +241,7 @@ func (a AuthServiceImpl) Register(ctx context.Context, request *auth.RegisterReq func (a AuthServiceImpl) Login(ctx context.Context, request *auth.LoginRequest) (resp *auth.LoginResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "LoginService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("AuthService.Login").WithContext(ctx) logger.WithFields(logrus.Fields{ "username": request.Username, @@ -354,7 +357,7 @@ func (a AuthServiceImpl) Login(ctx context.Context, request *auth.LoginRequest) func hashPassword(ctx context.Context, password string) (string, error) { _, span := tracing.Tracer.Start(ctx, "PasswordHash") defer span.End() - + logging.SetSpanWithHostname(span) bytes, err := bcrypt.GenerateFromPassword([]byte(password), 12) return string(bytes), err } @@ -362,6 +365,7 @@ func hashPassword(ctx context.Context, password string) (string, error) { func checkPasswordHash(ctx context.Context, password, hash string) bool { _, span := tracing.Tracer.Start(ctx, "PasswordHashChecked") defer span.End() + logging.SetSpanWithHostname(span) err := bcrypt.CompareHashAndPassword([]byte(hash), []byte(password)) return err == nil } @@ -422,7 +426,7 @@ func getAvatarByEmail(ctx context.Context, email string) string { func getEmailMD5(ctx context.Context, email string) (md5String string) { _, span := tracing.Tracer.Start(ctx, "Auth-EmailMD5") defer span.End() - + logging.SetSpanWithHostname(span) lowerEmail := stringsLib.ToLower(email) hashed := md5.New() hashed.Write([]byte(lowerEmail)) diff --git a/src/services/comment/handler.go b/src/services/comment/handler.go index 324d122..ed50f7e 100644 --- a/src/services/comment/handler.go +++ b/src/services/comment/handler.go @@ -91,6 +91,7 @@ func CloseMQConn() { func produceComment(ctx context.Context, event models.RecommendEvent) { ctx, span := tracing.Tracer.Start(ctx, "CommentPublisher") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("CommentService.CommentPublisher").WithContext(ctx) data, err := json.Marshal(event) if err != nil { @@ -127,6 +128,7 @@ func produceComment(ctx context.Context, event models.RecommendEvent) { func (c CommentServiceImpl) ActionComment(ctx context.Context, request *comment.ActionCommentRequest) (resp *comment.ActionCommentResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ActionCommentService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("CommentService.ActionComment").WithContext(ctx) logger.WithFields(logrus.Fields{ "user_id": request.ActorId, @@ -234,6 +236,7 @@ func (c CommentServiceImpl) ActionComment(ctx context.Context, request *comment. func (c CommentServiceImpl) ListComment(ctx context.Context, request *comment.ListCommentRequest) (resp *comment.ListCommentResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ListCommentService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("CommentService.ListComment").WithContext(ctx) logger.WithFields(logrus.Fields{ "user_id": request.ActorId, @@ -331,6 +334,7 @@ func (c CommentServiceImpl) ListComment(ctx context.Context, request *comment.Li func (c CommentServiceImpl) CountComment(ctx context.Context, request *comment.CountCommentRequest) (resp *comment.CountCommentResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "CountCommentService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("CommentService.CountComment").WithContext(ctx) logger.WithFields(logrus.Fields{ "user_id": request.ActorId, diff --git a/src/services/event/main.go b/src/services/event/main.go index b6f8638..b047e16 100644 --- a/src/services/event/main.go +++ b/src/services/event/main.go @@ -109,7 +109,7 @@ func Consume(ch *amqp.Channel, queueName string) { ctx := rabbitmq.ExtractAMQPHeaders(context.Background(), d.Headers) ctx, span := tracing.Tracer.Start(ctx, "EventSystem") logger := logging.LogService("EventSystem.Recommend").WithContext(ctx) - + logging.SetSpanWithHostname(span) var raw models.RecommendEvent if err := json.Unmarshal(d.Body, &raw); err != nil { logger.WithFields(logrus.Fields{ diff --git a/src/services/favorite/handler.go b/src/services/favorite/handler.go index 3a053f9..78c7adc 100644 --- a/src/services/favorite/handler.go +++ b/src/services/favorite/handler.go @@ -80,6 +80,7 @@ func CloseMQConn() { func produceFavorite(ctx context.Context, event models.RecommendEvent) { ctx, span := tracing.Tracer.Start(ctx, "FavoriteEventPublisher") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.FavoriteEventPublisher").WithContext(ctx) data, err := json.Marshal(event) if err != nil { @@ -115,6 +116,7 @@ func produceFavorite(ctx context.Context, event models.RecommendEvent) { func (c FavoriteServiceServerImpl) FavoriteAction(ctx context.Context, req *favorite.FavoriteRequest) (resp *favorite.FavoriteResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.FavoriteAction").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -260,6 +262,7 @@ func (c FavoriteServiceServerImpl) FavoriteList(ctx context.Context, req *favori ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.FavoriteList").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -347,6 +350,7 @@ func (c FavoriteServiceServerImpl) FavoriteList(ctx context.Context, req *favori func (c FavoriteServiceServerImpl) IsFavorite(ctx context.Context, req *favorite.IsFavoriteRequest) (resp *favorite.IsFavoriteResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.IsFavorite").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -416,6 +420,7 @@ func (c FavoriteServiceServerImpl) CountFavorite(ctx context.Context, req *favor ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.CountFavorite").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -470,6 +475,7 @@ func (c FavoriteServiceServerImpl) CountUserFavorite(ctx context.Context, req *f ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.CountUserFavorite").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -529,6 +535,7 @@ func (c FavoriteServiceServerImpl) CountUserFavorite(ctx context.Context, req *f func (c FavoriteServiceServerImpl) CountUserTotalFavorited(ctx context.Context, req *favorite.CountUserTotalFavoritedRequest) (resp *favorite.CountUserTotalFavoritedResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "FavoriteServiceServerImpl") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FavoriteService.CountUserTotalFavorited").WithContext(ctx) logger.WithFields(logrus.Fields{ diff --git a/src/services/feed/handler.go b/src/services/feed/handler.go index cb8eb5d..ffbf032 100644 --- a/src/services/feed/handler.go +++ b/src/services/feed/handler.go @@ -93,6 +93,7 @@ func CloseMQConn() { func produceFeed(ctx context.Context, event models.RecommendEvent) { ctx, span := tracing.Tracer.Start(ctx, "FeedPublisher") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.FeedPublisher").WithContext(ctx) data, err := json.Marshal(event) if err != nil { @@ -128,6 +129,7 @@ func produceFeed(ctx context.Context, event models.RecommendEvent) { func (s FeedServiceImpl) ListVideosByRecommend(ctx context.Context, request *feed.ListFeedRequest) (resp *feed.ListFeedResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ListVideosService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.ListVideos").WithContext(ctx) now := time.Now().UnixMilli() @@ -237,6 +239,7 @@ func (s FeedServiceImpl) ListVideosByRecommend(ctx context.Context, request *fee func (s FeedServiceImpl) ListVideos(ctx context.Context, request *feed.ListFeedRequest) (resp *feed.ListFeedResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ListVideosService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.ListVideos").WithContext(ctx) now := time.Now().UnixMilli() @@ -326,6 +329,7 @@ func (s FeedServiceImpl) ListVideos(ctx context.Context, request *feed.ListFeedR func (s FeedServiceImpl) QueryVideos(ctx context.Context, req *feed.QueryVideosRequest) (resp *feed.QueryVideosResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "QueryVideosService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.QueryVideos").WithContext(ctx) rst, err := query(ctx, logger, req.ActorId, req.VideoIds) @@ -353,6 +357,7 @@ func (s FeedServiceImpl) QueryVideos(ctx context.Context, req *feed.QueryVideosR func (s FeedServiceImpl) QueryVideoExisted(ctx context.Context, req *feed.VideoExistRequest) (resp *feed.VideoExistResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "QueryVideoExistedService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.QueryVideoExisted").WithContext(ctx) var video models.Video result := database.Client.WithContext(ctx).Where("id = ?", req.VideoId).First(&video) @@ -392,6 +397,7 @@ func (s FeedServiceImpl) QueryVideoExisted(ctx context.Context, req *feed.VideoE func (s FeedServiceImpl) QueryVideoSummaryAndKeywords(ctx context.Context, req *feed.QueryVideoSummaryAndKeywordsRequest) (resp *feed.QueryVideoSummaryAndKeywordsResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "QueryVideoSummaryAndKeywordsService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FeedService.QueryVideoSummaryAndKeywords").WithContext(ctx) videoExistRes, err := s.QueryVideoExisted(ctx, &feed.VideoExistRequest{ @@ -496,6 +502,7 @@ func findRecommendVideos(ctx context.Context, recommendVideoId []uint32) ([]*mod func queryDetailed(ctx context.Context, logger *logrus.Entry, actorId uint32, videos []*models.Video) (respVideoList []*feed.Video) { ctx, span := tracing.Tracer.Start(ctx, "queryDetailed") defer span.End() + logging.SetSpanWithHostname(span) logger = logging.LogService("ListVideos.queryDetailed").WithContext(ctx) respVideoList = make([]*feed.Video, len(videos)) diff --git a/src/services/message/handler.go b/src/services/message/handler.go index 99f086f..5f0afb3 100644 --- a/src/services/message/handler.go +++ b/src/services/message/handler.go @@ -125,6 +125,7 @@ func chatActionLimitKey(userId uint32) string { func (c MessageServiceImpl) ChatAction(ctx context.Context, request *chat.ActionRequest) (res *chat.ActionResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ChatActionService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("ChatService.ActionMessage").WithContext(ctx) logger.WithFields(logrus.Fields{ @@ -210,6 +211,7 @@ func (c MessageServiceImpl) ChatAction(ctx context.Context, request *chat.Action func (c MessageServiceImpl) Chat(ctx context.Context, request *chat.ChatRequest) (resp *chat.ChatResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ChatService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("ChatService.chat").WithContext(ctx) logger.WithFields(logrus.Fields{ "user_id": request.UserId, @@ -356,6 +358,7 @@ func addMessage(ctx context.Context, fromUserId uint32, toUserId uint32, Context func sendMagicMessage() { ctx, span := tracing.Tracer.Start(context.Background(), "SendMagicMessageService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("ChatService.SendMessageService").WithContext(ctx) logger.Debugf("Start ChatService.SendMessageService at %s", time.Now()) diff --git a/src/services/publish/handler.go b/src/services/publish/handler.go index 20ede42..80c8bbc 100644 --- a/src/services/publish/handler.go +++ b/src/services/publish/handler.go @@ -128,6 +128,7 @@ func (a PublishServiceImpl) New() { func (a PublishServiceImpl) ListVideo(ctx context.Context, req *publish.ListVideoRequest) (resp *publish.ListVideoResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "ListVideoService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("PublishServiceImpl.ListVideo").WithContext(ctx) var videos []models.Video @@ -181,6 +182,7 @@ func (a PublishServiceImpl) ListVideo(ctx context.Context, req *publish.ListVide func (a PublishServiceImpl) CountVideo(ctx context.Context, req *publish.CountVideoRequest) (resp *publish.CountVideoResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "CountVideoService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("PublishServiceImpl.CountVideo").WithContext(ctx) var count int64 @@ -208,6 +210,7 @@ func (a PublishServiceImpl) CountVideo(ctx context.Context, req *publish.CountVi func (a PublishServiceImpl) CreateVideo(ctx context.Context, request *publish.CreateVideoRequest) (resp *publish.CreateVideoResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "CreateVideoService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("PublishService.CreateVideo").WithContext(ctx) logger.WithFields(logrus.Fields{ diff --git a/src/services/recommend/handler.go b/src/services/recommend/handler.go index 8d45edb..8800f46 100644 --- a/src/services/recommend/handler.go +++ b/src/services/recommend/handler.go @@ -28,6 +28,7 @@ var gorseClient *gorse.GorseClient func (a RecommendServiceImpl) GetRecommendInformation(ctx context.Context, request *recommend.RecommendRequest) (resp *recommend.RecommendResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetRecommendService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RecommendService.GetRecommend").WithContext(ctx) var offset int @@ -106,6 +107,7 @@ func (a RecommendServiceImpl) GetRecommendInformation(ctx context.Context, reque func (a RecommendServiceImpl) RegisterRecommendUser(ctx context.Context, request *recommend.RecommendRegisterRequest) (resp *recommend.RecommendRegisterResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "RegisterRecommendService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RecommendService.RegisterRecommend").WithContext(ctx) _, err = gorseClient.InsertUsers(ctx, []gorse.User{ @@ -137,6 +139,7 @@ func (a RecommendServiceImpl) RegisterRecommendUser(ctx context.Context, request func getVideoIds(ctx context.Context, actorId string, num int) (ids []uint32, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetRecommendAutoService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RecommendService.GetRecommendAuto").WithContext(ctx) key := fmt.Sprintf("%s-RecommendAutoService-%s", config.EnvCfg.RedisPrefix, actorId) offset := 0 diff --git a/src/services/relation/handler.go b/src/services/relation/handler.go index 65f0c19..80860dd 100644 --- a/src/services/relation/handler.go +++ b/src/services/relation/handler.go @@ -44,6 +44,7 @@ func (r RelationServiceImpl) New() { func (r RelationServiceImpl) Follow(ctx context.Context, request *relation.RelationActionRequest) (resp *relation.RelationActionResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "FollowService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.Follow").WithContext(ctx) //限流 @@ -199,6 +200,7 @@ func (r RelationServiceImpl) Follow(ctx context.Context, request *relation.Relat func (r RelationServiceImpl) Unfollow(ctx context.Context, request *relation.RelationActionRequest) (resp *relation.RelationActionResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "UnfollowService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.Unfollow").WithContext(ctx) //actor exists @@ -321,6 +323,7 @@ func (r RelationServiceImpl) Unfollow(ctx context.Context, request *relation.Rel func (r RelationServiceImpl) CountFollowList(ctx context.Context, request *relation.CountFollowListRequest) (resp *relation.CountFollowListResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "CountFollowListService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.CountFollowList").WithContext(ctx) //actor exists userExist, err := userClient.GetUserExistInformation(ctx, &user.UserExistRequest{UserId: request.UserId}) @@ -409,6 +412,7 @@ func (r RelationServiceImpl) CountFollowList(ctx context.Context, request *relat func (r RelationServiceImpl) CountFollowerList(ctx context.Context, request *relation.CountFollowerListRequest) (resp *relation.CountFollowerListResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "CountFollowerListService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.CountFollowerList").WithContext(ctx) userExist, err := userClient.GetUserExistInformation(ctx, &user.UserExistRequest{UserId: request.UserId}) @@ -494,6 +498,7 @@ func (r RelationServiceImpl) CountFollowerList(ctx context.Context, request *rel func (r RelationServiceImpl) GetFriendList(ctx context.Context, request *relation.FriendListRequest) (resp *relation.FriendListResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetFriendListService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.GetFriendList").WithContext(ctx) ok, err := isUserExist(ctx, request.ActorId, request.UserId, span, logger) @@ -685,6 +690,7 @@ func (r RelationServiceImpl) IsFollow(ctx context.Context, request *relation.IsF ctx, span := tracing.Tracer.Start(ctx, "isFollowService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.isFollow").WithContext(ctx) var count int64 @@ -720,6 +726,7 @@ func (r RelationServiceImpl) IsFollow(ctx context.Context, request *relation.IsF func (r RelationServiceImpl) GetFollowList(ctx context.Context, request *relation.FollowListRequest) (resp *relation.FollowListResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetFollowListService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.GetFollowList").WithContext(ctx) ok, err := isUserExist(ctx, request.ActorId, request.UserId, span, logger) @@ -799,6 +806,7 @@ func (r RelationServiceImpl) GetFollowList(ctx context.Context, request *relatio func (r RelationServiceImpl) GetFollowerList(ctx context.Context, request *relation.FollowerListRequest) (resp *relation.FollowerListResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetFollowerListService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("RelationService.GetFollowerList").WithContext(ctx) ok, err := isUserExist(ctx, request.ActorId, request.UserId, span, logger) diff --git a/src/services/user/handler.go b/src/services/user/handler.go index 7abd99f..8788c14 100644 --- a/src/services/user/handler.go +++ b/src/services/user/handler.go @@ -42,6 +42,7 @@ func (a UserServiceImpl) New() { func (a UserServiceImpl) GetUserInfo(ctx context.Context, request *user.UserRequest) (resp *user.UserResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetUserInfo") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("UserService.GetUserInfo").WithContext(ctx) var userModel models.User @@ -269,6 +270,7 @@ func (a UserServiceImpl) GetUserInfo(ctx context.Context, request *user.UserRequ func (a UserServiceImpl) GetUserExistInformation(ctx context.Context, request *user.UserExistRequest) (resp *user.UserExistResponse, err error) { ctx, span := tracing.Tracer.Start(ctx, "GetUserExisted") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("UserService.GetUserExisted").WithContext(ctx) var userModel models.User diff --git a/src/services/videoprocessor/main.go b/src/services/videoprocessor/main.go index 5ecfa0a..87b6115 100644 --- a/src/services/videoprocessor/main.go +++ b/src/services/videoprocessor/main.go @@ -148,7 +148,7 @@ func Consume(channel *amqp.Channel) { ctx := rabbitmq.ExtractAMQPHeaders(context.Background(), d.Headers) ctx, span := tracing.Tracer.Start(ctx, "VideoPickerService") logger := logging.LogService("VideoPicker.Picker").WithContext(ctx) - + logging.SetSpanWithHostname(span) var raw models.RawVideo if err := json.Unmarshal(d.Body, &raw); err != nil { logger.WithFields(logrus.Fields{ @@ -228,6 +228,7 @@ func Consume(channel *amqp.Channel) { func extractVideoCover(ctx context.Context, video *models.RawVideo) error { ctx, span := tracing.Tracer.Start(ctx, "ExtractVideoCoverService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoPicker.Picker").WithContext(ctx) logger.Debug("Extracting video cover...") RawFileName := video.FileName @@ -264,6 +265,7 @@ func extractVideoCover(ctx context.Context, video *models.RawVideo) error { func textWatermark(ctx context.Context, video *models.RawVideo) (string, error) { ctx, span := tracing.Tracer.Start(ctx, "NicknameWatermarkService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoPicker.Picker").WithContext(ctx) // 加载字体文件 fontName := filepath.Join("static", "font.ttf") @@ -365,6 +367,7 @@ func textWatermark(ctx context.Context, video *models.RawVideo) (string, error) func addWatermarkToVideo(ctx context.Context, video *models.RawVideo, WatermarkPNGName string) error { ctx, span := tracing.Tracer.Start(ctx, "AddWatermarkToVideoService") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoPicker.Picker").WithContext(ctx) logger.Debug("Adding watermark to video...") RawFileName := video.FileName diff --git a/src/services/videoprocessor/summary.go b/src/services/videoprocessor/summary.go index 4ff2c1f..de3b499 100644 --- a/src/services/videoprocessor/summary.go +++ b/src/services/videoprocessor/summary.go @@ -442,6 +442,7 @@ func SummaryConsume(channel *amqp.Channel) { func video2Audio(ctx context.Context, videoFileName string) (audioFileName string, err error) { ctx, span := tracing.Tracer.Start(ctx, "Video2Audio") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoSummary.Video2Audio").WithContext(ctx) logger.WithFields(logrus.Fields{ "video_file_name": videoFileName, @@ -481,6 +482,7 @@ func video2Audio(ctx context.Context, videoFileName string) (audioFileName strin func speech2Text(ctx context.Context, audioFileName string) (transcript string, err error) { ctx, span := tracing.Tracer.Start(ctx, "Speech2Text") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoSummary.Speech2Text").WithContext(ctx) logger.WithFields(logrus.Fields{ "AudioFileName": audioFileName, @@ -513,6 +515,7 @@ func speech2Text(ctx context.Context, audioFileName string) (transcript string, func text2Summary(ctx context.Context, transcript string, summaryChannel *chan string, errChannel *chan error) { ctx, span := tracing.Tracer.Start(ctx, "Text2Summary") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoSummary.Text2Summary").WithContext(ctx) logger.WithFields(logrus.Fields{ "transcript": transcript, @@ -554,6 +557,7 @@ func text2Summary(ctx context.Context, transcript string, summaryChannel *chan s func text2Keywords(ctx context.Context, transcript string, keywordsChannel *chan string, errChannel *chan error) { ctx, span := tracing.Tracer.Start(ctx, "Text2Keywords") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("VideoSummary.Text2Keywords").WithContext(ctx) logger.WithFields(logrus.Fields{ "transcript": transcript, diff --git a/src/storage/cached/cache.go b/src/storage/cached/cache.go index 53e34b4..6005f65 100644 --- a/src/storage/cached/cache.go +++ b/src/storage/cached/cache.go @@ -33,6 +33,7 @@ type cachedItem interface { func ScanGet(ctx context.Context, key string, obj interface{}) (bool, error) { ctx, span := tracing.Tracer.Start(ctx, "Cached-GetFromScanCache") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("Cached.GetFromScanCache").WithContext(ctx) key = config.EnvCfg.RedisPrefix + key @@ -100,6 +101,7 @@ func ScanGet(ctx context.Context, key string, obj interface{}) (bool, error) { func ScanTagDelete(ctx context.Context, key string, obj interface{}) { ctx, span := tracing.Tracer.Start(ctx, "Cached-ScanTagDelete") defer span.End() + logging.SetSpanWithHostname(span) key = config.EnvCfg.RedisPrefix + key redis.Client.HDel(ctx, key) @@ -114,6 +116,7 @@ func ScanTagDelete(ctx context.Context, key string, obj interface{}) { func ScanWriteCache(ctx context.Context, key string, obj interface{}, state bool) (err error) { ctx, span := tracing.Tracer.Start(ctx, "Cached-ScanWriteCache") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("Cached.ScanWriteCache").WithContext(ctx) key = config.EnvCfg.RedisPrefix + key @@ -140,6 +143,7 @@ func ScanWriteCache(ctx context.Context, key string, obj interface{}, state bool func Get(ctx context.Context, key string) (string, bool, error) { ctx, span := tracing.Tracer.Start(ctx, "Cached-GetFromStringCache") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("Cached.GetFromStringCache").WithContext(ctx) key = config.EnvCfg.RedisPrefix + key @@ -184,7 +188,7 @@ func Get(ctx context.Context, key string) (string, bool, error) { func GetWithFunc(ctx context.Context, key string, f func(ctx context.Context, key string) (string, error)) (string, error) { ctx, span := tracing.Tracer.Start(ctx, "Cached-GetFromStringCacheWithFunc") defer span.End() - + logging.SetSpanWithHostname(span) value, ok, err := Get(ctx, key) if err != nil { @@ -210,6 +214,7 @@ func GetWithFunc(ctx context.Context, key string, f func(ctx context.Context, ke func Write(ctx context.Context, key string, value string, state bool) { ctx, span := tracing.Tracer.Start(ctx, "Cached-SetStringCache") defer span.End() + logging.SetSpanWithHostname(span) key = config.EnvCfg.RedisPrefix + key c := getOrCreateCache("strings") @@ -224,6 +229,7 @@ func Write(ctx context.Context, key string, value string, state bool) { func TagDelete(ctx context.Context, key string) { ctx, span := tracing.Tracer.Start(ctx, "Cached-DeleteStringCache") defer span.End() + logging.SetSpanWithHostname(span) key = config.EnvCfg.RedisPrefix + key c := getOrCreateCache("strings") @@ -252,6 +258,7 @@ func getOrCreateCache(name string) *cache.Cache { func CacheAndRedisGet(ctx context.Context, key string, obj interface{}) (bool, error) { ctx, span := tracing.Tracer.Start(ctx, "CacheAndRedisGet") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("CacheAndRedisGet").WithContext(ctx) key = config.EnvCfg.RedisPrefix + key diff --git a/src/storage/file/fs.go b/src/storage/file/fs.go index 483284f..4f87bf9 100644 --- a/src/storage/file/fs.go +++ b/src/storage/file/fs.go @@ -18,12 +18,14 @@ type FSStorage struct { func (f FSStorage) GetLocalPath(ctx context.Context, fileName string) string { _, span := tracing.Tracer.Start(ctx, "FSStorage-GetLocalPath") defer span.End() + logging.SetSpanWithHostname(span) return path.Join(config.EnvCfg.FileSystemStartPath, fileName) } func (f FSStorage) Upload(ctx context.Context, fileName string, content io.Reader) (output *PutObjectOutput, err error) { ctx, span := tracing.Tracer.Start(ctx, "FSStorage-Upload") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("FSStorage.Upload").WithContext(ctx) logger = logger.WithFields(logrus.Fields{ @@ -66,12 +68,14 @@ func (f FSStorage) Upload(ctx context.Context, fileName string, content io.Reade func (f FSStorage) GetLink(ctx context.Context, fileName string) (string, error) { _, span := tracing.Tracer.Start(ctx, "FSStorage-GetLink") defer span.End() + logging.SetSpanWithHostname(span) return url.JoinPath(config.EnvCfg.FileSystemBaseUrl, fileName) } func (f FSStorage) IsFileExist(ctx context.Context, fileName string) (bool, error) { _, span := tracing.Tracer.Start(ctx, "FSStorage-IsFileExist") defer span.End() + logging.SetSpanWithHostname(span) filePath := path.Join(config.EnvCfg.FileSystemStartPath, fileName) _, err := os.Stat(filePath) if err == nil { diff --git a/src/utils/logging/logging.go b/src/utils/logging/logging.go index d98b567..4a9df13 100644 --- a/src/utils/logging/logging.go +++ b/src/utils/logging/logging.go @@ -10,7 +10,11 @@ import ( "os" ) +var hostname string + func init() { + hostname, _ = os.Hostname() + switch config.EnvCfg.LoggerLevel { case "DEBUG": log.SetLevel(log.DebugLevel) @@ -29,7 +33,9 @@ func init() { log.SetFormatter(&log.JSONFormatter{}) log.AddHook(logTraceHook{}) Logger = log.WithFields(log.Fields{ - "Tied": config.EnvCfg.TiedLogging, + "Tied": config.EnvCfg.TiedLogging, + "Hostname": hostname, + "PodIP": config.EnvCfg.PodIpAddr, }) } @@ -91,3 +97,8 @@ func SetSpanErrorWithDesc(span trace.Span, err error, desc string) { span.RecordError(err) span.SetStatus(codes.Error, desc) } + +func SetSpanWithHostname(span trace.Span) { + span.SetAttributes(attribute.String("hostname", hostname)) + span.SetAttributes(attribute.String("podIP", config.EnvCfg.PodIpAddr)) +} diff --git a/src/web/about/handler.go b/src/web/about/handler.go index f3df1f7..9bcfa8d 100644 --- a/src/web/about/handler.go +++ b/src/web/about/handler.go @@ -3,6 +3,7 @@ package about import ( "GuGoTik/src/constant/strings" "GuGoTik/src/extra/tracing" + "GuGoTik/src/utils/logging" "GuGoTik/src/web/models" "github.com/gin-gonic/gin" "net/http" @@ -12,6 +13,7 @@ import ( func Handle(c *gin.Context) { _, span := tracing.Tracer.Start(c.Request.Context(), "AboutHandler") defer span.End() + logging.SetSpanWithHostname(span) var req models.AboutReq if err := c.ShouldBind(&req); err != nil { diff --git a/src/web/auth/handler.go b/src/web/auth/handler.go index c89261b..143dec9 100644 --- a/src/web/auth/handler.go +++ b/src/web/auth/handler.go @@ -21,6 +21,7 @@ func LoginHandle(c *gin.Context) { var req models.LoginReq _, span := tracing.Tracer.Start(c.Request.Context(), "LoginHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.Login").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/comment/handler.go b/src/web/comment/handler.go index 7897666..66a9448 100644 --- a/src/web/comment/handler.go +++ b/src/web/comment/handler.go @@ -25,6 +25,7 @@ func ActionCommentHandler(c *gin.Context) { var req models.ActionCommentReq _, span := tracing.Tracer.Start(c.Request.Context(), "ActionCommentHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.ActionComment").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/favorite/handler.go b/src/web/favorite/handler.go index 470ba1e..a09e788 100644 --- a/src/web/favorite/handler.go +++ b/src/web/favorite/handler.go @@ -25,6 +25,7 @@ func ActionFavoriteHandler(c *gin.Context) { var req models.ActionFavoriteReq _, span := tracing.Tracer.Start(c.Request.Context(), "ActionFavoriteHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.ActionFavorite").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/feed/handler.go b/src/web/feed/handler.go index aef903a..a752ac6 100644 --- a/src/web/feed/handler.go +++ b/src/web/feed/handler.go @@ -21,6 +21,7 @@ func ListVideosByRecommendHandle(c *gin.Context) { var req models.ListVideosReq _, span := tracing.Tracer.Start(c.Request.Context(), "Feed-ListVideosByRecommendHandle") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.Videos").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/message/handler.go b/src/web/message/handler.go index 3b1d509..3219bc8 100644 --- a/src/web/message/handler.go +++ b/src/web/message/handler.go @@ -27,6 +27,7 @@ func ActionMessageHandler(c *gin.Context) { var req models.SMessageReq _, span := tracing.Tracer.Start(c.Request.Context(), "ActionMessageHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.ActionChat").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/middleware/authenticate.go b/src/web/middleware/authenticate.go index 35bbc05..410d99f 100644 --- a/src/web/middleware/authenticate.go +++ b/src/web/middleware/authenticate.go @@ -20,7 +20,7 @@ func TokenAuthMiddleware() gin.HandlerFunc { return func(c *gin.Context) { ctx, span := tracing.Tracer.Start(c.Request.Context(), "AuthMiddleWare") defer span.End() - span.SetAttributes(attribute.String("podID", config.EnvCfg.PodIpAddr)) + logging.SetSpanWithHostname(span) if c.Request.URL.Path == "/douyin/user/login/" || c.Request.URL.Path == "/douyin/user/register/" || diff --git a/src/web/publish/handler.go b/src/web/publish/handler.go index 17cd1a7..f7b7863 100644 --- a/src/web/publish/handler.go +++ b/src/web/publish/handler.go @@ -26,6 +26,7 @@ func init() { func ListPublishHandle(c *gin.Context) { _, span := tracing.Tracer.Start(c.Request.Context(), "Publish-ListHandle") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.PublishList").WithContext(c.Request.Context()) var req models.ListPublishReq if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/relation/handler.go b/src/web/relation/handler.go index 658d6a3..b11b24e 100644 --- a/src/web/relation/handler.go +++ b/src/web/relation/handler.go @@ -27,6 +27,7 @@ func ActionRelationHandler(c *gin.Context) { var req models.RelationActionReq _, span := tracing.Tracer.Start(c.Request.Context(), "ActionRelationHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.ActionRelation").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { diff --git a/src/web/user/handler.go b/src/web/user/handler.go index d4e5c6a..5dc95ec 100644 --- a/src/web/user/handler.go +++ b/src/web/user/handler.go @@ -26,6 +26,7 @@ func UserHandler(c *gin.Context) { var req models.UserReq _, span := tracing.Tracer.Start(c.Request.Context(), "UserInfoHandler") defer span.End() + logging.SetSpanWithHostname(span) logger := logging.LogService("GateWay.UserInfo").WithContext(c.Request.Context()) if err := c.ShouldBindQuery(&req); err != nil { From e592773ed3f3c0b469c0427bde4e002fd565b2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E6=9D=B0?= <2707138687@qq.com> Date: Wed, 30 Aug 2023 17:51:52 +0800 Subject: [PATCH 17/21] feature: add feed and comment metrics --- src/services/comment/main.go | 71 ++++++++++++++++++++++++++++++++---- src/services/feed/main.go | 69 +++++++++++++++++++++++++++++++---- 2 files changed, 125 insertions(+), 15 deletions(-) diff --git a/src/services/comment/main.go b/src/services/comment/main.go index a1dbced..2f93f78 100644 --- a/src/services/comment/main.go +++ b/src/services/comment/main.go @@ -9,11 +9,18 @@ import ( healthImpl "GuGoTik/src/services/health" "GuGoTik/src/utils/consul" "GuGoTik/src/utils/logging" + "GuGoTik/src/utils/prom" "context" + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/oklog/run" + "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "net" + "net/http" + "os" + "syscall" ) func main() { @@ -35,10 +42,6 @@ func main() { // Configure Pyroscope profiling.InitPyroscope("GuGoTik.CommentService") - s := grpc.NewServer( - grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), - ) - log := logging.LogService(config.CommentRpcServerName) lis, err := net.Listen("tcp", config.EnvCfg.PodIpAddr+config.CommentRpcServerPort) @@ -46,17 +49,69 @@ func main() { log.Panicf("Rpc %s listen happens error: %v", config.CommentRpcServerName, err) } + srvMetrics := grpcprom.NewServerMetrics( + grpcprom.WithServerHandlingTimeHistogram( + grpcprom.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}), + ), + ) + reg := prom.Client + reg.MustRegister(srvMetrics) + + s := grpc.NewServer( + grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), + grpc.ChainUnaryInterceptor(srvMetrics.UnaryServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + grpc.ChainStreamInterceptor(srvMetrics.StreamServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + ) + + if err := consul.RegisterConsul(config.CommentRpcServerName, config.CommentRpcServerPort); err != nil { + log.Panicf("Rpc %s register consul happens error for: %v", config.CommentRpcServerName, err) + } + log.Infof("Rpc %s is running at %s now", config.CommentRpcServerName, config.CommentRpcServerPort) + var srv CommentServiceImpl var probe healthImpl.ProbeImpl comment.RegisterCommentServiceServer(s, srv) health.RegisterHealthServer(s, &probe) defer CloseMQConn() if err := consul.RegisterConsul(config.CommentRpcServerName, config.CommentRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul happens error for: %v", config.CommentRpcServerName, err) + log.Panicf("Rpc %s register consul hanpens error for: %v", config.CommentRpcServerName, err) } srv.New() - log.Infof("Rpc %s is running at %s now", config.CommentRpcServerName, config.CommentRpcServerPort) - if err := s.Serve(lis); err != nil { - log.Panicf("Rpc %s listen happens error for: %v", config.CommentRpcServerName, err) + srvMetrics.InitializeMetrics(s) + + g := &run.Group{} + g.Add(func() error { + return s.Serve(lis) + }, func(err error) { + s.GracefulStop() + s.Stop() + log.Errorf("Rpc %s listen happens error for: %v", config.CommentRpcServerName, err) + }) + + httpSrv := &http.Server{Addr: config.EnvCfg.PodIpAddr + config.Metrics} + g.Add(func() error { + m := http.NewServeMux() + m.Handle("/metrics", promhttp.HandlerFor( + reg, + promhttp.HandlerOpts{ + EnableOpenMetrics: true, + }, + )) + httpSrv.Handler = m + log.Infof("Promethus now running") + return httpSrv.ListenAndServe() + }, func(error) { + if err := httpSrv.Close(); err != nil { + log.Errorf("Prometheus %s listen happens error for: %v", config.CommentRpcServerName, err) + } + }) + + g.Add(run.SignalHandler(context.Background(), syscall.SIGINT, syscall.SIGTERM)) + + if err := g.Run(); err != nil { + log.WithFields(logrus.Fields{ + "err": err, + }).Errorf("Error when runing http server") + os.Exit(1) } } diff --git a/src/services/feed/main.go b/src/services/feed/main.go index 9066b6e..584dfe9 100644 --- a/src/services/feed/main.go +++ b/src/services/feed/main.go @@ -9,11 +9,18 @@ import ( healthImpl "GuGoTik/src/services/health" "GuGoTik/src/utils/consul" "GuGoTik/src/utils/logging" + "GuGoTik/src/utils/prom" "context" + grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus" + "github.com/oklog/run" + "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/sirupsen/logrus" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "net" + "net/http" + "os" + "syscall" ) func main() { @@ -35,10 +42,6 @@ func main() { // Configure Pyroscope profiling.InitPyroscope("GuGoTik.FeedService") - s := grpc.NewServer( - grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), - ) - log := logging.LogService(config.FeedRpcServerName) lis, err := net.Listen("tcp", config.EnvCfg.PodIpAddr+config.FeedRpcServerPort) @@ -46,6 +49,25 @@ func main() { log.Panicf("Rpc %s listen happens error: %v", config.FeedRpcServerName, err) } + srvMetrics := grpcprom.NewServerMetrics( + grpcprom.WithServerHandlingTimeHistogram( + grpcprom.WithHistogramBuckets([]float64{0.001, 0.01, 0.1, 0.3, 0.6, 1, 3, 6, 9, 20, 30, 60, 90, 120}), + ), + ) + reg := prom.Client + reg.MustRegister(srvMetrics) + + s := grpc.NewServer( + grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), + grpc.ChainUnaryInterceptor(srvMetrics.UnaryServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + grpc.ChainStreamInterceptor(srvMetrics.StreamServerInterceptor(grpcprom.WithExemplarFromContext(prom.ExtractContext))), + ) + + if err := consul.RegisterConsul(config.FeedRpcServerName, config.FeedRpcServerPort); err != nil { + log.Panicf("Rpc %s register consul happens error for: %v", config.FeedRpcServerName, err) + } + log.Infof("Rpc %s is running at %s now", config.FeedRpcServerName, config.FeedRpcServerPort) + var srv FeedServiceImpl var probe healthImpl.ProbeImpl feed.RegisterFeedServiceServer(s, srv) @@ -55,8 +77,41 @@ func main() { log.Panicf("Rpc %s register consul hanpens error for: %v", config.FeedRpcServerName, err) } srv.New() - log.Infof("Rpc %s is running at %s now", config.FeedRpcServerName, config.FeedRpcServerPort) - if err := s.Serve(lis); err != nil { - log.Panicf("Rpc %s listen hanpens error for: %v", config.FeedRpcServerName, err) + srvMetrics.InitializeMetrics(s) + + g := &run.Group{} + g.Add(func() error { + return s.Serve(lis) + }, func(err error) { + s.GracefulStop() + s.Stop() + log.Errorf("Rpc %s listen happens error for: %v", config.FeedRpcServerName, err) + }) + + httpSrv := &http.Server{Addr: config.EnvCfg.PodIpAddr + config.Metrics} + g.Add(func() error { + m := http.NewServeMux() + m.Handle("/metrics", promhttp.HandlerFor( + reg, + promhttp.HandlerOpts{ + EnableOpenMetrics: true, + }, + )) + httpSrv.Handler = m + log.Infof("Promethus now running") + return httpSrv.ListenAndServe() + }, func(error) { + if err := httpSrv.Close(); err != nil { + log.Errorf("Prometheus %s listen happens error for: %v", config.FeedRpcServerName, err) + } + }) + + g.Add(run.SignalHandler(context.Background(), syscall.SIGINT, syscall.SIGTERM)) + + if err := g.Run(); err != nil { + log.WithFields(logrus.Fields{ + "err": err, + }).Errorf("Error when runing http server") + os.Exit(1) } } From e40c105d5f08f3c184681f0a76a5237ffc9c769c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E6=9D=B0?= <2707138687@qq.com> Date: Wed, 30 Aug 2023 17:55:02 +0800 Subject: [PATCH 18/21] refactor: correcting typos --- src/services/comment/main.go | 2 +- src/services/feed/main.go | 2 +- src/services/user/main.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/services/comment/main.go b/src/services/comment/main.go index 2f93f78..f11ce9f 100644 --- a/src/services/comment/main.go +++ b/src/services/comment/main.go @@ -74,7 +74,7 @@ func main() { health.RegisterHealthServer(s, &probe) defer CloseMQConn() if err := consul.RegisterConsul(config.CommentRpcServerName, config.CommentRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul hanpens error for: %v", config.CommentRpcServerName, err) + log.Panicf("Rpc %s register consul happens error for: %v", config.CommentRpcServerName, err) } srv.New() srvMetrics.InitializeMetrics(s) diff --git a/src/services/feed/main.go b/src/services/feed/main.go index 584dfe9..6ef19cc 100644 --- a/src/services/feed/main.go +++ b/src/services/feed/main.go @@ -74,7 +74,7 @@ func main() { health.RegisterHealthServer(s, &probe) defer CloseMQConn() if err := consul.RegisterConsul(config.FeedRpcServerName, config.FeedRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul hanpens error for: %v", config.FeedRpcServerName, err) + log.Panicf("Rpc %s register consul happens error for: %v", config.FeedRpcServerName, err) } srv.New() srvMetrics.InitializeMetrics(s) diff --git a/src/services/user/main.go b/src/services/user/main.go index 9807506..0ce697e 100644 --- a/src/services/user/main.go +++ b/src/services/user/main.go @@ -68,7 +68,7 @@ func main() { ) if err := consul.RegisterConsul(config.UserRpcServerName, config.UserRpcServerPort); err != nil { - log.Panicf("Rpc %s register consul hanpens error for: %v", config.UserRpcServerName, err) + log.Panicf("Rpc %s register consul happens error for: %v", config.UserRpcServerName, err) } log.Infof("Rpc %s is running at %s now", config.UserRpcServerName, config.UserRpcServerPort) From d9876235977706304dab47b9dedfc51b0e80b8d5 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 18:52:35 +0800 Subject: [PATCH 19/21] fix: secret --- manifests-endymx/deployment-auth-service.yaml | 2 +- .../deployment-comment-service.yaml | 2 +- .../deployment-favorite-service.yaml | 2 +- manifests-endymx/deployment-feed-service.yaml | 2 +- manifests-endymx/deployment-http-service.yaml | 2 +- .../deployment-message-service.yaml | 2 +- .../deployment-msg-consumer-service.yaml | 2 +- .../deployment-publish-service.yaml | 2 +- .../deployment-recommend-service.yaml | 2 +- .../deployment-relation-service.yaml | 2 +- manifests-endymx/deployment-user-service.yaml | 2 +- .../deployment-video-processor-service.yaml | 2 +- manifests-endymx/sevice-auth-api.yaml | 21 ------------------- manifests-endymx/sevice-comment-api.yaml | 21 ------------------- manifests-endymx/sevice-event-api.yaml | 17 --------------- manifests-endymx/sevice-favorite-api.yaml | 21 ------------------- manifests-endymx/sevice-feed-api.yaml | 21 ------------------- manifests-endymx/sevice-http-api.yaml | 1 + manifests-endymx/sevice-message-api.yaml | 21 ------------------- manifests-endymx/sevice-msg-consumer-api.yaml | 17 --------------- manifests-endymx/sevice-publish-api.yaml | 21 ------------------- manifests-endymx/sevice-recommend-api.yaml | 21 ------------------- manifests-endymx/sevice-relation-api.yaml | 21 ------------------- manifests-endymx/sevice-user-api.yaml | 21 ------------------- test/web/publish_test.go | 6 +++--- test/web/value.go | 2 +- 26 files changed, 17 insertions(+), 239 deletions(-) delete mode 100644 manifests-endymx/sevice-auth-api.yaml delete mode 100644 manifests-endymx/sevice-comment-api.yaml delete mode 100644 manifests-endymx/sevice-event-api.yaml delete mode 100644 manifests-endymx/sevice-favorite-api.yaml delete mode 100644 manifests-endymx/sevice-feed-api.yaml delete mode 100644 manifests-endymx/sevice-message-api.yaml delete mode 100644 manifests-endymx/sevice-msg-consumer-api.yaml delete mode 100644 manifests-endymx/sevice-publish-api.yaml delete mode 100644 manifests-endymx/sevice-recommend-api.yaml delete mode 100644 manifests-endymx/sevice-relation-api.yaml delete mode 100644 manifests-endymx/sevice-user-api.yaml diff --git a/manifests-endymx/deployment-auth-service.yaml b/manifests-endymx/deployment-auth-service.yaml index 6c57d7d..ab1c6ad 100644 --- a/manifests-endymx/deployment-auth-service.yaml +++ b/manifests-endymx/deployment-auth-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-auth-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-comment-service.yaml b/manifests-endymx/deployment-comment-service.yaml index cc6de01..bc87b16 100644 --- a/manifests-endymx/deployment-comment-service.yaml +++ b/manifests-endymx/deployment-comment-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-comment-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-favorite-service.yaml b/manifests-endymx/deployment-favorite-service.yaml index 0619085..23fe4c9 100644 --- a/manifests-endymx/deployment-favorite-service.yaml +++ b/manifests-endymx/deployment-favorite-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-favorite-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-feed-service.yaml b/manifests-endymx/deployment-feed-service.yaml index 69c013f..ec08f0c 100644 --- a/manifests-endymx/deployment-feed-service.yaml +++ b/manifests-endymx/deployment-feed-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-feed-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-http-service.yaml b/manifests-endymx/deployment-http-service.yaml index 2cb3f50..f3227a4 100644 --- a/manifests-endymx/deployment-http-service.yaml +++ b/manifests-endymx/deployment-http-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-http-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-message-service.yaml b/manifests-endymx/deployment-message-service.yaml index f3df8ee..b54d8a2 100644 --- a/manifests-endymx/deployment-message-service.yaml +++ b/manifests-endymx/deployment-message-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-message-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-msg-consumer-service.yaml b/manifests-endymx/deployment-msg-consumer-service.yaml index a68176c..a4bd912 100644 --- a/manifests-endymx/deployment-msg-consumer-service.yaml +++ b/manifests-endymx/deployment-msg-consumer-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-msgconsumer-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-publish-service.yaml b/manifests-endymx/deployment-publish-service.yaml index e251225..4677daa 100644 --- a/manifests-endymx/deployment-publish-service.yaml +++ b/manifests-endymx/deployment-publish-service.yaml @@ -26,7 +26,7 @@ spec: persistentVolumeClaim: claimName: storage imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-recommend-service.yaml b/manifests-endymx/deployment-recommend-service.yaml index aad2af2..5d2230f 100644 --- a/manifests-endymx/deployment-recommend-service.yaml +++ b/manifests-endymx/deployment-recommend-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-recommend-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-relation-service.yaml b/manifests-endymx/deployment-relation-service.yaml index a0dd969..593f822 100644 --- a/manifests-endymx/deployment-relation-service.yaml +++ b/manifests-endymx/deployment-relation-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-relation-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-user-service.yaml b/manifests-endymx/deployment-user-service.yaml index 85669b8..a49aa95 100644 --- a/manifests-endymx/deployment-user-service.yaml +++ b/manifests-endymx/deployment-user-service.yaml @@ -22,7 +22,7 @@ spec: dream-unit: gugotik-user-service spec: imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/deployment-video-processor-service.yaml b/manifests-endymx/deployment-video-processor-service.yaml index b9004d0..1c85d63 100644 --- a/manifests-endymx/deployment-video-processor-service.yaml +++ b/manifests-endymx/deployment-video-processor-service.yaml @@ -26,7 +26,7 @@ spec: persistentVolumeClaim: claimName: storage imagePullSecrets: - - name: reg-cred + - name: regcred containers: - image: ${IMAGE} imagePullPolicy: IfNotPresent diff --git a/manifests-endymx/sevice-auth-api.yaml b/manifests-endymx/sevice-auth-api.yaml deleted file mode 100644 index c9d4880..0000000 --- a/manifests-endymx/sevice-auth-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-auth-service - name: gugotik-auth-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37001 - protocol: TCP - targetPort: 37001 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-auth-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-comment-api.yaml b/manifests-endymx/sevice-comment-api.yaml deleted file mode 100644 index 63821ab..0000000 --- a/manifests-endymx/sevice-comment-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-comment-service - name: gugotik-comment-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37003 - protocol: TCP - targetPort: 37003 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-comment-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-event-api.yaml b/manifests-endymx/sevice-event-api.yaml deleted file mode 100644 index ceb6633..0000000 --- a/manifests-endymx/sevice-event-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-event-service - name: gugotik-event-service - namespace: gugotik-service-bundle -spec: - ports: - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-event-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-favorite-api.yaml b/manifests-endymx/sevice-favorite-api.yaml deleted file mode 100644 index d1ef739..0000000 --- a/manifests-endymx/sevice-favorite-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-favorite-service - name: gugotik-favorite-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37006 - protocol: TCP - targetPort: 37006 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-favorite-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-feed-api.yaml b/manifests-endymx/sevice-feed-api.yaml deleted file mode 100644 index 039b407..0000000 --- a/manifests-endymx/sevice-feed-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-feed-service - name: gugotik-feed-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37004 - protocol: TCP - targetPort: 37004 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-feed-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-http-api.yaml b/manifests-endymx/sevice-http-api.yaml index 265af2c..464d79b 100644 --- a/manifests-endymx/sevice-http-api.yaml +++ b/manifests-endymx/sevice-http-api.yaml @@ -11,6 +11,7 @@ spec: port: 37000 protocol: TCP targetPort: 37000 + nodePort: 32192 selector: name: gugotik-http-service branch: master diff --git a/manifests-endymx/sevice-message-api.yaml b/manifests-endymx/sevice-message-api.yaml deleted file mode 100644 index 3d4eae9..0000000 --- a/manifests-endymx/sevice-message-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-message-service - name: gugotik-message-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37007 - protocol: TCP - targetPort: 37007 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-message-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-msg-consumer-api.yaml b/manifests-endymx/sevice-msg-consumer-api.yaml deleted file mode 100644 index 2074e02..0000000 --- a/manifests-endymx/sevice-msg-consumer-api.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-msgconsumer-service - name: gugotik-msgconsumer-service - namespace: gugotik-service-bundle -spec: - ports: - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-msgconsumer-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-publish-api.yaml b/manifests-endymx/sevice-publish-api.yaml deleted file mode 100644 index 94761a4..0000000 --- a/manifests-endymx/sevice-publish-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-publish-service - name: gugotik-publish-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37005 - protocol: TCP - targetPort: 37005 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-publish-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-recommend-api.yaml b/manifests-endymx/sevice-recommend-api.yaml deleted file mode 100644 index 3bd0bcd..0000000 --- a/manifests-endymx/sevice-recommend-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-recommend-service - name: gugotik-recommend-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37009 - protocol: TCP - targetPort: 37009 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-recommend-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-relation-api.yaml b/manifests-endymx/sevice-relation-api.yaml deleted file mode 100644 index 3a3f0f2..0000000 --- a/manifests-endymx/sevice-relation-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-relation-service - name: gugotik-relation-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37008 - protocol: TCP - targetPort: 37008 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-relation-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/manifests-endymx/sevice-user-api.yaml b/manifests-endymx/sevice-user-api.yaml deleted file mode 100644 index a9dd8a0..0000000 --- a/manifests-endymx/sevice-user-api.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: gugotik-user-service - name: gugotik-user-service - namespace: gugotik-service-bundle -spec: - ports: - - name: grpc - port: 37002 - protocol: TCP - targetPort: 37002 - - name: metrics - port: 37099 - protocol: TCP - targetPort: 37099 - selector: - name: gugotik-user-service - branch: master - type: ClusterIP \ No newline at end of file diff --git a/test/web/publish_test.go b/test/web/publish_test.go index c3a17ad..e6c8381 100644 --- a/test/web/publish_test.go +++ b/test/web/publish_test.go @@ -39,9 +39,9 @@ func TestListVideo(t *testing.T) { } func TestPublishVideo(t *testing.T) { - url := "http://localhost:37000/douyin/publish/action" + url := "http://43.248.96.203:32192/douyin/publish/action" method := "POST" - filePath := "E:\\Administrator\\Downloads\\Video\\1223461612-1-192.mp4" + filePath := "E:\\Administrator\\Downloads\\Video\\1245212692-1-192.mp4" payload := &bytes.Buffer{} writer := multipart.NewWriter(payload) @@ -60,7 +60,7 @@ func TestPublishVideo(t *testing.T) { assert.Empty(t, err) _ = writer.WriteField("token", token) - _ = writer.WriteField("title", "怎么找到余华的B站账号？") + _ = writer.WriteField("title", "10个报错，但是我代码只有9行啊？？？") err = writer.Close() assert.Empty(t, err) diff --git a/test/web/value.go b/test/web/value.go index 1ba6253..9b6a961 100644 --- a/test/web/value.go +++ b/test/web/value.go @@ -1,3 +1,3 @@ package web -const token = "7a675303-5d4d-4262-ace6-9e13ca3234bd" +const token = "5d7f7f7b-8c8b-47dc-9aa9-66363af2f1b6" From be33ccb4666b06ffa2bb3bd3d3e1a075a8758056 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 19:35:42 +0800 Subject: [PATCH 20/21] fix: msg --- manifests-endymx/sevice-http-api.yaml | 1 - src/services/message/handler.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/manifests-endymx/sevice-http-api.yaml b/manifests-endymx/sevice-http-api.yaml index 464d79b..265af2c 100644 --- a/manifests-endymx/sevice-http-api.yaml +++ b/manifests-endymx/sevice-http-api.yaml @@ -11,7 +11,6 @@ spec: port: 37000 protocol: TCP targetPort: 37000 - nodePort: 32192 selector: name: gugotik-http-service branch: master diff --git a/src/services/message/handler.go b/src/services/message/handler.go index 5f0afb3..d6f4cd6 100644 --- a/src/services/message/handler.go +++ b/src/services/message/handler.go @@ -90,8 +90,8 @@ func (c MessageServiceImpl) New() { cronRunner := cron.New(cron.WithSeconds()) - _, err = cronRunner.AddFunc("0 0 18 * * *", sendMagicMessage) // execute every 18:00 - //_, err = cronRunner.AddFunc("@every 2m", sendMagicMessage) // execute every minute [for test] + //_, err = cronRunner.AddFunc("0 0 18 * * *", sendMagicMessage) // execute every 18:00 + _, err = cronRunner.AddFunc("@every 5m", sendMagicMessage) // execute every minute [for test] if err != nil { logging.Logger.WithFields(logrus.Fields{ From 517e010a34b3622414f986fdd8f0d62ea87da4c2 Mon Sep 17 00:00:00 2001 From: EpicMo <1982742309@qq.com> Date: Wed, 30 Aug 2023 19:47:50 +0800 Subject: [PATCH 21/21] fix: msg --- src/services/videoprocessor/summary.go | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/videoprocessor/summary.go b/src/services/videoprocessor/summary.go index de3b499..5a0dc61 100644 --- a/src/services/videoprocessor/summary.go +++ b/src/services/videoprocessor/summary.go @@ -365,6 +365,7 @@ func SummaryConsume(channel *amqp.Channel) { Type: 3, Source: config.VideoProcessorRpcServiceName, Title: raw.Title, + Tag: strings.Split(keywords, " | "), }) }() wg.Wait()