Updated storageOptions and HttpStorageOptions

Author: ShreyasSinha

google-cloud-storage/src/main/java/com/google/cloud/storage/HttpStorageOptions.java

@@ -26,15 +26,15 @@
 import com.google.api.gax.rpc.HeaderProvider;
 import com.google.api.gax.tracing.ApiTracerFactory;
 import com.google.auth.Credentials;
+import com.google.cloud.storage.Retrying.DefaultRetrier;
+import com.google.cloud.storage.Retrying.HttpRetrier;
+import com.google.cloud.storage.Retrying.RetryingDependencies;
 import com.google.cloud.ServiceFactory;
 import com.google.cloud.ServiceRpc;
 import com.google.cloud.TransportOptions;
 import com.google.cloud.http.HttpTransportOptions;
 import com.google.cloud.spi.ServiceRpcFactory;
 import com.google.cloud.storage.BlobWriteSessionConfig.WriterFactory;
-import com.google.cloud.storage.Retrying.DefaultRetrier;
-import com.google.cloud.storage.Retrying.HttpRetrier;
-import com.google.cloud.storage.Retrying.RetryingDependencies;
 import com.google.cloud.storage.Storage.BlobWriteOption;
 import com.google.cloud.storage.TransportCompatibility.Transport;
 import com.google.cloud.storage.spi.StorageRpcFactory;
@@ -407,15 +407,7 @@ public Storage create(StorageOptions options) {
             blobWriteSessionConfig = HttpStorageOptions.defaults().getDefaultStorageWriterConfig();
           }
           WriterFactory factory = blobWriteSessionConfig.createFactory(clock);
-          StorageImpl storage =
-              new StorageImpl(
-                  httpStorageOptions,
-                  factory,
-                  new HttpRetrier(
-                      new DefaultRetrier(
-                          OtelStorageDecorator.retryContextDecorator(otel),
-                          RetryingDependencies.simple(
-                              options.getClock(), options.getRetrySettings()))));
+          StorageImpl storage = new StorageImpl(httpStorageOptions, factory, options.createRetrier());
           return OtelStorageDecorator.decorate(storage, otel, Transport.HTTP);
         } catch (IOException e) {
           throw new IllegalStateException(

google-cloud-storage/src/main/java/com/google/cloud/storage/StorageOptions.java

@@ -35,6 +35,10 @@
 import java.util.Locale;
 import java.util.Properties;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import com.google.cloud.storage.Retrying.DefaultRetrier;
+import com.google.cloud.storage.Retrying.HttpRetrier;
+import com.google.cloud.storage.Retrying.Retrier;
+import com.google.cloud.storage.Retrying.RetryingDependencies;
 
 public abstract class StorageOptions extends ServiceOptions<Storage, StorageOptions> {
 
@@ -68,6 +72,13 @@ public abstract class StorageOptions extends ServiceOptions<Storage, StorageOpti
     VERSION = tmp;
   }
 
+  Retrier createRetrier() {
+    return new HttpRetrier(
+        new DefaultRetrier(
+            OtelStorageDecorator.retryContextDecorator(getOpenTelemetry()),
+            RetryingDependencies.simple(getClock(), getRetrySettings())));
+  }
+
   /**
    * @deprecated Use {@link HttpStorageFactory}
    */