1. 兼容 promql 查询 metric, kol 查询 log, graphql 查询 trace

Author: kakj-go

Makefile

@@ -1,4 +1,4 @@
-.PHONY: fmt test vet run-server contract-lint contract-generate contract-check contract-breaking check-production-artifacts migrate sqlc otelcol-linux-arm64 otelcol-windows-amd64 otelcol-distributions e2e-m2-k8s e2e-m3-k8s e2e-m4-k8s e2e-m5-k8s e2e-m6-k8s e2e-m7-k8s e2e-m8-k8s release-local
+.PHONY: fmt test vet run-server contract-lint contract-generate contract-check contract-breaking query-parser-check query-promql-conformance query-kql-check query-skywalking-graphql-check query-tenant-schema-check check-production-artifacts migrate sqlc otelcol-linux-arm64 otelcol-windows-amd64 otelcol-distributions e2e-m2-k8s e2e-m3-k8s e2e-m4-k8s e2e-m5-k8s e2e-m6-k8s e2e-m7-k8s e2e-m8-k8s e2e-m10-query-k8s release-local
 
 fmt:
 	rg --files cmd internal -g '*.go' | xargs gofmt -w
@@ -7,7 +7,9 @@ test:
 	go test ./...
 
 vet:
-	go vet ./...
+	# Prometheus chunkenc.Iterator intentionally defines Seek(int64) ValueType;
+	# disable stdmethods' io.Seeker signature heuristic for this interface.
+	go vet -stdmethods=false ./...
 
 run-server:
 	go run ./cmd/argus-server
@@ -23,7 +25,7 @@ contract-generate:
 	mkdir -p api/openapi/generated internal/gen/openapi web/packages/api-client/src/generated
 	pnpm exec redocly bundle api/openapi/argus.yaml --output api/openapi/generated/argus.bundle.json --ext json
 	node scripts/minify-json.mjs api/openapi/generated/argus.bundle.json
-	@set -e; for domain in common identity authorization labels action card agent stream telemetry setup m8api platform enterpriseidentity enterpriseauthz machine audit secretapi hostapi kubernetesapi connectionapi actionapi connectorapi conversationapi modelapi workflowapi automationapi sandboxapi cardapi remoteaccessapi telemetryapi; do \
+	@set -e; for domain in common identity authorization labels action card agent stream setup m8api platform enterpriseidentity enterpriseauthz machine audit secretapi hostapi kubernetesapi connectionapi actionapi connectorapi conversationapi modelapi workflowapi automationapi sandboxapi cardapi remoteaccessapi telemetryapi; do \
 		pnpm exec redocly bundle api/openapi/generation/$$domain.yaml --output api/openapi/generated/$$domain.bundle.yaml --ext yaml; \
 		mkdir -p internal/gen/openapi/$$domain; \
 		go tool oapi-codegen -generate types,skip-prune -package $$domain -o internal/gen/openapi/$$domain/types.gen.go api/openapi/generated/$$domain.bundle.yaml; \
@@ -35,7 +37,7 @@ contract-generate:
 	@set -e; for domain in enterpriseauthz secretapi hostapi kubernetesapi connectionapi actionapi connectorapi sandboxapi cardapi remoteaccessapi telemetryapi; do \
 		node scripts/split-generated-go-server.mjs internal/gen/openapi/$$domain/server.gen.go; \
 	done
-	node scripts/generate-contract-index.mjs web/packages/api-client/src/generated/contracts.ts common identity authorization labels action card agent stream telemetry setup m8api platform enterpriseidentity enterpriseauthz machine audit secretapi hostapi kubernetesapi connectionapi actionapi connectorapi conversationapi modelapi workflowapi automationapi sandboxapi cardapi remoteaccessapi telemetryapi
+	node scripts/generate-contract-index.mjs web/packages/api-client/src/generated/contracts.ts common identity authorization labels action card agent stream setup m8api platform enterpriseidentity enterpriseauthz machine audit secretapi hostapi kubernetesapi connectionapi actionapi connectorapi conversationapi modelapi workflowapi automationapi sandboxapi cardapi remoteaccessapi telemetryapi
 	go tool buf generate api/proto --template api/proto/buf.gen.yaml
 
 sqlc:
@@ -81,6 +83,9 @@ e2e-m7-k8s:
 e2e-m8-k8s:
 	./scripts/e2e-m8-k8s.sh
 
+e2e-m10-query-k8s:
+	./scripts/e2e-m10-query-k8s.sh
+
 release-local:
 	./scripts/release-local.sh
 
@@ -95,5 +100,21 @@ contract-breaking:
 		echo 'origin/main has no protobuf baseline; this merge establishes it'; \
 	fi
 
+query-parser-check:
+	./scripts/check-query-parser-lock.sh
+
+query-promql-conformance:
+	go test ./internal/telemetry/queryengine/promql -count=1
+	go test ./internal/telemetry -run 'TestPromQLClickHouse' -count=1
+
+query-kql-check:
+	go test ./internal/telemetry/queryengine/kql -count=1
+
+query-skywalking-graphql-check:
+	go test ./internal/telemetry/queryengine/skywalking -count=1
+
+query-tenant-schema-check:
+	go test ./internal/telemetry -run 'TestTenant|TestTelemetrySchemaV3' -count=1
+
 check-production-artifacts:
 	./scripts/check-production-artifacts.sh

THIRD_PARTY_NOTICES.md

@@ -0,0 +1,31 @@
+# Third-Party Notices
+
+## Prometheus PromQL Parser
+
+Argus uses the PromQL parser and AST packages from Prometheus:
+
+- Project: Prometheus
+- Module: `github.com/prometheus/prometheus`
+- Version: `v0.314.0`
+- Commit: `d7598b7141418fa35be2b5ec5d0fefb634199610`
+- License: Apache License 2.0
+
+Copyright 2012-2015 The Prometheus Authors.
+
+The complete upstream license and NOTICE files are included in the locked Go
+module and are collected by the release SBOM process. The authoritative parser
+lock for this repository is `deploy/query-parsers.lock.json`.
+
+## graph-gophers/graphql-go
+
+Argus uses `github.com/graph-gophers/graphql-go` version `v1.10.2` as the
+schema-first runtime for the read-only SkyWalking-compatible trace query
+surface. The module is distributed under the MIT License; its complete license
+text is retained in the locked Go module and collected by the release SBOM
+process.
+
+Argus also uses the executable-document AST parser from
+`github.com/graphql-go/graphql` version `v0.8.1` to apply request-specific
+field-count, fragment-cycle, read-only and introspection checks before the
+fixed SDL runtime executes a query. That module is also distributed under the
+MIT License.

api/contracts/error-codes.yaml

@@ -146,7 +146,7 @@ codes:
   TELEMETRY_INGEST_LIMIT_EXCEEDED: {http_status: 429, message_key: errors.telemetry.ingest_limit_exceeded, retryable: true}
   TELEMETRY_SCHEMA_UNSUPPORTED: {http_status: 422, message_key: errors.telemetry.schema_unsupported, retryable: false}
   TELEMETRY_BACKPRESSURE: {http_status: 503, message_key: errors.telemetry.backpressure, retryable: true}
-  TELEMETRY_QUERY_BUDGET_EXCEEDED: {http_status: 422, message_key: errors.telemetry.query_budget_exceeded, retryable: false}
+  QUERY_BUDGET_EXCEEDED: {http_status: 413, message_key: errors.telemetry.query_budget_exceeded, retryable: false}
   TELEMETRY_SIGNAL_FORBIDDEN: {http_status: 403, message_key: errors.telemetry.signal_forbidden, retryable: false}
   TELEMETRY_FIELD_FORBIDDEN: {http_status: 403, message_key: errors.telemetry.field_forbidden, retryable: false}
   TELEMETRY_DEPENDENCY_UNAVAILABLE: {http_status: 503, message_key: errors.telemetry.dependency_unavailable, retryable: true}

api/openapi/argus.yaml

@@ -307,14 +307,16 @@ paths:
     $ref: ./paths/m7.yaml#/binding_preview
   /enterprise/telemetry/usage:
     $ref: ./paths/m7.yaml#/usage_item
-  /enterprise/telemetry/query/metrics:
-    $ref: ./paths/m7.yaml#/metrics_query
-  /enterprise/telemetry/query/logs:
-    $ref: ./paths/m7.yaml#/logs_query
-  /enterprise/telemetry/query/traces:
-    $ref: ./paths/m7.yaml#/traces_query
   /enterprise/telemetry/query/overview:
     $ref: ./paths/m7.yaml#/overview_query
+  /enterprise/metrics/query:
+    $ref: ./paths/m7.yaml#/metrics_query
+  /enterprise/metrics/query_range:
+    $ref: ./paths/m7.yaml#/metrics_query_range
+  /enterprise/logs/query:
+    $ref: ./paths/m7.yaml#/logs_query
+  /enterprise/traces/graphql:
+    $ref: ./paths/m7.yaml#/traces_graphql
   /enterprise/hosts/{id}/collector:
     $ref: ./paths/m7.yaml#/host_collector_item
   /enterprise/hosts/{id}/collector/actions/preview-{action}:
@@ -471,12 +473,6 @@ components:
       $ref: ./components/m7.yaml#/components/schemas/CollectionClaim
     KubernetesNodeHostBinding:
       $ref: ./components/m7.yaml#/components/schemas/KubernetesNodeHostBinding
-    MetricsResult:
-      $ref: ./components/m7.yaml#/components/schemas/MetricsResult
-    LogsResult:
-      $ref: ./components/m7.yaml#/components/schemas/LogsResult
-    TracesResult:
-      $ref: ./components/m7.yaml#/components/schemas/TracesResult
     TelemetryOverview:
       $ref: ./components/m7.yaml#/components/schemas/TelemetryOverview
     ConversationEvent:
@@ -505,10 +501,6 @@ components:
       $ref: ../schemas/agent/agent.schema.json#/$defs/ModelCall
     StreamEventEnvelope:
       $ref: ../schemas/stream/stream.schema.json
-    TelemetryQuery:
-      $ref: ../schemas/telemetry/query.schema.json
-    TrustedTelemetryIdentity:
-      $ref: ../schemas/telemetry/query.schema.json#/$defs/TrustedTelemetryIdentity
     PlatformState:
       $ref: ./components/m2.yaml#/components/schemas/PlatformState
     SetupStatus:

api/openapi/components/identity.yaml

@@ -7,7 +7,7 @@ components:
       properties:
         id: {type: string, minLength: 1}
         name: {type: string, minLength: 1, maxLength: 128}
-        code: {type: string, pattern: "^[a-z][a-z0-9-]{1,62}$"}
+        code: {type: string, minLength: 1, maxLength: 63, pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$"}
         status: {type: string, enum: [active, suspended, disabled]}
         timezone: {type: string, minLength: 1, maxLength: 128}
         default_locale: {type: string, enum: [zh-CN, en-US]}

api/openapi/components/m2.yaml

@@ -115,7 +115,7 @@ components:
       required: [name, code, timezone]
       properties:
         name: {type: string, minLength: 1, maxLength: 128}
-        code: {type: string, pattern: "^[a-z][a-z0-9-]{1,62}$"}
+        code: {type: string, minLength: 1, maxLength: 63, pattern: "^[a-z0-9]+(?:-[a-z0-9]+)*$"}
         timezone: {type: string, minLength: 1, maxLength: 128}
         default_locale: {$ref: "./common.yaml#/components/schemas/Locale"}
         remark: {type: string, maxLength: 2048}