TRACING-5692: Merge main into release-1.0

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,
 		})

tests/Dockerfile-cypress

@@ -15,6 +15,6 @@ RUN wget -O chainsaw.tar.gz https://github.com/kyverno/chainsaw/releases/downloa
     && mv chainsaw /usr/local/bin/ \
     && rm -rf chainsaw.tar.gz
 
-# Install apache2-utils for htpasswd required by OCP CI
-RUN apt update && apt install -y apache2-utils \
+# Install apache2-utils for htpasswd required by OCP CI, jq and curl for metrics validation
+RUN apt update && apt install -y apache2-utils jq curl \
     && rm -rf /var/lib/apt/lists/*

tests/PATTERNFLY_COMMANDS_EXAMPLES.md

@@ -111,7 +111,7 @@ cy.findByTestId('span-duration-bar').first().click(); // By test ID (multiple sp
 
 ```typescript
 // Single attribute validation
-cy.muiTraceAttribute('net.peer.ip', '1.2.3.4');
+cy.muiTraceAttribute('network.peer.address', '1.2.3.4');
 cy.muiTraceAttribute('peer.service', 'telemetrygen-client');
 cy.muiTraceAttribute('k8s.container.name', 'telemetrygen', true); // Optional attribute
 
@@ -122,7 +122,7 @@ cy.muiTraceAttribute('service.name', (text) => {
 
 // Bulk attribute validation (recommended for multiple attributes)
 cy.muiTraceAttributes({
-  'net.peer.ip': { value: '1.2.3.4' },
+  'network.peer.address': { value: '1.2.3.4' },
   'peer.service': { value: 'telemetrygen-client' },
   'k8s.container.name': { 
     value: 'telemetrygen', 
@@ -168,7 +168,7 @@ describe('Trace inspection', () => {
 
     // Validate trace attributes efficiently
     cy.muiTraceAttributes({
-      'net.peer.ip': { value: '1.2.3.4' },
+      'network.peer.address': { value: '1.2.3.4' },
       'peer.service': { value: 'telemetrygen-client' },
       'service.name': { 
         value: (text) => text.includes('rbac')

tests/README.md

@@ -138,7 +138,7 @@ cy.muiSpanBar('grpc-service').click()
 // Attribute validation (bulk)
 cy.muiTraceAttributes({
   'service.name': { value: 'my-service' },
-  'net.peer.ip': { value: '1.2.3.4' },
+  'network.peer.address': { value: '1.2.3.4' },
   'k8s.namespace': { value: 'test-ns', optional: true }
 })
 ```

tests/SELECTOR_BEST_PRACTICES.md

@@ -63,9 +63,9 @@ cy.muiSpanBar('http-rbac-2')                // Click specific span bar
 cy.muiFirstSpanBar()                        // Click first span bar
 
 // Trace Attribute Validation
-cy.muiTraceAttribute('net.peer.ip', '1.2.3.4')  // Single attribute check
+cy.muiTraceAttribute('network.peer.address', '1.2.3.4')  // Single attribute check
 cy.muiTraceAttributes({                     // Bulk attribute validation
-  'net.peer.ip': { value: '1.2.3.4' },
+  'network.peer.address': { value: '1.2.3.4' },
   'service.name': { value: (text) => text.includes('rbac') }
 })
 ```
@@ -219,7 +219,7 @@ cy.findByTestId('span-duration-bar').first().click()  // By test ID
 ### Trace Attribute Validation
 ```typescript
 // Old approach (48+ lines of repetitive code):
-cy.contains('.MuiTypography-h5', 'net.peer.ip').next('.MuiTypography-body1').should('have.text', '1.2.3.4')
+cy.contains('.MuiTypography-h5', 'network.peer.address').next('.MuiTypography-body1').should('have.text', '1.2.3.4')
 cy.contains('.MuiTypography-h5', 'peer.service').next('.MuiTypography-body1').should('have.text', 'telemetrygen-client')
 cy.get('body').then(($body) => {
   if ($body.find('.MuiTypography-h5:contains("k8s.container.name")').length > 0) {
@@ -230,7 +230,7 @@ cy.get('body').then(($body) => {
 
 // New approach (12 lines, 75% reduction):
 cy.muiTraceAttributes({
-  'net.peer.ip': { value: '1.2.3.4' },
+  'network.peer.address': { value: '1.2.3.4' },
   'peer.service': { value: 'telemetrygen-client' },
   'k8s.container.name': { value: 'telemetrygen', optional: true },
   'k8s.namespace.name': { 
@@ -243,7 +243,7 @@ cy.muiTraceAttributes({
 }, 'TempoStack')
 
 // Or individual attribute checks:
-cy.muiTraceAttribute('net.peer.ip', '1.2.3.4')
+cy.muiTraceAttribute('network.peer.address', '1.2.3.4')
 cy.muiTraceAttribute('service.name', (text) => text.includes('rbac'), false, 'TempoStack')
 ```