Skip to content

Commit

Permalink
Remove docker-collector makefile target (#50)
Browse files Browse the repository at this point in the history
We only need the unified docker-otelsvc. Having docker-collector in
the makefile is misleading and unnecessary.

Issue: #48
  • Loading branch information
tigrannajaryan committed Jun 25, 2019
1 parent 9e8f857 commit 026061c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,6 @@ ifndef COMPONENT
$(error COMPONENT variable was not defined)
endif

.PHONY: docker-collector
docker-collector:
COMPONENT=collector $(MAKE) docker-component

.PHONY: docker-otelsvc
docker-otelsvc:
COMPONENT=otelsvc $(MAKE) docker-component
Expand Down
16 changes: 9 additions & 7 deletions demos/trace/README.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# OpenCensus Service Demo
# OpenTelemetry Service Demo

*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).
*IMPORTANT:* This is a pre-released version of the OpenTelemetry Service and does not yet
implement full functionality required to run this demo.

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
For now, please use the [OpenCensus Service](https://github.com/census-instrumentation/opencensus-service).

Typical flow of tracing data with OpenTelemetry Service: tracing data initially received by OpenTelemetry Agent
and then sent to OpenTelemetry Collector using OC data format. The OpenTelemetry 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
This demo uses `docker-compose` and runs against locally built docker images of OpenTelemetry Service. In
order to build the docker images use the commands below from the root of the repo:

```shell
make docker-collector
make docker-otelsvc
```

To run the demo, switch to the `demos/trace` folder and run:
Expand Down

0 comments on commit 026061c

Please sign in to comment.