-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Identify spring-data-redis using underlying drivers (jedis or lettuce) #3268
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
Open
viktoriya-kutsarova
wants to merge
1
commit into
spring-projects:main
Choose a base branch
from
viktoriya-kutsarova:topic/pass-library-information-to-drivers
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
130 changes: 130 additions & 0 deletions
130
src/main/java/org/springframework/data/redis/util/RedisClientLibraryInfo.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| /* | ||
| * Copyright 2025 the original author or authors. | ||
| * | ||
| * Licensed 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 | ||
| * | ||
| * https://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.springframework.data.redis.util; | ||
|
|
||
| import org.jspecify.annotations.Nullable; | ||
|
|
||
| import org.springframework.util.StringUtils; | ||
|
|
||
| /** | ||
| * Utility class for building Spring Data Redis client library identification | ||
| * strings for Redis CLIENT SETINFO. | ||
| * <p> | ||
| * Supports the Redis CLIENT SETINFO custom suffix pattern: | ||
| * {@code (?<custom-name>[ -~]+) v(?<custom-version>[\d\.]+)}. | ||
| * Multiple suffixes can be delimited with semicolons. The recommended format | ||
| * for individual suffixes is {@code <custom-name>_v<custom-version>}. | ||
| * | ||
| * @author Viktoriya Kutsarova | ||
| * @since 4.0 | ||
| */ | ||
| public final class RedisClientLibraryInfo { | ||
|
|
||
| /** | ||
| * Lettuce driver name constant for CLIENT SETINFO. | ||
| */ | ||
| public static final String DRIVER_LETTUCE = "lettuce"; | ||
|
|
||
| /** | ||
| * Spring Data Redis framework name constant for CLIENT SETINFO. | ||
| */ | ||
| public static final String FRAMEWORK_NAME = "spring-data-redis"; | ||
|
|
||
| private static final String SUFFIX_DELIMITER = ";"; | ||
|
|
||
| private static final String VERSION_SEPARATOR = "_v"; | ||
|
|
||
| private static final String UNKNOWN_VERSION = "unknown"; | ||
|
|
||
| /** | ||
| * Get the Spring Data Redis version from the package manifest. | ||
| * Returns "unknown" if the version cannot be determined (for example when | ||
| * running from an IDE or tests without a populated Implementation-Version). | ||
| * | ||
| * @return the Spring Data Redis version, or "unknown" if not available | ||
| */ | ||
| public static String getVersion() { | ||
| Package pkg = RedisClientLibraryInfo.class.getPackage(); | ||
| String version = (pkg != null ? pkg.getImplementationVersion() : null); | ||
| return (version != null ? version : UNKNOWN_VERSION); | ||
| } | ||
|
|
||
| private RedisClientLibraryInfo() { | ||
| } | ||
|
|
||
| /** | ||
| * Build a library name suffix for CLIENT SETINFO in the format: | ||
| * {@code spring-data-redis_v<version>} | ||
| * <p> | ||
| * Note: The underscore before 'v' follows the Redis CLIENT SETINFO pattern recommendation. | ||
| * | ||
| * @return the library name suffix | ||
| */ | ||
| public static String getLibNameSuffix() { | ||
| return FRAMEWORK_NAME + VERSION_SEPARATOR + getVersion(); | ||
| } | ||
|
|
||
| /** | ||
| * Build a library name suffix with additional framework suffix(es) for CLIENT SETINFO. | ||
| * This allows multiple higher-level frameworks to identify themselves in a chain. | ||
| * <p> | ||
| * The {@code additionalSuffix} parameter should already be formatted according to the pattern | ||
| * and can contain multiple frameworks separated by semicolons. | ||
| * <p> | ||
| * Format: {@code <additionalSuffix>;spring-data-redis_v<version>} | ||
| * <p> | ||
| * Example with multiple frameworks: | ||
| * <pre> | ||
| * String suffix = RedisClientInfo.getLibNameSuffix( | ||
| * "spring-security_v6.0.0;spring-session-data-redis_v3.0.0" | ||
| * ); | ||
| * // Returns: "spring-security_v6.0.0;spring-session-data-redis_v3.0.0;spring-data-redis_v4.0.0" | ||
| * </pre> | ||
| * | ||
| * @param additionalSuffix pre-formatted suffix string containing one or more framework identifiers, | ||
| * already in the format "name_version" and separated by semicolons if multiple | ||
| * @return the combined library name suffix with all frameworks and Spring Data Redis info | ||
| */ | ||
| public static String getLibNameSuffix(@Nullable String additionalSuffix) { | ||
| if (!StringUtils.hasText(additionalSuffix)) { | ||
| return getLibNameSuffix(); | ||
| } | ||
| return additionalSuffix + SUFFIX_DELIMITER + getLibNameSuffix(); | ||
| } | ||
|
|
||
| /** | ||
| * Build a complete library name for CLIENT SETINFO by wrapping the suffix with the core driver name. | ||
| * This allows multiple higher-level frameworks to identify themselves in a chain. | ||
| * <p> | ||
| * Format: {@code <driverName>(<additionalSuffix>;spring-data-redis_v<version>)} | ||
| * <p> | ||
| * Example: | ||
| * <pre> | ||
| * String libName = RedisClientInfo.getLibName("lettuce", | ||
| * "spring-security_v6.0.0;spring-session-data-redis_v3.0.0"); | ||
| * // Returns: "lettuce(spring-security_v6.0.0;spring-session-data-redis_v3.0.0;spring-data-redis_v4.0.0)" | ||
| * </pre> | ||
| * | ||
| * @param driverName the core Redis driver name (e.g., "lettuce", "jedis") | ||
| * @param additionalSuffix pre-formatted suffix string containing one or more framework identifiers, | ||
| * already in the format "name_version" and separated by semicolons if multiple | ||
| * @return the complete library name in the format "driverName(additionalSuffix;spring-data-redis_version)" | ||
| */ | ||
| public static String getLibName(String driverName, @Nullable String additionalSuffix) { | ||
| return driverName + "(" + getLibNameSuffix(additionalSuffix) + ")"; | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,9 @@ | |
| import static org.assertj.core.api.Assertions.*; | ||
| import static org.mockito.Mockito.*; | ||
|
|
||
| import java.util.List; | ||
| import org.springframework.data.redis.core.types.RedisClientInfo; | ||
|
|
||
| import org.jspecify.annotations.Nullable; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
@@ -74,6 +77,64 @@ void connectionAppliesClientName() { | |
| assertThat(connection.getClientName()).isEqualTo("clientName"); | ||
| } | ||
|
|
||
| @Test // CLIENT SETINFO | ||
| void clientListReportsJedisLibNameWithSpringDataSuffix() { | ||
|
|
||
| factory = new JedisConnectionFactory( | ||
| new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()), | ||
| JedisClientConfiguration.builder().clientName("clientName").build()); | ||
| factory.afterPropertiesSet(); | ||
| factory.start(); | ||
|
|
||
| try (RedisConnection connection = factory.getConnection()) { | ||
|
|
||
| List<RedisClientInfo> clients = connection.serverCommands().getClientList(); | ||
|
|
||
| RedisClientInfo self = clients.stream() | ||
| .filter(info -> "clientName".equals(info.getName())) | ||
| .findFirst() | ||
| .orElseThrow(); | ||
|
|
||
| String libName = self.get("lib-name"); | ||
|
|
||
| assertThat(libName).isNotNull(); | ||
| assertThat(libName).contains("jedis("); | ||
| assertThat(libName).contains("spring-data-redis_v"); | ||
| } | ||
| } | ||
|
|
||
| @Test // CLIENT SETINFO | ||
| void clientListReportsJedisLibNameWithUpstreamSuffix() { | ||
|
|
||
| String upstreamLibNameSuffix = "spring-session-data-redis_v3.0.0"; | ||
|
|
||
| factory = new JedisConnectionFactory( | ||
| new RedisStandaloneConfiguration(SettingsUtils.getHost(), SettingsUtils.getPort()), | ||
| JedisClientConfiguration.builder().clientName("clientName").build()); | ||
| factory.addUpstreamLibNameSuffix(upstreamLibNameSuffix); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I was thinking we should hide the specifics of building up the suffix from the upstream libraries. Actually I am not sure SDR should do it either, but rather the drivers themselves |
||
| factory.afterPropertiesSet(); | ||
| factory.start(); | ||
|
|
||
| try (RedisConnection connection = factory.getConnection()) { | ||
|
|
||
| List<RedisClientInfo> clients = connection.serverCommands().getClientList(); | ||
|
|
||
| RedisClientInfo self = clients.stream() | ||
| .filter(info -> "clientName".equals(info.getName())) | ||
| .findFirst() | ||
| .orElseThrow(); | ||
|
|
||
| String libName = self.get("lib-name"); | ||
|
|
||
| assertThat(libName).isNotNull(); | ||
| assertThat(libName).contains("jedis("); | ||
| assertThat(libName).contains("spring-data-redis_v"); | ||
| assertThat(libName).contains(upstreamLibNameSuffix); | ||
| } | ||
| } | ||
|
|
||
|
|
||
|
|
||
| @Test // GH-2503 | ||
| void startStopStartConnectionFactory() { | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Formatting seems off here