Merge pull request #1 from IshwarKanse/gateway-otlp-http

Update e2e tests for HTTP gateway support
grafana · Jun 3, 2024 · 7fed685 · 7fed685
2 parents c487b9b + ae1fd90
commit 7fed685
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 12 deletions.
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/02-assert.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/02-assert.yaml
@@ -11,10 +11,21 @@ apiVersion: v1
 kind: Service
 metadata:
   name: dev-collector
+  namespace: chainsaw-monolithic-multitenancy
 spec:
   ports:
   - appProtocol: grpc
-    name: otlp-grpc
+    name: otlp-grpc-grpc
     port: 4317
     protocol: TCP
-    targetPort: 4317
+    targetPort: 4317
+  - appProtocol: http
+    name: otlp-http-http
+    port: 4318
+    protocol: TCP
+    targetPort: 4318
+  selector:
+    app.kubernetes.io/component: opentelemetry-collector
+    app.kubernetes.io/instance: chainsaw-monolithic-multitenancy.dev
+    app.kubernetes.io/managed-by: opentelemetry-operator
+    app.kubernetes.io/part-of: opentelemetry
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/02-install-otelcol.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/02-install-otelcol.yaml
@@ -9,9 +9,12 @@ spec:
         filename: /var/run/secrets/kubernetes.io/serviceaccount/token
 
     receivers:
-      otlp:
+      otlp/grpc:
         protocols:
           grpc:
+      otlp/http:
+        protocols:
+          http:
 
     exporters:
       otlp:
@@ -22,10 +25,26 @@ spec:
           authenticator: bearertokenauth
         headers:
           X-Scope-OrgID: dev  # tenantName
+      otlphttp:
+        endpoint: https://tempo-monolithic-multitenancy-openshift-gateway.chainsaw-monolithic-multitenancy.svc.cluster.local:8080/api/traces/v1/dev
+        tls:
+          ca_file: /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt
+        auth:
+          authenticator: bearertokenauth
+        headers:
+          X-Scope-OrgID: dev  # tenantName
 
     service:
+      telemetry:
+        logs:
+          level: "DEBUG"
+          development: true
+          encoding: "json"
       extensions: [bearertokenauth]
       pipelines:
-        traces:
-          receivers: [otlp]
+        traces/grpc:
+          receivers: [otlp/grpc]
           exporters: [otlp]
+        traces/http:
+          receivers: [otlp/http]
+          exporters: [otlphttp]
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/03-generate-traces.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/03-generate-traces.yaml
@@ -28,8 +28,9 @@ spec:
           image: ghcr.io/open-telemetry/opentelemetry-collector-contrib/telemetrygen:v0.92.0
           args:
             - traces
-            - --otlp-endpoint=dev-collector:4317
-            - --service=http
+            - --otlp-endpoint=dev-collector:4318
+            - --otlp-http
             - --otlp-insecure
+            - --service=http
             - --traces=10
-      restartPolicy: Never
+      restartPolicy: Never
diff --git a/tests/e2e-openshift/monolithic-multitenancy-openshift/04-verify-traces.yaml b/tests/e2e-openshift/monolithic-multitenancy-openshift/04-verify-traces.yaml
@@ -55,7 +55,7 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: verify-traces-jaegerui
+  name: verify-traces-jaegerui-http
 spec:
   template:
     spec:
@@ -82,7 +82,7 @@ spec:
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: verify-traces-traceql
+  name: verify-traces-traceql-http
 spec:
   template:
     spec:

diff --git a/tests/e2e-openshift/multitenancy/01-assert.yaml b/tests/e2e-openshift/multitenancy/01-assert.yaml
@@ -155,7 +155,7 @@ spec:
         - --web.listen=0.0.0.0:8080
         - --web.internal.listen=0.0.0.0:8081
         - --traces.write.otlpgrpc.endpoint=tempo-simplest-distributor.chainsaw-multitenancy.svc.cluster.local:4317
-        - --traces.write.otlphttp.endpoint=tempo-simplest-distributor.chainsaw-multitenancy.svc.cluster.local:4318
+        - --traces.write.otlphttp.endpoint=https://tempo-simplest-distributor.chainsaw-multitenancy.svc.cluster.local:4318
         - --traces.tempo.endpoint=https://tempo-simplest-query-frontend.chainsaw-multitenancy.svc.cluster.local:3200
         - --grpc.listen=0.0.0.0:8090
         - --rbac.config=/etc/tempo-gateway/cm/rbac.yaml

diff --git a/tests/e2e-openshift/multitenancy/02-install-otelcol.yaml b/tests/e2e-openshift/multitenancy/02-install-otelcol.yaml
@@ -32,7 +32,7 @@ spec:
         headers:
           X-Scope-OrgID: "dev"
       otlphttp:
-        endpoint: tempo-simplest-gateway.chainsaw-multitenancy.svc.cluster.local:8080
+        endpoint: https://tempo-simplest-gateway.chainsaw-multitenancy.svc.cluster.local:8080/api/traces/v1/dev
         tls:
           insecure: false
           ca_file: "/var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt"