Add OTLP rec and remove qretry from example and default config (#1823)

Signed-off-by: Pavol Loffay <[email protected]> Add OTLP receiver and qretry processor to example and default config. **Link to tracking Issue:** Updates #886 Updates #1721 **Testing:** * `make run` * build and run docker image
open-telemetry · Sep 22, 2020 · 64702fd · 64702fd
1 parent a85c7a2
commit 64702fd
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ endif
 BUILD_X3=-X $(BUILD_INFO_IMPORT_PATH).BuildType=$(BUILD_TYPE)
 BUILD_INFO=-ldflags "${BUILD_X1} ${BUILD_X2} ${BUILD_X3}"
 
-RUN_CONFIG?=local/config.yaml
+RUN_CONFIG?=examples/otel-local-config.yaml
 
 CONTRIB_PATH=$(CURDIR)/../opentelemetry-collector-contrib
 

diff --git a/cmd/otelcol/config.yaml b/cmd/otelcol/config.yaml
@@ -6,6 +6,10 @@ extensions:
     endpoint: 0.0.0.0:55679
 
 receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
 
   opencensus:
 
@@ -29,7 +33,6 @@ receivers:
 
 processors:
   batch:
-  queued_retry:
 
 exporters:
   logging:
@@ -41,7 +44,7 @@ service:
 
     traces:
       receivers: [opencensus, jaeger, zipkin]
-      processors: [batch, queued_retry]
+      processors: [batch]
       exporters: [logging]
 
     metrics:

diff --git a/examples/otel-local-config.yaml b/examples/otel-local-config.yaml
@@ -6,18 +6,13 @@ extensions:
     endpoint: 0.0.0.0:55679
 
 receivers:
+  otlp:
+    protocols:
+      grpc:
+      http:
 
   opencensus:
 
-  # Collect own metrics
-  prometheus:
-    config:
-      scrape_configs:
-      - job_name: 'otel-collector'
-        scrape_interval: 10s
-        static_configs:
-        - targets: ['0.0.0.0:8888']
-
   jaeger:
     protocols:
       grpc:
@@ -27,9 +22,17 @@ receivers:
 
   zipkin:
 
+  # Collect own metrics
+  prometheus:
+    config:
+      scrape_configs:
+        - job_name: 'otel-collector'
+          scrape_interval: 10s
+          static_configs:
+            - targets: [ '0.0.0.0:8888' ]
+
 processors:
   batch:
-  queued_retry:
 
 exporters:
   logging:
@@ -40,8 +43,8 @@ service:
   pipelines:
 
     traces:
-      receivers: [opencensus, jaeger, zipkin]
-      processors: [batch, queued_retry]
+      receivers: [otlp, opencensus, jaeger, zipkin]
+      processors: [batch]
       exporters: [logging]
 
     metrics: