more regen

Author: Liudmila Molkova

sdk/storage/azure-storage-blob-v2/src/main/java/com/azure/v2/storage/blob/AppendBlobClient.java

@@ -86,7 +86,7 @@ public Response<Void> createWithResponse(String containerName, String blob, long
         OffsetDateTime immutabilityPolicyExpiry, BlobImmutabilityPolicyMode immutabilityPolicyMode, Boolean legalHold,
         BlobHttpHeaders blobHttpHeaders, CpkInfo cpkInfo, EncryptionScope encryptionScopeParam,
         RequestOptions requestOptions) {
-        return this.instrumentation.instrument("AppendBlob_Create", requestOptions,
+        return this.instrumentation.instrumentWithResponse("AppendBlob_Create", requestOptions,
             updatedOptions -> this.serviceClient.createWithResponse(containerName, blob, contentLength, timeout,
                 metadata, leaseId, ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId,
                 blobTagsString, immutabilityPolicyExpiry, immutabilityPolicyMode, legalHold, blobHttpHeaders, cpkInfo,
@@ -193,7 +193,7 @@ public Response<Void> appendBlockWithResponse(String containerName, String blob,
         OffsetDateTime ifUnmodifiedSince, String ifMatch, String ifNoneMatch, String ifTags, String requestId,
         String structuredBodyType, Long structuredContentLength, CpkInfo cpkInfo, EncryptionScope encryptionScopeParam,
         RequestOptions requestOptions) {
-        return this.instrumentation.instrument("AppendBlob_AppendBlock", requestOptions,
+        return this.instrumentation.instrumentWithResponse("AppendBlob_AppendBlock", requestOptions,
             updatedOptions -> this.serviceClient.appendBlockWithResponse(containerName, blob, contentLength, body,
                 timeout, transactionalContentMD5, transactionalContentCrc64, leaseId, maxSize, appendPosition,
                 ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, structuredBodyType,
@@ -314,7 +314,7 @@ public Response<Void> appendBlockFromUrlWithResponse(String containerName, Strin
         String ifTags, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince,
         String sourceIfMatch, String sourceIfNoneMatch, String requestId, String copySourceAuthorization,
         CpkInfo cpkInfo, EncryptionScope encryptionScopeParam, RequestOptions requestOptions) {
-        return this.instrumentation.instrument("AppendBlob_AppendBlockFromUrl", requestOptions,
+        return this.instrumentation.instrumentWithResponse("AppendBlob_AppendBlockFromUrl", requestOptions,
             updatedOptions -> this.serviceClient.appendBlockFromUrlWithResponse(containerName, blob, sourceUrl,
                 contentLength, sourceRange, sourceContentMD5, sourceContentcrc64, timeout, transactionalContentMD5,
                 leaseId, maxSize, appendPosition, ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags,
@@ -419,7 +419,7 @@ public void appendBlockFromUrl(String containerName, String blob, String sourceU
     public Response<Void> sealWithResponse(String containerName, String blob, Integer timeout, String requestId,
         String leaseId, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatch,
         String ifNoneMatch, Long appendPosition, RequestOptions requestOptions) {
-        return this.instrumentation.instrument("AppendBlob_Seal", requestOptions,
+        return this.instrumentation.instrumentWithResponse("AppendBlob_Seal", requestOptions,
             updatedOptions -> this.serviceClient.sealWithResponse(containerName, blob, timeout, requestId, leaseId,
                 ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, appendPosition, updatedOptions));
     }

sdk/storage/azure-storage-blob-v2/src/main/java/com/azure/v2/storage/blob/AzureBlobStorageBuilder.java

@@ -33,7 +33,7 @@
  */
 @ServiceClientBuilder(
     serviceClients = {
-        ServiceClient.class,
+        StorageServiceClient.class,
         ContainerClient.class,
         BlobClient.class,
         PageBlobClient.class,
@@ -193,7 +193,7 @@ public AzureBlobStorageBuilder configuration(Configuration configuration) {
 
     /**
      * Sets The URL of the service account, container, or blob that is the target of the desired operation.
-     * 
+     *
      * @param url the url value.
      * @return the AzureBlobStorageBuilder.
      */
@@ -211,7 +211,7 @@ public AzureBlobStorageBuilder url(String url) {
 
     /**
      * Sets Specifies the version of the operation to use for this request.
-     * 
+     *
      * @param version the version value.
      * @return the AzureBlobStorageBuilder.
      */
@@ -223,7 +223,7 @@ public AzureBlobStorageBuilder version(String version) {
 
     /**
      * Builds an instance of AzureBlobStorageImpl with the provided parameters.
-     * 
+     *
      * @return an instance of AzureBlobStorageImpl.
      */
     @Metadata(generated = true)
@@ -261,22 +261,22 @@ private HttpPipeline createHttpPipeline() {
 
     /**
      * Builds an instance of ServiceClient class.
-     * 
+     *
      * @return an instance of ServiceClient.
      */
     @Metadata(generated = true)
-    public ServiceClient buildServiceClient() {
+    public StorageServiceClient buildServiceClient() {
         HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
-        return new ServiceClient(buildInnerClient().getServices(), instrumentation);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
+        return new StorageServiceClient(buildInnerClient().getServices(), instrumentation);
     }
 
     /**
      * Builds an instance of ContainerClient class.
-     * 
+     *
      * @return an instance of ContainerClient.
      */
     @Metadata(generated = true)
@@ -285,13 +285,13 @@ public ContainerClient buildContainerClient() {
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
         return new ContainerClient(buildInnerClient().getContainers(), instrumentation);
     }
 
     /**
      * Builds an instance of BlobClient class.
-     * 
+     *
      * @return an instance of BlobClient.
      */
     @Metadata(generated = true)
@@ -300,13 +300,13 @@ public BlobClient buildBlobClient() {
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
         return new BlobClient(buildInnerClient().getBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of PageBlobClient class.
-     * 
+     *
      * @return an instance of PageBlobClient.
      */
     @Metadata(generated = true)
@@ -315,13 +315,13 @@ public PageBlobClient buildPageBlobClient() {
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
         return new PageBlobClient(buildInnerClient().getPageBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of AppendBlobClient class.
-     * 
+     *
      * @return an instance of AppendBlobClient.
      */
     @Metadata(generated = true)
@@ -330,13 +330,13 @@ public AppendBlobClient buildAppendBlobClient() {
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
         return new AppendBlobClient(buildInnerClient().getAppendBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of BlockBlobClient class.
-     * 
+     *
      * @return an instance of BlockBlobClient.
      */
     @Metadata(generated = true)
@@ -345,7 +345,7 @@ public BlockBlobClient buildBlockBlobClient() {
             ? new HttpInstrumentationOptions()
             : this.httpInstrumentationOptions;
         Instrumentation instrumentation
-            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, null);
         return new BlockBlobClient(buildInnerClient().getBlockBlobs(), instrumentation);
     }
 }