TRACING-5693: Merge main into release-0.4

Dockerfile

@@ -11,7 +11,7 @@ RUN make install-frontend-ci-clean
 COPY web/ web/
 RUN make build-frontend
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 as go-builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as go-builder
 
 WORKDIR /opt/app-root
 

Dockerfile.dev

@@ -12,7 +12,7 @@ RUN make install-frontend-ci-clean
 COPY web/ web/
 RUN make build-frontend
 
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23 as go-builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 as go-builder
 
 WORKDIR /opt/app-root
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/distributed-tracing-console-plugin
 
-go 1.22.1
+go 1.24.0
 
 require (
 	github.com/evanphx/json-patch v5.6.0+incompatible

pkg/api/common.go

@@ -0,0 +1,38 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+)
+
+type Response struct {
+	Status    StatusType `json:"status"`
+	ErrorType string     `json:"errorType,omitempty"`
+	Error     string     `json:"error,omitempty"`
+	Data      any        `json:"data,omitempty"`
+}
+
+type StatusType string
+
+const (
+	StatusSuccess StatusType = "success"
+	StatusError   StatusType = "error"
+)
+
+func writeResponse(w http.ResponseWriter, code int, r Response) {
+	if r.Status != StatusSuccess {
+		log.Error(fmt.Sprintf("type=%s, error=%s", r.ErrorType, r.Error))
+	}
+
+	bytes, err := json.Marshal(r)
+	if err != nil {
+		log.Error(err)
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(code)
+	w.Write(bytes)
+}

pkg/api/tempo.go

@@ -2,7 +2,6 @@ package api
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"net/http"
 
@@ -14,7 +13,7 @@ import (
 	"k8s.io/client-go/dynamic"
 )
 
-var log = logrus.WithField("module", "api.tempo")
+var log = logrus.WithField("module", "api")
 
 type TempoResource struct {
 	Kind      KindType `json:"kind"`
@@ -31,20 +30,6 @@ const (
 	KindTempoMonolithic KindType = "TempoMonolithic"
 )
 
-type ListTempoResourcesResponse struct {
-	Status    StatusType      `json:"status"`
-	Data      []TempoResource `json:"data"`
-	ErrorType string          `json:"errorType,omitempty"`
-	Error     string          `json:"error,omitempty"`
-}
-
-type StatusType string
-
-const (
-	StatusSuccess StatusType = "success"
-	StatusError   StatusType = "error"
-)
-
 var (
 	tempostackGVR = schema.GroupVersionResource{
 		Group:    "tempo.grafana.com",
@@ -58,44 +43,27 @@ var (
 	}
 )
 
-func writeResponse(w http.ResponseWriter, code int, r ListTempoResourcesResponse) {
-	if r.Status == StatusError {
-		log.Error(fmt.Sprintf("type=%s, error=%s", r.ErrorType, r.Error))
-	}
-
-	bytes, err := json.Marshal(r)
-	if err != nil {
-		log.Error(err)
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(code)
-	w.Write(bytes)
-}
-
 func ListTempoResourcesHandler(k8sclient *dynamic.DynamicClient) http.HandlerFunc {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		resources, err := ListTempoResources(r.Context(), k8sclient)
 		if err != nil {
 			if apierrors.IsNotFound(err) {
-				writeResponse(w, http.StatusNotFound, ListTempoResourcesResponse{
+				writeResponse(w, http.StatusNotFound, Response{
 					Status:    StatusError,
 					ErrorType: "TempoCRDNotFound",
 					Error:     err.Error(),
 				})
 				return
 			}
 
-			writeResponse(w, http.StatusInternalServerError, ListTempoResourcesResponse{
+			writeResponse(w, http.StatusInternalServerError, Response{
 				Status: StatusError,
 				Error:  err.Error(),
 			})
 			return
 		}
 
-		writeResponse(w, http.StatusOK, ListTempoResourcesResponse{
+		writeResponse(w, http.StatusOK, Response{
 			Status: StatusSuccess,
 			Data:   resources,
 		})

web/.eslintrc.yml

@@ -11,7 +11,7 @@ parser: '@typescript-eslint/parser'
 parserOptions:
   ecmaFeatures:
     jsx: true
-  ecmaVersion: 2016
+  ecmaVersion: 2021
   sourceType: module
 plugins:
   - prettier

web/locales/en/plugin__distributed-tracing-console-plugin.json

@@ -1,33 +1,23 @@
 {
-  "Last 5 minutes": "Last 5 minutes",
-  "Last 15 minutes": "Last 15 minutes",
-  "Last 30 minutes": "Last 30 minutes",
-  "Last 1 hour": "Last 1 hour",
-  "Last 6 hours": "Last 6 hours",
-  "Last 12 hours": "Last 12 hours",
-  "Last 1 day": "Last 1 day",
-  "Last 7 days": "Last 7 days",
-  "Time range": "Time range",
-  "Select a time range": "Select a time range",
   "No Tempo instance selected": "No Tempo instance selected",
   "To explore data, select a Tempo instance and run a query.": "To explore data, select a Tempo instance and run a query.",
   "Tempo instance": "Tempo instance",
   "Select a Tempo instance": "Select a Tempo instance",
   "TempoStack and TempoMonolithic instances with multi-tenancy are supported. Instances without multi-tenancy are not supported.": "TempoStack and TempoMonolithic instances with multi-tenancy are supported. Instances without multi-tenancy are not supported.",
   "Tenant": "Tenant",
   "Select a tenant": "Select a tenant",
+  "Time range": "Time range",
   "Traces": "Traces",
   "Trace details": "Trace details",
   "Trace": "Trace",
   "Tracing": "Tracing",
   "Limit traces": "Limit traces",
-  "No datapoints found.": "No datapoints found.",
   "Hide graph": "Hide graph",
   "Show graph": "Show graph",
   "Filter": "Filter",
-  "Namespace": "Namespace",
   "Filter by namespace": "Filter by namespace",
   "This filter is based on the <1>k8s.namespace.name</1> resource attribute. To set this attribute, it is recommended to enable the <4>Kubernetes Attributes Processor</4> in your OpenTelemetry Collector pipeline.": "This filter is based on the <1>k8s.namespace.name</1> resource attribute. To set this attribute, it is recommended to enable the <4>Kubernetes Attributes Processor</4> in your OpenTelemetry Collector pipeline.",
+  "No results found. Please ensure that the <2>Kubernetes Attributes Processor</2><3></3>is enabled in your OpenTelemetry collector pipeline.": "No results found. Please ensure that the <2>Kubernetes Attributes Processor</2><3></3>is enabled in your OpenTelemetry collector pipeline.",
   "between {{min}} and {{max}}": "between {{min}} and {{max}}",
   "greater than {{min}}": "greater than {{min}}",
   "less than {{max}}": "less than {{max}}",
@@ -43,16 +33,18 @@
   "TraceQL Query": "TraceQL Query",
   "Query": "Query",
   "Run query": "Run query",
+  "Error connecting to the Tracing UI plugin backend": "Error connecting to the Tracing UI plugin backend",
   "Tempo operator isn't installed yet": "Tempo operator isn't installed yet",
   "To get started, install the Tempo operator and create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.": "To get started, install the Tempo operator and create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.",
   "Install Tempo operator": "Install Tempo operator",
   "No Tempo instances yet": "No Tempo instances yet",
-  "To get started, create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.": "To get started, create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.",
+  "To get started, create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.<1></1>Instances without multi-tenancy are not supported.": "To get started, create a TempoStack or TempoMonolithic instance with multi-tenancy enabled.<1></1>Instances without multi-tenancy are not supported.",
   "Create a Tempo instance": "Create a Tempo instance",
   "Create a TempoStack instance": "Create a TempoStack instance",
   "Create a TempoMonolithic instance": "Create a TempoMonolithic instance",
   "View documentation": "View documentation",
   "Error": "Error",
+  "Unknown error": "Unknown error",
   "No results found": "No results found",
   "No results match this query criteria. Clear all filters and try again.": "No results match this query criteria. Clear all filters and try again.",
   "Clear all filters": "Clear all filters"