@dynatrace-sdk/client-query 1.7.0 → 1.8.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 @dynatrace-sdk/client-query
 
+## 1.8.0
+
+### Minor Changes
+
+- `rollup` and `rate` properties were added to the `MetricMetadata` object
+
+## 1.7.2
+
+### Patch Changes
+
+- Fixed a bug that caused abort errors from http-client to be wrapped in ApiClientError('UnexpectedError').
+
+## 1.7.1
+
+### Patch Changes
+
+- Update dependencies.
+
 ## 1.7.0
 
 ### Minor Changes

package/README.md

@@ -1,6 +1,6 @@
 # @dynatrace-sdk/client-query
 
-[![npm](https://img.shields.io/badge/npm-v1.7.0-blue)](https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.0)
+[![npm](https://img.shields.io/badge/npm-v1.8.0-blue)](https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.8.0)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 
 Exposes an API to fetch records stored in Grail

package/cjs/index.js

@@ -88,45 +88,28 @@ module.exports = __toCommonJS(src_exports);
 // packages/client/query/src/lib/apis/query-assistance-api.ts
 var import_http_client = require("@dynatrace-sdk/http-client");
 
-// packages/platform/shared/utils/get-global-with-dt-runtime.ts
-var getGlobalWithDtRuntime = () => typeof globalThis !== "undefined" ? globalThis : window;
-
-// packages/platform/error-handlers/src/lib/add-global-error-serializer.ts
-function addGlobalErrorSerializer(serializer) {
-  const addGlobalErrorSerializerFunc = getAddGlobalErrorSerializer();
-  if (typeof addGlobalErrorSerializerFunc === "function") {
-    addGlobalErrorSerializerFunc(serializer);
-  } else {
-    console.warn("Missing addGlobalErrorSerializer function from sdk-web-runtime.");
-  }
-}
-function isGlobalErrorSerializerSupported() {
-  return typeof getAddGlobalErrorSerializer() === "function";
-}
-function getAddGlobalErrorSerializer() {
-  return getGlobalWithDtRuntime().dtRuntime?.errorHandlers?.addGlobalErrorSerializer;
-}
-
 // packages/client/query/src/lib/error-envelopes/api-client-error.ts
+var import_error_handlers = require("@dynatrace-sdk/error-handlers");
 var ApiClientError = class extends Error {
   constructor(name, message, cause) {
     super(message);
     this.cause = cause;
     this.name = name;
   }
-  errorType = "JS Error" /* COMMON */;
+  errorType = import_error_handlers.ErrorType.COMMON;
 };
 function isApiClientError(e) {
   return e instanceof ApiClientError;
 }
 
 // packages/client/query/src/lib/error-envelopes/client-request-error.ts
+var import_error_handlers2 = require("@dynatrace-sdk/error-handlers");
 var ClientRequestError = class extends ApiClientError {
   body;
   response;
   constructor(name, response, body, message, cause) {
     super(name, message, cause);
-    this.errorType = "Http Error" /* HTTP */;
+    this.errorType = import_error_handlers2.ErrorType.HTTP;
     this.body = body;
     this.response = response;
   }
@@ -143,6 +126,7 @@ function isErrorEnvelopeError(e) {
 }
 
 // packages/client/query/src/lib/error-envelopes/error-serializer.ts
+var import_error_handlers3 = require("@dynatrace-sdk/error-handlers");
 var apiClientErrorSerializer = async (error) => {
   if (isClientRequestError(error)) {
     const status = error.response.status;
@@ -152,7 +136,7 @@ var apiClientErrorSerializer = async (error) => {
       status,
       message,
       stack: error.stack,
-      type: "Http Error" /* HTTP */,
+      type: import_error_handlers3.ErrorType.HTTP,
       body: error.body,
       cause: error.cause,
       ...getOptionalErrorRef(error.body)
@@ -162,16 +146,16 @@ var apiClientErrorSerializer = async (error) => {
       name: error.name,
       message: error.message,
       stack: error.stack,
-      type: "JS Error" /* COMMON */,
+      type: import_error_handlers3.ErrorType.COMMON,
       cause: error.cause
     };
   }
 };
 var errorSerializerAdded = false;
 function registerGlobalErrorSerializer(serializer) {
-  if (!errorSerializerAdded && isGlobalErrorSerializerSupported()) {
+  if (!errorSerializerAdded && (0, import_error_handlers3.isGlobalErrorSerializerSupported)()) {
     errorSerializerAdded = true;
-    addGlobalErrorSerializer(serializer);
+    (0, import_error_handlers3.addGlobalErrorSerializer)(serializer);
   }
 }
 function getOptionalErrorRef(body) {
@@ -1595,7 +1579,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -1701,7 +1685,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -1810,7 +1794,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client.isHttpClientResponseError)(e)) {
@@ -2318,10 +2302,18 @@ function isMetricMetadata(value) {
   if (Array.isArray(value)) {
     return false;
   }
-  const modelKeys = /* @__PURE__ */ new Set(["metric.key", "displayName", "description", "unit", "fieldName"]);
+  const modelKeys = /* @__PURE__ */ new Set([
+    "metric.key",
+    "displayName",
+    "description",
+    "unit",
+    "fieldName",
+    "rollup",
+    "rate"
+  ]);
   const hasAdditionalProperties = false;
   const requiredKeys = [];
-  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName"];
+  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName", "rollup", "rate"];
   const valKeys = new Set(Object.keys(value));
   const containsRequiredOrOptionalKeys = requiredKeys.length > 0 ? requiredKeys.every((reqKey) => valKeys.has(reqKey)) : optionalKeys.some((key) => valKeys.has(key)) || hasAdditionalProperties;
   const doesNotContainExtraKeys = [...valKeys].every((key) => modelKeys.has(key)) || hasAdditionalProperties;
@@ -2338,10 +2330,18 @@ function isJson23(value) {
   if (Array.isArray(value)) {
     return false;
   }
-  const modelKeys = /* @__PURE__ */ new Set(["metric.key", "displayName", "description", "unit", "fieldName"]);
+  const modelKeys = /* @__PURE__ */ new Set([
+    "metric.key",
+    "displayName",
+    "description",
+    "unit",
+    "fieldName",
+    "rollup",
+    "rate"
+  ]);
   const hasAdditionalProperties = false;
   const requiredKeys = [];
-  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName"];
+  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName", "rollup", "rate"];
   const valKeys = new Set(Object.keys(value));
   const containsRequiredOrOptionalKeys = requiredKeys.length > 0 ? requiredKeys.every((reqKey) => valKeys.has(reqKey)) : optionalKeys.some((key) => valKeys.has(key)) || hasAdditionalProperties;
   const doesNotContainExtraKeys = [...valKeys].every((key) => modelKeys.has(key)) || hasAdditionalProperties;
@@ -2349,23 +2349,27 @@ function isJson23(value) {
   return containsRequiredOrOptionalKeys && doesNotContainExtraKeys && allPropertiesMatchFormat;
 }
 function fromJson23($model) {
-  const { "metric.key": metricKey, displayName, description, unit, fieldName } = $model;
+  const { "metric.key": metricKey, displayName, description, unit, fieldName, rollup, rate } = $model;
   return {
     "metric.key": metricKey,
     displayName,
     description,
     unit,
-    fieldName
+    fieldName,
+    rollup,
+    rate
   };
 }
 function toJson23($model) {
-  const { "metric.key": metricKey, displayName, description, unit, fieldName } = $model;
+  const { "metric.key": metricKey, displayName, description, unit, fieldName, rollup, rate } = $model;
   return {
     "metric.key": metricKey,
     displayName,
     description,
     unit,
-    fieldName
+    fieldName,
+    rollup,
+    rate
   };
 }
 
@@ -3182,7 +3186,7 @@ var QueryExecutionClient = class {
         throw new InvalidResponseError(`QueryExecutionClient.query:poll:200`, err, responseValue, void 0, void 0);
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {
@@ -3328,7 +3332,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {
@@ -3556,7 +3560,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if ((0, import_http_client2.isHttpClientAbortError)(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!(0, import_http_client2.isHttpClientResponseError)(e)) {

package/docs/DOCS.md

@@ -17,7 +17,7 @@ import NpmLogo from '@site/static/img/npm-logo.png';
     </a>
   </div>
   <div class="col" style={{textAlign: 'right'}}>
-    <a href="https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.7.0">v1.7.0</a>
+    <a href="https://www.npmjs.com/package/@dynatrace-sdk/client-query/v/1.8.0">v1.8.0</a>
   </div>
 </div>
 
@@ -40,7 +40,7 @@ import { queryAssistanceClient } from "@dynatrace-sdk/client-query";
 
 Get a structured list of suggestions for the query at the given position.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h2> Overview</h2>
 
@@ -119,7 +119,7 @@ const data = await queryAssistanceClient.queryAutocomplete({
 
 Get a structured tree of the canonical form of the query.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h2> Overview</h2>
 
@@ -354,7 +354,7 @@ const data = await queryAssistanceClient.queryParse({
 
 Verifies a query without executing it.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h2> Overview</h2>
 
@@ -410,7 +410,7 @@ import { queryExecutionClient } from "@dynatrace-sdk/client-query";
 
 Cancels the query and returns the result if the query was already finished, otherwise discards it.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h3> Overview:</h3>
 
@@ -485,7 +485,7 @@ const data = await queryExecutionClient.queryCancel({
 
 Starts a Grail query.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h3> Overview:</h3>
 
@@ -565,7 +565,7 @@ const data = await queryExecutionClient.queryExecute({
 
 Retrieves query status and final result from Grail.
 
-For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
 
 <h3> Overview:</h3>
 
@@ -761,7 +761,7 @@ Detailed information about the error.
 | defaultTimeframeEnd        | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a>   | The query timeframe 'end' timestamp in ISO-8601 or RFC399 format. If the timeframe 'start' parameter is missing, the whole timeframe is ignored. <em>Note that if a timeframe is specified within the query string (query) then it has precedence over this query request parameter.</em>     |
 | defaultTimeframeStart      | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a>   | The query timeframe 'start' timestamp in ISO-8601 or RFC399 format. If the timeframe 'end' parameter is missing, the whole timeframe is ignored. <em>Note that if a timeframe is specified within the query string (query) then it has precedence over this query request parameter.</em>     |
 | enablePreview              | <a href="https://developer.mozilla.org/en-US/docs/Glossary/Boolean">boolean</a> | Request preview results. If a preview is available within the requestTimeoutMilliseconds, then it will be returned as part of the response.                                                                                                                                                   |
-| fetchTimeoutSeconds        | <a href="https://developer.mozilla.org/en-US/docs/Glossary/Number">number</a>   | The query will stop after reaching the fetch-timeout.                                                                                                                                                                                                                                         |
+| fetchTimeoutSeconds        | <a href="https://developer.mozilla.org/en-US/docs/Glossary/Number">number</a>   | The query will stop reading data after reaching the fetch-timeout. The query execution will continue, providing a partial result based on the read data.                                                                                                                                      |
 | locale                     | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a>   | The query locale. If none specified, then a language/country neutral locale is chosen. The input values take the ISO-639 Language code with an optional ISO-3166 country code appended to it with an underscore. For instance, both values are valid 'en' or 'en_US'.                         |
 | maxResultBytes             | <a href="https://developer.mozilla.org/en-US/docs/Glossary/Number">number</a>   | The maximum number of result bytes that this query will return.                                                                                                                                                                                                                               |
 | maxResultRecords           | <a href="https://developer.mozilla.org/en-US/docs/Glossary/Number">number</a>   | The maximum number of result records that this query will return.                                                                                                                                                                                                                             |
@@ -839,6 +839,8 @@ An object that defines additional metric metadata.
 | displayName | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | The display name of the metadata.                   |
 | fieldName   | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | The name of the associated field used in the query. |
 | metric.key  | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | The metric key.                                     |
+| rate        | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | The specified rate normalization parameter.         |
+| rollup      | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | Metadata about the rollup type.                     |
 | unit        | <a href="https://developer.mozilla.org/en-US/docs/Glossary/String">string</a> | The unit used.                                      |
 
 ### ParseRequest

package/dynatrace-metadata.json

@@ -1,10 +1,10 @@
 {
   "dynagen": {
-    "version": "0.12.9",
+    "version": "0.13.0",
     "generatedAt": "",
     "template": {
       "name": "@dynatrace-sdk/template-typescript-client",
-      "version": "0.18.5"
+      "version": "0.18.6"
     },
     "featureFlags": {
       "typeguards": true
@@ -12,7 +12,7 @@
   },
   "spec": {
     "title": "DQL Query",
-    "version": "1.6.0",
+    "version": "1.7.0",
     "baseUrl": "/platform/storage/query/v1"
   }
 }

package/esm/index.js

@@ -22,48 +22,32 @@ var __export = (target, all) => {
 // packages/client/query/src/lib/apis/query-assistance-api.ts
 import {
   httpClient as defaultHttpClient,
-  isHttpClientResponseError
+  isHttpClientResponseError,
+  isHttpClientAbortError
 } from "@dynatrace-sdk/http-client";
 
-// packages/platform/shared/utils/get-global-with-dt-runtime.ts
-var getGlobalWithDtRuntime = () => typeof globalThis !== "undefined" ? globalThis : window;
-
-// packages/platform/error-handlers/src/lib/add-global-error-serializer.ts
-function addGlobalErrorSerializer(serializer) {
-  const addGlobalErrorSerializerFunc = getAddGlobalErrorSerializer();
-  if (typeof addGlobalErrorSerializerFunc === "function") {
-    addGlobalErrorSerializerFunc(serializer);
-  } else {
-    console.warn("Missing addGlobalErrorSerializer function from sdk-web-runtime.");
-  }
-}
-function isGlobalErrorSerializerSupported() {
-  return typeof getAddGlobalErrorSerializer() === "function";
-}
-function getAddGlobalErrorSerializer() {
-  return getGlobalWithDtRuntime().dtRuntime?.errorHandlers?.addGlobalErrorSerializer;
-}
-
 // packages/client/query/src/lib/error-envelopes/api-client-error.ts
+import { ErrorType } from "@dynatrace-sdk/error-handlers";
 var ApiClientError = class extends Error {
   constructor(name, message, cause) {
     super(message);
     this.cause = cause;
     this.name = name;
   }
-  errorType = "JS Error" /* COMMON */;
+  errorType = ErrorType.COMMON;
 };
 function isApiClientError(e) {
   return e instanceof ApiClientError;
 }
 
 // packages/client/query/src/lib/error-envelopes/client-request-error.ts
+import { ErrorType as ErrorType2 } from "@dynatrace-sdk/error-handlers";
 var ClientRequestError = class extends ApiClientError {
   body;
   response;
   constructor(name, response, body, message, cause) {
     super(name, message, cause);
-    this.errorType = "Http Error" /* HTTP */;
+    this.errorType = ErrorType2.HTTP;
     this.body = body;
     this.response = response;
   }
@@ -80,6 +64,11 @@ function isErrorEnvelopeError(e) {
 }
 
 // packages/client/query/src/lib/error-envelopes/error-serializer.ts
+import {
+  ErrorType as ErrorType3,
+  addGlobalErrorSerializer,
+  isGlobalErrorSerializerSupported
+} from "@dynatrace-sdk/error-handlers";
 var apiClientErrorSerializer = async (error) => {
   if (isClientRequestError(error)) {
     const status = error.response.status;
@@ -89,7 +78,7 @@ var apiClientErrorSerializer = async (error) => {
       status,
       message,
       stack: error.stack,
-      type: "Http Error" /* HTTP */,
+      type: ErrorType3.HTTP,
       body: error.body,
       cause: error.cause,
       ...getOptionalErrorRef(error.body)
@@ -99,7 +88,7 @@ var apiClientErrorSerializer = async (error) => {
       name: error.name,
       message: error.message,
       stack: error.stack,
-      type: "JS Error" /* COMMON */,
+      type: ErrorType3.COMMON,
       cause: error.cause
     };
   }
@@ -1532,7 +1521,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1638,7 +1627,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1747,7 +1736,7 @@ var QueryAssistanceClient = class {
         );
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError(e)) {
@@ -1825,7 +1814,8 @@ var queryAssistanceClient = /* @__PURE__ */ new QueryAssistanceClient(defaultHtt
 // packages/client/query/src/lib/apis/query-execution-api.ts
 import {
   httpClient as defaultHttpClient2,
-  isHttpClientResponseError as isHttpClientResponseError2
+  isHttpClientResponseError as isHttpClientResponseError2,
+  isHttpClientAbortError as isHttpClientAbortError2
 } from "@dynatrace-sdk/http-client";
 
 // packages/client/query/src/lib/models/execute-request.transformation.ts
@@ -2258,10 +2248,18 @@ function isMetricMetadata(value) {
   if (Array.isArray(value)) {
     return false;
   }
-  const modelKeys = /* @__PURE__ */ new Set(["metric.key", "displayName", "description", "unit", "fieldName"]);
+  const modelKeys = /* @__PURE__ */ new Set([
+    "metric.key",
+    "displayName",
+    "description",
+    "unit",
+    "fieldName",
+    "rollup",
+    "rate"
+  ]);
   const hasAdditionalProperties = false;
   const requiredKeys = [];
-  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName"];
+  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName", "rollup", "rate"];
   const valKeys = new Set(Object.keys(value));
   const containsRequiredOrOptionalKeys = requiredKeys.length > 0 ? requiredKeys.every((reqKey) => valKeys.has(reqKey)) : optionalKeys.some((key) => valKeys.has(key)) || hasAdditionalProperties;
   const doesNotContainExtraKeys = [...valKeys].every((key) => modelKeys.has(key)) || hasAdditionalProperties;
@@ -2278,10 +2276,18 @@ function isJson23(value) {
   if (Array.isArray(value)) {
     return false;
   }
-  const modelKeys = /* @__PURE__ */ new Set(["metric.key", "displayName", "description", "unit", "fieldName"]);
+  const modelKeys = /* @__PURE__ */ new Set([
+    "metric.key",
+    "displayName",
+    "description",
+    "unit",
+    "fieldName",
+    "rollup",
+    "rate"
+  ]);
   const hasAdditionalProperties = false;
   const requiredKeys = [];
-  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName"];
+  const optionalKeys = ["metric.key", "displayName", "description", "unit", "fieldName", "rollup", "rate"];
   const valKeys = new Set(Object.keys(value));
   const containsRequiredOrOptionalKeys = requiredKeys.length > 0 ? requiredKeys.every((reqKey) => valKeys.has(reqKey)) : optionalKeys.some((key) => valKeys.has(key)) || hasAdditionalProperties;
   const doesNotContainExtraKeys = [...valKeys].every((key) => modelKeys.has(key)) || hasAdditionalProperties;
@@ -2289,23 +2295,27 @@ function isJson23(value) {
   return containsRequiredOrOptionalKeys && doesNotContainExtraKeys && allPropertiesMatchFormat;
 }
 function fromJson23($model) {
-  const { "metric.key": metricKey, displayName, description, unit, fieldName } = $model;
+  const { "metric.key": metricKey, displayName, description, unit, fieldName, rollup, rate } = $model;
   return {
     "metric.key": metricKey,
     displayName,
     description,
     unit,
-    fieldName
+    fieldName,
+    rollup,
+    rate
   };
 }
 function toJson23($model) {
-  const { "metric.key": metricKey, displayName, description, unit, fieldName } = $model;
+  const { "metric.key": metricKey, displayName, description, unit, fieldName, rollup, rate } = $model;
   return {
     "metric.key": metricKey,
     displayName,
     description,
     unit,
-    fieldName
+    fieldName,
+    rollup,
+    rate
   };
 }
 
@@ -3122,7 +3132,7 @@ var QueryExecutionClient = class {
         throw new InvalidResponseError(`QueryExecutionClient.query:poll:200`, err, responseValue, void 0, void 0);
       }
     } catch (e) {
-      if (isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {
@@ -3268,7 +3278,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {
@@ -3496,7 +3506,7 @@ var QueryExecutionClient = class {
         }
       }
     } catch (e) {
-      if (isClientRequestError(e) || isInvalidResponseError(e)) {
+      if (isHttpClientAbortError2(e) || isInvalidResponseError(e) || isClientRequestError(e)) {
         throw e;
       }
       if (!isHttpClientResponseError2(e)) {

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@dynatrace-sdk/client-query",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "Exposes an API to fetch records stored in Grail.",
   "license": "Apache-2.0",
   "dependencies": {
-    "@dynatrace-sdk/http-client": "^1.0.6"
+    "@dynatrace-sdk/error-handlers": "^1.2.0",
+    "@dynatrace-sdk/http-client": "^1.0.9"
   },
   "main": "./cjs/index.js",
   "module": "./esm/index.js",

package/types/packages/client/query/src/lib/apis/query-assistance-api.d.ts

@@ -19,7 +19,7 @@ export declare class QueryAssistanceClient {
     /**
      * Verifies a query without executing it.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ## Overview
      *
@@ -46,7 +46,7 @@ export declare class QueryAssistanceClient {
     /**
      * Get a structured tree of the canonical form of the query.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ## Overview
      *
@@ -258,7 +258,7 @@ export declare class QueryAssistanceClient {
     /**
      * Get a structured list of suggestions for the query at the given position.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ## Overview
      *

package/types/packages/client/query/src/lib/apis/query-execution-api.d.ts

@@ -16,7 +16,7 @@ export declare class QueryExecutionClient {
     /**
      * Retrieves query status and final result from Grail.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ### Overview:
      *
@@ -67,7 +67,7 @@ export declare class QueryExecutionClient {
     /**
      * Starts a Grail query.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ### Overview:
      *
@@ -124,7 +124,7 @@ export declare class QueryExecutionClient {
     /**
      * Cancels the query and returns the result if the query was already finished, otherwise discards it.
      *
-     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://www.dynatrace.com/support/help/platform/grail/assign-permissions-in-grail).
+     * For information about the required permissions see the [Bucket and table permissions in Grail documentation](https://docs.dynatrace.com/docs/shortlink/assign-bucket-table-permissions).
      *
      * ### Overview:
      *

package/types/packages/client/query/src/lib/models/execute-request.d.ts

@@ -28,7 +28,7 @@ export interface ExecuteRequest {
      */
     maxResultBytes?: number;
     /**
-     * The query will stop after reaching the fetch-timeout.
+     * The query will stop reading data after reaching the fetch-timeout. The query execution will continue, providing a partial result based on the read data.
      */
     fetchTimeoutSeconds?: number;
     /**

package/types/packages/client/query/src/lib/models/metric-metadata.d.ts

@@ -22,4 +22,12 @@ export interface MetricMetadata {
      * The name of the associated field used in the query.
      */
     fieldName?: string;
+    /**
+     * Metadata about the rollup type.
+     */
+    rollup?: string;
+    /**
+     * The specified rate normalization parameter.
+     */
+    rate?: string;
 }

package/types/packages/client/query/src/lib/models/metric-metadata.transformation.d.ts

@@ -5,6 +5,8 @@ export interface AsJson {
     description?: string;
     unit?: string;
     fieldName?: string;
+    rollup?: string;
+    rate?: string;
 }
 export declare function isMetricMetadata(value: any): value is MetricMetadata;
 export declare function isJson(value: any): value is AsJson;