Spanner sql profiling

.github/workflows/build-sonar.yml

@@ -21,6 +21,9 @@ on:
     branches: [ develop, release/** ]
     types: [opened, synchronize, reopened, labeled]
 
+permissions:
+  checks: write
+
 jobs:
   build-sonar:
     runs-on: k8s-runner-build

.gitmodules

@@ -16,4 +16,4 @@
 [submodule "cdap-ui"]
   path = cdap-ui
   url = ../cdap-ui
-  branch = develop
+  branch = release/6.11

cdap-api-common/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.cdap.cdap</groupId>
     <artifactId>cdap</artifactId>
-    <version>6.11.0-SNAPSHOT</version>
+    <version>6.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>cdap-api-common</artifactId>

cdap-api-common/src/main/java/io/cdap/cdap/api/exception/ErrorCategory.java

@@ -16,6 +16,9 @@
 
 package io.cdap.cdap.api.exception;
 
+import java.util.Objects;
+import javax.annotation.Nullable;
+
 /**
  * Class representing the category of an error.
  *
@@ -25,6 +28,7 @@
  */
 public class ErrorCategory {
   private final ErrorCategoryEnum errorCategory;
+  @Nullable
   private final String subCategory;
 
   /**
@@ -33,8 +37,7 @@ public class ErrorCategory {
    * @param errorCategory The category of the error.
    */
   public ErrorCategory(ErrorCategoryEnum errorCategory) {
-    this.errorCategory = errorCategory;
-    this.subCategory = null;
+    this(errorCategory, null);
   }
 
   /**
@@ -43,7 +46,7 @@ public ErrorCategory(ErrorCategoryEnum errorCategory) {
    * @param errorCategory The category of the error.
    * @param subCategory The sub-category of the error.
    */
-  public ErrorCategory(ErrorCategoryEnum errorCategory, String subCategory) {
+  public ErrorCategory(ErrorCategoryEnum errorCategory, @Nullable String subCategory) {
     this.errorCategory = errorCategory;
     this.subCategory = subCategory;
   }
@@ -52,8 +55,24 @@ public ErrorCategory(ErrorCategoryEnum errorCategory, String subCategory) {
    * Returns the category of the error.
    */
   public String getErrorCategory() {
-    return errorCategory == null ? ErrorCategoryEnum.OTHERS.toString() : subCategory == null ?
-        errorCategory.toString() : String.format("%s-'%s'", errorCategory, subCategory);
+    return errorCategory == null ? ErrorCategoryEnum.OTHERS.toString() : subCategory == null
+        ? errorCategory.toString() : String.format("%s-'%s'", errorCategory, subCategory);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof ErrorCategory)) {
+      return false;
+    }
+
+    ErrorCategory that = (ErrorCategory) o;
+    return Objects.equals(this.errorCategory, that.errorCategory)
+        && Objects.equals(this.subCategory, that.subCategory);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(this.errorCategory, this.subCategory);
   }
 
   /*
@@ -64,16 +83,26 @@ public String toString() {
     return getErrorCategory();
   }
 
+  /**
+   * Returns the parent category of the error.
+   */
+  public ErrorCategoryEnum getParentCategory() {
+    return errorCategory == null ? ErrorCategoryEnum.OTHERS : errorCategory;
+  }
+
   /**
    * Enum representing the different categories of errors.
    */
   public enum ErrorCategoryEnum {
-    PLUGIN("Plugin"),
+    ACCESS("Access"),
+    DEPROVISIONING("Deprovisioning"),
     NETWORKING("Networking"),
+    MACROS("Macros"),
+    OTHERS("Others"),
+    PLUGIN("Plugin"),
     PROVISIONING("Provisioning"),
-    ACCESS("Access"),
     SCHEDULES_AND_TRIGGERS("Schedules and Triggers"),
-    OTHERS("Others");
+    STARTING("Starting");
 
     private final String displayName;
 

cdap-api-common/src/main/java/io/cdap/cdap/api/exception/ErrorUtils.java

@@ -125,6 +125,56 @@ public static ActionErrorPair getActionErrorByStatusCode(Integer statusCode) {
         return new ActionErrorPair("Please ensure there are no network connectivity "
           + "issues between the proxy/gateway server and the upstream server or try again later.",
           ErrorType.SYSTEM);
+      case HttpURLConnection.HTTP_PROXY_AUTH:
+        return new ActionErrorPair("Proxy authentication required. Please check your "
+            + "proxy settings and provide valid credentials.", ErrorType.USER);
+      case HttpURLConnection.HTTP_NOT_ACCEPTABLE:
+        return new ActionErrorPair("Request cannot be processed in the requested format."
+            + " Please check the Accept headers.", ErrorType.USER);
+      case HttpURLConnection.HTTP_GONE:
+        return new ActionErrorPair("Requested resource is no longer available.",
+            ErrorType.USER);
+      case HttpURLConnection.HTTP_LENGTH_REQUIRED:
+        return new ActionErrorPair("Content-Length header is required. "
+            + "Please include it in your request.", ErrorType.USER);
+      case HttpURLConnection.HTTP_ENTITY_TOO_LARGE:
+        return new ActionErrorPair("Request entity too large. "
+            + "Please reduce payload size and try again.", ErrorType.USER);
+      case HttpURLConnection.HTTP_REQ_TOO_LONG: // 414
+        return new ActionErrorPair("Request URL is too long. "
+            + "Consider shortening the URL.", ErrorType.USER);
+      case HttpURLConnection.HTTP_UNSUPPORTED_TYPE:
+        return new ActionErrorPair("Unsupported media type. "
+            + "Please use a supported format and try again.", ErrorType.USER);
+      case 416: // HTTP 416 Requested Range Not Satisfiable
+        return new ActionErrorPair("Requested range is not satisfiable. "
+            + "Please adjust range headers and try again.", ErrorType.USER);
+      case 417: // HTTP 417 Expectation Failed
+        return new ActionErrorPair("Expectation failed. "
+            + "Server cannot meet Expect header requirements.", ErrorType.USER);
+      case 421: // HTTP 421 Misdirected Request
+        return new ActionErrorPair("Request was misdirected. "
+            + "Please try sending it to the correct server.", ErrorType.USER);
+      case 422: // HTTP 422 Unprocessable Entity
+        return new ActionErrorPair("Request cannot be processed due to semantic errors. "
+            + "Please check the request syntax and try again.", ErrorType.USER);
+      case 423: // HTTP 423 Locked
+        return new ActionErrorPair("Resource is locked. Please try again later.",
+            ErrorType.USER);
+      case 424: // HTTP 424 Failed Dependency
+        return new ActionErrorPair("Request failed due to a failed dependency. "
+            + "Please ensure related actions are successful.", ErrorType.USER);
+      case 426: // HTTP 426 Upgrade Required
+        return new ActionErrorPair("Upgrade required. "
+            + "Please use a newer protocol version.", ErrorType.USER);
+      case 428: // HTTP 428 Precondition Required
+        return new ActionErrorPair("Request requires preconditions. "
+            + "Please ensure headers are set correctly.", ErrorType.USER);
+      case 431: // HTTP 431 Request Header Fields Too Large
+        return new ActionErrorPair("Request headers are too large. "
+            + "Please reduce the number or size of headers.", ErrorType.USER);
+      case 451: // HTTP 451 Unavailable For Legal Reasons
+        return new ActionErrorPair("Content is restricted due to legal reasons.", ErrorType.USER);
       default:
         return new ActionErrorPair(String.format("Request failed with error code: %s", statusCode),
           ErrorType.UNKNOWN);

cdap-api-common/src/main/java/io/cdap/cdap/api/exception/FailureDetailsProvider.java

@@ -21,6 +21,8 @@
 
 /**
  * Interface for providing failure details.
+ * While implementing the interface, please don't forget to add the class the in
+ * {io.cdap.cdap.logging.ErrorLogsClassifier#ALLOWLIST_CLASSES} list.
  */
 public interface FailureDetailsProvider {
 
@@ -69,4 +71,43 @@ default ErrorCategory getErrorCategory() {
   default ErrorType getErrorType() {
     return ErrorType.UNKNOWN;
   }
+
+  /**
+   * Returns whether the error is coming from a dependent service.
+   *
+   * @return true if the error is a dependency service error, false otherwise.
+   */
+  default boolean isDependency() {
+    return false;
+  }
+
+  /**
+   * Returns the type of error code.
+   *
+   * @return the type of error code.
+   */
+  @Nullable
+  default ErrorCodeType getErrorCodeType() {
+    return null;
+  }
+
+  /**
+   * Returns the error code.
+   *
+   * @return the error code.
+   */
+  @Nullable
+  default String getErrorCode() {
+    return null;
+  }
+
+  /**
+   * Returns the URL to the documentation.
+   *
+   * @return the URL to the documentation.
+   */
+  @Nullable
+  default String getSupportedDocumentationUrl() {
+    return null;
+  }
 }

cdap-api-common/src/main/java/io/cdap/cdap/api/exception/ProgramFailureException.java

@@ -70,46 +70,39 @@ public String getErrorReason() {
 
   @Override
   public ErrorCategory getErrorCategory() {
+    if (errorCategory == null) {
+      return FailureDetailsProvider.super.getErrorCategory();
+    }
     return errorCategory;
   }
 
   @Override
   public ErrorType getErrorType() {
-    return errorType == null ? ErrorType.UNKNOWN : errorType;
+    if (errorType == null) {
+      return FailureDetailsProvider.super.getErrorType();
+    }
+    return errorType;
   }
 
-  /**
-   * Returns whether the error is coming from a dependent service.
-   *
-   * @return true if the error is a dependency service error, false otherwise.
-   */
+  @Override
   public boolean isDependency() {
     return dependency;
   }
 
-  /**
-   * Returns the type of error code.
-   *
-   * @return the type of error code.
-   */
+  @Nullable
+  @Override
   public ErrorCodeType getErrorCodeType() {
     return errorCodeType;
   }
 
-  /**
-   * Returns the error code.
-   *
-   * @return the error code.
-   */
+  @Nullable
+  @Override
   public String getErrorCode() {
     return errorCode;
   }
 
-  /**
-   * Returns the URL to the documentation.
-   *
-   * @return the URL to the documentation.
-   */
+  @Nullable
+  @Override
   public String getSupportedDocumentationUrl() {
     return supportedDocumentationUrl;
   }

cdap-api-common/src/main/java/io/cdap/cdap/api/macro/InvalidMacroException.java

@@ -16,21 +16,76 @@
 
 package io.cdap.cdap.api.macro;
 
+import io.cdap.cdap.api.exception.ErrorCategory;
+import io.cdap.cdap.api.exception.ErrorCategory.ErrorCategoryEnum;
+import io.cdap.cdap.api.exception.ErrorType;
+import io.cdap.cdap.api.exception.FailureDetailsProvider;
+import javax.annotation.Nullable;
+
 /**
  * Indicates that there is an invalid macro.
  */
-public class InvalidMacroException extends RuntimeException {
+public class InvalidMacroException extends RuntimeException implements FailureDetailsProvider {
+
+  private final ErrorCategory errorCategory;
 
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
   public InvalidMacroException(String message) {
-    super(message);
+    this(message, null, null);
   }
 
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
   public InvalidMacroException(String message, Throwable cause) {
-    super(message, cause);
+    this(message, cause, null);
   }
 
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
   public InvalidMacroException(Throwable cause) {
-    super(cause);
+    this(cause.getMessage(), cause, null);
+  }
+
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
+  public InvalidMacroException(Throwable cause, ErrorCategory errorCategory) {
+    this(cause.getMessage(), cause, errorCategory);
+  }
+
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
+  public InvalidMacroException(String message, ErrorCategory errorCategory) {
+    this(message, null, errorCategory);
+  }
+
+  /**
+   * Constructor for {@link InvalidMacroException}.
+   */
+  public InvalidMacroException(String message, @Nullable Throwable cause,
+      @Nullable ErrorCategory errorCategory) {
+    super(message, cause);
+    this.errorCategory = errorCategory;
+  }
+
+
+  @Override
+  public ErrorCategory getErrorCategory() {
+    return errorCategory == null ?  new ErrorCategory(ErrorCategoryEnum.MACROS) : errorCategory;
+  }
+
+  @Override
+  public ErrorType getErrorType() {
+    return ErrorType.USER;
   }
 
+  @Override
+  public String getErrorReason() {
+    return getMessage();
+  }
 }

cdap-api-spark3_2.12/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.cdap.cdap</groupId>
     <artifactId>cdap</artifactId>
-    <version>6.11.0-SNAPSHOT</version>
+    <version>6.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>cdap-api-spark3_2.12</artifactId>

cdap-api/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>io.cdap.cdap</groupId>
     <artifactId>cdap</artifactId>
-    <version>6.11.0-SNAPSHOT</version>
+    <version>6.11.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>cdap-api</artifactId>