From cf58f77400f2cadfad8275bc6c58156810078e30 Mon Sep 17 00:00:00 2001
From: Ankit Nayan <ankit@signoz.io>
Date: Sun, 14 Feb 2021 12:16:43 +0530
Subject: [PATCH 1/2] added zipkin receiver

---
 deploy/kubernetes/otel-collector/config.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/deploy/kubernetes/otel-collector/config.yaml b/deploy/kubernetes/otel-collector/config.yaml
index f950b2c2fe..45293abd8f 100644
--- a/deploy/kubernetes/otel-collector/config.yaml
+++ b/deploy/kubernetes/otel-collector/config.yaml
@@ -12,6 +12,11 @@ data:
         protocols:
           grpc:
           thrift_http:
+      zipkin:
+      otlp:
+        protocols:
+          grpc:
+          http:      
     processors:
       batch:
         send_batch_size: 1000
@@ -40,6 +45,6 @@ data:
       extensions: [health_check, zpages]
       pipelines:
         traces:
-          receivers: [jaeger]
+          receivers: [jaeger, zipkin, otlp]
           processors: [memory_limiter, batch, queued_retry]
           exporters: [kafka]
\ No newline at end of file

From 1de802688c98ea9df1fa152052892392297345de Mon Sep 17 00:00:00 2001
From: Ankit Nayan <ankit@signoz.io>
Date: Sun, 14 Feb 2021 12:33:59 +0530
Subject: [PATCH 2/2] added 4317 port for otlp

---
 deploy/kubernetes/otel-collector/config.yaml     | 3 +--
 deploy/kubernetes/otel-collector/deployment.yaml | 4 +++-
 deploy/kubernetes/otel-collector/service.yaml    | 8 ++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/deploy/kubernetes/otel-collector/config.yaml b/deploy/kubernetes/otel-collector/config.yaml
index 45293abd8f..f60afd6c80 100644
--- a/deploy/kubernetes/otel-collector/config.yaml
+++ b/deploy/kubernetes/otel-collector/config.yaml
@@ -12,7 +12,6 @@ data:
         protocols:
           grpc:
           thrift_http:
-      zipkin:
       otlp:
         protocols:
           grpc:
@@ -45,6 +44,6 @@ data:
       extensions: [health_check, zpages]
       pipelines:
         traces:
-          receivers: [jaeger, zipkin, otlp]
+          receivers: [jaeger, otlp]
           processors: [memory_limiter, batch, queued_retry]
           exporters: [kafka]
\ No newline at end of file
diff --git a/deploy/kubernetes/otel-collector/deployment.yaml b/deploy/kubernetes/otel-collector/deployment.yaml
index b11da5db13..b386f350b6 100644
--- a/deploy/kubernetes/otel-collector/deployment.yaml
+++ b/deploy/kubernetes/otel-collector/deployment.yaml
@@ -37,7 +37,9 @@ spec:
         ports:
         - containerPort: 55679 # Default endpoint for ZPages.
         - containerPort: 55680 # Default endpoint for OpenTelemetry receiver.
-        - containerPort: 14250 # Default endpoint for Jaeger HTTP receiver.
+        - containerPort: 55681 # Default endpoint for OpenTelemetry HTTP receiver.
+        - containerPort: 4317 # Default endpoint for OpenTelemetry HTTP receiver.
+        - containerPort: 14250 # Default endpoint for Jaeger GRPC receiver.
         - containerPort: 14268 # Default endpoint for Jaeger HTTP receiver.
         - containerPort: 9411 # Default endpoint for Zipkin receiver.
         - containerPort: 8888  # Default endpoint for querying metrics.
diff --git a/deploy/kubernetes/otel-collector/service.yaml b/deploy/kubernetes/otel-collector/service.yaml
index d24ac9c6ee..81a8c1d485 100644
--- a/deploy/kubernetes/otel-collector/service.yaml
+++ b/deploy/kubernetes/otel-collector/service.yaml
@@ -11,6 +11,14 @@ spec:
     port: 55680
     protocol: TCP
     targetPort: 55680
+  - name: otlp-http-legacy # Default endpoint for OpenTelemetry receiver.
+    port: 55681
+    protocol: TCP
+    targetPort: 55681
+  - name: otlp-http # Default endpoint for OpenTelemetry receiver.
+    port: 4317
+    protocol: TCP
+    targetPort: 4317
   - name: jaeger-grpc # Default endpoing for Jaeger gRPC receiver
     port: 14250
   - name: jaeger-thrift-http # Default endpoint for Jaeger HTTP receiver.