Skip to content

Remove unused DataStax Astra support #1034

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.

Sign up for GitHub

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
dkropachev wants to merge 2 commits into
base: scylla-4.x
Choose a base branch
from
Open

Remove unused DataStax Astra support #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cca0952
Remove unused DataStax Astra support
dkropachev Aug 31, 2026
d16e315
Address Astra removal review feedback
dkropachev Sep 2, 2026
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
5 changes: 0 additions & 5 deletions core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@
<artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<resources>
Expand Down
8 changes: 0 additions & 8 deletions core/src/main/java/com/datastax/oss/driver/api/core/config/DefaultDriverOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,14 +869,6 @@ public enum DefaultDriverOption implements DriverOption {
*/
NETTY_DAEMON("advanced.netty.daemon"),

/**
* The location of the cloud secure bundle used to connect to DataStax Apache Cassandra as a
* service.
*
* <p>Value-type: {@link String}
*/
CLOUD_SECURE_CONNECT_BUNDLE("basic.cloud.secure-connect-bundle"),

/**
* Whether the slow replica avoidance should be enabled in the default LBP.
*
Expand Down
6 changes: 0 additions & 6 deletions core/src/main/java/com/datastax/oss/driver/api/core/config/TypedDriverOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,6 @@ public String toString() {
/** Whether the threads created by the driver should be daemon threads. */
public static final TypedDriverOption<Boolean> NETTY_DAEMON =
new TypedDriverOption<>(DefaultDriverOption.NETTY_DAEMON, GenericType.BOOLEAN);
/**
* The location of the cloud secure bundle used to connect to DataStax Apache Cassandra as a
* service.
*/
public static final TypedDriverOption<String> CLOUD_SECURE_CONNECT_BUNDLE =
new TypedDriverOption<>(DefaultDriverOption.CLOUD_SECURE_CONNECT_BUNDLE, GenericType.STRING);
/** Whether the slow replica avoidance should be enabled in the default LBP. */
public static final TypedDriverOption<Boolean> LOAD_BALANCING_POLICY_SLOW_AVOIDANCE =
new TypedDriverOption<>(
Expand Down
17 changes: 0 additions & 17 deletions core/src/main/java/com/datastax/oss/driver/api/core/session/ProgrammaticArguments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -68,7 +67,6 @@ public static Builder builder() {
private final ClassLoader classLoader;
private final AuthProvider authProvider;
private final SslEngineFactory sslEngineFactory;
private final InetSocketAddress cloudProxyAddress;
private final UUID startupClientId;
private final String startupApplicationName;
private final String startupApplicationVersion;
Expand All @@ -88,7 +86,6 @@ private ProgrammaticArguments(
@Nullable ClassLoader classLoader,
@Nullable AuthProvider authProvider,
@Nullable SslEngineFactory sslEngineFactory,
@Nullable InetSocketAddress cloudProxyAddress,
@Nullable UUID startupClientId,
@Nullable String startupApplicationName,
@Nullable String startupApplicationVersion,
Expand All @@ -107,7 +104,6 @@ private ProgrammaticArguments(
this.classLoader = classLoader;
this.authProvider = authProvider;
this.sslEngineFactory = sslEngineFactory;
this.cloudProxyAddress = cloudProxyAddress;
this.startupClientId = startupClientId;
this.startupApplicationName = startupApplicationName;
this.startupApplicationVersion = startupApplicationVersion;
Expand Down Expand Up @@ -173,11 +169,6 @@ public SslEngineFactory getSslEngineFactory() {
return sslEngineFactory;
}

@Nullable
public InetSocketAddress getCloudProxyAddress() {
return cloudProxyAddress;
}

@Nullable
public UUID getStartupClientId() {
return startupClientId;
Expand Down Expand Up @@ -223,7 +214,6 @@ public static class Builder {
private ClassLoader classLoader;
private AuthProvider authProvider;
private SslEngineFactory sslEngineFactory;
private InetSocketAddress cloudProxyAddress;
private UUID startupClientId;
private String startupApplicationName;
private String startupApplicationVersion;
Expand Down Expand Up @@ -388,12 +378,6 @@ public Builder withClassLoader(@Nullable ClassLoader classLoader) {
return this;
}

@NonNull
public Builder withCloudProxyAddress(@Nullable InetSocketAddress cloudAddress) {
Comment thread
dkropachev marked this conversation as resolved.
this.cloudProxyAddress = cloudAddress;
return this;
}

@NonNull
public Builder withAuthProvider(@Nullable AuthProvider authProvider) {
this.authProvider = authProvider;
Expand Down Expand Up @@ -456,7 +440,6 @@ public ProgrammaticArguments build() {
classLoader,
authProvider,
sslEngineFactory,
cloudProxyAddress,
startupClientId,
startupApplicationName,
startupApplicationVersion,
Expand Down
182 changes: 0 additions & 182 deletions core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import com.datastax.oss.driver.api.core.auth.ProgrammaticPlainTextAuthProvider;
import com.datastax.oss.driver.api.core.config.ClientRoutesConfig;
import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
import com.datastax.oss.driver.api.core.config.DriverConfig;
import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
import com.datastax.oss.driver.api.core.config.DriverExecutionProfile;
import com.datastax.oss.driver.api.core.context.DriverContext;
Expand All @@ -48,32 +47,23 @@
import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry;
import com.datastax.oss.driver.api.core.uuid.Uuids;
import com.datastax.oss.driver.internal.core.ContactPoints;
import com.datastax.oss.driver.internal.core.config.cloud.CloudConfig;
import com.datastax.oss.driver.internal.core.config.cloud.CloudConfigFactory;
import com.datastax.oss.driver.internal.core.config.typesafe.DefaultDriverConfigLoader;
import com.datastax.oss.driver.internal.core.context.DefaultDriverContext;
import com.datastax.oss.driver.internal.core.context.InternalDriverContext;
import com.datastax.oss.driver.internal.core.metadata.DefaultEndPoint;
import com.datastax.oss.driver.internal.core.session.DefaultSession;
import com.datastax.oss.driver.internal.core.tracker.W3CContextRequestIdGenerator;
import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation;
import com.datastax.oss.driver.internal.core.util.concurrent.CompletableFutures;
import edu.umd.cs.findbugs.annotations.NonNull;
import edu.umd.cs.findbugs.annotations.Nullable;
import java.io.InputStream;
import java.net.InetSocketAddress;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletionStage;
import java.util.function.Predicate;
import javax.net.ssl.SSLContext;
Expand All @@ -92,8 +82,6 @@
@NotThreadSafe
public abstract class SessionBuilder<SelfT extends SessionBuilder, SessionT> {

public static final String ASTRA_PAYLOAD_KEY = "traceparent";

private static final Logger LOG = LoggerFactory.getLogger(SessionBuilder.class);

@SuppressWarnings("unchecked")
Expand All @@ -102,11 +90,8 @@ public abstract class SessionBuilder<SelfT extends SessionBuilder, SessionT> {
protected DriverConfigLoader configLoader;
protected Set<EndPoint> programmaticContactPoints = new HashSet<>();
protected CqlIdentifier keyspace;
protected Callable<InputStream> cloudConfigInputStream;
protected ProgrammaticArguments.Builder programmaticArgumentsBuilder =
ProgrammaticArguments.builder();
private boolean programmaticSslFactory = false;
private boolean programmaticLocalDatacenter = false;

/**
* Sets the configuration loader to use.
Expand Down Expand Up @@ -427,7 +412,6 @@ public SelfT withCredentials(
*/
@NonNull
public SelfT withSslEngineFactory(@Nullable SslEngineFactory sslEngineFactory) {
this.programmaticSslFactory = true;
this.programmaticArgumentsBuilder.withSslEngineFactory(sslEngineFactory);
return self;
}
Expand Down Expand Up @@ -465,7 +449,6 @@ public SelfT withSslContext(@Nullable SSLContext sslContext) {
* if you use a third-party implementation, refer to their documentation.
*/
public SelfT withLocalDatacenter(@NonNull String profileName, @NonNull String localDatacenter) {
this.programmaticLocalDatacenter = true;
this.programmaticArgumentsBuilder.withLocalDatacenter(profileName, localDatacenter);
return self;
}
Expand Down Expand Up @@ -647,31 +630,6 @@ public SelfT withClassLoader(@Nullable ClassLoader classLoader) {
return self;
}

/**
* Configures this SessionBuilder for Cloud deployments by retrieving connection information from
* the provided {@link Path}.
*
* <p>To connect to a Cloud database, you must first download the secure database bundle from the
* DataStax Astra console that contains the connection information, then instruct the driver to
* read its contents using either this method or one if its variants.
*
* <p>For more information, please refer to the DataStax Astra documentation.
*
* @param cloudConfigPath Path to the secure connect bundle zip file.
* @see #withCloudSecureConnectBundle(URL)
* @see #withCloudSecureConnectBundle(InputStream)
*/
@NonNull
public SelfT withCloudSecureConnectBundle(@NonNull Path cloudConfigPath) {
Comment thread
dkropachev marked this conversation as resolved.
try {
URL cloudConfigUrl = cloudConfigPath.toAbsolutePath().normalize().toUri().toURL();
this.cloudConfigInputStream = cloudConfigUrl::openStream;
} catch (MalformedURLException e) {
throw new IllegalArgumentException("Incorrect format of cloudConfigPath", e);
}
return self;
}

/**
* Registers a CodecRegistry to use for the session.
*
Expand All @@ -684,72 +642,6 @@ public SelfT withCodecRegistry(@Nullable MutableCodecRegistry codecRegistry) {
return self;
}

/**
* Configures this SessionBuilder for Cloud deployments by retrieving connection information from
* the provided {@link URL}.
*
* <p>To connect to a Cloud database, you must first download the secure database bundle from the
* DataStax Astra console that contains the connection information, then instruct the driver to
* read its contents using either this method or one if its variants.
*
* <p>For more information, please refer to the DataStax Astra documentation.
*
* @param cloudConfigUrl URL to the secure connect bundle zip file.
* @see #withCloudSecureConnectBundle(Path)
* @see #withCloudSecureConnectBundle(InputStream)
*/
@NonNull
public SelfT withCloudSecureConnectBundle(@NonNull URL cloudConfigUrl) {
this.cloudConfigInputStream = cloudConfigUrl::openStream;
return self;
}

/**
* Configures this SessionBuilder for Cloud deployments by retrieving connection information from
* the provided {@link InputStream}.
*
* <p>To connect to a Cloud database, you must first download the secure database bundle from the
* DataStax Astra console that contains the connection information, then instruct the driver to
* read its contents using either this method or one if its variants.
*
* <p>For more information, please refer to the DataStax Astra documentation.
*
* <p>Note that the provided stream will be consumed <em>and closed</em> when either {@link
* #build()} or {@link #buildAsync()} are called; attempting to reuse it afterwards will result in
* an error being thrown.
*
* @param cloudConfigInputStream A stream containing the secure connect bundle zip file.
* @see #withCloudSecureConnectBundle(Path)
* @see #withCloudSecureConnectBundle(URL)
*/
@NonNull
public SelfT withCloudSecureConnectBundle(@NonNull InputStream cloudConfigInputStream) {
this.cloudConfigInputStream = () -> cloudConfigInputStream;
return self;
}

/**
* Configures this SessionBuilder to use the provided Cloud proxy endpoint.
*
* <p>Normally, this method should not be called directly; the normal and easiest way to configure
* the driver for Cloud deployments is through a {@linkplain #withCloudSecureConnectBundle(URL)
* secure connect bundle}.
*
* <p>Setting this option to any non-null address will make the driver use a special topology
* monitor tailored for Cloud deployments. This topology monitor assumes that the target cluster
* should be contacted through the proxy specified here, using SNI routing.
*
* <p>For more information, please refer to the DataStax Astra documentation.
*
* @param cloudProxyAddress The address of the Cloud proxy to use.
* @see <a href="https://en.wikipedia.org/wiki/Server_Name_Indication">Server Name Indication</a>
*/
@NonNull
public SelfT withCloudProxyAddress(@Nullable InetSocketAddress cloudProxyAddress) {
this.programmaticArgumentsBuilder.withCloudProxyAddress(cloudProxyAddress);
return self;
}

/**
* Configures this session to use client routes for cloud private-endpoint deployments.
*
Expand Down Expand Up @@ -910,52 +802,8 @@ protected final CompletionStage<CqlSession> buildDefaultSessionAsync() {
: defaultConfigLoader(programmaticArguments.getClassLoader());

DriverExecutionProfile defaultConfig = configLoader.getInitialConfig().getDefaultProfile();
if (cloudConfigInputStream == null) {
String configUrlString =
defaultConfig.getString(DefaultDriverOption.CLOUD_SECURE_CONNECT_BUNDLE, null);
if (configUrlString != null) {
cloudConfigInputStream = () -> getURL(configUrlString).openStream();
}
}
List<String> configContactPoints =
defaultConfig.getStringList(DefaultDriverOption.CONTACT_POINTS, Collections.emptyList());
if (cloudConfigInputStream != null) {
// override request id generator, unless user has already set it
if (programmaticArguments.getRequestIdGenerator() == null) {
programmaticArgumentsBuilder.withRequestIdGenerator(
new W3CContextRequestIdGenerator(ASTRA_PAYLOAD_KEY));
LOG.debug(
"A secure connect bundle is provided, using W3CContextRequestIdGenerator as request ID generator.");
}
if (!programmaticContactPoints.isEmpty() || !configContactPoints.isEmpty()) {
LOG.info(
"Both a secure connect bundle and contact points were provided. These are mutually exclusive. The contact points from the secure bundle will have priority.");
// clear the contact points provided in the setting file and via addContactPoints
configContactPoints = Collections.emptyList();
programmaticContactPoints = new HashSet<>();
}

if (programmaticSslFactory
|| defaultConfig.isDefined(DefaultDriverOption.SSL_ENGINE_FACTORY_CLASS)) {
LOG.info(
"Both a secure connect bundle and SSL options were provided. They are mutually exclusive. The SSL options from the secure bundle will have priority.");
}
CloudConfig cloudConfig =
new CloudConfigFactory().createCloudConfig(cloudConfigInputStream.call());
addContactEndPoints(cloudConfig.getEndPoints());

boolean localDataCenterDefined =
anyProfileHasDatacenterDefined(configLoader.getInitialConfig());
if (programmaticLocalDatacenter || localDataCenterDefined) {
LOG.info(
"Both a secure connect bundle and a local datacenter were provided. They are mutually exclusive. The local datacenter from the secure bundle will have priority.");
programmaticArgumentsBuilder.clearDatacenters();
}
withLocalDatacenter(cloudConfig.getLocalDatacenter());
withSslEngineFactory(cloudConfig.getSslEngineFactory());
withCloudProxyAddress(cloudConfig.getProxyAddress());
programmaticArguments = programmaticArgumentsBuilder.build();
}

boolean resolveAddresses =
defaultConfig.getBoolean(DefaultDriverOption.RESOLVE_CONTACT_POINTS, false);
Expand All @@ -980,36 +828,6 @@ protected final CompletionStage<CqlSession> buildDefaultSessionAsync() {
}
}

private boolean anyProfileHasDatacenterDefined(DriverConfig driverConfig) {
for (DriverExecutionProfile driverExecutionProfile : driverConfig.getProfiles().values()) {
if (driverExecutionProfile.isDefined(DefaultDriverOption.LOAD_BALANCING_LOCAL_DATACENTER)) {
return true;
}
}
return false;
}

/**
* Returns URL based on the configUrl setting. If the configUrl has no protocol provided, the
* method will fallback to file:// protocol and return URL that has file protocol specified.
*
* @param configUrl url to config secure bundle
* @return URL with file protocol if there was not explicit protocol provided in the configUrl
* setting
*/
private URL getURL(String configUrl) throws MalformedURLException {
try {
return new URL(configUrl);
} catch (MalformedURLException e1) {
try {
return Paths.get(configUrl).toAbsolutePath().normalize().toUri().toURL();
} catch (MalformedURLException e2) {
e2.addSuppressed(e1);
throw e2;
}
}
}

/**
* This <b>must</b> return an instance of {@code InternalDriverContext} (it's not expressed
* directly in the signature to avoid leaking that type through the protected API).
Expand Down
Loading
Loading