This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 65b28b7 Replace the agent display name from shardingsphere-agent to
shardingsphere (#14050)
65b28b7 is described below
commit 65b28b773333a2e9f84a79852b46367eed0a8e58
Author: 王善民 <[email protected]>
AuthorDate: Sun Dec 12 15:28:37 2021 +0800
Replace the agent display name from shardingsphere-agent to shardingsphere
(#14050)
---
.../shardingsphere-agent-core/src/test/resources/conf/agent.yaml | 6 +++---
.../src/main/resources/conf/agent.yaml | 8 ++++----
.../src/test/resources/conf/agent.yaml | 2 +-
.../src/test/resources/docker/proxy/conf/agent.yaml | 8 ++++----
.../src/test/resources/docker/proxy/conf/agent.yaml | 8 ++++----
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/shardingsphere-agent/shardingsphere-agent-core/src/test/resources/conf/agent.yaml
b/shardingsphere-agent/shardingsphere-agent-core/src/test/resources/conf/agent.yaml
index 67f662a..2daa053 100644
---
a/shardingsphere-agent/shardingsphere-agent-core/src/test/resources/conf/agent.yaml
+++
b/shardingsphere-agent/shardingsphere-agent-core/src/test/resources/conf/agent.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-applicationName: shardingsphere-agent
+applicationName: shardingsphere
ignoredPluginNames:
- Jaeger
- Opentracing
@@ -30,7 +30,7 @@ plugins:
host: "localhost"
port: 5775
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
JAEGER_SAMPLER_TYPE: "const"
JAEGER_SAMPLER_PARAM: "1"
JAEGER_REPORTER_LOG_SPANS: "true"
@@ -39,7 +39,7 @@ plugins:
host: "localhost"
port: 9411
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
URL_VERSION: "/api/v2/spans"
Opentracing:
props:
diff --git
a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/resources/conf/agent.yaml
b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/resources/conf/agent.yaml
index 2517ab1..83544b1 100644
---
a/shardingsphere-agent/shardingsphere-agent-distribution/src/main/resources/conf/agent.yaml
+++
b/shardingsphere-agent/shardingsphere-agent-distribution/src/main/resources/conf/agent.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-applicationName: shardingsphere-agent
+applicationName: shardingsphere
ignoredPluginNames:
- Jaeger
- OpenTracing
@@ -34,14 +34,14 @@ plugins:
host: "localhost"
port: 5775
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
JAEGER_SAMPLER_TYPE: "const"
JAEGER_SAMPLER_PARAM: "1"
Zipkin:
host: "localhost"
port: 9411
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
URL_VERSION: "/api/v2/spans"
SAMPLER_TYPE: "const"
SAMPLER_PARAM: "1"
@@ -50,7 +50,7 @@ plugins:
OPENTRACING_TRACER_CLASS_NAME:
"org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer"
OpenTelemetry:
props:
- otel.resource.attributes: "service.name=shardingsphere-agent"
+ otel.resource.attributes: "service.name=shardingsphere"
otel.traces.exporter: "zipkin"
Logging:
props:
diff --git
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/resources/conf/agent.yaml
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/resources/conf/agent.yaml
index c89bc8a..431a62c 100644
---
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/resources/conf/agent.yaml
+++
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/resources/conf/agent.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-applicationName: shardingsphere-agent
+applicationName: shardingsphere
ignoredPluginNames:
- Jaeger
- OpenTracing
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/agent.yaml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/agent.yaml
index 6cecfeb..2779540 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/agent.yaml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-metrics/src/test/resources/docker/proxy/conf/agent.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-applicationName: shardingsphere-agent
+applicationName: shardingsphere
ignoredPluginNames:
- Jaeger
- Opentracing
@@ -31,7 +31,7 @@ plugins:
host: "localhost"
port: 5775
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
JAEGER_SAMPLER_TYPE: "const"
JAEGER_SAMPLER_PARAM: "1"
JAEGER_REPORTER_LOG_SPANS: "true"
@@ -40,14 +40,14 @@ plugins:
host: "localhost"
port: 9411
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
URL_VERSION: "/api/v2/spans"
Opentracing:
props:
OPENTRACING_TRACER_CLASS_NAME:
"org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer"
OpenTelemetry:
props:
- otel.resource.attributes: "service.name=shardingsphere-agent"
+ otel.resource.attributes: "service.name=shardingsphere"
otel.traces.exporter: "zipkin"
Logging:
props:
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml
index 4605481..a22737e 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/docker/proxy/conf/agent.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
#
-applicationName: shardingsphere-agent
+applicationName: shardingsphere
ignoredPluginNames:
- Jaeger
- Opentracing
@@ -31,7 +31,7 @@ plugins:
host: "localhost"
port: 5775
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
JAEGER_SAMPLER_TYPE: "const"
JAEGER_SAMPLER_PARAM: "1"
JAEGER_REPORTER_LOG_SPANS: "true"
@@ -40,14 +40,14 @@ plugins:
host: "localhost"
port: 9411
props:
- SERVICE_NAME: "shardingsphere-agent"
+ SERVICE_NAME: "shardingsphere"
URL_VERSION: "/api/v2/spans"
Opentracing:
props:
OPENTRACING_TRACER_CLASS_NAME:
"org.apache.skywalking.apm.toolkit.opentracing.SkywalkingTracer"
OpenTelemetry:
props:
- otel.resource.attributes: "service.name=shardingsphere-agent"
+ otel.resource.attributes: "service.name=shardingsphere"
otel.traces.exporter: "zipkin"
otel.exporter.zipkin.endpoint:
"http://zipkin.agent.tracing.opentelemetry.host:9411/api/v2/spans";
Logging:
