From 584cec08b98139ffd48616050f96f7985241284a Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 17 Jun 2019 17:44:31 -0700 Subject: [PATCH 1/5] Rename OpenCensus to OpenTelemetry First pass to rename OpenCensus to OpenTelemetry. Priority is around updating markdown files and taking initial pass on protocol rename. Future changes will continue rename in other areas as decisions are made. --- CONTRIBUTING.md | 67 ++++-- DESIGN.md | 40 ++-- Makefile | 4 +- PERFORMANCE.MD | 20 +- README.md | 208 ++++++++++-------- example/k8s.yaml | 70 +++--- example/main.go | 4 +- ...entelemetry-service-deployment-models.png} | Bin ...-service.png => opentelemetry-service.png} | Bin 9 files changed, 230 insertions(+), 183 deletions(-) rename images/{opencensus-service-deployment-models.png => opentelemetry-service-deployment-models.png} (100%) rename images/{opencensus-service.png => opentelemetry-service.png} (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7fc9a74eda9..b53d0144668 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,27 +1,52 @@ -# How to contribute +# Contributing Guide -We'd love to accept your patches and contributions to this project. There are -just a few small guidelines you need to follow. +We'd love your help! -## Contributor License Agreement +## Report a bug or requesting feature -Contributions to this project must be accompanied by a Contributor License -Agreement. You (or your employer) retain the copyright to your contribution, -this simply gives us permission to use and redistribute your contributions as -part of the project. Head over to to see -your current agreements on file or to sign a new one. +Reporting bugs is an important contribution. Please make sure to include: -You generally only need to submit a CLA once, so if you've already submitted one -(even if it was for a different project), you probably don't need to do it -again. +* Expected and actual behavior +* OpenTelemetry version you are running +* If possible, steps to reproduce -## Code reviews +## How to contribute -All submissions, including submissions by project members, require review. We -use GitHub pull requests for this purpose. Consult [GitHub Help] for more -information on using pull requests. +### Before you start -[GitHub Help]: https://help.github.com/articles/about-pull-requests/ +Please read project contribution +[guide](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md) +for general practices for OpenTelemetry project. + +### Fork + +In the interest of keeping this repository clean and manageable, you should +work from a fork. To create a fork, click the 'Fork' button at the top of the +repository, then clone the fork locally using `git clone +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 + +# verify that the upstream exists +git remote -v` + +To update your fork, fetch the upstream repo's branches and commits, then merge your master with upstream's master: + +``` +git fetch upstream +git checkout master +git merge upstream/master +``` + +Remember to always work in a branch of your local copy, as you might otherwise +have to contend with conflicts in master. + +Please also see [GitHub +workflow](https://github.com/open-telemetry/community/blob/master/CONTRIBUTING.md#github-workflow) +section of general project contributing guide. ## Required Tools @@ -38,14 +63,14 @@ 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/census-instrumentation/opencensus-service +$ GO111MODULE="" go get -d github.com/open-telemetry/opentelemetry-service ``` Add your fork as an origin: ```shell -$ cd $(go env GOPATH)/src/github.com/census-instrumentation/opencensus-service -$ git remote add fork git@github.com:YOUR_GITHUB_USERNAME/opencensus-service.git +$ cd $(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-service +$ git remote add fork git@github.com:YOUR_GITHUB_USERNAME/opentelemetry-service.git ``` Run tests, fmt and lint: @@ -78,4 +103,4 @@ Travis CI uses the Makefile with the default target, it is recommended to run it before submitting your PR. It runs `gofmt -s` (simplify) and `golint`. The dependencies are managed with `go mod` if you work with the sources under your -`$GOPATH` you need to set the environment variable `GO111MODULE=on`. \ No newline at end of file +`$GOPATH` you need to set the environment variable `GO111MODULE=on`. diff --git a/DESIGN.md b/DESIGN.md index e194753c1c2..241a25e901f 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -1,11 +1,11 @@ -# OpenCensus Service Design Specs +# OpenTelemetry Service Design Specs -This document describes the architecture design and implementation of OpenCensus Agent and -OpenCensus Collector. +This document describes the architecture design and implementation of OpenTelemetry Agent and +OpenTelemetry Collector. # Table of contents - [Goals](#goals) -- [OpenCensus Agent](#opencensus-agent) +- [OpenTelemetry Agent](#opentelemetry-agent) - [Architecture overview](#agent-architecture-overview) - [Communication](#agent-communication) - [Protocol Workflow](#agent-protocol-workflow) @@ -13,7 +13,7 @@ OpenCensus Collector. - [Receivers](#agent-impl-receivers) - [Agent Core](#agent-impl-agent-core) - [Exporters](#agent-impl-exporters) -- [OpenCensus Collector](#opencensus-collector) +- [OpenTelemetry Collector](#opentelemetry-collector) - [Architecture overview](#collector-architecture-overview) ## Goals @@ -23,32 +23,32 @@ optionally run a daemon on the host and it will read the collected data and upload to the configured backend. * Binaries can be instrumented without thinking about the exporting story. Allows open source binary projects (e.g. web servers like Caddy or Istio Mixer) -to adopt OpenCensus without having to link any exporters into their binary. +to adopt OpenTelemetry without having to link any exporters into their binary. * Easier to scale the exporter development. Not every language has to implement support for each backend. * Custom daemons containing only the required exporters compiled in can be created. -## OpenCensus Agent +## OpenTelemetry Agent ### Architecture Overview On a typical VM/container, there are user applications running in some processes/pods with -OpenCensus Library (Library). Previously, Library did all the recording, collecting, sampling and +OpenTelemetry Library (Library). Previously, Library did all the recording, collecting, sampling and aggregation on spans/stats/metrics, and exported them to other persistent storage backends via the Library exporters, or displayed them on local zpages. This pattern has several drawbacks, for example: -1. For each OpenCensus Library, exporters/zpages need to be re-implemented in native languages. +1. For each OpenTelemetry Library, exporters/zpages need to be re-implemented in native languages. 2. In some programming languages (e.g Ruby, PHP), it is difficult to do the stats aggregation in process. -3. To enable exporting OpenCensus spans/stats/metrics, application users need to manually add +3. To enable exporting OpenTelemetry spans/stats/metrics, application users need to manually add library exporters and redeploy their binaries. This is especially difficult when there’s already -an incident and users want to use OpenCensus to investigate what’s going on right away. +an incident and users want to use OpenTelemetry to investigate what’s going on right away. 4. Application users need to take the responsibility in configuring and initializing exporters. This is error-prone (e.g they may not set up the correct credentials\monitored resources), and -users may be reluctant to “pollute” their code with OpenCensus. +users may be reluctant to “pollute” their code with OpenTelemetry. -To resolve the issues above, we are introducing OpenCensus Agent (Agent). Agent runs as a daemon +To resolve the issues above, we are introducing OpenTelemetry Agent (Agent). Agent runs as a daemon in the VM/container and can be deployed independent of Library. Once Agent is deployed and running, it should be able to retrieve spans/stats/metrics from Library, export them to other backends. We MAY also give Agent the ability to push configurations (e.g sampling probability) to @@ -84,7 +84,7 @@ assoicated, Agent should handle the data properly, as if they were sent in a sub Identifier is no longer needed once the streams are established. 3. On Library side, if connection to Agent failed, Library should retry indefintely if possible, subject to available/configured memory buffer size. (Reason: consider environments where the -running applications are already instrumented with OpenCensus Library but Agent is not deployed +running applications are already instrumented with OpenTelemetry Library but Agent is not deployed yet. Sometime in the future, we can simply roll out the Agent to those environments and Library would automatically connect to Agent with indefinite retries. Zero changes are required to the applications.) Depending on the language and implementation, retry can be done in either @@ -105,7 +105,7 @@ invocations. The Agent consists of three main parts: -1. The receivers of different instrumentation libraries, such as OpenCensus, Zipkin, +1. The receivers of different instrumentation libraries, such as OpenTelemetry, Zipkin, Istio Mixer, Prometheus client, etc. Receivers act as the “frontend” or “gateway” of Agent. In addition, there MAY be one special receiver for receiving configuration updates from outside. @@ -149,18 +149,18 @@ Once in a while, Agent Core will push `SpanProto` with `Node` to each exporter. receiving them, each exporter will translate `SpanProto` to the format supported by the backend (e.g Jaeger Thrift Span), and then push them to corresponding backend or service. -## OpenCensus Collector +## OpenTelemetry Collector ### Architecture Overview -The OpenCensus Collector runs as a standalone instance and receives spans and -metrics exporterd by one or more OpenCensus Agents or Libraries, or by +The OpenTelemetry Collector runs as a standalone instance and receives spans and +metrics exporterd by one or more OpenTelemetry Agents or Libraries, or by tasks/agents that emit in one of the supported protocols. The Collector is configured to send data to the configured exporter(s). The following figure summarizes the deployment architecture: -![OpenCensus Collector Architecture](https://user-images.githubusercontent.com/10536136/46637070-65f05f80-cb0f-11e8-96e6-bc56468486b3.png "OpenCensus Collector Architecture") +![OpenTelemetry Collector Architecture](https://user-images.githubusercontent.com/10536136/46637070-65f05f80-cb0f-11e8-96e6-bc56468486b3.png "OpenTelemetry Collector Architecture") -The OpenCensus Collector can also be deployed in other configurations, such as +The OpenTelemetry Collector can also be deployed in other configurations, such as receiving data from other agents or clients in one of the formats supported by its receivers. diff --git a/Makefile b/Makefile index 2aeabace849..4d07985e17b 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ GOVET=go vet GOOS=$(shell go env GOOS) GIT_SHA=$(shell git rev-parse --short HEAD) -BUILD_INFO_IMPORT_PATH=github.com/census-instrumentation/opencensus-service/internal/version +BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemtry-service/internal/version BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) ifdef VERSION BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) @@ -44,7 +44,7 @@ travis-ci: fmt vet lint test-with-cover .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/census-instrumentation/opencensus-service/,./,$(ALL_PKGS)) + @scripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemtry-service/,./,$(ALL_PKGS)) @echo pre-compiling tests @time go test -i $(ALL_PKGS) $(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) $(ALL_PKGS) diff --git a/PERFORMANCE.MD b/PERFORMANCE.MD index 4b85841f30b..535b7fa9268 100644 --- a/PERFORMANCE.MD +++ b/PERFORMANCE.MD @@ -1,18 +1,18 @@ -# OpenCensus Service Performance +# OpenTelemetry Service Performance The performance numbers that follow were generated using version 0.1.3 of the -OpenCensus Service, are applicable primarily to the OpenCensus Collector and +OpenTelemetry Service, are applicable primarily to the OpenTelemetry Collector and are measured only for traces. In the future, more configurations will be tested. -Note with the OpenCensus Agent you can expect as good if not better performance -with lower resource utilization. This is because the OpenCensus Agent does not +Note with the OpenTelemetry Agent you can expect as good if not better performance +with lower resource utilization. This is because the OpenTelemetry Agent does not today support features such as batching or retries and will not support tail-sampling. -It is important to note that the performance of the OpenCensus Collector depends +It is important to note that the performance of the OpenTelemetry Collector depends on a variety of factors including: -* The receiving format: OpenCensus (55678), Jaeger thrift (14268) or Zipkin v2 JSON (9411) +* The receiving format: OpenTelemetry (55678), Jaeger thrift (14268) or Zipkin v2 JSON (9411) * The size of the spans (tests are based on number of attributes): 20 * Whether tail-sampling is enabled or not * CPU / Memory allocation @@ -35,8 +35,8 @@ impact the results of the tests. The parameters used are defined below. | Span
Format | CPU
(2+ GHz) | RAM
(GB) | Sustained
Rate | Recommended
Maximum | | :---: | :---: | :---: | :---: | :---: | -| OpenCensus | 1 | 2 | ~12K | 10K | -| OpenCensus | 2 | 4 | ~24K | 20K | +| OpenTelemetry | 1 | 2 | ~12K | 10K | +| OpenTelemetry | 2 | 4 | ~24K | 20K | | Jaeger Thrift | 1 | 2 | ~14K | 12K | | Jaeger Thrift | 2 | 4 | ~27.5K | 24K | | Zipkin v2 JSON | 1 | 2 | ~10.5K | 9K | @@ -56,8 +56,8 @@ service | Span
Format | CPU
(2+ GHz) | RAM
(GB) | Sustained
Rate | Recommended
Maximum | | :---: | :---: | :---: | :---: | :---: | -| OpenCensus | 1 | 2 | ~9K | 8K | -| OpenCensus | 2 | 4 | ~18K | 16K | +| OpenTelemetry | 1 | 2 | ~9K | 8K | +| OpenTelemetry | 2 | 4 | ~18K | 16K | | Jaeger Thrift | 1 | 6 | ~11.5K | 10K | | Jaeger Thrift | 2 | 8 | ~23K | 20K | | Zipkin v2 JSON | 1 | 6 | ~8.5K | 7K | diff --git a/README.md b/README.md index b8d3bd1d3e2..5e71d837e9c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,9 @@ -# OpenCensus Service +# OpenTelemetry Service + + [![Build Status][travis-image]][travis-url] [![GoDoc][godoc-image]][godoc-url] @@ -16,57 +21,56 @@ - [Receivers](#config-receivers) - [Exporters](#config-exporters) - [Diagnostics](#config-diagnostics) -- [OpenCensus Agent](#opencensus-agent) +- [OpenTelemetry Agent](#opentelemetry-agent) - [Usage](#agent-usage) -- [OpenCensus Collector](#opencensus-collector) +- [OpenTelemetry Collector](#opentelemetry-collector) - [Global Attributes](#global-attributes) - [Intelligent Sampling](#tail-sampling) - [Usage](#collector-usage) ## Introduction -The OpenCensus Service is an component that can collect traces -and metrics from processes instrumented by OpenCensus or other -monitoring/tracing libraries (Jaeger, Prometheus, etc.), do -aggregation and smart sampling, and export traces and metrics -to one or more monitoring/tracing backends. - -Some frameworks and ecosystems are now providing out-of-the-box -instrumentation by using OpenCensus, but the user is still expected -to register an exporter in order to export data. This is a problem -during an incident. Even though our users can benefit from having -more diagnostics data coming out of services already instrumented -with OpenCensus, they have to modify their code to register an -exporter and redeploy. Asking our users recompile and redeploy is -not an ideal at an incident time. In addition, currently users need -to decide which service backend they want to export to, before they -distribute their binary instrumented by OpenCensus. - -The OpenCensus Service is trying to eliminate these requirements. With the -OpenCensus Service, users do not need to redeploy or restart their applications -as long as it has the OpenCensus exporter. All they need to do is -just configure and deploy the OpenCensus Service separately. The OpenCensus -Service will then automatically collect traces and metrics and export to any -backend of users' choice. - -Currently the OpenCensus Service consists of two components, -[OpenCensus Agent](#opencensus-agent) and [OpenCensus Collector](#opencensus-collector). For the detailed design specs, -please see [DESIGN.md](DESIGN.md). +The OpenTelemetry Service is an component that can collect traces and metrics +from processes instrumented by OpenTelemetry or other monitoring/tracing +libraries (Jaeger, Prometheus, etc.), does aggregation and smart sampling, and +export traces and metrics to one or more monitoring/tracing backends. + +Some frameworks and ecosystems are now providing out-of-the-box instrumentation +by using OpenTelemetry, but the user is still expected to register an exporter +in order to export data. This is a problem during an incident. Even though our +users can benefit from having more diagnostics data coming out of services +already instrumented with OpenTelemetry, they have to modify their code to +register an exporter and redeploy. Asking our users recompile and redeploy is +not an ideal at an incident time. In addition, currently users need to decide +which service backend they want to export to, before they distribute their +binary instrumented by OpenTelemetry. + +The OpenTelemetry Service is trying to eliminate these requirements. With the +OpenTelemetry Service, users do not need to redeploy or restart their +applications as long as it has the OpenTelemetry exporter. All they need to do +is just configure and deploy the OpenTelemetry Service separately. The +OpenTelemetry Service will then automatically collect traces and metrics and +export to any backend of users' choice. + +Currently the OpenTelemetry Service consists of two components, [OpenTelemetry +Agent](#opentelemetry-agent) and [OpenTelemetry Collector](#opentelemetry-collector). +For the detailed design specs, please see [DESIGN.md](DESIGN.md). ## Deployment -The OpenCensus Service can be deployed in a variety of different ways. The OpenCensus -Agent can be deployed with the application either as a separate process, as a sidecar, -or via a Kubernetes daemonset. Typically, the OpenCensus Collector is deployed -separately as either a Docker container, VM, or Kubernetes pod. +The OpenTelemetry Service can be deployed in a variety of different ways. The +OpenTelemetry Agent can be deployed with the application either as a separate +process, as a sidecar, or via a Kubernetes daemonset. Typically, the +OpenTelemetry Collector is deployed separately as either a Docker container, +VM, or Kubernetes pod. -![deployment-models](images/opencensus-service-deployment-models.png) +![deployment-models](images/opentelemetry-service-deployment-models.png) ## Getting Started ### Demo -Instructions for setting up an end-to-end demo environment can be found [here](https://github.com/census-instrumentation/opencensus-service/tree/master/demos/trace) +Instructions for setting up an end-to-end demo environment can be found [here](https://github.com/open-telemetry/opentelemetry-service/tree/master/demos/trace) ### Kubernetes @@ -78,19 +82,21 @@ $ kubectl apply -f example/k8s.yaml ### Standalone -Create an Agent [configuration](#config) file based on the options described below. Please note the Agent -requires the `opencensus` receiver be enabled. By default, the Agent has no exporters configured. +Create an Agent [configuration](#config) file based on the options described +below. Please note the Agent requires the `opentelemetry` receiver be enabled. By +default, the Agent has no exporters configured. Build the Agent, see [Usage](##agent-usage), and start it: ```shell $ ./bin/ocagent_$(go env GOOS) -$ 2018/10/08 21:38:00 Running OpenCensus receiver as a gRPC service at "127.0.0.1:55678" +$ 2018/10/08 21:38:00 Running OpenTelemetry receiver as a gRPC service at "127.0.0.1:55678" ``` -Create an Collector [configuration](#config) file based on the options described below. By default, the -Collector has the `opencensus` receiver enabled, but no exporters. +Create an Collector [configuration](#config) file based on the options +described below. By default, the Collector has the `opentelemetry` receiver +enabled, but no exporters. Build the Collector and start it: @@ -102,28 +108,32 @@ $ ./bin/occollector_$($GOOS) Run the demo application: ```shell -$ go run "$(go env GOPATH)/src/github.com/census-instrumentation/opencensus-service/example/main.go" +$ go run "$(go env GOPATH)/src/github.com/open-telemetry/opentelemetry-service/example/main.go" ``` -You should be able to see the traces in your exporter(s) of choice. -If you stop the ocagent, the example application will stop exporting. -If you run it again, exporting will resume. +You should be able to see the traces in your exporter(s) of choice. If you stop +the ocagent, the example application will stop exporting. If you run it again, +exporting will resume. ## Configuration -The OpenCensus Service (both the Agent and Collector) is configured via a YAML file. In general, you need to -configure one or more receivers as well as one or more exporters. In addition, diagnostics can also be configured. +The OpenTelemetry Service (both the Agent and Collector) is configured via a +YAML file. In general, you need to configure one or more receivers as well as +one or more exporters. In addition, diagnostics can also be configured. ### Receivers -A receiver is how you get data into the OpenCensus Service. One or more receivers can be configured. By default, -the `opencensus` receiver is enabled on the Collector and required as a defined receiver for the Agent. +A receiver is how you get data into the OpenTelemetry Service. One or more +receivers can be configured. By default, the `opentelemetry` receiver is enabled +on the Collector and required as a defined receiver for the Agent. + +A basic example of all available receivers is provided below. For detailed +receiver configuration, please see the [receiver +README.md](receiver/README.md). -A basic example of all available receivers is provided below. For detailed receiver configuration, -please see the [receiver README.md](receiver/README.md). ```yaml receivers: - opencensus: + opentelemetry: address: "127.0.0.1:55678" zipkin: @@ -144,14 +154,17 @@ receivers: ### Exporters -An exporter is how you send data to one or more backends/destinations. One or more exporters can be configured. -By default, no exporters are configured on the OpenCensus Service (either the Agent or Collector). +An exporter is how you send data to one or more backends/destinations. One or +more exporters can be configured. By default, no exporters are configured on +the OpenTelemetry Service (either the Agent or Collector). + +A basic example of all available exporters is provided below. For detailed +exporter configuration, please see the [exporter +README.md](exporter/README.md). -A basic example of all available exporters is provided below. For detailed exporter configuration, -please see the [exporter README.md](exporter/README.md). ```yaml exporters: - opencensus: + opentelemetry: headers: {"X-test-header": "test-header"} compression: "gzip" cert-pem-file: "server_ca_public.pem" # optional to enable TLS @@ -163,7 +176,7 @@ exporters: kafka: brokers: ["127.0.0.1:9092"] - topic: "opencensus-spans" + topic: "opentelemetry-spans" stackdriver: project: "my-project-id" # optional, defaults to agent project if run on GCP @@ -209,21 +222,24 @@ zpages: disabled: true ``` -## OpenCensus Agent +## OpenTelemetry Agent ### Usage -> It is recommended that you use the latest [release](https://github.com/census-instrumentation/opencensus-service/releases). +> It is recommended that you use the latest [release](https://github.com/open-telemetry/opentelemetry-service/releases). -The ocagent 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/census-instrumentation/opencensus-service`. +The ocagent 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`. -The minimum Go version required for this project is Go 1.12.5. In addition, you must manually install [Bazaar](https://github.com/census-instrumentation/opencensus-service/blob/master/CONTRIBUTING.md#required-tools) +The minimum Go version required for this project is Go 1.12.5. In addition, you +must manually install +[Bazaar](https://github.com/open-telemetry/opentelemetry-service/blob/master/CONTRIBUTING.md#required-tools) 1. Run from sources: ```shell -$ GO111MODULE=on go run github.com/census-instrumentation/opencensus-service/cmd/ocagent --help +$ GO111MODULE=on go run github.com/open-telemetry/opentelemetry-service/cmd/ocagent --help ``` 2. Run from binary (from the root of your repo): @@ -249,17 +265,17 @@ $ docker run \ --config=/conf/ocagent-config.yaml ``` -## OpenCensus Collector +## OpenTelemetry Collector -The OpenCensus Collector is a component that runs “nearby” (e.g. in the same +The OpenTelemetry Collector is a component that runs “nearby” (e.g. in the same VPC, AZ, etc.) a user’s application components and receives trace spans and -metrics emitted by the OpenCensus Agent or tasks instrumented with OpenCensus -instrumentation (or other supported protocols/libraries). The received spans -and metrics could be emitted directly by clients in instrumented tasks, or -potentially routed via intermediate proxy sidecar/daemon agents (such as the -OpenCensus Agent). The collector provides a central egress point for exporting -traces and metrics to one or more tracing and metrics backends, with buffering -and retries as well as advanced aggregation, filtering and annotation +metrics emitted by the OpenTelemetry Agent or tasks instrumented with +OpenTelemetry instrumentation (or other supported protocols/libraries). The +received spans and metrics could be emitted directly by clients in instrumented +tasks, or potentially routed via intermediate proxy sidecar/daemon agents (such +as the OpenTelemetry Agent). The collector provides a central egress point for +exporting traces and metrics to one or more tracing and metrics backends, with +buffering and retries as well as advanced aggregation, filtering and annotation capabilities. The collector is extensible enabling it to support a range of out-of-the-box @@ -282,10 +298,13 @@ For detailed information about configuring receivers for the collector refer to ### Global Attributes -The collector also takes some global configurations that modify its behavior for all receivers / exporters. +The collector also takes some global configurations that modify its behavior for all receivers / exporters. -1. Add Attributes to all spans passing through this collector. These additional attributes can be configured to either overwrite existing keys if they already exist on the span, or respect the original values. -2. The key of each attribute can also be mapped to different strings using the `key-mapping` configuration. The key matching is case sensitive. +1. Add Attributes to all spans passing through this collector. These additional + attributes can be configured to either overwrite existing keys if they + already exist on the span, or respect the original values. +2. The key of each attribute can also be mapped to different strings using the + `key-mapping` configuration. The key matching is case sensitive. An example using these configurations of this is provided below. @@ -344,24 +363,27 @@ sampling: ### Usage -> It is recommended that you use the latest [release](https://github.com/census-instrumentation/opencensus-service/releases). +> It is recommended that you use the latest [release](https://github.com/open-telemetry/opentelemetry-service/releases). -The 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/census-instrumentation/opencensus-service`. +The 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`. The minimum Go version required for this project is Go 1.12.5. 1. Run from sources: ```shell -$ GO111MODULE=on go run github.com/census-instrumentation/opencensus-service/cmd/occollector --help +$ GO111MODULE=on go run github.com/open-telemetry/opentelemetry-service/cmd/occollector --help ``` 2. Run from binary (from the root of your repo): ```shell $ make collector $ ./bin/occollector_$($GOOS) ``` -3. Build a Docker scratch image and use the appropriate Docker command for your scenario -(note: additional ports may be required depending on your receiver configuration): +3. Build a Docker scratch image and use the appropriate Docker command for your + scenario (note: additional ports may be required depending on your receiver + configuration): ```shell $ make docker-collector $ docker run \ @@ -376,7 +398,7 @@ $ docker run \ It can be configured via command-line or config file: ``` -OpenCensus Collector +OpenTelemetry Collector Usage: occollector [flags] @@ -391,7 +413,7 @@ Flags: --metrics-level string Output level of telemetry metrics (NONE, BASIC, NORMAL, DETAILED) (default "BASIC") --metrics-port uint Port exposing collector telemetry. (default 8888) --receive-jaeger Flag to run the Jaeger receiver (i.e.: Jaeger Collector), default settings: {ThriftTChannelPort:14267 ThriftHTTPPort:14268} - --receive-oc-trace Flag to run the OpenCensus trace receiver, default settings: {Port:55678} (default true) + --receive-oc-trace Flag to run the OpenTelemetry trace receiver, default settings: {Port:55678} (default true) --receive-zipkin Flag to run the Zipkin receiver, default settings: {Port:9411} --receive-zipkin-scribe Flag to run the Zipkin Scribe receiver, default settings: {Address: Port:9410 Category:zipkin} --tail-sampling-always-sample Flag to use a tail-based sampling processor with an always sample policy, unless tail sampling setting is present on configuration file. @@ -402,7 +424,7 @@ Sample configuration file: log-level: DEBUG receivers: - opencensus: {} # Runs OpenCensus receiver with default configuration (default behavior). + opentelemetry: {} # Runs OpenTelemetry receiver with default configuration (default behavior). queued-exporters: jaeger-sender-test: # A friendly name for the exporter @@ -431,11 +453,11 @@ queued-exporters: timeout: 5s ``` -[travis-image]: https://travis-ci.org/census-instrumentation/opencensus-service.svg?branch=master -[travis-url]: https://travis-ci.org/census-instrumentation/opencensus-service -[godoc-image]: https://godoc.org/github.com/census-instrumentation/opencensus-service?status.svg -[godoc-url]: https://godoc.org/github.com/census-instrumentation/opencensus-service -[gitter-image]: https://badges.gitter.im/census-instrumentation/lobby.svg -[gitter-url]: https://gitter.im/census-instrumentation/lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge -[codecov-image]: https://codecov.io/gh/census-instrumentation/opencensus-service/branch/master/graph/badge.svg -[codecov-url]: https://codecov.io/gh/census-instrumentation/opencensus-service/branch/master/ +[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 +[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 +[codecov-url]: https://codecov.io/gh/open-telemetry/opentelemetry-service/branch/master/ diff --git a/example/k8s.yaml b/example/k8s.yaml index c3bdd947c24..5573c05956f 100644 --- a/example/k8s.yaml +++ b/example/k8s.yaml @@ -2,40 +2,40 @@ apiVersion: v1 kind: ConfigMap metadata: - name: oc-agent-conf + name: opentel-agent-conf labels: app: opencensus - component: oc-agent-conf + component: opentel-agent-conf data: - oc-agent-config: | + opentel-agent-config: | receivers: opencensus: {} # jaeger: {} # zipkin: {} exporters: opencensus: - endpoint: "oc-collector.default:55678" # TODO: Update me + endpoint: "opentel-collector.default:55678" # TODO: Update me --- apiVersion: extensions/v1beta1 kind: DaemonSet metadata: - name: oc-agent + name: opentel-agent labels: app: opencensus - component: oc-agent + component: opentel-agent spec: template: metadata: labels: app: opencensus - component: oc-agent + component: opentel-agent spec: containers: - command: - - "/ocagent_linux" - - "--config=/conf/oc-agent-config.yaml" + - "/opentelagent_linux" + - "--config=/conf/opentel-agent-config.yaml" image: omnition/opencensus-agent:0.1.6 - name: oc-agent + name: opentel-agent resources: limits: cpu: 500m @@ -50,25 +50,25 @@ spec: # - containerPort: 14268 # - containerPort: 9411 volumeMounts: - - name: oc-agent-config-vol + - name: opentel-agent-config-vol mountPath: /conf volumes: - configMap: - name: oc-agent-conf + name: opentel-agent-conf items: - - key: oc-agent-config - path: oc-agent-config.yaml - name: oc-agent-config-vol + - key: opentel-agent-config + path: opentel-agent-config.yaml + name: opentel-agent-config-vol --- apiVersion: v1 kind: ConfigMap metadata: - name: oc-collector-conf + name: opentel-collector-conf labels: app: opencensus - component: oc-collector-conf + component: opentel-collector-conf data: - oc-collector-config: | + opentel-collector-config: | receivers: opencensus: # keepalive settings can help load balancing, see receiver/README.md for more info. @@ -103,15 +103,15 @@ data: apiVersion: v1 kind: Service metadata: - name: oc-collector + name: opentel-collector labels: app: opencesus - component: oc-collector + component: opentel-collector spec: ports: - name: opencensus port: 55678 - protocol: TCP + protopentelol: TCP targetPort: 55678 # - name: jaeger-tchannel # port: 14267 @@ -120,15 +120,15 @@ spec: # - name: zipkin # port: 9411 selector: - component: oc-collector + component: opentel-collector --- apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: oc-collector + name: opentel-collector labels: app: opencensus - component: oc-collector + component: opentel-collector spec: minReadySeconds: 5 progressDeadlineSeconds: 120 @@ -141,17 +141,17 @@ spec: prometheus.io/scrape: "true" labels: app: opencensus - component: oc-collector + component: opentel-collector spec: containers: - command: - - "/occollector_linux" - - "--config=/conf/oc-collector-config.yaml" + - "/opentelcollector_linux" + - "--config=/conf/opentel-collector-config.yaml" env: - name: GOGC value: "80" image: omnition/opencensus-collector:0.1.6 - name: oc-collector + name: opentel-collector resources: limits: cpu: 1 @@ -165,9 +165,9 @@ spec: # - containerPort: 14268 # - containerPort: 9411 volumeMounts: - - name: oc-collector-config-vol + - name: opentel-collector-config-vol mountPath: /conf -# - name: oc-collector-secrets +# - name: opentel-collector-secrets # mountPath: /secrets livenessProbe: httpGet: @@ -179,13 +179,13 @@ spec: port: 13133 volumes: - configMap: - name: oc-collector-conf + name: opentel-collector-conf items: - - key: oc-collector-config - path: oc-collector-config.yaml - name: oc-collector-config-vol + - key: opentel-collector-config + path: opentel-collector-config.yaml + name: opentel-collector-config-vol # - secret: -# name: oc-collector-secrets +# name: opentel-collector-secrets # items: # - key: cert.pem # path: cert.pem diff --git a/example/main.go b/example/main.go index 5fa9f5ff96f..484e647d4ea 100644 --- a/example/main.go +++ b/example/main.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Sample contains a program that exports to the OpenCensus service. +// Sample contains a program that exports to the OpenTelemetry service. package main import ( @@ -35,7 +35,7 @@ func main() { ocagent.WithInsecure(), ocagent.WithServiceName(fmt.Sprintf("example-go-%d", os.Getpid()))) if err != nil { - log.Fatalf("Failed to create ocagent-exporter: %v", err) + log.Fatalf("Failed to create opentelagent-exporter: %v", err) } trace.RegisterExporter(oce) view.RegisterExporter(oce) diff --git a/images/opencensus-service-deployment-models.png b/images/opentelemetry-service-deployment-models.png similarity index 100% rename from images/opencensus-service-deployment-models.png rename to images/opentelemetry-service-deployment-models.png diff --git a/images/opencensus-service.png b/images/opentelemetry-service.png similarity index 100% rename from images/opencensus-service.png rename to images/opentelemetry-service.png From d9aaa5f3cb2227254335d48d10f764519a2019da Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 17 Jun 2019 17:49:00 -0700 Subject: [PATCH 2/5] Fix notice at top of README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 5e71d837e9c..00c2cf2fc4b 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ # OpenTelemetry Service - [![Build Status][travis-image]][travis-url] [![GoDoc][godoc-image]][godoc-url] From 3dd30060b82ad2c77e23e38b4deba8e9a3db50f7 Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 17 Jun 2019 18:24:59 -0700 Subject: [PATCH 3/5] More rename --- .travis.yml | 2 +- cmd/ocagent/main.go | 48 +++++++------- cmd/occollector/app/builder/builder.go | 10 +-- cmd/occollector/app/builder/builder_test.go | 6 +- cmd/occollector/app/builder/doc.go | 4 +- .../app/builder/exporters_builder.go | 10 +-- .../app/builder/exporters_builder_test.go | 6 +- .../app/builder/pipelines_builder.go | 10 +-- .../app/builder/pipelines_builder_test.go | 12 ++-- .../app/builder/processor_builder.go | 4 +- .../app/builder/processor_builder_test.go | 4 +- .../app/builder/sampling_builder.go | 2 +- cmd/occollector/app/collector/collector.go | 18 ++--- .../app/collector/collector_test.go | 6 +- cmd/occollector/app/collector/healthcheck.go | 2 +- cmd/occollector/app/collector/logger.go | 2 +- cmd/occollector/app/collector/processors.go | 26 ++++---- .../app/collector/processors_test.go | 10 +-- cmd/occollector/app/collector/receivers.go | 16 ++--- cmd/occollector/app/collector/telemetry.go | 16 ++--- cmd/occollector/app/sender/doc.go | 2 +- cmd/occollector/app/sender/empty_test.go | 2 +- .../app/sender/jaeger_proto_grpc_sender.go | 8 +-- .../app/sender/jaeger_thrift_http_sender.go | 8 +-- .../sender/jaeger_thrift_tchannel_sender.go | 8 +-- cmd/occollector/main.go | 4 +- cmd/unisvc/main.go | 4 +- consumer/consumer.go | 4 +- consumer/empty_test.go | 2 +- data/data.go | 10 +-- data/empty_test.go | 2 +- demos/trace/README.md | 4 +- exporter/README.md | 4 +- exporter/awsexporter/aws_xray.go | 14 ++-- exporter/awsexporter/aws_xray_test.go | 2 +- exporter/datadogexporter/datadog.go | 6 +- exporter/datadogexporter/datadog_test.go | 2 +- exporter/empty_test.go | 2 +- exporter/exporter.go | 4 +- exporter/exporterhelper/common.go | 2 +- exporter/exporterhelper/common_test.go | 2 +- exporter/exporterhelper/constants.go | 2 +- exporter/exporterhelper/metricshelper.go | 8 +-- exporter/exporterhelper/metricshelper_test.go | 8 +-- exporter/exporterhelper/tracehelper.go | 8 +-- exporter/exporterhelper/tracehelper_test.go | 12 ++-- exporter/exportertest/exportertest.go | 2 +- exporter/exportertest/nop_exporter.go | 6 +- exporter/exportertest/nop_exporter_test.go | 8 +-- exporter/exportertest/sink_exporter.go | 6 +- exporter/exportertest/sink_exporter_test.go | 8 +-- exporter/exporterwrapper/exporterwrapper.go | 24 +++---- .../exporterwrapper/exporterwrapper_test.go | 2 +- exporter/factory.go | 2 +- exporter/honeycombexporter/honeycomb.go | 8 +-- .../honeycombexporter_test.go | 2 +- exporter/jaegerexporter/jaeger.go | 6 +- .../jaegerexporter/jaegerexporter_test.go | 2 +- exporter/kafkaexporter/kafka.go | 6 +- exporter/kafkaexporter/kafkaexporter_test.go | 2 +- exporter/loggingexporter/logging_exporter.go | 8 +-- .../loggingexporter/logging_exporter_test.go | 8 +-- exporter/opencensusexporter/config.go | 6 +- exporter/opencensusexporter/config_test.go | 8 +-- exporter/opencensusexporter/factory.go | 28 ++++---- exporter/opencensusexporter/factory_test.go | 6 +- exporter/opencensusexporter/opencensus.go | 38 +++++------ .../opencensusexporter_test.go | 10 +-- exporter/prometheusexporter/prometheus.go | 6 +- .../prometheusexporter/prometheus_test.go | 8 +-- exporter/stackdriverexporter/stackdriver.go | 8 +-- .../stackdriverexporter_test.go | 2 +- exporter/wavefrontexporter/wavefront.go | 6 +- exporter/wavefrontexporter/wavefront_test.go | 2 +- exporter/zipkinexporter/zipkin.go | 24 +++---- exporter/zipkinexporter/zipkin_test.go | 12 ++-- go.mod | 4 +- go.sum | 6 +- internal/collector/jaeger/receiver.go | 10 +-- internal/collector/opencensus/receiver.go | 20 +++--- .../collector/opencensus/receiver_test.go | 12 ++-- internal/collector/processor/doc.go | 4 +- internal/collector/processor/empty_test.go | 2 +- .../processor/idbatcher/id_batcher.go | 2 +- .../processor/idbatcher/id_batcher_test.go | 4 +- internal/collector/processor/metrics.go | 6 +- .../processor/nodebatcher/metrics.go | 6 +- .../processor/nodebatcher/node_batcher.go | 16 ++--- .../nodebatcher/node_batcher_test.go | 10 +-- .../processor/nodebatcher/options.go | 2 +- .../collector/processor/queued/options.go | 4 +- .../processor/queued/queued_processor.go | 12 ++-- .../processor/queued/queued_processor_test.go | 8 +-- .../processor/tailsampling/metrics.go | 4 +- .../processor/tailsampling/processor.go | 14 ++-- .../processor/tailsampling/processor_test.go | 14 ++-- internal/collector/sampling/always_sample.go | 4 +- internal/collector/sampling/doc.go | 2 +- .../collector/sampling/numeric_tag_filter.go | 4 +- internal/collector/sampling/policy.go | 6 +- internal/collector/sampling/rate_limiting.go | 4 +- .../collector/sampling/string_tag_filter.go | 4 +- internal/collector/telemetry/telemetry.go | 2 +- internal/collector/zipkin/receiver.go | 10 +-- internal/collector/zipkin/scribe/receiver.go | 10 +-- internal/compression/empty_test.go | 2 +- internal/compression/grpc/grpc.go | 4 +- internal/compression/grpc/grpc_test.go | 4 +- internal/compression/grpc/gzip.go | 2 +- internal/compression/keys.go | 2 +- internal/config/config.go | 66 +++++++++---------- internal/config/config_test.go | 20 +++--- internal/config/tls_credentials.go | 2 +- internal/config/tls_credentials_test.go | 6 +- internal/config/viperutils/viperutils.go | 2 +- internal/config/viperutils/viperutils_test.go | 2 +- internal/configmodels/configmodels.go | 2 +- internal/configmodels/empty_test.go | 2 +- internal/configv2/configv2.go | 6 +- internal/configv2/configv2_test.go | 4 +- internal/configv2/example_factories.go | 14 ++-- internal/configv2/test_helpers.go | 4 +- internal/factories/factories.go | 10 +-- internal/factories/factories_test.go | 10 +-- internal/internal.go | 2 +- internal/internal_test.go | 4 +- internal/pprofserver/pprofserver.go | 2 +- internal/pprofserver/pprofserver_test.go | 2 +- internal/testutils/testutils.go | 2 +- internal/testutils/testutils_test.go | 2 +- internal/version/version.go | 2 +- internal/version/version_test.go | 2 +- internal/zpagesserver/zpagesserver.go | 2 +- internal/zpagesserver/zpagesserver_test.go | 2 +- observability/observability.go | 6 +- observability/observability_test.go | 6 +- .../observabilitytest/observabilitytest.go | 4 +- .../observabilitytest_test.go | 6 +- .../addattributesprocessor.go | 10 +-- .../addattributesprocessor_test.go | 8 +-- processor/addattributesprocessor/config.go | 4 +- .../addattributesprocessor/config_test.go | 8 +-- processor/addattributesprocessor/factory.go | 12 ++-- .../addattributesprocessor/factory_test.go | 4 +- .../attributekeyprocessor.go | 8 +-- .../attributekeyprocessor_test.go | 14 ++-- processor/empty_test.go | 2 +- processor/factory.go | 2 +- processor/multiconsumer/multiconsumer.go | 10 +-- processor/multiconsumer/multiconsumer_test.go | 10 +-- processor/processor.go | 4 +- processor/processortest/nop_processor.go | 8 +-- processor/processortest/nop_processor_test.go | 10 +-- receiver/README.md | 20 +++--- receiver/end_to_end_test.go | 10 +-- receiver/factory.go | 4 +- receiver/factorytemplate/factorytemplate.go | 6 +- .../factorytemplate/factorytemplate_test.go | 8 +-- receiver/jaegerreceiver/config.go | 4 +- receiver/jaegerreceiver/config_test.go | 8 +-- receiver/jaegerreceiver/factory.go | 10 +-- receiver/jaegerreceiver/factory_test.go | 4 +- receiver/jaegerreceiver/jaeger_agent_test.go | 18 ++--- receiver/jaegerreceiver/trace_receiver.go | 10 +-- .../jaegerreceiver/trace_receiver_test.go | 16 ++--- receiver/opencensusreceiver/config.go | 6 +- receiver/opencensusreceiver/config_test.go | 8 +-- receiver/opencensusreceiver/factory.go | 12 ++-- receiver/opencensusreceiver/factory_test.go | 6 +- receiver/opencensusreceiver/ocmetrics/doc.go | 4 +- .../ocmetrics/opencensus.go | 22 +++---- .../ocmetrics/opencensus_test.go | 22 +++---- .../opencensusreceiver/ocmetrics/options.go | 2 +- receiver/opencensusreceiver/octrace/doc.go | 4 +- .../octrace/observability_test.go | 16 ++--- .../opencensusreceiver/octrace/opencensus.go | 20 +++--- .../octrace/opencensus_test.go | 20 +++--- .../opencensusreceiver/octrace/options.go | 2 +- receiver/opencensusreceiver/opencensus.go | 18 ++--- .../opencensusreceiver/opencensus_test.go | 22 +++---- receiver/opencensusreceiver/options.go | 6 +- receiver/opencensusreceiver/options_test.go | 2 +- receiver/prometheusreceiver/doc.go | 2 +- .../prometheusreceiver/metrics_receiver.go | 10 +-- .../metrics_receiver_test.go | 10 +-- receiver/receiver.go | 4 +- receiver/vmmetricsreceiver/doc.go | 2 +- .../vmmetricsreceiver/metrics_receiver.go | 4 +- .../vmmetricsreceiver/vm_metrics_collector.go | 10 +-- .../vmmetricsreceiver/vm_metrics_constants.go | 4 +- receiver/zipkinreceiver/proto_parse_test.go | 12 ++-- receiver/zipkinreceiver/trace_receiver.go | 30 ++++----- .../zipkinreceiver/trace_receiver_test.go | 18 ++--- .../zipkinscribereceiver/scribe_receiver.go | 10 +-- .../scribe_receiver_test.go | 12 ++-- tools/tools.go | 2 +- translator/trace/big_endian_converter.go | 2 +- translator/trace/big_endian_converter_test.go | 2 +- translator/trace/jaeger/constants.go | 2 +- .../trace/jaeger/jaegerthrift_to_protospan.go | 12 ++-- .../jaeger/jaegerthrift_to_protospan_test.go | 10 +-- .../trace/jaeger/protospan_to_jaegerproto.go | 18 ++--- .../jaeger/protospan_to_jaegerproto_test.go | 12 ++-- .../trace/jaeger/protospan_to_jaegerthrift.go | 18 ++--- .../jaeger/protospan_to_jaegerthrift_test.go | 12 ++-- translator/trace/protospan_translation.go | 2 +- .../trace/spandata/protospan_to_spandata.go | 12 ++-- .../spandata/protospan_to_spandata_test.go | 6 +- .../zipkin/zipkinv1_thrift_to_protospan.go | 10 +-- .../zipkinv1_thrift_to_protospan_test.go | 2 +- .../trace/zipkin/zipkinv1_to_protospan.go | 10 +-- .../zipkin/zipkinv1_to_protospan_test.go | 10 +-- unisvc/service.go | 4 +- 213 files changed, 862 insertions(+), 862 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8ce1d02b3c..01bf5b178fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go -go_import_path: github.com/census-instrumentation/opencensus-service +go_import_path: github.com/open-telemetry/opentelemetry-service go: - 1.12.x diff --git a/cmd/ocagent/main.go b/cmd/ocagent/main.go index f4340ad2a5c..f9d58783523 100644 --- a/cmd/ocagent/main.go +++ b/cmd/ocagent/main.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Program ocagent collects OpenCensus stats and traces +// Program ocagent collects OpenTelemetry stats and traces // to export to a configured backend. package main @@ -30,25 +30,25 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/config" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" - "github.com/census-instrumentation/opencensus-service/internal/pprofserver" - "github.com/census-instrumentation/opencensus-service/internal/version" - "github.com/census-instrumentation/opencensus-service/internal/zpagesserver" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/processor/multiconsumer" - "github.com/census-instrumentation/opencensus-service/receiver/jaegerreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/prometheusreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/vmmetricsreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver/zipkinscribereceiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/config" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" + "github.com/open-telemetry/opentelemetry-service/internal/pprofserver" + "github.com/open-telemetry/opentelemetry-service/internal/version" + "github.com/open-telemetry/opentelemetry-service/internal/zpagesserver" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" + "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-service/receiver/zipkinreceiver/zipkinscribereceiver" ) var rootCmd = &cobra.Command{ Use: "ocagent", - Short: "ocagent runs the OpenCensus service", + Short: "ocagent runs the OpenTelemetry service", Run: func(cmd *cobra.Command, args []string) { runOCAgent() }, @@ -207,7 +207,7 @@ func runOCAgent() { func runOCReceiver(logger *zap.Logger, acfg *config.Config, tc consumer.TraceConsumer, mc consumer.MetricsConsumer, asyncErrorChan chan<- error) (doneFn func() error, err error) { tlsCredsOption, hasTLSCreds, err := acfg.OpenCensusReceiverTLSCredentialsServerOption() if err != nil { - return nil, fmt.Errorf("OpenCensus receiver TLS Credentials: %v", err) + return nil, fmt.Errorf("OpenTelemetry receiver TLS Credentials: %v", err) } addr := acfg.OpenCensusReceiverAddress() corsOrigins := acfg.OpenCensusReceiverCorsAllowedOrigins() @@ -218,14 +218,14 @@ func runOCReceiver(logger *zap.Logger, acfg *config.Config, tc consumer.TraceCon opencensusreceiver.WithCorsOrigins(corsOrigins)) if err != nil { - return nil, fmt.Errorf("failed to create the OpenCensus receiver on address %q: error %v", addr, err) + return nil, fmt.Errorf("failed to create the OpenTelemetry receiver on address %q: error %v", addr, err) } if err := view.Register(observability.AllViews...); err != nil { return nil, fmt.Errorf("failed to register internal.AllViews: %v", err) } // Temporarily disabling the grpc metrics since they do not provide good data at this moment, - // See https://github.com/census-instrumentation/opencensus-service/issues/287 + // See https://github.com/open-telemetry/opentelemetry-service/issues/287 // if err := view.Register(ocgrpc.DefaultServerViews...); err != nil { // return nil, fmt.Errorf("Failed to register ocgrpc.DefaultServerViews: %v", err) // } @@ -237,24 +237,24 @@ func runOCReceiver(logger *zap.Logger, acfg *config.Config, tc consumer.TraceCon if err := ocr.Start(ctx); err != nil { return nil, fmt.Errorf("failed to start Trace and Metrics Receivers: %v", err) } - log.Printf("Running OpenCensus Trace and Metrics receivers as a gRPC service at %q", addr) + log.Printf("Running OpenTelemetry Trace and Metrics receivers as a gRPC service at %q", addr) case acfg.CanRunOpenCensusTraceReceiver(): if err := ocr.StartTraceReception(ctx, asyncErrorChan); err != nil { return nil, fmt.Errorf("failed to start TraceReceiver: %v", err) } - log.Printf("Running OpenCensus Trace receiver as a gRPC service at %q", addr) + log.Printf("Running OpenTelemetry Trace receiver as a gRPC service at %q", addr) case acfg.CanRunOpenCensusMetricsReceiver(): if err := ocr.StartMetricsReception(ctx, asyncErrorChan); err != nil { return nil, fmt.Errorf("failed to start MetricsReceiver: %v", err) } - log.Printf("Running OpenCensus Metrics receiver as a gRPC service at %q", addr) + log.Printf("Running OpenTelemetry Metrics receiver as a gRPC service at %q", addr) } if hasTLSCreds { tlsCreds := acfg.OpenCensusReceiverTLSServerCredentials() - logger.Info("OpenCensus receiver with TLS Credentials", + logger.Info("OpenTelemetry receiver with TLS Credentials", zap.String("cert_file", tlsCreds.CertFile), zap.String("key_file", tlsCreds.KeyFile)) } diff --git a/cmd/occollector/app/builder/builder.go b/cmd/occollector/app/builder/builder.go index bafb40997de..10553bfd240 100644 --- a/cmd/occollector/app/builder/builder.go +++ b/cmd/occollector/app/builder/builder.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/census-instrumentation/opencensus-service/internal/config" + "github.com/open-telemetry/opentelemetry-service/internal/config" "github.com/spf13/viper" ) @@ -47,7 +47,7 @@ func Flags(flags *flag.FlagSet) { flags.Bool(jaegerReceiverFlg, false, fmt.Sprintf("Flag to run the Jaeger receiver (i.e.: Jaeger Collector), default settings: %+v", *NewDefaultJaegerReceiverCfg())) flags.Bool(ocReceiverFlg, true, - fmt.Sprintf("Flag to run the OpenCensus trace receiver, default settings: %+v", *NewDefaultOpenCensusReceiverCfg())) + fmt.Sprintf("Flag to run the OpenTelemetry trace receiver, default settings: %+v", *NewDefaultOpenCensusReceiverCfg())) flags.Bool(zipkinReceiverFlg, false, fmt.Sprintf("Flag to run the Zipkin receiver, default settings: %+v", *NewDefaultZipkinReceiverCfg())) flags.Bool(zipkinScribeReceiverFlg, false, @@ -100,7 +100,7 @@ func (cfg *JaegerReceiverCfg) InitFromViper(v *viper.Viper) (*JaegerReceiverCfg, return cfg, initFromViper(cfg, v, receiversRoot, jaegerEntry) } -// OpenCensusReceiverCfg holds configuration for OpenCensus receiver. +// OpenCensusReceiverCfg holds configuration for OpenTelemetry receiver. type OpenCensusReceiverCfg struct { // Port is the port that the receiver will use Port int `mapstructure:"port"` @@ -140,7 +140,7 @@ type keepaliveEnforcementPolicy struct { PermitWithoutStream bool `mapstructure:"permit-without-stream,omitempty"` } -// OpenCensusReceiverEnabled checks if the OpenCensus receiver is enabled, via a command-line flag, environment +// OpenCensusReceiverEnabled checks if the OpenTelemetry receiver is enabled, via a command-line flag, environment // variable, or configuration file. func OpenCensusReceiverEnabled(v *viper.Viper) bool { return featureEnabled(v, ocReceiverFlg, receiversRoot, opencensusEntry) diff --git a/cmd/occollector/app/builder/builder_test.go b/cmd/occollector/app/builder/builder_test.go index 31e1ba26d73..a170f1be3cd 100644 --- a/cmd/occollector/app/builder/builder_test.go +++ b/cmd/occollector/app/builder/builder_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -47,9 +47,9 @@ func TestReceiversEnabledByPresenceWithDefaultSettings(t *testing.T) { woc := NewDefaultOpenCensusReceiverCfg() goc, err := woc.InitFromViper(v) if err != nil { - t.Errorf("Failed to InitFromViper for OpenCensus receiver: %v", err) + t.Errorf("Failed to InitFromViper for OpenTelemetry receiver: %v", err) } else if !reflect.DeepEqual(woc, goc) { - t.Errorf("Incorrect config for OpenCensus receiver, want %v got %v", woc, goc) + t.Errorf("Incorrect config for OpenTelemetry receiver, want %v got %v", woc, goc) } wz := NewDefaultZipkinReceiverCfg() diff --git a/cmd/occollector/app/builder/doc.go b/cmd/occollector/app/builder/doc.go index 1f0d88694ce..4628ce47e95 100644 --- a/cmd/occollector/app/builder/doc.go +++ b/cmd/occollector/app/builder/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package builder handles the options to build the OpenCensus collector +// Package builder handles the options to build the OpenTelemetry collector // pipeline. package builder diff --git a/cmd/occollector/app/builder/exporters_builder.go b/cmd/occollector/app/builder/exporters_builder.go index a94824d8ac8..ee7d65b7e36 100644 --- a/cmd/occollector/app/builder/exporters_builder.go +++ b/cmd/occollector/app/builder/exporters_builder.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ import ( "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) // builtExporter is an exporter that is built based on a config. It can have diff --git a/cmd/occollector/app/builder/exporters_builder_test.go b/cmd/occollector/app/builder/exporters_builder_test.go index c87c9595828..d4528aac831 100644 --- a/cmd/occollector/app/builder/exporters_builder_test.go +++ b/cmd/occollector/app/builder/exporters_builder_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/exporter/opencensusexporter" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) func TestExportersBuilder_Build(t *testing.T) { diff --git a/cmd/occollector/app/builder/pipelines_builder.go b/cmd/occollector/app/builder/pipelines_builder.go index dda51138d55..7245daf2ba1 100644 --- a/cmd/occollector/app/builder/pipelines_builder.go +++ b/cmd/occollector/app/builder/pipelines_builder.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,10 +19,10 @@ import ( "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/processor/multiconsumer" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" ) // builtProcessor is a processor that is built based on a config. diff --git a/cmd/occollector/app/builder/pipelines_builder_test.go b/cmd/occollector/app/builder/pipelines_builder_test.go index 646cb380d9d..9dddd116ddc 100644 --- a/cmd/occollector/app/builder/pipelines_builder_test.go +++ b/cmd/occollector/app/builder/pipelines_builder_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor" ) // Ensure attributes processor is registered. diff --git a/cmd/occollector/app/builder/processor_builder.go b/cmd/occollector/app/builder/processor_builder.go index f7c4275b2d5..839c1192736 100644 --- a/cmd/occollector/app/builder/processor_builder.go +++ b/cmd/occollector/app/builder/processor_builder.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor" ) // SenderType indicates the type of sender diff --git a/cmd/occollector/app/builder/processor_builder_test.go b/cmd/occollector/app/builder/processor_builder_test.go index 9b2efd30195..2a9e753100b 100644 --- a/cmd/occollector/app/builder/processor_builder_test.go +++ b/cmd/occollector/app/builder/processor_builder_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor" ) func TestGlobalProcessorCfg_InitFromViper(t *testing.T) { diff --git a/cmd/occollector/app/builder/sampling_builder.go b/cmd/occollector/app/builder/sampling_builder.go index 8ee724d93ec..df33de9a156 100644 --- a/cmd/occollector/app/builder/sampling_builder.go +++ b/cmd/occollector/app/builder/sampling_builder.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmd/occollector/app/collector/collector.go b/cmd/occollector/app/collector/collector.go index 78bf9927b86..7ccabc339c4 100644 --- a/cmd/occollector/app/collector/collector.go +++ b/cmd/occollector/app/collector/collector.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -28,13 +28,13 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/internal/pprofserver" - "github.com/census-instrumentation/opencensus-service/internal/zpagesserver" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/internal/pprofserver" + "github.com/open-telemetry/opentelemetry-service/internal/zpagesserver" + "github.com/open-telemetry/opentelemetry-service/receiver" ) var ( @@ -203,7 +203,7 @@ func (app *Application) execute() { func (app *Application) Start() error { rootCmd := &cobra.Command{ Use: "occollector", - Long: "OpenCensus Collector", + Long: "OpenTelemetry Collector", Run: func(cmd *cobra.Command, args []string) { app.init() app.execute() diff --git a/cmd/occollector/app/collector/collector_test.go b/cmd/occollector/app/collector/collector_test.go index 9df2c7f278d..57899eaf225 100644 --- a/cmd/occollector/app/collector/collector_test.go +++ b/cmd/occollector/app/collector/collector_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,9 +20,9 @@ import ( "net/http" "testing" - "github.com/census-instrumentation/opencensus-service/internal/testutils" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" - "github.com/census-instrumentation/opencensus-service/internal/zpagesserver" + "github.com/open-telemetry/opentelemetry-service/internal/zpagesserver" ) func TestApplication_Start(t *testing.T) { diff --git a/cmd/occollector/app/collector/healthcheck.go b/cmd/occollector/app/collector/healthcheck.go index 3c2b81a0437..5b77fde0bc4 100644 --- a/cmd/occollector/app/collector/healthcheck.go +++ b/cmd/occollector/app/collector/healthcheck.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmd/occollector/app/collector/logger.go b/cmd/occollector/app/collector/logger.go index 7a93c3b9ccd..ae1ee93a192 100644 --- a/cmd/occollector/app/collector/logger.go +++ b/cmd/occollector/app/collector/logger.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmd/occollector/app/collector/processors.go b/cmd/occollector/app/collector/processors.go index 6e7657d71c7..dc120b9a2e1 100644 --- a/cmd/occollector/app/collector/processors.go +++ b/cmd/occollector/app/collector/processors.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,18 +23,18 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/sender" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/loggingexporter" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/queued" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/tailsampling" - "github.com/census-instrumentation/opencensus-service/internal/collector/sampling" - "github.com/census-instrumentation/opencensus-service/internal/config" - "github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor" - "github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor" - "github.com/census-instrumentation/opencensus-service/processor/multiconsumer" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/sender" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/queued" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/tailsampling" + "github.com/open-telemetry/opentelemetry-service/internal/collector/sampling" + "github.com/open-telemetry/opentelemetry-service/internal/config" + "github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" ) func createExporters(v *viper.Viper, logger *zap.Logger) ([]func(), []consumer.TraceConsumer, []consumer.MetricsConsumer) { diff --git a/cmd/occollector/app/collector/processors_test.go b/cmd/occollector/app/collector/processors_test.go index c5cf2a2bf1a..3c9493b6da5 100644 --- a/cmd/occollector/app/collector/processors_test.go +++ b/cmd/occollector/app/collector/processors_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/processor/addattributesprocessor" - "github.com/census-instrumentation/opencensus-service/processor/attributekeyprocessor" - "github.com/census-instrumentation/opencensus-service/processor/multiconsumer" - "github.com/census-instrumentation/opencensus-service/processor/processortest" + "github.com/open-telemetry/opentelemetry-service/processor/addattributesprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/attributekeyprocessor" + "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" + "github.com/open-telemetry/opentelemetry-service/processor/processortest" ) func Test_startProcessor(t *testing.T) { diff --git a/cmd/occollector/app/collector/receivers.go b/cmd/occollector/app/collector/receivers.go index 68aa34f1692..5d180710eb1 100644 --- a/cmd/occollector/app/collector/receivers.go +++ b/cmd/occollector/app/collector/receivers.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,13 +21,13 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - jaegerreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/jaeger" - ocreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/opencensus" - zipkinreceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin" - zipkinscribereceiver "github.com/census-instrumentation/opencensus-service/internal/collector/zipkin/scribe" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + jaegerreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/jaeger" + ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opencensus" + zipkinreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin" + zipkinscribereceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin/scribe" + "github.com/open-telemetry/opentelemetry-service/receiver" ) func createReceivers(v *viper.Viper, logger *zap.Logger, traceConsumers consumer.TraceConsumer, asyncErrorChan chan<- error) []receiver.TraceReceiver { diff --git a/cmd/occollector/app/collector/telemetry.go b/cmd/occollector/app/collector/telemetry.go index 99e7db4aebd..b2cd303d907 100644 --- a/cmd/occollector/app/collector/telemetry.go +++ b/cmd/occollector/app/collector/telemetry.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,12 +25,12 @@ import ( "go.opencensus.io/stats/view" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/queued" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/tailsampling" - "github.com/census-instrumentation/opencensus-service/internal/collector/telemetry" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/queued" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/tailsampling" + "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" + "github.com/open-telemetry/opentelemetry-service/observability" ) const ( @@ -49,7 +49,7 @@ type appTelemetry struct { func telemetryFlags(flags *flag.FlagSet) { flags.String(metricsLevelCfg, "BASIC", "Output level of telemetry metrics (NONE, BASIC, NORMAL, DETAILED)") - // At least until we can use a generic, i.e.: OpenCensus, metrics exporter we default to Prometheus at port 8888, if not otherwise specified. + // At least until we can use a generic, i.e.: OpenTelemetry, metrics exporter we default to Prometheus at port 8888, if not otherwise specified. flags.Uint(metricsPortCfg, 8888, "Port exposing collector telemetry.") } diff --git a/cmd/occollector/app/sender/doc.go b/cmd/occollector/app/sender/doc.go index 5b7ca9dfb9b..960dcd4fd0a 100644 --- a/cmd/occollector/app/sender/doc.go +++ b/cmd/occollector/app/sender/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmd/occollector/app/sender/empty_test.go b/cmd/occollector/app/sender/empty_test.go index c919fab1ec4..1df66e1d46b 100644 --- a/cmd/occollector/app/sender/empty_test.go +++ b/cmd/occollector/app/sender/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go b/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go index c4d223709e2..cdf9fd24e1b 100644 --- a/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go +++ b/cmd/occollector/app/sender/jaeger_proto_grpc_sender.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,9 +22,9 @@ import ( jaegerproto "github.com/jaegertracing/jaeger/proto-gen/api_v2" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - jaegertranslator "github.com/census-instrumentation/opencensus-service/translator/trace/jaeger" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger" ) // JaegerProtoGRPCSender forwards spans encoded in the jaeger proto diff --git a/cmd/occollector/app/sender/jaeger_thrift_http_sender.go b/cmd/occollector/app/sender/jaeger_thrift_http_sender.go index 9fecfac675e..9b30074344f 100644 --- a/cmd/occollector/app/sender/jaeger_thrift_http_sender.go +++ b/cmd/occollector/app/sender/jaeger_thrift_http_sender.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import ( "github.com/apache/thrift/lib/go/thrift" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - jaegertranslator "github.com/census-instrumentation/opencensus-service/translator/trace/jaeger" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger" ) // Default timeout for http request in seconds diff --git a/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go b/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go index 55621e962d2..d5db137a9e6 100644 --- a/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go +++ b/cmd/occollector/app/sender/jaeger_thrift_tchannel_sender.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( reporter "github.com/jaegertracing/jaeger/cmd/agent/app/reporter" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - jaegertranslator "github.com/census-instrumentation/opencensus-service/translator/trace/jaeger" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger" ) // JaegerThriftTChannelSender takes span batches and sends them diff --git a/cmd/occollector/main.go b/cmd/occollector/main.go index 15be4510534..b3f5e77256c 100644 --- a/cmd/occollector/main.go +++ b/cmd/occollector/main.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ package main import ( "log" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/collector" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/collector" ) func main() { diff --git a/cmd/unisvc/main.go b/cmd/unisvc/main.go index b448b1eec80..2544c702cf2 100644 --- a/cmd/unisvc/main.go +++ b/cmd/unisvc/main.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ // and traces and exports to a configured backend. package main -import "github.com/census-instrumentation/opencensus-service/unisvc" +import "github.com/open-telemetry/opentelemetry-service/unisvc" func main() { unisvc.Run() diff --git a/consumer/consumer.go b/consumer/consumer.go index d43b56bf2de..c756a32f3e5 100644 --- a/consumer/consumer.go +++ b/consumer/consumer.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package consumer import ( "context" - "github.com/census-instrumentation/opencensus-service/data" + "github.com/open-telemetry/opentelemetry-service/data" ) // MetricsConsumer is an interface that receives data.MetricsData, process it as needed, and diff --git a/consumer/empty_test.go b/consumer/empty_test.go index e2bc2e669f2..737d39c8610 100644 --- a/consumer/empty_test.go +++ b/consumer/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/data/data.go b/data/data.go index d1d830fe3f0..67e09cdeb72 100644 --- a/data/data.go +++ b/data/data.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,10 +15,10 @@ package data import ( - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" ) // MetricsData is a struct that groups proto metrics with a unique node and a resource. diff --git a/data/empty_test.go b/data/empty_test.go index e544fcacd39..6fe5300a178 100644 --- a/data/empty_test.go +++ b/data/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/demos/trace/README.md b/demos/trace/README.md index 3de24b639c9..21a9e178897 100644 --- a/demos/trace/README.md +++ b/demos/trace/README.md @@ -1,6 +1,6 @@ -# OpenCensus Agent/Collector Demo +# OpenTelemetry Agent/Collector Demo -Typical flow of tracing data with OpenCensus service: tracing data initially received by OC Agent +Typical flow of tracing data with OpenTelemetry 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 tracing backend, in this demo Jaeger and Zipkin. diff --git a/exporter/README.md b/exporter/README.md index fa9675594af..a1e4c27ef41 100644 --- a/exporter/README.md +++ b/exporter/README.md @@ -1,4 +1,4 @@ -A variety of exporters are available to the OpenCensus Service (both Agent and Collector) +A variety of exporters are available to the OpenTelemetry Service (both Agent and Collector) ## Collector @@ -51,7 +51,7 @@ sampling: ### Queued Exporters -In addition to the normal `exporters`, the OpenCensus Collector supports a special configuration. +In addition to the normal `exporters`, the OpenTelemetry Collector supports a special configuration. `queued-exporters` offer bounded buffer retry logic for multiple destinations. ```yaml diff --git a/exporter/awsexporter/aws_xray.go b/exporter/awsexporter/aws_xray.go index 68de1b6c18c..4af229420fa 100644 --- a/exporter/awsexporter/aws_xray.go +++ b/exporter/awsexporter/aws_xray.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exporterhelper" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) const defaultVersionForAWSXRayApplications = "latest" @@ -49,7 +49,7 @@ type awsXRayConfig struct { type awsXRayExporter struct { mu sync.RWMutex - // exportersByServiceName shards AWS X-Ray OpenCensus-Go + // exportersByServiceName shards AWS X-Ray OpenTelemetry-Go // Trace exporters by serviceName that's derived // from each Node of spans that this exporter receives. exportersByServiceName map[string]*xray.Exporter @@ -153,7 +153,7 @@ func transformConfigToXRayOptions(axrCfg *awsXRayConfig) (xopts []xray.Option, e return xopts, nil } -// ExportSpans is the method that translates OpenCensus-Proto Traces into AWS X-Ray spans. +// ExportSpans is the method that translates OpenTelemetry-Proto Traces into AWS X-Ray spans. // It uniquely maintains func (axe *awsXRayExporter) PushTraceData(ctx context.Context, td data.TraceData) (int, error) { serviceName := td.Node.GetServiceInfo().GetName() diff --git a/exporter/awsexporter/aws_xray_test.go b/exporter/awsexporter/aws_xray_test.go index eebd75886c6..124e5dc2d07 100644 --- a/exporter/awsexporter/aws_xray_test.go +++ b/exporter/awsexporter/aws_xray_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/datadogexporter/datadog.go b/exporter/datadogexporter/datadog.go index e2c20ea85b8..78e53615adf 100644 --- a/exporter/datadogexporter/datadog.go +++ b/exporter/datadogexporter/datadog.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import ( datadog "github.com/DataDog/opencensus-go-exporter-datadog" "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) type datadogConfig struct { diff --git a/exporter/datadogexporter/datadog_test.go b/exporter/datadogexporter/datadog_test.go index c2bcc2f1100..7d4d53bb318 100644 --- a/exporter/datadogexporter/datadog_test.go +++ b/exporter/datadogexporter/datadog_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/empty_test.go b/exporter/empty_test.go index bcf9d5812b0..845ebc215fd 100644 --- a/exporter/empty_test.go +++ b/exporter/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/exporter.go b/exporter/exporter.go index 9f8c83c38fc..fe3f7014032 100644 --- a/exporter/exporter.go +++ b/exporter/exporter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package exporter import ( - "github.com/census-instrumentation/opencensus-service/consumer" + "github.com/open-telemetry/opentelemetry-service/consumer" ) // TraceExporter composes TraceConsumer with some additional exporter-specific functions. diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index c6225d9f0c4..db503e655fa 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index ad9995234bb..bd302b3a150 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/exporterhelper/constants.go b/exporter/exporterhelper/constants.go index a146a625e50..f4946586f04 100644 --- a/exporter/exporterhelper/constants.go +++ b/exporter/exporterhelper/constants.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/exporterhelper/metricshelper.go b/exporter/exporterhelper/metricshelper.go index e1e051747c3..485d6ab2733 100644 --- a/exporter/exporterhelper/metricshelper.go +++ b/exporter/exporterhelper/metricshelper.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package exporterhelper import ( "context" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/observability" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" ) // PushMetricsData is a helper function that is similar to ConsumeMetricsData but also returns diff --git a/exporter/exporterhelper/metricshelper_test.go b/exporter/exporterhelper/metricshelper_test.go index 064b2cf297f..8fff8e15cf8 100644 --- a/exporter/exporterhelper/metricshelper_test.go +++ b/exporter/exporterhelper/metricshelper_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,11 +18,11 @@ import ( "errors" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" ) func TestMetricsExporter_InvalidName(t *testing.T) { diff --git a/exporter/exporterhelper/tracehelper.go b/exporter/exporterhelper/tracehelper.go index 9b7951d2423..d61ca13f005 100644 --- a/exporter/exporterhelper/tracehelper.go +++ b/exporter/exporterhelper/tracehelper.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import ( "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" + "github.com/open-telemetry/opentelemetry-service/observability" ) // PushTraceData is a helper function that is similar to ConsumeTraceData but also returns diff --git a/exporter/exporterhelper/tracehelper_test.go b/exporter/exporterhelper/tracehelper_test.go index 514b587bab8..c61441813b8 100644 --- a/exporter/exporterhelper/tracehelper_test.go +++ b/exporter/exporterhelper/tracehelper_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ import ( "sync" "testing" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/observability/observabilitytest" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/observability/observabilitytest" ) const ( diff --git a/exporter/exportertest/exportertest.go b/exporter/exportertest/exportertest.go index d9e99cbf2cb..ee34ddf402e 100644 --- a/exporter/exportertest/exportertest.go +++ b/exporter/exportertest/exportertest.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/exportertest/nop_exporter.go b/exporter/exportertest/nop_exporter.go index 1a3cf855477..4d3f48265dc 100644 --- a/exporter/exportertest/nop_exporter.go +++ b/exporter/exportertest/nop_exporter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package exportertest import ( "context" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" ) // NopExporterOption represents options that can be applied to a NopExporter. diff --git a/exporter/exportertest/nop_exporter_test.go b/exporter/exportertest/nop_exporter_test.go index bc5af3039cb..4bd1783e32a 100644 --- a/exporter/exportertest/nop_exporter_test.go +++ b/exporter/exportertest/nop_exporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ import ( "errors" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" ) func TestNopTraceExporter_NoErrors(t *testing.T) { diff --git a/exporter/exportertest/sink_exporter.go b/exporter/exportertest/sink_exporter.go index d3cd5a7299f..a2e32665eaa 100644 --- a/exporter/exportertest/sink_exporter.go +++ b/exporter/exportertest/sink_exporter.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,8 +18,8 @@ import ( "context" "sync" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" ) // SinkTraceExporter acts as a trace receiver for use in tests. diff --git a/exporter/exportertest/sink_exporter_test.go b/exporter/exportertest/sink_exporter_test.go index d1bf9376218..a6e7d91ca1e 100644 --- a/exporter/exportertest/sink_exporter_test.go +++ b/exporter/exportertest/sink_exporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ import ( "reflect" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" ) func TestSinkTraceExporter(t *testing.T) { diff --git a/exporter/exporterwrapper/exporterwrapper.go b/exporter/exporterwrapper/exporterwrapper.go index e80837ba628..11834daa831 100644 --- a/exporter/exporterwrapper/exporterwrapper.go +++ b/exporter/exporterwrapper/exporterwrapper.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ // Package exporterwrapper provides support for wrapping OC go library trace.Exporter into a // consumer.TraceConsumer. -// For now it currently only provides statically imported OpenCensus +// For now it currently only provides statically imported OpenTelemetry // exporters like: // * Stackdriver Tracing and Monitoring // * DataDog @@ -26,22 +26,22 @@ import ( "go.opencensus.io/trace" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" - "github.com/census-instrumentation/opencensus-service/exporter/exporterhelper" - "github.com/census-instrumentation/opencensus-service/internal" - spandatatranslator "github.com/census-instrumentation/opencensus-service/translator/trace/spandata" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" + "github.com/open-telemetry/opentelemetry-service/internal" + spandatatranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/spandata" ) -// NewExporterWrapper returns a consumer.TraceConsumer that converts OpenCensus Proto TraceData -// to OpenCensus-Go SpanData and calls into the given trace.Exporter. +// NewExporterWrapper returns a consumer.TraceConsumer that converts OpenTelemetry Proto TraceData +// to OpenTelemetry-Go SpanData and calls into the given trace.Exporter. // // This is a bootstrapping mechanism for us to re-use as many of -// the OpenCensus-Go trace.SpanData exporters which were written +// the OpenTelemetry-Go trace.SpanData exporters which were written // by various vendors and contributors. Eventually the goal is to // get those exporters converted to directly receive -// OpenCensus Proto TraceData. +// OpenTelemetry Proto TraceData. func NewExporterWrapper(exporterName string, spanName string, ocExporter trace.Exporter) (exporter.TraceExporter, error) { return exporterhelper.NewTraceExporter( exporterName, diff --git a/exporter/exporterwrapper/exporterwrapper_test.go b/exporter/exporterwrapper/exporterwrapper_test.go index a5b2af65d14..5638cb5a82c 100644 --- a/exporter/exporterwrapper/exporterwrapper_test.go +++ b/exporter/exporterwrapper/exporterwrapper_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/factory.go b/exporter/factory.go index 3dc503497da..8338e69d295 100644 --- a/exporter/factory.go +++ b/exporter/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go index 9cdcc7911c0..6ab23eeb28c 100644 --- a/exporter/honeycombexporter/honeycomb.go +++ b/exporter/honeycombexporter/honeycomb.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,14 +15,14 @@ package honeycombexporter // TODO: (@odeke-em) file an issue at the official Honeycomb repository to -// ask them to make an exporter that uses OpenCensus-Proto instead of OpenCensus-Go. +// ask them to make an exporter that uses OpenTelemetry-Proto instead of OpenTelemetry-Go. import ( "github.com/honeycombio/opencensus-exporter/honeycomb" "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) type honeycombConfig struct { diff --git a/exporter/honeycombexporter/honeycombexporter_test.go b/exporter/honeycombexporter/honeycombexporter_test.go index a5f807e37d9..400f453864a 100644 --- a/exporter/honeycombexporter/honeycombexporter_test.go +++ b/exporter/honeycombexporter/honeycombexporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/jaegerexporter/jaeger.go b/exporter/jaegerexporter/jaeger.go index 27e050403e1..80269dfdbb5 100644 --- a/exporter/jaegerexporter/jaeger.go +++ b/exporter/jaegerexporter/jaeger.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import ( "contrib.go.opencensus.io/exporter/jaeger" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) // Slight modified version of go/src/contrib.go.opencensus.io/exporter/jaeger/jaeger.go diff --git a/exporter/jaegerexporter/jaegerexporter_test.go b/exporter/jaegerexporter/jaegerexporter_test.go index 35fba844f6e..b745b4b6f0d 100644 --- a/exporter/jaegerexporter/jaegerexporter_test.go +++ b/exporter/jaegerexporter/jaegerexporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/kafkaexporter/kafka.go b/exporter/kafkaexporter/kafka.go index 3d9aef4d87e..d6ef7a79e46 100644 --- a/exporter/kafkaexporter/kafka.go +++ b/exporter/kafkaexporter/kafka.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "github.com/spf13/viper" kafka "github.com/yancl/opencensus-go-exporter-kafka" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) type kafkaConfig struct { diff --git a/exporter/kafkaexporter/kafkaexporter_test.go b/exporter/kafkaexporter/kafkaexporter_test.go index 61b862591b8..793a31f027b 100644 --- a/exporter/kafkaexporter/kafkaexporter_test.go +++ b/exporter/kafkaexporter/kafkaexporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/loggingexporter/logging_exporter.go b/exporter/loggingexporter/logging_exporter.go index b9e4539c049..fbd73d33dce 100644 --- a/exporter/loggingexporter/logging_exporter.go +++ b/exporter/loggingexporter/logging_exporter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ package loggingexporter import ( "context" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter" - "github.com/census-instrumentation/opencensus-service/exporter/exporterhelper" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" "go.uber.org/zap" ) diff --git a/exporter/loggingexporter/logging_exporter_test.go b/exporter/loggingexporter/logging_exporter_test.go index 3305cb3f168..6f42d715f98 100644 --- a/exporter/loggingexporter/logging_exporter_test.go +++ b/exporter/loggingexporter/logging_exporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ import ( "context" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" "go.uber.org/zap" ) diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index 83200f7abef..db623fb32b7 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ package opencensusexporter import ( "time" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) -// ConfigV2 defines configuration for OpenCensus exporter. +// ConfigV2 defines configuration for OpenTelemetry exporter. type ConfigV2 struct { configmodels.ExporterSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct. Endpoint string `mapstructure:"endpoint"` diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index a40412a190a..04c59509159 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) var _ = configv2.RegisterTestFactories() diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index e1fc9243185..edfb0a5b064 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,12 +24,12 @@ import ( "contrib.go.opencensus.io/exporter/ocagent" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterhelper" - "github.com/census-instrumentation/opencensus-service/internal/compression" - compressiongrpc "github.com/census-instrumentation/opencensus-service/internal/compression/grpc" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" + "github.com/open-telemetry/opentelemetry-service/internal/compression" + compressiongrpc "github.com/open-telemetry/opentelemetry-service/internal/compression/grpc" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) var _ = factories.RegisterExporterFactory(&exporterFactory{}) @@ -39,7 +39,7 @@ const ( typeStr = "opencensus" ) -// exporterFactory is the factory for OpenCensus exporter. +// exporterFactory is the factory for OpenTelemetry exporter. type exporterFactory struct { } @@ -66,7 +66,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con if ocac.Endpoint == "" { return nil, nil, &ocTraceExporterError{ code: errEndpointRequired, - msg: "OpenCensus exporter config requires an Endpoint", + msg: "OpenTelemetry exporter config requires an Endpoint", } } @@ -77,7 +77,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con } else { return nil, nil, &ocTraceExporterError{ code: errUnsupportedCompressionType, - msg: fmt.Sprintf("OpenCensus exporter unsupported compression type %q", ocac.Compression), + msg: fmt.Sprintf("OpenTelemetry exporter unsupported compression type %q", ocac.Compression), } } } @@ -86,7 +86,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con if err != nil { return nil, nil, &ocTraceExporterError{ code: errUnableToGetTLSCreds, - msg: fmt.Sprintf("OpenCensus exporter unable to read TLS credentials from pem file %q: %v", ocac.CertPemFile, err), + msg: fmt.Sprintf("OpenTelemetry exporter unable to read TLS credentials from pem file %q: %v", ocac.CertPemFile, err), } } opts = append(opts, ocagent.WithTLSCredentials(creds)) @@ -96,7 +96,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con return nil, nil, &ocTraceExporterError{ code: errUnableToGetTLSCreds, msg: fmt.Sprintf( - "OpenCensus exporter unable to read certificates from system pool: %v", err), + "OpenTelemetry exporter unable to read certificates from system pool: %v", err), } } creds := credentials.NewClientTLSFromCert(certPool, "") @@ -127,7 +127,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con for exporterIndex := 0; exporterIndex < numWorkers; exporterIndex++ { exporter, serr := ocagent.NewExporter(opts...) if serr != nil { - return nil, nil, fmt.Errorf("cannot configure OpenCensus Trace exporter: %v", serr) + return nil, nil, fmt.Errorf("cannot configure OpenTelemetry Trace exporter: %v", serr) } exportersChan <- exporter } @@ -136,7 +136,7 @@ func (f *exporterFactory) CreateTraceExporter(config configmodels.Exporter) (con oexp, err := exporterhelper.NewTraceExporter( "oc_trace", oce.PushTraceData, - exporterhelper.WithSpanName("ocservice.exporter.OpenCensus.ConsumeTraceData"), + exporterhelper.WithSpanName("ocservice.exporter.OpenTelemetry.ConsumeTraceData"), exporterhelper.WithRecordMetrics(true)) if err != nil { diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 777e49a67a7..960986c9ded 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/compression" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/compression" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index 64067f60fe2..2ded845ec8a 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,18 +22,18 @@ import ( "time" "contrib.go.opencensus.io/exporter/ocagent" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" "github.com/spf13/viper" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exporterhelper" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/internal/compression" - compressiongrpc "github.com/census-instrumentation/opencensus-service/internal/compression/grpc" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/internal/compression" + compressiongrpc "github.com/open-telemetry/opentelemetry-service/internal/compression/grpc" ) // keepaliveConfig exposes the keepalive.ClientParameters to be used by the exporter. @@ -88,15 +88,15 @@ const ( ) // OpenCensusTraceExportersFromViper unmarshals the viper and returns an consumer.TraceConsumer targeting -// OpenCensus Agent/Collector according to the configuration settings. +// OpenTelemetry Agent/Collector according to the configuration settings. func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps []consumer.MetricsConsumer, doneFns []func() error, err error) { var cfg struct { - OpenCensus *opencensusConfig `mapstructure:"opencensus"` + OpenTelemetry *opencensusConfig `mapstructure:"opencensus"` } if err := v.Unmarshal(&cfg); err != nil { return nil, nil, nil, err } - ocac := cfg.OpenCensus + ocac := cfg.OpenTelemetry if ocac == nil { return nil, nil, nil, nil } @@ -104,7 +104,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons if ocac.Endpoint == "" { return nil, nil, nil, &ocTraceExporterError{ code: errEndpointRequired, - msg: "OpenCensus exporter config requires an Endpoint", + msg: "OpenTelemetry exporter config requires an Endpoint", } } @@ -115,7 +115,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons } else { return nil, nil, nil, &ocTraceExporterError{ code: errUnsupportedCompressionType, - msg: fmt.Sprintf("OpenCensus exporter unsupported compression type %q", ocac.Compression), + msg: fmt.Sprintf("OpenTelemetry exporter unsupported compression type %q", ocac.Compression), } } } @@ -124,7 +124,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons if err != nil { return nil, nil, nil, &ocTraceExporterError{ code: errUnableToGetTLSCreds, - msg: fmt.Sprintf("OpenCensus exporter unable to read TLS credentials from pem file %q: %v", ocac.CertPemFile, err), + msg: fmt.Sprintf("OpenTelemetry exporter unable to read TLS credentials from pem file %q: %v", ocac.CertPemFile, err), } } opts = append(opts, ocagent.WithTLSCredentials(creds)) @@ -134,7 +134,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons return nil, nil, nil, &ocTraceExporterError{ code: errUnableToGetTLSCreds, msg: fmt.Sprintf( - "OpenCensus exporter unable to read certificates from system pool: %v", err), + "OpenTelemetry exporter unable to read certificates from system pool: %v", err), } } creds := credentials.NewClientTLSFromCert(certPool, "") @@ -165,7 +165,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons for exporterIndex := 0; exporterIndex < numWorkers; exporterIndex++ { exporter, serr := ocagent.NewExporter(opts...) if serr != nil { - return nil, nil, nil, fmt.Errorf("cannot configure OpenCensus Trace exporter: %v", serr) + return nil, nil, nil, fmt.Errorf("cannot configure OpenTelemetry Trace exporter: %v", serr) } exportersChan <- exporter } @@ -174,7 +174,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons oexp, err := exporterhelper.NewTraceExporter( "oc_trace", oce.PushTraceData, - exporterhelper.WithSpanName("ocservice.exporter.OpenCensus.ConsumeTraceData"), + exporterhelper.WithSpanName("ocservice.exporter.OpenTelemetry.ConsumeTraceData"), exporterhelper.WithRecordMetrics(true)) if err != nil { @@ -184,7 +184,7 @@ func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCons tps = append(tps, oexp) doneFns = append(doneFns, oce.stop) - // TODO: (@odeke-em, @songya23) implement ExportMetrics for OpenCensus. + // TODO: (@odeke-em, @songya23) implement ExportMetrics for OpenTelemetry. // mps = append(mps, oexp) return } @@ -224,7 +224,7 @@ func (oce *ocagentExporter) PushTraceData(ctx context.Context, td data.TraceData if !ok { err := &ocTraceExporterError{ code: errAlreadyStopped, - msg: fmt.Sprintf("OpenCensus exporter was already stopped."), + msg: fmt.Sprintf("OpenTelemetry exporter was already stopped."), } return len(td.Spans), err } diff --git a/exporter/opencensusexporter/opencensusexporter_test.go b/exporter/opencensusexporter/opencensusexporter_test.go index c5b21b24678..cc829fe60a9 100644 --- a/exporter/opencensusexporter/opencensusexporter_test.go +++ b/exporter/opencensusexporter/opencensusexporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/census-instrumentation/opencensus-service/data" + "github.com/open-telemetry/opentelemetry-service/data" "github.com/google/go-cmp/cmp" "github.com/spf13/viper" ) @@ -38,7 +38,7 @@ func TestOpenCensusTraceExportersFromViper(t *testing.T) { exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { - t.Fatalf("Unexpected error building OpenCensus Exporter") + t.Fatalf("Unexpected error building OpenTelemetry Exporter") } if len(exporters) != 1 { t.Fatalf("Should get 1 exporter but got %d", len(exporters)) @@ -58,7 +58,7 @@ func TestOpenCensusTraceExportersFromViper_TLS(t *testing.T) { v.Set("opencensus.cert-pem-file", "testdata/test_cert.pem") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { - t.Fatalf("Unexpected error building OpenCensus Exporter") + t.Fatalf("Unexpected error building OpenTelemetry Exporter") } if len(exporters) != 1 { t.Fatalf("Should get 1 exporter but got %d", len(exporters)) @@ -77,7 +77,7 @@ func TestOpenCensusTraceExportersFromViper_Compression(t *testing.T) { v.Set("opencensus.compression", "gzip") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { - t.Fatalf("Unexpected error building OpenCensus Exporter") + t.Fatalf("Unexpected error building OpenTelemetry Exporter") } if len(exporters) != 1 { t.Fatalf("Should get 1 exporter but got %d", len(exporters)) diff --git a/exporter/prometheusexporter/prometheus.go b/exporter/prometheusexporter/prometheus.go index 9f2d505f3fb..1b128d7b4c2 100644 --- a/exporter/prometheusexporter/prometheus.go +++ b/exporter/prometheusexporter/prometheus.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,8 +21,8 @@ import ( "net/http" "strings" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" "github.com/spf13/viper" // TODO: once this repository has been transferred to the diff --git a/exporter/prometheusexporter/prometheus_test.go b/exporter/prometheusexporter/prometheus_test.go index 73fb424ef0e..6bebe9d6dd9 100644 --- a/exporter/prometheusexporter/prometheus_test.go +++ b/exporter/prometheusexporter/prometheus_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,9 +23,9 @@ import ( "github.com/golang/protobuf/ptypes/timestamp" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - "github.com/census-instrumentation/opencensus-service/data" - viperutils "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + "github.com/open-telemetry/opentelemetry-service/data" + viperutils "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" ) func TestPrometheusExporter(t *testing.T) { diff --git a/exporter/stackdriverexporter/stackdriver.go b/exporter/stackdriverexporter/stackdriver.go index c947f489091..b4df4dec169 100644 --- a/exporter/stackdriverexporter/stackdriver.go +++ b/exporter/stackdriverexporter/stackdriver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,9 +24,9 @@ import ( "github.com/spf13/viper" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) type stackdriverConfig struct { diff --git a/exporter/stackdriverexporter/stackdriverexporter_test.go b/exporter/stackdriverexporter/stackdriverexporter_test.go index 499970dfb66..fef0b3694a0 100644 --- a/exporter/stackdriverexporter/stackdriverexporter_test.go +++ b/exporter/stackdriverexporter/stackdriverexporter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/wavefrontexporter/wavefront.go b/exporter/wavefrontexporter/wavefront.go index d47d25bf08d..433edf82980 100644 --- a/exporter/wavefrontexporter/wavefront.go +++ b/exporter/wavefrontexporter/wavefront.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,8 +22,8 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exporterwrapper" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) type wavefrontConfig struct { diff --git a/exporter/wavefrontexporter/wavefront_test.go b/exporter/wavefrontexporter/wavefront_test.go index 31d16b92da6..c111cb44572 100644 --- a/exporter/wavefrontexporter/wavefront_test.go +++ b/exporter/wavefrontexporter/wavefront_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index aaf8aa2e103..fe438a57593 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import ( "sync" "time" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinreporter "github.com/openzipkin/zipkin-go/reporter" @@ -30,11 +30,11 @@ import ( "github.com/spf13/viper" "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/observability" - spandatatranslator "github.com/census-instrumentation/opencensus-service/translator/trace/spandata" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/observability" + spandatatranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/spandata" ) // ZipkinConfig holds the configuration of a Zipkin exporter. @@ -45,11 +45,11 @@ type ZipkinConfig struct { UploadPeriod *time.Duration `mapstructure:"upload_period,omitempty"` } -// zipkinExporter is a multiplexing exporter that spawns a new OpenCensus-Go Zipkin +// zipkinExporter is a multiplexing exporter that spawns a new OpenTelemetry-Go Zipkin // exporter per unique node encountered. This is because serviceNames per node define // unique services, alongside their IPs. Also it is useful to receive traffic from // Zipkin servers and then transform them back to the final form when creating an -// OpenCensus spandata. +// OpenTelemetry spandata. type zipkinExporter struct { // mu protects the fields below mu sync.Mutex @@ -228,16 +228,16 @@ func (ze *zipkinExporter) ConsumeTraceData(ctx context.Context, td data.TraceDat } // This code from down below is mostly copied from -// https://github.com/census-instrumentation/opencensus-go/blob/96e75b88df843315da521168a0e3b11792088728/exporter/zipkin/zipkin.go#L57-L194 +// https://github.com/open-telemetry/opentelemetry-go/blob/96e75b88df843315da521168a0e3b11792088728/exporter/zipkin/zipkin.go#L57-L194 // but that is because the Zipkin Go exporter requires process to change // and was designed without taking into account that LocalEndpoint and RemoteEndpoint // are per-span-Node attributes instead of global/system variables. // The alternative is to create a single exporter for every single combination // but this wastes resources i.e. an HTTP client for every single combination // but also requires the exporter to be changed entirely as per -// https://github.com/census-instrumentation/opencensus-go/issues/959 +// https://github.com/open-telemetry/opentelemetry-go/issues/959 // -// TODO: (@odeke-em) whenever we come to consensus with the OpenCensus-Go repository +// TODO: (@odeke-em) whenever we come to consensus with the OpenTelemetry-Go repository // on the Zipkin exporter and they have the same logic, then delete all the code // below here to allow per-span configuration changes. diff --git a/exporter/zipkinexporter/zipkin_test.go b/exporter/zipkinexporter/zipkin_test.go index 07eb2ecb6cc..73677f23b8d 100644 --- a/exporter/zipkinexporter/zipkin_test.go +++ b/exporter/zipkinexporter/zipkin_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -28,14 +28,14 @@ import ( "strings" "testing" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinreporter "github.com/openzipkin/zipkin-go/reporter" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" - "github.com/census-instrumentation/opencensus-service/internal/testutils" - "github.com/census-instrumentation/opencensus-service/processor/multiconsumer" - "github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" + "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" + "github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver" ) func TestZipkinEndpointFromNode(t *testing.T) { diff --git a/go.mod b/go.mod index 715605c3dd5..a9e1599c076 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/census-instrumentation/opencensus-service +module github.com/open-telemetry/opentelemetry-service require ( contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 @@ -12,7 +12,7 @@ require ( github.com/VividCortex/gohistogram v1.0.0 // indirect github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect - github.com/census-instrumentation/opencensus-proto v0.2.0 + github.com/open-telemetry/opentelemetry-proto v0.2.0 github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect github.com/facebookgo/limitgroup v0.0.0-20150612190941-6abd8d71ec01 // indirect github.com/facebookgo/muster v0.0.0-20150708232844-fd3d7953fd52 // indirect diff --git a/go.sum b/go.sum index 0b1f93bfb90..456ff2b5bf1 100644 --- a/go.sum +++ b/go.sum @@ -63,9 +63,9 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D github.com/caio/go-tdigest v2.3.0+incompatible h1:zP6nR0nTSUzlSqqr7F/LhslPlSZX/fZeGmgmwj2cxxY= github.com/caio/go-tdigest v2.3.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/cenk/backoff v2.0.0+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE= -github.com/census-instrumentation/opencensus-proto v0.0.2/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= -github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/open-telemetry/opentelemetry-proto v0.0.2/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/open-telemetry/opentelemetry-proto v0.2.0 h1:LzQXZOgg4CQfE6bFvXGM30YZL1WW/M337pXml+GrcZ4= +github.com/open-telemetry/opentelemetry-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2/go.mod h1:GJKEexRPVJrBSOjoqN5VNOIKJ5Q3RViH6eu3puDRwx4= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= diff --git a/internal/collector/jaeger/receiver.go b/internal/collector/jaeger/receiver.go index 7b99edfe5ea..7c62b421c84 100644 --- a/internal/collector/jaeger/receiver.go +++ b/internal/collector/jaeger/receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -28,10 +28,10 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" - "github.com/census-instrumentation/opencensus-service/receiver/jaegerreceiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" + "github.com/open-telemetry/opentelemetry-service/receiver/jaegerreceiver" ) // Start starts the Jaeger receiver endpoint. diff --git a/internal/collector/opencensus/receiver.go b/internal/collector/opencensus/receiver.go index d93930eebeb..d464e8373d7 100644 --- a/internal/collector/opencensus/receiver.go +++ b/internal/collector/opencensus/receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ // limitations under the License. // Package ocreceiver wraps the functionality to start the end-point that -// receives data directly in the OpenCensus format. +// receives data directly in the OpenTelemetry format. package ocreceiver import ( @@ -26,13 +26,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" ) -// Start starts the OpenCensus receiver endpoint. +// Start starts the OpenTelemetry receiver endpoint. func Start(logger *zap.Logger, v *viper.Viper, traceConsumer consumer.TraceConsumer, asyncErrorChan chan<- error) (receiver.TraceReceiver, error) { addr, opts, zapFields, err := receiverOptions(v) if err != nil { @@ -41,14 +41,14 @@ func Start(logger *zap.Logger, v *viper.Viper, traceConsumer consumer.TraceConsu ocr, err := opencensusreceiver.New(addr, traceConsumer, nil, opts...) if err != nil { - return nil, fmt.Errorf("Failed to create the OpenCensus trace receiver: %v", err) + return nil, fmt.Errorf("Failed to create the OpenTelemetry trace receiver: %v", err) } if err := ocr.StartTraceReception(context.Background(), asyncErrorChan); err != nil { return nil, fmt.Errorf("Cannot bind Opencensus receiver to address %q: %v", addr, err) } - logger.Info("OpenCensus receiver is running.", zapFields...) + logger.Info("OpenTelemetry receiver is running.", zapFields...) return ocr, nil } @@ -61,7 +61,7 @@ func receiverOptions(v *viper.Viper) (addr string, opts []opencensusreceiver.Opt tlsCredsOption, hasTLSCreds, err := rOpts.TLSCredentials.ToOpenCensusReceiverServerOption() if err != nil { - return addr, opts, zapFields, fmt.Errorf("OpenCensus receiver TLS Credentials: %v", err) + return addr, opts, zapFields, fmt.Errorf("OpenTelemetry receiver TLS Credentials: %v", err) } if hasTLSCreds { opts = append(opts, tlsCredsOption) diff --git a/internal/collector/opencensus/receiver_test.go b/internal/collector/opencensus/receiver_test.go index b757512c6a4..b86762a120a 100644 --- a/internal/collector/opencensus/receiver_test.go +++ b/internal/collector/opencensus/receiver_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ // limitations under the License. // Package ocreceiver wraps the functionality to start the end-point that -// receives data directly in the OpenCensus format. +// receives data directly in the OpenTelemetry format. package ocreceiver import ( @@ -23,9 +23,9 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/processor/processortest" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/processor/processortest" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" ) func TestStart(t *testing.T) { @@ -93,7 +93,7 @@ func TestStart(t *testing.T) { } if got != nil { // TODO: (@pjanotti) current StopTraceReception, stop the whole receiver. - // See https://github.com/census-instrumentation/opencensus-service/issues/559 + // See https://github.com/open-telemetry/opentelemetry-service/issues/559 got.(*opencensusreceiver.Receiver).Stop() } }) diff --git a/internal/collector/processor/doc.go b/internal/collector/processor/doc.go index 6f24e7e0378..62354770c88 100644 --- a/internal/collector/processor/doc.go +++ b/internal/collector/processor/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,6 +14,6 @@ // Package processor is the central point on the collector processing: it // aggregates and performs any operation that applies to all traces in the -// pipeline. Traces reach it after being converted to the OpenCensus protobuf +// pipeline. Traces reach it after being converted to the OpenTelemetry protobuf // format. package processor diff --git a/internal/collector/processor/empty_test.go b/internal/collector/processor/empty_test.go index 8f7baa84a2e..dc0263928fb 100644 --- a/internal/collector/processor/empty_test.go +++ b/internal/collector/processor/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/collector/processor/idbatcher/id_batcher.go b/internal/collector/processor/idbatcher/id_batcher.go index c71538c6428..77514f794c8 100644 --- a/internal/collector/processor/idbatcher/id_batcher.go +++ b/internal/collector/processor/idbatcher/id_batcher.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/collector/processor/idbatcher/id_batcher_test.go b/internal/collector/processor/idbatcher/id_batcher_test.go index d1f66da89ea..218e1c5ed35 100644 --- a/internal/collector/processor/idbatcher/id_batcher_test.go +++ b/internal/collector/processor/idbatcher/id_batcher_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import ( "testing" "time" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" ) func TestBatcherNew(t *testing.T) { diff --git a/internal/collector/processor/metrics.go b/internal/collector/processor/metrics.go index 87d78622b1b..6838e4287f6 100644 --- a/internal/collector/processor/metrics.go +++ b/internal/collector/processor/metrics.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ package processor import ( - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" "go.opencensus.io/stats" "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "github.com/census-instrumentation/opencensus-service/internal/collector/telemetry" + "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) // Keys and stats for telemetry. diff --git a/internal/collector/processor/nodebatcher/metrics.go b/internal/collector/processor/nodebatcher/metrics.go index f02b63010d8..4147b7486f3 100644 --- a/internal/collector/processor/nodebatcher/metrics.go +++ b/internal/collector/processor/nodebatcher/metrics.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,8 +19,8 @@ import ( "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor" - "github.com/census-instrumentation/opencensus-service/internal/collector/telemetry" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" + "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) var ( diff --git a/internal/collector/processor/nodebatcher/node_batcher.go b/internal/collector/processor/nodebatcher/node_batcher.go index 05e857df3a7..136bd545da1 100644 --- a/internal/collector/processor/nodebatcher/node_batcher.go +++ b/internal/collector/processor/nodebatcher/node_batcher.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,17 +22,17 @@ import ( "sync" "time" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/proto" "go.opencensus.io/stats" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" + "github.com/open-telemetry/opentelemetry-service/observability" ) const ( diff --git a/internal/collector/processor/nodebatcher/node_batcher_test.go b/internal/collector/processor/nodebatcher/node_batcher_test.go index b6c790e6a3b..704c33d6570 100644 --- a/internal/collector/processor/nodebatcher/node_batcher_test.go +++ b/internal/collector/processor/nodebatcher/node_batcher_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import ( "testing" "time" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" "go.uber.org/zap" ) diff --git a/internal/collector/processor/nodebatcher/options.go b/internal/collector/processor/nodebatcher/options.go index 91fc18b4ff7..44053583156 100644 --- a/internal/collector/processor/nodebatcher/options.go +++ b/internal/collector/processor/nodebatcher/options.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/collector/processor/queued/options.go b/internal/collector/processor/queued/options.go index 92fb6811803..9507c5bd5cd 100644 --- a/internal/collector/processor/queued/options.go +++ b/internal/collector/processor/queued/options.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher" ) const ( diff --git a/internal/collector/processor/queued/queued_processor.go b/internal/collector/processor/queued/queued_processor.go index e3bf35f8bbd..288ed686a42 100644 --- a/internal/collector/processor/queued/queued_processor.go +++ b/internal/collector/processor/queued/queued_processor.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import ( "go.opencensus.io/tag" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/nodebatcher" - "github.com/census-instrumentation/opencensus-service/internal/collector/telemetry" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/nodebatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) type queuedSpanProcessor struct { diff --git a/internal/collector/processor/queued/queued_processor_test.go b/internal/collector/processor/queued/queued_processor_test.go index 5a62c280859..a0a8b517ae1 100644 --- a/internal/collector/processor/queued/queued_processor_test.go +++ b/internal/collector/processor/queued/queued_processor_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import ( "sync/atomic" "testing" - "github.com/census-instrumentation/opencensus-service/consumer" + "github.com/open-telemetry/opentelemetry-service/consumer" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" ) func TestQueueProcessorHappyPath(t *testing.T) { diff --git a/internal/collector/processor/tailsampling/metrics.go b/internal/collector/processor/tailsampling/metrics.go index 3415c3fc0c1..0667fe8cf15 100644 --- a/internal/collector/processor/tailsampling/metrics.go +++ b/internal/collector/processor/tailsampling/metrics.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "github.com/census-instrumentation/opencensus-service/internal/collector/telemetry" + "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) // Variables related to metrics specific to tail sampling. diff --git a/internal/collector/processor/tailsampling/processor.go b/internal/collector/processor/tailsampling/processor.go index ea44786ab1c..01e3fbdc04c 100644 --- a/internal/collector/processor/tailsampling/processor.go +++ b/internal/collector/processor/tailsampling/processor.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,16 +21,16 @@ import ( "sync/atomic" "time" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "go.opencensus.io/stats" "go.opencensus.io/tag" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/idbatcher" - "github.com/census-instrumentation/opencensus-service/internal/collector/sampling" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/idbatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/sampling" + "github.com/open-telemetry/opentelemetry-service/observability" ) // Policy combines a sampling policy evaluator with the destinations to be diff --git a/internal/collector/processor/tailsampling/processor_test.go b/internal/collector/processor/tailsampling/processor_test.go index e0114f0188d..ecb0deb29d8 100644 --- a/internal/collector/processor/tailsampling/processor_test.go +++ b/internal/collector/processor/tailsampling/processor_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,13 +20,13 @@ import ( "testing" "time" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/collector/processor/idbatcher" - "github.com/census-instrumentation/opencensus-service/internal/collector/sampling" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/collector/processor/idbatcher" + "github.com/open-telemetry/opentelemetry-service/internal/collector/sampling" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "go.uber.org/zap" ) diff --git a/internal/collector/sampling/always_sample.go b/internal/collector/sampling/always_sample.go index f89b1667572..5cdee19a77f 100644 --- a/internal/collector/sampling/always_sample.go +++ b/internal/collector/sampling/always_sample.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ package sampling -import tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" +import tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" type alwaysSample struct{} diff --git a/internal/collector/sampling/doc.go b/internal/collector/sampling/doc.go index 0f744ef9f59..9c6cc34e80e 100644 --- a/internal/collector/sampling/doc.go +++ b/internal/collector/sampling/doc.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/collector/sampling/numeric_tag_filter.go b/internal/collector/sampling/numeric_tag_filter.go index 3e3a0880635..e828fb9e7fd 100644 --- a/internal/collector/sampling/numeric_tag_filter.go +++ b/internal/collector/sampling/numeric_tag_filter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ package sampling -import tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" +import tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" type numericAttributeFilter struct { key string diff --git a/internal/collector/sampling/policy.go b/internal/collector/sampling/policy.go index 0c2aa1d79cb..c8b098271f4 100644 --- a/internal/collector/sampling/policy.go +++ b/internal/collector/sampling/policy.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,9 +18,9 @@ import ( "sync" "time" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + "github.com/open-telemetry/opentelemetry-service/data" ) // TraceData stores the sampling related trace data. diff --git a/internal/collector/sampling/rate_limiting.go b/internal/collector/sampling/rate_limiting.go index 91cf76d8895..e425b3f2b70 100644 --- a/internal/collector/sampling/rate_limiting.go +++ b/internal/collector/sampling/rate_limiting.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package sampling import ( "time" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" ) type rateLimiting struct { diff --git a/internal/collector/sampling/string_tag_filter.go b/internal/collector/sampling/string_tag_filter.go index bb7a0699bec..ebc97d60274 100644 --- a/internal/collector/sampling/string_tag_filter.go +++ b/internal/collector/sampling/string_tag_filter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ package sampling -import tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" +import tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" type stringAttributeFilter struct { key string diff --git a/internal/collector/telemetry/telemetry.go b/internal/collector/telemetry/telemetry.go index 7493fad769a..012aa9fd20c 100644 --- a/internal/collector/telemetry/telemetry.go +++ b/internal/collector/telemetry/telemetry.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/collector/zipkin/receiver.go b/internal/collector/zipkin/receiver.go index 2486d711e9c..6877949a188 100644 --- a/internal/collector/zipkin/receiver.go +++ b/internal/collector/zipkin/receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" - "github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" + "github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver" ) // Start starts the Zipkin receiver endpoint. diff --git a/internal/collector/zipkin/scribe/receiver.go b/internal/collector/zipkin/scribe/receiver.go index b3fa00c937e..701099e62b0 100644 --- a/internal/collector/zipkin/scribe/receiver.go +++ b/internal/collector/zipkin/scribe/receiver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/builder" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" - "github.com/census-instrumentation/opencensus-service/receiver/zipkinreceiver/zipkinscribereceiver" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" + "github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver/zipkinscribereceiver" ) // Start starts the Zipkin Scribe receiver endpoint. diff --git a/internal/compression/empty_test.go b/internal/compression/empty_test.go index 4b440261d81..0bf7c149e80 100644 --- a/internal/compression/empty_test.go +++ b/internal/compression/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/compression/grpc/grpc.go b/internal/compression/grpc/grpc.go index 16040cb99d4..8edcaa15176 100644 --- a/internal/compression/grpc/grpc.go +++ b/internal/compression/grpc/grpc.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "google.golang.org/grpc/encoding/gzip" - "github.com/census-instrumentation/opencensus-service/internal/compression" + "github.com/open-telemetry/opentelemetry-service/internal/compression" ) var ( diff --git a/internal/compression/grpc/grpc_test.go b/internal/compression/grpc/grpc_test.go index 372d1799f56..8edea548223 100644 --- a/internal/compression/grpc/grpc_test.go +++ b/internal/compression/grpc/grpc_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package grpc import ( "testing" - "github.com/census-instrumentation/opencensus-service/internal/compression" + "github.com/open-telemetry/opentelemetry-service/internal/compression" ) func TestGetGRPCCompressionKey(t *testing.T) { diff --git a/internal/compression/grpc/gzip.go b/internal/compression/grpc/gzip.go index bf3e9eefb67..5b490f3411b 100644 --- a/internal/compression/grpc/gzip.go +++ b/internal/compression/grpc/gzip.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/compression/keys.go b/internal/compression/keys.go index 7847ebcf872..dc9cad258c8 100644 --- a/internal/compression/keys.go +++ b/internal/compression/keys.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/config/config.go b/internal/config/config.go index 6af13631e87..cff9f5b678d 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,19 +26,19 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/awsexporter" - "github.com/census-instrumentation/opencensus-service/exporter/datadogexporter" - "github.com/census-instrumentation/opencensus-service/exporter/honeycombexporter" - "github.com/census-instrumentation/opencensus-service/exporter/jaegerexporter" - "github.com/census-instrumentation/opencensus-service/exporter/kafkaexporter" - "github.com/census-instrumentation/opencensus-service/exporter/opencensusexporter" - "github.com/census-instrumentation/opencensus-service/exporter/prometheusexporter" - "github.com/census-instrumentation/opencensus-service/exporter/stackdriverexporter" - "github.com/census-instrumentation/opencensus-service/exporter/wavefrontexporter" - "github.com/census-instrumentation/opencensus-service/exporter/zipkinexporter" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver" - "github.com/census-instrumentation/opencensus-service/receiver/prometheusreceiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/awsexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/datadogexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/honeycombexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/jaegerexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/kafkaexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/stackdriverexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/wavefrontexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/zipkinexporter" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver" ) // We expect the configuration.yaml file to look like this: @@ -94,11 +94,11 @@ type Config struct { // Receivers denotes configurations for the various telemetry ingesters, such as: // * Jaeger (traces) -// * OpenCensus (metrics and traces) +// * OpenTelemetry (metrics and traces) // * Prometheus (metrics) // * Zipkin (traces) type Receivers struct { - OpenCensus *ReceiverConfig `mapstructure:"opencensus"` + OpenTelemetry *ReceiverConfig `mapstructure:"opencensus"` Zipkin *ReceiverConfig `mapstructure:"zipkin"` Jaeger *ReceiverConfig `mapstructure:"jaeger"` Scribe *ScribeReceiverConfig `mapstructure:"zipkin-scribe"` @@ -120,13 +120,13 @@ type Receivers struct { // * Address // * Various ports type ReceiverConfig struct { - // The address to which the OpenCensus receiver will be bound and run on. + // The address to which the OpenTelemetry receiver will be bound and run on. Address string `mapstructure:"address"` CollectorHTTPPort int `mapstructure:"collector_http_port"` CollectorThriftPort int `mapstructure:"collector_thrift_port"` // The allowed CORS origins for HTTP/JSON requests the grpc-gateway adapter - // for the OpenCensus receiver. See github.com/rs/cors + // for the OpenTelemetry receiver. See github.com/rs/cors // An empty list means that CORS is not enabled at all. A wildcard (*) can be // used to match any origin or one or more characters of an origin. CorsAllowedOrigins []string `mapstructure:"cors_allowed_origins"` @@ -168,18 +168,18 @@ type ZPagesConfig struct { } // OpenCensusReceiverAddress is a helper to safely retrieve the address -// that the OpenCensus receiver will be bound to. -// If Config is nil or the OpenCensus receiver's configuration is nil, it +// that the OpenTelemetry receiver will be bound to. +// If Config is nil or the OpenTelemetry receiver's configuration is nil, it // will return the default of ":55678" func (c *Config) OpenCensusReceiverAddress() string { if c == nil || c.Receivers == nil { return defaultOCReceiverAddress } inCfg := c.Receivers - if inCfg.OpenCensus == nil || inCfg.OpenCensus.Address == "" { + if inCfg.OpenTelemetry == nil || inCfg.OpenTelemetry.Address == "" { return defaultOCReceiverAddress } - return inCfg.OpenCensus.Address + return inCfg.OpenTelemetry.Address } // OpenCensusReceiverCorsAllowedOrigins is a helper to safely retrieve the list @@ -189,30 +189,30 @@ func (c *Config) OpenCensusReceiverCorsAllowedOrigins() []string { return defaultOCReceiverCorsAllowedOrigins } inCfg := c.Receivers - if inCfg.OpenCensus == nil { + if inCfg.OpenTelemetry == nil { return defaultOCReceiverCorsAllowedOrigins } - return inCfg.OpenCensus.CorsAllowedOrigins + return inCfg.OpenTelemetry.CorsAllowedOrigins } // CanRunOpenCensusTraceReceiver returns true if the configuration -// permits running the OpenCensus Trace receiver. +// permits running the OpenTelemetry Trace receiver. func (c *Config) CanRunOpenCensusTraceReceiver() bool { - return c.openCensusReceiverEnabled() && !c.Receivers.OpenCensus.DisableTracing + return c.openCensusReceiverEnabled() && !c.Receivers.OpenTelemetry.DisableTracing } // CanRunOpenCensusMetricsReceiver returns true if the configuration -// permits running the OpenCensus Metrics receiver. +// permits running the OpenTelemetry Metrics receiver. func (c *Config) CanRunOpenCensusMetricsReceiver() bool { - return c.openCensusReceiverEnabled() && !c.Receivers.OpenCensus.DisableMetrics + return c.openCensusReceiverEnabled() && !c.Receivers.OpenTelemetry.DisableMetrics } // openCensusReceiverEnabled returns true if both: -// Config.Receivers and Config.Receivers.OpenCensus +// Config.Receivers and Config.Receivers.OpenTelemetry // are non-nil. func (c *Config) openCensusReceiverEnabled() bool { return c != nil && c.Receivers != nil && - c.Receivers.OpenCensus != nil + c.Receivers.OpenTelemetry != nil } // ZPagesDisabled returns true if zPages have not been enabled. @@ -335,13 +335,13 @@ func (rCfg *ReceiverConfig) HasTLSCredentials() bool { } // OpenCensusReceiverTLSServerCredentials retrieves the TLS credentials -// from this Config's OpenCensus receiver if any. +// from this Config's OpenTelemetry receiver if any. func (c *Config) OpenCensusReceiverTLSServerCredentials() *TLSCredentials { if !c.openCensusReceiverEnabled() { return nil } - ocrConfig := c.Receivers.OpenCensus + ocrConfig := c.Receivers.OpenTelemetry if !ocrConfig.HasTLSCredentials() { return nil } @@ -366,7 +366,7 @@ func (tlsCreds *TLSCredentials) ToOpenCensusReceiverServerOption() (opt opencens return opencensusreceiver.WithGRPCServerOptions(gRPCCredsOpt), true, nil } -// OpenCensusReceiverTLSCredentialsServerOption checks if the OpenCensus receiver's Configuration +// OpenCensusReceiverTLSCredentialsServerOption checks if the OpenTelemetry receiver's Configuration // has TLS credentials in the form of a certificate file and a key file. If it doesn't // have any, it will return opencensusreceiver.WithNoopOption() and a nil error. // Otherwise, it will try to retrieve gRPC transport credentials from the file combinations, diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 4cdba7b1771..9ab51a6533f 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/exporter/zipkinexporter" - "github.com/census-instrumentation/opencensus-service/internal/config" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" + "github.com/open-telemetry/opentelemetry-service/exporter/zipkinexporter" + "github.com/open-telemetry/opentelemetry-service/internal/config" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" ) // Issue #233: Zipkin receiver and exporter loopback detection @@ -69,20 +69,20 @@ exporters: } } -// Issue #377: If Config.OpenCensus == nil, invoking +// Issue #377: If Config.OpenTelemetry == nil, invoking // CanRunOpenCensus{Metrics, Trace}Receiver() would crash. func TestOpenCensusTraceReceiverEnabledNoCrash(t *testing.T) { // 1. Test with an in-code struct. cfg := &config.Config{ Receivers: &config.Receivers{ - OpenCensus: nil, + OpenTelemetry: nil, }, } if cfg.CanRunOpenCensusTraceReceiver() { - t.Fatal("CanRunOpenCensusTraceReceiver: Unexpected True for a nil Receiver.OpenCensus") + t.Fatal("CanRunOpenCensusTraceReceiver: Unexpected True for a nil Receiver.OpenTelemetry") } if cfg.CanRunOpenCensusMetricsReceiver() { - t.Fatal("CanRunOpenCensusMetricsReceiver: Unexpected True for a nil Receiver.OpenCensus") + t.Fatal("CanRunOpenCensusMetricsReceiver: Unexpected True for a nil Receiver.OpenTelemetry") } // 2. Test with a struct unmarshalled from a configuration file's YAML. @@ -102,9 +102,9 @@ receivers: } if cfg.CanRunOpenCensusTraceReceiver() { - t.Fatal("yaml.CanRunOpenCensusTraceReceiver: Unexpected True for a nil Receiver.OpenCensus") + t.Fatal("yaml.CanRunOpenCensusTraceReceiver: Unexpected True for a nil Receiver.OpenTelemetry") } if cfg.CanRunOpenCensusMetricsReceiver() { - t.Fatal("yaml.CanRunOpenCensusMetricsReceiver: Unexpected True for a nil Receiver.OpenCensus") + t.Fatal("yaml.CanRunOpenCensusMetricsReceiver: Unexpected True for a nil Receiver.OpenTelemetry") } } diff --git a/internal/config/tls_credentials.go b/internal/config/tls_credentials.go index 5dd1f250057..aaef8089048 100644 --- a/internal/config/tls_credentials.go +++ b/internal/config/tls_credentials.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/config/tls_credentials_test.go b/internal/config/tls_credentials_test.go index 777215b5f43..4e5b847df26 100644 --- a/internal/config/tls_credentials_test.go +++ b/internal/config/tls_credentials_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" ) func TestTLSConfigByParsing(t *testing.T) { @@ -69,7 +69,7 @@ func TestTLSConfigDereferencing(t *testing.T) { } if nilConfig.openCensusReceiverEnabled() { - t.Error("Somehow OpenCensus receiver is enabled on a nil Config") + t.Error("Somehow OpenTelemetry receiver is enabled on a nil Config") } } diff --git a/internal/config/viperutils/viperutils.go b/internal/config/viperutils/viperutils.go index 3415e90728d..c4d93580ecc 100644 --- a/internal/config/viperutils/viperutils.go +++ b/internal/config/viperutils/viperutils.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/config/viperutils/viperutils_test.go b/internal/config/viperutils/viperutils_test.go index 64ec3b05e1d..cc43c260fbd 100644 --- a/internal/config/viperutils/viperutils_test.go +++ b/internal/config/viperutils/viperutils_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/configmodels/configmodels.go b/internal/configmodels/configmodels.go index aec8b2a6001..a290a10bd94 100644 --- a/internal/configmodels/configmodels.go +++ b/internal/configmodels/configmodels.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/configmodels/empty_test.go b/internal/configmodels/empty_test.go index cfabfef6307..67ee9ade614 100644 --- a/internal/configmodels/empty_test.go +++ b/internal/configmodels/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/configv2/configv2.go b/internal/configv2/configv2.go index 092531c7518..965721be082 100644 --- a/internal/configv2/configv2.go +++ b/internal/configv2/configv2.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) // These are errors that can be returned by Load(). Note that error codes are not part diff --git a/internal/configv2/configv2_test.go b/internal/configv2/configv2_test.go index 2922649667d..39c045b3fb0 100644 --- a/internal/configv2/configv2_test.go +++ b/internal/configv2/configv2_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) var _ = RegisterTestFactories() diff --git a/internal/configv2/example_factories.go b/internal/configv2/example_factories.go index 77a50e88bce..2a18b8b6eb4 100644 --- a/internal/configv2/example_factories.go +++ b/internal/configv2/example_factories.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ package configv2 import ( "context" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/processor" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/processor" + "github.com/open-telemetry/opentelemetry-service/receiver" ) // ExampleReceiver is for testing purposes. We are defining an example config and factory diff --git a/internal/configv2/test_helpers.go b/internal/configv2/test_helpers.go index 1e2d6ac8381..44778e0867f 100644 --- a/internal/configv2/test_helpers.go +++ b/internal/configv2/test_helpers.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "os" "testing" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" "github.com/spf13/viper" ) diff --git a/internal/factories/factories.go b/internal/factories/factories.go index 58517d1fb2e..1c2b51f80c0 100644 --- a/internal/factories/factories.go +++ b/internal/factories/factories.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,10 +21,10 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/processor" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/processor" + "github.com/open-telemetry/opentelemetry-service/receiver" ) /////////////////////////////////////////////////////////////////////////////// diff --git a/internal/factories/factories_test.go b/internal/factories/factories_test.go index 1c68b391116..8b73a5bb5ab 100644 --- a/internal/factories/factories_test.go +++ b/internal/factories/factories_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ import ( "context" "testing" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/processor" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) type ExampleReceiverFactory struct { diff --git a/internal/internal.go b/internal/internal.go index 9bd7d953631..c6d019fa873 100644 --- a/internal/internal.go +++ b/internal/internal.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/internal_test.go b/internal/internal_test.go index d6a1118ba14..20b7f5b8842 100644 --- a/internal/internal_test.go +++ b/internal/internal_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import ( "testing" "time" - "github.com/census-instrumentation/opencensus-service/internal" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestTimeConverters(t *testing.T) { diff --git a/internal/pprofserver/pprofserver.go b/internal/pprofserver/pprofserver.go index 50346afda9a..fd3505b1f9d 100644 --- a/internal/pprofserver/pprofserver.go +++ b/internal/pprofserver/pprofserver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/pprofserver/pprofserver_test.go b/internal/pprofserver/pprofserver_test.go index 9845b7e855d..658b81f30a3 100644 --- a/internal/pprofserver/pprofserver_test.go +++ b/internal/pprofserver/pprofserver_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/testutils/testutils.go b/internal/testutils/testutils.go index 5e8c1137907..f1b6943b76f 100644 --- a/internal/testutils/testutils.go +++ b/internal/testutils/testutils.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/testutils/testutils_test.go b/internal/testutils/testutils_test.go index ef934538577..2a80f0e1810 100644 --- a/internal/testutils/testutils_test.go +++ b/internal/testutils/testutils_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/version/version.go b/internal/version/version.go index c81f50eb3e6..e628131fc4d 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/version/version_test.go b/internal/version/version_test.go index a8834fe4e80..8dede43daaa 100644 --- a/internal/version/version_test.go +++ b/internal/version/version_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/zpagesserver/zpagesserver.go b/internal/zpagesserver/zpagesserver.go index 6436d28a20c..0ff5f177095 100644 --- a/internal/zpagesserver/zpagesserver.go +++ b/internal/zpagesserver/zpagesserver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/internal/zpagesserver/zpagesserver_test.go b/internal/zpagesserver/zpagesserver_test.go index 7dbfcacc5cb..b63b8ea94a4 100644 --- a/internal/zpagesserver/zpagesserver_test.go +++ b/internal/zpagesserver/zpagesserver_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/observability/observability.go b/observability/observability.go index 2b2581db351..829c108827b 100644 --- a/observability/observability.go +++ b/observability/observability.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package observability // This file contains helpers that are useful to add observability -// with metrics and tracing using OpenCensus to the various pieces +// with metrics and tracing using OpenTelemetry to the various pieces // of the service. import ( @@ -117,7 +117,7 @@ func RecordTraceExporterMetrics(ctx context.Context, receivedSpans int, droppedS } // GRPCServerWithObservabilityEnabled creates a gRPC server that at a bare minimum has -// the OpenCensus ocgrpc server stats handler enabled for tracing and stats. +// the OpenTelemetry ocgrpc server stats handler enabled for tracing and stats. // Use it instead of invoking grpc.NewServer directly. func GRPCServerWithObservabilityEnabled(extraOpts ...grpc.ServerOption) *grpc.Server { opts := append(extraOpts, grpc.StatsHandler(&ocgrpc.ServerHandler{})) diff --git a/observability/observability_test.go b/observability/observability_test.go index 3bf36847203..0963c54031e 100644 --- a/observability/observability_test.go +++ b/observability/observability_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/observability/observabilitytest" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/observability/observabilitytest" ) const ( diff --git a/observability/observabilitytest/observabilitytest.go b/observability/observabilitytest/observabilitytest.go index 61058ae3608..73906ab2fe7 100644 --- a/observability/observabilitytest/observabilitytest.go +++ b/observability/observabilitytest/observabilitytest.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ import ( "go.opencensus.io/stats/view" "go.opencensus.io/tag" - "github.com/census-instrumentation/opencensus-service/observability" + "github.com/open-telemetry/opentelemetry-service/observability" ) // SetupRecordedMetricsTest does setup the testing environment to check the metrics recorded by receivers, producers or exporters. diff --git a/observability/observabilitytest/observabilitytest_test.go b/observability/observabilitytest/observabilitytest_test.go index 3705d78b9ff..e0b0c7103b6 100644 --- a/observability/observabilitytest/observabilitytest_test.go +++ b/observability/observabilitytest/observabilitytest_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "context" "testing" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/observability/observabilitytest" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/observability/observabilitytest" ) const ( diff --git a/processor/addattributesprocessor/addattributesprocessor.go b/processor/addattributesprocessor/addattributesprocessor.go index 83a86d818be..678de1e4733 100644 --- a/processor/addattributesprocessor/addattributesprocessor.go +++ b/processor/addattributesprocessor/addattributesprocessor.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,12 +18,12 @@ import ( "context" "errors" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/spf13/cast" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/processor" ) var ( diff --git a/processor/addattributesprocessor/addattributesprocessor_test.go b/processor/addattributesprocessor/addattributesprocessor_test.go index 4228084a525..d51d30c7fd0 100644 --- a/processor/addattributesprocessor/addattributesprocessor_test.go +++ b/processor/addattributesprocessor/addattributesprocessor_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import ( "errors" "testing" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" ) func TestAddAttributesProcessorInvalidValue(t *testing.T) { diff --git a/processor/addattributesprocessor/config.go b/processor/addattributesprocessor/config.go index 4bf6aefab5c..1cfec6dc612 100644 --- a/processor/addattributesprocessor/config.go +++ b/processor/addattributesprocessor/config.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package addattributesprocessor import ( - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) // ConfigV2 defines configuration for Attributes processor. diff --git a/processor/addattributesprocessor/config_test.go b/processor/addattributesprocessor/config_test.go index be37baa39b6..101fe8b3c6b 100644 --- a/processor/addattributesprocessor/config_test.go +++ b/processor/addattributesprocessor/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) var _ = configv2.RegisterTestFactories() diff --git a/processor/addattributesprocessor/factory.go b/processor/addattributesprocessor/factory.go index d29dc54a818..ddcd64d3fbb 100644 --- a/processor/addattributesprocessor/factory.go +++ b/processor/addattributesprocessor/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,10 +15,10 @@ package addattributesprocessor import ( - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/processor" ) var _ = factories.RegisterProcessorFactory(&processorFactory{}) @@ -28,7 +28,7 @@ const ( typeStr = "attributes" ) -// processorFactory is the factory for OpenCensus exporter. +// processorFactory is the factory for OpenTelemetry exporter. type processorFactory struct { } diff --git a/processor/addattributesprocessor/factory_test.go b/processor/addattributesprocessor/factory_test.go index ec64633b39c..71206c05084 100644 --- a/processor/addattributesprocessor/factory_test.go +++ b/processor/addattributesprocessor/factory_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/processor/attributekeyprocessor/attributekeyprocessor.go b/processor/attributekeyprocessor/attributekeyprocessor.go index 269ebd7d4a2..970d3438f71 100644 --- a/processor/attributekeyprocessor/attributekeyprocessor.go +++ b/processor/attributekeyprocessor/attributekeyprocessor.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,9 +19,9 @@ import ( "errors" "fmt" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/processor" ) // KeyReplacement identifies a key and its respective replacement. diff --git a/processor/attributekeyprocessor/attributekeyprocessor_test.go b/processor/attributekeyprocessor/attributekeyprocessor_test.go index 4c8a17108d9..621487b7026 100644 --- a/processor/attributekeyprocessor/attributekeyprocessor_test.go +++ b/processor/attributekeyprocessor/attributekeyprocessor_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,14 +19,14 @@ import ( "reflect" "testing" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/google/go-cmp/cmp" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/processor" - "github.com/census-instrumentation/opencensus-service/processor/processortest" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/processor" + "github.com/open-telemetry/opentelemetry-service/processor/processortest" ) func TestNewTraceProcessor(t *testing.T) { diff --git a/processor/empty_test.go b/processor/empty_test.go index 50b54ec8bc0..a30e16b9529 100644 --- a/processor/empty_test.go +++ b/processor/empty_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/processor/factory.go b/processor/factory.go index 3fbc633e0f9..549ff50a951 100644 --- a/processor/factory.go +++ b/processor/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/processor/multiconsumer/multiconsumer.go b/processor/multiconsumer/multiconsumer.go index a75e7e7dfac..2ec4aaca5d1 100644 --- a/processor/multiconsumer/multiconsumer.go +++ b/processor/multiconsumer/multiconsumer.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,10 +17,10 @@ package multiconsumer import ( "context" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/processor" ) // NewMetricsProcessor wraps multiple metrics consumers in a single one. diff --git a/processor/multiconsumer/multiconsumer_test.go b/processor/multiconsumer/multiconsumer_test.go index 8f9bb105c0e..b16f5fa51b1 100644 --- a/processor/multiconsumer/multiconsumer_test.go +++ b/processor/multiconsumer/multiconsumer_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ import ( "fmt" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" ) func TestTraceProcessorMultiplexing(t *testing.T) { diff --git a/processor/processor.go b/processor/processor.go index 417d50ba862..1218c907816 100644 --- a/processor/processor.go +++ b/processor/processor.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package processor import ( - "github.com/census-instrumentation/opencensus-service/consumer" + "github.com/open-telemetry/opentelemetry-service/consumer" ) // TraceProcessor composes TraceConsumer with some additional processor-specific functions. diff --git a/processor/processortest/nop_processor.go b/processor/processortest/nop_processor.go index 754ee1bb11f..87f43da342c 100644 --- a/processor/processortest/nop_processor.go +++ b/processor/processortest/nop_processor.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,9 +17,9 @@ package processortest import ( "context" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/processor" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/processor" ) type nopProcessor struct { diff --git a/processor/processortest/nop_processor_test.go b/processor/processortest/nop_processor_test.go index 9f1acbb1f59..d4aebe28e84 100644 --- a/processor/processortest/nop_processor_test.go +++ b/processor/processortest/nop_processor_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,10 +18,10 @@ import ( "reflect" "testing" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" ) func TestNopTraceProcessorNoErrors(t *testing.T) { diff --git a/receiver/README.md b/receiver/README.md index 32e0bea9928..ef4dc3ad783 100644 --- a/receiver/README.md +++ b/receiver/README.md @@ -1,11 +1,11 @@ -A variety of receivers are available to the OpenCensus Service (both Agent and Collector) +A variety of receivers are available to the OpenTelemetry Service (both Agent and Collector) __Currently there are some inconsistencies between Agent and Collector configuration, those will be addressed by issue -[#135](https://github.com/census-instrumentation/opencensus-service/issues/135).__ +[#135](https://github.com/open-telemetry/opentelemetry-service/issues/135).__ -## OpenCensus +## OpenTelemetry -This receiver receives spans from OpenCensus instrumented applications and translates them into the internal span types that are then sent to the collector/exporters. +This receiver receives spans from OpenTelemetry instrumented applications and translates them into the internal span types that are then sent to the collector/exporters. Its address can be configured in the YAML configuration file under section "receivers", subsection "opencensus" and field "address". The syntax of the field "address" is `[address|host]:`. @@ -18,12 +18,12 @@ receivers: ``` ### Writing with HTTP/JSON -The OpenCensus receiver for the agent can receive trace export calls via +The OpenTelemetry receiver for the agent can receive trace export calls via HTTP/JSON in addition to gRPC. The HTTP/JSON address is the same as gRPC as the protocol is recognized and processed accordingly. To write traces with HTTP/JSON, `POST` to `[address]/v1/trace`. The JSON message -format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/census-instrumentation/opencensus-proto/blob/master/gen-openapi/opencensus/proto/agent/trace/v1/trace_service.swagger.json). +format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/open-telemetry/opentelemetry-proto/blob/master/gen-openapi/opencensus/proto/agent/trace/v1/trace_service.swagger.json). The HTTP/JSON endpoint can also optionally [CORS](https://fetch.spec.whatwg.org/#cors-protocol), which is enabled by @@ -40,9 +40,9 @@ receivers: ``` ### Collector Differences -(To be fixed via [#135](https://github.com/census-instrumentation/opencensus-service/issues/135)) +(To be fixed via [#135](https://github.com/open-telemetry/opentelemetry-service/issues/135)) -By default this receiver is ALWAYS started on the OpenCensus Collector, it can be disabled via command-line by +By default this receiver is ALWAYS started on the OpenTelemetry Collector, it can be disabled via command-line by using `--receive-oc-trace=false`. On the Collector only the port can be configured, example: ```yaml @@ -113,7 +113,7 @@ receivers: ``` ### Collector Differences -(To be fixed via [#135](https://github.com/census-instrumentation/opencensus-service/issues/135)) +(To be fixed via [#135](https://github.com/open-telemetry/opentelemetry-service/issues/135)) On the Collector Jaeger reception at the default ports can be enabled via command-line `--receive-jaeger`, and the name of the fields is slightly different: @@ -139,7 +139,7 @@ receivers: ``` ### Collector Differences -(To be fixed via [#135](https://github.com/census-instrumentation/opencensus-service/issues/135)) +(To be fixed via [#135](https://github.com/open-telemetry/opentelemetry-service/issues/135)) On the Collector Zipkin reception at the port 9411 can be enabled via command-line `--receive-zipkin`. On the Collector only the port can be configured, example: diff --git a/receiver/end_to_end_test.go b/receiver/end_to_end_test.go index ddc1819616c..22135323ca3 100644 --- a/receiver/end_to_end_test.go +++ b/receiver/end_to_end_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,13 +19,13 @@ import ( "log" "time" - "github.com/census-instrumentation/opencensus-service/exporter/loggingexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter" "contrib.go.opencensus.io/exporter/ocagent" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/receiver" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" "go.uber.org/zap" ) @@ -47,7 +47,7 @@ func Example_endToEnd() { trl := []receiver.TraceReceiver{tr} // Once we have the span receiver which will connect to the - // various exporter pipeline i.e. *tracepb.Span->OpenCensus.SpanData + // various exporter pipeline i.e. *tracepb.Span->OpenTelemetry.SpanData for _, tr := range trl { if err := tr.StartTraceReception(context.Background(), nil); err != nil { log.Fatalf("Failed to start trace receiver: %v", err) diff --git a/receiver/factory.go b/receiver/factory.go index 64108556a1a..352081958d7 100644 --- a/receiver/factory.go +++ b/receiver/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,7 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" + "github.com/open-telemetry/opentelemetry-service/consumer" ) // TraceReceiverFactory is an interface that builds a new TraceReceiver based on diff --git a/receiver/factorytemplate/factorytemplate.go b/receiver/factorytemplate/factorytemplate.go index c3457afd1a9..971075b5d29 100644 --- a/receiver/factorytemplate/factorytemplate.go +++ b/receiver/factorytemplate/factorytemplate.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,8 +24,8 @@ import ( "github.com/spf13/viper" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" ) var ( diff --git a/receiver/factorytemplate/factorytemplate_test.go b/receiver/factorytemplate/factorytemplate_test.go index bae33f146d0..75cf6b765f0 100644 --- a/receiver/factorytemplate/factorytemplate_test.go +++ b/receiver/factorytemplate/factorytemplate_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" yaml "gopkg.in/yaml.v2" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/receiver" ) func TestNewTraceReceiverFactory(t *testing.T) { diff --git a/receiver/jaegerreceiver/config.go b/receiver/jaegerreceiver/config.go index 16a49aea362..a9f83fc2572 100644 --- a/receiver/jaegerreceiver/config.go +++ b/receiver/jaegerreceiver/config.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package jaegerreceiver import ( - "github.com/census-instrumentation/opencensus-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) // ConfigV2 defines configuration for Jaeger receiver. diff --git a/receiver/jaegerreceiver/config_test.go b/receiver/jaegerreceiver/config_test.go index 895df632dd9..4415492d1f9 100644 --- a/receiver/jaegerreceiver/config_test.go +++ b/receiver/jaegerreceiver/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) var _ = configv2.RegisterTestFactories() diff --git a/receiver/jaegerreceiver/factory.go b/receiver/jaegerreceiver/factory.go index e0a65447c30..9a9783d1a83 100644 --- a/receiver/jaegerreceiver/factory.go +++ b/receiver/jaegerreceiver/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import ( "net" "strconv" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/receiver" ) var _ = factories.RegisterReceiverFactory(&receiverFactory{}) diff --git a/receiver/jaegerreceiver/factory_test.go b/receiver/jaegerreceiver/factory_test.go index 585d7452cff..7c1c2988aaf 100644 --- a/receiver/jaegerreceiver/factory_test.go +++ b/receiver/jaegerreceiver/factory_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index fcc6426dcf6..a6c2c048b50 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import ( "contrib.go.opencensus.io/exporter/jaeger" "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/internal" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestJaegerAgentUDP_ThriftCompact_6831(t *testing.T) { @@ -41,7 +41,7 @@ func TestJaegerAgentUDP_ThriftCompact_6831(t *testing.T) { } func TestJaegerAgentUDP_ThriftBinary_6832(t *testing.T) { - t.Skipf("Unfortunately due to Jaeger internal versioning, OpenCensus-Go's Thrift seems to conflict with ours") + t.Skipf("Unfortunately due to Jaeger internal versioning, OpenTelemetry-Go's Thrift seems to conflict with ours") port := 6832 addrForClient := fmt.Sprintf(":%d", port) @@ -81,7 +81,7 @@ func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *Configu }, }) if err != nil { - t.Fatalf("Failed to create the Jaeger OpenCensus exporter for the live application: %v", err) + t.Fatalf("Failed to create the Jaeger OpenTelemetry exporter for the live application: %v", err) } // 3. Now finally send some spans @@ -224,7 +224,7 @@ func testJaegerAgent(t *testing.T, agentEndpoint string, receiverConfig *Configu // Parent_Linked_Spans as currently they've only got: // * Child_of // * Follows_from - // yet OpenCensus has Parent too but Jaeger uses a zero-value for LinkCHILD. + // yet OpenTelemetry has Parent too but Jaeger uses a zero-value for LinkCHILD. Type: tracepb.Span_Link_PARENT_LINKED_SPAN, }, }, diff --git a/receiver/jaegerreceiver/trace_receiver.go b/receiver/jaegerreceiver/trace_receiver.go index d865e23ae72..4b48082d072 100644 --- a/receiver/jaegerreceiver/trace_receiver.go +++ b/receiver/jaegerreceiver/trace_receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -37,10 +37,10 @@ import ( "github.com/uber/tchannel-go/thrift" "go.uber.org/zap" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/receiver" - jaegertranslator "github.com/census-instrumentation/opencensus-service/translator/trace/jaeger" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/receiver" + jaegertranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/jaeger" ) // Configuration defines the behavior and the ports that diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index db2e501c2a5..7fe2f53dfa5 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,11 +25,11 @@ import ( "contrib.go.opencensus.io/exporter/jaeger" "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/internal" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestReception(t *testing.T) { @@ -68,7 +68,7 @@ func TestReception(t *testing.T) { CollectorEndpoint: fmt.Sprintf("http://localhost:%d/api/traces", config.CollectorHTTPPort), }) if err != nil { - t.Fatalf("Failed to create the Jaeger OpenCensus exporter for the live application: %v", err) + t.Fatalf("Failed to create the Jaeger OpenTelemetry exporter for the live application: %v", err) } // 3. Now finally send some spans @@ -207,7 +207,7 @@ func TestReception(t *testing.T) { // Parent_Linked_Spans as currently they've only got: // * Child_of // * Follows_from - // yet OpenCensus has Parent too but Jaeger uses a zero-value for LinkCHILD. + // yet OpenTelemetry has Parent too but Jaeger uses a zero-value for LinkCHILD. Type: tracepb.Span_Link_PARENT_LINKED_SPAN, }, }, diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index d6bd23f499a..e2fb5250881 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ package opencensusreceiver -import "github.com/census-instrumentation/opencensus-service/internal/configmodels" +import "github.com/open-telemetry/opentelemetry-service/internal/configmodels" -// ConfigV2 defines configuration for OpenCensus receiver. +// ConfigV2 defines configuration for OpenTelemetry receiver. type ConfigV2 struct { configmodels.ReceiverSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct } diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index c84cd185ef4..5c08c5ab17b 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/configv2" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/configv2" + "github.com/open-telemetry/opentelemetry-service/internal/factories" ) var _ = configv2.RegisterTestFactories() diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 944ba76d6bf..7183fdb528b 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,11 +17,11 @@ package opencensusreceiver import ( "context" - "github.com/census-instrumentation/opencensus-service/internal/configmodels" - "github.com/census-instrumentation/opencensus-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/configmodels" + "github.com/open-telemetry/opentelemetry-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/receiver" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/receiver" ) var _ = factories.RegisterReceiverFactory(&receiverFactory{}) @@ -109,7 +109,7 @@ func (f *receiverFactory) createReceiver(cfg configmodels.Receiver) (*Receiver, return receiver, nil } -// This is the map of already created OpenCensus receivers for particular configurations. +// This is the map of already created OpenTelemetry receivers for particular configurations. // We maintain this map because the factory is asked trace and metric receivers separately // when it gets CreateTraceReceiver() and CreateMetricsReceiver() but they must not // create separate objects, they must use one Receiver object per configuration. diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index cc13cf84524..d68dfe96a6e 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/census-instrumentation/opencensus-service/internal/factories" - "github.com/census-instrumentation/opencensus-service/internal/testutils" + "github.com/open-telemetry/opentelemetry-service/internal/factories" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" ) func TestCreateDefaultConfig(t *testing.T) { diff --git a/receiver/opencensusreceiver/ocmetrics/doc.go b/receiver/opencensusreceiver/ocmetrics/doc.go index ba7169b8e21..2c1d6ae4f3c 100644 --- a/receiver/opencensusreceiver/ocmetrics/doc.go +++ b/receiver/opencensusreceiver/ocmetrics/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package ocmetrics is the logic for receiving OpenCensus metrics proto from +// Package ocmetrics is the logic for receiving OpenTelemetry metrics proto from // already instrumented applications and then passing them onto a metricsink instance. package ocmetrics diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus.go b/receiver/opencensusreceiver/ocmetrics/opencensus.go index 436ff4960ab..0239fd7a0f3 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,16 +23,16 @@ import ( "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/observability" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/observability" ) -// Receiver is the type used to handle metrics from OpenCensus exporters. +// Receiver is the type used to handle metrics from OpenTelemetry exporters. type Receiver struct { nextConsumer consumer.MetricsConsumer metricBufferPeriod time.Duration @@ -58,7 +58,7 @@ var errMetricsExportProtocolViolation = errors.New("protocol violation: Export's const receiverTagValue = "oc_metrics" // Export is the gRPC method that receives streamed metrics from -// OpenCensus-metricproto compatible libraries/applications. +// OpenTelemetry-metricproto compatible libraries/applications. func (ocr *Receiver) Export(mes agentmetricspb.MetricsService_ExportServer) error { // The bundler will receive batches of metrics i.e. []*metricspb.Metric // We need to ensure that it propagates the receiver name as a tag @@ -101,7 +101,7 @@ func (ocr *Receiver) Export(mes agentmetricspb.MetricsService_ExportServer) erro } // TODO(songya): differentiate between unset and nil resource. See - // https://github.com/census-instrumentation/opencensus-proto/issues/146. + // https://github.com/open-telemetry/opentelemetry-proto/issues/146. if recv.Resource != nil { resource = recv.Resource } diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus_test.go b/receiver/opencensusreceiver/ocmetrics/opencensus_test.go index 93b4dd581fe..b9a4ba1867a 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus_test.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -31,13 +31,13 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/observability" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/observability" ) // TODO: add E2E tests once ocagent implements metric service client. @@ -166,7 +166,7 @@ func TestExportMultiplexing(t *testing.T) { } // The first message without a Node MUST be rejected and teardown the connection. -// See https://github.com/census-instrumentation/opencensus-service/issues/53 +// See https://github.com/open-telemetry/opentelemetry-service/issues/53 func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { metricSink := newMetricAppender() @@ -234,10 +234,10 @@ func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { // If the first message is valid (has a non-nil Node) and has metrics, those // metrics should be received and NEVER discarded. -// See https://github.com/census-instrumentation/opencensus-service/issues/51 +// See https://github.com/open-telemetry/opentelemetry-service/issues/51 func TestExportProtocolConformation_metricsInFirstMessage(t *testing.T) { t.Skipf("Currently disabled, this test is flaky on Windows. Enable this test when the following are fixed:\nIssue %s\n", - "https://github.com/census-instrumentation/opencensus-service/issues/225", + "https://github.com/open-telemetry/opentelemetry-service/issues/225", ) metricSink := newMetricAppender() diff --git a/receiver/opencensusreceiver/ocmetrics/options.go b/receiver/opencensusreceiver/ocmetrics/options.go index 9fda51d3ef4..4302c2e7104 100644 --- a/receiver/opencensusreceiver/ocmetrics/options.go +++ b/receiver/opencensusreceiver/ocmetrics/options.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/receiver/opencensusreceiver/octrace/doc.go b/receiver/opencensusreceiver/octrace/doc.go index 64e572bb729..bce34f8395f 100644 --- a/receiver/opencensusreceiver/octrace/doc.go +++ b/receiver/opencensusreceiver/octrace/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,6 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package octrace is the logic for receiving OpenCensus trace protobuf defined spans from +// Package octrace is the logic for receiving OpenTelemetry trace protobuf defined spans from // already instrumented applications and then passing them onto a TraceReceiverSink instance. package octrace diff --git a/receiver/opencensusreceiver/octrace/observability_test.go b/receiver/opencensusreceiver/octrace/observability_test.go index 8d73bc97f46..16d45869467 100644 --- a/receiver/opencensusreceiver/octrace/observability_test.go +++ b/receiver/opencensusreceiver/octrace/observability_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,16 +24,16 @@ import ( "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/observability/observabilitytest" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/observability/observabilitytest" ) // Ensure that if we add a metrics exporter that our target metrics // will be recorded but also with the proper tag keys and values. -// See Issue https://github.com/census-instrumentation/opencensus-service/issues/63 +// See Issue https://github.com/open-telemetry/opentelemetry-service/issues/63 // // Note: we are intentionally skipping the ocgrpc.ServerDefaultViews as this // test is to ensure exactness, but with the mentioned views registered, the @@ -99,7 +99,7 @@ func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { // Always sample for the purpose of examining all the spans in this test. trace.ApplyConfig(trace.Config{DefaultSampler: trace.AlwaysSample()}) - // TODO: File an issue with OpenCensus-Go to ask for a method to retrieve + // TODO: File an issue with OpenTelemetry-Go to ask for a method to retrieve // the default sampler because the current method of blindly changing the // global sampler makes testing hard. // Denoise this test by setting the sampler to never sample diff --git a/receiver/opencensusreceiver/octrace/opencensus.go b/receiver/opencensusreceiver/octrace/opencensus.go index 7aea3901d43..0081ec69c1e 100644 --- a/receiver/opencensusreceiver/octrace/opencensus.go +++ b/receiver/opencensusreceiver/octrace/opencensus.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,12 +21,12 @@ import ( "go.opencensus.io/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" - resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/observability" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" + resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/observability" ) const ( @@ -35,7 +35,7 @@ const ( messageChannelSize = 64 ) -// Receiver is the type used to handle spans from OpenCensus exporters. +// Receiver is the type used to handle spans from OpenTelemetry exporters. type Receiver struct { nextConsumer consumer.TraceConsumer numWorkers int @@ -91,7 +91,7 @@ var errTraceExportProtocolViolation = errors.New("protocol violation: Export's f const receiverTagValue = "oc_trace" // Export is the gRPC method that receives streamed traces from -// OpenCensus-traceproto compatible libraries/applications. +// OpenTelemetry-traceproto compatible libraries/applications. func (ocr *Receiver) Export(tes agenttracepb.TraceService_ExportServer) error { // We need to ensure that it propagates the receiver name as a tag ctxWithReceiverName := observability.ContextWithReceiverName(tes.Context(), receiverTagValue) @@ -117,7 +117,7 @@ func (ocr *Receiver) Export(tes agenttracepb.TraceService_ExportServer) error { } // TODO(songya): differentiate between unset and nil resource. See - // https://github.com/census-instrumentation/opencensus-proto/issues/146. + // https://github.com/open-telemetry/opentelemetry-proto/issues/146. if recv.Resource != nil { resource = recv.Resource } diff --git a/receiver/opencensusreceiver/octrace/opencensus_test.go b/receiver/opencensusreceiver/octrace/opencensus_test.go index de4f78c25f9..c2571914c01 100644 --- a/receiver/opencensusreceiver/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/octrace/opencensus_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -33,13 +33,13 @@ import ( "google.golang.org/grpc" "contrib.go.opencensus.io/exporter/ocagent" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/observability" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/observability" "go.opencensus.io/trace" "go.opencensus.io/trace/tracestate" ) @@ -304,7 +304,7 @@ func TestExportMultiplexing(t *testing.T) { } // The first message without a Node MUST be rejected and teardown the connection. -// See https://github.com/census-instrumentation/opencensus-service/issues/53 +// See https://github.com/open-telemetry/opentelemetry-service/issues/53 func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { spanSink := newSpanAppender() @@ -372,7 +372,7 @@ func TestExportProtocolViolations_nodelessFirstMessage(t *testing.T) { // If the first message is valid (has a non-nil Node) and has spans, those // spans should be received and NEVER discarded. -// See https://github.com/census-instrumentation/opencensus-service/issues/51 +// See https://github.com/open-telemetry/opentelemetry-service/issues/51 func TestExportProtocolConformation_spansInFirstMessage(t *testing.T) { spanSink := newSpanAppender() diff --git a/receiver/opencensusreceiver/octrace/options.go b/receiver/opencensusreceiver/octrace/options.go index d9d809f5550..39c0a764798 100644 --- a/receiver/opencensusreceiver/octrace/options.go +++ b/receiver/opencensusreceiver/octrace/options.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index 1db22ab2cdc..1cb83799c4a 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,16 +25,16 @@ import ( "google.golang.org/grpc" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver/ocmetrics" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver/octrace" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/ocmetrics" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/octrace" gatewayruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/rs/cors" "github.com/soheilhy/cmux" - agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" + agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" ) // Receiver is the type that exposes Trace and Metrics reception. @@ -67,9 +67,9 @@ var ( errAlreadyStopped = errors.New("already stopped") ) -const source string = "OpenCensus" +const source string = "OpenTelemetry" -// New just creates the OpenCensus receiver services. It is the caller's +// New just creates the OpenTelemetry receiver services. It is the caller's // responsibility to invoke the respective Start*Reception methods as well // as the various Stop*Reception methods or simply Stop to end it. func New(addr string, tc consumer.TraceConsumer, mc consumer.MetricsConsumer, opts ...Option) (*Receiver, error) { diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 04e5360b0aa..197f2aba113 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,12 +27,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/internal" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestGrpcGateway_endToEnd(t *testing.T) { @@ -175,7 +175,7 @@ func TestGrpcGatewayCors_endToEnd(t *testing.T) { verifyCorsResp(t, url, "disallowed-origin.com", 200, false) } -// As per Issue https://github.com/census-instrumentation/opencensus-service/issues/366 +// As per Issue https://github.com/open-telemetry/opentelemetry-service/issues/366 // the agent's mux should be able to accept all Proto affiliated content-types and not // redirect them to the web-grpc-gateway endpoint. func TestAcceptAllGRPCProtoAffiliatedContentTypes(t *testing.T) { @@ -203,7 +203,7 @@ func TestAcceptAllGRPCProtoAffiliatedContentTypes(t *testing.T) { } // Now start the client with the various Proto affiliated gRPC Content-Types, - // as we encountered in https://github.com/census-instrumentation/opencensus-service/issues/366 + // as we encountered in https://github.com/open-telemetry/opentelemetry-service/issues/366 protoAffiliatedContentTypes := []string{"application/grpc", "application/grpc+proto"} for _, contentType := range protoAffiliatedContentTypes { if err := runContentTypeTests(addr, asContentType, contentType); err != nil { @@ -311,11 +311,11 @@ func verifyCorsResp(t *testing.T, url string, origin string, wantStatus int, wan } } -// Issue #379: Invoking Stop on an unstarted OpenCensus receiver should never crash. +// Issue #379: Invoking Stop on an unstarted OpenTelemetry receiver should never crash. func TestStopWithoutStartNeverCrashes(t *testing.T) { ocr, err := New(":55444", nil, nil) if err != nil { - t.Fatalf("Failed to create an OpenCensus receiver: %v", err) + t.Fatalf("Failed to create an OpenTelemetry receiver: %v", err) } // Stop it before ever invoking Start*. ocr.Stop() diff --git a/receiver/opencensusreceiver/options.go b/receiver/opencensusreceiver/options.go index 74c0ede69d0..1b2139c5828 100644 --- a/receiver/opencensusreceiver/options.go +++ b/receiver/opencensusreceiver/options.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,8 +17,8 @@ package opencensusreceiver import ( "google.golang.org/grpc" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver/ocmetrics" - "github.com/census-instrumentation/opencensus-service/receiver/opencensusreceiver/octrace" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/ocmetrics" + "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/octrace" ) // Option interface defines for configuration settings to be applied to receivers. diff --git a/receiver/opencensusreceiver/options_test.go b/receiver/opencensusreceiver/options_test.go index 6a11f65dec4..b55e455f8b7 100644 --- a/receiver/opencensusreceiver/options_test.go +++ b/receiver/opencensusreceiver/options_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/receiver/prometheusreceiver/doc.go b/receiver/prometheusreceiver/doc.go index fce6731d27a..8534dd27c08 100644 --- a/receiver/prometheusreceiver/doc.go +++ b/receiver/prometheusreceiver/doc.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/receiver/prometheusreceiver/metrics_receiver.go b/receiver/prometheusreceiver/metrics_receiver.go index 76fffd6cdea..3bd7261c238 100644 --- a/receiver/prometheusreceiver/metrics_receiver.go +++ b/receiver/prometheusreceiver/metrics_receiver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v2" - agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/receiver" + agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/receiver" "github.com/orijtech/promreceiver" "github.com/prometheus/prometheus/config" ) diff --git a/receiver/prometheusreceiver/metrics_receiver_test.go b/receiver/prometheusreceiver/metrics_receiver_test.go index e8b19f5b8c1..99e1d04a815 100644 --- a/receiver/prometheusreceiver/metrics_receiver_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ import ( "go.opencensus.io/metric/metricdata" "go.opencensus.io/metric/metricproducer" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/internal/config/viperutils" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/internal/config/viperutils" "github.com/golang/protobuf/ptypes/timestamp" ) diff --git a/receiver/receiver.go b/receiver/receiver.go index d7b76c84338..5a2c436387a 100644 --- a/receiver/receiver.go +++ b/receiver/receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ package receiver import ( "context" - _ "github.com/census-instrumentation/opencensus-service/internal/compression/grpc" // load in supported grpc compression encodings + _ "github.com/open-telemetry/opentelemetry-service/internal/compression/grpc" // load in supported grpc compression encodings ) // A TraceReceiver is an "arbitrary data"-to-"trace proto span" converter. diff --git a/receiver/vmmetricsreceiver/doc.go b/receiver/vmmetricsreceiver/doc.go index 9d5e2f717d8..5405c76e72b 100644 --- a/receiver/vmmetricsreceiver/doc.go +++ b/receiver/vmmetricsreceiver/doc.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/receiver/vmmetricsreceiver/metrics_receiver.go b/receiver/vmmetricsreceiver/metrics_receiver.go index d3f003eac70..1acb4f05b74 100644 --- a/receiver/vmmetricsreceiver/metrics_receiver.go +++ b/receiver/vmmetricsreceiver/metrics_receiver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import ( "github.com/spf13/viper" - "github.com/census-instrumentation/opencensus-service/consumer" + "github.com/open-telemetry/opentelemetry-service/consumer" ) var ( diff --git a/receiver/vmmetricsreceiver/vm_metrics_collector.go b/receiver/vmmetricsreceiver/vm_metrics_collector.go index 7cf09c23a16..207581e9408 100644 --- a/receiver/vmmetricsreceiver/vm_metrics_collector.go +++ b/receiver/vmmetricsreceiver/vm_metrics_collector.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,11 +24,11 @@ import ( "github.com/prometheus/procfs" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" ) // VMMetricsCollector is a struct that collects and reports VM and process metrics (cpu, mem, etc). diff --git a/receiver/vmmetricsreceiver/vm_metrics_constants.go b/receiver/vmmetricsreceiver/vm_metrics_constants.go index e413cc1f8b2..e216f3bb8fb 100644 --- a/receiver/vmmetricsreceiver/vm_metrics_constants.go +++ b/receiver/vmmetricsreceiver/vm_metrics_constants.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ package vmmetricsreceiver import ( - metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1" + metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" ) // VM and process metric constants. diff --git a/receiver/zipkinreceiver/proto_parse_test.go b/receiver/zipkinreceiver/proto_parse_test.go index 08dbcda1bb3..b369d8a4ada 100644 --- a/receiver/zipkinreceiver/proto_parse_test.go +++ b/receiver/zipkinreceiver/proto_parse_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,10 +23,10 @@ import ( "github.com/golang/protobuf/proto" zipkin_proto3 "github.com/openzipkin/zipkin-go/proto/v2" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { @@ -103,7 +103,7 @@ func TestConvertSpansToTraceSpans_protobuf(t *testing.T) { hdr := make(http.Header) hdr.Set("Content-Type", "application/x-protobuf") - // 3. Get that payload converted to OpenCensus proto spans. + // 3. Get that payload converted to OpenTelemetry proto spans. reqs, err := zi.v2ToTraceSpans(protoBlob, hdr) if err != nil { t.Fatalf("Failed to parse convert Zipkin spans in Protobuf to Trace spans: %v", err) diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 327ae25de09..0d80b3cbefa 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -30,20 +30,20 @@ import ( "sync" "github.com/apache/thrift/lib/go/thrift" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinproto "github.com/openzipkin/zipkin-go/proto/v2" "go.opencensus.io/trace" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/receiver" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" - zipkintranslator "github.com/census-instrumentation/opencensus-service/translator/trace/zipkin" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/receiver" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" + zipkintranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/zipkin" ) var ( @@ -127,7 +127,7 @@ func (zr *ZipkinReceiver) StartTraceReception(ctx context.Context, asyncErrorCha return err } -// v1ToTraceSpans parses Zipkin v1 JSON traces and converts them to OpenCensus Proto spans. +// v1ToTraceSpans parses Zipkin v1 JSON traces and converts them to OpenTelemetry Proto spans. func (zr *ZipkinReceiver) v1ToTraceSpans(blob []byte, hdr http.Header) (reqs []data.TraceData, err error) { if hdr.Get("Content-Type") == "application/x-thrift" { zSpans, err := deserializeThrift(blob) @@ -168,7 +168,7 @@ func deserializeThrift(b []byte) ([]*zipkincore.Span, error) { return spans, nil } -// v2ToTraceSpans parses Zipkin v2 JSON or Protobuf traces and converts them to OpenCensus Proto spans. +// v2ToTraceSpans parses Zipkin v2 JSON or Protobuf traces and converts them to OpenTelemetry Proto spans. func (zr *ZipkinReceiver) v2ToTraceSpans(blob []byte, hdr http.Header) (reqs []data.TraceData, err error) { // This flag's reference is from: // https://github.com/openzipkin/zipkin-go/blob/3793c981d4f621c0e3eb1457acffa2c1cc591384/proto/v2/zipkin.proto#L154 @@ -470,7 +470,7 @@ const statusCodeUnknown = 2 func extractProtoStatus(zs *zipkinmodel.SpanModel) *tracepb.Status { // The status is stored with the "error" key - // See https://github.com/census-instrumentation/opencensus-go/blob/1eb9a13c7dd02141e065a665f6bf5c99a090a16a/exporter/zipkin/zipkin.go#L160-L165 + // See https://github.com/open-telemetry/opentelemetry-go/blob/1eb9a13c7dd02141e065a665f6bf5c99a090a16a/exporter/zipkin/zipkin.go#L160-L165 if zs == nil || len(zs.Tags) == 0 { return nil } @@ -564,8 +564,8 @@ func zipkinTagsToTraceAttributes(tags map[string]string) *tracepb.Span_Attribute amap := make(map[string]*tracepb.AttributeValue, len(tags)) for key, value := range tags { // We did a translation from "boolean" to "string" - // in OpenCensus-Go's Zipkin exporter as per - // https://github.com/census-instrumentation/opencensus-go/blob/1eb9a13c7dd02141e065a665f6bf5c99a090a16a/exporter/zipkin/zipkin.go#L138-L155 + // in OpenTelemetry-Go's Zipkin exporter as per + // https://github.com/open-telemetry/opentelemetry-go/blob/1eb9a13c7dd02141e065a665f6bf5c99a090a16a/exporter/zipkin/zipkin.go#L138-L155 switch value { case "true", "false": amap[key] = &tracepb.AttributeValue{ diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index d3901cece28..54a0e26b8ca 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -32,14 +32,14 @@ import ( zipkinmodel "github.com/openzipkin/zipkin-go/model" zhttp "github.com/openzipkin/zipkin-go/reporter/http" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" - "github.com/census-instrumentation/opencensus-service/internal" - "github.com/census-instrumentation/opencensus-service/internal/testutils" - spandatatranslator "github.com/census-instrumentation/opencensus-service/translator/trace/spandata" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-service/internal" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" + spandatatranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/spandata" ) func TestTraceIDConversion(t *testing.T) { diff --git a/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver.go b/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver.go index bfdd0ffc9b6..17bd51dea03 100644 --- a/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver.go +++ b/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,10 +26,10 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "github.com/omnition/scribe-go/if/scribe/gen-go/scribe" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/observability" - "github.com/census-instrumentation/opencensus-service/receiver" - zipkintranslator "github.com/census-instrumentation/opencensus-service/translator/trace/zipkin" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/observability" + "github.com/open-telemetry/opentelemetry-service/receiver" + zipkintranslator "github.com/open-telemetry/opentelemetry-service/translator/trace/zipkin" ) var ( diff --git a/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver_test.go b/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver_test.go index 8dec0541fe3..4a248e477e8 100644 --- a/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver_test.go +++ b/receiver/zipkinreceiver/zipkinscribereceiver/scribe_receiver_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,11 +23,11 @@ import ( "testing" "github.com/apache/thrift/lib/go/thrift" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/consumer" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/exporter/exportertest" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/consumer" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/exporter/exportertest" "github.com/golang/protobuf/ptypes/timestamp" "github.com/omnition/scribe-go/if/scribe/gen-go/scribe" ) diff --git a/tools/tools.go b/tools/tools.go index 6bcc6b75668..3fc90c7d521 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/big_endian_converter.go b/translator/trace/big_endian_converter.go index 6b28594ad38..82dfe20028d 100644 --- a/translator/trace/big_endian_converter.go +++ b/translator/trace/big_endian_converter.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/big_endian_converter_test.go b/translator/trace/big_endian_converter_test.go index 2aca2843d09..db744ba0772 100644 --- a/translator/trace/big_endian_converter_test.go +++ b/translator/trace/big_endian_converter_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/jaeger/constants.go b/translator/trace/jaeger/constants.go index a2070afc444..08fa225e20e 100644 --- a/translator/trace/jaeger/constants.go +++ b/translator/trace/jaeger/constants.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/jaeger/jaegerthrift_to_protospan.go b/translator/trace/jaeger/jaegerthrift_to_protospan.go index 31db555c3f8..75a8b0fa7e9 100644 --- a/translator/trace/jaeger/jaegerthrift_to_protospan.go +++ b/translator/trace/jaeger/jaegerthrift_to_protospan.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,13 +21,13 @@ import ( "strconv" "time" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" ) // ThriftBatchToOCProto converts a single Jaeger Thrift batch of spans to a OC proto batch. diff --git a/translator/trace/jaeger/jaegerthrift_to_protospan_test.go b/translator/trace/jaeger/jaegerthrift_to_protospan_test.go index 7b84e2e3dc2..51be1e297e3 100644 --- a/translator/trace/jaeger/jaegerthrift_to_protospan_test.go +++ b/translator/trace/jaeger/jaegerthrift_to_protospan_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,10 +24,10 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/testutils" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" ) func TestThriftBatchToOCProto_Roundtrip(t *testing.T) { diff --git a/translator/trace/jaeger/protospan_to_jaegerproto.go b/translator/trace/jaeger/protospan_to_jaegerproto.go index 4cbab0b1a41..36772e12f90 100644 --- a/translator/trace/jaeger/protospan_to_jaegerproto.go +++ b/translator/trace/jaeger/protospan_to_jaegerproto.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,17 +23,17 @@ import ( wrappers "github.com/golang/protobuf/ptypes/wrappers" jaeger "github.com/jaegertracing/jaeger/model" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" ) var ( unknownProcessProto = &jaeger.Process{ServiceName: "unknown-service-name"} ) -// OCProtoToJaegerProto translates OpenCensus trace data into the Jaeger Proto for GRPC. +// OCProtoToJaegerProto translates OpenTelemetry trace data into the Jaeger Proto for GRPC. func OCProtoToJaegerProto(td data.TraceData) (*jaeger.Batch, error) { jSpans, err := ocSpansToJaegerSpansProto(td.Spans) if err != nil { @@ -98,7 +98,7 @@ func ocNodeToJaegerProcessProto(node *commonpb.Node) *jaeger.Process { } } - // Add OpenCensus library information as tags if available + // Add OpenTelemetry library information as tags if available ocLib := node.LibraryInfo if ocLib != nil { // Only add language if specified @@ -246,7 +246,7 @@ func ocSpanAttributesToJaegerTagsProto(ocAttribs *tracepb.Span_Attributes) []jae jTag.VFloat64 = d jTag.VType = jaeger.ValueType_FLOAT64 default: - str := "" + str := "" jTag.VStr = str jTag.VType = jaeger.ValueType_STRING } @@ -275,7 +275,7 @@ func ocTimeEventsToJaegerLogsProto(ocSpanTimeEvents *tracepb.Span_TimeEvents) [] case *tracepb.Span_TimeEvent_MessageEvent_: jLog.Fields = ocMessageEventToJaegerTagsProto(teValue.MessageEvent) default: - msg := "An unknown OpenCensus TimeEvent type was detected when translating to Jaeger" + msg := "An unknown OpenTelemetry TimeEvent type was detected when translating to Jaeger" jKV := jaeger.KeyValue{ Key: ocTimeEventUnknownType, VStr: msg, diff --git a/translator/trace/jaeger/protospan_to_jaegerproto_test.go b/translator/trace/jaeger/protospan_to_jaegerproto_test.go index 21dea5f5783..05ebbedc94f 100644 --- a/translator/trace/jaeger/protospan_to_jaegerproto_test.go +++ b/translator/trace/jaeger/protospan_to_jaegerproto_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,13 +20,13 @@ import ( "sort" "testing" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" jaeger "github.com/jaegertracing/jaeger/model" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/testutils" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" ) func TestNilOCProtoNodeToJaegerProto(t *testing.T) { @@ -107,7 +107,7 @@ func TestOCProtoToJaegerProto(t *testing.T) { } } -// ocBatches has the OpenCensus proto batches used in the test. They are hard coded because +// ocBatches has the OpenTelemetry proto batches used in the test. They are hard coded because // structs like tracepb.AttributeMap cannot be read from JSON. var ocBatches = []data.TraceData{ { diff --git a/translator/trace/jaeger/protospan_to_jaegerthrift.go b/translator/trace/jaeger/protospan_to_jaegerthrift.go index be0b8093417..0a194cb18e1 100644 --- a/translator/trace/jaeger/protospan_to_jaegerthrift.go +++ b/translator/trace/jaeger/protospan_to_jaegerthrift.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,21 +17,21 @@ package jaeger import ( "fmt" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - "github.com/census-instrumentation/opencensus-service/data" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + "github.com/open-telemetry/opentelemetry-service/data" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" ) var ( unknownProcess = &jaeger.Process{ServiceName: "unknown-service-name"} ) -// OCProtoToJaegerThrift translates OpenCensus trace data into the Jaeger Thrift format. +// OCProtoToJaegerThrift translates OpenTelemetry trace data into the Jaeger Thrift format. func OCProtoToJaegerThrift(td data.TraceData) (*jaeger.Batch, error) { jSpans, err := ocSpansToJaegerSpans(td.Spans) if err != nil { @@ -96,7 +96,7 @@ func ocNodeToJaegerProcess(node *commonpb.Node) *jaeger.Process { } } - // Add OpenCensus library information as tags if available + // Add OpenTelemetry library information as tags if available ocLib := node.LibraryInfo if ocLib != nil { // Only add language if specified @@ -288,7 +288,7 @@ func ocTimeEventsToJaegerLogs(ocSpanTimeEvents *tracepb.Span_TimeEvents) []*jaeg case *tracepb.Span_TimeEvent_MessageEvent_: jLog.Fields = ocMessageEventToJaegerTags(teValue.MessageEvent) default: - msg := "An unknown OpenCensus TimeEvent type was detected when translating to Jaeger" + msg := "An unknown OpenTelemetry TimeEvent type was detected when translating to Jaeger" jTag := &jaeger.Tag{ Key: ocTimeEventUnknownType, VStr: &msg, @@ -416,7 +416,7 @@ func ocSpanAttributesToJaegerTags(ocAttribs *tracepb.Span_Attributes) []*jaeger. jTag.VDouble = &d jTag.VType = jaeger.TagType_DOUBLE default: - str := "" + str := "" jTag.VStr = &str jTag.VType = jaeger.TagType_STRING } diff --git a/translator/trace/jaeger/protospan_to_jaegerthrift_test.go b/translator/trace/jaeger/protospan_to_jaegerthrift_test.go index a799258bca1..69d33cebbdd 100644 --- a/translator/trace/jaeger/protospan_to_jaegerthrift_test.go +++ b/translator/trace/jaeger/protospan_to_jaegerthrift_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,15 +21,15 @@ import ( "strings" "testing" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" "github.com/jaegertracing/jaeger/thrift-gen/jaeger" - "github.com/census-instrumentation/opencensus-service/data" - "github.com/census-instrumentation/opencensus-service/internal/testutils" + "github.com/open-telemetry/opentelemetry-service/data" + "github.com/open-telemetry/opentelemetry-service/internal/testutils" ) func TestInvalidOCProtoIDs(t *testing.T) { diff --git a/translator/trace/protospan_translation.go b/translator/trace/protospan_translation.go index 825a91747ef..f1aa18963c1 100644 --- a/translator/trace/protospan_translation.go +++ b/translator/trace/protospan_translation.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/spandata/protospan_to_spandata.go b/translator/trace/spandata/protospan_to_spandata.go index deb37d964ca..2bf4d170ac8 100644 --- a/translator/trace/spandata/protospan_to_spandata.go +++ b/translator/trace/spandata/protospan_to_spandata.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package spandata defines translators from Trace proto spans to OpenCensus Go spanData. +// Package spandata defines translators from Trace proto spans to OpenTelemetry Go spanData. package spandata import ( @@ -22,7 +22,7 @@ import ( "go.opencensus.io/trace" "go.opencensus.io/trace/tracestate" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" "github.com/golang/protobuf/ptypes/wrappers" ) @@ -165,7 +165,7 @@ func protoAttributesToOCAttributes(attrs *tracepb.Span_Attributes) map[string]in } func protoTimeEventsToOCMessageEvents(tes *tracepb.Span_TimeEvents) []trace.MessageEvent { - // TODO: (@odeke-em) file a bug with OpenCensus-Go and ask them why + // TODO: (@odeke-em) file a bug with OpenTelemetry-Go and ask them why // only MessageEvents are implemented. if tes == nil || len(tes.TimeEvent) == 0 { return nil @@ -182,7 +182,7 @@ func protoTimeEventsToOCMessageEvents(tes *tracepb.Span_TimeEvents) []trace.Mess } me := tme.MessageEvent var ocme trace.MessageEvent - // TODO: (@odeke-em) file an issue with OpenCensus-Go to ask why + // TODO: (@odeke-em) file an issue with OpenTelemetry-Go to ask why // they have these attributes as int64 yet the proto definitions // are uint64, this could be a potential loss of precision particularly // in very high traffic systems. @@ -218,7 +218,7 @@ func protoTimeEventsToOCAnnotations(tes *tracepb.Span_TimeEvents) []trace.Annota } me := tann.Annotation var ocann trace.Annotation - // TODO: (@odeke-em) file an issue with OpenCensus-Go to ask why + // TODO: (@odeke-em) file an issue with OpenTelemetry-Go to ask why // they have these attributes as int64 yet the proto definitions // are uint64, this could be a potential loss of precision particularly // in very high traffic systems. diff --git a/translator/trace/spandata/protospan_to_spandata_test.go b/translator/trace/spandata/protospan_to_spandata_test.go index 91fb3bd0e5d..4fadbd08948 100644 --- a/translator/trace/spandata/protospan_to_spandata_test.go +++ b/translator/trace/spandata/protospan_to_spandata_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ import ( "go.opencensus.io/trace" "go.opencensus.io/trace/tracestate" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/internal" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/internal" ) func TestProtoSpanToOCSpanData_endToEnd(t *testing.T) { diff --git a/translator/trace/zipkin/zipkinv1_thrift_to_protospan.go b/translator/trace/zipkin/zipkinv1_thrift_to_protospan.go index 0a68ae7e267..7cc2a12cd90 100644 --- a/translator/trace/zipkin/zipkinv1_thrift_to_protospan.go +++ b/translator/trace/zipkin/zipkinv1_thrift_to_protospan.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,13 +22,13 @@ import ( "math" "net" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "github.com/pkg/errors" - "github.com/census-instrumentation/opencensus-service/data" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + "github.com/open-telemetry/opentelemetry-service/data" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" ) // V1ThriftBatchToOCProto converts Zipkin v1 spans to OC Proto. @@ -56,7 +56,7 @@ func zipkinV1ThriftToOCSpan(zSpan *zipkincore.Span) (*tracepb.Span, *annotationP } // TODO: (@pjanotti) ideally we should error here instead of generating invalid OC proto - // however per https://github.com/census-instrumentation/opencensus-service/issues/349 + // however per https://github.com/open-telemetry/opentelemetry-service/issues/349 // failures on the receivers in general are silent at this moment, so letting them // proceed for now. We should validate the traceID, spanID and parentID are good with // OC proto requirements. diff --git a/translator/trace/zipkin/zipkinv1_thrift_to_protospan_test.go b/translator/trace/zipkin/zipkinv1_thrift_to_protospan_test.go index ff2bdf86008..0bdecac1839 100644 --- a/translator/trace/zipkin/zipkinv1_thrift_to_protospan_test.go +++ b/translator/trace/zipkin/zipkinv1_thrift_to_protospan_test.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/translator/trace/zipkin/zipkinv1_to_protospan.go b/translator/trace/zipkin/zipkinv1_to_protospan.go index 05137d1095a..bf785bf3f09 100644 --- a/translator/trace/zipkin/zipkinv1_to_protospan.go +++ b/translator/trace/zipkin/zipkinv1_to_protospan.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -20,10 +20,10 @@ import ( "math" "strconv" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" - tracetranslator "github.com/census-instrumentation/opencensus-service/translator/trace" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" + tracetranslator "github.com/open-telemetry/opentelemetry-service/translator/trace" "github.com/golang/protobuf/ptypes/timestamp" "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" "github.com/pkg/errors" diff --git a/translator/trace/zipkin/zipkinv1_to_protospan_test.go b/translator/trace/zipkin/zipkinv1_to_protospan_test.go index c67b64c3590..fad9590da54 100644 --- a/translator/trace/zipkin/zipkinv1_to_protospan_test.go +++ b/translator/trace/zipkin/zipkinv1_to_protospan_test.go @@ -1,4 +1,4 @@ -// Copyright 2018, OpenCensus Authors +// Copyright 2018, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import ( "sort" "testing" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" - "github.com/census-instrumentation/opencensus-service/data" + commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" + tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" + "github.com/open-telemetry/opentelemetry-service/data" "github.com/golang/protobuf/ptypes/timestamp" ) @@ -239,7 +239,7 @@ func sortTraceByNodeName(trace []data.TraceData) { }) } -// ocBatches has the OpenCensus proto batches used in the test. They are hard coded because +// ocBatches has the OpenTelemetry proto batches used in the test. They are hard coded because // structs like tracepb.AttributeMap cannot be ready from JSON. var ocBatchesFromZipkinV1 = []data.TraceData{ { diff --git a/unisvc/service.go b/unisvc/service.go index ae8ea75c636..632e6a0b1cd 100644 --- a/unisvc/service.go +++ b/unisvc/service.go @@ -1,4 +1,4 @@ -// Copyright 2019, OpenCensus Authors +// Copyright 2019, OpenTelemetry Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ package unisvc import ( "log" - "github.com/census-instrumentation/opencensus-service/cmd/occollector/app/collector" + "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/collector" ) // Run the unified telemetry service. From f4894bd94582d2c1e7a5c73296aab0aeabfbb84f Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 17 Jun 2019 18:34:27 -0700 Subject: [PATCH 4/5] Rename go packages --- cmd/ocagent/config.yaml | 2 +- cmd/ocagent/main.go | 8 +-- cmd/occollector/app/builder/builder.go | 8 +-- cmd/occollector/app/builder/builder_test.go | 12 ++-- .../app/builder/exporters_builder_test.go | 16 ++--- .../builder/testdata/oc_keepalive_config.yaml | 2 +- .../builder/testdata/receivers_disabled.yaml | 2 +- .../builder/testdata/receivers_enabled.yaml | 2 +- .../app/builder/testdata/sampling_config.yaml | 2 +- .../app/collector/collector_test.go | 2 +- cmd/occollector/app/collector/receivers.go | 2 +- cmd/occollector/app/collector/telemetry.go | 4 +- .../app/collector/testdata/unisvc-config.yaml | 4 +- demos/trace/docker-compose.yaml | 18 +++--- demos/trace/oc-agent-config.yaml | 6 +- demos/trace/oc-collector-config.yaml | 2 +- example/k8s.yaml | 26 ++++---- example/main.go | 10 ++-- exporter/README.md | 2 +- exporter/awsexporter/aws_xray.go | 4 +- exporter/awsexporter/aws_xray_test.go | 2 +- exporter/datadogexporter/datadog.go | 2 +- exporter/exporterhelper/common.go | 2 +- exporter/exporterhelper/common_test.go | 2 +- exporter/exporterhelper/metricshelper.go | 2 +- exporter/exporterhelper/metricshelper_test.go | 2 +- exporter/exporterhelper/tracehelper.go | 2 +- exporter/exporterhelper/tracehelper_test.go | 2 +- exporter/exporterwrapper/exporterwrapper.go | 2 +- exporter/honeycombexporter/honeycomb.go | 2 +- exporter/jaegerexporter/jaeger.go | 6 +- exporter/kafkaexporter/kafka.go | 2 +- exporter/opencensusexporter/config.go | 2 +- exporter/opencensusexporter/config_test.go | 10 ++-- exporter/opencensusexporter/factory.go | 6 +- exporter/opencensusexporter/factory_test.go | 2 +- exporter/opencensusexporter/opencensus.go | 8 +-- .../opencensusexporter_test.go | 50 ++++++++-------- .../opencensusexporter/testdata/config.yaml | 6 +- exporter/stackdriverexporter/stackdriver.go | 8 +-- exporter/wavefrontexporter/README.md | 2 +- exporter/wavefrontexporter/wavefront.go | 2 +- exporter/zipkinexporter/zipkin.go | 6 +- go.mod | 22 +++---- go.sum | 60 +++++++++---------- internal/collector/opencensus/receiver.go | 8 +-- .../collector/opencensus/receiver_test.go | 26 ++++---- internal/collector/processor/metrics.go | 6 +- .../processor/nodebatcher/metrics.go | 6 +- .../processor/nodebatcher/node_batcher.go | 2 +- .../nodebatcher/node_batcher_test.go | 22 +++---- .../processor/queued/queued_processor.go | 6 +- .../processor/tailsampling/metrics.go | 6 +- .../processor/tailsampling/processor.go | 4 +- .../collector/telemetry/process_telemetry.go | 12 ++-- internal/compression/grpc/grpc.go | 2 +- internal/compression/keys.go | 2 +- internal/config/config.go | 24 ++++---- internal/config/tls_credentials_test.go | 8 +-- internal/zpagesserver/zpagesserver.go | 2 +- observability/observability.go | 18 +++--- .../observabilitytest/observabilitytest.go | 4 +- receiver/README.md | 14 ++--- receiver/end_to_end_test.go | 8 +-- receiver/jaegerreceiver/jaeger_agent_test.go | 4 +- .../jaegerreceiver/trace_receiver_test.go | 4 +- receiver/opencensusreceiver/config.go | 2 +- receiver/opencensusreceiver/config_test.go | 6 +- receiver/opencensusreceiver/factory.go | 4 +- receiver/opencensusreceiver/factory_test.go | 2 +- .../ocmetrics/opencensus.go | 2 +- .../octrace/observability_test.go | 4 +- .../opencensusreceiver/octrace/opencensus.go | 4 +- .../octrace/opencensus_test.go | 8 +-- receiver/opencensusreceiver/opencensus.go | 6 +- .../opencensusreceiver/opencensus_test.go | 2 +- receiver/opencensusreceiver/options.go | 6 +- receiver/opencensusreceiver/options_test.go | 2 +- .../opencensusreceiver/testdata/config.yaml | 6 +- .../metrics_receiver_test.go | 6 +- .../vmmetricsreceiver/vm_metrics_collector.go | 2 +- receiver/zipkinreceiver/trace_receiver.go | 4 +- .../zipkinreceiver/trace_receiver_test.go | 2 +- translator/trace/jaeger/constants.go | 22 +++---- .../trace/jaeger/protospan_to_jaegerproto.go | 6 +- .../trace/jaeger/protospan_to_jaegerthrift.go | 6 +- .../proto_batch_no_binary_tags_01.json | 12 ++-- .../thrift_batch_no_binary_tags_01.json | 2 +- .../trace/spandata/protospan_to_spandata.go | 4 +- .../spandata/protospan_to_spandata_test.go | 4 +- 90 files changed, 329 insertions(+), 329 deletions(-) diff --git a/cmd/ocagent/config.yaml b/cmd/ocagent/config.yaml index 3960d6baea1..ce7f23a2fa9 100644 --- a/cmd/ocagent/config.yaml +++ b/cmd/ocagent/config.yaml @@ -1,5 +1,5 @@ receivers: - opencensus: + opentelemtry: address: "127.0.0.1:55678" zipkin: diff --git a/cmd/ocagent/main.go b/cmd/ocagent/main.go index f9d58783523..d0c23579fea 100644 --- a/cmd/ocagent/main.go +++ b/cmd/ocagent/main.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go.opencensus.io/stats/view" + "go.opentelemtry.io/stats/view" "go.uber.org/zap" "go.uber.org/zap/zapcore" @@ -39,7 +39,7 @@ import ( "github.com/open-telemetry/opentelemetry-service/observability" "github.com/open-telemetry/opentelemetry-service/processor/multiconsumer" "github.com/open-telemetry/opentelemetry-service/receiver/jaegerreceiver" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" "github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver" "github.com/open-telemetry/opentelemetry-service/receiver/vmmetricsreceiver" "github.com/open-telemetry/opentelemetry-service/receiver/zipkinreceiver" @@ -211,11 +211,11 @@ func runOCReceiver(logger *zap.Logger, acfg *config.Config, tc consumer.TraceCon } addr := acfg.OpenCensusReceiverAddress() corsOrigins := acfg.OpenCensusReceiverCorsAllowedOrigins() - ocr, err := opencensusreceiver.New(addr, + ocr, err := opentelemetryreceiver.New(addr, tc, mc, tlsCredsOption, - opencensusreceiver.WithCorsOrigins(corsOrigins)) + opentelemetryreceiver.WithCorsOrigins(corsOrigins)) if err != nil { return nil, fmt.Errorf("failed to create the OpenTelemetry receiver on address %q: error %v", addr, err) diff --git a/cmd/occollector/app/builder/builder.go b/cmd/occollector/app/builder/builder.go index 10553bfd240..b31ea6d7405 100644 --- a/cmd/occollector/app/builder/builder.go +++ b/cmd/occollector/app/builder/builder.go @@ -27,14 +27,14 @@ import ( const ( receiversRoot = "receivers" jaegerEntry = "jaeger" - opencensusEntry = "opencensus" + opentelemetryEntry = "opentelemtry" zipkinEntry = "zipkin" zipkinScribeEntry = "zipkin-scribe" // flags configCfg = "config" jaegerReceiverFlg = "receive-jaeger" - ocReceiverFlg = "receive-oc-trace" + ocReceiverFlg = "receive-opentel-trace" zipkinReceiverFlg = "receive-zipkin" zipkinScribeReceiverFlg = "receive-zipkin-scribe" loggingExporterFlg = "logging-exporter" @@ -143,7 +143,7 @@ type keepaliveEnforcementPolicy struct { // OpenCensusReceiverEnabled checks if the OpenTelemetry receiver is enabled, via a command-line flag, environment // variable, or configuration file. func OpenCensusReceiverEnabled(v *viper.Viper) bool { - return featureEnabled(v, ocReceiverFlg, receiversRoot, opencensusEntry) + return featureEnabled(v, ocReceiverFlg, receiversRoot, opentelemetryEntry) } // NewDefaultOpenCensusReceiverCfg returns an instance of OpenCensusReceiverCfg with default values @@ -156,7 +156,7 @@ func NewDefaultOpenCensusReceiverCfg() *OpenCensusReceiverCfg { // InitFromViper returns a OpenCensusReceiverCfg according to the configuration. func (cfg *OpenCensusReceiverCfg) InitFromViper(v *viper.Viper) (*OpenCensusReceiverCfg, error) { - return cfg, initFromViper(cfg, v, receiversRoot, opencensusEntry) + return cfg, initFromViper(cfg, v, receiversRoot, opentelemetryEntry) } // ZipkinReceiverCfg holds configuration for Zipkin receiver. diff --git a/cmd/occollector/app/builder/builder_test.go b/cmd/occollector/app/builder/builder_test.go index a170f1be3cd..18d86c78c24 100644 --- a/cmd/occollector/app/builder/builder_test.go +++ b/cmd/occollector/app/builder/builder_test.go @@ -30,10 +30,10 @@ func TestReceiversEnabledByPresenceWithDefaultSettings(t *testing.T) { t.Fatalf("Failed to load viper from test file: %v", err) } - jaegerEnabled, opencensusEnabled, zipkinEnabled, scribeEnabled := + jaegerEnabled, opentelemetryEnabled, zipkinEnabled, scribeEnabled := JaegerReceiverEnabled(v), OpenCensusReceiverEnabled(v), ZipkinReceiverEnabled(v), ZipkinScribeReceiverEnabled(v) - if !jaegerEnabled || !opencensusEnabled || !zipkinEnabled || !scribeEnabled { - t.Fatalf("Some of the expected receivers were not enabled j:%v oc:%v z:%v scribe:%v", jaegerEnabled, opencensusEnabled, zipkinEnabled, scribeEnabled) + if !jaegerEnabled || !opentelemetryEnabled || !zipkinEnabled || !scribeEnabled { + t.Fatalf("Some of the expected receivers were not enabled j:%v opentel:%v z:%v scribe:%v", jaegerEnabled, opentelemetryEnabled, zipkinEnabled, scribeEnabled) } wj := NewDefaultJaegerReceiverCfg() @@ -75,10 +75,10 @@ func TestReceiversDisabledByPresenceWithDefaultSettings(t *testing.T) { t.Fatalf("Failed to load viper from test file: %v", err) } - jaegerEnabled, opencensusEnabled, zipkinEnabled, scribeEnabled := + jaegerEnabled, opentelemetryEnabled, zipkinEnabled, scribeEnabled := JaegerReceiverEnabled(v), OpenCensusReceiverEnabled(v), ZipkinReceiverEnabled(v), ZipkinScribeReceiverEnabled(v) - if jaegerEnabled || opencensusEnabled || zipkinEnabled { - t.Fatalf("Not all receivers were disabled j:%v oc:%v z:%v scribe:%v", jaegerEnabled, opencensusEnabled, zipkinEnabled, scribeEnabled) + if jaegerEnabled || opentelemetryEnabled || zipkinEnabled { + t.Fatalf("Not all receivers were disabled j:%v opentel:%v z:%v scribe:%v", jaegerEnabled, opentelemetryEnabled, zipkinEnabled, scribeEnabled) } } diff --git a/cmd/occollector/app/builder/exporters_builder_test.go b/cmd/occollector/app/builder/exporters_builder_test.go index d4528aac831..74971d2b065 100644 --- a/cmd/occollector/app/builder/exporters_builder_test.go +++ b/cmd/occollector/app/builder/exporters_builder_test.go @@ -23,17 +23,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/opentelemetryexporter" "github.com/open-telemetry/opentelemetry-service/internal/configmodels" ) func TestExportersBuilder_Build(t *testing.T) { config := &configmodels.ConfigV2{ Exporters: map[string]configmodels.Exporter{ - "opencensus": &opencensusexporter.ConfigV2{ + "opentelemtry": &opentelemetryexporter.ConfigV2{ ExporterSettings: configmodels.ExporterSettings{ - NameVal: "opencensus", - TypeVal: "opencensus", + NameVal: "opentelemtry", + TypeVal: "opentelemtry", Enabled: true, }, Endpoint: "0.0.0.0:12345", @@ -44,7 +44,7 @@ func TestExportersBuilder_Build(t *testing.T) { "trace": { Name: "trace", InputType: configmodels.TracesDataType, - Exporters: []string{"opencensus"}, + Exporters: []string{"opentelemtry"}, }, }, } @@ -54,7 +54,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NoError(t, err) require.NotNil(t, exporters) - e1 := exporters[config.Exporters["opencensus"]] + e1 := exporters[config.Exporters["opentelemtry"]] // Ensure exporter has its fields correctly populated. require.NotNil(t, e1) @@ -66,7 +66,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NoError(t, e1.Stop()) // Now change only pipeline data type to "metrics" and make sure exporter builder - // now fails (because opencensus exporter does not currently support metrics). + // now fails (because opentelemtry exporter does not currently support metrics). config.Pipelines["trace"].InputType = configmodels.MetricsDataType _, err = NewExportersBuilder(zap.NewNop(), config).Build() assert.NotNil(t, err) @@ -79,7 +79,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NotNil(t, exporters) assert.Nil(t, err) - e1 = exporters[config.Exporters["opencensus"]] + e1 = exporters[config.Exporters["opentelemtry"]] // Ensure exporter has its fields correctly populated. require.NotNil(t, e1) diff --git a/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml b/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml index 043bc07336b..7bde6997ff9 100644 --- a/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml +++ b/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml @@ -1,5 +1,5 @@ receivers: - opencensus: + opentelemtry: keepalive: server-parameters: time: 30s diff --git a/cmd/occollector/app/builder/testdata/receivers_disabled.yaml b/cmd/occollector/app/builder/testdata/receivers_disabled.yaml index 565ed7a5ec8..59a6cf6de9e 100644 --- a/cmd/occollector/app/builder/testdata/receivers_disabled.yaml +++ b/cmd/occollector/app/builder/testdata/receivers_disabled.yaml @@ -1,6 +1,6 @@ # No receivers enabled, all commented out receivers: # jaeger: {} - # opencensus: {} + # opentelemtry: {} # zipkin: {} # zipkin-scribe: {} diff --git a/cmd/occollector/app/builder/testdata/receivers_enabled.yaml b/cmd/occollector/app/builder/testdata/receivers_enabled.yaml index 0c011be00b3..e3c12f58248 100644 --- a/cmd/occollector/app/builder/testdata/receivers_enabled.yaml +++ b/cmd/occollector/app/builder/testdata/receivers_enabled.yaml @@ -1,6 +1,6 @@ # Enable receivers with default configuration receivers: jaeger: {} - opencensus: {} + opentelemtry: {} zipkin: {} zipkin-scribe: {} diff --git a/cmd/occollector/app/builder/testdata/sampling_config.yaml b/cmd/occollector/app/builder/testdata/sampling_config.yaml index 5a8b50cc468..b2eb317192f 100644 --- a/cmd/occollector/app/builder/testdata/sampling_config.yaml +++ b/cmd/occollector/app/builder/testdata/sampling_config.yaml @@ -1,7 +1,7 @@ receivers: jaeger: collector_http_port: 14268 - opencensus: + opentelemtry: address: "127.0.0.1:55678" queued-exporters: jaeger1: diff --git a/cmd/occollector/app/collector/collector_test.go b/cmd/occollector/app/collector/collector_test.go index 57899eaf225..4619ddec16e 100644 --- a/cmd/occollector/app/collector/collector_test.go +++ b/cmd/occollector/app/collector/collector_test.go @@ -32,7 +32,7 @@ func TestApplication_Start(t *testing.T) { healthCheckHTTPPort, // Keep it as first since its address is used later. zpagesserver.ZPagesHTTPPort, "metrics-port", - "receivers.opencensus.port", + "receivers.opentelemtry.port", } addresses := getMultipleAvailableLocalAddresses(t, uint(len(portArg))) for i, addr := range addresses { diff --git a/cmd/occollector/app/collector/receivers.go b/cmd/occollector/app/collector/receivers.go index 5d180710eb1..8807928d446 100644 --- a/cmd/occollector/app/collector/receivers.go +++ b/cmd/occollector/app/collector/receivers.go @@ -24,7 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" "github.com/open-telemetry/opentelemetry-service/consumer" jaegerreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/jaeger" - ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opencensus" + ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opentelemtry" zipkinreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin" zipkinscribereceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin/scribe" "github.com/open-telemetry/opentelemetry-service/receiver" diff --git a/cmd/occollector/app/collector/telemetry.go b/cmd/occollector/app/collector/telemetry.go index b2cd303d907..c5ccfea79bd 100644 --- a/cmd/occollector/app/collector/telemetry.go +++ b/cmd/occollector/app/collector/telemetry.go @@ -20,9 +20,9 @@ import ( "net/http" "strconv" - "contrib.go.opencensus.io/exporter/prometheus" + "contrib.go.opentelemtry.io/exporter/prometheus" "github.com/spf13/viper" - "go.opencensus.io/stats/view" + "go.opentelemtry.io/stats/view" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" diff --git a/cmd/occollector/app/collector/testdata/unisvc-config.yaml b/cmd/occollector/app/collector/testdata/unisvc-config.yaml index a28a771ef81..5a113129ddc 100644 --- a/cmd/occollector/app/collector/testdata/unisvc-config.yaml +++ b/cmd/occollector/app/collector/testdata/unisvc-config.yaml @@ -3,7 +3,7 @@ receivers: enabled: true exporters: - opencensus: + opentelemtry: endpoint: "locahost:55678" enabled: true @@ -15,4 +15,4 @@ pipelines: traces: receivers: [jaeger] processors: [attributes] - exporters: [opencensus] + exporters: [opentelemtry] diff --git a/demos/trace/docker-compose.yaml b/demos/trace/docker-compose.yaml index 10ad5ed278f..72a622fd811 100644 --- a/demos/trace/docker-compose.yaml +++ b/demos/trace/docker-compose.yaml @@ -15,11 +15,11 @@ services: - "9411:9411" # Collector - oc-collector: + opentel-collector: image: occollector:latest - command: ["--config=/etc/oc-collector-config.yaml", "--http-pprof-port=1777"] + command: ["--config=/etc/opentel-collector-config.yaml", "--http-pprof-port=1777"] volumes: - - ./oc-collector-config.yaml:/etc/oc-collector-config.yaml + - ./opentel-collector-config.yaml:/etc/opentel-collector-config.yaml ports: - "55678" - "55680:55679" @@ -30,24 +30,24 @@ services: - zipkin-all-in-one # Agent - oc-agent: + opentel-agent: image: ocagent:latest - command: ["--config=/etc/oc-agent-config.yaml", "--http-pprof-port=1888"] + command: ["--config=/etc/opentel-agent-config.yaml", "--http-pprof-port=1888"] volumes: - - ./oc-agent-config.yaml:/etc/oc-agent-config.yaml + - ./opentel-agent-config.yaml:/etc/opentel-agent-config.yaml ports: - "1888:1888" - "14268" - "55678" - "55679:55679" depends_on: - - oc-collector + - opentel-collector # Synthetic load generator synthetic-load-generator: image: omnition/synthetic-load-generator:1.0.25 environment: - - JAEGER_COLLECTOR_URL=http://oc-agent:14268 + - JAEGER_COLLECTOR_URL=http://opentel-agent:14268 depends_on: - - oc-agent + - opentel-agent diff --git a/demos/trace/oc-agent-config.yaml b/demos/trace/oc-agent-config.yaml index 6288f22fe07..8a2bdaec22a 100644 --- a/demos/trace/oc-agent-config.yaml +++ b/demos/trace/oc-agent-config.yaml @@ -1,10 +1,10 @@ receivers: - opencensus: + opentelemtry: address: ":55678" reconnection-delay: 2s jaeger: collector_http_port: 14268 exporters: - opencensus: - endpoint: "oc-collector:55678" + opentelemtry: + endpoint: "opentel-collector:55678" diff --git a/demos/trace/oc-collector-config.yaml b/demos/trace/oc-collector-config.yaml index 4c083159695..0707ac41134 100644 --- a/demos/trace/oc-collector-config.yaml +++ b/demos/trace/oc-collector-config.yaml @@ -1,5 +1,5 @@ receivers: - opencensus: + opentelemtry: port: 55678 exporters: diff --git a/example/k8s.yaml b/example/k8s.yaml index 5573c05956f..43471b2f40e 100644 --- a/example/k8s.yaml +++ b/example/k8s.yaml @@ -4,16 +4,16 @@ kind: ConfigMap metadata: name: opentel-agent-conf labels: - app: opencensus + app: opentelemtry component: opentel-agent-conf data: opentel-agent-config: | receivers: - opencensus: {} + opentelemtry: {} # jaeger: {} # zipkin: {} exporters: - opencensus: + opentelemtry: endpoint: "opentel-collector.default:55678" # TODO: Update me --- apiVersion: extensions/v1beta1 @@ -21,20 +21,20 @@ kind: DaemonSet metadata: name: opentel-agent labels: - app: opencensus + app: opentelemtry component: opentel-agent spec: template: metadata: labels: - app: opencensus + app: opentelemtry component: opentel-agent spec: containers: - command: - "/opentelagent_linux" - "--config=/conf/opentel-agent-config.yaml" - image: omnition/opencensus-agent:0.1.6 + image: omnition/opentelemtry-agent:0.1.6 name: opentel-agent resources: limits: @@ -65,12 +65,12 @@ kind: ConfigMap metadata: name: opentel-collector-conf labels: - app: opencensus + app: opentelemtry component: opentel-collector-conf data: opentel-collector-config: | receivers: - opencensus: + opentelemtry: # keepalive settings can help load balancing, see receiver/README.md for more info. keepalive: server-parameters: @@ -92,7 +92,7 @@ data: num-workers: 16 queue-size: 10000 retry-on-failure: true - opencensus: + opentelemtry: compression: "gzip" endpoint: "ingest.omnition.io:443" headers: { "x-omnition-api-key":"00000000-0000-0000-0000-000000000001" } # TODO: Update me @@ -109,7 +109,7 @@ metadata: component: opentel-collector spec: ports: - - name: opencensus + - name: opentelemtry port: 55678 protopentelol: TCP targetPort: 55678 @@ -127,7 +127,7 @@ kind: Deployment metadata: name: opentel-collector labels: - app: opencensus + app: opentelemtry component: opentel-collector spec: minReadySeconds: 5 @@ -140,7 +140,7 @@ spec: prometheus.io/port: "8888" prometheus.io/scrape: "true" labels: - app: opencensus + app: opentelemtry component: opentel-collector spec: containers: @@ -150,7 +150,7 @@ spec: env: - name: GOGC value: "80" - image: omnition/opencensus-collector:0.1.6 + image: omnition/opentelemtry-collector:0.1.6 name: opentel-collector resources: limits: diff --git a/example/main.go b/example/main.go index 484e647d4ea..eeffc88e5b5 100644 --- a/example/main.go +++ b/example/main.go @@ -23,11 +23,11 @@ import ( "os" "time" - "contrib.go.opencensus.io/exporter/ocagent" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" - "go.opencensus.io/trace" + "contrib.go.opentelemtry.io/exporter/ocagent" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" + "go.opentelemtry.io/trace" ) func main() { diff --git a/exporter/README.md b/exporter/README.md index a1e4c27ef41..2fdb3beb415 100644 --- a/exporter/README.md +++ b/exporter/README.md @@ -83,7 +83,7 @@ queued-exporters: timeout: 5s # Non-sender exporters can now also be used by setting the exporters section in queued-exporters. exporters: - opencensus: + opentelemtry: endpoint: "127.0.0.1:55566" cert-pem-file: "server_ca_public.pem" # PEM file used to enable TLS. For trusted CAs from # system pool use "secure:" setting, see below. diff --git a/exporter/awsexporter/aws_xray.go b/exporter/awsexporter/aws_xray.go index 4af229420fa..ef0633e84dc 100644 --- a/exporter/awsexporter/aws_xray.go +++ b/exporter/awsexporter/aws_xray.go @@ -21,8 +21,8 @@ import ( "sync" "time" - xray "contrib.go.opencensus.io/exporter/aws" - "go.opencensus.io/trace" + xray "contrib.go.opentelemtry.io/exporter/aws" + "go.opentelemtry.io/trace" "github.com/spf13/viper" diff --git a/exporter/awsexporter/aws_xray_test.go b/exporter/awsexporter/aws_xray_test.go index 124e5dc2d07..790dbe22450 100644 --- a/exporter/awsexporter/aws_xray_test.go +++ b/exporter/awsexporter/aws_xray_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - xray "contrib.go.opencensus.io/exporter/aws" + xray "contrib.go.opentelemtry.io/exporter/aws" ) func TestTransformConfigToXRayOptions(t *testing.T) { diff --git a/exporter/datadogexporter/datadog.go b/exporter/datadogexporter/datadog.go index 78e53615adf..76d1f80ef69 100644 --- a/exporter/datadogexporter/datadog.go +++ b/exporter/datadogexporter/datadog.go @@ -15,7 +15,7 @@ package datadogexporter import ( - datadog "github.com/DataDog/opencensus-go-exporter-datadog" + datadog "github.com/DataDog/opentelemtry-go-exporter-datadog" "github.com/spf13/viper" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index db503e655fa..f187fa199b3 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -15,7 +15,7 @@ package exporterhelper import ( - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" ) var ( diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index bd302b3a150..c07dcb19496 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" ) func TestDefaultOptions(t *testing.T) { diff --git a/exporter/exporterhelper/metricshelper.go b/exporter/exporterhelper/metricshelper.go index 485d6ab2733..f8aa64ac2db 100644 --- a/exporter/exporterhelper/metricshelper.go +++ b/exporter/exporterhelper/metricshelper.go @@ -18,7 +18,7 @@ import ( "context" "github.com/open-telemetry/opentelemetry-service/observability" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/metricshelper_test.go b/exporter/exporterhelper/metricshelper_test.go index 8fff8e15cf8..808f6f36bb1 100644 --- a/exporter/exporterhelper/metricshelper_test.go +++ b/exporter/exporterhelper/metricshelper_test.go @@ -19,7 +19,7 @@ import ( "testing" metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/tracehelper.go b/exporter/exporterhelper/tracehelper.go index d61ca13f005..16948babeb1 100644 --- a/exporter/exporterhelper/tracehelper.go +++ b/exporter/exporterhelper/tracehelper.go @@ -17,7 +17,7 @@ package exporterhelper import ( "context" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/tracehelper_test.go b/exporter/exporterhelper/tracehelper_test.go index c61441813b8..44c4753d842 100644 --- a/exporter/exporterhelper/tracehelper_test.go +++ b/exporter/exporterhelper/tracehelper_test.go @@ -20,7 +20,7 @@ import ( "testing" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterwrapper/exporterwrapper.go b/exporter/exporterwrapper/exporterwrapper.go index 11834daa831..f05f2ee1adc 100644 --- a/exporter/exporterwrapper/exporterwrapper.go +++ b/exporter/exporterwrapper/exporterwrapper.go @@ -24,7 +24,7 @@ package exporterwrapper import ( "context" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/open-telemetry/opentelemetry-service/data" diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go index 6ab23eeb28c..69610ad208c 100644 --- a/exporter/honeycombexporter/honeycomb.go +++ b/exporter/honeycombexporter/honeycomb.go @@ -18,7 +18,7 @@ package honeycombexporter // ask them to make an exporter that uses OpenTelemetry-Proto instead of OpenTelemetry-Go. import ( - "github.com/honeycombio/opencensus-exporter/honeycomb" + "github.com/honeycombio/opentelemtry-exporter/honeycomb" "github.com/spf13/viper" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/exporter/jaegerexporter/jaeger.go b/exporter/jaegerexporter/jaeger.go index 80269dfdbb5..9c2b43b376a 100644 --- a/exporter/jaegerexporter/jaeger.go +++ b/exporter/jaegerexporter/jaeger.go @@ -17,13 +17,13 @@ package jaegerexporter import ( "github.com/spf13/viper" - "contrib.go.opencensus.io/exporter/jaeger" + "contrib.go.opentelemtry.io/exporter/jaeger" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) -// Slight modified version of go/src/contrib.go.opencensus.io/exporter/jaeger/jaeger.go +// Slight modified version of go/src/contrib.go.opentelemtry.io/exporter/jaeger/jaeger.go type jaegerConfig struct { CollectorEndpoint string `mapstructure:"collector_endpoint,omitempty"` Username string `mapstructure:"username,omitempty"` @@ -67,7 +67,7 @@ func JaegerExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps if err != nil { return nil, nil, nil, err } - // TODO: Examine "contrib.go.opencensus.io/exporter/jaeger" to see + // TODO: Examine "contrib.go.opentelemtry.io/exporter/jaeger" to see // if trace.ExportSpan was constraining and if perhaps the Jaeger // upload can use the context and information from the Node. tps = append(tps, jte) diff --git a/exporter/kafkaexporter/kafka.go b/exporter/kafkaexporter/kafka.go index d6ef7a79e46..3868fd14e93 100644 --- a/exporter/kafkaexporter/kafka.go +++ b/exporter/kafkaexporter/kafka.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/viper" - kafka "github.com/yancl/opencensus-go-exporter-kafka" + kafka "github.com/yancl/opentelemtry-go-exporter-kafka" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" diff --git a/exporter/opencensusexporter/config.go b/exporter/opencensusexporter/config.go index db623fb32b7..22be2db1fb4 100644 --- a/exporter/opencensusexporter/config.go +++ b/exporter/opencensusexporter/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "time" diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index 04c59509159..dee35e4a3a7 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "path" @@ -36,15 +36,15 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NotNil(t, config) - e0 := config.Exporters["opencensus"] + e0 := config.Exporters["opentelemtry"] assert.Equal(t, e0, factory.CreateDefaultConfig()) - e1 := config.Exporters["opencensus/2"] + e1 := config.Exporters["opentelemtry/2"] assert.Equal(t, e1, &ConfigV2{ ExporterSettings: configmodels.ExporterSettings{ - NameVal: "opencensus/2", - TypeVal: "opencensus", + NameVal: "opentelemtry/2", + TypeVal: "opentelemtry", Enabled: true, }, Headers: map[string]string{ diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index edfb0a5b064..a3aa64fb8f1 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "crypto/x509" @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opentelemtry.io/exporter/ocagent" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" @@ -36,7 +36,7 @@ var _ = factories.RegisterExporterFactory(&exporterFactory{}) const ( // The value of "type" key in configuration. - typeStr = "opencensus" + typeStr = "opentelemtry" ) // exporterFactory is the factory for OpenTelemetry exporter. diff --git a/exporter/opencensusexporter/factory_test.go b/exporter/opencensusexporter/factory_test.go index 960986c9ded..9415043a688 100644 --- a/exporter/opencensusexporter/factory_test.go +++ b/exporter/opencensusexporter/factory_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "testing" diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index 2ded845ec8a..ca85e746c49 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "context" @@ -21,7 +21,7 @@ import ( "sync" "time" - "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opentelemtry.io/exporter/ocagent" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" "github.com/spf13/viper" "google.golang.org/grpc" @@ -44,7 +44,7 @@ type keepaliveConfig struct { PermitWithoutStream bool `mapstructure:"permit-without-stream,omitempty"` } -type opencensusConfig struct { +type opentelemetryConfig struct { Endpoint string `mapstructure:"endpoint,omitempty"` Compression string `mapstructure:"compression,omitempty"` Headers map[string]string `mapstructure:"headers,omitempty"` @@ -91,7 +91,7 @@ const ( // OpenTelemetry Agent/Collector according to the configuration settings. func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps []consumer.MetricsConsumer, doneFns []func() error, err error) { var cfg struct { - OpenTelemetry *opencensusConfig `mapstructure:"opencensus"` + OpenTelemetry *opentelemetryConfig `mapstructure:"opentelemtry"` } if err := v.Unmarshal(&cfg); err != nil { return nil, nil, nil, err diff --git a/exporter/opencensusexporter/opencensusexporter_test.go b/exporter/opencensusexporter/opencensusexporter_test.go index cc829fe60a9..eba256ba578 100644 --- a/exporter/opencensusexporter/opencensusexporter_test.go +++ b/exporter/opencensusexporter/opencensusexporter_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusexporter +package opentelemetryexporter import ( "context" @@ -26,15 +26,15 @@ import ( func TestOpenCensusTraceExportersFromViper(t *testing.T) { v := viper.New() - v.Set("opencensus", map[interface{}]interface{}{}) - v.Set("opencensus.endpoint", "") + v.Set("opentelemtry", map[interface{}]interface{}{}) + v.Set("opentelemtry.endpoint", "") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errEndpointRequired { t.Fatalf("Expected to get errEndpointRequired. Got %v", err) } - v.Set("opencensus.endpoint", "127.0.0.1:55678") + v.Set("opentelemtry.endpoint", "127.0.0.1:55678") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { @@ -47,15 +47,15 @@ func TestOpenCensusTraceExportersFromViper(t *testing.T) { func TestOpenCensusTraceExportersFromViper_TLS(t *testing.T) { v := viper.New() - v.Set("opencensus.endpoint", "127.0.0.1:55678") - v.Set("opencensus.cert-pem-file", "dummy_file.pem") + v.Set("opentelemtry.endpoint", "127.0.0.1:55678") + v.Set("opentelemtry.cert-pem-file", "dummy_file.pem") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errUnableToGetTLSCreds { t.Fatalf("Expected to get errUnableToGetTLSCreds but got %v", err) } - v.Set("opencensus.cert-pem-file", "testdata/test_cert.pem") + v.Set("opentelemtry.cert-pem-file", "testdata/test_cert.pem") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { t.Fatalf("Unexpected error building OpenTelemetry Exporter") @@ -67,14 +67,14 @@ func TestOpenCensusTraceExportersFromViper_TLS(t *testing.T) { func TestOpenCensusTraceExportersFromViper_Compression(t *testing.T) { v := viper.New() - v.Set("opencensus.endpoint", "127.0.0.1:55678") - v.Set("opencensus.compression", "random-compression") + v.Set("opentelemtry.endpoint", "127.0.0.1:55678") + v.Set("opentelemtry.compression", "random-compression") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errUnsupportedCompressionType { t.Fatalf("Expected to get errUnsupportedCompressionType but got %v", err) } - v.Set("opencensus.compression", "gzip") + v.Set("opentelemtry.compression", "gzip") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { t.Fatalf("Unexpected error building OpenTelemetry Exporter") @@ -86,7 +86,7 @@ func TestOpenCensusTraceExportersFromViper_Compression(t *testing.T) { func TestOpenCensusTraceExporters_StopError(t *testing.T) { v := viper.New() - v.Set("opencensus.endpoint", "127.0.0.1:55678") + v.Set("opentelemtry.endpoint", "127.0.0.1:55678") tps, _, doneFns, err := OpenCensusTraceExportersFromViper(v) doneFnCalled := false defer func() { @@ -127,15 +127,15 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { tests := []struct { name string configMap map[string]string - want opencensusConfig + want opentelemetryConfig }{ { name: "UseSecure", configMap: map[string]string{ - "opencensus.endpoint": defaultTestEndPoint, - "opencensus.secure": "true", + "opentelemtry.endpoint": defaultTestEndPoint, + "opentelemtry.secure": "true", }, - want: opencensusConfig{ + want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, UseSecure: true, }, @@ -143,10 +143,10 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { { name: "ReconnectionDelay", configMap: map[string]string{ - "opencensus.endpoint": defaultTestEndPoint, - "opencensus.reconnection-delay": "5s", + "opentelemtry.endpoint": defaultTestEndPoint, + "opentelemtry.reconnection-delay": "5s", }, - want: opencensusConfig{ + want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, ReconnectionDelay: 5 * time.Second, }, @@ -154,12 +154,12 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { { name: "KeepaliveParameters", configMap: map[string]string{ - "opencensus.endpoint": defaultTestEndPoint, - "opencensus.keepalive.time": "30s", - "opencensus.keepalive.timeout": "25s", - "opencensus.keepalive.permit-without-stream": "true", + "opentelemtry.endpoint": defaultTestEndPoint, + "opentelemtry.keepalive.time": "30s", + "opentelemtry.keepalive.timeout": "25s", + "opentelemtry.keepalive.permit-without-stream": "true", }, - want: opencensusConfig{ + want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, KeepaliveParameters: &keepaliveConfig{ Time: 30 * time.Second, @@ -178,8 +178,8 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { } // Ensure that the settings are being read, via UnmarshalExact. - var got opencensusConfig - if err := v.Sub("opencensus").UnmarshalExact(&got); err != nil { + var got opentelemetryConfig + if err := v.Sub("opentelemtry").UnmarshalExact(&got); err != nil { t.Fatalf("UnmarshalExact() error: %v", err) } diff --git a/exporter/opencensusexporter/testdata/config.yaml b/exporter/opencensusexporter/testdata/config.yaml index 3bea7ae1a53..2ddc86180b7 100644 --- a/exporter/opencensusexporter/testdata/config.yaml +++ b/exporter/opencensusexporter/testdata/config.yaml @@ -5,8 +5,8 @@ processors: exampleprocessor: exporters: - opencensus: - opencensus/2: + opentelemtry: + opentelemtry/2: enabled: true endpoint: "1.2.3.4:1234" compression: "on" @@ -27,4 +27,4 @@ pipelines: traces: receivers: [examplereceiver] processors: [exampleprocessor] - exporters: [opencensus] + exporters: [opentelemtry] diff --git a/exporter/stackdriverexporter/stackdriver.go b/exporter/stackdriverexporter/stackdriver.go index b4df4dec169..f085d4f1129 100644 --- a/exporter/stackdriverexporter/stackdriver.go +++ b/exporter/stackdriverexporter/stackdriver.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "contrib.go.opencensus.io/exporter/stackdriver" + "contrib.go.opentelemtry.io/exporter/stackdriver" "github.com/spf13/viper" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" @@ -93,7 +93,7 @@ func StackdriverTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCon return nil, nil, nil, err } - // TODO: Examine "contrib.go.opencensus.io/exporter/stackdriver" to see + // TODO: Examine "contrib.go.opentelemtry.io/exporter/stackdriver" to see // if trace.ExportSpan was constraining and if perhaps the Stackdriver // upload can use the context and information from the Node. if sc.EnableTracing { @@ -113,7 +113,7 @@ func StackdriverTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCon func (sde *stackdriverExporter) ConsumeMetricsData(ctx context.Context, md data.MetricsData) error { ctx, span := trace.StartSpan(ctx, - "opencensus.service.exporter.stackdriver.ExportMetricsData", + "opentelemtry.service.exporter.stackdriver.ExportMetricsData", trace.WithSampler(trace.NeverSample())) defer span.End() diff --git a/exporter/wavefrontexporter/README.md b/exporter/wavefrontexporter/README.md index f357f786d60..98bb78d7cba 100644 --- a/exporter/wavefrontexporter/README.md +++ b/exporter/wavefrontexporter/README.md @@ -58,5 +58,5 @@ exporters: ``` ### References -- [https://github.com/wavefrontHQ/opencensus-exporter](https://github.com/wavefrontHQ/opencensus-exporter) +- [https://github.com/wavefrontHQ/opentelemtry-exporter](https://github.com/wavefrontHQ/opentelemtry-exporter) - [https://github.com/wavefrontHQ/wavefront-sdk-go](https://github.com/wavefrontHQ/wavefront-sdk-go) \ No newline at end of file diff --git a/exporter/wavefrontexporter/wavefront.go b/exporter/wavefrontexporter/wavefront.go index 433edf82980..129513d9c3f 100644 --- a/exporter/wavefrontexporter/wavefront.go +++ b/exporter/wavefrontexporter/wavefront.go @@ -17,7 +17,7 @@ package wavefrontexporter import ( "errors" - "github.com/wavefronthq/opencensus-exporter/wavefront" + "github.com/wavefronthq/opentelemtry-exporter/wavefront" "github.com/wavefronthq/wavefront-sdk-go/senders" "github.com/spf13/viper" diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index fe438a57593..55e4a20ab4e 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -28,7 +28,7 @@ import ( zipkinreporter "github.com/openzipkin/zipkin-go/reporter" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" "github.com/spf13/viper" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" "github.com/open-telemetry/opentelemetry-service/consumer" @@ -194,7 +194,7 @@ func (ze *zipkinExporter) stop() error { func (ze *zipkinExporter) ConsumeTraceData(ctx context.Context, td data.TraceData) (zerr error) { ctx, span := trace.StartSpan(ctx, - "opencensus.service.exporter.zipkin.ExportTrace", + "opentelemtry.service.exporter.zipkin.ExportTrace", trace.WithSampler(trace.NeverSample())) defer func() { @@ -243,7 +243,7 @@ func (ze *zipkinExporter) ConsumeTraceData(ctx context.Context, td data.TraceDat const ( statusCodeTagKey = "error" - statusDescriptionTagKey = "opencensus.status_description" + statusDescriptionTagKey = "opentelemtry.status_description" ) var ( diff --git a/go.mod b/go.mod index a9e1599c076..db5a347b856 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/open-telemetry/opentelemetry-service require ( - contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 - contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 - contrib.go.opencensus.io/exporter/ocagent v0.5.0 - contrib.go.opencensus.io/exporter/prometheus v0.1.0 - contrib.go.opencensus.io/exporter/stackdriver v0.12.2 - contrib.go.opencensus.io/exporter/zipkin v0.1.1 + contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 + contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 + contrib.go.opentelemtry.io/exporter/ocagent v0.5.0 + contrib.go.opentelemtry.io/exporter/prometheus v0.1.0 + contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2 + contrib.go.opentelemtry.io/exporter/zipkin v0.1.1 github.com/DataDog/datadog-go v2.2.0+incompatible // indirect - github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 + github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 github.com/VividCortex/gohistogram v1.0.0 // indirect github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect @@ -24,7 +24,7 @@ require ( github.com/gorilla/mux v1.6.2 github.com/grpc-ecosystem/grpc-gateway v1.8.5 github.com/honeycombio/libhoney-go v1.10.0 // indirect - github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a + github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jaegertracing/jaeger v1.9.0 github.com/omnition/scribe-go v0.0.0-20190131012523-9e3c68f31124 @@ -50,10 +50,10 @@ require ( github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect github.com/uber/jaeger-lib v2.0.0+incompatible github.com/uber/tchannel-go v1.10.0 - github.com/wavefronthq/opencensus-exporter v0.0.0-20190506162721-983d7cdaceaf + github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf github.com/wavefronthq/wavefront-sdk-go v0.9.2 - github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb - go.opencensus.io v0.22.0 + github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb + go.opentelemtry.io v0.22.0 go.uber.org/atomic v1.3.2 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.9.1 diff --git a/go.sum b/go.sum index 456ff2b5bf1..b034d008a31 100644 --- a/go.sum +++ b/go.sum @@ -4,21 +4,21 @@ cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 h1:YsbWYxDZkC7x2OxlsDEYvvEXZ3cBI3qBgUK5BqkZvRw= -contrib.go.opencensus.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 h1:xdP25yLqNGSnpfDmEChwA9ZuKLdiyL0jqJKPm/Ypfag= -contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= -contrib.go.opencensus.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ= -contrib.go.opencensus.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -contrib.go.opencensus.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg= -contrib.go.opencensus.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= -contrib.go.opencensus.io/exporter/stackdriver v0.12.1 h1:Dll2uFfOVI3fa8UzsHyP6z0M6fEc9ZTAMo+Y3z282Xg= -contrib.go.opencensus.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opencensus.io/exporter/stackdriver v0.12.2 h1:jU1p9F07ASK11wYgSTPKtFlTvTtCDj6R1d3nRt0ZHDE= -contrib.go.opencensus.io/exporter/stackdriver v0.12.2/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opencensus.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g= -contrib.go.opencensus.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= -contrib.go.opencensus.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= +contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 h1:YsbWYxDZkC7x2OxlsDEYvvEXZ3cBI3qBgUK5BqkZvRw= +contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= +contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 h1:xdP25yLqNGSnpfDmEChwA9ZuKLdiyL0jqJKPm/Ypfag= +contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= +contrib.go.opentelemtry.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ= +contrib.go.opentelemtry.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= +contrib.go.opentelemtry.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg= +contrib.go.opentelemtry.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= +contrib.go.opentelemtry.io/exporter/stackdriver v0.12.1 h1:Dll2uFfOVI3fa8UzsHyP6z0M6fEc9ZTAMo+Y3z282Xg= +contrib.go.opentelemtry.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2 h1:jU1p9F07ASK11wYgSTPKtFlTvTtCDj6R1d3nRt0ZHDE= +contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opentelemtry.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g= +contrib.go.opentelemtry.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= +contrib.go.opentelemtry.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 h1:sihTnRgTOUSCQz0iS0pjZuFQy/z7GXCJgSBg3+rZKHw= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/Azure/azure-sdk-for-go v0.0.0-20161028183111-bd73d950fa44 h1:L4fLiifszjLnCRGi6Xhp0MgUwjIMbVXKbayoRiVxkU8= @@ -29,8 +29,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v2.2.0+incompatible h1:V5BKkxACZLjzHjSgBbr2gvLA2Ae49yhc6CSY7MLy5k4= github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 h1:WOxkY7ClXANNyQQuq4rxQrM/nQnjXCpvqY0ipYxB9cQ= -github.com/DataDog/opencensus-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= +github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 h1:WOxkY7ClXANNyQQuq4rxQrM/nQnjXCpvqY0ipYxB9cQ= +github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= @@ -207,8 +207,8 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/honeycombio/libhoney-go v1.10.0 h1:eZ5VauogxgWlw26CDkeAmEK/CuhsIVlLgGuKtHdp2c8= github.com/honeycombio/libhoney-go v1.10.0/go.mod h1:jdLxh51fcBTy6XIpx1efuJmHePs2xUfVkw25lr+hsmg= -github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a h1:XZRt69AYOjIRW3KGpzOh0ulEa4DOep0snLPlIgtaXPE= -github.com/honeycombio/opencensus-exporter v0.0.0-20181101214123-9be2bb327b5a/go.mod h1:Zx4YGFb3eHJsstwhyB5yaVGLROSXWCd0b4PkFKb1mdc= +github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a h1:XZRt69AYOjIRW3KGpzOh0ulEa4DOep0snLPlIgtaXPE= +github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a/go.mod h1:Zx4YGFb3eHJsstwhyB5yaVGLROSXWCd0b4PkFKb1mdc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -390,19 +390,19 @@ github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtG github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/tchannel-go v1.10.0 h1:YOihLHuvkwT3nzvpgqFtexFW+pb5vD1Tz7h/bIWApgE= github.com/uber/tchannel-go v1.10.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo= -github.com/wavefronthq/opencensus-exporter v0.0.0-20190506162721-983d7cdaceaf h1:KO5PCIdHHzqs9c9fanhFuBxhK5eRiRz1ZGTqTrm17FU= -github.com/wavefronthq/opencensus-exporter v0.0.0-20190506162721-983d7cdaceaf/go.mod h1:2pXfsubgEW9xaV795VimF4TNNQDyl6YpLCwTInzUvCU= +github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf h1:KO5PCIdHHzqs9c9fanhFuBxhK5eRiRz1ZGTqTrm17FU= +github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf/go.mod h1:2pXfsubgEW9xaV795VimF4TNNQDyl6YpLCwTInzUvCU= github.com/wavefronthq/wavefront-sdk-go v0.9.2 h1:/LvWgZYNjHFUg+ZUX+qv+7e+M8sEMi0lM15zPp681Gk= github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod h1:hQI6y8M9OtTCtc0xdwh+dCER4osxXdEAeCpacjpDZEU= -github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb h1:DSch+h+LW/9zO8ImnA2KzFylC/ShRAAgRPJVlx6FMSA= -github.com/yancl/opencensus-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb/go.mod h1:zfby7AY8Vh0VWAMyiFKkTvMyYKAmWTT5x3DSAOJM6xM= -go.opencensus.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opencensus.io v0.17.0 h1:2Cu88MYg+1LU+WVD+NWwYhyP0kKgRlN9QjWGaX0jKTE= -go.opencensus.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= -go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb h1:DSch+h+LW/9zO8ImnA2KzFylC/ShRAAgRPJVlx6FMSA= +github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb/go.mod h1:zfby7AY8Vh0VWAMyiFKkTvMyYKAmWTT5x3DSAOJM6xM= +go.opentelemtry.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= +go.opentelemtry.io v0.17.0 h1:2Cu88MYg+1LU+WVD+NWwYhyP0kKgRlN9QjWGaX0jKTE= +go.opentelemtry.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= +go.opentelemtry.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= +go.opentelemtry.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opentelemtry.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opentelemtry.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= diff --git a/internal/collector/opencensus/receiver.go b/internal/collector/opencensus/receiver.go index d464e8373d7..36075cd3884 100644 --- a/internal/collector/opencensus/receiver.go +++ b/internal/collector/opencensus/receiver.go @@ -29,7 +29,7 @@ import ( "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/receiver" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" ) // Start starts the OpenTelemetry receiver endpoint. @@ -39,7 +39,7 @@ func Start(logger *zap.Logger, v *viper.Viper, traceConsumer consumer.TraceConsu return nil, err } - ocr, err := opencensusreceiver.New(addr, traceConsumer, nil, opts...) + ocr, err := opentelemetryreceiver.New(addr, traceConsumer, nil, opts...) if err != nil { return nil, fmt.Errorf("Failed to create the OpenTelemetry trace receiver: %v", err) } @@ -53,7 +53,7 @@ func Start(logger *zap.Logger, v *viper.Viper, traceConsumer consumer.TraceConsu return ocr, nil } -func receiverOptions(v *viper.Viper) (addr string, opts []opencensusreceiver.Option, zapFields []zap.Field, err error) { +func receiverOptions(v *viper.Viper) (addr string, opts []opentelemetryreceiver.Option, zapFields []zap.Field, err error) { rOpts, err := builder.NewDefaultOpenCensusReceiverCfg().InitFromViper(v) if err != nil { return addr, opts, zapFields, err @@ -71,7 +71,7 @@ func receiverOptions(v *viper.Viper) (addr string, opts []opencensusreceiver.Opt grpcServerOptions, zapFields := grpcServerOptions(rOpts, zapFields) if len(grpcServerOptions) > 0 { - opts = append(opts, opencensusreceiver.WithGRPCServerOptions(grpcServerOptions...)) + opts = append(opts, opentelemetryreceiver.WithGRPCServerOptions(grpcServerOptions...)) } addr = ":" + strconv.FormatInt(int64(rOpts.Port), 10) diff --git a/internal/collector/opencensus/receiver_test.go b/internal/collector/opencensus/receiver_test.go index b86762a120a..01846008fd7 100644 --- a/internal/collector/opencensus/receiver_test.go +++ b/internal/collector/opencensus/receiver_test.go @@ -25,7 +25,7 @@ import ( "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" "github.com/open-telemetry/opentelemetry-service/processor/processortest" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" ) func TestStart(t *testing.T) { @@ -38,7 +38,7 @@ func TestStart(t *testing.T) { name: "default_config", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opencensus.{}", nil) + v.Set("receivers.opentelemtry.{}", nil) return v }, }, @@ -46,7 +46,7 @@ func TestStart(t *testing.T) { name: "invalid_port", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opencensus.port", -1) + v.Set("receivers.opentelemtry.port", -1) return v }, wantErr: true, @@ -55,7 +55,7 @@ func TestStart(t *testing.T) { name: "missing_tls_files", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opencensus.tls_credentials.cert_file", "foo") + v.Set("receivers.opentelemtry.tls_credentials.cert_file", "foo") return v }, wantErr: true, @@ -64,13 +64,13 @@ func TestStart(t *testing.T) { name: "grpc_settings", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opencensus.port", 55678) - v.Set("receivers.opencensus.max-recv-msg-size-mib", 32) - v.Set("receivers.opencensus.max-concurrent-streams", 64) - v.Set("receivers.opencensus.keepalive.server-parameters.max-connection-age", 180*time.Second) - v.Set("receivers.opencensus.keepalive.server-parameters.max-connection-age-grace", 10*time.Second) - v.Set("receivers.opencensus.keepalive.enforcement-policy.min-time", 60*time.Second) - v.Set("receivers.opencensus.keepalive.enforcement-policy.permit-without-stream", true) + v.Set("receivers.opentelemtry.port", 55678) + v.Set("receivers.opentelemtry.max-recv-msg-size-mib", 32) + v.Set("receivers.opentelemtry.max-concurrent-streams", 64) + v.Set("receivers.opentelemtry.keepalive.server-parameters.max-connection-age", 180*time.Second) + v.Set("receivers.opentelemtry.keepalive.server-parameters.max-connection-age-grace", 10*time.Second) + v.Set("receivers.opentelemtry.keepalive.enforcement-policy.min-time", 60*time.Second) + v.Set("receivers.opentelemtry.keepalive.enforcement-policy.permit-without-stream", true) return v }, }, @@ -80,7 +80,7 @@ func TestStart(t *testing.T) { // Enforce that all configurations are actually recognized. v := tt.viperFn() rOpts := builder.OpenCensusReceiverCfg{} - if err := v.Sub("receivers.opencensus").UnmarshalExact(&rOpts); err != nil { + if err := v.Sub("receivers.opentelemtry").UnmarshalExact(&rOpts); err != nil { t.Errorf("UnmarshalExact error: %v", err) return } @@ -94,7 +94,7 @@ func TestStart(t *testing.T) { if got != nil { // TODO: (@pjanotti) current StopTraceReception, stop the whole receiver. // See https://github.com/open-telemetry/opentelemetry-service/issues/559 - got.(*opencensusreceiver.Receiver).Stop() + got.(*opentelemetryreceiver.Receiver).Stop() } }) } diff --git a/internal/collector/processor/metrics.go b/internal/collector/processor/metrics.go index 6838e4287f6..0ffcbd12232 100644 --- a/internal/collector/processor/metrics.go +++ b/internal/collector/processor/metrics.go @@ -16,9 +16,9 @@ package processor import ( commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) diff --git a/internal/collector/processor/nodebatcher/metrics.go b/internal/collector/processor/nodebatcher/metrics.go index 4147b7486f3..b8a13a3da80 100644 --- a/internal/collector/processor/nodebatcher/metrics.go +++ b/internal/collector/processor/nodebatcher/metrics.go @@ -15,9 +15,9 @@ package nodebatcher import ( - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" diff --git a/internal/collector/processor/nodebatcher/node_batcher.go b/internal/collector/processor/nodebatcher/node_batcher.go index 136bd545da1..f857e332b05 100644 --- a/internal/collector/processor/nodebatcher/node_batcher.go +++ b/internal/collector/processor/nodebatcher/node_batcher.go @@ -26,7 +26,7 @@ import ( resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/proto" - "go.opencensus.io/stats" + "go.opentelemtry.io/stats" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/processor/nodebatcher/node_batcher_test.go b/internal/collector/processor/nodebatcher/node_batcher_test.go index 704c33d6570..c8ea2e2b02f 100644 --- a/internal/collector/processor/nodebatcher/node_batcher_test.go +++ b/internal/collector/processor/nodebatcher/node_batcher_test.go @@ -40,7 +40,7 @@ func BenchmarkGenBucketID(b *testing.B) { "composite-md5": batcher.genBucketID, } - inputSmall := bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "oc"} + inputSmall := bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "opentel"} inputBig := bucketIDTestInput{ &commonpb.Node{ ServiceInfo: &commonpb.ServiceInfo{Name: "svc-i-am-a-cat"}, @@ -52,7 +52,7 @@ func BenchmarkGenBucketID(b *testing.B) { "skarisskarisskarisdf": "bsdfasdfasdfasdfasdf", "iamacatiamacatiamacat": "bsdfasdfasdfasdfasdf", }}, - "oc", + "opentel", } for genName, gen := range gens { @@ -76,20 +76,20 @@ func TestGenBucketID(t *testing.T) { { "different span formats", false, - bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "oc"}, + bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "opentel"}, bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "zipkin"}, }, { "identical but different node objects", true, - bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "oc"}, - bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "oc"}, + bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "opentel"}, + bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "opentel"}, }, { "different nodes", false, - bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "oc"}, - bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc2"}}, nil, "oc"}, + bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, nil, "opentel"}, + bucketIDTestInput{&commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc2"}}, nil, "opentel"}, }, { "different resources", @@ -97,12 +97,12 @@ func TestGenBucketID(t *testing.T) { bucketIDTestInput{ &commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, &resourcepb.Resource{Labels: map[string]string{"a": "b"}}, - "oc", + "opentel", }, bucketIDTestInput{ &commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, &resourcepb.Resource{Labels: map[string]string{"a": "c"}}, - "oc", + "opentel", }, }, { @@ -111,12 +111,12 @@ func TestGenBucketID(t *testing.T) { bucketIDTestInput{ &commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, &resourcepb.Resource{Labels: map[string]string{"a": "b"}}, - "oc", + "opentel", }, bucketIDTestInput{ &commonpb.Node{ServiceInfo: &commonpb.ServiceInfo{Name: "svc"}}, &resourcepb.Resource{Labels: map[string]string{"a": "b"}}, - "oc", + "opentel", }, }, } diff --git a/internal/collector/processor/queued/queued_processor.go b/internal/collector/processor/queued/queued_processor.go index 288ed686a42..4214f3c0f6b 100644 --- a/internal/collector/processor/queued/queued_processor.go +++ b/internal/collector/processor/queued/queued_processor.go @@ -20,9 +20,9 @@ import ( "time" "github.com/jaegertracing/jaeger/pkg/queue" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/processor/tailsampling/metrics.go b/internal/collector/processor/tailsampling/metrics.go index 0667fe8cf15..4eb2de3ca7f 100644 --- a/internal/collector/processor/tailsampling/metrics.go +++ b/internal/collector/processor/tailsampling/metrics.go @@ -15,9 +15,9 @@ package tailsampling import ( - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) diff --git a/internal/collector/processor/tailsampling/processor.go b/internal/collector/processor/tailsampling/processor.go index 01e3fbdc04c..3bc53ed1141 100644 --- a/internal/collector/processor/tailsampling/processor.go +++ b/internal/collector/processor/tailsampling/processor.go @@ -22,8 +22,8 @@ import ( "time" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "go.opencensus.io/stats" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/tag" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/telemetry/process_telemetry.go b/internal/collector/telemetry/process_telemetry.go index 3b33e0c0921..d5882c0c03a 100644 --- a/internal/collector/telemetry/process_telemetry.go +++ b/internal/collector/telemetry/process_telemetry.go @@ -7,8 +7,8 @@ import ( "time" "github.com/prometheus/procfs" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" ) // ProcessMetricsViews is a struct that contains views related to process metrics (cpu, mem, etc) @@ -17,7 +17,7 @@ type ProcessMetricsViews struct { done chan struct{} } -var mRuntimeAllocMem = stats.Int64("oc.io/process/memory_alloc", "Number of bytes currently allocated in use", "By") +var mRuntimeAllocMem = stats.Int64("opentel.io/process/memory_alloc", "Number of bytes currently allocated in use", "By") var viewAllocMem = &view.View{ Name: mRuntimeAllocMem.Name(), Description: mRuntimeAllocMem.Description(), @@ -26,7 +26,7 @@ var viewAllocMem = &view.View{ TagKeys: nil, } -var mRuntimeTotalAllocMem = stats.Int64("oc.io/process/total_memory_alloc", "Number of allocations in total", "By") +var mRuntimeTotalAllocMem = stats.Int64("opentel.io/process/total_memory_alloc", "Number of allocations in total", "By") var viewTotalAllocMem = &view.View{ Name: mRuntimeTotalAllocMem.Name(), Description: mRuntimeTotalAllocMem.Description(), @@ -35,7 +35,7 @@ var viewTotalAllocMem = &view.View{ TagKeys: nil, } -var mRuntimeSysMem = stats.Int64("oc.io/process/sys_memory_alloc", "Number of bytes given to the process to use in total", "By") +var mRuntimeSysMem = stats.Int64("opentel.io/process/sys_memory_alloc", "Number of bytes given to the process to use in total", "By") var viewSysMem = &view.View{ Name: mRuntimeSysMem.Name(), Description: mRuntimeSysMem.Description(), @@ -44,7 +44,7 @@ var viewSysMem = &view.View{ TagKeys: nil, } -var mCPUSeconds = stats.Int64("oc.io/process/cpu_seconds", "CPU seconds for this process", "1") +var mCPUSeconds = stats.Int64("opentel.io/process/cpu_seconds", "CPU seconds for this process", "1") var viewCPUSeconds = &view.View{ Name: mCPUSeconds.Name(), Description: mCPUSeconds.Description(), diff --git a/internal/compression/grpc/grpc.go b/internal/compression/grpc/grpc.go index 8edcaa15176..404b1725da6 100644 --- a/internal/compression/grpc/grpc.go +++ b/internal/compression/grpc/grpc.go @@ -23,7 +23,7 @@ import ( ) var ( - // Map of opencensus compression types to grpc registered compression types + // Map of opentelemtry compression types to grpc registered compression types grpcCompressionKeyMap = map[string]string{ compression.Gzip: gzip.Name, } diff --git a/internal/compression/keys.go b/internal/compression/keys.go index dc9cad258c8..5d31ba30bf5 100644 --- a/internal/compression/keys.go +++ b/internal/compression/keys.go @@ -14,7 +14,7 @@ package compression -// Compression keys for supported compression types within opencensus collector +// Compression keys for supported compression types within opentelemtry collector const ( Unsupported = "" Gzip = "gzip" diff --git a/internal/config/config.go b/internal/config/config.go index cff9f5b678d..a16f9736ac3 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -32,19 +32,19 @@ import ( "github.com/open-telemetry/opentelemetry-service/exporter/honeycombexporter" "github.com/open-telemetry/opentelemetry-service/exporter/jaegerexporter" "github.com/open-telemetry/opentelemetry-service/exporter/kafkaexporter" - "github.com/open-telemetry/opentelemetry-service/exporter/opencensusexporter" + "github.com/open-telemetry/opentelemetry-service/exporter/opentelemetryexporter" "github.com/open-telemetry/opentelemetry-service/exporter/prometheusexporter" "github.com/open-telemetry/opentelemetry-service/exporter/stackdriverexporter" "github.com/open-telemetry/opentelemetry-service/exporter/wavefrontexporter" "github.com/open-telemetry/opentelemetry-service/exporter/zipkinexporter" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" "github.com/open-telemetry/opentelemetry-service/receiver/prometheusreceiver" ) // We expect the configuration.yaml file to look like this: // // receivers: -// opencensus: +// opentelemtry: // port: // // zipkin: @@ -98,7 +98,7 @@ type Config struct { // * Prometheus (metrics) // * Zipkin (traces) type Receivers struct { - OpenTelemetry *ReceiverConfig `mapstructure:"opencensus"` + OpenTelemetry *ReceiverConfig `mapstructure:"opentelemtry"` Zipkin *ReceiverConfig `mapstructure:"zipkin"` Jaeger *ReceiverConfig `mapstructure:"jaeger"` Scribe *ScribeReceiverConfig `mapstructure:"zipkin-scribe"` @@ -350,12 +350,12 @@ func (c *Config) OpenCensusReceiverTLSServerCredentials() *TLSCredentials { // ToOpenCensusReceiverServerOption checks if the TLS credentials // in the form of a certificate file and a key file. If they aren't, -// it will return opencensusreceiver.WithNoopOption() and a nil error. +// it will return opentelemetryreceiver.WithNoopOption() and a nil error. // Otherwise, it will try to retrieve gRPC transport credentials from the file combinations, // and create a option, along with any errors encountered while retrieving the credentials. -func (tlsCreds *TLSCredentials) ToOpenCensusReceiverServerOption() (opt opencensusreceiver.Option, ok bool, err error) { +func (tlsCreds *TLSCredentials) ToOpenCensusReceiverServerOption() (opt opentelemetryreceiver.Option, ok bool, err error) { if tlsCreds == nil { - return opencensusreceiver.WithNoopOption(), false, nil + return opentelemetryreceiver.WithNoopOption(), false, nil } transportCreds, err := credentials.NewServerTLSFromFile(tlsCreds.CertFile, tlsCreds.KeyFile) @@ -363,15 +363,15 @@ func (tlsCreds *TLSCredentials) ToOpenCensusReceiverServerOption() (opt opencens return nil, false, err } gRPCCredsOpt := grpc.Creds(transportCreds) - return opencensusreceiver.WithGRPCServerOptions(gRPCCredsOpt), true, nil + return opentelemetryreceiver.WithGRPCServerOptions(gRPCCredsOpt), true, nil } // OpenCensusReceiverTLSCredentialsServerOption checks if the OpenTelemetry receiver's Configuration // has TLS credentials in the form of a certificate file and a key file. If it doesn't -// have any, it will return opencensusreceiver.WithNoopOption() and a nil error. +// have any, it will return opentelemetryreceiver.WithNoopOption() and a nil error. // Otherwise, it will try to retrieve gRPC transport credentials from the file combinations, // and create a option, along with any errors encountered while retrieving the credentials. -func (c *Config) OpenCensusReceiverTLSCredentialsServerOption() (opt opencensusreceiver.Option, ok bool, err error) { +func (c *Config) OpenCensusReceiverTLSCredentialsServerOption() (opt opentelemetryreceiver.Option, ok bool, err error) { tlsCreds := c.OpenCensusReceiverTLSServerCredentials() return tlsCreds.ToOpenCensusReceiverServerOption() } @@ -449,7 +449,7 @@ func eqLocalHost(host string) bool { // + zipkin // + jaeger // + kafka -// + opencensus +// + opentelemtry // + prometheus // + aws-xray // + honeycomb @@ -464,7 +464,7 @@ func ExportersFromViperConfig(logger *zap.Logger, v *viper.Viper) ([]consumer.Tr {name: "zipkin", fn: zipkinexporter.ZipkinExportersFromViper}, {name: "jaeger", fn: jaegerexporter.JaegerExportersFromViper}, {name: "kafka", fn: kafkaexporter.KafkaExportersFromViper}, - {name: "opencensus", fn: opencensusexporter.OpenCensusTraceExportersFromViper}, + {name: "opentelemtry", fn: opentelemetryexporter.OpenCensusTraceExportersFromViper}, {name: "prometheus", fn: prometheusexporter.PrometheusExportersFromViper}, {name: "aws-xray", fn: awsexporter.AWSXRayTraceExportersFromViper}, {name: "honeycomb", fn: honeycombexporter.HoneycombTraceExportersFromViper}, diff --git a/internal/config/tls_credentials_test.go b/internal/config/tls_credentials_test.go index 4e5b847df26..f5aec00e556 100644 --- a/internal/config/tls_credentials_test.go +++ b/internal/config/tls_credentials_test.go @@ -26,7 +26,7 @@ import ( func TestTLSConfigByParsing(t *testing.T) { configYAML := []byte(` receivers: - opencensus: + opentelemtry: tls_credentials: cert_file: "foobar.crt" key_file: "foobar.key" @@ -84,7 +84,7 @@ func TestTLSCredentials_nonEmptyChecks(t *testing.T) { { config: ` receivers: - opencensus: + opentelemtry: tls_credentials: cert_file: "foo" `, want: true, @@ -92,7 +92,7 @@ receivers: { config: ` receivers: - opencensus: + opentelemtry: tls_credentials: key_file: "foo" `, want: true, @@ -100,7 +100,7 @@ receivers: { config: ` receivers: - opencensus: + opentelemtry: tls_credentials: key_file: "" cert_file: "" diff --git a/internal/zpagesserver/zpagesserver.go b/internal/zpagesserver/zpagesserver.go index 0ff5f177095..3b4a554620c 100644 --- a/internal/zpagesserver/zpagesserver.go +++ b/internal/zpagesserver/zpagesserver.go @@ -20,7 +20,7 @@ import ( "net" "net/http" - "go.opencensus.io/zpages" + "go.opentelemtry.io/zpages" ) const ( diff --git a/observability/observability.go b/observability/observability.go index 829c108827b..8537e1151bc 100644 --- a/observability/observability.go +++ b/observability/observability.go @@ -23,19 +23,19 @@ import ( "google.golang.org/grpc" - "go.opencensus.io/plugin/ocgrpc" - "go.opencensus.io/stats" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" - "go.opencensus.io/trace" + "go.opentelemtry.io/plugin/ocgrpc" + "go.opentelemtry.io/stats" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" + "go.opentelemtry.io/trace" ) var ( - mReceiverReceivedSpans = stats.Int64("oc.io/receiver/received_spans", "Counts the number of spans received by the receiver", "1") - mReceiverDroppedSpans = stats.Int64("oc.io/receiver/dropped_spans", "Counts the number of spans dropped by the receiver", "1") + mReceiverReceivedSpans = stats.Int64("opentel.io/receiver/received_spans", "Counts the number of spans received by the receiver", "1") + mReceiverDroppedSpans = stats.Int64("opentel.io/receiver/dropped_spans", "Counts the number of spans dropped by the receiver", "1") - mExporterReceivedSpans = stats.Int64("oc.io/exporter/received_spans", "Counts the number of spans received by the exporter", "1") - mExporterDroppedSpans = stats.Int64("oc.io/exporter/dropped_spans", "Counts the number of spans received by the exporter", "1") + mExporterReceivedSpans = stats.Int64("opentel.io/exporter/received_spans", "Counts the number of spans received by the exporter", "1") + mExporterDroppedSpans = stats.Int64("opentel.io/exporter/dropped_spans", "Counts the number of spans received by the exporter", "1") ) // TagKeyReceiver defines tag key for Receiver. diff --git a/observability/observabilitytest/observabilitytest.go b/observability/observabilitytest/observabilitytest.go index 73906ab2fe7..8cf77a8f27c 100644 --- a/observability/observabilitytest/observabilitytest.go +++ b/observability/observabilitytest/observabilitytest.go @@ -19,8 +19,8 @@ import ( "reflect" "sort" - "go.opencensus.io/stats/view" - "go.opencensus.io/tag" + "go.opentelemtry.io/stats/view" + "go.opentelemtry.io/tag" "github.com/open-telemetry/opentelemetry-service/observability" ) diff --git a/receiver/README.md b/receiver/README.md index ef4dc3ad783..983fe6b8419 100644 --- a/receiver/README.md +++ b/receiver/README.md @@ -7,13 +7,13 @@ __Currently there are some inconsistencies between Agent and Collector configura This receiver receives spans from OpenTelemetry instrumented applications and translates them into the internal span types that are then sent to the collector/exporters. -Its address can be configured in the YAML configuration file under section "receivers", subsection "opencensus" and field "address". The syntax of the field "address" is `[address|host]:`. +Its address can be configured in the YAML configuration file under section "receivers", subsection "opentelemtry" and field "address". The syntax of the field "address" is `[address|host]:`. For example: ```yaml receivers: - opencensus: + opentelemtry: address: "127.0.0.1:55678" ``` ### Writing with HTTP/JSON @@ -23,7 +23,7 @@ HTTP/JSON in addition to gRPC. The HTTP/JSON address is the same as gRPC as the protocol is recognized and processed accordingly. To write traces with HTTP/JSON, `POST` to `[address]/v1/trace`. The JSON message -format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/open-telemetry/opentelemetry-proto/blob/master/gen-openapi/opencensus/proto/agent/trace/v1/trace_service.swagger.json). +format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/open-telemetry/opentelemetry-proto/blob/master/gen-openapi/opentelemtry/proto/agent/trace/v1/trace_service.swagger.json). The HTTP/JSON endpoint can also optionally [CORS](https://fetch.spec.whatwg.org/#cors-protocol), which is enabled by @@ -31,7 +31,7 @@ specifying a list of allowed CORS origins in the `cors_allowed_origins` field: ```yaml receivers: - opencensus: + opentelemtry: address: "localhost:55678" cors_allowed_origins: - http://test.com @@ -43,11 +43,11 @@ receivers: (To be fixed via [#135](https://github.com/open-telemetry/opentelemetry-service/issues/135)) By default this receiver is ALWAYS started on the OpenTelemetry Collector, it can be disabled via command-line by -using `--receive-oc-trace=false`. On the Collector only the port can be configured, example: +using `--receive-opentel-trace=false`. On the Collector only the port can be configured, example: ```yaml receivers: - opencensus: + opentelemtry: port: 55678 # Settings below are only available on collector. @@ -170,7 +170,7 @@ receivers: prometheus: config: scrape_configs: - - job_name: 'opencensus_service' + - job_name: 'opentelemetry_service' scrape_interval: 5s static_configs: - targets: ['localhost:8889'] diff --git a/receiver/end_to_end_test.go b/receiver/end_to_end_test.go index 22135323ca3..e8852c19581 100644 --- a/receiver/end_to_end_test.go +++ b/receiver/end_to_end_test.go @@ -21,11 +21,11 @@ import ( "github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter" - "contrib.go.opencensus.io/exporter/ocagent" - "go.opencensus.io/trace" + "contrib.go.opentelemtry.io/exporter/ocagent" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/receiver" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" "go.uber.org/zap" ) @@ -38,7 +38,7 @@ func Example_endToEnd() { log.Fatalf("Failed to create logging exporter: %v", err) } - tr, err := opencensusreceiver.New("localhost:55678", lte, nil) + tr, err := opentelemetryreceiver.New("localhost:55678", lte, nil) if err != nil { log.Fatalf("Failed to create trace receiver: %v", err) } diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index a6c2c048b50..3afe50f765f 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" - "contrib.go.opencensus.io/exporter/jaeger" - "go.opencensus.io/trace" + "contrib.go.opentelemtry.io/exporter/jaeger" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 7fe2f53dfa5..8143c5288d1 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" - "contrib.go.opencensus.io/exporter/jaeger" - "go.opencensus.io/trace" + "contrib.go.opentelemtry.io/exporter/jaeger" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" diff --git a/receiver/opencensusreceiver/config.go b/receiver/opencensusreceiver/config.go index e2fb5250881..6b063ae110f 100644 --- a/receiver/opencensusreceiver/config.go +++ b/receiver/opencensusreceiver/config.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import "github.com/open-telemetry/opentelemetry-service/internal/configmodels" diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 5c08c5ab17b..166584437f3 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "path" @@ -39,10 +39,10 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(config.Receivers), 2) - r0 := config.Receivers["opencensus"] + r0 := config.Receivers["opentelemtry"] assert.Equal(t, r0, factory.CreateDefaultConfig()) - r1 := config.Receivers["opencensus/customname"].(*ConfigV2) + r1 := config.Receivers["opentelemtry/customname"].(*ConfigV2) assert.Equal(t, r1.ReceiverSettings, configmodels.ReceiverSettings{ Endpoint: "0.0.0.0:9090", diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 7183fdb528b..746ad4e2f6f 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "context" @@ -28,7 +28,7 @@ var _ = factories.RegisterReceiverFactory(&receiverFactory{}) const ( // The value of "type" key in configuration. - typeStr = "opencensus" + typeStr = "opentelemtry" ) // receiverFactory is the factory for receiver. diff --git a/receiver/opencensusreceiver/factory_test.go b/receiver/opencensusreceiver/factory_test.go index d68dfe96a6e..e2a4a34a589 100644 --- a/receiver/opencensusreceiver/factory_test.go +++ b/receiver/opencensusreceiver/factory_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "context" diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus.go b/receiver/opencensusreceiver/ocmetrics/opencensus.go index 0239fd7a0f3..086908442fb 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus.go @@ -21,7 +21,7 @@ import ( "google.golang.org/api/support/bundler" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" diff --git a/receiver/opencensusreceiver/octrace/observability_test.go b/receiver/opencensusreceiver/octrace/observability_test.go index 16d45869467..6547ddaaf9e 100644 --- a/receiver/opencensusreceiver/octrace/observability_test.go +++ b/receiver/opencensusreceiver/octrace/observability_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" @@ -132,7 +132,7 @@ func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { defer ocSpansSaver.mu.Unlock() if len(ocSpansSaver.spanData) == 0 { - t.Fatal("Unfortunately did not receive an exported span data. Please check this library's implementation or go.opencensus.io/trace") + t.Fatal("Unfortunately did not receive an exported span data. Please check this library's implementation or go.opentelemtry.io/trace") } gotSpanData := ocSpansSaver.spanData[:] diff --git a/receiver/opencensusreceiver/octrace/opencensus.go b/receiver/opencensusreceiver/octrace/opencensus.go index 0081ec69c1e..bbc423e5540 100644 --- a/receiver/opencensusreceiver/octrace/opencensus.go +++ b/receiver/opencensusreceiver/octrace/opencensus.go @@ -19,7 +19,7 @@ import ( "errors" "io" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" @@ -48,7 +48,7 @@ type traceDataWithCtx struct { ctx context.Context } -// New creates a new opencensus.Receiver reference. +// New creates a new opentelemtry.Receiver reference. func New(nextConsumer consumer.TraceConsumer, opts ...Option) (*Receiver, error) { if nextConsumer == nil { return nil, errors.New("needs a non-nil consumer.TraceConsumer") diff --git a/receiver/opencensusreceiver/octrace/opencensus_test.go b/receiver/opencensusreceiver/octrace/opencensus_test.go index c2571914c01..c3a84868a57 100644 --- a/receiver/opencensusreceiver/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/octrace/opencensus_test.go @@ -32,7 +32,7 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - "contrib.go.opencensus.io/exporter/ocagent" + "contrib.go.opentelemtry.io/exporter/ocagent" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" @@ -40,8 +40,8 @@ import ( "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/internal" "github.com/open-telemetry/opentelemetry-service/observability" - "go.opencensus.io/trace" - "go.opencensus.io/trace/tracestate" + "go.opentelemtry.io/trace" + "go.opentelemtry.io/trace/tracestate" ) func TestReceiver_endToEnd(t *testing.T) { @@ -52,7 +52,7 @@ func TestReceiver_endToEnd(t *testing.T) { _, port, doneFn := ocReceiverOnGRPCServer(t, sappender) defer doneFn() - // Now the opencensus-agent exporter. + // Now the opentelemtry-agent exporter. address := fmt.Sprintf("localhost:%d", port) oce, err := ocagent.NewExporter(ocagent.WithAddress(address), ocagent.WithInsecure()) if err != nil { diff --git a/receiver/opencensusreceiver/opencensus.go b/receiver/opencensusreceiver/opencensus.go index 1cb83799c4a..f05ba2f038b 100644 --- a/receiver/opencensusreceiver/opencensus.go +++ b/receiver/opencensusreceiver/opencensus.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "context" @@ -27,8 +27,8 @@ import ( "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/observability" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/ocmetrics" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/octrace" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver/ocmetrics" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver/octrace" gatewayruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/rs/cors" "github.com/soheilhy/cmux" diff --git a/receiver/opencensusreceiver/opencensus_test.go b/receiver/opencensusreceiver/opencensus_test.go index 197f2aba113..7b4bd46e35c 100644 --- a/receiver/opencensusreceiver/opencensus_test.go +++ b/receiver/opencensusreceiver/opencensus_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "bytes" diff --git a/receiver/opencensusreceiver/options.go b/receiver/opencensusreceiver/options.go index 1b2139c5828..d82b33fcfd5 100644 --- a/receiver/opencensusreceiver/options.go +++ b/receiver/opencensusreceiver/options.go @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "google.golang.org/grpc" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/ocmetrics" - "github.com/open-telemetry/opentelemetry-service/receiver/opencensusreceiver/octrace" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver/ocmetrics" + "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver/octrace" ) // Option interface defines for configuration settings to be applied to receivers. diff --git a/receiver/opencensusreceiver/options_test.go b/receiver/opencensusreceiver/options_test.go index b55e455f8b7..d4654ee19ff 100644 --- a/receiver/opencensusreceiver/options_test.go +++ b/receiver/opencensusreceiver/options_test.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package opencensusreceiver +package opentelemetryreceiver import ( "reflect" diff --git a/receiver/opencensusreceiver/testdata/config.yaml b/receiver/opencensusreceiver/testdata/config.yaml index 7a1d4a6511c..ee38ce9c1ad 100644 --- a/receiver/opencensusreceiver/testdata/config.yaml +++ b/receiver/opencensusreceiver/testdata/config.yaml @@ -1,6 +1,6 @@ receivers: - opencensus: - opencensus/customname: + opentelemtry: + opentelemtry/customname: endpoint: 0.0.0.0:9090 processors: @@ -11,7 +11,7 @@ exporters: pipelines: traces: - receivers: [opencensus] + receivers: [opentelemtry] processors: [exampleprocessor] exporters: [exampleexporter] diff --git a/receiver/prometheusreceiver/metrics_receiver_test.go b/receiver/prometheusreceiver/metrics_receiver_test.go index 99e1d04a815..4ce434a5704 100644 --- a/receiver/prometheusreceiver/metrics_receiver_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_test.go @@ -27,10 +27,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "contrib.go.opencensus.io/exporter/prometheus" + "contrib.go.opentelemtry.io/exporter/prometheus" "github.com/spf13/viper" - "go.opencensus.io/metric/metricdata" - "go.opencensus.io/metric/metricproducer" + "go.opentelemtry.io/metric/metricdata" + "go.opentelemtry.io/metric/metricproducer" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" diff --git a/receiver/vmmetricsreceiver/vm_metrics_collector.go b/receiver/vmmetricsreceiver/vm_metrics_collector.go index 207581e9408..9287c9221a0 100644 --- a/receiver/vmmetricsreceiver/vm_metrics_collector.go +++ b/receiver/vmmetricsreceiver/vm_metrics_collector.go @@ -22,7 +22,7 @@ import ( "time" "github.com/prometheus/procfs" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 0d80b3cbefa..115608ca0ed 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -35,7 +35,7 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinproto "github.com/openzipkin/zipkin-go/proto/v2" - "go.opencensus.io/trace" + "go.opentelemtry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" @@ -475,7 +475,7 @@ func extractProtoStatus(zs *zipkinmodel.SpanModel) *tracepb.Status { return nil } canonicalCodeStr := zs.Tags["error"] - message := zs.Tags["opencensus.status_description"] + message := zs.Tags["opentelemtry.status_description"] if message == "" && canonicalCodeStr == "" { return nil } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index 54a0e26b8ca..e350f676847 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "contrib.go.opencensus.io/exporter/zipkin" + "contrib.go.opentelemtry.io/exporter/zipkin" openzipkin "github.com/openzipkin/zipkin-go" zipkinmodel "github.com/openzipkin/zipkin-go/model" zhttp "github.com/openzipkin/zipkin-go/reporter/http" diff --git a/translator/trace/jaeger/constants.go b/translator/trace/jaeger/constants.go index 08fa225e20e..0c930978873 100644 --- a/translator/trace/jaeger/constants.go +++ b/translator/trace/jaeger/constants.go @@ -20,17 +20,17 @@ import ( const ( // Jaeger Tags - ocTimeEventUnknownType = "oc.timeevent.unknown.type" - ocTimeEventAnnotationDescription = "oc.timeevent.annotation.description" - ocTimeEventMessageEventType = "oc.timeevent.messageevent.type" - ocTimeEventMessageEventID = "oc.timeevent.messageevent.id" - ocTimeEventMessageEventUSize = "oc.timeevent.messageevent.usize" - ocTimeEventMessageEventCSize = "oc.timeevent.messageevent.csize" - ocSameProcessAsParentSpan = "oc.sameprocessasparentspan" - ocSpanChildCount = "oc.span.childcount" - opencensusLanguage = "opencensus.language" - opencensusExporterVersion = "opencensus.exporterversion" - opencensusCoreLibVersion = "opencensus.corelibversion" + ocTimeEventUnknownType = "opentel.timeevent.unknown.type" + ocTimeEventAnnotationDescription = "opentel.timeevent.annotation.description" + ocTimeEventMessageEventType = "opentel.timeevent.messageevent.type" + ocTimeEventMessageEventID = "opentel.timeevent.messageevent.id" + ocTimeEventMessageEventUSize = "opentel.timeevent.messageevent.usize" + ocTimeEventMessageEventCSize = "opentel.timeevent.messageevent.csize" + ocSameProcessAsParentSpan = "opentel.sameprocessasparentspan" + ocSpanChildCount = "opentel.span.childcount" + opentelemetryLanguage = "opentelemtry.language" + opentelemetryExporterVersion = "opentelemtry.exporterversion" + opentelemetryCoreLibVersion = "opentelemtry.corelibversion" ) var ( diff --git a/translator/trace/jaeger/protospan_to_jaegerproto.go b/translator/trace/jaeger/protospan_to_jaegerproto.go index 36772e12f90..51cda82228e 100644 --- a/translator/trace/jaeger/protospan_to_jaegerproto.go +++ b/translator/trace/jaeger/protospan_to_jaegerproto.go @@ -105,7 +105,7 @@ func ocNodeToJaegerProcessProto(node *commonpb.Node) *jaeger.Process { if ocLib.Language != commonpb.LibraryInfo_LANGUAGE_UNSPECIFIED { languageStr := ocLib.Language.String() languageTag := jaeger.KeyValue{ - Key: opencensusLanguage, + Key: opentelemetryLanguage, VType: jaeger.ValueType_STRING, VStr: languageStr, } @@ -113,7 +113,7 @@ func ocNodeToJaegerProcessProto(node *commonpb.Node) *jaeger.Process { } if ocLib.ExporterVersion != "" { exporterTag := jaeger.KeyValue{ - Key: opencensusExporterVersion, + Key: opentelemetryExporterVersion, VType: jaeger.ValueType_STRING, VStr: ocLib.ExporterVersion, } @@ -121,7 +121,7 @@ func ocNodeToJaegerProcessProto(node *commonpb.Node) *jaeger.Process { } if ocLib.CoreLibraryVersion != "" { exporterTag := jaeger.KeyValue{ - Key: opencensusCoreLibVersion, + Key: opentelemetryCoreLibVersion, VType: jaeger.ValueType_STRING, VStr: ocLib.CoreLibraryVersion, } diff --git a/translator/trace/jaeger/protospan_to_jaegerthrift.go b/translator/trace/jaeger/protospan_to_jaegerthrift.go index 0a194cb18e1..ba9b0fea819 100644 --- a/translator/trace/jaeger/protospan_to_jaegerthrift.go +++ b/translator/trace/jaeger/protospan_to_jaegerthrift.go @@ -103,7 +103,7 @@ func ocNodeToJaegerProcess(node *commonpb.Node) *jaeger.Process { if ocLib.Language != commonpb.LibraryInfo_LANGUAGE_UNSPECIFIED { languageStr := ocLib.Language.String() languageTag := &jaeger.Tag{ - Key: opencensusLanguage, + Key: opentelemetryLanguage, VType: jaeger.TagType_STRING, VStr: &languageStr, } @@ -111,7 +111,7 @@ func ocNodeToJaegerProcess(node *commonpb.Node) *jaeger.Process { } if ocLib.ExporterVersion != "" { exporterTag := &jaeger.Tag{ - Key: opencensusExporterVersion, + Key: opentelemetryExporterVersion, VType: jaeger.TagType_STRING, VStr: &ocLib.ExporterVersion, } @@ -119,7 +119,7 @@ func ocNodeToJaegerProcess(node *commonpb.Node) *jaeger.Process { } if ocLib.CoreLibraryVersion != "" { exporterTag := &jaeger.Tag{ - Key: opencensusCoreLibVersion, + Key: opentelemetryCoreLibVersion, VType: jaeger.TagType_STRING, VStr: &ocLib.CoreLibraryVersion, } diff --git a/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json b/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json index ec5d36912ab..d7dfa434649 100644 --- a/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json +++ b/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json @@ -20,7 +20,7 @@ "v_str": "10.53.69.61" }, { - "key": "opencensus.exporterversion", + "key": "opentelemtry.exporterversion", "v_str": "someVersion" }, { @@ -94,20 +94,20 @@ "timestamp": "2017-01-26T21:46:31.639874Z", "fields": [ { - "key": "oc.timeevent.messageevent.id", + "key": "opentel.timeevent.messageevent.id", "v_type": 2 }, { - "key": "oc.timeevent.messageevent.type", + "key": "opentel.timeevent.messageevent.type", "v_str": "SENT" }, { - "key": "oc.timeevent.messageevent.csize", + "key": "opentel.timeevent.messageevent.csize", "v_int64": 512, "v_type": 2 }, { - "key": "oc.timeevent.messageevent.usize", + "key": "opentel.timeevent.messageevent.usize", "v_int64": 1024, "v_type": 2 } @@ -130,7 +130,7 @@ "v_str": "nothing" }, { - "key": "oc.timeevent.annotation.description", + "key": "opentel.timeevent.annotation.description", "v_str": "annotation description" } ] diff --git a/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json b/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json index 9643d3dca5a..4c2de6f38c5 100644 --- a/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json +++ b/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json @@ -23,7 +23,7 @@ "vStr": "10.53.69.61" }, { - "key": "opencensus.exporterversion", + "key": "opentelemtry.exporterversion", "vType": "STRING", "vStr": "someVersion" }, diff --git a/translator/trace/spandata/protospan_to_spandata.go b/translator/trace/spandata/protospan_to_spandata.go index 2bf4d170ac8..3c88eb5a410 100644 --- a/translator/trace/spandata/protospan_to_spandata.go +++ b/translator/trace/spandata/protospan_to_spandata.go @@ -19,8 +19,8 @@ import ( "errors" "time" - "go.opencensus.io/trace" - "go.opencensus.io/trace/tracestate" + "go.opentelemtry.io/trace" + "go.opentelemtry.io/trace/tracestate" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" diff --git a/translator/trace/spandata/protospan_to_spandata_test.go b/translator/trace/spandata/protospan_to_spandata_test.go index 4fadbd08948..9f27b223825 100644 --- a/translator/trace/spandata/protospan_to_spandata_test.go +++ b/translator/trace/spandata/protospan_to_spandata_test.go @@ -23,8 +23,8 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" - "go.opencensus.io/trace" - "go.opencensus.io/trace/tracestate" + "go.opentelemtry.io/trace" + "go.opentelemtry.io/trace/tracestate" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/open-telemetry/opentelemetry-service/internal" From 364fb34c6f275f0e706b31a8057bec3f13f50fe8 Mon Sep 17 00:00:00 2001 From: Steve Flanders Date: Mon, 17 Jun 2019 18:35:58 -0700 Subject: [PATCH 5/5] Fix typo --- Makefile | 4 +- cmd/ocagent/config.yaml | 2 +- cmd/ocagent/main.go | 2 +- cmd/occollector/app/builder/builder.go | 2 +- .../app/builder/exporters_builder_test.go | 14 ++--- .../builder/testdata/oc_keepalive_config.yaml | 2 +- .../builder/testdata/receivers_disabled.yaml | 2 +- .../builder/testdata/receivers_enabled.yaml | 2 +- .../app/builder/testdata/sampling_config.yaml | 2 +- .../app/collector/collector_test.go | 2 +- cmd/occollector/app/collector/receivers.go | 2 +- cmd/occollector/app/collector/telemetry.go | 4 +- .../app/collector/testdata/unisvc-config.yaml | 4 +- demos/trace/oc-agent-config.yaml | 4 +- demos/trace/oc-collector-config.yaml | 2 +- example/k8s.yaml | 26 ++++---- example/main.go | 10 ++-- exporter/README.md | 2 +- exporter/awsexporter/aws_xray.go | 4 +- exporter/awsexporter/aws_xray_test.go | 2 +- exporter/datadogexporter/datadog.go | 2 +- exporter/exporterhelper/common.go | 2 +- exporter/exporterhelper/common_test.go | 2 +- exporter/exporterhelper/metricshelper.go | 2 +- exporter/exporterhelper/metricshelper_test.go | 2 +- exporter/exporterhelper/tracehelper.go | 2 +- exporter/exporterhelper/tracehelper_test.go | 2 +- exporter/exporterwrapper/exporterwrapper.go | 2 +- exporter/honeycombexporter/honeycomb.go | 2 +- exporter/jaegerexporter/jaeger.go | 6 +- exporter/kafkaexporter/kafka.go | 2 +- exporter/opencensusexporter/config_test.go | 8 +-- exporter/opencensusexporter/factory.go | 4 +- exporter/opencensusexporter/opencensus.go | 4 +- .../opencensusexporter_test.go | 38 ++++++------ .../opencensusexporter/testdata/config.yaml | 6 +- exporter/stackdriverexporter/stackdriver.go | 8 +-- exporter/wavefrontexporter/README.md | 2 +- exporter/wavefrontexporter/wavefront.go | 2 +- exporter/zipkinexporter/zipkin.go | 6 +- go.mod | 22 +++---- go.sum | 60 +++++++++---------- .../collector/opencensus/receiver_test.go | 22 +++---- internal/collector/processor/metrics.go | 6 +- .../processor/nodebatcher/metrics.go | 6 +- .../processor/nodebatcher/node_batcher.go | 2 +- .../processor/queued/queued_processor.go | 6 +- .../processor/tailsampling/metrics.go | 6 +- .../processor/tailsampling/processor.go | 4 +- .../collector/telemetry/process_telemetry.go | 4 +- internal/compression/grpc/grpc.go | 2 +- internal/compression/keys.go | 2 +- internal/config/config.go | 8 +-- internal/config/tls_credentials_test.go | 8 +-- internal/zpagesserver/zpagesserver.go | 2 +- observability/observability.go | 10 ++-- .../observabilitytest/observabilitytest.go | 4 +- receiver/README.md | 10 ++-- receiver/end_to_end_test.go | 4 +- receiver/jaegerreceiver/jaeger_agent_test.go | 4 +- .../jaegerreceiver/trace_receiver_test.go | 4 +- receiver/opencensusreceiver/config_test.go | 4 +- receiver/opencensusreceiver/factory.go | 2 +- .../ocmetrics/opencensus.go | 2 +- .../octrace/observability_test.go | 4 +- .../opencensusreceiver/octrace/opencensus.go | 4 +- .../octrace/opencensus_test.go | 8 +-- .../opencensusreceiver/testdata/config.yaml | 6 +- .../metrics_receiver_test.go | 6 +- .../vmmetricsreceiver/vm_metrics_collector.go | 2 +- receiver/zipkinreceiver/trace_receiver.go | 4 +- .../zipkinreceiver/trace_receiver_test.go | 2 +- translator/trace/jaeger/constants.go | 6 +- .../proto_batch_no_binary_tags_01.json | 2 +- .../thrift_batch_no_binary_tags_01.json | 2 +- .../trace/spandata/protospan_to_spandata.go | 4 +- .../spandata/protospan_to_spandata_test.go | 4 +- 77 files changed, 228 insertions(+), 228 deletions(-) diff --git a/Makefile b/Makefile index 4d07985e17b..b78c1cf08fe 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ GOVET=go vet GOOS=$(shell go env GOOS) GIT_SHA=$(shell git rev-parse --short HEAD) -BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemtry-service/internal/version +BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-service/internal/version BUILD_X1=-X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) ifdef VERSION BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) @@ -44,7 +44,7 @@ travis-ci: fmt vet lint test-with-cover .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/opentelemtry-service/,./,$(ALL_PKGS)) + @scripts/check-test-files.sh $(subst github.com/open-telemetry/opentelemetry-service/,./,$(ALL_PKGS)) @echo pre-compiling tests @time go test -i $(ALL_PKGS) $(GOTEST) $(GOTEST_OPT_WITH_COVERAGE) $(ALL_PKGS) diff --git a/cmd/ocagent/config.yaml b/cmd/ocagent/config.yaml index ce7f23a2fa9..25e5904b5cc 100644 --- a/cmd/ocagent/config.yaml +++ b/cmd/ocagent/config.yaml @@ -1,5 +1,5 @@ receivers: - opentelemtry: + opentelemetry: address: "127.0.0.1:55678" zipkin: diff --git a/cmd/ocagent/main.go b/cmd/ocagent/main.go index d0c23579fea..a763e90a2b5 100644 --- a/cmd/ocagent/main.go +++ b/cmd/ocagent/main.go @@ -26,7 +26,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go.opentelemtry.io/stats/view" + "go.opentelemetry.io/stats/view" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/cmd/occollector/app/builder/builder.go b/cmd/occollector/app/builder/builder.go index b31ea6d7405..12051f2c9e5 100644 --- a/cmd/occollector/app/builder/builder.go +++ b/cmd/occollector/app/builder/builder.go @@ -27,7 +27,7 @@ import ( const ( receiversRoot = "receivers" jaegerEntry = "jaeger" - opentelemetryEntry = "opentelemtry" + opentelemetryEntry = "opentelemetry" zipkinEntry = "zipkin" zipkinScribeEntry = "zipkin-scribe" diff --git a/cmd/occollector/app/builder/exporters_builder_test.go b/cmd/occollector/app/builder/exporters_builder_test.go index 74971d2b065..f0db2006fa7 100644 --- a/cmd/occollector/app/builder/exporters_builder_test.go +++ b/cmd/occollector/app/builder/exporters_builder_test.go @@ -30,10 +30,10 @@ import ( func TestExportersBuilder_Build(t *testing.T) { config := &configmodels.ConfigV2{ Exporters: map[string]configmodels.Exporter{ - "opentelemtry": &opentelemetryexporter.ConfigV2{ + "opentelemetry": &opentelemetryexporter.ConfigV2{ ExporterSettings: configmodels.ExporterSettings{ - NameVal: "opentelemtry", - TypeVal: "opentelemtry", + NameVal: "opentelemetry", + TypeVal: "opentelemetry", Enabled: true, }, Endpoint: "0.0.0.0:12345", @@ -44,7 +44,7 @@ func TestExportersBuilder_Build(t *testing.T) { "trace": { Name: "trace", InputType: configmodels.TracesDataType, - Exporters: []string{"opentelemtry"}, + Exporters: []string{"opentelemetry"}, }, }, } @@ -54,7 +54,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NoError(t, err) require.NotNil(t, exporters) - e1 := exporters[config.Exporters["opentelemtry"]] + e1 := exporters[config.Exporters["opentelemetry"]] // Ensure exporter has its fields correctly populated. require.NotNil(t, e1) @@ -66,7 +66,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NoError(t, e1.Stop()) // Now change only pipeline data type to "metrics" and make sure exporter builder - // now fails (because opentelemtry exporter does not currently support metrics). + // now fails (because opentelemetry exporter does not currently support metrics). config.Pipelines["trace"].InputType = configmodels.MetricsDataType _, err = NewExportersBuilder(zap.NewNop(), config).Build() assert.NotNil(t, err) @@ -79,7 +79,7 @@ func TestExportersBuilder_Build(t *testing.T) { assert.NotNil(t, exporters) assert.Nil(t, err) - e1 = exporters[config.Exporters["opentelemtry"]] + e1 = exporters[config.Exporters["opentelemetry"]] // Ensure exporter has its fields correctly populated. require.NotNil(t, e1) diff --git a/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml b/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml index 7bde6997ff9..cad022dd9ed 100644 --- a/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml +++ b/cmd/occollector/app/builder/testdata/oc_keepalive_config.yaml @@ -1,5 +1,5 @@ receivers: - opentelemtry: + opentelemetry: keepalive: server-parameters: time: 30s diff --git a/cmd/occollector/app/builder/testdata/receivers_disabled.yaml b/cmd/occollector/app/builder/testdata/receivers_disabled.yaml index 59a6cf6de9e..56843d65633 100644 --- a/cmd/occollector/app/builder/testdata/receivers_disabled.yaml +++ b/cmd/occollector/app/builder/testdata/receivers_disabled.yaml @@ -1,6 +1,6 @@ # No receivers enabled, all commented out receivers: # jaeger: {} - # opentelemtry: {} + # opentelemetry: {} # zipkin: {} # zipkin-scribe: {} diff --git a/cmd/occollector/app/builder/testdata/receivers_enabled.yaml b/cmd/occollector/app/builder/testdata/receivers_enabled.yaml index e3c12f58248..4db1b58ae33 100644 --- a/cmd/occollector/app/builder/testdata/receivers_enabled.yaml +++ b/cmd/occollector/app/builder/testdata/receivers_enabled.yaml @@ -1,6 +1,6 @@ # Enable receivers with default configuration receivers: jaeger: {} - opentelemtry: {} + opentelemetry: {} zipkin: {} zipkin-scribe: {} diff --git a/cmd/occollector/app/builder/testdata/sampling_config.yaml b/cmd/occollector/app/builder/testdata/sampling_config.yaml index b2eb317192f..6795117f968 100644 --- a/cmd/occollector/app/builder/testdata/sampling_config.yaml +++ b/cmd/occollector/app/builder/testdata/sampling_config.yaml @@ -1,7 +1,7 @@ receivers: jaeger: collector_http_port: 14268 - opentelemtry: + opentelemetry: address: "127.0.0.1:55678" queued-exporters: jaeger1: diff --git a/cmd/occollector/app/collector/collector_test.go b/cmd/occollector/app/collector/collector_test.go index 4619ddec16e..204dfcd8ccb 100644 --- a/cmd/occollector/app/collector/collector_test.go +++ b/cmd/occollector/app/collector/collector_test.go @@ -32,7 +32,7 @@ func TestApplication_Start(t *testing.T) { healthCheckHTTPPort, // Keep it as first since its address is used later. zpagesserver.ZPagesHTTPPort, "metrics-port", - "receivers.opentelemtry.port", + "receivers.opentelemetry.port", } addresses := getMultipleAvailableLocalAddresses(t, uint(len(portArg))) for i, addr := range addresses { diff --git a/cmd/occollector/app/collector/receivers.go b/cmd/occollector/app/collector/receivers.go index 8807928d446..572b40756b6 100644 --- a/cmd/occollector/app/collector/receivers.go +++ b/cmd/occollector/app/collector/receivers.go @@ -24,7 +24,7 @@ import ( "github.com/open-telemetry/opentelemetry-service/cmd/occollector/app/builder" "github.com/open-telemetry/opentelemetry-service/consumer" jaegerreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/jaeger" - ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opentelemtry" + ocreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/opentelemetry" zipkinreceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin" zipkinscribereceiver "github.com/open-telemetry/opentelemetry-service/internal/collector/zipkin/scribe" "github.com/open-telemetry/opentelemetry-service/receiver" diff --git a/cmd/occollector/app/collector/telemetry.go b/cmd/occollector/app/collector/telemetry.go index c5ccfea79bd..cf7519382e4 100644 --- a/cmd/occollector/app/collector/telemetry.go +++ b/cmd/occollector/app/collector/telemetry.go @@ -20,9 +20,9 @@ import ( "net/http" "strconv" - "contrib.go.opentelemtry.io/exporter/prometheus" + "contrib.go.opentelemetry.io/exporter/prometheus" "github.com/spf13/viper" - "go.opentelemtry.io/stats/view" + "go.opentelemetry.io/stats/view" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" diff --git a/cmd/occollector/app/collector/testdata/unisvc-config.yaml b/cmd/occollector/app/collector/testdata/unisvc-config.yaml index 5a113129ddc..23b62d1e33e 100644 --- a/cmd/occollector/app/collector/testdata/unisvc-config.yaml +++ b/cmd/occollector/app/collector/testdata/unisvc-config.yaml @@ -3,7 +3,7 @@ receivers: enabled: true exporters: - opentelemtry: + opentelemetry: endpoint: "locahost:55678" enabled: true @@ -15,4 +15,4 @@ pipelines: traces: receivers: [jaeger] processors: [attributes] - exporters: [opentelemtry] + exporters: [opentelemetry] diff --git a/demos/trace/oc-agent-config.yaml b/demos/trace/oc-agent-config.yaml index 8a2bdaec22a..84d6ea00ee1 100644 --- a/demos/trace/oc-agent-config.yaml +++ b/demos/trace/oc-agent-config.yaml @@ -1,10 +1,10 @@ receivers: - opentelemtry: + opentelemetry: address: ":55678" reconnection-delay: 2s jaeger: collector_http_port: 14268 exporters: - opentelemtry: + opentelemetry: endpoint: "opentel-collector:55678" diff --git a/demos/trace/oc-collector-config.yaml b/demos/trace/oc-collector-config.yaml index 0707ac41134..80c1b279e6f 100644 --- a/demos/trace/oc-collector-config.yaml +++ b/demos/trace/oc-collector-config.yaml @@ -1,5 +1,5 @@ receivers: - opentelemtry: + opentelemetry: port: 55678 exporters: diff --git a/example/k8s.yaml b/example/k8s.yaml index 43471b2f40e..7f091597c1a 100644 --- a/example/k8s.yaml +++ b/example/k8s.yaml @@ -4,16 +4,16 @@ kind: ConfigMap metadata: name: opentel-agent-conf labels: - app: opentelemtry + app: opentelemetry component: opentel-agent-conf data: opentel-agent-config: | receivers: - opentelemtry: {} + opentelemetry: {} # jaeger: {} # zipkin: {} exporters: - opentelemtry: + opentelemetry: endpoint: "opentel-collector.default:55678" # TODO: Update me --- apiVersion: extensions/v1beta1 @@ -21,20 +21,20 @@ kind: DaemonSet metadata: name: opentel-agent labels: - app: opentelemtry + app: opentelemetry component: opentel-agent spec: template: metadata: labels: - app: opentelemtry + app: opentelemetry component: opentel-agent spec: containers: - command: - "/opentelagent_linux" - "--config=/conf/opentel-agent-config.yaml" - image: omnition/opentelemtry-agent:0.1.6 + image: omnition/opentelemetry-agent:0.1.6 name: opentel-agent resources: limits: @@ -65,12 +65,12 @@ kind: ConfigMap metadata: name: opentel-collector-conf labels: - app: opentelemtry + app: opentelemetry component: opentel-collector-conf data: opentel-collector-config: | receivers: - opentelemtry: + opentelemetry: # keepalive settings can help load balancing, see receiver/README.md for more info. keepalive: server-parameters: @@ -92,7 +92,7 @@ data: num-workers: 16 queue-size: 10000 retry-on-failure: true - opentelemtry: + opentelemetry: compression: "gzip" endpoint: "ingest.omnition.io:443" headers: { "x-omnition-api-key":"00000000-0000-0000-0000-000000000001" } # TODO: Update me @@ -109,7 +109,7 @@ metadata: component: opentel-collector spec: ports: - - name: opentelemtry + - name: opentelemetry port: 55678 protopentelol: TCP targetPort: 55678 @@ -127,7 +127,7 @@ kind: Deployment metadata: name: opentel-collector labels: - app: opentelemtry + app: opentelemetry component: opentel-collector spec: minReadySeconds: 5 @@ -140,7 +140,7 @@ spec: prometheus.io/port: "8888" prometheus.io/scrape: "true" labels: - app: opentelemtry + app: opentelemetry component: opentel-collector spec: containers: @@ -150,7 +150,7 @@ spec: env: - name: GOGC value: "80" - image: omnition/opentelemtry-collector:0.1.6 + image: omnition/opentelemetry-collector:0.1.6 name: opentel-collector resources: limits: diff --git a/example/main.go b/example/main.go index eeffc88e5b5..7ee2ce1e98d 100644 --- a/example/main.go +++ b/example/main.go @@ -23,11 +23,11 @@ import ( "os" "time" - "contrib.go.opentelemtry.io/exporter/ocagent" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" - "go.opentelemtry.io/trace" + "contrib.go.opentelemetry.io/exporter/ocagent" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" + "go.opentelemetry.io/trace" ) func main() { diff --git a/exporter/README.md b/exporter/README.md index 2fdb3beb415..d33a6255b21 100644 --- a/exporter/README.md +++ b/exporter/README.md @@ -83,7 +83,7 @@ queued-exporters: timeout: 5s # Non-sender exporters can now also be used by setting the exporters section in queued-exporters. exporters: - opentelemtry: + opentelemetry: endpoint: "127.0.0.1:55566" cert-pem-file: "server_ca_public.pem" # PEM file used to enable TLS. For trusted CAs from # system pool use "secure:" setting, see below. diff --git a/exporter/awsexporter/aws_xray.go b/exporter/awsexporter/aws_xray.go index ef0633e84dc..8bd876cf318 100644 --- a/exporter/awsexporter/aws_xray.go +++ b/exporter/awsexporter/aws_xray.go @@ -21,8 +21,8 @@ import ( "sync" "time" - xray "contrib.go.opentelemtry.io/exporter/aws" - "go.opentelemtry.io/trace" + xray "contrib.go.opentelemetry.io/exporter/aws" + "go.opentelemetry.io/trace" "github.com/spf13/viper" diff --git a/exporter/awsexporter/aws_xray_test.go b/exporter/awsexporter/aws_xray_test.go index 790dbe22450..ce38d5c33c9 100644 --- a/exporter/awsexporter/aws_xray_test.go +++ b/exporter/awsexporter/aws_xray_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - xray "contrib.go.opentelemtry.io/exporter/aws" + xray "contrib.go.opentelemetry.io/exporter/aws" ) func TestTransformConfigToXRayOptions(t *testing.T) { diff --git a/exporter/datadogexporter/datadog.go b/exporter/datadogexporter/datadog.go index 76d1f80ef69..87095537757 100644 --- a/exporter/datadogexporter/datadog.go +++ b/exporter/datadogexporter/datadog.go @@ -15,7 +15,7 @@ package datadogexporter import ( - datadog "github.com/DataDog/opentelemtry-go-exporter-datadog" + datadog "github.com/DataDog/opentelemetry-go-exporter-datadog" "github.com/spf13/viper" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/exporter/exporterhelper/common.go b/exporter/exporterhelper/common.go index f187fa199b3..a22909100e6 100644 --- a/exporter/exporterhelper/common.go +++ b/exporter/exporterhelper/common.go @@ -15,7 +15,7 @@ package exporterhelper import ( - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" ) var ( diff --git a/exporter/exporterhelper/common_test.go b/exporter/exporterhelper/common_test.go index c07dcb19496..951a6c5a159 100644 --- a/exporter/exporterhelper/common_test.go +++ b/exporter/exporterhelper/common_test.go @@ -17,7 +17,7 @@ import ( "errors" "testing" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" ) func TestDefaultOptions(t *testing.T) { diff --git a/exporter/exporterhelper/metricshelper.go b/exporter/exporterhelper/metricshelper.go index f8aa64ac2db..7334f1e92df 100644 --- a/exporter/exporterhelper/metricshelper.go +++ b/exporter/exporterhelper/metricshelper.go @@ -18,7 +18,7 @@ import ( "context" "github.com/open-telemetry/opentelemetry-service/observability" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/metricshelper_test.go b/exporter/exporterhelper/metricshelper_test.go index 808f6f36bb1..008ae2ae6a8 100644 --- a/exporter/exporterhelper/metricshelper_test.go +++ b/exporter/exporterhelper/metricshelper_test.go @@ -19,7 +19,7 @@ import ( "testing" metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/tracehelper.go b/exporter/exporterhelper/tracehelper.go index 16948babeb1..a08748fa6df 100644 --- a/exporter/exporterhelper/tracehelper.go +++ b/exporter/exporterhelper/tracehelper.go @@ -17,7 +17,7 @@ package exporterhelper import ( "context" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterhelper/tracehelper_test.go b/exporter/exporterhelper/tracehelper_test.go index 44c4753d842..2f331e9a02a 100644 --- a/exporter/exporterhelper/tracehelper_test.go +++ b/exporter/exporterhelper/tracehelper_test.go @@ -20,7 +20,7 @@ import ( "testing" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/exporter" diff --git a/exporter/exporterwrapper/exporterwrapper.go b/exporter/exporterwrapper/exporterwrapper.go index f05f2ee1adc..ae9655a82c7 100644 --- a/exporter/exporterwrapper/exporterwrapper.go +++ b/exporter/exporterwrapper/exporterwrapper.go @@ -24,7 +24,7 @@ package exporterwrapper import ( "context" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/open-telemetry/opentelemetry-service/data" diff --git a/exporter/honeycombexporter/honeycomb.go b/exporter/honeycombexporter/honeycomb.go index 69610ad208c..9e23c7c2a43 100644 --- a/exporter/honeycombexporter/honeycomb.go +++ b/exporter/honeycombexporter/honeycomb.go @@ -18,7 +18,7 @@ package honeycombexporter // ask them to make an exporter that uses OpenTelemetry-Proto instead of OpenTelemetry-Go. import ( - "github.com/honeycombio/opentelemtry-exporter/honeycomb" + "github.com/honeycombio/opentelemetry-exporter/honeycomb" "github.com/spf13/viper" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/exporter/jaegerexporter/jaeger.go b/exporter/jaegerexporter/jaeger.go index 9c2b43b376a..09f6e563923 100644 --- a/exporter/jaegerexporter/jaeger.go +++ b/exporter/jaegerexporter/jaeger.go @@ -17,13 +17,13 @@ package jaegerexporter import ( "github.com/spf13/viper" - "contrib.go.opentelemtry.io/exporter/jaeger" + "contrib.go.opentelemetry.io/exporter/jaeger" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" ) -// Slight modified version of go/src/contrib.go.opentelemtry.io/exporter/jaeger/jaeger.go +// Slight modified version of go/src/contrib.go.opentelemetry.io/exporter/jaeger/jaeger.go type jaegerConfig struct { CollectorEndpoint string `mapstructure:"collector_endpoint,omitempty"` Username string `mapstructure:"username,omitempty"` @@ -67,7 +67,7 @@ func JaegerExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps if err != nil { return nil, nil, nil, err } - // TODO: Examine "contrib.go.opentelemtry.io/exporter/jaeger" to see + // TODO: Examine "contrib.go.opentelemetry.io/exporter/jaeger" to see // if trace.ExportSpan was constraining and if perhaps the Jaeger // upload can use the context and information from the Node. tps = append(tps, jte) diff --git a/exporter/kafkaexporter/kafka.go b/exporter/kafkaexporter/kafka.go index 3868fd14e93..72785fca634 100644 --- a/exporter/kafkaexporter/kafka.go +++ b/exporter/kafkaexporter/kafka.go @@ -18,7 +18,7 @@ import ( "fmt" "github.com/spf13/viper" - kafka "github.com/yancl/opentelemtry-go-exporter-kafka" + kafka "github.com/yancl/opentelemetry-go-exporter-kafka" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterwrapper" diff --git a/exporter/opencensusexporter/config_test.go b/exporter/opencensusexporter/config_test.go index dee35e4a3a7..e26dda9deea 100644 --- a/exporter/opencensusexporter/config_test.go +++ b/exporter/opencensusexporter/config_test.go @@ -36,15 +36,15 @@ func TestLoadConfig(t *testing.T) { require.NoError(t, err) require.NotNil(t, config) - e0 := config.Exporters["opentelemtry"] + e0 := config.Exporters["opentelemetry"] assert.Equal(t, e0, factory.CreateDefaultConfig()) - e1 := config.Exporters["opentelemtry/2"] + e1 := config.Exporters["opentelemetry/2"] assert.Equal(t, e1, &ConfigV2{ ExporterSettings: configmodels.ExporterSettings{ - NameVal: "opentelemtry/2", - TypeVal: "opentelemtry", + NameVal: "opentelemetry/2", + TypeVal: "opentelemetry", Enabled: true, }, Headers: map[string]string{ diff --git a/exporter/opencensusexporter/factory.go b/exporter/opencensusexporter/factory.go index a3aa64fb8f1..2c152c15980 100644 --- a/exporter/opencensusexporter/factory.go +++ b/exporter/opencensusexporter/factory.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/keepalive" - "contrib.go.opentelemtry.io/exporter/ocagent" + "contrib.go.opentelemetry.io/exporter/ocagent" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/exporter/exporterhelper" @@ -36,7 +36,7 @@ var _ = factories.RegisterExporterFactory(&exporterFactory{}) const ( // The value of "type" key in configuration. - typeStr = "opentelemtry" + typeStr = "opentelemetry" ) // exporterFactory is the factory for OpenTelemetry exporter. diff --git a/exporter/opencensusexporter/opencensus.go b/exporter/opencensusexporter/opencensus.go index ca85e746c49..f4e8f8e14e4 100644 --- a/exporter/opencensusexporter/opencensus.go +++ b/exporter/opencensusexporter/opencensus.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "contrib.go.opentelemtry.io/exporter/ocagent" + "contrib.go.opentelemetry.io/exporter/ocagent" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" "github.com/spf13/viper" "google.golang.org/grpc" @@ -91,7 +91,7 @@ const ( // OpenTelemetry Agent/Collector according to the configuration settings. func OpenCensusTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceConsumer, mps []consumer.MetricsConsumer, doneFns []func() error, err error) { var cfg struct { - OpenTelemetry *opentelemetryConfig `mapstructure:"opentelemtry"` + OpenTelemetry *opentelemetryConfig `mapstructure:"opentelemetry"` } if err := v.Unmarshal(&cfg); err != nil { return nil, nil, nil, err diff --git a/exporter/opencensusexporter/opencensusexporter_test.go b/exporter/opencensusexporter/opencensusexporter_test.go index eba256ba578..a456eacdc89 100644 --- a/exporter/opencensusexporter/opencensusexporter_test.go +++ b/exporter/opencensusexporter/opencensusexporter_test.go @@ -26,15 +26,15 @@ import ( func TestOpenCensusTraceExportersFromViper(t *testing.T) { v := viper.New() - v.Set("opentelemtry", map[interface{}]interface{}{}) - v.Set("opentelemtry.endpoint", "") + v.Set("opentelemetry", map[interface{}]interface{}{}) + v.Set("opentelemetry.endpoint", "") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errEndpointRequired { t.Fatalf("Expected to get errEndpointRequired. Got %v", err) } - v.Set("opentelemtry.endpoint", "127.0.0.1:55678") + v.Set("opentelemetry.endpoint", "127.0.0.1:55678") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { @@ -47,15 +47,15 @@ func TestOpenCensusTraceExportersFromViper(t *testing.T) { func TestOpenCensusTraceExportersFromViper_TLS(t *testing.T) { v := viper.New() - v.Set("opentelemtry.endpoint", "127.0.0.1:55678") - v.Set("opentelemtry.cert-pem-file", "dummy_file.pem") + v.Set("opentelemetry.endpoint", "127.0.0.1:55678") + v.Set("opentelemetry.cert-pem-file", "dummy_file.pem") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errUnableToGetTLSCreds { t.Fatalf("Expected to get errUnableToGetTLSCreds but got %v", err) } - v.Set("opentelemtry.cert-pem-file", "testdata/test_cert.pem") + v.Set("opentelemetry.cert-pem-file", "testdata/test_cert.pem") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { t.Fatalf("Unexpected error building OpenTelemetry Exporter") @@ -67,14 +67,14 @@ func TestOpenCensusTraceExportersFromViper_TLS(t *testing.T) { func TestOpenCensusTraceExportersFromViper_Compression(t *testing.T) { v := viper.New() - v.Set("opentelemtry.endpoint", "127.0.0.1:55678") - v.Set("opentelemtry.compression", "random-compression") + v.Set("opentelemetry.endpoint", "127.0.0.1:55678") + v.Set("opentelemetry.compression", "random-compression") _, _, _, err := OpenCensusTraceExportersFromViper(v) if errorCode(err) != errUnsupportedCompressionType { t.Fatalf("Expected to get errUnsupportedCompressionType but got %v", err) } - v.Set("opentelemtry.compression", "gzip") + v.Set("opentelemetry.compression", "gzip") exporters, _, _, err := OpenCensusTraceExportersFromViper(v) if err != nil { t.Fatalf("Unexpected error building OpenTelemetry Exporter") @@ -86,7 +86,7 @@ func TestOpenCensusTraceExportersFromViper_Compression(t *testing.T) { func TestOpenCensusTraceExporters_StopError(t *testing.T) { v := viper.New() - v.Set("opentelemtry.endpoint", "127.0.0.1:55678") + v.Set("opentelemetry.endpoint", "127.0.0.1:55678") tps, _, doneFns, err := OpenCensusTraceExportersFromViper(v) doneFnCalled := false defer func() { @@ -132,8 +132,8 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { { name: "UseSecure", configMap: map[string]string{ - "opentelemtry.endpoint": defaultTestEndPoint, - "opentelemtry.secure": "true", + "opentelemetry.endpoint": defaultTestEndPoint, + "opentelemetry.secure": "true", }, want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, @@ -143,8 +143,8 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { { name: "ReconnectionDelay", configMap: map[string]string{ - "opentelemtry.endpoint": defaultTestEndPoint, - "opentelemtry.reconnection-delay": "5s", + "opentelemetry.endpoint": defaultTestEndPoint, + "opentelemetry.reconnection-delay": "5s", }, want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, @@ -154,10 +154,10 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { { name: "KeepaliveParameters", configMap: map[string]string{ - "opentelemtry.endpoint": defaultTestEndPoint, - "opentelemtry.keepalive.time": "30s", - "opentelemtry.keepalive.timeout": "25s", - "opentelemtry.keepalive.permit-without-stream": "true", + "opentelemetry.endpoint": defaultTestEndPoint, + "opentelemetry.keepalive.time": "30s", + "opentelemetry.keepalive.timeout": "25s", + "opentelemetry.keepalive.permit-without-stream": "true", }, want: opentelemetryConfig{ Endpoint: defaultTestEndPoint, @@ -179,7 +179,7 @@ func TestOpenCensusTraceExporterConfigsViaViper(t *testing.T) { // Ensure that the settings are being read, via UnmarshalExact. var got opentelemetryConfig - if err := v.Sub("opentelemtry").UnmarshalExact(&got); err != nil { + if err := v.Sub("opentelemetry").UnmarshalExact(&got); err != nil { t.Fatalf("UnmarshalExact() error: %v", err) } diff --git a/exporter/opencensusexporter/testdata/config.yaml b/exporter/opencensusexporter/testdata/config.yaml index 2ddc86180b7..efe7576d335 100644 --- a/exporter/opencensusexporter/testdata/config.yaml +++ b/exporter/opencensusexporter/testdata/config.yaml @@ -5,8 +5,8 @@ processors: exampleprocessor: exporters: - opentelemtry: - opentelemtry/2: + opentelemetry: + opentelemetry/2: enabled: true endpoint: "1.2.3.4:1234" compression: "on" @@ -27,4 +27,4 @@ pipelines: traces: receivers: [examplereceiver] processors: [exampleprocessor] - exporters: [opentelemtry] + exporters: [opentelemetry] diff --git a/exporter/stackdriverexporter/stackdriver.go b/exporter/stackdriverexporter/stackdriver.go index f085d4f1129..bb03bf67546 100644 --- a/exporter/stackdriverexporter/stackdriver.go +++ b/exporter/stackdriverexporter/stackdriver.go @@ -20,9 +20,9 @@ import ( "sync" "time" - "contrib.go.opentelemtry.io/exporter/stackdriver" + "contrib.go.opentelemetry.io/exporter/stackdriver" "github.com/spf13/viper" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" @@ -93,7 +93,7 @@ func StackdriverTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCon return nil, nil, nil, err } - // TODO: Examine "contrib.go.opentelemtry.io/exporter/stackdriver" to see + // TODO: Examine "contrib.go.opentelemetry.io/exporter/stackdriver" to see // if trace.ExportSpan was constraining and if perhaps the Stackdriver // upload can use the context and information from the Node. if sc.EnableTracing { @@ -113,7 +113,7 @@ func StackdriverTraceExportersFromViper(v *viper.Viper) (tps []consumer.TraceCon func (sde *stackdriverExporter) ConsumeMetricsData(ctx context.Context, md data.MetricsData) error { ctx, span := trace.StartSpan(ctx, - "opentelemtry.service.exporter.stackdriver.ExportMetricsData", + "opentelemetry.service.exporter.stackdriver.ExportMetricsData", trace.WithSampler(trace.NeverSample())) defer span.End() diff --git a/exporter/wavefrontexporter/README.md b/exporter/wavefrontexporter/README.md index 98bb78d7cba..dc1f148d658 100644 --- a/exporter/wavefrontexporter/README.md +++ b/exporter/wavefrontexporter/README.md @@ -58,5 +58,5 @@ exporters: ``` ### References -- [https://github.com/wavefrontHQ/opentelemtry-exporter](https://github.com/wavefrontHQ/opentelemtry-exporter) +- [https://github.com/wavefrontHQ/opentelemetry-exporter](https://github.com/wavefrontHQ/opentelemetry-exporter) - [https://github.com/wavefrontHQ/wavefront-sdk-go](https://github.com/wavefrontHQ/wavefront-sdk-go) \ No newline at end of file diff --git a/exporter/wavefrontexporter/wavefront.go b/exporter/wavefrontexporter/wavefront.go index 129513d9c3f..bd8915d669f 100644 --- a/exporter/wavefrontexporter/wavefront.go +++ b/exporter/wavefrontexporter/wavefront.go @@ -17,7 +17,7 @@ package wavefrontexporter import ( "errors" - "github.com/wavefronthq/opentelemtry-exporter/wavefront" + "github.com/wavefronthq/opentelemetry-exporter/wavefront" "github.com/wavefronthq/wavefront-sdk-go/senders" "github.com/spf13/viper" diff --git a/exporter/zipkinexporter/zipkin.go b/exporter/zipkinexporter/zipkin.go index 55e4a20ab4e..92069281e73 100644 --- a/exporter/zipkinexporter/zipkin.go +++ b/exporter/zipkinexporter/zipkin.go @@ -28,7 +28,7 @@ import ( zipkinreporter "github.com/openzipkin/zipkin-go/reporter" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" "github.com/spf13/viper" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" "github.com/open-telemetry/opentelemetry-service/consumer" @@ -194,7 +194,7 @@ func (ze *zipkinExporter) stop() error { func (ze *zipkinExporter) ConsumeTraceData(ctx context.Context, td data.TraceData) (zerr error) { ctx, span := trace.StartSpan(ctx, - "opentelemtry.service.exporter.zipkin.ExportTrace", + "opentelemetry.service.exporter.zipkin.ExportTrace", trace.WithSampler(trace.NeverSample())) defer func() { @@ -243,7 +243,7 @@ func (ze *zipkinExporter) ConsumeTraceData(ctx context.Context, td data.TraceDat const ( statusCodeTagKey = "error" - statusDescriptionTagKey = "opentelemtry.status_description" + statusDescriptionTagKey = "opentelemetry.status_description" ) var ( diff --git a/go.mod b/go.mod index db5a347b856..0da80262add 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ module github.com/open-telemetry/opentelemetry-service require ( - contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 - contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 - contrib.go.opentelemtry.io/exporter/ocagent v0.5.0 - contrib.go.opentelemtry.io/exporter/prometheus v0.1.0 - contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2 - contrib.go.opentelemtry.io/exporter/zipkin v0.1.1 + contrib.go.opentelemetry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 + contrib.go.opentelemetry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 + contrib.go.opentelemetry.io/exporter/ocagent v0.5.0 + contrib.go.opentelemetry.io/exporter/prometheus v0.1.0 + contrib.go.opentelemetry.io/exporter/stackdriver v0.12.2 + contrib.go.opentelemetry.io/exporter/zipkin v0.1.1 github.com/DataDog/datadog-go v2.2.0+incompatible // indirect - github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 + github.com/DataDog/opentelemetry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 github.com/VividCortex/gohistogram v1.0.0 // indirect github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b // indirect @@ -24,7 +24,7 @@ require ( github.com/gorilla/mux v1.6.2 github.com/grpc-ecosystem/grpc-gateway v1.8.5 github.com/honeycombio/libhoney-go v1.10.0 // indirect - github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a + github.com/honeycombio/opentelemetry-exporter v0.0.0-20181101214123-9be2bb327b5a github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/jaegertracing/jaeger v1.9.0 github.com/omnition/scribe-go v0.0.0-20190131012523-9e3c68f31124 @@ -50,10 +50,10 @@ require ( github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect github.com/uber/jaeger-lib v2.0.0+incompatible github.com/uber/tchannel-go v1.10.0 - github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf + github.com/wavefronthq/opentelemetry-exporter v0.0.0-20190506162721-983d7cdaceaf github.com/wavefronthq/wavefront-sdk-go v0.9.2 - github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb - go.opentelemtry.io v0.22.0 + github.com/yancl/opentelemetry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb + go.opentelemetry.io v0.22.0 go.uber.org/atomic v1.3.2 // indirect go.uber.org/multierr v1.1.0 // indirect go.uber.org/zap v1.9.1 diff --git a/go.sum b/go.sum index b034d008a31..8ec447327e3 100644 --- a/go.sum +++ b/go.sum @@ -4,21 +4,21 @@ cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 h1:YsbWYxDZkC7x2OxlsDEYvvEXZ3cBI3qBgUK5BqkZvRw= -contrib.go.opentelemtry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= -contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 h1:xdP25yLqNGSnpfDmEChwA9ZuKLdiyL0jqJKPm/Ypfag= -contrib.go.opentelemtry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= -contrib.go.opentelemtry.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ= -contrib.go.opentelemtry.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= -contrib.go.opentelemtry.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg= -contrib.go.opentelemtry.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= -contrib.go.opentelemtry.io/exporter/stackdriver v0.12.1 h1:Dll2uFfOVI3fa8UzsHyP6z0M6fEc9ZTAMo+Y3z282Xg= -contrib.go.opentelemtry.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2 h1:jU1p9F07ASK11wYgSTPKtFlTvTtCDj6R1d3nRt0ZHDE= -contrib.go.opentelemtry.io/exporter/stackdriver v0.12.2/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= -contrib.go.opentelemtry.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g= -contrib.go.opentelemtry.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= -contrib.go.opentelemtry.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= +contrib.go.opentelemetry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0 h1:YsbWYxDZkC7x2OxlsDEYvvEXZ3cBI3qBgUK5BqkZvRw= +contrib.go.opentelemetry.io/exporter/aws v0.0.0-20181029163544-2befc13012d0/go.mod h1:uu1P0UCM/6RbsMrgPa98ll8ZcHM858i/AD06a9aLRCA= +contrib.go.opentelemetry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948 h1:xdP25yLqNGSnpfDmEChwA9ZuKLdiyL0jqJKPm/Ypfag= +contrib.go.opentelemetry.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948/go.mod h1:ukdzwIYYHgZ7QYtwVFQUjiT28BJHiMhTERo32s6qVgM= +contrib.go.opentelemetry.io/exporter/ocagent v0.5.0 h1:TKXjQSRS0/cCDrP7KvkgU6SmILtF/yV2TOs/02K/WZQ= +contrib.go.opentelemetry.io/exporter/ocagent v0.5.0/go.mod h1:ImxhfLRpxoYiSq891pBrLVhN+qmP8BTVvdH2YLs7Gl0= +contrib.go.opentelemetry.io/exporter/prometheus v0.1.0 h1:SByaIoWwNgMdPSgl5sMqM2KDE5H/ukPWBRo314xiDvg= +contrib.go.opentelemetry.io/exporter/prometheus v0.1.0/go.mod h1:cGFniUXGZlKRjzOyuZJ6mgB+PgBcCIa79kEKR8YCW+A= +contrib.go.opentelemetry.io/exporter/stackdriver v0.12.1 h1:Dll2uFfOVI3fa8UzsHyP6z0M6fEc9ZTAMo+Y3z282Xg= +contrib.go.opentelemetry.io/exporter/stackdriver v0.12.1/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opentelemetry.io/exporter/stackdriver v0.12.2 h1:jU1p9F07ASK11wYgSTPKtFlTvTtCDj6R1d3nRt0ZHDE= +contrib.go.opentelemetry.io/exporter/stackdriver v0.12.2/go.mod h1:iwB6wGarfphGGe/e5CWqyUk/cLzKnWsOKPVW3no6OTw= +contrib.go.opentelemetry.io/exporter/zipkin v0.1.1 h1:PR+1zWqY8ceXs1qDQQIlgXe+sdiwCf0n32bH4+Epk8g= +contrib.go.opentelemetry.io/exporter/zipkin v0.1.1/go.mod h1:GMvdSl3eJ2gapOaLKzTKE3qDgUkJ86k9k3yY2eqwkzc= +contrib.go.opentelemetry.io/resource v0.1.1/go.mod h1:F361eGI91LCmW1I/Saf+rX0+OFcigGlFvXwEGEnkRLA= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999 h1:sihTnRgTOUSCQz0iS0pjZuFQy/z7GXCJgSBg3+rZKHw= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= github.com/Azure/azure-sdk-for-go v0.0.0-20161028183111-bd73d950fa44 h1:L4fLiifszjLnCRGi6Xhp0MgUwjIMbVXKbayoRiVxkU8= @@ -29,8 +29,8 @@ github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v2.2.0+incompatible h1:V5BKkxACZLjzHjSgBbr2gvLA2Ae49yhc6CSY7MLy5k4= github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 h1:WOxkY7ClXANNyQQuq4rxQrM/nQnjXCpvqY0ipYxB9cQ= -github.com/DataDog/opentelemtry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= +github.com/DataDog/opentelemetry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329 h1:WOxkY7ClXANNyQQuq4rxQrM/nQnjXCpvqY0ipYxB9cQ= +github.com/DataDog/opentelemetry-go-exporter-datadog v0.0.0-20181026070331-e7c4bd17b329/go.mod h1:gMGUEe16aZh0QN941HgDjwrdjU4iTthPoz2/AtDRADE= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/Shopify/sarama v1.19.0 h1:9oksLxC6uxVPHPVYUmq6xhr1BOF/hHobWH2UzO67z1s= @@ -207,8 +207,8 @@ github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/honeycombio/libhoney-go v1.10.0 h1:eZ5VauogxgWlw26CDkeAmEK/CuhsIVlLgGuKtHdp2c8= github.com/honeycombio/libhoney-go v1.10.0/go.mod h1:jdLxh51fcBTy6XIpx1efuJmHePs2xUfVkw25lr+hsmg= -github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a h1:XZRt69AYOjIRW3KGpzOh0ulEa4DOep0snLPlIgtaXPE= -github.com/honeycombio/opentelemtry-exporter v0.0.0-20181101214123-9be2bb327b5a/go.mod h1:Zx4YGFb3eHJsstwhyB5yaVGLROSXWCd0b4PkFKb1mdc= +github.com/honeycombio/opentelemetry-exporter v0.0.0-20181101214123-9be2bb327b5a h1:XZRt69AYOjIRW3KGpzOh0ulEa4DOep0snLPlIgtaXPE= +github.com/honeycombio/opentelemetry-exporter v0.0.0-20181101214123-9be2bb327b5a/go.mod h1:Zx4YGFb3eHJsstwhyB5yaVGLROSXWCd0b4PkFKb1mdc= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -390,19 +390,19 @@ github.com/uber/jaeger-lib v2.0.0+incompatible h1:iMSCV0rmXEogjNWPh2D0xk9YVKvrtG github.com/uber/jaeger-lib v2.0.0+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/uber/tchannel-go v1.10.0 h1:YOihLHuvkwT3nzvpgqFtexFW+pb5vD1Tz7h/bIWApgE= github.com/uber/tchannel-go v1.10.0/go.mod h1:Rrgz1eL8kMjW/nEzZos0t+Heq0O4LhnUJVA32OvWKHo= -github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf h1:KO5PCIdHHzqs9c9fanhFuBxhK5eRiRz1ZGTqTrm17FU= -github.com/wavefronthq/opentelemtry-exporter v0.0.0-20190506162721-983d7cdaceaf/go.mod h1:2pXfsubgEW9xaV795VimF4TNNQDyl6YpLCwTInzUvCU= +github.com/wavefronthq/opentelemetry-exporter v0.0.0-20190506162721-983d7cdaceaf h1:KO5PCIdHHzqs9c9fanhFuBxhK5eRiRz1ZGTqTrm17FU= +github.com/wavefronthq/opentelemetry-exporter v0.0.0-20190506162721-983d7cdaceaf/go.mod h1:2pXfsubgEW9xaV795VimF4TNNQDyl6YpLCwTInzUvCU= github.com/wavefronthq/wavefront-sdk-go v0.9.2 h1:/LvWgZYNjHFUg+ZUX+qv+7e+M8sEMi0lM15zPp681Gk= github.com/wavefronthq/wavefront-sdk-go v0.9.2/go.mod h1:hQI6y8M9OtTCtc0xdwh+dCER4osxXdEAeCpacjpDZEU= -github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb h1:DSch+h+LW/9zO8ImnA2KzFylC/ShRAAgRPJVlx6FMSA= -github.com/yancl/opentelemtry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb/go.mod h1:zfby7AY8Vh0VWAMyiFKkTvMyYKAmWTT5x3DSAOJM6xM= -go.opentelemtry.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= -go.opentelemtry.io v0.17.0 h1:2Cu88MYg+1LU+WVD+NWwYhyP0kKgRlN9QjWGaX0jKTE= -go.opentelemtry.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= -go.opentelemtry.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= -go.opentelemtry.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opentelemtry.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= -go.opentelemtry.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +github.com/yancl/opentelemetry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb h1:DSch+h+LW/9zO8ImnA2KzFylC/ShRAAgRPJVlx6FMSA= +github.com/yancl/opentelemetry-go-exporter-kafka v0.0.0-20181029030031-9c471c1bfbeb/go.mod h1:zfby7AY8Vh0VWAMyiFKkTvMyYKAmWTT5x3DSAOJM6xM= +go.opentelemetry.io v0.15.0/go.mod h1:UffZAU+4sDEINUGP/B7UfBBkq4fqLu9zXAX7ke6CHW0= +go.opentelemetry.io v0.17.0 h1:2Cu88MYg+1LU+WVD+NWwYhyP0kKgRlN9QjWGaX0jKTE= +go.opentelemetry.io v0.17.0/go.mod h1:mp1VrMQxhlqqDpKvH4UcQUa4YwlzNmymAjPrDdfxNpI= +go.opentelemetry.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg= +go.opentelemetry.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opentelemetry.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4= +go.opentelemetry.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= diff --git a/internal/collector/opencensus/receiver_test.go b/internal/collector/opencensus/receiver_test.go index 01846008fd7..852101777a8 100644 --- a/internal/collector/opencensus/receiver_test.go +++ b/internal/collector/opencensus/receiver_test.go @@ -38,7 +38,7 @@ func TestStart(t *testing.T) { name: "default_config", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opentelemtry.{}", nil) + v.Set("receivers.opentelemetry.{}", nil) return v }, }, @@ -46,7 +46,7 @@ func TestStart(t *testing.T) { name: "invalid_port", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opentelemtry.port", -1) + v.Set("receivers.opentelemetry.port", -1) return v }, wantErr: true, @@ -55,7 +55,7 @@ func TestStart(t *testing.T) { name: "missing_tls_files", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opentelemtry.tls_credentials.cert_file", "foo") + v.Set("receivers.opentelemetry.tls_credentials.cert_file", "foo") return v }, wantErr: true, @@ -64,13 +64,13 @@ func TestStart(t *testing.T) { name: "grpc_settings", viperFn: func() *viper.Viper { v := viper.New() - v.Set("receivers.opentelemtry.port", 55678) - v.Set("receivers.opentelemtry.max-recv-msg-size-mib", 32) - v.Set("receivers.opentelemtry.max-concurrent-streams", 64) - v.Set("receivers.opentelemtry.keepalive.server-parameters.max-connection-age", 180*time.Second) - v.Set("receivers.opentelemtry.keepalive.server-parameters.max-connection-age-grace", 10*time.Second) - v.Set("receivers.opentelemtry.keepalive.enforcement-policy.min-time", 60*time.Second) - v.Set("receivers.opentelemtry.keepalive.enforcement-policy.permit-without-stream", true) + v.Set("receivers.opentelemetry.port", 55678) + v.Set("receivers.opentelemetry.max-recv-msg-size-mib", 32) + v.Set("receivers.opentelemetry.max-concurrent-streams", 64) + v.Set("receivers.opentelemetry.keepalive.server-parameters.max-connection-age", 180*time.Second) + v.Set("receivers.opentelemetry.keepalive.server-parameters.max-connection-age-grace", 10*time.Second) + v.Set("receivers.opentelemetry.keepalive.enforcement-policy.min-time", 60*time.Second) + v.Set("receivers.opentelemetry.keepalive.enforcement-policy.permit-without-stream", true) return v }, }, @@ -80,7 +80,7 @@ func TestStart(t *testing.T) { // Enforce that all configurations are actually recognized. v := tt.viperFn() rOpts := builder.OpenCensusReceiverCfg{} - if err := v.Sub("receivers.opentelemtry").UnmarshalExact(&rOpts); err != nil { + if err := v.Sub("receivers.opentelemetry").UnmarshalExact(&rOpts); err != nil { t.Errorf("UnmarshalExact error: %v", err) return } diff --git a/internal/collector/processor/metrics.go b/internal/collector/processor/metrics.go index 0ffcbd12232..b4d7c60b378 100644 --- a/internal/collector/processor/metrics.go +++ b/internal/collector/processor/metrics.go @@ -16,9 +16,9 @@ package processor import ( commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) diff --git a/internal/collector/processor/nodebatcher/metrics.go b/internal/collector/processor/nodebatcher/metrics.go index b8a13a3da80..6e27dcf4d42 100644 --- a/internal/collector/processor/nodebatcher/metrics.go +++ b/internal/collector/processor/nodebatcher/metrics.go @@ -15,9 +15,9 @@ package nodebatcher import ( - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/processor" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" diff --git a/internal/collector/processor/nodebatcher/node_batcher.go b/internal/collector/processor/nodebatcher/node_batcher.go index f857e332b05..ca49399383e 100644 --- a/internal/collector/processor/nodebatcher/node_batcher.go +++ b/internal/collector/processor/nodebatcher/node_batcher.go @@ -26,7 +26,7 @@ import ( resourcepb "github.com/open-telemetry/opentelemetry-proto/gen-go/resource/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/proto" - "go.opentelemtry.io/stats" + "go.opentelemetry.io/stats" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/processor/queued/queued_processor.go b/internal/collector/processor/queued/queued_processor.go index 4214f3c0f6b..bba68110926 100644 --- a/internal/collector/processor/queued/queued_processor.go +++ b/internal/collector/processor/queued/queued_processor.go @@ -20,9 +20,9 @@ import ( "time" "github.com/jaegertracing/jaeger/pkg/queue" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/processor/tailsampling/metrics.go b/internal/collector/processor/tailsampling/metrics.go index 4eb2de3ca7f..f5c96137dc9 100644 --- a/internal/collector/processor/tailsampling/metrics.go +++ b/internal/collector/processor/tailsampling/metrics.go @@ -15,9 +15,9 @@ package tailsampling import ( - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" "github.com/open-telemetry/opentelemetry-service/internal/collector/telemetry" ) diff --git a/internal/collector/processor/tailsampling/processor.go b/internal/collector/processor/tailsampling/processor.go index 3bc53ed1141..9fa54b9b96d 100644 --- a/internal/collector/processor/tailsampling/processor.go +++ b/internal/collector/processor/tailsampling/processor.go @@ -22,8 +22,8 @@ import ( "time" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/tag" "go.uber.org/zap" "github.com/open-telemetry/opentelemetry-service/consumer" diff --git a/internal/collector/telemetry/process_telemetry.go b/internal/collector/telemetry/process_telemetry.go index d5882c0c03a..0bb16321110 100644 --- a/internal/collector/telemetry/process_telemetry.go +++ b/internal/collector/telemetry/process_telemetry.go @@ -7,8 +7,8 @@ import ( "time" "github.com/prometheus/procfs" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" ) // ProcessMetricsViews is a struct that contains views related to process metrics (cpu, mem, etc) diff --git a/internal/compression/grpc/grpc.go b/internal/compression/grpc/grpc.go index 404b1725da6..38d76920c86 100644 --- a/internal/compression/grpc/grpc.go +++ b/internal/compression/grpc/grpc.go @@ -23,7 +23,7 @@ import ( ) var ( - // Map of opentelemtry compression types to grpc registered compression types + // Map of opentelemetry compression types to grpc registered compression types grpcCompressionKeyMap = map[string]string{ compression.Gzip: gzip.Name, } diff --git a/internal/compression/keys.go b/internal/compression/keys.go index 5d31ba30bf5..bbcd9ceead6 100644 --- a/internal/compression/keys.go +++ b/internal/compression/keys.go @@ -14,7 +14,7 @@ package compression -// Compression keys for supported compression types within opentelemtry collector +// Compression keys for supported compression types within opentelemetry collector const ( Unsupported = "" Gzip = "gzip" diff --git a/internal/config/config.go b/internal/config/config.go index a16f9736ac3..b5327a2163b 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -44,7 +44,7 @@ import ( // We expect the configuration.yaml file to look like this: // // receivers: -// opentelemtry: +// opentelemetry: // port: // // zipkin: @@ -98,7 +98,7 @@ type Config struct { // * Prometheus (metrics) // * Zipkin (traces) type Receivers struct { - OpenTelemetry *ReceiverConfig `mapstructure:"opentelemtry"` + OpenTelemetry *ReceiverConfig `mapstructure:"opentelemetry"` Zipkin *ReceiverConfig `mapstructure:"zipkin"` Jaeger *ReceiverConfig `mapstructure:"jaeger"` Scribe *ScribeReceiverConfig `mapstructure:"zipkin-scribe"` @@ -449,7 +449,7 @@ func eqLocalHost(host string) bool { // + zipkin // + jaeger // + kafka -// + opentelemtry +// + opentelemetry // + prometheus // + aws-xray // + honeycomb @@ -464,7 +464,7 @@ func ExportersFromViperConfig(logger *zap.Logger, v *viper.Viper) ([]consumer.Tr {name: "zipkin", fn: zipkinexporter.ZipkinExportersFromViper}, {name: "jaeger", fn: jaegerexporter.JaegerExportersFromViper}, {name: "kafka", fn: kafkaexporter.KafkaExportersFromViper}, - {name: "opentelemtry", fn: opentelemetryexporter.OpenCensusTraceExportersFromViper}, + {name: "opentelemetry", fn: opentelemetryexporter.OpenCensusTraceExportersFromViper}, {name: "prometheus", fn: prometheusexporter.PrometheusExportersFromViper}, {name: "aws-xray", fn: awsexporter.AWSXRayTraceExportersFromViper}, {name: "honeycomb", fn: honeycombexporter.HoneycombTraceExportersFromViper}, diff --git a/internal/config/tls_credentials_test.go b/internal/config/tls_credentials_test.go index f5aec00e556..dc40d73e371 100644 --- a/internal/config/tls_credentials_test.go +++ b/internal/config/tls_credentials_test.go @@ -26,7 +26,7 @@ import ( func TestTLSConfigByParsing(t *testing.T) { configYAML := []byte(` receivers: - opentelemtry: + opentelemetry: tls_credentials: cert_file: "foobar.crt" key_file: "foobar.key" @@ -84,7 +84,7 @@ func TestTLSCredentials_nonEmptyChecks(t *testing.T) { { config: ` receivers: - opentelemtry: + opentelemetry: tls_credentials: cert_file: "foo" `, want: true, @@ -92,7 +92,7 @@ receivers: { config: ` receivers: - opentelemtry: + opentelemetry: tls_credentials: key_file: "foo" `, want: true, @@ -100,7 +100,7 @@ receivers: { config: ` receivers: - opentelemtry: + opentelemetry: tls_credentials: key_file: "" cert_file: "" diff --git a/internal/zpagesserver/zpagesserver.go b/internal/zpagesserver/zpagesserver.go index 3b4a554620c..8cabe5310eb 100644 --- a/internal/zpagesserver/zpagesserver.go +++ b/internal/zpagesserver/zpagesserver.go @@ -20,7 +20,7 @@ import ( "net" "net/http" - "go.opentelemtry.io/zpages" + "go.opentelemetry.io/zpages" ) const ( diff --git a/observability/observability.go b/observability/observability.go index 8537e1151bc..193f90ea10f 100644 --- a/observability/observability.go +++ b/observability/observability.go @@ -23,11 +23,11 @@ import ( "google.golang.org/grpc" - "go.opentelemtry.io/plugin/ocgrpc" - "go.opentelemtry.io/stats" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/plugin/ocgrpc" + "go.opentelemetry.io/stats" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" + "go.opentelemetry.io/trace" ) var ( diff --git a/observability/observabilitytest/observabilitytest.go b/observability/observabilitytest/observabilitytest.go index 8cf77a8f27c..00c7e6bf45f 100644 --- a/observability/observabilitytest/observabilitytest.go +++ b/observability/observabilitytest/observabilitytest.go @@ -19,8 +19,8 @@ import ( "reflect" "sort" - "go.opentelemtry.io/stats/view" - "go.opentelemtry.io/tag" + "go.opentelemetry.io/stats/view" + "go.opentelemetry.io/tag" "github.com/open-telemetry/opentelemetry-service/observability" ) diff --git a/receiver/README.md b/receiver/README.md index 983fe6b8419..65c4aee8fbf 100644 --- a/receiver/README.md +++ b/receiver/README.md @@ -7,13 +7,13 @@ __Currently there are some inconsistencies between Agent and Collector configura This receiver receives spans from OpenTelemetry instrumented applications and translates them into the internal span types that are then sent to the collector/exporters. -Its address can be configured in the YAML configuration file under section "receivers", subsection "opentelemtry" and field "address". The syntax of the field "address" is `[address|host]:`. +Its address can be configured in the YAML configuration file under section "receivers", subsection "opentelemetry" and field "address". The syntax of the field "address" is `[address|host]:`. For example: ```yaml receivers: - opentelemtry: + opentelemetry: address: "127.0.0.1:55678" ``` ### Writing with HTTP/JSON @@ -23,7 +23,7 @@ HTTP/JSON in addition to gRPC. The HTTP/JSON address is the same as gRPC as the protocol is recognized and processed accordingly. To write traces with HTTP/JSON, `POST` to `[address]/v1/trace`. The JSON message -format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/open-telemetry/opentelemetry-proto/blob/master/gen-openapi/opentelemtry/proto/agent/trace/v1/trace_service.swagger.json). +format parallels the gRPC protobuf format, see this [OpenApi spec for it](https://github.com/open-telemetry/opentelemetry-proto/blob/master/gen-openapi/opentelemetry/proto/agent/trace/v1/trace_service.swagger.json). The HTTP/JSON endpoint can also optionally [CORS](https://fetch.spec.whatwg.org/#cors-protocol), which is enabled by @@ -31,7 +31,7 @@ specifying a list of allowed CORS origins in the `cors_allowed_origins` field: ```yaml receivers: - opentelemtry: + opentelemetry: address: "localhost:55678" cors_allowed_origins: - http://test.com @@ -47,7 +47,7 @@ using `--receive-opentel-trace=false`. On the Collector only the port can be con ```yaml receivers: - opentelemtry: + opentelemetry: port: 55678 # Settings below are only available on collector. diff --git a/receiver/end_to_end_test.go b/receiver/end_to_end_test.go index e8852c19581..c1a402665c5 100644 --- a/receiver/end_to_end_test.go +++ b/receiver/end_to_end_test.go @@ -21,8 +21,8 @@ import ( "github.com/open-telemetry/opentelemetry-service/exporter/loggingexporter" - "contrib.go.opentelemtry.io/exporter/ocagent" - "go.opentelemtry.io/trace" + "contrib.go.opentelemetry.io/exporter/ocagent" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/receiver" "github.com/open-telemetry/opentelemetry-service/receiver/opentelemetryreceiver" diff --git a/receiver/jaegerreceiver/jaeger_agent_test.go b/receiver/jaegerreceiver/jaeger_agent_test.go index 3afe50f765f..185189161f3 100644 --- a/receiver/jaegerreceiver/jaeger_agent_test.go +++ b/receiver/jaegerreceiver/jaeger_agent_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" - "contrib.go.opentelemtry.io/exporter/jaeger" - "go.opentelemtry.io/trace" + "contrib.go.opentelemetry.io/exporter/jaeger" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" diff --git a/receiver/jaegerreceiver/trace_receiver_test.go b/receiver/jaegerreceiver/trace_receiver_test.go index 8143c5288d1..95b4bf56755 100644 --- a/receiver/jaegerreceiver/trace_receiver_test.go +++ b/receiver/jaegerreceiver/trace_receiver_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" - "contrib.go.opentelemtry.io/exporter/jaeger" - "go.opentelemtry.io/trace" + "contrib.go.opentelemetry.io/exporter/jaeger" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" diff --git a/receiver/opencensusreceiver/config_test.go b/receiver/opencensusreceiver/config_test.go index 166584437f3..6a30cc28c7f 100644 --- a/receiver/opencensusreceiver/config_test.go +++ b/receiver/opencensusreceiver/config_test.go @@ -39,10 +39,10 @@ func TestLoadConfig(t *testing.T) { assert.Equal(t, len(config.Receivers), 2) - r0 := config.Receivers["opentelemtry"] + r0 := config.Receivers["opentelemetry"] assert.Equal(t, r0, factory.CreateDefaultConfig()) - r1 := config.Receivers["opentelemtry/customname"].(*ConfigV2) + r1 := config.Receivers["opentelemetry/customname"].(*ConfigV2) assert.Equal(t, r1.ReceiverSettings, configmodels.ReceiverSettings{ Endpoint: "0.0.0.0:9090", diff --git a/receiver/opencensusreceiver/factory.go b/receiver/opencensusreceiver/factory.go index 746ad4e2f6f..dd576d3acf1 100644 --- a/receiver/opencensusreceiver/factory.go +++ b/receiver/opencensusreceiver/factory.go @@ -28,7 +28,7 @@ var _ = factories.RegisterReceiverFactory(&receiverFactory{}) const ( // The value of "type" key in configuration. - typeStr = "opentelemtry" + typeStr = "opentelemetry" ) // receiverFactory is the factory for receiver. diff --git a/receiver/opencensusreceiver/ocmetrics/opencensus.go b/receiver/opencensusreceiver/ocmetrics/opencensus.go index 086908442fb..f842b79c8de 100644 --- a/receiver/opencensusreceiver/ocmetrics/opencensus.go +++ b/receiver/opencensusreceiver/ocmetrics/opencensus.go @@ -21,7 +21,7 @@ import ( "google.golang.org/api/support/bundler" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agentmetricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/metrics/v1" diff --git a/receiver/opencensusreceiver/octrace/observability_test.go b/receiver/opencensusreceiver/octrace/observability_test.go index 6547ddaaf9e..f6ee4c682d2 100644 --- a/receiver/opencensusreceiver/octrace/observability_test.go +++ b/receiver/opencensusreceiver/octrace/observability_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" @@ -132,7 +132,7 @@ func TestExportSpanLinkingMaintainsParentLink(t *testing.T) { defer ocSpansSaver.mu.Unlock() if len(ocSpansSaver.spanData) == 0 { - t.Fatal("Unfortunately did not receive an exported span data. Please check this library's implementation or go.opentelemtry.io/trace") + t.Fatal("Unfortunately did not receive an exported span data. Please check this library's implementation or go.opentelemetry.io/trace") } gotSpanData := ocSpansSaver.spanData[:] diff --git a/receiver/opencensusreceiver/octrace/opencensus.go b/receiver/opencensusreceiver/octrace/opencensus.go index bbc423e5540..58086152857 100644 --- a/receiver/opencensusreceiver/octrace/opencensus.go +++ b/receiver/opencensusreceiver/octrace/opencensus.go @@ -19,7 +19,7 @@ import ( "errors" "io" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" @@ -48,7 +48,7 @@ type traceDataWithCtx struct { ctx context.Context } -// New creates a new opentelemtry.Receiver reference. +// New creates a new opentelemetry.Receiver reference. func New(nextConsumer consumer.TraceConsumer, opts ...Option) (*Receiver, error) { if nextConsumer == nil { return nil, errors.New("needs a non-nil consumer.TraceConsumer") diff --git a/receiver/opencensusreceiver/octrace/opencensus_test.go b/receiver/opencensusreceiver/octrace/opencensus_test.go index c3a84868a57..deffe77de5e 100644 --- a/receiver/opencensusreceiver/octrace/opencensus_test.go +++ b/receiver/opencensusreceiver/octrace/opencensus_test.go @@ -32,7 +32,7 @@ import ( "github.com/golang/protobuf/proto" "google.golang.org/grpc" - "contrib.go.opentelemtry.io/exporter/ocagent" + "contrib.go.opentelemetry.io/exporter/ocagent" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" agenttracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/trace/v1" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" @@ -40,8 +40,8 @@ import ( "github.com/open-telemetry/opentelemetry-service/data" "github.com/open-telemetry/opentelemetry-service/internal" "github.com/open-telemetry/opentelemetry-service/observability" - "go.opentelemtry.io/trace" - "go.opentelemtry.io/trace/tracestate" + "go.opentelemetry.io/trace" + "go.opentelemetry.io/trace/tracestate" ) func TestReceiver_endToEnd(t *testing.T) { @@ -52,7 +52,7 @@ func TestReceiver_endToEnd(t *testing.T) { _, port, doneFn := ocReceiverOnGRPCServer(t, sappender) defer doneFn() - // Now the opentelemtry-agent exporter. + // Now the opentelemetry-agent exporter. address := fmt.Sprintf("localhost:%d", port) oce, err := ocagent.NewExporter(ocagent.WithAddress(address), ocagent.WithInsecure()) if err != nil { diff --git a/receiver/opencensusreceiver/testdata/config.yaml b/receiver/opencensusreceiver/testdata/config.yaml index ee38ce9c1ad..616a3819e35 100644 --- a/receiver/opencensusreceiver/testdata/config.yaml +++ b/receiver/opencensusreceiver/testdata/config.yaml @@ -1,6 +1,6 @@ receivers: - opentelemtry: - opentelemtry/customname: + opentelemetry: + opentelemetry/customname: endpoint: 0.0.0.0:9090 processors: @@ -11,7 +11,7 @@ exporters: pipelines: traces: - receivers: [opentelemtry] + receivers: [opentelemetry] processors: [exampleprocessor] exporters: [exampleexporter] diff --git a/receiver/prometheusreceiver/metrics_receiver_test.go b/receiver/prometheusreceiver/metrics_receiver_test.go index 4ce434a5704..75d1e4a941b 100644 --- a/receiver/prometheusreceiver/metrics_receiver_test.go +++ b/receiver/prometheusreceiver/metrics_receiver_test.go @@ -27,10 +27,10 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "contrib.go.opentelemtry.io/exporter/prometheus" + "contrib.go.opentelemetry.io/exporter/prometheus" "github.com/spf13/viper" - "go.opentelemtry.io/metric/metricdata" - "go.opentelemtry.io/metric/metricproducer" + "go.opentelemetry.io/metric/metricdata" + "go.opentelemetry.io/metric/metricproducer" commonpb "github.com/open-telemetry/opentelemetry-proto/gen-go/agent/common/v1" metricspb "github.com/open-telemetry/opentelemetry-proto/gen-go/metrics/v1" diff --git a/receiver/vmmetricsreceiver/vm_metrics_collector.go b/receiver/vmmetricsreceiver/vm_metrics_collector.go index 9287c9221a0..58dd4564b4c 100644 --- a/receiver/vmmetricsreceiver/vm_metrics_collector.go +++ b/receiver/vmmetricsreceiver/vm_metrics_collector.go @@ -22,7 +22,7 @@ import ( "time" "github.com/prometheus/procfs" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" diff --git a/receiver/zipkinreceiver/trace_receiver.go b/receiver/zipkinreceiver/trace_receiver.go index 115608ca0ed..5235bc883ea 100644 --- a/receiver/zipkinreceiver/trace_receiver.go +++ b/receiver/zipkinreceiver/trace_receiver.go @@ -35,7 +35,7 @@ import ( "github.com/jaegertracing/jaeger/thrift-gen/zipkincore" zipkinmodel "github.com/openzipkin/zipkin-go/model" zipkinproto "github.com/openzipkin/zipkin-go/proto/v2" - "go.opentelemtry.io/trace" + "go.opentelemetry.io/trace" "github.com/open-telemetry/opentelemetry-service/consumer" "github.com/open-telemetry/opentelemetry-service/data" @@ -475,7 +475,7 @@ func extractProtoStatus(zs *zipkinmodel.SpanModel) *tracepb.Status { return nil } canonicalCodeStr := zs.Tags["error"] - message := zs.Tags["opentelemtry.status_description"] + message := zs.Tags["opentelemetry.status_description"] if message == "" && canonicalCodeStr == "" { return nil } diff --git a/receiver/zipkinreceiver/trace_receiver_test.go b/receiver/zipkinreceiver/trace_receiver_test.go index e350f676847..aaf1a1d5e1c 100644 --- a/receiver/zipkinreceiver/trace_receiver_test.go +++ b/receiver/zipkinreceiver/trace_receiver_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "contrib.go.opentelemtry.io/exporter/zipkin" + "contrib.go.opentelemetry.io/exporter/zipkin" openzipkin "github.com/openzipkin/zipkin-go" zipkinmodel "github.com/openzipkin/zipkin-go/model" zhttp "github.com/openzipkin/zipkin-go/reporter/http" diff --git a/translator/trace/jaeger/constants.go b/translator/trace/jaeger/constants.go index 0c930978873..3c3db9cb4f8 100644 --- a/translator/trace/jaeger/constants.go +++ b/translator/trace/jaeger/constants.go @@ -28,9 +28,9 @@ const ( ocTimeEventMessageEventCSize = "opentel.timeevent.messageevent.csize" ocSameProcessAsParentSpan = "opentel.sameprocessasparentspan" ocSpanChildCount = "opentel.span.childcount" - opentelemetryLanguage = "opentelemtry.language" - opentelemetryExporterVersion = "opentelemtry.exporterversion" - opentelemetryCoreLibVersion = "opentelemtry.corelibversion" + opentelemetryLanguage = "opentelemetry.language" + opentelemetryExporterVersion = "opentelemetry.exporterversion" + opentelemetryCoreLibVersion = "opentelemetry.corelibversion" ) var ( diff --git a/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json b/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json index d7dfa434649..103ba8587f7 100644 --- a/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json +++ b/translator/trace/jaeger/testdata/proto_batch_no_binary_tags_01.json @@ -20,7 +20,7 @@ "v_str": "10.53.69.61" }, { - "key": "opentelemtry.exporterversion", + "key": "opentelemetry.exporterversion", "v_str": "someVersion" }, { diff --git a/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json b/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json index 4c2de6f38c5..754af5a5e49 100644 --- a/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json +++ b/translator/trace/jaeger/testdata/thrift_batch_no_binary_tags_01.json @@ -23,7 +23,7 @@ "vStr": "10.53.69.61" }, { - "key": "opentelemtry.exporterversion", + "key": "opentelemetry.exporterversion", "vType": "STRING", "vStr": "someVersion" }, diff --git a/translator/trace/spandata/protospan_to_spandata.go b/translator/trace/spandata/protospan_to_spandata.go index 3c88eb5a410..36ab2546021 100644 --- a/translator/trace/spandata/protospan_to_spandata.go +++ b/translator/trace/spandata/protospan_to_spandata.go @@ -19,8 +19,8 @@ import ( "errors" "time" - "go.opentelemtry.io/trace" - "go.opentelemtry.io/trace/tracestate" + "go.opentelemetry.io/trace" + "go.opentelemetry.io/trace/tracestate" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/golang/protobuf/ptypes/timestamp" diff --git a/translator/trace/spandata/protospan_to_spandata_test.go b/translator/trace/spandata/protospan_to_spandata_test.go index 9f27b223825..7b3e87a3b15 100644 --- a/translator/trace/spandata/protospan_to_spandata_test.go +++ b/translator/trace/spandata/protospan_to_spandata_test.go @@ -23,8 +23,8 @@ import ( "github.com/golang/protobuf/ptypes/wrappers" - "go.opentelemtry.io/trace" - "go.opentelemtry.io/trace/tracestate" + "go.opentelemetry.io/trace" + "go.opentelemetry.io/trace/tracestate" tracepb "github.com/open-telemetry/opentelemetry-proto/gen-go/trace/v1" "github.com/open-telemetry/opentelemetry-service/internal"