kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix jedis 2.x plugin bug and add test for redis cluster (#580) 

* fix bug and add test for redist cluster

* add test to flow

---------

Co-authored-by: litexu <litexu@tencent.com>
This commit is contained in:
xu1009 2023-07-10 21:27:10 +08:00 committed by GitHub
parent c9a61701f1
commit d8dcc79bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 773 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/plugins-test.1.yaml vendored
View File

@ -67,6 +67,7 @@ jobs:
- jedis-3.1.x-plus-scenario
- jedis-4.x-scenario
- jedis-3.3.x-plus-scenario
- jedis-2.x-3.x-cluster-scenario
- jetty-scenario
- kafka-scenario
- kotlin-coroutine-scenario

1
CHANGES.md
View File

@ -12,6 +12,7 @@ Release Notes.
access name, method cache value field. All names are under `sw$` name trait. They are predictable and unchanged after
re-transform.
* Fix witness class in springmvc-annotation-5.x-plugin to avoid falling into v3 use cases.
* Fix Jedis-2.x plugin bug and add test for redis cluster scene
```
* SWAuxiliaryTypeNamingStrategy

30
apm-sniffer/apm-sdk-plugin/jedis-plugins/jedis-2.x-3.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jedis/v3/JedisClusterConstructorWithHostAndPortArgInterceptor.java Normal file
View File

@ -0,0 +1,30 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.skywalking.apm.plugin.jedis.v3;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance;
import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor;
import redis.clients.jedis.HostAndPort;
public class JedisClusterConstructorWithHostAndPortArgInterceptor implements InstanceConstructorInterceptor {
@Override
public void onConstruct(EnhancedInstance objInst, Object[] allArguments) throws Throwable {
HostAndPort hostAndPort = (HostAndPort) allArguments[0];
objInst.setSkyWalkingDynamicField(hostAndPort.getHost() + ":" + hostAndPort.getPort());
}
}

21
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/bin/startup.sh Normal file
View File

@ -0,0 +1,21 @@
#!/bin/bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
home="$(cd "$(dirname $0)"; pwd)"
java -jar ${agent_opts} -Dredis.cluster=${REDIS_CLUSTER_SERVER} ${home}/../libs/jedis-2.x-3.x-cluster-scenario.jar &

171
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/config/expectedData.yaml Normal file
View File

@ -0,0 +1,171 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
segmentItems:
- serviceName: jedis-2.x-3.x-cluster-scenario
segmentSize: ge 1
segments:
- segmentId: not null
spans:
- operationName: Jedis/echo
operationId: 0
parentSpanId: 0
spanId: 1
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379;redis-server2:6379;redis-server1:6379;
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: echo}
- {key: cache.key, value: Test}
- operationName: Jedis/set
operationId: 0
parentSpanId: 0
spanId: 2
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379;redis-server2:6379;redis-server1:6379;
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: set}
- {key: cache.key, value: a}
- {key: cache.op, value: write}
- operationName: Jedis/get
operationId: 0
parentSpanId: 0
spanId: 3
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379;redis-server2:6379;redis-server1:6379;
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: get}
- {key: cache.key, value: a}
- {key: cache.op, value: read}
- operationName: Jedis/del
operationId: 0
parentSpanId: 0
spanId: 4
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379;redis-server2:6379;redis-server1:6379;
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: del}
- {key: cache.key, value: a}
- {key: cache.op, value: write}
- operationName: Jedis/echo
operationId: 0
parentSpanId: 0
spanId: 5
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: echo}
- {key: cache.key, value: Test}
- operationName: Jedis/set
operationId: 0
parentSpanId: 0
spanId: 6
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: set}
- {key: cache.key, value: b}
- {key: cache.op, value: write}
- operationName: Jedis/get
operationId: 0
parentSpanId: 0
spanId: 7
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: get}
- {key: cache.key, value: b}
- {key: cache.op, value: read}
- operationName: Jedis/del
operationId: 0
parentSpanId: 0
spanId: 8
spanLayer: Cache
startTime: gt 0
endTime: gt 0
componentId: 30
isError: false
spanType: Exit
peer: redis-server3:6379
skipAnalysis: false
tags:
- {key: cache.type, value: Redis}
- {key: cache.cmd, value: del}
- {key: cache.key, value: b}
- {key: cache.op, value: write}
- operationName: GET:/jedis-2.x-3.x-cluster-scenario/case/jedis-2.x-3.x-cluster-scenario
operationId: 0
parentSpanId: -1
spanId: 0
spanLayer: Http
startTime: gt 0
endTime: gt 0
componentId: 1
isError: false
spanType: Entry
peer: ''
skipAnalysis: false
tags:
- {key: url, value: 'http://localhost:8080/jedis-2.x-3.x-cluster-scenario/case/jedis-2.x-3.x-cluster-scenario'}
- {key: http.method, value: GET}
- {key: http.status_code, value: '200'}

48
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/configuration.yml Normal file
View File

@ -0,0 +1,48 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
type: jvm
entryService: http://localhost:8080/jedis-2.x-3.x-cluster-scenario/case/jedis-2.x-3.x-cluster-scenario
healthCheck: http://localhost:8080/jedis-2.x-3.x-cluster-scenario/case/healthCheck
startScript: ./bin/startup.sh
environment:
- REDIS_CLUSTER_SERVER=redis-server1:6379,redis-server2:6379,redis-server3:6379
- SW_PLUGIN_JEDIS_TRACE_REDIS_PARAMETERS=true
dependencies:
redis-server1:
image: bitnami/redis-cluster:7.0
hostname: redis-server1
environment:
- ALLOW_EMPTY_PASSWORD=true
- REDIS_NODES=redis-server1 redis-server2 redis-server3
redis-server2:
image: bitnami/redis-cluster:7.0
hostname: redis-server2
environment:
- ALLOW_EMPTY_PASSWORD=true
- REDIS_NODES=redis-server1 redis-server2 redis-server3
redis-server3:
image: bitnami/redis-cluster:7.0
hostname: redis-server3
depends_on:
- redis-server1
- redis-server2
environment:
- ALLOW_EMPTY_PASSWORD=true
- REDIS_CLUSTER_REPLICAS=0
- REDIS_NODES=redis-server1 redis-server2 redis-server3
- REDIS_CLUSTER_CREATOR=yes

169
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/pom.xml Normal file
View File

@ -0,0 +1,169 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<groupId>org.apache.skywalking.apm.testcase</groupId>
<artifactId>jedis-2.x-3.x-cluster-scenario</artifactId>
<version>1.0.0</version>
<packaging>jar</packaging>
<modelVersion>4.0.0</modelVersion>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>1.8</compiler.version>
<spring.boot.version>2.1.6.RELEASE</spring.boot.version>
<test.framework.version>3.0.1</test.framework.version>
</properties>
<name>jedis-2.x-3.x-cluster-scenario</name>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring.boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${test.framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
</dependencies>
<build>
<finalName>jedis-2.x-3.x-cluster-scenario</finalName>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.38</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>1.5.9.RELEASE</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${compiler.version}</source>
<target>${compiler.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>assemble</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
<outputDirectory>./target/</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<configLocation>${maven.multiModuleProjectDirectory}/apm-checkstyle/checkStyle.xml</configLocation>
<headerLocation>${maven.multiModuleProjectDirectory}/apm-checkstyle/CHECKSTYLE_HEAD</headerLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<failOnViolation>${checkstyle.fails.on.error}</failOnViolation>
<sourceDirectories>
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<sourceDirectory>${project.build.testSourceDirectory}</sourceDirectory>
<sourceDirectory>scenarios/dbcp-2.x-scenario</sourceDirectory>
<sourceDirectory>scenarios/druid-1.x-scenario</sourceDirectory>
<sourceDirectory>scenarios/druid-1.x</sourceDirectory>
</sourceDirectories>
<resourceIncludes>
**/*.properties,
**/*.sh,
**/*.bat,
**/*.yml,
**/*.yaml,
**/*.xml
</resourceIncludes>
<excludes>
**/target/generated-test-sources/**,
**/target/generated-sources/**,
**/org/apache/skywalking/apm/testcase/baidu.brpc/interfaces/Echo.java,
**/org/apache/skywalking/apm/testcase/grpc/proto/*.java
</excludes>
<propertyExpansion>
import.control=${maven.multiModuleProjectDirectory}/apm-checkstyle/importControl.xml
</propertyExpansion>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>process-sources</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

41
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/assembly/assembly.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>./bin</directory>
<fileMode>0775</fileMode>
</fileSet>
</fileSets>
<files>
<file>
<source>${project.build.directory}/jedis-2.x-3.x-cluster-scenario.jar</source>
<outputDirectory>./libs</outputDirectory>
<fileMode>0775</fileMode>
</file>
</files>
</assembly>

34
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/Application.java Normal file
View File

@ -0,0 +1,34 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.testcase.jedis;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class Application {
public static void main(String[] args) {
try {
SpringApplication.run(Application.class, args);
} catch (Exception e) {
// Never do this
}
}
}

60
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/CaseController.java Normal file
View File

@ -0,0 +1,60 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.testcase.jedis.controller;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/case")
public class CaseController {
private static final String SUCCESS = "Success";
@Value("${redis.cluster:127.0.0.1:6379}")
private String redisCluster;
@RequestMapping("/jedis-2.x-3.x-cluster-scenario")
@ResponseBody
public String testcase() throws Exception {
try (RedisClusterCommandExecutor command = new RedisClusterCommandExecutor(redisCluster)) {
command.set("a", "a");
command.get("a");
command.del("a");
}
try (RedisSingleClusterCommandExecutor command = new RedisSingleClusterCommandExecutor(redisCluster)) {
command.set("b", "b");
command.get("b");
command.del("b");
}
return SUCCESS;
}
@RequestMapping("/healthCheck")
@ResponseBody
public String healthCheck() throws Exception {
try (RedisClusterCommandExecutor command = new RedisClusterCommandExecutor(redisCluster)) {
}
return SUCCESS;
}
}

58
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisClusterCommandExecutor.java Normal file
View File

@ -0,0 +1,58 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.testcase.jedis.controller;
import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.JedisCluster;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class RedisClusterCommandExecutor implements AutoCloseable {
private JedisCluster jedisCluster;
public RedisClusterCommandExecutor(String redisCluster) {
List<String> hostAndPortString = Arrays.asList(redisCluster.split(","));
Set<HostAndPort> hostAndPorts = new HashSet<>();
hostAndPortString.forEach(it -> {
String[] hostPort = it.split(":");
hostAndPorts.add(new HostAndPort(hostPort[0], Integer.parseInt(hostPort[1])));
});
jedisCluster = new JedisCluster(hostAndPorts);
jedisCluster.echo("Test");
}
public void set(String key, String value) {
jedisCluster.set(key, value);
}
public void get(String key) {
jedisCluster.get(key);
}
public void del(String key) {
jedisCluster.del(key);
}
public void close() throws Exception {
jedisCluster.close();
}
}

66
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/java/org/apache/skywalking/apm/testcase/jedis/controller/RedisSingleClusterCommandExecutor.java Normal file
View File

@ -0,0 +1,66 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package org.apache.skywalking.apm.testcase.jedis.controller;
import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.JedisCluster;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
public class RedisSingleClusterCommandExecutor implements AutoCloseable {
private JedisCluster jedisCluster;
public RedisSingleClusterCommandExecutor(String redisCluster) {
List<String> hostAndPortString = Arrays.asList(redisCluster.split(","));
Set<HostAndPort> hostAndPorts = new HashSet<>();
hostAndPortString.forEach(it -> {
String[] hostPort = it.split(":");
hostAndPorts.add(new HostAndPort(hostPort[0], Integer.parseInt(hostPort[1])));
});
try {
jedisCluster = new JedisCluster(hostAndPorts.iterator().next());
} catch (Throwable throwable) {
jedisCluster = new JedisCluster(Collections.singleton(hostAndPorts.iterator().next()));
}
jedisCluster.echo("Test");
}
public void set(String key, String value) {
jedisCluster.set(key, value);
}
public void get(String key) {
jedisCluster.get(key);
}
public void del(String key) {
jedisCluster.del(key);
}
@Override
public void close() throws Exception {
}
}

21
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/resources/application.yaml Normal file
View File

@ -0,0 +1,21 @@
#
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
server:
port: 8080
servlet:
context-path: /jedis-2.x-3.x-cluster-scenario

30
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/src/main/resources/log4j2.xml Normal file
View File

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<Configuration status="WARN">
<Appenders>
<Console name="Console" target="SYSTEM_ERR">
<PatternLayout charset="UTF-8" pattern="[%d{yyyy-MM-dd HH:mm:ss:SSS}] [%p] - %l - %m%n"/>
</Console>
</Appenders>
<Loggers>
<Root level="WARN">
<AppenderRef ref="Console"/>
</Root>
</Loggers>
</Configuration>

22
test/plugin/scenarios/jedis-2.x-3.x-cluster-scenario/support-version.list Normal file
View File

@ -0,0 +1,22 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
3.8.0
3.5.2
3.0.1
2.9.0
2.8.2