Merge pull request #38 from wilsonwu/main

Update adservice to support sentinel metrics

Author: Frapschen

charts/opentelemetry-demo/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: opentelemetry-demo
 type: application
-version: 0.2.1
+version: 0.3.0
 description: A helm chart for openTelemetry community demo application integration with other component.
 sources:
   - https://github.com/openinsight-proj/opentelemetry-demo-helm-chart

charts/opentelemetry-demo/values.yaml

@@ -55,13 +55,15 @@ opentelemetry-demo:
 
     adService:
       enabled: true
-      image: ghcr.m.daocloud.io/openinsight-proj/adservice:v0.2.0
+      image: ghcr.m.daocloud.io/openinsight-proj/adservice:v0.3.0
       servicePort: 9555
       ports:
         - name: http
           value: 8081
         - name: health-http
           value: 8999
+        - name: sentinel-metrics
+          value: 12345
       env:
         - name: AD_SERVICE_PORT
           value: '9555'
@@ -80,7 +82,7 @@ opentelemetry-demo:
           value: >-
             k8s.namespace.name=$(K8S_NAMESPACE),k8s.node.name=$(OTEL_RESOURCE_ATTRIBUTES_NODE_NAME),k8s.pod.name=$(OTEL_RESOURCE_ATTRIBUTES_POD_NAME),k8s.pod.uid=$(OTEL_RESOURCE_ATTRIBUTES_POD_UID),skoala.registry=$(SKOALA_REGISTRY),nacos.namespaceid=$(NACSO_NAMESPACE_ID),nacos.groupname=$(NACSO_GROUP_NAME)
         - name: JAVA_OPTS
-          value: -Dspring.cloud.nacos.config.server-addr=nacos-test.skoala-jia:8848 -Dspring.application.name=adservice-springcloud -Dspring.cloud.nacos.discovery.enabled=true -Dspring.cloud.nacos.discovery.server-addr=nacos-test.skoala-jia:8848 -Dspring.cloud.nacos.config.discovery.metadata.k8s_cluster_id=xxx -Dspring.cloud.nacos.config.discovery.metadata.k8s_cluster_name=skoala-dev -Dspring.cloud.nacos.config.discovery.metadata.k8s_namespace_name=skoala-jia -Dspring.cloud.nacos.config.discovery.metadata.k8s_workload_type=deployment -Dspring.cloud.nacos.config.discovery.metadata.k8s_workload_name=adservice-springcloud -Dspring.cloud.nacos.config.discovery.metadata.k8s_service_name=adservice-springcloud -Dspring.cloud.nacos.config.discovery.metadata.k8s_pod_name=$(HOSTNAME) -Dspring.cloud.sentinel.enabled=true -Dspring.cloud.sentinel.transport.dashboard=nacos-test-sentinel:8080
+          value: -javaagent:/jmx_prometheus_javaagent-0.17.0.jar=12345:/prometheus-jmx-config.yaml -Dspring.cloud.nacos.config.server-addr=nacos-test.skoala-jia:8848 -Dspring.application.name=adservice-springcloud -Dspring.cloud.nacos.discovery.enabled=true -Dspring.cloud.nacos.discovery.server-addr=nacos-test.skoala-jia:8848 -Dspring.cloud.nacos.config.discovery.metadata.k8s_cluster_id=xxx -Dspring.cloud.nacos.config.discovery.metadata.k8s_cluster_name=skoala-dev -Dspring.cloud.nacos.config.discovery.metadata.k8s_namespace_name=skoala-jia -Dspring.cloud.nacos.config.discovery.metadata.k8s_workload_type=deployment -Dspring.cloud.nacos.config.discovery.metadata.k8s_workload_name=adservice-springcloud -Dspring.cloud.nacos.config.discovery.metadata.k8s_service_name=adservice-springcloud -Dspring.cloud.nacos.config.discovery.metadata.k8s_pod_name=$(HOSTNAME) -Dspring.cloud.sentinel.enabled=true -Dspring.cloud.sentinel.transport.dashboard=nacos-test-sentinel:8080
 
       podAnnotations:
         instrumentation.opentelemetry.io/inject-sdk: 'true'