resolving comments

sdk/cosmos/azure-cosmos/pom.xml

@@ -134,17 +134,16 @@ Licensed under the MIT License.
 
     <dependency>
       <groupId>com.azure</groupId>
-      <artifactId>azure-core-tracing-opentelemetry</artifactId>
+      <artifactId>azure-core-tracing-opentelemetry</artifactId> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
       <scope>test</scope>
       <version>1.0.0-beta.4</version>
       <exclusions>
         <exclusion>
           <groupId>io.netty</groupId>
-          <artifactId>*</artifactId>
+          <artifactId>netty-tcnative-boringssl-static</artifactId>
         </exclusion>
       </exclusions>
     </dependency>
-
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncClient.java

@@ -207,7 +207,7 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabaseIfNotExists(CosmosDatabas
         }
 
         return withContext(context -> createDatabaseIfNotExistsInternal(getDatabase(databaseSettings.getId()),
-            context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -224,7 +224,7 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabaseIfNotExists(String id) {
             return createDatabaseIfNotExistsInternal(getDatabase(id));
         }
 
-        return withContext(context -> createDatabaseIfNotExistsInternal(getDatabase(id), context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createDatabaseIfNotExistsInternal(getDatabase(id), context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -251,7 +251,7 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabase(CosmosDatabaseProperties
         }
 
         final CosmosDatabaseRequestOptions requestOptions = options;
-        return withContext(context -> createDatabaseInternal(wrappedDatabase, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createDatabaseInternal(wrappedDatabase, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -312,7 +312,7 @@ public Mono<CosmosAsyncDatabaseResponse> createDatabase(CosmosDatabaseProperties
 
 
         final CosmosDatabaseRequestOptions requestOptions = options;
-        return withContext(context -> createDatabaseInternal(wrappedDatabase, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createDatabaseInternal(wrappedDatabase, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -475,17 +475,7 @@ private CosmosPagedFlux<CosmosDatabaseProperties> queryDatabasesInternal(boolean
     private Mono<CosmosAsyncDatabaseResponse> createDatabaseIfNotExistsInternal(CosmosAsyncDatabase database,
                                                                                 Context context) {
         String spanName = "createDatabaseIfNotExists." + database.getId();
-        Mono<CosmosAsyncDatabaseResponse> responseMono = database.read().onErrorResume(exception -> {
-            final Throwable unwrappedException = Exceptions.unwrap(exception);
-            if (unwrappedException instanceof CosmosClientException) {
-                final CosmosClientException cosmosClientException = (CosmosClientException) unwrappedException;
-                if (cosmosClientException.getStatusCode() == HttpConstants.StatusCodes.NOTFOUND) {
-                    return createDatabase(new CosmosDatabaseProperties(database.getId()),
-                        new CosmosDatabaseRequestOptions());
-                }
-            }
-            return Mono.error(unwrappedException);
-        });
+        Mono<CosmosAsyncDatabaseResponse> responseMono = createDatabaseIfNotExistsInternal(database);
         return tracerProvider.traceEnabledCosmosResponsePublisher(responseMono, context, spanName, database.getId(),
             this.serviceEndpoint);
     }

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncDatabase.java

@@ -90,7 +90,7 @@ public Mono<CosmosAsyncDatabaseResponse> read(CosmosDatabaseRequestOptions optio
             return readInternal(options);
         }
         final CosmosDatabaseRequestOptions requestOptions = options;
-        return withContext(context -> readInternal(requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -125,7 +125,7 @@ public Mono<CosmosAsyncDatabaseResponse> delete(CosmosDatabaseRequestOptions opt
         }
 
         final CosmosDatabaseRequestOptions requestOptions = options;
-        return withContext(context -> deleteInternal(requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /* CosmosAsyncContainer operations */
@@ -216,7 +216,7 @@ public Mono<CosmosAsyncContainerResponse> createContainer(
         }
 
         final CosmosContainerRequestOptions requestOptions = options;
-        return withContext(context -> createContainerInternal(containerProperties, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createContainerInternal(containerProperties, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
 
@@ -302,7 +302,7 @@ public Mono<CosmosAsyncContainerResponse> createContainerIfNotExists(
         }
 
         return withContext(context -> createContainerIfNotExistsInternal(containerProperties, container, null,
-            context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -329,7 +329,7 @@ public Mono<CosmosAsyncContainerResponse> createContainerIfNotExists(
         }
 
         return withContext(context -> createContainerIfNotExistsInternal(containerProperties, container, options,
-            context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -352,7 +352,7 @@ public Mono<CosmosAsyncContainerResponse> createContainerIfNotExists(String id,
         }
 
         return withContext(context -> createContainerIfNotExistsInternal(new CosmosContainerProperties(id, partitionKeyPath), container, null,
-            context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -380,7 +380,7 @@ public Mono<CosmosAsyncContainerResponse> createContainerIfNotExists(
         }
 
         return withContext(context -> createContainerIfNotExistsInternal(new CosmosContainerProperties(id,
-            partitionKeyPath), container, options, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            partitionKeyPath), container, options, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -510,7 +510,7 @@ public Mono<CosmosAsyncUserResponse> createUser(CosmosUserProperties userPropert
         if (!client.getTracerProvider().isEnabled()) {
             return createUserInternal(userProperties);
         }
-        return withContext(context -> createUserInternal(userProperties, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createUserInternal(userProperties, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
 
@@ -530,7 +530,7 @@ public Mono<CosmosAsyncUserResponse> upsertUser(CosmosUserProperties userPropert
             return upsertUserInternal(userProperties);
         }
 
-        return withContext(context -> upsertUserInternal(userProperties, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> upsertUserInternal(userProperties, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -653,7 +653,7 @@ public Mono<Integer> readProvisionedThroughput() {
             return readProvisionedThroughputInternal();
         }
 
-        return withContext(context -> readProvisionedThroughputInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readProvisionedThroughputInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -669,7 +669,7 @@ public Mono<Integer> replaceProvisionedThroughput(int requestUnitsPerSecond) {
             return replaceProvisionedThroughputInternal(requestUnitsPerSecond);
         }
 
-        return withContext(context -> replaceProvisionedThroughputInternal(requestUnitsPerSecond, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> replaceProvisionedThroughputInternal(requestUnitsPerSecond, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncPermission.java

@@ -66,7 +66,7 @@ public Mono<CosmosAsyncPermissionResponse> read(CosmosPermissionRequestOptions o
         }
 
         final CosmosPermissionRequestOptions requestOptions = options;
-        return withContext(context -> readInternal(requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -91,7 +91,7 @@ public Mono<CosmosAsyncPermissionResponse> replace(CosmosPermissionProperties pe
         }
 
         final CosmosPermissionRequestOptions requestOptions = options;
-        return withContext(context -> replaceInternal(permissionSettings, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> replaceInternal(permissionSettings, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -114,7 +114,7 @@ public Mono<CosmosAsyncPermissionResponse> delete(CosmosPermissionRequestOptions
         }
 
         final CosmosPermissionRequestOptions requestOptions = options;
-        return withContext(context -> deleteInternal(requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     String getURIPathSegment() {

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncScripts.java

@@ -79,7 +79,7 @@ public Mono<CosmosAsyncStoredProcedureResponse> createStoredProcedure(
         }
 
         final CosmosStoredProcedureRequestOptions requestOptions = options;
-        return withContext(context -> createStoredProcedureInternal(sProc, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createStoredProcedureInternal(sProc, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
 
@@ -182,7 +182,7 @@ public Mono<CosmosAsyncUserDefinedFunctionResponse> createUserDefinedFunction(
             return createUserDefinedFunctionInternal(udf);
         }
 
-        return withContext(context -> createUserDefinedFunctionInternal(udf, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createUserDefinedFunctionInternal(udf, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -280,7 +280,7 @@ public Mono<CosmosAsyncTriggerResponse> createTrigger(CosmosTriggerProperties pr
             return createTriggerInternal(properties);
         }
 
-        return withContext(context -> createTriggerInternal(properties, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createTriggerInternal(properties, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncStoredProcedure.java

@@ -78,7 +78,7 @@ public Mono<CosmosAsyncStoredProcedureResponse> read(CosmosStoredProcedureReques
             return readInternal(options);
         }
 
-        return withContext(context -> readInternal(options, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(options, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -111,7 +111,7 @@ public Mono<CosmosAsyncStoredProcedureResponse> delete(CosmosStoredProcedureRequ
             return deleteInternal(options);
         }
 
-        return withContext(context -> deleteInternal(options, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(options, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -132,7 +132,7 @@ public Mono<CosmosAsyncStoredProcedureResponse> execute(Object[] procedureParams
             return executeInternal(procedureParams, options);
         }
 
-        return withContext(context -> executeInternal(procedureParams, options, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> executeInternal(procedureParams, options, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -169,7 +169,7 @@ public Mono<CosmosAsyncStoredProcedureResponse> replace(CosmosStoredProcedurePro
         }
 
         return withContext(context -> replaceInternal(storedProcedureSettings, options,
-            context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+            context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     String getURIPathSegment() {

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncTrigger.java

@@ -60,7 +60,7 @@ public Mono<CosmosAsyncTriggerResponse> read() {
             return readInternal();
         }
 
-        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -78,7 +78,7 @@ public Mono<CosmosAsyncTriggerResponse> replace(CosmosTriggerProperties triggerS
             return replaceInternal(triggerSettings);
         }
 
-        return withContext(context -> replaceInternal(triggerSettings, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> replaceInternal(triggerSettings, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -95,7 +95,7 @@ public Mono<CosmosAsyncTriggerResponse> delete() {
             return deleteInternal();
         }
 
-        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     String getURIPathSegment() {

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUser.java

@@ -63,7 +63,7 @@ public Mono<CosmosAsyncUserResponse> read() {
             return readInternal();
         }
 
-        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -77,7 +77,7 @@ public Mono<CosmosAsyncUserResponse> replace(CosmosUserProperties userSettings)
             return replaceInternal(userSettings);
         }
 
-        return withContext(context -> replaceInternal(userSettings, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> replaceInternal(userSettings, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -90,7 +90,7 @@ public Mono<CosmosAsyncUserResponse> delete() {
             return deleteInternal();
         }
 
-        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -117,7 +117,7 @@ public Mono<CosmosAsyncPermissionResponse> createPermission(
         }
 
         final CosmosPermissionRequestOptions requesOptions = options;
-        return withContext(context -> createPermissionInternal(permission, requesOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> createPermissionInternal(permission, requesOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -144,7 +144,7 @@ public Mono<CosmosAsyncPermissionResponse> upsertPermission(
         }
 
         final CosmosPermissionRequestOptions requestOptions = options;
-        return withContext(context -> upsertPermissionInternal(permission, requestOptions, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> upsertPermissionInternal(permission, requestOptions, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
 

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosAsyncUserDefinedFunction.java

@@ -62,7 +62,7 @@ public Mono<CosmosAsyncUserDefinedFunctionResponse> read() {
             return readInternal();
         }
 
-        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> readInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -82,7 +82,7 @@ public Mono<CosmosAsyncUserDefinedFunctionResponse> replace(CosmosUserDefinedFun
             return replaceInternal(udfSettings);
         }
 
-        return withContext(context -> replaceInternal(udfSettings, context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> replaceInternal(udfSettings, context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     /**
@@ -101,7 +101,7 @@ public Mono<CosmosAsyncUserDefinedFunctionResponse> delete() {
             return deleteInternal();
         }
 
-        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.callDepthAttributeFunc);
+        return withContext(context -> deleteInternal(context)).subscriberContext(TracerProvider.CALL_DEPTH_ATTRIBUTE_FUNC);
     }
 
     String getURIPathSegment() {

sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/HttpConstants.java

@@ -265,6 +265,7 @@ public static class Versions {
     }
 
     public static class StatusCodes {
+        public static final int OK = 200;
         public static final int NOT_MODIFIED = 304;
         // Client error
         public static final int MINIMUM_STATUSCODE_AS_ERROR_GATEWAY = 400;