regen

Author: Liudmila Molkova

sdk/storage/azure-storage-blob-v2/pom.xml

@@ -31,7 +31,7 @@
     <dependency>
       <groupId>io.clientcore</groupId>
       <artifactId>core</artifactId>
-      <version>1.0.0-beta.5</version>
+      <version>1.0.0-beta.6</version>
     </dependency>
     <dependency>
       <groupId>com.azure</groupId>

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

@@ -14,6 +14,7 @@
 import io.clientcore.core.annotations.ServiceClient;
 import io.clientcore.core.http.models.RequestOptions;
 import io.clientcore.core.http.models.Response;
+import io.clientcore.core.instrumentation.Instrumentation;
 import io.clientcore.core.models.binarydata.BinaryData;
 import java.time.OffsetDateTime;
 import java.util.Map;
@@ -26,14 +27,18 @@ public final class AppendBlobClient {
     @Metadata(generated = true)
     private final AppendBlobsImpl serviceClient;
 
+    private final Instrumentation instrumentation;
+
     /**
      * Initializes an instance of AppendBlobClient class.
      * 
      * @param serviceClient the service client implementation.
+     * @param instrumentation the instrumentation instance.
      */
     @Metadata(generated = true)
-    AppendBlobClient(AppendBlobsImpl serviceClient) {
+    AppendBlobClient(AppendBlobsImpl serviceClient, Instrumentation instrumentation) {
         this.serviceClient = serviceClient;
+        this.instrumentation = instrumentation;
     }
 
     /**
@@ -81,10 +86,11 @@ 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.serviceClient.createWithResponse(containerName, blob, contentLength, timeout, metadata, leaseId,
-            ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, blobTagsString,
-            immutabilityPolicyExpiry, immutabilityPolicyMode, legalHold, blobHttpHeaders, cpkInfo, encryptionScopeParam,
-            requestOptions);
+        return this.instrumentation.instrument("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,
+                encryptionScopeParam, updatedOptions));
     }
 
     /**
@@ -129,9 +135,11 @@ public void create(String containerName, String blob, long contentLength, Intege
         String ifMatch, String ifNoneMatch, String ifTags, String requestId, String blobTagsString,
         OffsetDateTime immutabilityPolicyExpiry, BlobImmutabilityPolicyMode immutabilityPolicyMode, Boolean legalHold,
         BlobHttpHeaders blobHttpHeaders, CpkInfo cpkInfo, EncryptionScope encryptionScopeParam) {
-        this.serviceClient.create(containerName, blob, contentLength, timeout, metadata, leaseId, ifModifiedSince,
-            ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, blobTagsString, immutabilityPolicyExpiry,
-            immutabilityPolicyMode, legalHold, blobHttpHeaders, cpkInfo, encryptionScopeParam);
+        this.instrumentation.instrument("AppendBlob_Create", null,
+            updatedOptions -> this.serviceClient.create(containerName, blob, contentLength, timeout, metadata, leaseId,
+                ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, blobTagsString,
+                immutabilityPolicyExpiry, immutabilityPolicyMode, legalHold, blobHttpHeaders, cpkInfo,
+                encryptionScopeParam));
     }
 
     /**
@@ -185,10 +193,11 @@ 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.serviceClient.appendBlockWithResponse(containerName, blob, contentLength, body, timeout,
-            transactionalContentMD5, transactionalContentCrc64, leaseId, maxSize, appendPosition, ifModifiedSince,
-            ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, structuredBodyType, structuredContentLength,
-            cpkInfo, encryptionScopeParam, requestOptions);
+        return this.instrumentation.instrument("AppendBlob_AppendBlock", requestOptions,
+            updatedOptions -> this.serviceClient.appendBlockWithResponse(containerName, blob, contentLength, body,
+                timeout, transactionalContentMD5, transactionalContentCrc64, leaseId, maxSize, appendPosition,
+                ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, structuredBodyType,
+                structuredContentLength, cpkInfo, encryptionScopeParam, updatedOptions));
     }
 
     /**
@@ -239,9 +248,11 @@ public void appendBlock(String containerName, String blob, long contentLength, B
         Long appendPosition, OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatch,
         String ifNoneMatch, String ifTags, String requestId, String structuredBodyType, Long structuredContentLength,
         CpkInfo cpkInfo, EncryptionScope encryptionScopeParam) {
-        this.serviceClient.appendBlock(containerName, blob, contentLength, body, timeout, transactionalContentMD5,
-            transactionalContentCrc64, leaseId, maxSize, appendPosition, ifModifiedSince, ifUnmodifiedSince, ifMatch,
-            ifNoneMatch, ifTags, requestId, structuredBodyType, structuredContentLength, cpkInfo, encryptionScopeParam);
+        this.instrumentation.instrument("AppendBlob_AppendBlock", null,
+            updatedOptions -> this.serviceClient.appendBlock(containerName, blob, contentLength, body, timeout,
+                transactionalContentMD5, transactionalContentCrc64, leaseId, maxSize, appendPosition, ifModifiedSince,
+                ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, requestId, structuredBodyType, structuredContentLength,
+                cpkInfo, encryptionScopeParam));
     }
 
     /**
@@ -303,11 +314,12 @@ 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.serviceClient.appendBlockFromUrlWithResponse(containerName, blob, sourceUrl, contentLength,
-            sourceRange, sourceContentMD5, sourceContentcrc64, timeout, transactionalContentMD5, leaseId, maxSize,
-            appendPosition, ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, sourceIfModifiedSince,
-            sourceIfUnmodifiedSince, sourceIfMatch, sourceIfNoneMatch, requestId, copySourceAuthorization, cpkInfo,
-            encryptionScopeParam, requestOptions);
+        return this.instrumentation.instrument("AppendBlob_AppendBlockFromUrl", requestOptions,
+            updatedOptions -> this.serviceClient.appendBlockFromUrlWithResponse(containerName, blob, sourceUrl,
+                contentLength, sourceRange, sourceContentMD5, sourceContentcrc64, timeout, transactionalContentMD5,
+                leaseId, maxSize, appendPosition, ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags,
+                sourceIfModifiedSince, sourceIfUnmodifiedSince, sourceIfMatch, sourceIfNoneMatch, requestId,
+                copySourceAuthorization, cpkInfo, encryptionScopeParam, updatedOptions));
     }
 
     /**
@@ -367,11 +379,12 @@ public void appendBlockFromUrl(String containerName, String blob, String sourceU
         String ifTags, OffsetDateTime sourceIfModifiedSince, OffsetDateTime sourceIfUnmodifiedSince,
         String sourceIfMatch, String sourceIfNoneMatch, String requestId, String copySourceAuthorization,
         CpkInfo cpkInfo, EncryptionScope encryptionScopeParam) {
-        this.serviceClient.appendBlockFromUrl(containerName, blob, sourceUrl, contentLength, sourceRange,
-            sourceContentMD5, sourceContentcrc64, timeout, transactionalContentMD5, leaseId, maxSize, appendPosition,
-            ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, sourceIfModifiedSince,
-            sourceIfUnmodifiedSince, sourceIfMatch, sourceIfNoneMatch, requestId, copySourceAuthorization, cpkInfo,
-            encryptionScopeParam);
+        this.instrumentation.instrument("AppendBlob_AppendBlockFromUrl", null,
+            updatedOptions -> this.serviceClient.appendBlockFromUrl(containerName, blob, sourceUrl, contentLength,
+                sourceRange, sourceContentMD5, sourceContentcrc64, timeout, transactionalContentMD5, leaseId, maxSize,
+                appendPosition, ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, ifTags, sourceIfModifiedSince,
+                sourceIfUnmodifiedSince, sourceIfMatch, sourceIfNoneMatch, requestId, copySourceAuthorization, cpkInfo,
+                encryptionScopeParam));
     }
 
     /**
@@ -406,8 +419,9 @@ 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.serviceClient.sealWithResponse(containerName, blob, timeout, requestId, leaseId, ifModifiedSince,
-            ifUnmodifiedSince, ifMatch, ifNoneMatch, appendPosition, requestOptions);
+        return this.instrumentation.instrument("AppendBlob_Seal", requestOptions,
+            updatedOptions -> this.serviceClient.sealWithResponse(containerName, blob, timeout, requestId, leaseId,
+                ifModifiedSince, ifUnmodifiedSince, ifMatch, ifNoneMatch, appendPosition, updatedOptions));
     }
 
     /**
@@ -440,7 +454,8 @@ public Response<Void> sealWithResponse(String containerName, String blob, Intege
     public void seal(String containerName, String blob, Integer timeout, String requestId, String leaseId,
         OffsetDateTime ifModifiedSince, OffsetDateTime ifUnmodifiedSince, String ifMatch, String ifNoneMatch,
         Long appendPosition) {
-        this.serviceClient.seal(containerName, blob, timeout, requestId, leaseId, ifModifiedSince, ifUnmodifiedSince,
-            ifMatch, ifNoneMatch, appendPosition);
+        this.instrumentation.instrument("AppendBlob_Seal", null,
+            updatedOptions -> this.serviceClient.seal(containerName, blob, timeout, requestId, leaseId, ifModifiedSince,
+                ifUnmodifiedSince, ifMatch, ifNoneMatch, appendPosition));
     }
 }

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

@@ -18,6 +18,8 @@
 import io.clientcore.core.http.pipeline.HttpRedirectPolicy;
 import io.clientcore.core.http.pipeline.HttpRetryOptions;
 import io.clientcore.core.http.pipeline.HttpRetryPolicy;
+import io.clientcore.core.instrumentation.Instrumentation;
+import io.clientcore.core.instrumentation.LibraryInstrumentationOptions;
 import io.clientcore.core.traits.ConfigurationTrait;
 import io.clientcore.core.traits.HttpTrait;
 import io.clientcore.core.traits.ProxyTrait;
@@ -31,7 +33,7 @@
  */
 @ServiceClientBuilder(
     serviceClients = {
-        StorageServiceClient.class,
+        ServiceClient.class,
         ContainerClient.class,
         BlobClient.class,
         PageBlobClient.class,
@@ -45,6 +47,10 @@ public final class AzureBlobStorageBuilder implements HttpTrait<AzureBlobStorage
     @Metadata(generated = true)
     private static final String SDK_VERSION = "version";
 
+    @Metadata(generated = true)
+    private static final LibraryInstrumentationOptions LIBRARY_INSTRUMENTATION_OPTIONS
+        = new LibraryInstrumentationOptions("");
+
     @Metadata(generated = true)
     private final List<HttpPipelinePolicy> pipelinePolicies;
 
@@ -187,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.
      */
@@ -205,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.
      */
@@ -217,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)
@@ -255,61 +261,91 @@ private HttpPipeline createHttpPipeline() {
 
     /**
      * Builds an instance of ServiceClient class.
-     *
+     * 
      * @return an instance of ServiceClient.
      */
     @Metadata(generated = true)
-    public StorageServiceClient buildServiceClient() {
-        return new StorageServiceClient(buildInnerClient().getServices());
+    public ServiceClient 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);
     }
 
     /**
      * Builds an instance of ContainerClient class.
-     *
+     * 
      * @return an instance of ContainerClient.
      */
     @Metadata(generated = true)
     public ContainerClient buildContainerClient() {
-        return new ContainerClient(buildInnerClient().getContainers());
+        HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
+            ? new HttpInstrumentationOptions()
+            : this.httpInstrumentationOptions;
+        Instrumentation instrumentation
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+        return new ContainerClient(buildInnerClient().getContainers(), instrumentation);
     }
 
     /**
      * Builds an instance of BlobClient class.
-     *
+     * 
      * @return an instance of BlobClient.
      */
     @Metadata(generated = true)
     public BlobClient buildBlobClient() {
-        return new BlobClient(buildInnerClient().getBlobs());
+        HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
+            ? new HttpInstrumentationOptions()
+            : this.httpInstrumentationOptions;
+        Instrumentation instrumentation
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+        return new BlobClient(buildInnerClient().getBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of PageBlobClient class.
-     *
+     * 
      * @return an instance of PageBlobClient.
      */
     @Metadata(generated = true)
     public PageBlobClient buildPageBlobClient() {
-        return new PageBlobClient(buildInnerClient().getPageBlobs());
+        HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
+            ? new HttpInstrumentationOptions()
+            : this.httpInstrumentationOptions;
+        Instrumentation instrumentation
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+        return new PageBlobClient(buildInnerClient().getPageBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of AppendBlobClient class.
-     *
+     * 
      * @return an instance of AppendBlobClient.
      */
     @Metadata(generated = true)
     public AppendBlobClient buildAppendBlobClient() {
-        return new AppendBlobClient(buildInnerClient().getAppendBlobs());
+        HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
+            ? new HttpInstrumentationOptions()
+            : this.httpInstrumentationOptions;
+        Instrumentation instrumentation
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+        return new AppendBlobClient(buildInnerClient().getAppendBlobs(), instrumentation);
     }
 
     /**
      * Builds an instance of BlockBlobClient class.
-     *
+     * 
      * @return an instance of BlockBlobClient.
      */
     @Metadata(generated = true)
     public BlockBlobClient buildBlockBlobClient() {
-        return new BlockBlobClient(buildInnerClient().getBlockBlobs());
+        HttpInstrumentationOptions localHttpInstrumentationOptions = this.httpInstrumentationOptions == null
+            ? new HttpInstrumentationOptions()
+            : this.httpInstrumentationOptions;
+        Instrumentation instrumentation
+            = Instrumentation.create(localHttpInstrumentationOptions, LIBRARY_INSTRUMENTATION_OPTIONS, this.endpoint);
+        return new BlockBlobClient(buildInnerClient().getBlockBlobs(), instrumentation);
     }
 }