Make demo work with collector binary (open-telemetry#32)

Address open-telemetry#24 though you should use
census-instrumentation/opencensus-service for now

demos/trace/README.md

@@ -1,14 +1,17 @@
-# OpenCensus Agent/Collector Demo
+# OpenCensus Service Demo
 
-Typical flow of tracing data with OpenCensus service: tracing data initially received by OC Agent
+*IMPORTANT:* This is a pre-released version of the OpenTelemetry Service.
+For now, please use the [OpenCensus Service](https://github.com/open-telemetry/opentelemetry-service).
+
+Typical flow of tracing data with OpenCensus Service: tracing data initially received by OC Agent
 and then sent OC Collector using OC data format. The OC Collector then sends the data to the
 tracing backend, in this demo Jaeger and Zipkin.
 
 This demo uses `docker-compose` and runs against locally built docker images of OC service. In
 order to build the docker images use the commands below from the root of the repo:
 
 ```shell
-make docker-agent && make docker-collector
+make docker-collector
 ```
 
 To run the demo, switch to the `demos/trace` folder and run:

demos/trace/docker-compose.yaml

@@ -15,11 +15,11 @@ services:
       - "9411:9411"
 
   # Collector
-  otelsvc-collector:
-    image: otelsvc:latest
-    command: ["--config=/etc/otelsvc-collector-config.yaml", "--http-pprof-port=1777"]
+  oc-collector:
+    image: collector:latest
+    command: ["--config=/etc/oc-collector-config.yaml", "--http-pprof-port=1777"]
     volumes:
-      - ./otelsvc-collector-config.yaml:/etc/otelsvc-collector-config.yaml
+      - ./oc-collector-config.yaml:/etc/oc-collector-config.yaml
     ports:
       - "55678"
       - "55680:55679"
@@ -30,24 +30,23 @@ services:
       - zipkin-all-in-one
 
   # Agent
-  otelsvc-agent:
-    image: otelsvc:latest
-    command: ["--config=/etc/otelsvc-agent-config.yaml", "--http-pprof-port=1888"]
+  oc-agent:
+    image: collector:latest
+    command: ["--config=/etc/oc-agent-config.yaml", "--http-pprof-port=1888"]
     volumes:
-      - ./otelsvc-agent-config.yaml:/etc/otelsvc-agent-config.yaml
+      - ./oc-agent-config.yaml:/etc/oc-agent-config.yaml
     ports:
-      - "1888:1888"
       - "14268"
       - "55678"
       - "55679:55679"
     depends_on:
-      - otelsvc-collector
+      - oc-collector
 
   # Synthetic load generator
   synthetic-load-generator:
     image: omnition/synthetic-load-generator:1.0.25
     environment:
       - JAEGER_COLLECTOR_URL=http://otelsvc-agent:14268
     depends_on:
-      - otelsvc-agent
+      - oc-agent
 

demos/trace/oc-agent-config.yaml

@@ -1,10 +1,14 @@
 receivers:
   opencensus:
-    address: ":55678"
+    port: 55678
     reconnection-delay: 2s
   jaeger:
     collector_http_port: 14268
 
-exporters:
+queued-exporters:
+  collector:
+    num-workers: 2
+    queue-size: 10
+    retry-on-failure: true
   opencensus:
     endpoint: "oc-collector:55678"