Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove docker-collector makefile target #50

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Remove docker-collector makefile target #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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