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 06657e9 Fix openTelemetryPluginIT error (#14069)
06657e9 is described below
commit 06657e9d83534314f3fdf38ef023766ba8af2f82
Author: Guocheng Tang <[email protected]>
AuthorDate: Mon Dec 13 22:08:13 2021 +0800
Fix openTelemetryPluginIT error (#14069)
* fix OpenTelemetryPluginIT test error
* Fix openTelemetryPluginIT error
---
.../integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java | 2 +-
.../src/test/resources/env/engine-env.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test
[...]
index eea93bc..1114522 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java
@@ -80,7 +80,7 @@ public final class OpenTelemetryPluginIT extends BasePluginIT
{
assertNotNull(tracingResult.getDuration());
Map<String, String> localEndPoint =
tracingResult.getLocalEndpoint();
assertNotNull(localEndPoint);
- assertThat(localEndPoint.get("serviceName"),
is("shardingsphere-agent"));
+ assertThat(localEndPoint.get("serviceName"), is("shardingsphere"));
assertNotNull(localEndPoint.get("ipv4"));
Map<String, String> tags = tracingResult.getTags();
switch (name) {
diff --git
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/env/engine-env.properties
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/env/engine-env.properties
index 710ade6..e744461 100644
---
a/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/env/engine-env.properties
+++
b/shardingsphere-test/shardingsphere-integration-agent-test/shardingsphere-integration-agent-test-plugins/shardingsphere-integration-agent-test-opentelemetry/src/test/resources/env/engine-env.properties
@@ -26,4 +26,4 @@ proxy.waitMs=1000
opentelemetry.waitMs=60000
opentelemetry.zipkin.url=http://127.0.0.1:19411/api/v2/traces?serviceName=
-opentelemetry.servername=shardingsphere-agent
+opentelemetry.servername=shardingsphere
