[DO NOT MERGE] Direct TCP | Add support for request timelines to be used in diagnostic strings #7165

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

Closed

David-Noble-at-work wants to merge 69 commits into Azure:cosmos/v4 from David-Noble-at-work:issue/#6580/cosmos/v4/support-request-timeline

.github/CODEOWNERS

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     /sdk/appconfiguration/       @mssfang @alzimmermsft @conniey @sima-zhu
     /sdk/batch/                  @xingwu1 @bgklein @matthchr
     /sdk/core/                   @alzimmermsft @jianghaolu @srnagar @hemanttanwar
-    /sdk/cosmos/                 @moderakh @christopheranderson @kushagraThapar
+    /sdk/cosmos/                 @moderakh @kushagraThapar @David-Noble-at-work @kirankumarkolli
     /sdk/eventhubs/              @conniey @srnagar @mssfang
     /sdk/identity/               @jianghaolu @g2vinay @hemanttanwar
     /sdk/keyvault/               @g2vinay @samvaity
@@ Expand Down @@

eng/.docsettings.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -48,7 +48,7 @@ known_presence_issues: @@
       - ['sdk/core/azure-core-management', '#2847']
       - ['cosmosdb/data-plane/commons-test-utils', '#2847']
       - ['cosmosdb/data-plane/sdk', '#2847']
-      - ['sdk/cosmos/microsoft-azure-cosmos', '#2847']
+      - ['sdk/cosmos/azure-cosmos', '#2847']
       - ['cosmosdb/data-plane/gateway', '#2847']
       - ['cosmosdb/data-plane/commons', '#2847']
       - ['cosmosdb/data-plane/direct-impl', '#2847']
@@ Expand All / @@ -73,7 +73,7 @@ known_content_issues: @@
       - ['cosmosdb/data-plane/faq/README.md', '#3113']
       - ['sdk/cosmos/faq/README.md', '#3113']
       - ['sdk/cosmos/changelog/README.md', '#3113']
-      - ['sdk/cosmos/microsoft-azure-cosmos-benchmark/README.md', '#3113']
+      - ['sdk/cosmos/azure-cosmos-benchmark/README.md', '#3113']
       - ['sdk/cosmos/README.md', '#3113']
       - ['sdk/storage/azure-storage-blob/swagger/README.md', '#3113']
       - ['sdk/storage/azure-storage-queue/swagger/README.md', '#3113']
@@ Expand Down @@

eng/pipelines/templates/variables/globals.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
    variables:

      DefaultOptions: '--batch-mode --fail-at-end --settings eng/settings.xml'

      LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

      MemoryOptions: '-Xmx3072m'

      #Agent.Source.Git.ShallowFetchDepth: 1

      skipComponentGovernanceDetection: true  

      EmulatorMsiUrl: 'https://acpedaily1.blob.core.windows.net/emulator/azure-cosmos-emulator.msi'

        DefaultOptions: '--batch-mode --fail-at-end --settings eng/settings.xml'

        LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'

        MemoryOptions: '-Xmx3072m'

        #Agent.Source.Git.ShallowFetchDepth: 1

        skipComponentGovernanceDetection: true

        EmulatorMsiUrl: 'https://aka.ms/cosmosdb-emulator'

sdk/core/azure-core-amqp/src/main/java/com/azure/core/amqp/implementation/CBSChannel.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     import com.azure.core.amqp.CBSNode;
     import com.azure.core.amqp.RetryOptions;
     import com.azure.core.credentials.TokenCredential;
+    import com.azure.core.credentials.TokenRequest;
     import com.azure.core.util.logging.ClientLogger;
     import org.apache.qpid.proton.Proton;
     import org.apache.qpid.proton.amqp.messaging.AmqpValue;
@@ Expand Down Expand Up @@
             final ApplicationProperties applicationProperties = new ApplicationProperties(properties);
             request.setApplicationProperties(applicationProperties);
-            return credential.getToken(tokenAudience).flatMap(accessToken -> {
+            return credential.getToken(new TokenRequest().addScopes(tokenAudience)).flatMap(accessToken -> {
                 request.setBody(new AmqpValue(accessToken.getToken()));
                 return cbsChannelMono.flatMap(x -> x.sendWithAck(request))
@@ Expand Down @@

...re/azure-core/src/main/java/com/azure/core/credentials/BasicAuthenticationCredential.java

-Original file line number
+Diff line change
@@ Expand Up @@
          * @throws RuntimeException If the UTF-8 encoding isn't supported.
          */
         @Override
-        public Mono<AccessToken> getToken(String... scopes) {
+        public Mono<AccessToken> getToken(TokenRequest request) {
             String credential = userName + ":" + password;
             String encodedCredential;
             try {
@@ Expand Down @@

sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenCredential.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -12,8 +12,8 @@
  
    public interface TokenCredential {

        /**

         * Asynchronously get a token for a given resource/audience.

         * @param scopes the scopes the token will be used for

         * @param request the details of the token request

         * @return a Publisher that emits a single access token

         */

        Mono<AccessToken> getToken(String... scopes);

        Mono<AccessToken> getToken(TokenRequest request);

    }

sdk/core/azure-core/src/main/java/com/azure/core/credentials/TokenRequest.java

-Original file line number
+Diff line change
@@ -0,0 +1,53 @@
+    // Copyright (c) Microsoft Corporation. All rights reserved.
+    // Licensed under the MIT License.
+    package com.azure.core.credentials;
+    import java.util.ArrayList;
+    import java.util.Arrays;
+    import java.util.List;
+    import java.util.Objects;
+    /**
+     * Contains details of a request to Azure Active Directory to get a token.
+     */
+    public class TokenRequest {
+        private final List<String> scopes;
+        /**
+         * Creates a token request instance.
+         */
+        public TokenRequest() {
+            this.scopes = new ArrayList<>();
+        }
+        /**
+         * Gets the scopes required for the token.
+         * @return the scopes required for the token
+         */
+        public List<String> getScopes() {
+            return scopes;
+        }
+        /**
+         * Sets the scopes required for the token.
+         * @param scopes the scopes required for the token
+         * @return the TokenRequest itself
+         */
+        public TokenRequest setScopes(List<String> scopes) {
+            Objects.requireNonNull(scopes);
+            this.scopes.clear();
+            this.scopes.addAll(scopes);
+            return this;
+        }
+        /**
+         * Adds one or more scopes to the request scopes.
+         * @param scopes one or more scopes to add
+         * @return the TokenRequest itself
+         */
+        public TokenRequest addScopes(String... scopes) {
+            this.scopes.addAll(Arrays.asList(scopes));
+            return this;
+        }
+    }

.../azure-core/src/main/java/com/azure/core/http/policy/BearerTokenAuthenticationPolicy.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
     import com.azure.core.credentials.SimpleTokenCache;
     import com.azure.core.credentials.TokenCredential;
+    import com.azure.core.credentials.TokenRequest;
     import com.azure.core.http.HttpPipelineCallContext;
     import com.azure.core.http.HttpPipelineNextPolicy;
     import com.azure.core.http.HttpResponse;
@@ Expand Down Expand Up @@
             assert scopes.length > 0;
             this.credential = credential;
             this.scopes = scopes;
-            this.cache = new SimpleTokenCache(() -> credential.getToken(scopes));
+            this.cache = new SimpleTokenCache(() -> credential.getToken(new TokenRequest().addScopes(scopes)));
         }
         @Override
@@ Expand Down @@

sdk/core/azure-core/src/main/java/com/azure/core/implementation/util/ScopeUtil.java

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,6 +3,7 @@
  
    package com.azure.core.implementation.util;

    import java.util.List;

    import java.util.Objects;

    /**

    @@ -18,18 +19,18 @@ public final class ScopeUtil {
  
         * @return the resource to authenticate with Azure Active Directory.

         * @throws IllegalArgumentException if scopes is empty or has more than 1 items

         */

        public static String scopesToResource(String[] scopes) {

        public static String scopesToResource(List<String> scopes) {

            Objects.requireNonNull(scopes);

            if (scopes.length != 1) {

            if (scopes.size() != 1) {

                throw new IllegalArgumentException(

                    "To convert to a resource string the specified array must be exactly length 1");

            }

            if (!scopes[0].endsWith(DEFAULT_SUFFIX)) {

                return scopes[0];

            if (!scopes.get(0).endsWith(DEFAULT_SUFFIX)) {

                return scopes.get(0);

            }

            return scopes[0].substring(0, scopes[0].lastIndexOf(DEFAULT_SUFFIX));

            return scopes.get(0).substring(0, scopes.get(0).lastIndexOf(DEFAULT_SUFFIX));

        }

        /**

sdk/core/azure-core/src/test/java/com/azure/core/credentials/CredentialsTests.java

-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,7 @@ public void basicCredentialsTest() throws Exception { @@
             //
             final HttpPipeline pipeline = new HttpPipelineBuilder()
                 .httpClient(new NoOpHttpClient())
-                .policies((context, next) -> credentials.getToken("scope./default")
+                .policies((context, next) -> credentials.getToken(new TokenRequest().addScopes("scope./default"))
                     .flatMap(token -> {
                         context.getHttpRequest().getHeaders().put("Authorization", "Basic " + token.getToken());
                         return next.process();
@@ Expand All / @@ -44,12 +44,7 @@ public void basicCredentialsTest() throws Exception { @@
         @Test
         public void tokenCredentialTest() throws Exception {
-            TokenCredential credentials = new TokenCredential() {
-                @Override
-                public Mono<AccessToken> getToken(String... scopes) {
-                    return Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX));
-                }
-            };
+            TokenCredential credentials = request -> Mono.just(new AccessToken("this_is_a_token", OffsetDateTime.MAX));
             HttpPipelinePolicy auditorPolicy =  (context, next) -> {
                 String headerValue = context.getHttpRequest().getHeaders().getValue("Authorization");
@@ Expand Down @@

sdk/cosmos/CODEOWNERS

-Original file line number
+Diff line change
@@ Expand Up / @@ -7,4 +7,4 @@ @@
     #   https://help.github.com/articles/about-codeowners/
     # Default owner for repo
-    *	@moderakh @christopheranderson @kushagraThapar
+    *	@moderakh @kushagraThapar @David-Noble-at-work @kirankumarkolli

sdk/cosmos/README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -26,7 +26,7 @@
  
    See the complete code for the above sample in [`HelloWorldDemo.java`](./microsoft-azure-cosmos-examples/src/main/java/com/azure/data/cosmos/examples/HelloWorldDemo.java)

    ```java

    import com.azure.data.cosmos.*;

    import com.azure.cosmos.*;

    import reactor.core.publisher.Mono;

    import java.io.IOException;

    @@ -89,9 +89,9 @@ For example, using maven, you can add the following dependency to your maven pom
  
    ```xml

    <dependency>

      <groupId>com.microsoft.azure</groupId>

      <groupId>com.azure</groupId>

      <artifactId>azure-cosmos</artifactId>

      <version>3.1.0</version>

      <version>4.0.0-preview.1</version>

    </dependency>

    ```

    @@ -151,16 +151,15 @@ readItemMono
  
    After result is received if you want to do CPU intensive work on the result you should avoid doing so on eventloop IO netty thread. You can instead provide your own Scheduler to provide your own thread for running your work.

    ```java

    import rx.schedulers;

    Mono<CosmosItemResponse> readItemMono = item.read();

    readItemMono

      .subscribeOn(Schedulers.computation())

      .subscribeOn(Schedulers.parallel())

      .subscribe(

      resourceResponse -> {

        // this is executed on threads provided by Scheduler.computation()

        // Schedulers.computation() should be used only the work is cpu intensive and you are not doing blocking IO, thread sleep, etc. in this thread against other resources.

        // this is executed on threads provided by Scheduler.parallel()

        // Schedulers.parallel() should be used only when the work is cpu intensive and you are not doing blocking IO, thread sleep, etc. in this thread against other resources.

        veryCpuIntensiveWork();

      });

    @@ -218,7 +217,7 @@ and add the following dependency to your project maven dependencies:
  
    <dependency>

      <groupId>io.netty</groupId>

      <artifactId>netty-tcnative</artifactId>

      <version>2.0.25.Final</version>

      <version>2.0.26.Final</version>

      <classifier>linux-x86_64</classifier>

    </dependency>

    ```

0 ...icrosoft-azure-cosmos-benchmark/README.md → sdk/cosmos/azure-cosmos-benchmark/README.md

File renamed without changes.

.../microsoft-azure-cosmos-benchmark/pom.xml → sdk/cosmos/azure-cosmos-benchmark/pom.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -6,14 +6,14 @@ Licensed under the MIT License.
  
      xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

      <modelVersion>4.0.0</modelVersion>

      <parent>

        <groupId>com.microsoft.azure</groupId>

        <groupId>com.azure</groupId>

        <artifactId>azure-cosmos-parent</artifactId>

        <version>3.3.0</version>

        <version>4.0.0-SNAPSHOT</version>

      </parent>

      <groupId>com.microsoft.azure</groupId>

      <groupId>com.azure</groupId>

      <artifactId>azure-cosmos-benchmark</artifactId>

      <version>3.3.0</version>

      <version>4.0.0-SNAPSHOT</version>

      <name>Microsoft Azure SDK for SQL API of Azure Cosmos DB Service - Benchmarking tool</name>

      <description>This package contains Benchmarking tool for Microsoft Azure SDK for SQL API of Azure Cosmos DB Service</description>

      <url>https://github.com/Azure/azure-sdk-for-java</url>

    @@ -31,9 +31,9 @@ Licensed under the MIT License.
  
      <dependencies>

        <dependency>

          <groupId>com.microsoft.azure</groupId>

          <groupId>com.azure</groupId>

          <artifactId>azure-cosmos</artifactId>

          <version>3.3.0</version>

          <version>4.0.0-SNAPSHOT</version>

        </dependency>

        <dependency>

    @@ -124,7 +124,7 @@ Licensed under the MIT License.
  
            <groupId>org.codehaus.mojo</groupId>

            <artifactId>exec-maven-plugin</artifactId>

            <configuration>

              <mainClass>com.azure.data.cosmos.benchmark.Main</mainClass>

              <mainClass>com.azure.cosmos.benchmark.Main</mainClass>

            </configuration>

          </plugin>

    @@ -137,7 +137,7 @@ Licensed under the MIT License.
  
              </descriptorRefs>

              <archive>

                <manifest>

                  <mainClass>com.azure.data.cosmos.benchmark.Main</mainClass>

                  <mainClass>com.azure.cosmos.benchmark.Main</mainClass>

                </manifest>

              </archive>

            </configuration>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DO NOT MERGE] Direct TCP | Add support for request timelines to be used in diagnostic strings #7165

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!