Skip to content

Commit bca091f

Browse files
chenzhiguochenzhiguo
committed
Add service catalog and enhance timer configurations in properties files
1 parent f735d91 commit bca091f

File tree

4 files changed

+36
-10
lines changed

4 files changed

+36
-10
lines changed

‎deploy/all-cr.yaml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ data:
9898
app.service.name=${APPLICATION_SERVICE_NAME:${CONFIG_NACOS_SERVICE:${APPLICATION_NAME}}}
9999
app.service.namespace=${APPLICATION_SERVICE_NAMESPACE}
100100
app.service.group=${APPLICATION_SERVICE_GROUP}
101+
app.service.catalog=${APPLICATION_SERVICE_CATALOG:${REGISTRY_GROUP:${CONFIG_NACOS_GROUP}}}
101102
app.service.gateway=${APPLICATION_SERVICE_GATEWAY:NONE}
102103
app.service.port=${APPLICATION_SERVICE_PORT}
103104
app.service.weight=${APPLICATION_SERVICE_WEIGHT:100}
@@ -181,6 +182,8 @@ data:
181182
com.jd.live.agent.core.util.http.HttpUtils:
182183
- java.net.URI
183184
timer:
185+
tickTime: ${CONFIG_TIMER_TICK_TIME:100}
186+
ticks: ${CONFIG_TIMER_TICKS:512}
184187
workerThreads: ${CONFIG_TIMER_WORKER_THREADS:4}
185188
publisher:
186189
configs:
@@ -355,6 +358,7 @@ data:
355358
type: SmoothBursty
356359
cleanInterval: 30000
357360
expireTime: 60000
361+
configs: ${CONFIG_RATE_LIMITER_CONFIG:}
358362
loadLimiter:
359363
cpuUsage: ${CONFIG_MAX_CPU_USAGE:}
360364
loadUsage: ${CONFIG_MAX_LOAD_USAGE:}
@@ -370,20 +374,26 @@ data:
370374
mq:
371375
liveMode: ${CONFIG_LIVE_MQ_MODE:ISOLATION_CLUSTER}
372376
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
373-
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${'_lane_'lane}}
377+
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${_!lane}}
374378
topics:
375379
db:
376380
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
377381
live:
378382
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
383+
hostEnabled: ${CONFIG_LIVE_HOST_ENABLED:false}
384+
hostExpression: ${CONFIG_LIVE_HOST_EXPRESSION}
385+
hosts: ${CONFIG_LIVE_HOSTS}
379386
lane:
380387
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
388+
hostEnabled: ${CONFIG_LANE_HOST_ENABLED:false}
389+
hostExpression: ${CONFIG_LANE_HOST_EXPRESSION}
390+
hosts: ${CONFIG_LANE_HOSTS}
381391
router:
382392
spring:
383393
discovery:
384394
disables: ${CONFIG_SPRING_DISCOVERY_DISABLES}
385-
phevos:
386-
groupExpression: ${unit}-${cell}-${group}
395+
gateway:
396+
pathFilters: ${CONFIG_SPRING_GATEWAY_PATH_FILTERS}
387397
transmission:
388398
type: ${CONFIG_TRANSMISSION_TYPE:live}
389399
autoDetect: ${CONFIG_TRANSMISSION_AUTO_DETECT:NONE}
@@ -407,8 +417,8 @@ data:
407417
- org.apache.tomcat.util.threads.ThreadPoolExecutor
408418
- org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor
409419
- org.apache.tomcat.util.threads.InlineExecutorService
420+
- org.apache.juli.AsyncFileHandler$LoggerExecutorService
410421
- javax.management.NotificationBroadcasterSupport$1
411-
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory
412422
- com.alibaba.druid.pool.DruidAbstractDataSource$SynchronousExecutor
413423
excludeTasks:
414424
- com.jd.live.agent.core.thread.NamedThreadFactory
@@ -424,15 +434,18 @@ data:
424434
- io.sermant.implement.service.xds.handler.XdsHandler.NamedThreadFactory
425435
- io.sermant.discovery.factory.RealmServiceThreadFactory
426436
- org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory
437+
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory
427438
- sun.rmi.runtime.RuntimeUtil$1
428439
- sun.rmi.transport.tcp.TCPTransport$1
429440
- sun.rmi.transport.DGCImpl$1
430441
- sun.rmi.transport.DGCAckHandler$1
431442
- org.apache.tomcat.util.threads.TaskThreadFactory
443+
- org.apache.juli.FileHandler$ThreadFactory
444+
- com.tongweb.container.startup.HostConfig$DeployWar
445+
- sun.nio.fs.PollingWatchService$PollingWatchKey$1
432446
excludeExecutorPrefixes:
433447
- com.jd.live.agent.shaded.
434448
- com.netflix.hystrix.util.HystrixTimer$ScheduledExecutor$
435-
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory$
436449
- com.alibaba.nacos.
437450
excludeTaskPrefixes:
438451
- reactor.core.scheduler.BoundedElasticScheduler$$Lambda

‎deploy/joylive-injector/config/bootstrap.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ app.name=${APPLICATION_NAME}
22
app.service.name=${APPLICATION_SERVICE_NAME:${CONFIG_NACOS_SERVICE:${APPLICATION_NAME}}}
33
app.service.namespace=${APPLICATION_SERVICE_NAMESPACE}
44
app.service.group=${APPLICATION_SERVICE_GROUP}
5+
app.service.catalog=${APPLICATION_SERVICE_CATALOG:${REGISTRY_GROUP:${CONFIG_NACOS_GROUP}}}
56
app.service.gateway=${APPLICATION_SERVICE_GATEWAY:NONE}
67
app.service.port=${APPLICATION_SERVICE_PORT}
78
app.service.weight=${APPLICATION_SERVICE_WEIGHT:100}

‎deploy/joylive-injector/config/config.yaml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ agent:
3333
com.jd.live.agent.core.util.http.HttpUtils:
3434
- java.net.URI
3535
timer:
36+
tickTime: ${CONFIG_TIMER_TICK_TIME:100}
37+
ticks: ${CONFIG_TIMER_TICKS:512}
3638
workerThreads: ${CONFIG_TIMER_WORKER_THREADS:4}
3739
publisher:
3840
configs:
@@ -207,6 +209,7 @@ agent:
207209
type: SmoothBursty
208210
cleanInterval: 30000
209211
expireTime: 60000
212+
configs: ${CONFIG_RATE_LIMITER_CONFIG:}
210213
loadLimiter:
211214
cpuUsage: ${CONFIG_MAX_CPU_USAGE:}
212215
loadUsage: ${CONFIG_MAX_LOAD_USAGE:}
@@ -222,20 +225,26 @@ agent:
222225
mq:
223226
liveMode: ${CONFIG_LIVE_MQ_MODE:ISOLATION_CLUSTER}
224227
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
225-
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${'_lane_'lane}}
228+
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${_!lane}}
226229
topics:
227230
db:
228231
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
229232
live:
230233
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
234+
hostEnabled: ${CONFIG_LIVE_HOST_ENABLED:false}
235+
hostExpression: ${CONFIG_LIVE_HOST_EXPRESSION}
236+
hosts: ${CONFIG_LIVE_HOSTS}
231237
lane:
232238
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
239+
hostEnabled: ${CONFIG_LANE_HOST_ENABLED:false}
240+
hostExpression: ${CONFIG_LANE_HOST_EXPRESSION}
241+
hosts: ${CONFIG_LANE_HOSTS}
233242
router:
234243
spring:
235244
discovery:
236245
disables: ${CONFIG_SPRING_DISCOVERY_DISABLES}
237-
phevos:
238-
groupExpression: ${unit}-${cell}-${group}
246+
gateway:
247+
pathFilters: ${CONFIG_SPRING_GATEWAY_PATH_FILTERS}
239248
transmission:
240249
type: ${CONFIG_TRANSMISSION_TYPE:live}
241250
autoDetect: ${CONFIG_TRANSMISSION_AUTO_DETECT:NONE}
@@ -259,8 +268,8 @@ agent:
259268
- org.apache.tomcat.util.threads.ThreadPoolExecutor
260269
- org.apache.tomcat.util.threads.ScheduledThreadPoolExecutor
261270
- org.apache.tomcat.util.threads.InlineExecutorService
271+
- org.apache.juli.AsyncFileHandler$LoggerExecutorService
262272
- javax.management.NotificationBroadcasterSupport$1
263-
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory
264273
- com.alibaba.druid.pool.DruidAbstractDataSource$SynchronousExecutor
265274
excludeTasks:
266275
- com.jd.live.agent.core.thread.NamedThreadFactory
@@ -276,15 +285,18 @@ agent:
276285
- io.sermant.implement.service.xds.handler.XdsHandler.NamedThreadFactory
277286
- io.sermant.discovery.factory.RealmServiceThreadFactory
278287
- org.apache.skywalking.apm.agent.core.boot.DefaultNamedThreadFactory
288+
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory
279289
- sun.rmi.runtime.RuntimeUtil$1
280290
- sun.rmi.transport.tcp.TCPTransport$1
281291
- sun.rmi.transport.DGCImpl$1
282292
- sun.rmi.transport.DGCAckHandler$1
283293
- org.apache.tomcat.util.threads.TaskThreadFactory
294+
- org.apache.juli.FileHandler$ThreadFactory
295+
- com.tongweb.container.startup.HostConfig$DeployWar
296+
- sun.nio.fs.PollingWatchService$PollingWatchKey$1
284297
excludeExecutorPrefixes:
285298
- com.jd.live.agent.shaded.
286299
- com.netflix.hystrix.util.HystrixTimer$ScheduledExecutor$
287-
- com.netflix.stats.distribution.DataPublisher$PublishThreadFactory$
288300
- com.alibaba.nacos.
289301
excludeTaskPrefixes:
290302
- reactor.core.scheduler.BoundedElasticScheduler$$Lambda

‎deploy/packages/joylive-injector-1.3.8.tgz‎

175 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)