Skip to content

Commit 1c9c1fd

Browse files
author
Tigran Najaryan
committed
Remove docker-collector makefile target
We only need the unified docker-otelsvc. Having docker-collector in the makefile is misleading and unnecessary. Issue: open-telemetry#48
1 parent 9e8f857 commit 1c9c1fd

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

Makefile

-4
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@ ifndef COMPONENT
102102
$(error COMPONENT variable was not defined)
103103
endif
104104

105-
.PHONY: docker-collector
106-
docker-collector:
107-
COMPONENT=collector $(MAKE) docker-component
108-
109105
.PHONY: docker-otelsvc
110106
docker-otelsvc:
111107
COMPONENT=otelsvc $(MAKE) docker-component

demos/trace/README.md

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
# OpenCensus Service Demo
1+
# OpenTelemetry Service Demo
22

3-
*IMPORTANT:* This is a pre-released version of the OpenTelemetry Service.
4-
For now, please use the [OpenCensus Service](https://github.com/open-telemetry/opentelemetry-service).
3+
*IMPORTANT:* This is a pre-released version of the OpenTelemetry Service and does not yet
4+
implement full functionality required to run this demo.
55

6-
Typical flow of tracing data with OpenCensus Service: tracing data initially received by OC Agent
7-
and then sent OC Collector using OC data format. The OC Collector then sends the data to the
6+
For now, please use the [OpenCensus Service](https://github.com/census-instrumentation/opencensus-service).
7+
8+
Typical flow of tracing data with OpenTelemetry Service: tracing data initially received by OpenTelemetry Agent
9+
and then sent to OpenTelemetry Collector using OC data format. The OpenTelemetry Collector then sends the data to the
810
tracing backend, in this demo Jaeger and Zipkin.
911

10-
This demo uses `docker-compose` and runs against locally built docker images of OC service. In
12+
This demo uses `docker-compose` and runs against locally built docker images of OpenTelemetry Service. In
1113
order to build the docker images use the commands below from the root of the repo:
1214

1315
```shell
14-
make docker-collector
16+
make docker-otelsvc
1517
```
1618

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

0 commit comments

Comments
 (0)