@perses-dev/tempo-plugin 0.46.0 → 0.47.0-rc0

package/dist/model/api-types.d.ts

@@ -1,72 +1,109 @@
-export interface Span {
-    startTimeUnixNano: string;
-    spanId?: string;
-    spanID?: string;
-    attributes?: Attribute[];
-    durationNanos?: string;
-    endTimeUnixNano?: string;
-    kind?: string;
-    name?: string;
-    parentSpanId?: string;
-    status?: {
-        code?: string;
+/**
+ * Common types
+ */
+export interface Attribute {
+    key: string;
+    value: AttributeValue;
+}
+export type AttributeValue = {
+    stringValue: string;
+} | {
+    intValue: string;
+} | {
+    boolValue: boolean;
+} | {
+    arrayValue: {
+        values: AttributeValue[];
     };
-    traceId?: string;
+};
+/**
+ * Parameters of Tempo HTTP API endpoint GET /api/search
+ */
+export interface SearchRequestParameters {
+    q: string;
+    start?: number;
+    end?: number;
 }
-export interface Trace {
+/**
+ * Response of Tempo HTTP API endpoint GET /api/search/<query>
+ */
+export interface SearchTraceQueryResponse {
+    traces: TraceSearchResult[];
+}
+export interface TraceSearchResult {
     traceID: string;
     rootServiceName: string;
     rootTraceName: string;
     startTimeUnixNano: string;
-    durationMs: number;
+    /** unset if duration is less than 1ms */
+    durationMs?: number;
+    /** @deprecated spanSet is deprecated in favor of spanSets */
+    spanSet?: {
+        spans: SpanSearchResult[];
+        matched: number;
+    };
     spanSets?: Array<{
-        spans: Span[];
+        spans: SpanSearchResult[];
         matched: number;
     }>;
+    /** ServiceStats are only available in Tempo vParquet4+ blocks */
+    serviceStats?: Record<string, ServiceStats>;
+}
+export interface SpanSearchResult {
+    spanID: string;
+    name: string;
+    startTimeUnixNano: string;
+    durationNanos: string;
+    attributes: Attribute[];
+}
+export interface ServiceStats {
+    spanCount: number;
+    /** number of spans with errors, unset if zero */
+    errorCount?: number;
 }
 /**
- * Response of Tempo HTTP API endpoint GET /api/search/<query>
+ * Response of Tempo HTTP API endpoint GET /api/traces/<traceID>
+ * OTEL trace proto: https://github.com/open-telemetry/opentelemetry-proto-go/blob/main/otlp/trace/v1/trace.pb.go
  */
-export interface SearchTraceQueryResponse {
-    traces: Trace[];
+export interface SearchTraceIDResponse {
+    batches: Batch[];
 }
-export interface Attribute {
-    key: string;
-    value: {
-        stringValue?: string;
-        intValue?: string;
-    };
+export interface Batch {
+    resource: Resource;
+    scopeSpans: ScopeSpan[];
+}
+export interface Resource {
+    attributes: Attribute[];
 }
 export interface ScopeSpan {
-    scope: {
-        name: string;
-    };
+    scope: Scope;
     spans: Span[];
 }
-export interface Batch {
-    resource: {
-        attributes: Attribute[];
-    };
-    scopeSpans: ScopeSpan[];
+export interface Scope {
+    name: string;
 }
-/**
- * Response of Tempo HTTP API endpoint GET /api/traces/<traceID>
- */
-export interface SearchTraceIDResponse {
-    batches: Batch[];
+export interface Span {
+    traceId: string;
+    spanId: string;
+    parentSpanId?: string;
+    name: string;
+    kind: string;
+    startTimeUnixNano: string;
+    endTimeUnixNano: string;
+    attributes?: Attribute[];
+    events?: SpanEvent[];
+    status?: SpanStatus;
 }
-/**
- * Combined Response of Tempo HTTP API endpoint GET /api/search/<query>
- * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>
- * a detailed trace report is fetched from  GET /api/traces/<traceID>.
- */
-export interface EnrichedTraceQueryResponse {
-    query: string;
-    traces: Array<{
-        spanCount: number;
-        errorCount: number;
-        summary: Trace;
-        traceDetails: SearchTraceIDResponse;
-    }>;
+export interface SpanEvent {
+    timeUnixNano: string;
+    name: string;
+    attributes?: Attribute[];
+}
+export interface SpanStatus {
+    code?: typeof SpanStatusUnset | typeof SpanStatusOk | typeof SpanStatusError;
+    message?: string;
 }
+export declare const SpanStatusUnset = "STATUS_CODE_UNSET";
+export declare const SpanStatusOk = "STATUS_CODE_OK";
+export declare const SpanStatusError = "STATUS_CODE_ERROR";
 //# sourceMappingURL=api-types.d.ts.map

package/dist/model/api-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-types.d.ts","sourceRoot":"","sources":["../../src/model/api-types.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,IAAI;IACnB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,SAAS,EAAE,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE;QACP,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,KAAK;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC;QACf,KAAK,EAAE,IAAI,EAAE,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,KAAK,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,KAAK,EAAE,IAAI,EAAE,CAAC;CACf;AAED,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE;QACR,UAAU,EAAE,SAAS,EAAE,CAAC;KACzB,CAAC;IACF,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,KAAK,EAAE,CAAC;CAClB;AAED;;;;GAIG;AACH,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,KAAK,CAAC;QACZ,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,EAAE,KAAK,CAAC;QACf,YAAY,EAAE,qBAAqB,CAAC;KACrC,CAAC,CAAC;CACJ"}
+{"version":3,"file":"api-types.d.ts","sourceRoot":"","sources":["../../src/model/api-types.ts"],"names":[],"mappings":"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"}

package/dist/model/api-types.js

@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 /**
- * Combined Response of Tempo HTTP API endpoint GET /api/search/<query>
- * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>
- * a detailed trace report is fetched from  GET /api/traces/<traceID>.
- */ export { };
+ * Common types
+ */ export const SpanStatusUnset = 'STATUS_CODE_UNSET';
+export const SpanStatusOk = 'STATUS_CODE_OK';
+export const SpanStatusError = 'STATUS_CODE_ERROR';
 
 //# sourceMappingURL=api-types.js.map

package/dist/model/api-types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/api-types.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nexport interface Span {\n  startTimeUnixNano: string;\n  spanId?: string; // Span from api/search/<query>\n  spanID?: string; // Span from api/traces/<traceID>\n  attributes?: Attribute[];\n  durationNanos?: string;\n  endTimeUnixNano?: string;\n  kind?: string;\n  name?: string;\n  parentSpanId?: string;\n  status?: {\n    code?: string;\n  };\n  traceId?: string;\n}\n\nexport interface Trace {\n  traceID: string;\n  rootServiceName: string;\n  rootTraceName: string;\n  startTimeUnixNano: string;\n  durationMs: number;\n  spanSets?: Array<{\n    spans: Span[];\n    matched: number;\n  }>;\n}\n\n/**\n * Response of Tempo HTTP API endpoint GET /api/search/<query>\n */\nexport interface SearchTraceQueryResponse {\n  traces: Trace[];\n}\n\nexport interface Attribute {\n  key: string;\n  value: {\n    stringValue?: string;\n    intValue?: string;\n  };\n}\n\nexport interface ScopeSpan {\n  scope: {\n    name: string;\n  };\n  spans: Span[];\n}\n\nexport interface Batch {\n  resource: {\n    attributes: Attribute[];\n  };\n  scopeSpans: ScopeSpan[];\n}\n\n/**\n * Response of Tempo HTTP API endpoint GET /api/traces/<traceID>\n */\nexport interface SearchTraceIDResponse {\n  batches: Batch[];\n}\n\n/**\n * Combined Response of Tempo HTTP API endpoint GET /api/search/<query>\n * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>\n * a detailed trace report is fetched from  GET /api/traces/<traceID>.\n */\nexport interface EnrichedTraceQueryResponse {\n  query: string;\n  traces: Array<{\n    spanCount: number;\n    errorCount: number;\n    summary: Trace;\n    traceDetails: SearchTraceIDResponse;\n  }>;\n}\n"],"names":[],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAkEjC;;;;CAIC,GACD,WAQC"}
+{"version":3,"sources":["../../src/model/api-types.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\n/**\n * Common types\n */\nexport interface Attribute {\n  key: string;\n  value: AttributeValue;\n}\n\nexport type AttributeValue =\n  | { stringValue: string }\n  | { intValue: string }\n  | { boolValue: boolean }\n  | { arrayValue: { values: AttributeValue[] } };\n\n/**\n * Parameters of Tempo HTTP API endpoint GET /api/search\n */\nexport interface SearchRequestParameters {\n  q: string;\n  start?: number;\n  end?: number;\n}\n\n/**\n * Response of Tempo HTTP API endpoint GET /api/search/<query>\n */\nexport interface SearchTraceQueryResponse {\n  traces: TraceSearchResult[];\n}\n\nexport interface TraceSearchResult {\n  traceID: string;\n  rootServiceName: string;\n  rootTraceName: string;\n  startTimeUnixNano: string;\n  /** unset if duration is less than 1ms */\n  durationMs?: number;\n  /** @deprecated spanSet is deprecated in favor of spanSets */\n  spanSet?: {\n    spans: SpanSearchResult[];\n    matched: number;\n  };\n  spanSets?: Array<{\n    spans: SpanSearchResult[];\n    matched: number;\n  }>;\n  /** ServiceStats are only available in Tempo vParquet4+ blocks */\n  serviceStats?: Record<string, ServiceStats>;\n}\n\nexport interface SpanSearchResult {\n  spanID: string;\n  name: string;\n  startTimeUnixNano: string;\n  durationNanos: string;\n  attributes: Attribute[];\n}\n\nexport interface ServiceStats {\n  spanCount: number;\n  /** number of spans with errors, unset if zero */\n  errorCount?: number;\n}\n\n/**\n * Response of Tempo HTTP API endpoint GET /api/traces/<traceID>\n * OTEL trace proto: https://github.com/open-telemetry/opentelemetry-proto-go/blob/main/otlp/trace/v1/trace.pb.go\n */\nexport interface SearchTraceIDResponse {\n  batches: Batch[];\n}\n\nexport interface Batch {\n  resource: Resource;\n  scopeSpans: ScopeSpan[];\n}\n\nexport interface Resource {\n  attributes: Attribute[];\n}\n\nexport interface ScopeSpan {\n  scope: Scope;\n  spans: Span[];\n}\n\nexport interface Scope {\n  name: string;\n}\n\nexport interface Span {\n  traceId: string;\n  spanId: string;\n  parentSpanId?: string;\n  name: string;\n  kind: string;\n  startTimeUnixNano: string;\n  endTimeUnixNano: string;\n  attributes?: Attribute[];\n  events?: SpanEvent[];\n  status?: SpanStatus;\n}\n\nexport interface SpanEvent {\n  timeUnixNano: string;\n  name: string;\n  attributes?: Attribute[];\n}\n\nexport interface SpanStatus {\n  code?: typeof SpanStatusUnset | typeof SpanStatusOk | typeof SpanStatusError;\n  message?: string;\n}\n\nexport const SpanStatusUnset = 'STATUS_CODE_UNSET';\nexport const SpanStatusOk = 'STATUS_CODE_OK';\nexport const SpanStatusError = 'STATUS_CODE_ERROR';\n"],"names":["SpanStatusUnset","SpanStatusOk","SpanStatusError"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC;;CAEC,GAgHD,OAAO,MAAMA,kBAAkB,oBAAoB;AACnD,OAAO,MAAMC,eAAe,iBAAiB;AAC7C,OAAO,MAAMC,kBAAkB,oBAAoB"}

package/dist/model/tempo-client.d.ts

@@ -1,36 +1,38 @@
 import { RequestHeaders } from '@perses-dev/core';
 import { DatasourceClient } from '@perses-dev/plugin-system';
-import { SearchTraceIDResponse, EnrichedTraceQueryResponse, SearchTraceQueryResponse } from './api-types';
+import { SearchRequestParameters, SearchTraceIDResponse, SearchTraceQueryResponse } from './api-types';
 interface TempoClientOptions {
     datasourceUrl: string;
     headers?: RequestHeaders;
 }
 export interface TempoClient extends DatasourceClient {
     options: TempoClientOptions;
-    getEnrichedTraceQuery(query: string, datasourceUrl: string): Promise<EnrichedTraceQueryResponse>;
-    searchTraceQuery(query: string, datasourceUrl: string): Promise<SearchTraceQueryResponse>;
-    searchTraceID(traceID: string, datasourceUrl: string): Promise<SearchTraceIDResponse>;
+    searchTraceQuery(params: SearchRequestParameters, queryOptions: QueryOptions): Promise<SearchTraceQueryResponse>;
+    searchTraceQueryFallback(params: SearchRequestParameters, queryOptions: QueryOptions): Promise<SearchTraceQueryResponse>;
+    searchTraceID(traceID: string, queryOptions: QueryOptions): Promise<SearchTraceIDResponse>;
 }
-export declare const executeRequest: <T>(url: string) => Promise<T>;
+export interface QueryOptions {
+    datasourceUrl: string;
+    headers?: RequestHeaders;
+}
+export declare const executeRequest: <T>(input: string | URL | Request, init?: RequestInit | undefined) => Promise<T>;
 /**
  * Returns a summary report of traces that satisfy the query.
  */
-export declare function searchTraceQuery(query: string, datasourceUrl: string): Promise<SearchTraceQueryResponse>;
+export declare function searchTraceQuery(params: SearchRequestParameters, queryOptions: QueryOptions): Promise<SearchTraceQueryResponse>;
 /**
  * Returns a detailed report, including all the spans, for a given trace.
  */
-export declare function searchTraceID(traceID: string, datasourceUrl: string): Promise<SearchTraceIDResponse>;
+export declare function searchTraceID(traceID: string, queryOptions: QueryOptions): Promise<SearchTraceIDResponse>;
 /**
- * Combined response of Tempo HTTP API endpoints GET /api/search/<query>
- * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>
- * a detailed trace report is fetched from  GET /api/traces/<traceID>. This is a
- * temporary workaround to obtain the total number of spans and total number
- * of errors for a trace.
+ * Returns a summary report of traces that satisfy the query.
+ *
+ * If the serviceStats field is missing in the response, fetches all traces
+ * and calculates the serviceStats.
  *
- * TODO: This workaround should be replaced once this issue,
- * https://github.com/grafana/tempo/issues/2940, is resolved upstream in
- * Tempo.
+ * Tempo computes the serviceStats field during ingestion since vParquet4,
+ * this fallback is required for older block formats.
  */
-export declare function getEnrichedTraceQuery(query: string, datasourceUrl: string): Promise<EnrichedTraceQueryResponse>;
+export declare function searchTraceQueryFallback(params: SearchRequestParameters, queryOptions: QueryOptions): Promise<SearchTraceQueryResponse>;
 export {};
 //# sourceMappingURL=tempo-client.d.ts.map

package/dist/model/tempo-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tempo-client.d.ts","sourceRoot":"","sources":["../../src/model/tempo-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAS,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAE1G,UAAU,kBAAkB;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD,OAAO,EAAE,kBAAkB,CAAC;IAC5B,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACjG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC1F,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACvF;AAED,eAAO,MAAM,cAAc,WAAkB,MAAM,eAIlD,CAAC;AAOF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qCAEpE;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,kCAEnE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAoCrH"}
+{"version":3,"file":"tempo-client.d.ts","sourceRoot":"","sources":["../../src/model/tempo-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAS,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,wBAAwB,EAGzB,MAAM,aAAa,CAAC;AAErB,UAAU,kBAAkB;IAC1B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,WAAY,SAAQ,gBAAgB;IACnD,OAAO,EAAE,kBAAkB,CAAC;IAC5B,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACjH,wBAAwB,CACtB,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,wBAAwB,CAAC,CAAC;IACrC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;CAC5F;AAED,MAAM,WAAW,YAAY;IAC3B,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,eAAO,MAAM,cAAc,kFAI1B,CAAC;AAiBF;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,uBAAuB,EAAE,YAAY,EAAE,YAAY,qCAE3F;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,kCAExE;AAED;;;;;;;;GAQG;AACH,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,YAAY,GACzB,OAAO,CAAC,wBAAwB,CAAC,CAgDnC"}

package/dist/model/tempo-client.js

@@ -11,67 +11,88 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { fetch } from '@perses-dev/core';
-export const executeRequest = async (url)=>{
-    const response = await fetch(url);
+import { SpanStatusError } from './api-types';
+export const executeRequest = async (...args)=>{
+    const response = await fetch(...args);
     const jsonData = await response.json();
     return jsonData;
 };
-function fetchWithGet(apiURI, datasourceUrl) {
-    const url = `${datasourceUrl}${apiURI}`;
-    return executeRequest(url);
+function fetchWithGet(apiURI, params, queryOptions) {
+    const { datasourceUrl, headers = {} } = queryOptions;
+    let url = `${datasourceUrl}${apiURI}`;
+    if (params) {
+        url += '?' + new URLSearchParams(params);
+    }
+    const init = {
+        method: 'GET',
+        headers
+    };
+    return executeRequest(url, init);
 }
 /**
  * Returns a summary report of traces that satisfy the query.
- */ export function searchTraceQuery(query, datasourceUrl) {
-    return fetchWithGet(`/api/search?q=${query}`, datasourceUrl);
+ */ export function searchTraceQuery(params, queryOptions) {
+    return fetchWithGet(`/api/search`, params, queryOptions);
 }
 /**
  * Returns a detailed report, including all the spans, for a given trace.
- */ export function searchTraceID(traceID, datasourceUrl) {
-    return fetchWithGet(`/api/traces/${traceID}`, datasourceUrl);
+ */ export function searchTraceID(traceID, queryOptions) {
+    return fetchWithGet(`/api/traces/${traceID}`, null, queryOptions);
 }
 /**
- * Combined response of Tempo HTTP API endpoints GET /api/search/<query>
- * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>
- * a detailed trace report is fetched from  GET /api/traces/<traceID>. This is a
- * temporary workaround to obtain the total number of spans and total number
- * of errors for a trace.
+ * Returns a summary report of traces that satisfy the query.
+ *
+ * If the serviceStats field is missing in the response, fetches all traces
+ * and calculates the serviceStats.
  *
- * TODO: This workaround should be replaced once this issue,
- * https://github.com/grafana/tempo/issues/2940, is resolved upstream in
- * Tempo.
- */ export async function getEnrichedTraceQuery(query, datasourceUrl) {
+ * Tempo computes the serviceStats field during ingestion since vParquet4,
+ * this fallback is required for older block formats.
+ */ export async function searchTraceQueryFallback(params, queryOptions) {
+    var _searchResponse_traces_;
     // Get a list of traces that satisfy the query.
-    const searchResponse = await searchTraceQuery(query, datasourceUrl);
-    if (!searchResponse.traces) {
+    const searchResponse = await searchTraceQuery(params, queryOptions);
+    if (!searchResponse.traces || searchResponse.traces.length === 0) {
         return {
-            query,
             traces: []
         };
     }
+    // exit early if fallback is not required (serviceStats are contained in the response)
+    if ((_searchResponse_traces_ = searchResponse.traces[0]) === null || _searchResponse_traces_ === void 0 ? void 0 : _searchResponse_traces_.serviceStats) {
+        return searchResponse;
+    }
+    // calculate serviceStats (number of spans and errors) per service
     return {
-        query,
         traces: await Promise.all(searchResponse.traces.map(async (trace)=>{
-            let spanCount = 0;
-            let errorCount = 0;
-            const searchTraceIDResponse = await searchTraceID(trace.traceID, datasourceUrl);
-            // For every trace, get the full trace, and find the total number of spans and errors.
+            const serviceStats = {};
+            const searchTraceIDResponse = await searchTraceID(trace.traceID, queryOptions);
+            // For every trace, get the full trace, and find the number of spans and errors.
             for (const batch of searchTraceIDResponse.batches){
+                let serviceName = '?';
+                for (const attr of batch.resource.attributes){
+                    if (attr.key === 'service.name' && 'stringValue' in attr.value) {
+                        serviceName = attr.value.stringValue;
+                        break;
+                    }
+                }
+                var _serviceStats_serviceName;
+                const stats = (_serviceStats_serviceName = serviceStats[serviceName]) !== null && _serviceStats_serviceName !== void 0 ? _serviceStats_serviceName : {
+                    spanCount: 0
+                };
                 for (const scopeSpan of batch.scopeSpans){
-                    spanCount += scopeSpan.spans.length;
+                    stats.spanCount += scopeSpan.spans.length;
                     for (const span of scopeSpan.spans){
                         var _span_status;
-                        if ((_span_status = span.status) === null || _span_status === void 0 ? void 0 : _span_status.code) {
-                            errorCount++;
+                        if (((_span_status = span.status) === null || _span_status === void 0 ? void 0 : _span_status.code) === SpanStatusError) {
+                            var _stats_errorCount;
+                            stats.errorCount = ((_stats_errorCount = stats.errorCount) !== null && _stats_errorCount !== void 0 ? _stats_errorCount : 0) + 1;
                         }
                     }
                 }
+                serviceStats[serviceName] = stats;
             }
             return {
-                summary: trace,
-                traceDetails: searchTraceIDResponse,
-                spanCount,
-                errorCount
+                ...trace,
+                serviceStats
             };
         }))
     };

package/dist/model/tempo-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/model/tempo-client.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { fetch, RequestHeaders } from '@perses-dev/core';\nimport { DatasourceClient } from '@perses-dev/plugin-system';\nimport { SearchTraceIDResponse, EnrichedTraceQueryResponse, SearchTraceQueryResponse } from './api-types';\n\ninterface TempoClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface TempoClient extends DatasourceClient {\n  options: TempoClientOptions;\n  getEnrichedTraceQuery(query: string, datasourceUrl: string): Promise<EnrichedTraceQueryResponse>;\n  searchTraceQuery(query: string, datasourceUrl: string): Promise<SearchTraceQueryResponse>;\n  searchTraceID(traceID: string, datasourceUrl: string): Promise<SearchTraceIDResponse>;\n}\n\nexport const executeRequest = async <T>(url: string): Promise<T> => {\n  const response = await fetch(url);\n  const jsonData = await response.json();\n  return jsonData;\n};\n\nfunction fetchWithGet<TResponse>(apiURI: string, datasourceUrl: string) {\n  const url = `${datasourceUrl}${apiURI}`;\n  return executeRequest<TResponse>(url);\n}\n\n/**\n * Returns a summary report of traces that satisfy the query.\n */\nexport function searchTraceQuery(query: string, datasourceUrl: string) {\n  return fetchWithGet<SearchTraceQueryResponse>(`/api/search?q=${query}`, datasourceUrl);\n}\n\n/**\n * Returns a detailed report, including all the spans, for a given trace.\n */\nexport function searchTraceID(traceID: string, datasourceUrl: string) {\n  return fetchWithGet<SearchTraceIDResponse>(`/api/traces/${traceID}`, datasourceUrl);\n}\n\n/**\n * Combined response of Tempo HTTP API endpoints GET /api/search/<query>\n * and GET /api/traces/<traceID>. For each trace returned from GET /api/search/<query>\n * a detailed trace report is fetched from  GET /api/traces/<traceID>. This is a\n * temporary workaround to obtain the total number of spans and total number\n * of errors for a trace.\n *\n * TODO: This workaround should be replaced once this issue,\n * https://github.com/grafana/tempo/issues/2940, is resolved upstream in\n * Tempo.\n */\nexport async function getEnrichedTraceQuery(query: string, datasourceUrl: string): Promise<EnrichedTraceQueryResponse> {\n  // Get a list of traces that satisfy the query.\n  const searchResponse = await searchTraceQuery(query, datasourceUrl);\n  if (!searchResponse.traces) {\n    return { query, traces: [] };\n  }\n\n  return {\n    query,\n    traces: await Promise.all(\n      searchResponse.traces.map(async (trace) => {\n        let spanCount = 0;\n        let errorCount = 0;\n        const searchTraceIDResponse = await searchTraceID(trace.traceID, datasourceUrl);\n\n        // For every trace, get the full trace, and find the total number of spans and errors.\n        for (const batch of searchTraceIDResponse.batches) {\n          for (const scopeSpan of batch.scopeSpans) {\n            spanCount += scopeSpan.spans.length;\n            for (const span of scopeSpan.spans) {\n              if (span.status?.code) {\n                errorCount++;\n              }\n            }\n          }\n        }\n\n        return {\n          summary: trace,\n          traceDetails: searchTraceIDResponse,\n          spanCount,\n          errorCount,\n        };\n      })\n    ),\n  };\n}\n"],"names":["fetch","executeRequest","url","response","jsonData","json","fetchWithGet","apiURI","datasourceUrl","searchTraceQuery","query","searchTraceID","traceID","getEnrichedTraceQuery","searchResponse","traces","Promise","all","map","trace","spanCount","errorCount","searchTraceIDResponse","batch","batches","scopeSpan","scopeSpans","spans","length","span","status","code","summary","traceDetails"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,KAAK,QAAwB,mBAAmB;AAgBzD,OAAO,MAAMC,iBAAiB,OAAUC;IACtC,MAAMC,WAAW,MAAMH,MAAME;IAC7B,MAAME,WAAW,MAAMD,SAASE,IAAI;IACpC,OAAOD;AACT,EAAE;AAEF,SAASE,aAAwBC,MAAc,EAAEC,aAAqB;IACpE,MAAMN,MAAM,CAAC,EAAEM,cAAc,EAAED,OAAO,CAAC;IACvC,OAAON,eAA0BC;AACnC;AAEA;;CAEC,GACD,OAAO,SAASO,iBAAiBC,KAAa,EAAEF,aAAqB;IACnE,OAAOF,aAAuC,CAAC,cAAc,EAAEI,MAAM,CAAC,EAAEF;AAC1E;AAEA;;CAEC,GACD,OAAO,SAASG,cAAcC,OAAe,EAAEJ,aAAqB;IAClE,OAAOF,aAAoC,CAAC,YAAY,EAAEM,QAAQ,CAAC,EAAEJ;AACvE;AAEA;;;;;;;;;;CAUC,GACD,OAAO,eAAeK,sBAAsBH,KAAa,EAAEF,aAAqB;IAC9E,+CAA+C;IAC/C,MAAMM,iBAAiB,MAAML,iBAAiBC,OAAOF;IACrD,IAAI,CAACM,eAAeC,MAAM,EAAE;QAC1B,OAAO;YAAEL;YAAOK,QAAQ,EAAE;QAAC;IAC7B;IAEA,OAAO;QACLL;QACAK,QAAQ,MAAMC,QAAQC,GAAG,CACvBH,eAAeC,MAAM,CAACG,GAAG,CAAC,OAAOC;YAC/B,IAAIC,YAAY;YAChB,IAAIC,aAAa;YACjB,MAAMC,wBAAwB,MAAMX,cAAcQ,MAAMP,OAAO,EAAEJ;YAEjE,sFAAsF;YACtF,KAAK,MAAMe,SAASD,sBAAsBE,OAAO,CAAE;gBACjD,KAAK,MAAMC,aAAaF,MAAMG,UAAU,CAAE;oBACxCN,aAAaK,UAAUE,KAAK,CAACC,MAAM;oBACnC,KAAK,MAAMC,QAAQJ,UAAUE,KAAK,CAAE;4BAC9BE;wBAAJ,KAAIA,eAAAA,KAAKC,MAAM,cAAXD,mCAAAA,aAAaE,IAAI,EAAE;4BACrBV;wBACF;oBACF;gBACF;YACF;YAEA,OAAO;gBACLW,SAASb;gBACTc,cAAcX;gBACdF;gBACAC;YACF;QACF;IAEJ;AACF"}
+{"version":3,"sources":["../../src/model/tempo-client.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { fetch, RequestHeaders } from '@perses-dev/core';\nimport { DatasourceClient } from '@perses-dev/plugin-system';\nimport {\n  SearchRequestParameters,\n  SearchTraceIDResponse,\n  SearchTraceQueryResponse,\n  ServiceStats,\n  SpanStatusError,\n} from './api-types';\n\ninterface TempoClientOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface TempoClient extends DatasourceClient {\n  options: TempoClientOptions;\n  searchTraceQuery(params: SearchRequestParameters, queryOptions: QueryOptions): Promise<SearchTraceQueryResponse>;\n  searchTraceQueryFallback(\n    params: SearchRequestParameters,\n    queryOptions: QueryOptions\n  ): Promise<SearchTraceQueryResponse>;\n  searchTraceID(traceID: string, queryOptions: QueryOptions): Promise<SearchTraceIDResponse>;\n}\n\nexport interface QueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport const executeRequest = async <T>(...args: Parameters<typeof global.fetch>): Promise<T> => {\n  const response = await fetch(...args);\n  const jsonData = await response.json();\n  return jsonData;\n};\n\nfunction fetchWithGet<T, TResponse>(apiURI: string, params: T | null, queryOptions: QueryOptions) {\n  const { datasourceUrl, headers = {} } = queryOptions;\n\n  let url = `${datasourceUrl}${apiURI}`;\n  if (params) {\n    url += '?' + new URLSearchParams(params);\n  }\n  const init = {\n    method: 'GET',\n    headers,\n  };\n\n  return executeRequest<TResponse>(url, init);\n}\n\n/**\n * Returns a summary report of traces that satisfy the query.\n */\nexport function searchTraceQuery(params: SearchRequestParameters, queryOptions: QueryOptions) {\n  return fetchWithGet<SearchRequestParameters, SearchTraceQueryResponse>(`/api/search`, params, queryOptions);\n}\n\n/**\n * Returns a detailed report, including all the spans, for a given trace.\n */\nexport function searchTraceID(traceID: string, queryOptions: QueryOptions) {\n  return fetchWithGet<null, SearchTraceIDResponse>(`/api/traces/${traceID}`, null, queryOptions);\n}\n\n/**\n * Returns a summary report of traces that satisfy the query.\n *\n * If the serviceStats field is missing in the response, fetches all traces\n * and calculates the serviceStats.\n *\n * Tempo computes the serviceStats field during ingestion since vParquet4,\n * this fallback is required for older block formats.\n */\nexport async function searchTraceQueryFallback(\n  params: SearchRequestParameters,\n  queryOptions: QueryOptions\n): Promise<SearchTraceQueryResponse> {\n  // Get a list of traces that satisfy the query.\n  const searchResponse = await searchTraceQuery(params, queryOptions);\n  if (!searchResponse.traces || searchResponse.traces.length === 0) {\n    return { traces: [] };\n  }\n\n  // exit early if fallback is not required (serviceStats are contained in the response)\n  if (searchResponse.traces[0]?.serviceStats) {\n    return searchResponse;\n  }\n\n  // calculate serviceStats (number of spans and errors) per service\n  return {\n    traces: await Promise.all(\n      searchResponse.traces.map(async (trace) => {\n        const serviceStats: Record<string, ServiceStats> = {};\n        const searchTraceIDResponse = await searchTraceID(trace.traceID, queryOptions);\n\n        // For every trace, get the full trace, and find the number of spans and errors.\n        for (const batch of searchTraceIDResponse.batches) {\n          let serviceName = '?';\n          for (const attr of batch.resource.attributes) {\n            if (attr.key === 'service.name' && 'stringValue' in attr.value) {\n              serviceName = attr.value.stringValue;\n              break;\n            }\n          }\n\n          const stats = serviceStats[serviceName] ?? { spanCount: 0 };\n          for (const scopeSpan of batch.scopeSpans) {\n            stats.spanCount += scopeSpan.spans.length;\n            for (const span of scopeSpan.spans) {\n              if (span.status?.code === SpanStatusError) {\n                stats.errorCount = (stats.errorCount ?? 0) + 1;\n              }\n            }\n          }\n          serviceStats[serviceName] = stats;\n        }\n\n        return {\n          ...trace,\n          serviceStats,\n        };\n      })\n    ),\n  };\n}\n"],"names":["fetch","SpanStatusError","executeRequest","args","response","jsonData","json","fetchWithGet","apiURI","params","queryOptions","datasourceUrl","headers","url","URLSearchParams","init","method","searchTraceQuery","searchTraceID","traceID","searchTraceQueryFallback","searchResponse","traces","length","serviceStats","Promise","all","map","trace","searchTraceIDResponse","batch","batches","serviceName","attr","resource","attributes","key","value","stringValue","stats","spanCount","scopeSpan","scopeSpans","spans","span","status","code","errorCount"],"mappings":"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"}

package/dist/plugins/tempo-datasource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tempo-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/tempo-datasource.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAA0D,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC5G,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAyB/D,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,WAAW,CAK9E,CAAC"}
+{"version":3,"file":"tempo-datasource.d.ts","sourceRoot":"","sources":["../../src/plugins/tempo-datasource.tsx"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAA6D,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAC/G,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAyB/D,eAAO,MAAM,eAAe,EAAE,gBAAgB,CAAC,mBAAmB,EAAE,WAAW,CAK9E,CAAC"}

package/dist/plugins/tempo-datasource.js

@@ -10,7 +10,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-import { searchTraceQuery, searchTraceID, getEnrichedTraceQuery } from '../model/tempo-client';
+import { searchTraceQuery, searchTraceID, searchTraceQueryFallback } from '../model/tempo-client';
 /**
  * Creates a TempoClient for a specific datasource spec.
  */ const createClient = (spec, options)=>{
@@ -25,9 +25,9 @@ import { searchTraceQuery, searchTraceID, getEnrichedTraceQuery } from '../model
         options: {
             datasourceUrl
         },
-        searchTraceQuery: (query)=>searchTraceQuery(query, datasourceUrl),
-        searchTraceID: (traceID)=>searchTraceID(traceID, datasourceUrl),
-        getEnrichedTraceQuery: (query)=>getEnrichedTraceQuery(query, datasourceUrl)
+        searchTraceQuery: (params, queryOptions)=>searchTraceQuery(params, queryOptions),
+        searchTraceQueryFallback: (params, queryOptions)=>searchTraceQueryFallback(params, queryOptions),
+        searchTraceID: (traceID, queryOptions)=>searchTraceID(traceID, queryOptions)
     };
 };
 export const TempoDatasource = {

package/dist/plugins/tempo-datasource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/plugins/tempo-datasource.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { searchTraceQuery, searchTraceID, getEnrichedTraceQuery, TempoClient } from '../model/tempo-client';\nimport { TempoDatasourceSpec } from './tempo-datasource-types';\n\n/**\n * Creates a TempoClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<TempoDatasourceSpec, TempoClient>['createClient'] = (spec, options) => {\n  const { directUrl } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = directUrl ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Tempo client. You can use directUrl in the spec to configure it.');\n  }\n\n  return {\n    options: {\n      datasourceUrl,\n    },\n    searchTraceQuery: (query: string) => searchTraceQuery(query, datasourceUrl),\n    searchTraceID: (traceID: string) => searchTraceID(traceID, datasourceUrl),\n    getEnrichedTraceQuery: (query: string) => getEnrichedTraceQuery(query, datasourceUrl),\n  };\n};\n\nexport const TempoDatasource: DatasourcePlugin<TempoDatasourceSpec, TempoClient> = {\n  createClient,\n  // TODO add a options editor component for tempo datasource\n  // OptionsEditorComponent: TempoDatasourceEditor,\n  createInitialOptions: () => ({ directUrl: '' }),\n};\n"],"names":["searchTraceQuery","searchTraceID","getEnrichedTraceQuery","createClient","spec","options","directUrl","proxyUrl","datasourceUrl","undefined","Error","query","traceID","TempoDatasource","createInitialOptions"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,gBAAgB,EAAEC,aAAa,EAAEC,qBAAqB,QAAqB,wBAAwB;AAG5G;;CAEC,GACD,MAAMC,eAAmF,CAACC,MAAMC;IAC9F,MAAM,EAAEC,SAAS,EAAE,GAAGF;IACtB,MAAM,EAAEG,QAAQ,EAAE,GAAGF;IAErB,4FAA4F;IAC5F,MAAMG,gBAAgBF,sBAAAA,uBAAAA,YAAaC;IACnC,IAAIC,kBAAkBC,WAAW;QAC/B,MAAM,IAAIC,MAAM;IAClB;IAEA,OAAO;QACLL,SAAS;YACPG;QACF;QACAR,kBAAkB,CAACW,QAAkBX,iBAAiBW,OAAOH;QAC7DP,eAAe,CAACW,UAAoBX,cAAcW,SAASJ;QAC3DN,uBAAuB,CAACS,QAAkBT,sBAAsBS,OAAOH;IACzE;AACF;AAEA,OAAO,MAAMK,kBAAsE;IACjFV;IACA,2DAA2D;IAC3D,iDAAiD;IACjDW,sBAAsB,IAAO,CAAA;YAAER,WAAW;QAAG,CAAA;AAC/C,EAAE"}
+{"version":3,"sources":["../../src/plugins/tempo-datasource.tsx"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { DatasourcePlugin } from '@perses-dev/plugin-system';\nimport { searchTraceQuery, searchTraceID, searchTraceQueryFallback, TempoClient } from '../model/tempo-client';\nimport { TempoDatasourceSpec } from './tempo-datasource-types';\n\n/**\n * Creates a TempoClient for a specific datasource spec.\n */\nconst createClient: DatasourcePlugin<TempoDatasourceSpec, TempoClient>['createClient'] = (spec, options) => {\n  const { directUrl } = spec;\n  const { proxyUrl } = options;\n\n  // Use the direct URL if specified, but fallback to the proxyUrl by default if not specified\n  const datasourceUrl = directUrl ?? proxyUrl;\n  if (datasourceUrl === undefined) {\n    throw new Error('No URL specified for Tempo client. You can use directUrl in the spec to configure it.');\n  }\n\n  return {\n    options: {\n      datasourceUrl,\n    },\n    searchTraceQuery: (params, queryOptions) => searchTraceQuery(params, queryOptions),\n    searchTraceQueryFallback: (params, queryOptions) => searchTraceQueryFallback(params, queryOptions),\n    searchTraceID: (traceID, queryOptions) => searchTraceID(traceID, queryOptions),\n  };\n};\n\nexport const TempoDatasource: DatasourcePlugin<TempoDatasourceSpec, TempoClient> = {\n  createClient,\n  // TODO add a options editor component for tempo datasource\n  // OptionsEditorComponent: TempoDatasourceEditor,\n  createInitialOptions: () => ({ directUrl: '' }),\n};\n"],"names":["searchTraceQuery","searchTraceID","searchTraceQueryFallback","createClient","spec","options","directUrl","proxyUrl","datasourceUrl","undefined","Error","params","queryOptions","traceID","TempoDatasource","createInitialOptions"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAGjC,SAASA,gBAAgB,EAAEC,aAAa,EAAEC,wBAAwB,QAAqB,wBAAwB;AAG/G;;CAEC,GACD,MAAMC,eAAmF,CAACC,MAAMC;IAC9F,MAAM,EAAEC,SAAS,EAAE,GAAGF;IACtB,MAAM,EAAEG,QAAQ,EAAE,GAAGF;IAErB,4FAA4F;IAC5F,MAAMG,gBAAgBF,sBAAAA,uBAAAA,YAAaC;IACnC,IAAIC,kBAAkBC,WAAW;QAC/B,MAAM,IAAIC,MAAM;IAClB;IAEA,OAAO;QACLL,SAAS;YACPG;QACF;QACAR,kBAAkB,CAACW,QAAQC,eAAiBZ,iBAAiBW,QAAQC;QACrEV,0BAA0B,CAACS,QAAQC,eAAiBV,yBAAyBS,QAAQC;QACrFX,eAAe,CAACY,SAASD,eAAiBX,cAAcY,SAASD;IACnE;AACF;AAEA,OAAO,MAAME,kBAAsE;IACjFX;IACA,2DAA2D;IAC3D,iDAAiD;IACjDY,sBAAsB,IAAO,CAAA;YAAET,WAAW;QAAG,CAAA;AAC/C,EAAE"}

package/dist/plugins/tempo-trace-query/TempoTraceQuery.js

@@ -18,7 +18,7 @@ import { TempoTraceQueryEditor } from './TempoTraceQueryEditor';
     getTraceData,
     OptionsEditorComponent: TempoTraceQueryEditor,
     createInitialOptions: ()=>({
-            query: '{}',
+            query: '',
             datasource: undefined
         })
 };

package/dist/plugins/tempo-trace-query/TempoTraceQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/plugins/tempo-trace-query/TempoTraceQuery.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { getTraceData } from './get-trace-data';\nimport { TempoTraceQueryEditor } from './TempoTraceQueryEditor';\n\n/**\n * The core Tempo TraceQuery plugin for Perses.\n */\nexport const TempoTraceQuery = {\n  getTraceData,\n  OptionsEditorComponent: TempoTraceQueryEditor,\n  createInitialOptions: () => ({\n    query: '{}',\n    datasource: undefined,\n  }),\n};\n"],"names":["getTraceData","TempoTraceQueryEditor","TempoTraceQuery","OptionsEditorComponent","createInitialOptions","query","datasource","undefined"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,YAAY,QAAQ,mBAAmB;AAChD,SAASC,qBAAqB,QAAQ,0BAA0B;AAEhE;;CAEC,GACD,OAAO,MAAMC,kBAAkB;IAC7BF;IACAG,wBAAwBF;IACxBG,sBAAsB,IAAO,CAAA;YAC3BC,OAAO;YACPC,YAAYC;QACd,CAAA;AACF,EAAE"}
+{"version":3,"sources":["../../../src/plugins/tempo-trace-query/TempoTraceQuery.ts"],"sourcesContent":["// Copyright 2023 The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { getTraceData } from './get-trace-data';\nimport { TempoTraceQueryEditor } from './TempoTraceQueryEditor';\n\n/**\n * The core Tempo TraceQuery plugin for Perses.\n */\nexport const TempoTraceQuery = {\n  getTraceData,\n  OptionsEditorComponent: TempoTraceQueryEditor,\n  createInitialOptions: () => ({\n    query: '',\n    datasource: undefined,\n  }),\n};\n"],"names":["getTraceData","TempoTraceQueryEditor","TempoTraceQuery","OptionsEditorComponent","createInitialOptions","query","datasource","undefined"],"mappings":"AAAA,oCAAoC;AACpC,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,YAAY,QAAQ,mBAAmB;AAChD,SAASC,qBAAqB,QAAQ,0BAA0B;AAEhE;;CAEC,GACD,OAAO,MAAMC,kBAAkB;IAC7BF;IACAG,wBAAwBF;IACxBG,sBAAsB,IAAO,CAAA;YAC3BC,OAAO;YACPC,YAAYC;QACd,CAAA;AACF,EAAE"}

package/dist/plugins/tempo-trace-query/get-trace-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-trace-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/tempo-trace-query/get-trace-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAyB,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAE5E,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAIpE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB;;;EAM5D;AAED,eAAO,MAAM,YAAY,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,cAAc,CAkE9E,CAAC"}
+{"version":3,"file":"get-trace-data.d.ts","sourceRoot":"","sources":["../../../src/plugins/tempo-trace-query/get-trace-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAEL,iBAAiB,EAMlB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAYpE,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,iBAAiB;;;EAM5D;AAED,eAAO,MAAM,YAAY,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,CAAC,cAAc,CAyD9E,CAAC"}