Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复无法javaagent无法获取用户的spring.application.name的问题 #182

Merged
merged 46 commits into from
May 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
0aa8b49
fix: optimize the discovery inject logic and fix nacos config not wor…
andrewshan Apr 13, 2024
b427ba8
Merge branch 'polarismesh:main' into main
andrewshan Apr 15, 2024
761549a
feat: 删除无用的导入
andrewshan Apr 15, 2024
8e5277b
feat: 增加actuator到demo中
andrewshan Apr 15, 2024
dae0a9e
fix: add lossless healthcheck for example
andrewshan Apr 15, 2024
33c84f1
fix: add configuration comments
andrewshan Apr 15, 2024
3bbc028
Merge branch 'polarismesh:main' into main
andrewshan Apr 15, 2024
4c1533d
fix: 修复事件日志不输出的问题
andrewshan Apr 15, 2024
53c0a44
Merge branch 'polarismesh:main' into main
andrewshan Apr 15, 2024
0adca0b
release: release version to 1.7.0-RC1
andrewshan Apr 15, 2024
02150bf
Merge branch 'polarismesh:main' into main
andrewshan Apr 29, 2024
0d37c12
feat: new add java agent for hoxton
andrewshan May 3, 2024
286d397
feat: support service registry and config
andrewshan May 4, 2024
6fa3d0b
feat: refrator all inject logics into BeanInjector
andrewshan May 6, 2024
fbd5fe6
Merge branch 'polarismesh:main' into main
andrewshan May 6, 2024
1604631
feat: add gray release example & dispatch bean register into plugins
andrewshan May 7, 2024
2c8c777
Merge branch 'polarismesh:main' into main
andrewshan May 7, 2024
cada831
feat: add environment parameter to obtain the configuration
andrewshan May 8, 2024
5c6c44c
Merge branch 'polarismesh:main' into main
andrewshan May 8, 2024
1be919f
feat: 增加元数据传输相关拦截器
andrewshan May 8, 2024
32a18c4
Merge branch 'polarismesh:main' into main
andrewshan May 9, 2024
0260fdd
feat: 调整example打包脚本
andrewshan May 9, 2024
4faef54
fix: 修复脚本没法跳转的问题
andrewshan May 9, 2024
657caf1
Merge branch 'polarismesh:main' into main
andrewshan May 9, 2024
7779ff8
fix: 修正样例的配置文件
andrewshan May 9, 2024
9c1fcba
fix: 修复熔断无法加载的问题
andrewshan May 10, 2024
56c61c2
Merge branch 'main' into main
andrewshan May 10, 2024
9a54440
fix: 更新北极星的版本号依赖
andrewshan May 10, 2024
3484c70
Merge branch 'main' of https://github.com/andrewshan/polaris-java-agent
andrewshan May 10, 2024
05e58b5
Merge branch 'polarismesh:main' into main
andrewshan May 10, 2024
eb8ad9e
fix: 调整版本依赖
andrewshan May 10, 2024
dc1bea9
Merge branch 'main' of https://github.com/andrewshan/polaris-java-agent
andrewshan May 10, 2024
48a4991
Merge branch 'polarismesh:main' into main
andrewshan May 11, 2024
c26bd51
feat:对齐deployment与application中的服务名定义
andrewshan May 11, 2024
f7d2fcf
Merge branch 'polarismesh:main' into main
andrewshan May 13, 2024
c667586
feat: optimize default-plugin.conf to load once per lifecyle
andrewshan May 13, 2024
011f8b5
Merge branch 'polarismesh:main' into main
andrewshan May 13, 2024
740f1a3
Merge branch 'polarismesh:main' into main
andrewshan May 13, 2024
3ce5576
feat: 优化日志打印,增加polarisLoggingApplicationListener的配置
andrewshan May 13, 2024
9d73cee
Merge branch 'polarismesh:main' into main
andrewshan May 13, 2024
6782b43
fix: 修复启动脚本配置项错误问题
andrewshan May 14, 2024
28e16df
Merge branch 'polarismesh:main' into main
andrewshan May 14, 2024
fc227c0
Merge branch 'polarismesh:main' into main
andrewshan May 14, 2024
d667954
Merge branch 'polarismesh:main' into main
andrewshan May 14, 2024
1137119
fix: 修复无法javaagent无法获取用户的spring.application.name的问题
andrewshan May 14, 2024
35e493d
Merge branch 'main' of https://github.com/andrewshan/polaris-java-agent
andrewshan May 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.cloud</groupId>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
server.port=65203

spring.application.name=service-a-hoxton
spring.cloud.nacos.discovery.enabled=false
spring.cloud.nacos.discovery.enabled=true
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.enabled=false
spring.cloud.nacos.config.serverAddr=127.0.0.1:8848
spring.cloud.nacos.username='nacos'
spring.cloud.nacos.password='nacos'
management.endpoint.health.show-details=always
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
server.port=65202

spring.application.name=service-b-hoxton
spring.cloud.nacos.discovery.enabled=false
spring.cloud.nacos.discovery.enabled=true
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.enabled=false
spring.cloud.nacos.config.enabled=true
spring.cloud.nacos.config.serverAddr=127.0.0.1:8848
spring.cloud.nacos.username='nacos'
spring.cloud.nacos.password='nacos'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
server.port=65201

spring.application.name=service-c-hoxton
spring.cloud.nacos.discovery.enabled=false
spring.cloud.nacos.discovery.enabled=true
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.enabled=false
spring.cloud.nacos.config.serverAddr=127.0.0.1:8848
spring.cloud.nacos.username='nacos'
spring.cloud.nacos.password='nacos'
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include='*'
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
spring.application.name=service-c-hoxton
spring.cloud.nacos.config.server-addr=127.0.0.1:8848

#nacos certification information
spring.cloud.nacos.username=nacos
spring.cloud.nacos.password=nacos

## nacos-namespace cannot user 'public',cause by 'public' has special handing inside.
#spring.cloud.nacos.config.namespace=public

## you can specify a custom name if you don't want to use the application name.
#spring.cloud.nacos.config.name=test-aaa
#spring.cloud.nacos.config.file-extension=yaml

## not recommended.
#spring.cloud.nacos.config.refreshable-dataids=common.properties
## not recommended.
#spring.cloud.nacos.config.shared-data-ids=common.properties,base-common.properties

## recommended.
spring.cloud.nacos.config.shared-configs[0].data-id=data-source.yaml
spring.cloud.nacos.config.shared-configs[0].refresh=true
## the default value is 'DEFAULT_GROUP' , if not specified.
#spring.cloud.nacos.config.shared-configs[0].group=GROUP_APP1

## not recommended.
#spring.cloud.nacos.config.ext-config[0]=ext.properties
## recommended.
spring.cloud.nacos.config.extension-configs[0].data-id=ext-data-source.yaml
spring.cloud.nacos.config.extension-configs[0].refresh=true

# the setting of reading config log print on stdout
logging.level.com.alibaba.cloud.nacos.client=debug


spring.cloud.nacos.config.refresh-enabled=true
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
server.port=65200

spring.application.name=sc-gateway-hoxton
spring.cloud.nacos.discovery.enabled=false
spring.cloud.nacos.discovery.enabled=true
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.enabled=false
spring.cloud.nacos.config.serverAddr=127.0.0.1:8848
spring.cloud.nacos.username='nacos'
spring.cloud.nacos.password='nacos'
spring.cloud.gateway.discovery.locator.enabled=true
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
server.port=65200

spring.application.name=sc-gateway-hoxton
spring.cloud.nacos.config.enabled=true
spring.cloud.nacos.config.serverAddr=127.0.0.1:8848
spring.cloud.nacos.username='nacos'
spring.cloud.nacos.password='nacos'
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#server.port=65001
#spring.application.name=service-provider-hoxton
#spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
#spring.cloud.nacos.discovery.enabled=false
#spring.cloud.nacos.config.enabled=false
#spring.cloud.gateway.discovery.locator.enabled=false
#spring.cloud.nacos.username=nacos
#spring.cloud.nacos.password=nacos
#
#management.endpoints.web.exposure.include=*
#management.endpoint.health.show-details=always
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.discovery.enabled=true

management.endpoints.web.exposure.include=*
management.endpoint.health.show-details=always
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
server.port=65001
spring.application.name=service-provider-hoxton
spring.cloud.nacos.discovery.server-addr=127.0.0.1:8848
spring.cloud.nacos.discovery.enabled=false
spring.cloud.nacos.config.enabled=false
spring.cloud.gateway.discovery.locator.enabled=false
spring.cloud.nacos.config.server-addr=127.0.0.1:8848
spring.cloud.nacos.config.enabled=true
spring.cloud.nacos.username=nacos
spring.cloud.nacos.password=nacos

management.endpoints.web.exposure.include=*
management.endpoint.health.show-details=always
spring.cloud.nacos.password=nacos
Loading