Skip to content

Commit 1c93483

Browse files
committed
feat: add support for java.net.URI and JOYLIVE_SIDECAR_SETTING_ENABLE in configuration
1 parent c94fd4d commit 1c93483

File tree

3 files changed

+20
-22
lines changed

3 files changed

+20
-22
lines changed

deploy/all-cr.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ data:
309309
timeout: 5000
310310
switch:
311311
govern:
312-
mq: ${CONFIG_LIVE_MQ_ENABLED:false}
312+
mq: ${CONFIG_MQ_ENABLED:false}
313313
dubbo: true
314314
grpc: true
315315
sofarpc: true
@@ -354,7 +354,6 @@ data:
354354
shutdownWaitTime: ${CONFIG_SHUTDOWN_WAIT_TIME:10000}
355355
service:
356356
localFirst: ${CONFIG_LOCAL_FIRST:true}
357-
localFirstMode: ${CONFIG_LOCAL_FIRST_MODE:CELL}
358357
cellFailoverThresholds: ${CELL_FAILOVER_THRESHOLDS}
359358
serviceGroups: ${CONFIG_SERVICE_GROUPS:}
360359
serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
@@ -397,8 +396,9 @@ data:
397396
mq:
398397
liveMode: ${CONFIG_LIVE_MQ_MODE:ISOLATION_CLUSTER}
399398
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
400-
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${_!lane}}
401-
topics:
399+
groupEnabled: ${CONFIG_MQ_GROUP_ENABLED:true}
400+
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION}
401+
topics: ${CONFIG_MQ_TOPICS}
402402
db:
403403
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
404404
live:
@@ -563,17 +563,16 @@ data:
563563
enabled: ${CONFIG_EXPORTER_ENABLED:true}
564564
type: ${CONFIG_EXPORTER_TYPE:${CONFIG_COUNTER_EXPORTER_TYPE:otlp.grpc}}
565565
endpoint: ${CONFIG_EXPORTER_ENDPOINT:${CONFIG_COUNTER_EXPORTER_ENDPOINT:http://otel-collector.joylive.svc:4317}}
566-
timeout: 5000
567-
readerInterval: 1000
566+
port: ${CONFIG_EXPORTER_PORT:${CONFIG_COUNTER_EXPORTER_PORT:9494}}
567+
timeout: ${CONFIG_EXPORTER_TIMEOUT:5000}
568+
readerInterval: ${CONFIG_EXPORTER_READER_INTERVAL:60000}
568569
traffic:
569570
enabled: ${CONFIG_EXPORTER_TRAFFIC_ENABLED:true}
570-
gatewayEnabled: true
571-
serviceEnabled: true
572-
document:
573-
enabled: ${CONFIG_EXPORTER_DOCUMENT_ENABLED:false}
571+
gatewayEnabled: ${CONFIG_EXPORTER_GATEWAY_ENABLED:true}
572+
serviceEnabled: ${CONFIG_EXPORTER_SERVICE_ENABLED:true}
574573
exception:
575574
enabled: ${CONFIG_EXPORTER_EXCEPTION_ENABLED:true}
576-
maxDepth: 20
575+
maxDepth: ${CONFIG_EXPORTER_EXCEPTION_MAX_DEPTH:20}
577576
stackTracePrefixes:
578577
- java.
579578
- javax.

deploy/joylive-injector/config/config.yaml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ agent:
160160
timeout: 5000
161161
switch:
162162
govern:
163-
mq: ${CONFIG_LIVE_MQ_ENABLED:false}
163+
mq: ${CONFIG_MQ_ENABLED:false}
164164
dubbo: true
165165
grpc: true
166166
sofarpc: true
@@ -205,7 +205,6 @@ agent:
205205
shutdownWaitTime: ${CONFIG_SHUTDOWN_WAIT_TIME:10000}
206206
service:
207207
localFirst: ${CONFIG_LOCAL_FIRST:true}
208-
localFirstMode: ${CONFIG_LOCAL_FIRST_MODE:{{ .Values.agent.governance.service.localFirstMode }}}
209208
cellFailoverThresholds: ${CELL_FAILOVER_THRESHOLDS}
210209
serviceGroups: ${CONFIG_SERVICE_GROUPS:}
211210
serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
@@ -248,8 +247,9 @@ agent:
248247
mq:
249248
liveMode: ${CONFIG_LIVE_MQ_MODE:ISOLATION_CLUSTER}
250249
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
251-
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${_!lane}}
252-
topics:
250+
groupEnabled: ${CONFIG_MQ_GROUP_ENABLED:true}
251+
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION}
252+
topics: ${CONFIG_MQ_TOPICS}
253253
db:
254254
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
255255
live:
@@ -414,17 +414,16 @@ agent:
414414
enabled: ${CONFIG_EXPORTER_ENABLED:true}
415415
type: ${CONFIG_EXPORTER_TYPE:${CONFIG_COUNTER_EXPORTER_TYPE:{{ .Values.agent.exporter.type }}}}
416416
endpoint: ${CONFIG_EXPORTER_ENDPOINT:${CONFIG_COUNTER_EXPORTER_ENDPOINT:{{ .Values.agent.exporter.endpoint }}}}
417-
timeout: 5000
418-
readerInterval: 1000
417+
port: ${CONFIG_EXPORTER_PORT:${CONFIG_COUNTER_EXPORTER_PORT:9494}}
418+
timeout: ${CONFIG_EXPORTER_TIMEOUT:5000}
419+
readerInterval: ${CONFIG_EXPORTER_READER_INTERVAL:60000}
419420
traffic:
420421
enabled: ${CONFIG_EXPORTER_TRAFFIC_ENABLED:true}
421-
gatewayEnabled: true
422-
serviceEnabled: true
423-
document:
424-
enabled: ${CONFIG_EXPORTER_DOCUMENT_ENABLED:false}
422+
gatewayEnabled: ${CONFIG_EXPORTER_GATEWAY_ENABLED:true}
423+
serviceEnabled: ${CONFIG_EXPORTER_SERVICE_ENABLED:true}
425424
exception:
426425
enabled: ${CONFIG_EXPORTER_EXCEPTION_ENABLED:true}
427-
maxDepth: 20
426+
maxDepth: ${CONFIG_EXPORTER_EXCEPTION_MAX_DEPTH:20}
428427
stackTracePrefixes:
429428
- java.
430429
- javax.
21 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)