Skip to content

Commit

Permalink
Merge pull request open-telemetry#71 from signalfx/flands/collector
Browse files Browse the repository at this point in the history
Rename Collector to Data Collector
  • Loading branch information
MrAlias authored May 4, 2021
2 parents dd4f8a9 + a478cf1 commit 9d7cd7f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ reading by GDI project consumers.

## Terms

- Collector: A single binary that can be deployed as an agent or gateway.
- Data Collector: A way to collect telemetry data within an environment.
Refers to `splunk-otel-collector` project.
- GDI: Getting Data In
- GDI Project: A project in the `signalfx` GitHub that starts with
`splunk-otel-\*`
- Instrumentation Library: The way to emit telemetry data from an application.
- Instrumentation Library: A way to emit telemetry data from an application.
Refers to `splunk-otel-<language>` projects.
- Maintainer: Someone responsible for the specification or a project
- Specification: A set of requirements for projects
Expand Down
12 changes: 6 additions & 6 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ projects MAY remove deprecated features in any future release).

## Environment variables

### Collector
### Data Collector

| Name (default value) | Description |
| :-------------------: | :-----------------------------------: |
Expand All @@ -59,11 +59,11 @@ projects MAY remove deprecated features in any future release).
are defined, `SPLUNK_CONFIG` MAY be defined. If `SPLUNK_CONFIG` is
defined, either, neither, or both of `SPLUNK_ACCESS_TOKEN` and
`SPLUNK_REALM` MAY be defined.
- [2]: If the Collector is configured to export data to a Splunk back-end these
options MUST be defined with valid values (this is the default behavior for
the Collector). If the Collector is configured as an agent and the agent is
configured to send to a Collector running as a gateway then these options are
not required but MAY be defined (to support
- [2]: If the Data Collector is configured to export data to a Splunk back-end
these options MUST be defined with valid values (this is the default behavior
for the Data Collector). If the Data Collector is configured as an agent and
the agent is configured to send to a Data Collector running as a gateway then
these options are not required but MAY be defined (to support
[`access_token_passthrough`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/signalfxreceiver#configuration)).
If `SPLUNK_CONFIG` is defined then these options are not required but MAY be
defined.
Expand Down
2 changes: 1 addition & 1 deletion docs/repository.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Note: the **upstream** project signal you depend on (if any) MUST be stable
- MUST use [signed tags](https://docs.github.com/en/github/authenticating-to-github/signing-tags)
- MUST state version of OpenTelemetry components built against if applicable

## Collector
## Data Collector

- MUST document all supported configuration parameters
- MUST document sizing guidelines for all signals
Expand Down

0 comments on commit 9d7cd7f

Please sign in to comment.