@daocloud-proto/insight 0.12.2-74 → 0.12.2-78

package/insight/v1alpha1/insight.pb.ts

@@ -255,8 +255,8 @@ export class Resource {
   }
 }
 export class Tracing {
-  static ListServices(req: InsightIoApiTracingV1alpha1Tracing.QueryBaseRequest, initReq?: fm.InitReq): Promise<InsightIoApiTracingV1alpha1Query.GetServicesResponse> {
-    return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.QueryBaseRequest, InsightIoApiTracingV1alpha1Query.GetServicesResponse>(`/apis/insight.io/v1alpha1/traces/clusters/${req["cluster"]}/services?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
+  static ListServices(req: InsightIoApiTracingV1alpha1Tracing.ListServicesRequest, initReq?: fm.InitReq): Promise<InsightIoApiTracingV1alpha1Query.GetServicesResponse> {
+    return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.ListServicesRequest, InsightIoApiTracingV1alpha1Query.GetServicesResponse>(`/apis/insight.io/v1alpha1/traces/clusters/${req["cluster"]}/services?${fm.renderURLSearchParams(req, ["cluster"])}`, {...initReq, method: "GET"})
   }
   static QueryOperations(req: InsightIoApiTracingV1alpha1Tracing.QueryBaseRequest, initReq?: fm.InitReq): Promise<InsightIoApiTracingV1alpha1Tracing.OperationsQueryResponse> {
     return fm.fetchReq<InsightIoApiTracingV1alpha1Tracing.QueryBaseRequest, InsightIoApiTracingV1alpha1Tracing.OperationsQueryResponse>(`/apis/insight.io/v1alpha1/traces/operations?${fm.renderURLSearchParams(req, [])}`, {...initReq, method: "GET"})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"@daocloud-proto/insight",
-  "version":"0.12.2-74",
+  "version":"0.12.2-78",
   "description": "",
   "main": "index.js",
   "scripts": {

package/span_metric/v1alpha1/span_metric.pb.ts

@@ -6,8 +6,17 @@
 
 import * as InsightIoApiMetricV1alpha1Metric from "../../metric/v1alpha1/metric.pb"
 import * as InsightIoApiSpan_metricV1alpha1Otelspankind from "./otelspankind.pb"
-export type MetricsQueryBaseRequest = {
-  cluster?: string
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
+type BaseMetricsQueryBaseRequest = {
   namespace?: string
   instanceName?: string
   extensionFilters?: string
@@ -20,8 +29,11 @@ export type MetricsQueryBaseRequest = {
   spanKinds?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
 }
 
-export type GetApdexRequest = {
-  cluster?: string
+export type MetricsQueryBaseRequest = BaseMetricsQueryBaseRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
+
+type BaseGetApdexRequest = {
   namespace?: string
   name?: string
   apdexThreshold?: string
@@ -30,6 +42,9 @@ export type GetApdexRequest = {
   extensionFilters?: string
 }
 
+export type GetApdexRequest = BaseGetApdexRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type MetricsWithOperation = {
   operationName?: string
   spanKind?: string

package/tracing/v1alpha1/query.pb.ts

@@ -5,6 +5,15 @@
 */
 
 import * as InsightIoApiTracingV1alpha1Model from "./model.pb"
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
 export type TracesResponseChunk = {
   traces?: InsightIoApiTracingV1alpha1Model.Trace[]
 }
@@ -13,7 +22,8 @@ export type SpansResponseChunk = {
   spans?: InsightIoApiTracingV1alpha1Model.Span[]
 }
 
-export type TraceQueryParameters = {
+
+type BaseTraceQueryParameters = {
   serviceName?: string
   operationName?: string
   tags?: {[key: string]: string}
@@ -22,10 +32,12 @@ export type TraceQueryParameters = {
   durationMin?: string
   durationMax?: string
   limit?: number
-  cluster?: string
   namespace?: string
 }
 
+export type TraceQueryParameters = BaseTraceQueryParameters
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type FindTracesRequest = {
   query?: TraceQueryParameters
 }

package/tracing/v1alpha1/tracing.pb.ts

@@ -5,8 +5,17 @@
 */
 
 import * as InsightIoApiSpan_metricV1alpha1Otelspankind from "../../span_metric/v1alpha1/otelspankind.pb"
-export type QueryBaseRequest = {
-  cluster?: string
+
+type Absent<T, K extends keyof T> = { [k in Exclude<keyof T, K>]?: undefined };
+type OneOf<T> =
+  | { [k in keyof T]?: undefined }
+  | (
+    keyof T extends infer K ?
+      (K extends string & keyof T ? { [k in K]: T[K] } & Absent<T, K>
+        : never)
+    : never);
+
+type BaseQueryBaseRequest = {
   namespace?: string
   serviceName?: string
   spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
@@ -14,6 +23,9 @@ export type QueryBaseRequest = {
   end?: string
 }
 
+export type QueryBaseRequest = BaseQueryBaseRequest
+  & OneOf<{ cluster: string; clusterName: string }>
+
 export type BatchQueryBaseRequest = {
   cluster?: string
   namespace?: string
@@ -30,8 +42,20 @@ export type OperationsQueryResponse = {
   operations?: Operation[]
 }
 
-export type TraceRequestById = {
+
+type BaseTraceRequestById = {
   traceId?: string
+  namespace?: string
+}
+
+export type TraceRequestById = BaseTraceRequestById
+  & OneOf<{ cluster: string; clusterName: string }>
+
+export type ListServicesRequest = {
   cluster?: string
   namespace?: string
+  serviceName?: string
+  spanKind?: InsightIoApiSpan_metricV1alpha1Otelspankind.SpanKind[]
+  start?: string
+  end?: string
 }