Skip to content

Commit

Permalink
Rename all github paths from opentelemtry-service to opentelemetry-co…
Browse files Browse the repository at this point in the history 
…llector (#371)

This is part of renaming task: #352
  • Loading branch information
@tigrannajaryan
tigrannajaryan authored Sep 27, 2019
1 parent d038801 commit dc6b290
Show file tree
Hide file tree
Showing 216 changed files with 893 additions and 609 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cache:
directories:
- /home/travis/gopath/pkg/mod

go_import_path: github.com/open-telemetry/opentelemetry-service
go_import_path: github.com/open-telemetry/opentelemetry-collector

go:
- 1.12.x
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ for general practices for OpenTelemetry project.

Select a good issue from the links below (ordered by difficulty/complexity):

* [Good First Issue](https://github.com/open-telemetry/opentelemetry-service/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
* [Up for Grabs](https://github.com/open-telemetry/opentelemetry-service/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs+)
* [Help Wanted](https://github.com/open-telemetry/opentelemetry-service/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)
* [Good First Issue](https://github.com/open-telemetry/opentelemetry-collector/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22)
* [Up for Grabs](https://github.com/open-telemetry/opentelemetry-collector/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+label%3Aup-for-grabs+)
* [Help Wanted](https://github.com/open-telemetry/opentelemetry-collector/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22)

Comment on the issue that you want to work on so we can assign it to you and
clarify anything related to it.
Expand All @@ -46,7 +46,7 @@ git@github.com:USERNAME/opentelemetry-service.git`.
You should also add this repository as an "upstream" repo to your local copy,
in order to keep it up to date. You can add this as a remote like so:

`git remote add upstream https://github.com/open-telemetry/opentelemetry-service.git
`git remote add upstream https://github.com/open-telemetry/opentelemetry-collector.git

# verify that the upstream exists
git remote -v`
Expand Down Expand Up @@ -81,13 +81,13 @@ Working with the project sources requires the following tools:
Fork the repo, checkout the upstream repo to your GOPATH by:

```
$ GO111MODULE="" go get -d github.com/open-telemetry/opentelemetry-service
$ GO111MODULE="" go get -d github.com/open-telemetry/opentelemetry-collector
```

Add your fork as an origin:

```shell
$ cd $(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-service
$ cd $(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-collector
$ git remote add fork git@github.com:YOUR_GITHUB_USERNAME/opentelemetry-service.git
```

Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ MISSPELL_CORRECTION=misspell -w
STATICCHECK=staticcheck

GIT_SHA=$(shell git rev-parse --short HEAD)
BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-service/internal/version
BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector/internal/version
BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA)
ifdef VERSION
BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)
Expand Down Expand Up @@ -58,7 +58,7 @@ travis-ci: fmt vet lint goimports misspell staticcheck test-with-cover otelcol
.PHONY: test-with-cover
test-with-cover:
@echo Verifying that all packages have test files to count in coverage
@scripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemetry-service/,./,$(ALL_PKGS))
@scripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemetry-collector/,./,$(ALL_PKGS))
@echo pre-compiling tests
@time go test -i $(ALL_PKGS)
$(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) $(ALL_PKGS)
Expand Down Expand Up @@ -99,7 +99,7 @@ lint:

.PHONY: goimports
goimports:
@IMPORTSOUT=`$(GOIMPORTS) -local github.com/open-telemetry/opentelemetry-service -d . 2>&1`; \
@IMPORTSOUT=`$(GOIMPORTS) -local github.com/open-telemetry/opentelemetry-collector -d . 2>&1`; \
if [ "$$IMPORTSOUT" ]; then \
echo "$(GOIMPORTS) FAILED => fix the following goimports errors:\n"; \
echo "$$IMPORTSOUT\n"; \
Expand Down
16 changes: 8 additions & 8 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ enabled).

### <a name="getting-started-demo"></a>Demo

Instructions for setting up an end-to-end demo environment can be found [here](https://github.com/open-telemetry/opentelemetry-service/tree/master/examples/demo)
Instructions for setting up an end-to-end demo environment can be found [here](https://github.com/open-telemetry/opentelemetry-collector/tree/master/examples/demo)

### <a name="getting-started-k8s"></a>Kubernetes

Expand Down Expand Up @@ -114,7 +114,7 @@ $ ./bin/$($GOOS)/otelcol --config ./examples/demo/otel-collector-config.yaml
Run the demo application:

```shell
$ go run "$(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-service/examples/main.go"
$ go run "$(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-collector/examples/main.go"
```

You should be able to see the traces in your exporter(s) of choice. If you stop
Expand All @@ -129,7 +129,7 @@ needs to be configured.

*Note* This documentation is still in progress. For any questions, please reach out in the
[OpenTelemetry Gitter](https://gitter.im/open-telemetry/opentelemetry-service) or
refer to the [issues page](https://github.com/open-telemetry/opentelemetry-service/issues).
refer to the [issues page](https://github.com/open-telemetry/opentelemetry-collector/issues).

There are four main parts to a config:
```yaml
Expand Down Expand Up @@ -350,18 +350,18 @@ sampling:
> Note that an exporter can only have a single sampling policy today.
## <a name="collector-usage"></a>Usage

> It is recommended that you use the latest [release](https://github.com/open-telemetry/opentelemetry-service/releases).
> It is recommended that you use the latest [release](https://github.com/open-telemetry/opentelemetry-collector/releases).

The OpenTelemetry Collector can be run directly from sources, binary, or a Docker
image. If you are planning to run from sources or build on your machine start
by cloning the repo using `go get -d
github.com/open-telemetry/opentelemetry-service`.
github.com/open-telemetry/opentelemetry-collector`.

The minimum Go version required for this project is Go 1.12.5.

1. Run from sources:
```shell
$ GO111MODULE=on go run github.com/open-telemetry/opentelemetry-service/cmd/otelcol --help
$ GO111MODULE=on go run github.com/open-telemetry/opentelemetry-collector/cmd/otelcol --help
```
2. Run from binary (from the root of your repo):
```shell
Expand Down Expand Up @@ -435,8 +435,8 @@ queued-exporters:

[travis-image]: https://travis-ci.org/open-telemetry/opentelemetry-service.svg?branch=master
[travis-url]: https://travis-ci.org/open-telemetry/opentelemetry-service
[godoc-image]: https://godoc.org/github.com/open-telemetry/opentelemetry-service?status.svg
[godoc-url]: https://godoc.org/github.com/open-telemetry/opentelemetry-service
[godoc-image]: https://godoc.org/github.com/open-telemetry/opentelemetry-collector?status.svg
[godoc-url]: https://godoc.org/github.com/open-telemetry/opentelemetry-collector
[gitter-image]: https://badges.gitter.im/open-telemetry/opentelemetry-service.svg
[gitter-url]: https://gitter.im/open-telemetry/opentelemetry-service?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
[codecov-image]: https://codecov.io/gh/open-telemetry/opentelemetry-service/branch/master/graph/badge.svg
Expand Down
4 changes: 2 additions & 2 deletions cmd/otelcol/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package main
import (
"log"

"github.com/open-telemetry/opentelemetry-service/defaults"
"github.com/open-telemetry/opentelemetry-service/service"
"github.com/open-telemetry/opentelemetry-collector/defaults"
"github.com/open-telemetry/opentelemetry-collector/service"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion compression/grpc/grpc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (

"google.golang.org/grpc/encoding/gzip"

"github.com/open-telemetry/opentelemetry-service/compression"
"github.com/open-telemetry/opentelemetry-collector/compression"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion compression/grpc/grpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package grpc
import (
"testing"

"github.com/open-telemetry/opentelemetry-service/compression"
"github.com/open-telemetry/opentelemetry-collector/compression"
)

func TestGetGRPCCompressionKey(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-service/config/configmodels"
"github.com/open-telemetry/opentelemetry-service/exporter"
"github.com/open-telemetry/opentelemetry-service/extension"
"github.com/open-telemetry/opentelemetry-service/processor"
"github.com/open-telemetry/opentelemetry-service/receiver"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/exporter"
"github.com/open-telemetry/opentelemetry-collector/extension"
"github.com/open-telemetry/opentelemetry-collector/processor"
"github.com/open-telemetry/opentelemetry-collector/receiver"
)

// These are errors that can be returned by Load(). Note that error codes are not part
Expand Down
2 changes: 1 addition & 1 deletion config/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-service/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
)

func TestDecodeConfig(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions config/example_factories.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ import (

"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-service/config/configerror"
"github.com/open-telemetry/opentelemetry-service/config/configmodels"
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-service/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-service/exporter"
"github.com/open-telemetry/opentelemetry-service/extension"
"github.com/open-telemetry/opentelemetry-service/processor"
"github.com/open-telemetry/opentelemetry-service/receiver"
"github.com/open-telemetry/opentelemetry-collector/config/configerror"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/exporter"
"github.com/open-telemetry/opentelemetry-collector/extension"
"github.com/open-telemetry/opentelemetry-collector/processor"
"github.com/open-telemetry/opentelemetry-collector/receiver"
)

// ExampleReceiver is for testing purposes. We are defining an example config and factory
Expand Down
2 changes: 1 addition & 1 deletion config/test_helpers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/spf13/viper"
"go.uber.org/zap"

"github.com/open-telemetry/opentelemetry-service/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
)

// LoadConfigFile loads a config from file.
Expand Down
2 changes: 1 addition & 1 deletion consumer/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package consumer
import (
"context"

"github.com/open-telemetry/opentelemetry-service/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
)

// MetricsConsumer is an interface that receives consumerdata.MetricsData, process it as needed, and
Expand Down
50 changes: 25 additions & 25 deletions defaults/defaults.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,31 @@
package defaults

import (
"github.com/open-telemetry/opentelemetry-service/config"
"github.com/open-telemetry/opentelemetry-service/exporter"
"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegergrpcexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/zipkinexporter"
"github.com/open-telemetry/opentelemetry-service/extension"
"github.com/open-telemetry/opentelemetry-service/extension/healthcheckextension"
"github.com/open-telemetry/opentelemetry-service/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-service/extension/zpagesextension"
"github.com/open-telemetry/opentelemetry-service/oterr"
"github.com/open-telemetry/opentelemetry-service/processor"
"github.com/open-telemetry/opentelemetry-service/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/nodebatcherprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/probabilisticsamplerprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/queuedprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/tailsamplingprocessor"
"github.com/open-telemetry/opentelemetry-service/receiver"
"github.com/open-telemetry/opentelemetry-service/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/vmmetricsreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver"
"github.com/open-telemetry/opentelemetry-collector/config"
"github.com/open-telemetry/opentelemetry-collector/exporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/jaeger/jaegergrpcexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/jaeger/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/loggingexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/zipkinexporter"
"github.com/open-telemetry/opentelemetry-collector/extension"
"github.com/open-telemetry/opentelemetry-collector/extension/healthcheckextension"
"github.com/open-telemetry/opentelemetry-collector/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-collector/extension/zpagesextension"
"github.com/open-telemetry/opentelemetry-collector/oterr"
"github.com/open-telemetry/opentelemetry-collector/processor"
"github.com/open-telemetry/opentelemetry-collector/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/nodebatcherprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/probabilisticsamplerprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/queuedprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/tailsamplingprocessor"
"github.com/open-telemetry/opentelemetry-collector/receiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/vmmetricsreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/zipkinreceiver"
)

// Components returns the default set of components used by the
Expand Down
46 changes: 23 additions & 23 deletions defaults/defaults_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@ import (

"github.com/stretchr/testify/assert"

"github.com/open-telemetry/opentelemetry-service/exporter"
"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegergrpcexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/jaeger/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-service/exporter/zipkinexporter"
"github.com/open-telemetry/opentelemetry-service/extension"
"github.com/open-telemetry/opentelemetry-service/extension/healthcheckextension"
"github.com/open-telemetry/opentelemetry-service/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-service/extension/zpagesextension"
"github.com/open-telemetry/opentelemetry-service/processor"
"github.com/open-telemetry/opentelemetry-service/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/nodebatcherprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/probabilisticsamplerprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/queuedprocessor"
"github.com/open-telemetry/opentelemetry-service/processor/tailsamplingprocessor"
"github.com/open-telemetry/opentelemetry-service/receiver"
"github.com/open-telemetry/opentelemetry-service/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/vmmetricsreceiver"
"github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver"
"github.com/open-telemetry/opentelemetry-collector/exporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/jaeger/jaegergrpcexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/jaeger/jaegerthrifthttpexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/loggingexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/opencensusexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-collector/exporter/zipkinexporter"
"github.com/open-telemetry/opentelemetry-collector/extension"
"github.com/open-telemetry/opentelemetry-collector/extension/healthcheckextension"
"github.com/open-telemetry/opentelemetry-collector/extension/pprofextension"
"github.com/open-telemetry/opentelemetry-collector/extension/zpagesextension"
"github.com/open-telemetry/opentelemetry-collector/processor"
"github.com/open-telemetry/opentelemetry-collector/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/nodebatcherprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/probabilisticsamplerprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/queuedprocessor"
"github.com/open-telemetry/opentelemetry-collector/processor/tailsamplingprocessor"
"github.com/open-telemetry/opentelemetry-collector/receiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/opencensusreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/vmmetricsreceiver"
"github.com/open-telemetry/opentelemetry-collector/receiver/zipkinreceiver"
)

func TestDefaultComponents(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion docs/pipelines.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Pipelines
*Note* This documentation is still in progress. For any questions, please reach
out in the [OpenTelemetry Gitter](https://gitter.im/open-telemetry/opentelemetry-service)
or refer to the [issues page](https://github.com/open-telemetry/opentelemetry-service/issues).
or refer to the [issues page](https://github.com/open-telemetry/opentelemetry-collector/issues).
2 changes: 1 addition & 1 deletion exporter/exporter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package exporter

import (
"github.com/open-telemetry/opentelemetry-service/consumer"
"github.com/open-telemetry/opentelemetry-collector/consumer"
)

// TraceExporter composes TraceConsumer with some additional exporter-specific functions.
Expand Down
8 changes: 4 additions & 4 deletions exporter/exporterhelper/metricshelper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

"go.opencensus.io/trace"

"github.com/open-telemetry/opentelemetry-service/config/configmodels"
"github.com/open-telemetry/opentelemetry-service/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-service/exporter"
"github.com/open-telemetry/opentelemetry-service/observability"
"github.com/open-telemetry/opentelemetry-collector/config/configmodels"
"github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata"
"github.com/open-telemetry/opentelemetry-collector/exporter"
"github.com/open-telemetry/opentelemetry-collector/observability"
)

// PushMetricsData is a helper function that is similar to ConsumeMetricsData but also returns
Expand Down
Loading

0 comments on commit dc6b290

Please sign in to comment.