diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e386a71b898..f8a7b6f28c31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,6 +16,11 @@ executors: - image: cimg/go:1.14 commands: + restore_workspace: + steps: + - attach_to_workspace + - restore_module_cache + attach_to_workspace: steps: - attach_workspace: @@ -24,7 +29,7 @@ commands: save_module_cache: steps: - save_cache: - key: cimg-go-pkg-mod-{{ checksum "go.sum" }}-v2 + key: cimg-go-pkg-mod-{{ checksum "go.sum" }}-v4 paths: - "/home/circleci/go/pkg/mod" @@ -35,10 +40,7 @@ commands: command: mkdir -p ~/go/pkg/mod - restore_cache: # restores saved cache if no changes are detected since last run keys: - - cimg-go-pkg-mod-{{ checksum "go.sum" }}-v2 - - persist_to_workspace: - root: ~/ - paths: go/pkg/mod + - cimg-go-pkg-mod-{{ checksum "go.sum" }}-v4 publish_docker_images: parameters: @@ -79,7 +81,7 @@ workflows: - build - publish-dev: requires: - - run-stability-tests + - run-stability-tests build-publish: when: << pipeline.parameters.run-build-publish >> @@ -108,7 +110,7 @@ workflows: only: /.*/ - cross-compile: requires: - - build + - setup filters: tags: only: /.*/ @@ -139,7 +141,7 @@ workflows: - build filters: branches: - only: /master/ + only: /master|release\/.+/ tags: ignore: /.*/ @@ -149,25 +151,28 @@ jobs: steps: - checkout - restore_module_cache - - persist_to_workspace: - root: ~/ - paths: project + - run: + name: Install deps + command: make -j8 for-all-target TARGET='dep' - run: name: Install tools command: make install-tools - run: name: Install testbed tools command: make -C testbed install-tools + - save_module_cache - persist_to_workspace: root: ~/ - paths: go/bin + paths: + - project + - go/bin lint: executor: golang steps: - - attach_to_workspace + - restore_workspace - run: name: Lint - command: CMD="make lint" make -j4 for-all + command: make -j8 for-all-target TARGET="lint" - run: name: Checks command: make -j4 checklicense impi misspell @@ -175,7 +180,7 @@ jobs: build: executor: golang steps: - - attach_to_workspace + - restore_workspace - run: name: Build collector for linux_amd64 command: make otelcontribcol @@ -187,7 +192,7 @@ jobs: docker: - image: cimg/go:1.14 steps: - - attach_to_workspace + - restore_workspace - setup_remote_docker - run: name: Build trace example @@ -197,7 +202,7 @@ jobs: executor: golang parallelism: 4 steps: - - attach_to_workspace + - restore_workspace - run: name: Build collector for all archs command: grep ^otelcontribcol-all-sys Makefile|fmt -w 1|tail -n +2|circleci tests split|xargs make @@ -208,7 +213,7 @@ jobs: test: executor: golang steps: - - attach_to_workspace + - restore_workspace - run: name: Coverage tests command: make test-with-cover @@ -220,7 +225,7 @@ jobs: executor: golang resource_class: medium+ steps: - - attach_to_workspace + - restore_workspace - run: name: Loadtest command: make -C testbed runtests @@ -233,7 +238,7 @@ jobs: docker: - image: cimg/go:1.14 steps: - - attach_to_workspace + - restore_workspace - setup_remote_docker - publish_docker_images: repo: opentelemetry-collector @@ -248,7 +253,7 @@ jobs: publish-dev: executor: golang steps: - - attach_to_workspace + - restore_workspace - setup_remote_docker - publish_docker_images: repo: opentelemetry-collector-dev @@ -278,7 +283,7 @@ jobs: run-stability-tests: executor: golang steps: - - attach_to_workspace + - restore_workspace - run: name: Run stability tests command: make stability-tests diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000000..8975a2d30d20 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,223 @@ +# Changelog + +## Unreleased + +## v0.4.0 + +Released 17-06-2020 + +# 🎉 OpenTelemetry Collector Contrib v0.4.0 (Beta) 🎉 + +The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-collector release](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.4.0) (be sure to check the release notes here as well!). Check out the [Getting Started Guide](https://opentelemetry.io/docs/collector/about/) for deployment and configuration information. + +## 🛑 Breaking changes 🛑 + + - `signalfx` exporter `url` parameter changed to `ingest_url` (no impact if only using `realm` setting) + +## 🚀 New components 🚀 + +- Receivers + - `receiver_creator` to create receivers at runtime (#145), add observer support to receiver_creator (#173), add rules support (#207), add dynamic configuration values (#235) + - `kubeletstats` receiver (#237) + - `prometheus_simple` receiver (#184) + - `kubernetes-cluster` receiver (#175) + - `redis` receiver (#138) +- Exporters + - `alibabacloudlogservice` exporter (#259) + - `SplunkHEC` metrics exporter (#246) + - `elastic` APM exporter (#240) + - `newrelic` exporter (#229) +- Extensions + - `k8s` observer (#185) + +## 💡 Enhancements 💡 + +- `awsxray` exporter + - Use X-Ray convention of segment name == service name (#282) + - Tweak xray export to improve rendering of traces and improve parity (#241) + - Add handling for spans received with nil attributes (#212) +- `honeycomb` exporter + - Use SendPresampled (#291) + - Add span attributes as honeycomb event fields (#271) + - Support resource labels in Honeycomb exporter (#20) +- `k8s` processor + - Add support of Pod UID extraction to k8sprocessor (#219) + - Use `k8s.pod.ip` to record resource IP instead of just `ip` (#183) + - Support same authentication mechanism as other kubernetes components do (#307) +- `sapm` exporter: Add TLS for SAPM and SignalFx receiver (#215) +- `signalfx` exporter + - Add metric metadata syncer to SignalFx exporter (#231) + - Add TLS for SAPM and SignalFx receiver (#215) +- `stackdriver` exporter: Add support for resource mapping in config (#163) + +## 🧰 Bug fixes 🧰 + +- `awsxray` exporter: Wrap bad request errors for proper handling by retry queue (#205) +- `lightstep` exporter: Ensure Lightstep exporter doesnt crash on nil node (#250) +- `sapm` exporter: Do not break Jaeger traces before sending downstream (#193) +- `k8s` processor: Ensure Jaeger spans work in passthrough mode (262) + +## 🧩 Components 🧩 + +### Receivers + +| Traces | Metrics | +|:-------:|:-------:| +| Jaeger Legacy | Carbon | +| SAPM (SignalFx APM) | Collectd | +| Zipkin Scribe | K8s Cluster | +| | Redis | +| | SignalFx | +| | Simple Prometheus | +| | Wavefront | + +### Processors + +- K8s + +### Exporters + +| Commercial | Community | +|:------------:|:-----------:| +| Alibaba Cloud Log Service | Carbon | +| AWS X-ray | Elastic | +| Azure Monitor | Jaeger Thrift | +| Honeycomb | Kinesis | +| Lightstep | +| New Relic | +| SAPM (SignalFx APM) | +| SignalFx (Metrics) | +| Splunk HEC | +| Stackdriver (Google) | + +### Extensions + +- Observer + - K8s + +## v0.3.0 Beta + +Released 2020-03-30 + +### Breaking changes + +- Make prometheus receiver config loading strict. #697 +Prometheus receiver will now fail fast if the config contains unused keys in it. + +### Changes and fixes + +- Enable best effort serve by default of Prometheus Exporter (https://github.com/orijtech/prometheus-go-metrics-exporter/pull/6) +- Fix null pointer exception in the logging exporter #743 +- Remove unnecessary condition to have at least one processor #744 +- Updated Honeycomb exported to `honeycombio/opentelemetry-exporter-go v0.3.1` + +### Features + +Receivers / Exporters: + +* AWS X-Ray +* Carbon +* CollectD +* Honeycomb +* Jaeger +* Kinesis +* LightStep +* OpenCensus +* OpenTelemetry +* SAPM +* SignalFx +* Stackdriver +* Wavefront +* Zipkin +* Zipkin Scribe + + +Processors: + +* Attributes +* Batch +* Memory Limiter +* Queued Retry +* Resource +* Sampling +* Span +* Kubernetes + +Extensions: + +* Health Check +* Performance Profiler +* zPages + + +## v0.2.8 + +Released 2020-03-25 + +Alpha v0.2.8 of OpenTelemetry Collector Contrib. + +- Implemented OTLP receiver and exporter. +- Added ability to pass config to the service programmatically (useful for custom builds). +- Improved own metrics / observability. + + +## v0.2.7 + +Released 2020-03-17 + +### Self-Observability +- New command-line switch to control legacy and new metrics. Users are encouraged +to experiment and migrate to the new metrics. +- Improved error handling on shutdown. + + +### Processors +- Fixed passthrough mode k8sprocessor. +- Added `HASH` action to attribute processor. + +### Receivers and Exporters +- Added Honeycomb exporter. +- Added LightStep exporter. +- Added regular expression for Carbon receiver, allowing the metric name to be broken into proper label keys and values. +- Updated Stackdriver exporter to use a new batch API. + + +## v0.2.6 Alpha + +Released 2020-02-18 + +### Self-Observability +- Updated metrics prefix to `otelcol` and expose command line argument to modify the prefix value. +- Batch dropped span now emits zero when no spans are dropped. + +### Processors +- Extended Span processor to have include/exclude span logic. +- Ability to choose strict or regexp matching for include/exclude filters. + +### Receivers and Exporters +- Added Carbon receiver and exporter. +- Added Wavefront receiver. + + +## v0.0.5 Alpha + +Released 2020-01-30 + +- Regexp-based filtering of span names. +- Ability to extract attributes from span names and rename span. +- File exporter for debugging. +- Span processor is now enabled by default. + +## v0.0.1 Alpha + +Released 2020-01-11 + +First release of OpenTelemetry Collector Contrib. + + +[v0.3.0]: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.2.8...v0.3.0 +[v0.2.8]: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.2.7...v0.2.8 +[v0.2.7]: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.2.6...v0.2.7 +[v0.2.6]: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.0.5...v0.2.6 +[v0.0.5]: https://github.com/open-telemetry/opentelemetry-collector-contrib/compare/v0.0.1...v0.0.5 +[v0.0.1]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.0.1 \ No newline at end of file diff --git a/Makefile b/Makefile index 4515eb95cd10..887e004862d8 100644 --- a/Makefile +++ b/Makefile @@ -60,6 +60,14 @@ for-all: $${CMD} ); \ done +GOMODULES = $(ALL_MODULES) $(PWD) +.PHONY: $(GOMODULES) +MODULEDIRS = $(GOMODULES:%=for-all-target-%) +for-all-target: $(MODULEDIRS) +$(MODULEDIRS): + $(MAKE) -C $(@:for-all-target-%=%) $(TARGET) +.PHONY: for-all-target + .PHONY: install-tools install-tools: go install github.com/client9/misspell/cmd/misspell diff --git a/Makefile.Common b/Makefile.Common index a01ddf18945a..edde2fda4514 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -92,7 +92,7 @@ fmt: .PHONY: lint lint: lint-static-check - $(LINT) run + $(LINT) run --allow-parallel-runners .PHONY: misspell misspell: @@ -105,3 +105,7 @@ misspell-correction: .PHONY: impi impi: @$(IMPI) --local github.com/open-telemetry/opentelemetry-collector-contrib --scheme stdThirdPartyLocal ./... + +.PHONY: dep +dep: + go mod download \ No newline at end of file diff --git a/cmd/otelcontribcol/components_docs_test.go b/cmd/otelcontribcol/components_docs_test.go new file mode 100644 index 000000000000..a56986c55d80 --- /dev/null +++ b/cmd/otelcontribcol/components_docs_test.go @@ -0,0 +1,49 @@ +// Copyright The OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +package main + +import ( + "os" + "path/filepath" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componentdocs" +) + +const ( + relativeDefaultComponentsPath = "cmd/otelcontribcol/components.go" + projectGoModule = "github.com/open-telemetry/opentelemetry-collector-contrib" +) + +// TestComponentDocs verifies existence of READMEs for components specified as +// default components in the collector. Looking for default components being enabled +// in the collector gives a reasonable measure of the components that need to be +// documented. Note, that for this test to work, the underlying assumption is +// the imports in cmd/otelcontribcol/components.go" are indicative +// of components that require documentation. +func TestComponentDocs(t *testing.T) { + wd, err := os.Getwd() + require.NoError(t, err, "failed to get working directory: %v") + + // Absolute path to the project root directory + projectPath := filepath.Join(wd, "../../") + + err = componentdocs.VerifyComponentDocumentation( + projectPath, + relativeDefaultComponentsPath, + projectGoModule, + ) + require.NoError(t, err) +} diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod index 95fcd2fbfac8..105c17bf27ef 100644 --- a/exporter/alibabacloudlogserviceexporter/go.mod +++ b/exporter/alibabacloudlogserviceexporter/go.mod @@ -8,6 +8,6 @@ require ( github.com/gogo/protobuf v1.3.1 github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum index 64fe17d2730b..ae1a90f8cfcd 100644 --- a/exporter/alibabacloudlogserviceexporter/go.sum +++ b/exporter/alibabacloudlogserviceexporter/go.sum @@ -1038,8 +1038,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index 6aa0f5157e1d..1a42cf7a7669 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/mattn/go-isatty v0.0.10 // indirect github.com/open-telemetry/opentelemetry-proto v0.3.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e ) diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum index 9b6a39c950d1..2f441a84a924 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -1234,8 +1234,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/azuremonitorexporter/README.md b/exporter/azuremonitorexporter/README.md new file mode 100644 index 000000000000..a30c5ff7801a --- /dev/null +++ b/exporter/azuremonitorexporter/README.md @@ -0,0 +1,3 @@ +# Azure Monitor Exporter + +To be added. \ No newline at end of file diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 06742bf85ee3..ab0a5f0c26b2 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/multierr v1.4.0 // indirect go.uber.org/zap v1.13.0 google.golang.org/appengine v1.6.2 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 16ac0d56b706..2affa12b8122 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -1135,8 +1135,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/exporter/carbonexporter/README.md b/exporter/carbonexporter/README.md new file mode 100644 index 000000000000..1eb9f97ec7bd --- /dev/null +++ b/exporter/carbonexporter/README.md @@ -0,0 +1,3 @@ +# Carbon Exporter + +To be added. \ No newline at end of file diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 9e5f31f150ff..27351a94e086 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -5,6 +5,6 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index 5009062a5112..cb7db019e201 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -1125,8 +1125,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod index 86d21e5f9506..fb4ec58ebb42 100644 --- a/exporter/elasticexporter/go.mod +++ b/exporter/elasticexporter/go.mod @@ -6,6 +6,6 @@ require ( github.com/stretchr/testify v1.5.1 go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea go.elastic.co/fastjson v1.1.0 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.15.0 ) diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum index 2a33dbdf193b..4c976d45ce01 100644 --- a/exporter/elasticexporter/go.sum +++ b/exporter/elasticexporter/go.sum @@ -1113,8 +1113,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 9d3228a3634b..0f9845361099 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/klauspost/compress v1.10.2 github.com/opentracing/opentracing-go v1.1.1-0.20190913142402-a7454ce5950e // indirect github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.0 google.golang.org/grpc v1.29.1 ) diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index 6d6e8d91fd18..2113276f89f5 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -1147,8 +1147,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 31ada5095e52..7e66355c3659 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -9,6 +9,6 @@ require ( github.com/google/go-cmp v0.4.0 github.com/jaegertracing/jaeger v1.17.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 73dc8f01f41c..fe8e70d60b13 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -1106,8 +1106,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/kinesisexporter/README.md b/exporter/kinesisexporter/README.md new file mode 100644 index 000000000000..73eea03a06b6 --- /dev/null +++ b/exporter/kinesisexporter/README.md @@ -0,0 +1,3 @@ +# Kinesis Exporter + +To be added. \ No newline at end of file diff --git a/exporter/kinesisexporter/go.mod b/exporter/kinesisexporter/go.mod index 209ff2102d95..a3343e6327a0 100644 --- a/exporter/kinesisexporter/go.mod +++ b/exporter/kinesisexporter/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/signalfx/opencensus-go-exporter-kinesis v0.4.2 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/exporter/kinesisexporter/go.sum b/exporter/kinesisexporter/go.sum index d03d17e94208..01ec5897f84a 100644 --- a/exporter/kinesisexporter/go.sum +++ b/exporter/kinesisexporter/go.sum @@ -1146,8 +1146,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/lightstepexporter/go.mod b/exporter/lightstepexporter/go.mod index 3f2df94623d3..8f8627872216 100644 --- a/exporter/lightstepexporter/go.mod +++ b/exporter/lightstepexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/lightstep/opentelemetry-exporter-go v0.6.2 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.opentelemetry.io/otel v0.6.0 go.uber.org/zap v1.14.0 ) diff --git a/exporter/lightstepexporter/go.sum b/exporter/lightstepexporter/go.sum index 4f24955c793e..fff2002f43c4 100644 --- a/exporter/lightstepexporter/go.sum +++ b/exporter/lightstepexporter/go.sum @@ -1141,8 +1141,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.opentelemetry.io/otel v0.6.0 h1:+vkHm/XwJ7ekpISV2Ixew93gCrxTbuwTF5rSewnLLgw= go.opentelemetry.io/otel v0.6.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod index bee4d7083587..e27dd20794a2 100644 --- a/exporter/newrelicexporter/go.mod +++ b/exporter/newrelicexporter/go.mod @@ -8,6 +8,6 @@ require ( github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum index 3fd3225658b8..da5c10045a69 100644 --- a/exporter/newrelicexporter/go.sum +++ b/exporter/newrelicexporter/go.sum @@ -1097,8 +1097,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index db91a7f95355..84314dfd21e5 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/signalfx/sapm-proto v0.5.1 github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac // indirect github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/multierr v1.4.0 // indirect go.uber.org/zap v1.13.0 ) diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index 5aa64f10f6c9..2585b0a71d38 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index b2f9a16006f8..f6ff00a8a2fd 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.0.0 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190530013331-054be550cb49 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.1 ) diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index e5e0d4bf27e4..cc1f20f78185 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -1133,8 +1133,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/exporter/splunkhecexporter/go.mod b/exporter/splunkhecexporter/go.mod index 37fecedf87a5..070825eea5db 100644 --- a/exporter/splunkhecexporter/go.mod +++ b/exporter/splunkhecexporter/go.mod @@ -6,6 +6,6 @@ require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.12.0 ) diff --git a/exporter/splunkhecexporter/go.sum b/exporter/splunkhecexporter/go.sum index e8b4cd27f4ed..103b0f94ac38 100644 --- a/exporter/splunkhecexporter/go.sum +++ b/exporter/splunkhecexporter/go.sum @@ -1095,8 +1095,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/exporter/stackdriverexporter/README.md b/exporter/stackdriverexporter/README.md new file mode 100644 index 000000000000..f86d6703dc26 --- /dev/null +++ b/exporter/stackdriverexporter/README.md @@ -0,0 +1,3 @@ +# Stackdriver Exporter + +To be added. \ No newline at end of file diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index f81a9b696382..c31888ab6870 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -10,7 +10,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 google.golang.org/api v0.10.0 google.golang.org/genproto v0.0.0-20200408120641-fbb3ad325eb7 diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index 36cd88a92cc9..1b6fb7884c9f 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -1140,8 +1140,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/extension/observer/k8sobserver/go.mod b/extension/observer/k8sobserver/go.mod index 02419dceda1c..7a4a27b37043 100644 --- a/extension/observer/k8sobserver/go.mod +++ b/extension/observer/k8sobserver/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 k8s.io/api v0.17.0 k8s.io/apimachinery v0.17.0 diff --git a/extension/observer/k8sobserver/go.sum b/extension/observer/k8sobserver/go.sum index 0fc41596ba69..14e1ec314031 100644 --- a/extension/observer/k8sobserver/go.sum +++ b/extension/observer/k8sobserver/go.sum @@ -1126,8 +1126,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/go.mod b/go.mod index 58c1131e6540..197a54265229 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/client9/misspell v0.3.4 - github.com/golangci/golangci-lint v1.24.0 + github.com/golangci/golangci-lint v1.27.0 github.com/google/addlicense v0.0.0-20200301095109-7c013a14f2e2 github.com/jstemmer/go-junit-report v0.9.1 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.0.0 @@ -37,8 +37,9 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinscribereceiver v0.0.0 github.com/pavius/impi v0.0.0-20180302134524-c1cbdcb8df2b + github.com/stretchr/testify v1.5.1 github.com/tcnksm/ghr v0.13.0 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.4.0 honnef.co/go/tools v0.0.1-2020.1.3 ) @@ -46,7 +47,7 @@ replace git.apache.org/thrift.git v0.12.0 => github.com/apache/thrift v0.12.0 replace github.com/apache/thrift => github.com/apache/thrift v0.0.0-20161221203622-b2a4d4ae21c7 -replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349 +replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 // Replace references to modules that are in this repository with their relateive paths // so that we always build with current (latest) version of the source code. diff --git a/go.sum b/go.sum index dc6ddba29a6c..b6e99c7f66cc 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,8 @@ github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 h1:qELHH0AWCvf github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7/go.mod h1:Q5DbzQ+3AkgGwymQO7aZFNP7ns2lZKGtvRBzRXfdi60= github.com/DataDog/zstd v1.4.4 h1:+IawcoXhCBylN7ccwdwf8LOH2jKq7NavGpEPanrlTzE= github.com/DataDog/zstd v1.4.4/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157 h1:hY39LwQHh+1kaovmIjOrlqnXNX6tygSRfLkkK33IkZU= +github.com/Djarvur/go-err113 v0.0.0-20200410182137-af658d038157/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Microsoft/ApplicationInsights-Go v0.4.2 h1:HIZoGXMiKNwAtMAgCSSX35j9mP+DjGF9ezfBvxMDLLg= github.com/Microsoft/ApplicationInsights-Go v0.4.2/go.mod h1:CukZ/G66zxXtI+h/VcVn3eVVDGDHfXM2zVILF7bMmsg= @@ -65,8 +67,8 @@ github.com/Songmu/retry v0.1.0/go.mod h1:7sXIW7eseB9fq0FUvigRcQMVLR9tuHI0Scok+rk github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk= github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349 h1:UMhNMx0DBTp4yyw9EejdmdnLQpbeHa5TuYUwVjmEJLo= -github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 h1:LolWgmDli9TYvVpjBqL82NgBRqJ6EVgyJUZeGMR+OFo= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= @@ -112,6 +114,8 @@ github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b h1:AP/Y7sqYicnjGDf github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/bombsimon/wsl/v2 v2.0.0 h1:+Vjcn+/T5lSrO8Bjzhk4v14Un/2UyCA1E3V5j9nwTkQ= github.com/bombsimon/wsl/v2 v2.0.0/go.mod h1:mf25kr/SqFEPhhcxW1+7pxzGlW+hIl/hYTKY95VwV8U= +github.com/bombsimon/wsl/v3 v3.0.0 h1:w9f49xQatuaeTJFaNP4SpiWSR5vfT6IstPtM62JjcqA= +github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/brianvoe/gofakeit v3.17.0+incompatible h1:C1+30+c0GtjgGDtRC+iePZeP1WMiwsWCELNJhmc7aIc= github.com/brianvoe/gofakeit v3.17.0+incompatible/go.mod h1:kfwdRA90vvNhPutZWfH7WPaDzUjz+CZFqG+rPkOjGOc= github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -153,6 +157,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cucumber/godog v0.8.1 h1:lVb+X41I4YDreE+ibZ50bdXmySxgRviYFgKY6Aw4XE8= github.com/cucumber/godog v0.8.1/go.mod h1:vSh3r/lM+psC1BPXvdkSEuNjmXfpVqrMGYAElF6hxnA= github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -314,6 +319,7 @@ github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUD github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= github.com/go-toolsmith/typep v1.0.0 h1:zKymWyA1TRYvqYrYDrfEMZULyrhcnGY3x7LDKU2XQaA= github.com/go-toolsmith/typep v1.0.0/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= +github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobuffalo/buffalo v0.12.8-0.20181004233540-fac9bb505aa8/go.mod h1:sLyT7/dceRXJUxSsE813JTQtA3Eb1vjxWfo/N//vXIY= github.com/gobuffalo/buffalo v0.13.0/go.mod h1:Mjn1Ba9wpIbpbrD+lIDMy99pQ0H0LiddMIIDGse7qT4= github.com/gobuffalo/buffalo-plugins v1.0.2/go.mod h1:pOp/uF7X3IShFHyobahTkTLZaeUXwb0GrUTb9ngJWTs= @@ -543,6 +549,8 @@ github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= github.com/golangci/golangci-lint v1.24.0 h1:OcmSTTMPqI/VT4GvN1fKuE9NX15dDXIwolO0l08334U= github.com/golangci/golangci-lint v1.24.0/go.mod h1:yIqiAZ2SSQqg+1JeFlAdvEWjGVz4uu5jr4lrciqA1gE= +github.com/golangci/golangci-lint v1.27.0 h1:VYLx63qb+XJsHdZ27PMS2w5JZacN0XG8ffUwe7yQomo= +github.com/golangci/golangci-lint v1.27.0/go.mod h1:+eZALfxIuthdrHPtfM7w/R3POJLjHDfJJw8XZl9xOng= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc h1:gLLhTLMk2/SutryVJ6D4VZCU3CUqr8YloG7FPIBWFpI= github.com/golangci/ineffassign v0.0.0-20190609212857-42439a7714cc/go.mod h1:e5tpTHCfVze+7EpLEozzMB3eafxo2KT5veNg1k6byQU= github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= @@ -593,6 +601,7 @@ github.com/googleapis/gnostic v0.0.0-20170426233943-68f4ded48ba9/go.mod h1:sJBsC github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/googleapis/gnostic v0.3.0 h1:CcQijm0XKekKjP/YCz28LXVSpgguuB+nCxaSjCe09y0= github.com/googleapis/gnostic v0.3.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= +github.com/gookit/color v1.2.4/go.mod h1:AhIE+pS6D4Ql0SQWbBeXPHw7gY0/sjHoA4s/n1KB7xg= github.com/gophercloud/gophercloud v0.0.0-20190126172459-c818fa66e4c8/go.mod h1:3WdhXV3rUYy9p6AUW8d94kr+HS62Y4VL9mBnFxsD8q4= github.com/gophercloud/gophercloud v0.3.0 h1:6sjpKIpVwRIIwmcEGp+WwNovNsem+c+2vm6oxshRpL8= github.com/gophercloud/gophercloud v0.3.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= @@ -780,6 +789,8 @@ github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v0.0.0-20160406211939-eadb3ce320cb/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -806,6 +817,8 @@ github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/maratori/testpackage v1.0.1 h1:QtJ5ZjqapShm0w5DosRjg0PRlSdAdlx+W6cCKoALdbQ= +github.com/maratori/testpackage v1.0.1/go.mod h1:ddKdw+XG0Phzhx8BFDTKgpWP4i7MpApTE5fXSKAqwDU= github.com/markbates/deplist v1.0.4/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/deplist v1.0.5/go.mod h1:gRRbPbbuA8TmMiRvaOzUlRfzfjeCCBqX2A6arxN01MM= github.com/markbates/going v1.0.2/go.mod h1:UWCk3zm0UKefHZ7l8BNqi26UyiEMniznk8naLdTcy6c= @@ -883,16 +896,21 @@ github.com/monoculum/formam v0.0.0-20180901015400-4e68be1d79ba/go.mod h1:RKgILGE github.com/moul/http2curl v0.0.0-20170919181001-9ac6cf4d929b/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mozilla/tls-observatory v0.0.0-20190404164649-a3c1b6cfecfd/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/mozilla/tls-observatory v0.0.0-20200220173314-aae45faa4006/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= +github.com/mozilla/tls-observatory v0.0.0-20200317151703-4fa42e1c2dee/go.mod h1:SrKMQvPiws7F7iqYp8/TX+IhxCYhzr6N/1yb8cwHsGk= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/nakabonne/nestif v0.3.0 h1:+yOViDGhg8ygGrmII72nV9B/zGxY188TYpfolntsaPw= +github.com/nakabonne/nestif v0.3.0/go.mod h1:dI314BppzXjJ4HsCnbo7XzrJHPszZsjnk5wEBSYHI2c= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d h1:AREM5mwr4u1ORQBMvzfzBgpsctsbQikCVpvC+tX285E= github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU= github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0 h1:W8+lNIfAldCScGiikToSprbf3DCaMXk0VIM9l73BIpY= github.com/newrelic/newrelic-telemetry-sdk-go v0.2.0/go.mod h1:G9MqE/cHGv3Hx3qpYhfuyFUsGx2DpVcGi1iJIqTg+JQ= github.com/nicksnyder/go-i18n v1.10.0/go.mod h1:HrK7VCrbOvQoUAQ7Vpy7i87N7JZZZ7R2xBGjv0j365Q= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v0.0.0-20170117200651-66bb6560562f/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= @@ -968,6 +986,7 @@ github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUr github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.2+incompatible h1:6spEXYEkGG74KeVRPzvSU0Fa3xO9DGO0bJcA6uIfwo8= github.com/pierrec/lz4 v2.0.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= @@ -1043,6 +1062,8 @@ github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThC github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryancurrah/gomodguard v1.0.4 h1:oCreMAt9GuFXDe9jW4HBpc3GjdX3R/sUEcLAGh1zPx8= +github.com/ryancurrah/gomodguard v1.0.4/go.mod h1:9T/Cfuxs5StfsocWr4WzDL36HqnX0fVb9d5fSEaLhoE= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190810000440-0ceca61e4d75 h1:cA+Ubq9qEVIQhIWvP2kNuSZ2CmnfBJFSRq+kO1pu2cc= @@ -1059,6 +1080,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg github.com/securego/gosec v0.0.0-20200103095621-79fbf3af8d83/go.mod h1:vvbZ2Ae7AzSq3/kywjUDxSNq2SJ27RxCz2un0H3ePqE= github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd h1:qB+l4fYZsH78xORC1aqVS0zNmgkQp4rkj2rvfxQMtzc= github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd/go.mod h1:NurAFZsWJAEZjogSwdVPlHkOZB3DOAU7gsPP8VFZCHc= +github.com/securego/gosec/v2 v2.3.0 h1:y/9mCF2WPDbSDpL3QDWZD3HHGrSYw0QSHnCqTfs4JPE= +github.com/securego/gosec/v2 v2.3.0/go.mod h1:UzeVyUXbxukhLeHKV3VVqo7HdoQR9MrRfFmZYotn8ME= github.com/segmentio/analytics-go v3.0.1+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48= github.com/segmentio/analytics-go v3.1.0+incompatible/go.mod h1:C7CYBtQWk4vRk2RyLu0qOcbHJ18E3F1HV2C/8JvKN48= github.com/segmentio/backo-go v0.0.0-20160424052352-204274ad699c/go.mod h1:kJ9mm9YmoWSkk+oQ+5Cj8DEoRCX2JT6As4kEtIIOp1M= @@ -1171,8 +1194,12 @@ github.com/tcnksm/go-gitconfig v0.1.2 h1:iiDhRitByXAEyjgBqsKi9QU4o2TNtv9kPP3RgPg github.com/tcnksm/go-gitconfig v0.1.2/go.mod h1:/8EhP4H7oJZdIPyT+/UIsG87kTzrzM4UsLGSItWYCpE= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e h1:IWllFTiDjjLIf2oeKxpIUmtiDV5sn71VgeQgg6vcE7k= github.com/tcnksm/go-latest v0.0.0-20170313132115-e3007ae9052e/go.mod h1:d7u6HkTYKSv5m6MCKkOQlHwaShTMl3HjqSGW3XtVhXM= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2 h1:Xr9gkxfOP0KQWXKNqmwe8vEeSUiUj4Rlee9CMVX2ZUQ= +github.com/tdakkota/asciicheck v0.0.0-20200416190851-d7f85be797a2/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 h1:mujcChM89zOHwgZBBNr5WZ77mBXP1yR+gLThGCYZgAg= github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00/go.mod h1:eyZnKCc955uh98WQvzOm0dgAeLnf2O0Rz0LPoC5ze+0= +github.com/tetafro/godot v0.3.7 h1:+mecr7RKrUKB5UQ1gwqEMn13sDKTyDR8KNIquB9mm+8= +github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0= github.com/tidwall/gjson v1.3.2/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls= github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -1217,6 +1244,7 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63MEE3IF9l2/ebyx59GyGgPi+tICQdmM= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= @@ -1525,7 +1553,12 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200203215610-ab391d50b528/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204192400-7124308813f3/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200228224639-71482053b885/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200331202046-9d5940d49312/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200422022333-3d57cf2e726e/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200428211428-0c9eba77bc32/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200502202811-ed308ab3e770/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5 h1:MeC2gMlMdkd67dn17MEby3rGXRxZtWeiRXOnISfTQ74= golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1603,6 +1636,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index 4e6bbb7f35a9..12392ae9d706 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -6,7 +6,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.3.0-20200605184202-f640b7103f96 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.13.0 k8s.io/api v0.17.0 k8s.io/apimachinery v0.17.0 @@ -14,4 +14,5 @@ require ( ) replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common -replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349 \ No newline at end of file + +replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index dc0774407884..21d75ae64848 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -50,8 +50,8 @@ github.com/Songmu/retry v0.1.0 h1:hPA5xybQsksLR/ry/+t/7cFajPW+dqjmjhzZhioBILA= github.com/Songmu/retry v0.1.0/go.mod h1:7sXIW7eseB9fq0FUvigRcQMVLR9tuHI0Scok+rkpAuA= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 h1:fLjPD/aNc3UIOA6tDi6QXUemppXK3P9BI7mr2hd6gx8= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= -github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349 h1:UMhNMx0DBTp4yyw9EejdmdnLQpbeHa5TuYUwVjmEJLo= -github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200615151012-78b0f93ca349/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 h1:LolWgmDli9TYvVpjBqL82NgBRqJ6EVgyJUZeGMR+OFo= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= @@ -1128,8 +1128,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/processor/sourceprocessor/go.mod b/processor/sourceprocessor/go.mod index 408de71e18e1..a701fb91460c 100644 --- a/processor/sourceprocessor/go.mod +++ b/processor/sourceprocessor/go.mod @@ -5,6 +5,8 @@ go 1.14 require ( github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65 + go.opentelemetry.io/collector v0.4.0 go.uber.org/zap v1.13.0 // indirect ) + +replace go.opentelemetry.io/collector => github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 diff --git a/processor/sourceprocessor/go.sum b/processor/sourceprocessor/go.sum index 21e4b2d6e1b4..7c8d31a4be00 100644 --- a/processor/sourceprocessor/go.sum +++ b/processor/sourceprocessor/go.sum @@ -39,6 +39,8 @@ github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWX github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/Songmu/retry v0.1.0/go.mod h1:7sXIW7eseB9fq0FUvigRcQMVLR9tuHI0Scok+rkpAuA= github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5 h1:LolWgmDli9TYvVpjBqL82NgBRqJ6EVgyJUZeGMR+OFo= +github.com/SumoLogic/opentelemetry-collector v0.2.7-0.20200618143706-98e95f47a6d5/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -394,6 +396,8 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.2.2-0.20190730201129-28a6bbf47e48/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= github.com/golang/gddo v0.0.0-20190904175337-72a348e765d2/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= @@ -939,8 +943,6 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65 h1:ObXizS60v/+eWWebUtS+14chMIWdq2eBv1C3JIUWOvA= -go.opentelemetry.io/collector v0.3.1-0.20200522130256-daf2fc71ac65/go.mod h1:rcMDg+njfS22WiT/MioZMNnGyXrxfsKXA2d6xxpnnfc= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -1236,6 +1238,7 @@ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4= google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -1283,7 +1286,6 @@ k8s.io/api v0.0.0-20190813020757-36bff7324fb7/go.mod h1:3Iy+myeAORNCLgjd/Xu9ebwN k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA= k8s.io/apimachinery v0.0.0-20190809020650-423f5d784010/go.mod h1:Waf/xTS2FGRrgXCkO5FP3XxTOWh0qLf2QhL1qFZZ/R8= k8s.io/client-go v0.0.0-20190620085101-78d2af792bab/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k= -k8s.io/client-go v12.0.0+incompatible/go.mod h1:E95RaSlHr79aHaX0aGSwcPNfygDiPKOVXdmivCIZT0k= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/receiver/carbonreceiver/README.md b/receiver/carbonreceiver/README.md new file mode 100644 index 000000000000..001e56a7a6e0 --- /dev/null +++ b/receiver/carbonreceiver/README.md @@ -0,0 +1,3 @@ +# Carbon Receiver + +To be added. \ No newline at end of file diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 8d5720b67f2c..bfd2ff39215a 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -8,6 +8,6 @@ require ( github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.13.0 ) diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index fad5b6cece4c..eff18b20e97f 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -1134,8 +1134,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index e67f8c17315b..7394eef9d71f 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -7,6 +7,6 @@ require ( github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index 1fa21444c21d..04b42780fe14 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -1131,8 +1131,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/jaegerlegacyreceiver/README.md b/receiver/jaegerlegacyreceiver/README.md new file mode 100644 index 000000000000..ef5c0ad4cd45 --- /dev/null +++ b/receiver/jaegerlegacyreceiver/README.md @@ -0,0 +1,3 @@ +# Jaeger Receiver + +To be added. \ No newline at end of file diff --git a/receiver/jaegerlegacyreceiver/go.mod b/receiver/jaegerlegacyreceiver/go.mod index e92390506d22..8d63080412ff 100644 --- a/receiver/jaegerlegacyreceiver/go.mod +++ b/receiver/jaegerlegacyreceiver/go.mod @@ -11,7 +11,7 @@ require ( github.com/uber/jaeger-lib v2.2.0+incompatible github.com/uber/tchannel-go v1.10.0 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/receiver/jaegerlegacyreceiver/go.sum b/receiver/jaegerlegacyreceiver/go.sum index 7b3caa4f4b9b..a1a0c7e35c4b 100644 --- a/receiver/jaegerlegacyreceiver/go.sum +++ b/receiver/jaegerlegacyreceiver/go.sum @@ -1135,8 +1135,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/k8sclusterreceiver/go.mod b/receiver/k8sclusterreceiver/go.mod index 0aa3617afe75..73b1cf779e15 100644 --- a/receiver/k8sclusterreceiver/go.mod +++ b/receiver/k8sclusterreceiver/go.mod @@ -7,7 +7,7 @@ require ( github.com/iancoleman/strcase v0.0.0-20171129010253-3de563c3dc08 github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.1 k8s.io/api v0.17.0 k8s.io/apimachinery v0.17.0 diff --git a/receiver/k8sclusterreceiver/go.sum b/receiver/k8sclusterreceiver/go.sum index 994990e28ff5..4f5c3ba8f896 100644 --- a/receiver/k8sclusterreceiver/go.sum +++ b/receiver/k8sclusterreceiver/go.sum @@ -1114,8 +1114,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/kubeletstatsreceiver/go.mod b/receiver/kubeletstatsreceiver/go.mod index 904db9f1ab1b..a44b3f003210 100644 --- a/receiver/kubeletstatsreceiver/go.mod +++ b/receiver/kubeletstatsreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.0.0-20200518175917-05cf2ea24e6c github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 k8s.io/kubernetes v1.12.0 ) diff --git a/receiver/kubeletstatsreceiver/go.sum b/receiver/kubeletstatsreceiver/go.sum index 578007605640..20ebbd4f9305 100644 --- a/receiver/kubeletstatsreceiver/go.sum +++ b/receiver/kubeletstatsreceiver/go.sum @@ -1107,8 +1107,8 @@ go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opentelemetry.io/collector v0.3.1-0.20200518164231-3729dac06f74 h1:HYX4ZeBv4e3c+Dva7Fz+eH97JNJncvUIzn692gewUR0= go.opentelemetry.io/collector v0.3.1-0.20200518164231-3729dac06f74/go.mod h1:aG66d9YK0UIQEjuQxr1vLaBwNnP4QgFpjNEqXDO/b1c= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1 h1:rsqfU5vBkVknbhUGbAUwQKR2H4ItV8tjJ+6kJX4cxHM= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index 34d7462d2c63..173ef3862c61 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -9,7 +9,7 @@ require ( github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.13.0 ) diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index 8ef61190aef9..af4c317c7307 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -1139,8 +1139,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 3f582b8f82af..f84159ad8a37 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -7,6 +7,6 @@ require ( github.com/go-redis/redis/v7 v7.2.0 github.com/golang/protobuf v1.3.5 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index aeee18ec0df0..a74fccbbcb8b 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -1079,8 +1079,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 88e596c8b000..9c84152f7ea4 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -14,7 +14,7 @@ require ( github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac // indirect github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.13.0 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 551e4e8722e9..e7b932ea3498 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -1143,8 +1143,8 @@ go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index b60155a08182..ad40ce9ab802 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -10,7 +10,7 @@ require ( github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190530013331-054be550cb49 github.com/stretchr/testify v1.5.1 go.opencensus.io v0.22.3 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.1 ) diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index aef20cce6fe4..a8a5fd12d332 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -1139,8 +1139,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/receiver/simpleprometheusreceiver/go.mod b/receiver/simpleprometheusreceiver/go.mod index 5017e65aec78..a7e2cc027dee 100644 --- a/receiver/simpleprometheusreceiver/go.mod +++ b/receiver/simpleprometheusreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/prometheus/common v0.9.1 github.com/prometheus/prometheus v1.8.2-0.20190924101040-52e0504f83ea github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.1 k8s.io/client-go v0.0.0-20190620085101-78d2af792bab ) diff --git a/receiver/simpleprometheusreceiver/go.sum b/receiver/simpleprometheusreceiver/go.sum index 67cbe6724816..10af86a3b218 100644 --- a/receiver/simpleprometheusreceiver/go.sum +++ b/receiver/simpleprometheusreceiver/go.sum @@ -1099,8 +1099,8 @@ go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.1/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= diff --git a/receiver/wavefrontreceiver/README.md b/receiver/wavefrontreceiver/README.md new file mode 100644 index 000000000000..0f315b3853e5 --- /dev/null +++ b/receiver/wavefrontreceiver/README.md @@ -0,0 +1,3 @@ +# Wavefront Receiver + +To be added. \ No newline at end of file diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 335083f515fc..a7431a5274f5 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.13.0 ) diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 972459a37cfc..452b78152794 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -1125,8 +1125,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= diff --git a/receiver/zipkinscribereceiver/README.md b/receiver/zipkinscribereceiver/README.md new file mode 100644 index 000000000000..6b8b48b92305 --- /dev/null +++ b/receiver/zipkinscribereceiver/README.md @@ -0,0 +1,3 @@ +# Zipkin Receiver + +To be added. \ No newline at end of file diff --git a/receiver/zipkinscribereceiver/go.mod b/receiver/zipkinscribereceiver/go.mod index ceb0be9a1e38..636d423fe4b4 100644 --- a/receiver/zipkinscribereceiver/go.mod +++ b/receiver/zipkinscribereceiver/go.mod @@ -9,6 +9,6 @@ require ( github.com/jaegertracing/jaeger v1.17.0 github.com/omnition/scribe-go v1.0.0 github.com/stretchr/testify v1.5.1 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.10.0 ) diff --git a/receiver/zipkinscribereceiver/go.sum b/receiver/zipkinscribereceiver/go.sum index e61b216e1b56..e549e51d19f6 100644 --- a/receiver/zipkinscribereceiver/go.sum +++ b/receiver/zipkinscribereceiver/go.sum @@ -1138,8 +1138,8 @@ go.opencensus.io v0.22.1 h1:8dP3SGL7MPB94crU3bEPplMPe83FI4EouesJUeFHv50= go.opencensus.io v0.22.1/go.mod h1:Ap50jQcDJrx6rB6VgeeFPtuPIf3wMRvRfrfYDO6+BmA= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/testbed/datareceivers/carbon.go b/testbed/datareceivers/carbon.go new file mode 100644 index 000000000000..219c4e09374b --- /dev/null +++ b/testbed/datareceivers/carbon.go @@ -0,0 +1,80 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datareceivers + +import ( + "context" + "fmt" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" +) + +// CarbonDataReceiver implements Carbon format receiver. +type CarbonDataReceiver struct { + testbed.DataReceiverBase + receiver component.MetricsReceiver +} + +// Ensure CarbonDataReceiver implements MetricDataSender. +var _ testbed.DataReceiver = (*CarbonDataReceiver)(nil) + +// NewCarbonDataReceiver creates a new CarbonDataReceiver that will listen on the +// specified port after Start is called. +func NewCarbonDataReceiver(port int) *CarbonDataReceiver { + return &CarbonDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} +} + +// Start the receiver. +func (cr *CarbonDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { + addr := fmt.Sprintf("localhost:%d", cr.Port) + config := carbonreceiver.Config{ + ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr}, + Parser: &protocol.Config{ + Type: "plaintext", + Config: &protocol.PlaintextConfig{}, + }, + } + var err error + cr.receiver, err = carbonreceiver.New(zap.L(), config, mc) + if err != nil { + return err + } + + return cr.receiver.Start(context.Background(), cr) +} + +// Stop the receiver. +func (cr *CarbonDataReceiver) Stop() { + cr.receiver.Shutdown(context.Background()) +} + +// GenConfigYAMLStr returns exporter config for the agent. +func (cr *CarbonDataReceiver) GenConfigYAMLStr() string { + // Note that this generates an exporter config for agent. + return fmt.Sprintf(` + carbon: + endpoint: "localhost:%d"`, cr.Port) +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (cr *CarbonDataReceiver) ProtocolName() string { + return "carbon" +} diff --git a/testbed/datareceivers/sapm.go b/testbed/datareceivers/sapm.go new file mode 100644 index 000000000000..6e02e78cee3c --- /dev/null +++ b/testbed/datareceivers/sapm.go @@ -0,0 +1,79 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datareceivers + +import ( + "context" + "fmt" + "log" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver" +) + +// SapmDataReceiver implements Sapm format receiver. +type SapmDataReceiver struct { + testbed.DataReceiverBase + receiver component.TraceReceiver +} + +// NewSapmDataReceiver creates a new SapmDataReceiver. +func NewSapmDataReceiver(port int) *SapmDataReceiver { + return &SapmDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} +} + +// Start the receiver. +func (sr *SapmDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { + sapmCfg := sapmreceiver.Config{ + ReceiverSettings: configmodels.ReceiverSettings{ + Endpoint: fmt.Sprintf("localhost:%d", sr.Port), + }, + } + var err error + params := component.ReceiverCreateParams{Logger: zap.L()} + sr.receiver, err = sapmreceiver.New(context.Background(), params, &sapmCfg, tc) + if err != nil { + return err + } + + return sr.receiver.Start(context.Background(), sr) +} + +// Stop the receiver. +func (sr *SapmDataReceiver) Stop() { + if sr.receiver != nil { + if err := sr.receiver.Shutdown(context.Background()); err != nil { + log.Printf("Cannot stop Sapm receiver: %s", err.Error()) + } + } +} + +// GenConfigYAMLStr returns exporter config for the agent. +func (sr *SapmDataReceiver) GenConfigYAMLStr() string { + // Note that this generates an exporter config for agent. + return fmt.Sprintf(` + sapm: + endpoint: "http://localhost:%d/v2/trace" + disable_compression: true`, sr.Port) +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (sr *SapmDataReceiver) ProtocolName() string { + return "sapm" +} diff --git a/testbed/datareceivers/signalfx.go b/testbed/datareceivers/signalfx.go new file mode 100644 index 000000000000..28bb7216fb6f --- /dev/null +++ b/testbed/datareceivers/signalfx.go @@ -0,0 +1,77 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datareceivers + +import ( + "context" + "fmt" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config/configmodels" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver" +) + +// SFxMetricsDataReceiver implements SignalFx format receiver. +type SFxMetricsDataReceiver struct { + testbed.DataReceiverBase + receiver component.MetricsReceiver +} + +// Ensure SFxMetricsDataReceiver implements MetricDataSender. +var _ testbed.DataReceiver = (*SFxMetricsDataReceiver)(nil) + +// NewSFxMetricsDataReceiver creates a new SFxMetricsDataReceiver that will listen on the +// specified port after Start is called. +func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver { + return &SFxMetricsDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} +} + +// Start the receiver. +func (sr *SFxMetricsDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { + addr := fmt.Sprintf("localhost:%d", sr.Port) + config := signalfxreceiver.Config{ + ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr}, + } + var err error + sr.receiver, err = signalfxreceiver.New(zap.L(), config, mc) + if err != nil { + return err + } + + return sr.receiver.Start(context.Background(), sr) +} + +// Stop the receiver. +func (sr *SFxMetricsDataReceiver) Stop() { + sr.receiver.Shutdown(context.Background()) +} + +// GenConfigYAMLStr returns exporter config for the agent. +func (sr *SFxMetricsDataReceiver) GenConfigYAMLStr() string { + // Note that this generates an exporter config for agent. + return fmt.Sprintf(` + signalfx: + ingest_url: "http://localhost:%d/v2/datapoint" + api_url: "http://localhost/" + access_token: "access_token"`, sr.Port) +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (sr *SFxMetricsDataReceiver) ProtocolName() string { + return "signalfx" +} diff --git a/testbed/datasenders/carbon.go b/testbed/datasenders/carbon.go new file mode 100644 index 000000000000..bad1408a732a --- /dev/null +++ b/testbed/datasenders/carbon.go @@ -0,0 +1,88 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datasenders + +import ( + "context" + "fmt" + "time" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer/consumerdata" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter" +) + +// CarbonDataSender implements MetricDataSender for Carbon metrics protocol. +type CarbonDataSender struct { + exporter component.MetricsExporterOld + port int +} + +// Ensure CarbonDataSender implements MetricDataSenderOld. +var _ testbed.MetricDataSenderOld = (*CarbonDataSender)(nil) + +// NewCarbonDataSender creates a new Carbon metric protocol sender that will send +// to the specified port after Start is called. +func NewCarbonDataSender(port int) *CarbonDataSender { + return &CarbonDataSender{port: port} +} + +// Start the sender. +func (cs *CarbonDataSender) Start() error { + cfg := &carbonexporter.Config{ + Endpoint: fmt.Sprintf("localhost:%d", cs.port), + Timeout: 5 * time.Second, + } + + factory := carbonexporter.Factory{} + exporter, err := factory.CreateMetricsExporter(zap.L(), cfg) + + if err != nil { + return err + } + + cs.exporter = exporter + return nil +} + +// SendMetrics sends metrics. Can be called after Start. +func (cs *CarbonDataSender) SendMetrics(metrics consumerdata.MetricsData) error { + return cs.exporter.ConsumeMetricsData(context.Background(), metrics) +} + +// Flush previously sent metrics. +func (cs *CarbonDataSender) Flush() { +} + +// GenConfigYAMLStr returns receiver config for the agent. +func (cs *CarbonDataSender) GenConfigYAMLStr() string { + // Note that this generates a receiver config for agent. + return fmt.Sprintf(` + carbon: + endpoint: localhost:%d`, cs.port) +} + +// GetCollectorPort returns receiver port for the Collector. +func (cs *CarbonDataSender) GetCollectorPort() int { + return cs.port +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (cs *CarbonDataSender) ProtocolName() string { + return "carbon" +} diff --git a/testbed/datasenders/sapm.go b/testbed/datasenders/sapm.go new file mode 100644 index 000000000000..0f7032346635 --- /dev/null +++ b/testbed/datasenders/sapm.go @@ -0,0 +1,88 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datasenders + +import ( + "context" + "fmt" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer/pdata" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter" +) + +// SapmDataSender implements TraceDataSender for SAPM protocol. +type SapmDataSender struct { + exporter component.TraceExporter + port int +} + +// Ensure SapmDataSender implements TraceDataSenderOld. +var _ testbed.TraceDataSender = (*SapmDataSender)(nil) + +// NewSapmDataSender creates a new Sapm protocol sender that will send +// to the specified port after Start is called. +func NewSapmDataSender(port int) *SapmDataSender { + return &SapmDataSender{port: port} +} + +// Start the sender. +func (je *SapmDataSender) Start() error { + cfg := &sapmexporter.Config{ + Endpoint: fmt.Sprintf("http://localhost:%d/v2/trace", je.port), + DisableCompression: true, + } + + var err error + factory := sapmexporter.Factory{} + params := component.ExporterCreateParams{Logger: zap.NewNop()} + exporter, err := factory.CreateTraceExporter(context.Background(), params, cfg) + + if err != nil { + return err + } + + je.exporter = exporter + return err +} + +// SendSpans sends spans. Can be called after Start. +func (je *SapmDataSender) SendSpans(traces pdata.Traces) error { + return je.exporter.ConsumeTraces(context.Background(), traces) +} + +// Flush previously sent spans. +func (je *SapmDataSender) Flush() { +} + +// GenConfigYAMLStr returns receiver config for the agent. +func (je *SapmDataSender) GenConfigYAMLStr() string { + return fmt.Sprintf(` + sapm: + endpoint: "localhost:%d"`, je.port) +} + +// GetCollectorPort returns receiver port for the Collector. +func (je *SapmDataSender) GetCollectorPort() int { + return je.port +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (je *SapmDataSender) ProtocolName() string { + return "sapm" +} diff --git a/testbed/datasenders/signalfx.go b/testbed/datasenders/signalfx.go new file mode 100644 index 000000000000..ab6ce9ead48b --- /dev/null +++ b/testbed/datasenders/signalfx.go @@ -0,0 +1,88 @@ +// Copyright 2020 OpenTelemetry Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package datasenders + +import ( + "context" + "fmt" + + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer/consumerdata" + "go.opentelemetry.io/collector/testbed/testbed" + "go.uber.org/zap" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" +) + +// SFxMetricsDataSender implements MetricDataSender for SignalFx metrics protocol. +type SFxMetricsDataSender struct { + exporter component.MetricsExporterOld + port int +} + +// Ensure SFxMetricsDataSender implements MetricDataSenderOld. +var _ testbed.MetricDataSenderOld = (*SFxMetricsDataSender)(nil) + +// NewSFxMetricDataSender creates a new SignalFx metric protocol sender that will send +// to the specified port after Start is called. +func NewSFxMetricDataSender(port int) *SFxMetricsDataSender { + return &SFxMetricsDataSender{port: port} +} + +// Start the sender. +func (sf *SFxMetricsDataSender) Start() error { + cfg := &signalfxexporter.Config{ + IngestURL: fmt.Sprintf("http://localhost:%d/v2/datapoint", sf.port), + APIURL: "http://localhost", + AccessToken: "access_token", + } + + factory := signalfxexporter.Factory{} + exporter, err := factory.CreateMetricsExporter(zap.L(), cfg) + + if err != nil { + return err + } + + sf.exporter = exporter + return nil +} + +// SendMetrics sends metrics. Can be called after Start. +func (sf *SFxMetricsDataSender) SendMetrics(metrics consumerdata.MetricsData) error { + return sf.exporter.ConsumeMetricsData(context.Background(), metrics) +} + +// Flush previously sent metrics. +func (sf *SFxMetricsDataSender) Flush() { +} + +// GenConfigYAMLStr returns receiver config for the agent. +func (sf *SFxMetricsDataSender) GenConfigYAMLStr() string { + // Note that this generates a receiver config for agent. + return fmt.Sprintf(` + signalfx: + endpoint: "localhost:%d"`, sf.port) +} + +// GetCollectorPort returns receiver port for the Collector. +func (sf *SFxMetricsDataSender) GetCollectorPort() int { + return sf.port +} + +// ProtocolName returns protocol name as it is specified in Collector config. +func (sf *SFxMetricsDataSender) ProtocolName() string { + return "signalfx" +} diff --git a/testbed/go.mod b/testbed/go.mod index 2a957cfbab76..cda9ca3ec359 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -9,7 +9,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver v0.0.0 - go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 + go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e go.uber.org/zap v1.14.1 ) diff --git a/testbed/go.sum b/testbed/go.sum index 0b85d78fb400..7221f155a757 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -1164,8 +1164,8 @@ go.opencensus.io v0.22.2 h1:75k/FF0Q2YM8QYo07VPddOLBslDt1MZOdEslOHvmzAs= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44 h1:+8m3CO7AdW9tLzYrVvUqEiZvEwUCFWILLfA6FlXAxas= -go.opentelemetry.io/collector v0.3.1-0.20200612184320-01ce74db9c44/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e h1:prlvFvQpEbZGiemDw9IgyiBVqcF2Ph4dMV0LyXv7y7U= +go.opentelemetry.io/collector v0.3.1-0.20200615181810-b28cbd9c8e2e/go.mod h1:5T4FxThCDCuB2Sbn8UwU+TjoYsxKHH3UywmZoLUwAbg= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= diff --git a/testbed/tests/metric_test.go b/testbed/tests/metric_test.go index 66e2a0ee769d..f2d4b29ac8d5 100644 --- a/testbed/tests/metric_test.go +++ b/testbed/tests/metric_test.go @@ -19,6 +19,9 @@ import ( "go.opentelemetry.io/collector/testbed/testbed" scenarios "go.opentelemetry.io/collector/testbed/tests" + + "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" + "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" ) func TestMetric10kDPS(t *testing.T) { @@ -39,8 +42,8 @@ func TestMetric10kDPS(t *testing.T) { }, { "Carbon", - NewCarbonDataSender(testbed.GetAvailablePort(t)), - NewCarbonDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewCarbonDataSender(testbed.GetAvailablePort(t)), + datareceivers.NewCarbonDataReceiver(testbed.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 237, ExpectedMaxRAM: 90, @@ -48,8 +51,8 @@ func TestMetric10kDPS(t *testing.T) { }, { "SignalFx", - NewSFxMetricDataSender(testbed.GetAvailablePort(t)), - NewSFxMetricsDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewSFxMetricDataSender(testbed.GetAvailablePort(t)), + datareceivers.NewSFxMetricsDataReceiver(testbed.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 83, ExpectedMaxRAM: 91, diff --git a/testbed/tests/receivers.go b/testbed/tests/receivers.go deleted file mode 100644 index 02284b0957d5..000000000000 --- a/testbed/tests/receivers.go +++ /dev/null @@ -1,184 +0,0 @@ -// 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tests - -import ( - "context" - "fmt" - "log" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/config/configmodels" - "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" - - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver" -) - -// SapmDataReceiver implements Sapm format receiver. -type SapmDataReceiver struct { - testbed.DataReceiverBase - receiver component.TraceReceiver -} - -// NewSapmDataReceiver creates a new SapmDataReceiver. -func NewSapmDataReceiver(port int) *SapmDataReceiver { - return &SapmDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} -} - -// Start the receiver. -func (sr *SapmDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { - sapmCfg := sapmreceiver.Config{ - ReceiverSettings: configmodels.ReceiverSettings{ - Endpoint: fmt.Sprintf("localhost:%d", sr.Port), - }, - } - var err error - params := component.ReceiverCreateParams{Logger: zap.L()} - sr.receiver, err = sapmreceiver.New(context.Background(), params, &sapmCfg, tc) - if err != nil { - return err - } - - return sr.receiver.Start(context.Background(), sr) -} - -// Stop the receiver. -func (sr *SapmDataReceiver) Stop() { - if sr.receiver != nil { - if err := sr.receiver.Shutdown(context.Background()); err != nil { - log.Printf("Cannot stop Sapm receiver: %s", err.Error()) - } - } -} - -// GenConfigYAMLStr returns exporter config for the agent. -func (sr *SapmDataReceiver) GenConfigYAMLStr() string { - // Note that this generates an exporter config for agent. - return fmt.Sprintf(` - sapm: - endpoint: "http://localhost:%d/v2/trace" - disable_compression: true`, sr.Port) -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (sr *SapmDataReceiver) ProtocolName() string { - return "sapm" -} - -// SFxMetricsDataReceiver implements SignalFx format receiver. -type SFxMetricsDataReceiver struct { - testbed.DataReceiverBase - receiver component.MetricsReceiver -} - -// Ensure SFxMetricsDataReceiver implements MetricDataSender. -var _ testbed.DataReceiver = (*SFxMetricsDataReceiver)(nil) - -// NewSFxMetricsDataReceiver creates a new SFxMetricsDataReceiver that will listen on the -// specified port after Start is called. -func NewSFxMetricsDataReceiver(port int) *SFxMetricsDataReceiver { - return &SFxMetricsDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} -} - -// Start the receiver. -func (sr *SFxMetricsDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { - addr := fmt.Sprintf("localhost:%d", sr.Port) - config := signalfxreceiver.Config{ - ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr}, - } - var err error - sr.receiver, err = signalfxreceiver.New(zap.L(), config, mc) - if err != nil { - return err - } - - return sr.receiver.Start(context.Background(), sr) -} - -// Stop the receiver. -func (sr *SFxMetricsDataReceiver) Stop() { - sr.receiver.Shutdown(context.Background()) -} - -// GenConfigYAMLStr returns exporter config for the agent. -func (sr *SFxMetricsDataReceiver) GenConfigYAMLStr() string { - // Note that this generates an exporter config for agent. - return fmt.Sprintf(` - signalfx: - ingest_url: "http://localhost:%d/v2/datapoint" - api_url: "http://localhost/" - access_token: "access_token"`, sr.Port) -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (sr *SFxMetricsDataReceiver) ProtocolName() string { - return "signalfx" -} - -// CarbonDataReceiver implements Carbon format receiver. -type CarbonDataReceiver struct { - testbed.DataReceiverBase - receiver component.MetricsReceiver -} - -// Ensure CarbonDataReceiver implements MetricDataSender. -var _ testbed.DataReceiver = (*CarbonDataReceiver)(nil) - -// NewCarbonDataReceiver creates a new CarbonDataReceiver that will listen on the -// specified port after Start is called. -func NewCarbonDataReceiver(port int) *CarbonDataReceiver { - return &CarbonDataReceiver{DataReceiverBase: testbed.DataReceiverBase{Port: port}} -} - -// Start the receiver. -func (cr *CarbonDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.MockMetricConsumer) error { - addr := fmt.Sprintf("localhost:%d", cr.Port) - config := carbonreceiver.Config{ - ReceiverSettings: configmodels.ReceiverSettings{Endpoint: addr}, - Parser: &protocol.Config{ - Type: "plaintext", - Config: &protocol.PlaintextConfig{}, - }, - } - var err error - cr.receiver, err = carbonreceiver.New(zap.L(), config, mc) - if err != nil { - return err - } - - return cr.receiver.Start(context.Background(), cr) -} - -// Stop the receiver. -func (cr *CarbonDataReceiver) Stop() { - cr.receiver.Shutdown(context.Background()) -} - -// GenConfigYAMLStr returns exporter config for the agent. -func (cr *CarbonDataReceiver) GenConfigYAMLStr() string { - // Note that this generates an exporter config for agent. - return fmt.Sprintf(` - carbon: - endpoint: "localhost:%d"`, cr.Port) -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (cr *CarbonDataReceiver) ProtocolName() string { - return "carbon" -} diff --git a/testbed/tests/senders.go b/testbed/tests/senders.go deleted file mode 100644 index 0b085f0bbe56..000000000000 --- a/testbed/tests/senders.go +++ /dev/null @@ -1,213 +0,0 @@ -// 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. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package tests - -import ( - "context" - "fmt" - "time" - - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/consumer/consumerdata" - "go.opentelemetry.io/collector/consumer/pdata" - "go.opentelemetry.io/collector/testbed/testbed" - "go.uber.org/zap" - - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter" -) - -// SapmDataSender implements TraceDataSender for SAPM protocol. -type SapmDataSender struct { - exporter component.TraceExporter - port int -} - -// Ensure SapmDataSender implements TraceDataSenderOld. -var _ testbed.TraceDataSender = (*SapmDataSender)(nil) - -// NewSapmDataSender creates a new Sapm protocol sender that will send -// to the specified port after Start is called. -func NewSapmDataSender(port int) *SapmDataSender { - return &SapmDataSender{port: port} -} - -// Start the sender. -func (je *SapmDataSender) Start() error { - cfg := &sapmexporter.Config{ - Endpoint: fmt.Sprintf("http://localhost:%d/v2/trace", je.port), - DisableCompression: true, - } - - var err error - factory := sapmexporter.Factory{} - params := component.ExporterCreateParams{Logger: zap.NewNop()} - exporter, err := factory.CreateTraceExporter(context.Background(), params, cfg) - - if err != nil { - return err - } - - je.exporter = exporter - return err -} - -// SendSpans sends spans. Can be called after Start. -func (je *SapmDataSender) SendSpans(traces pdata.Traces) error { - return je.exporter.ConsumeTraces(context.Background(), traces) -} - -// Flush previously sent spans. -func (je *SapmDataSender) Flush() { -} - -// GenConfigYAMLStr returns receiver config for the agent. -func (je *SapmDataSender) GenConfigYAMLStr() string { - return fmt.Sprintf(` - sapm: - endpoint: "localhost:%d"`, je.port) -} - -// GetCollectorPort returns receiver port for the Collector. -func (je *SapmDataSender) GetCollectorPort() int { - return je.port -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (je *SapmDataSender) ProtocolName() string { - return "sapm" -} - -// SFxMetricsDataSender implements MetricDataSender for SignalFx metrics protocol. -type SFxMetricsDataSender struct { - exporter component.MetricsExporterOld - port int -} - -// Ensure SFxMetricsDataSender implements MetricDataSenderOld. -var _ testbed.MetricDataSenderOld = (*SFxMetricsDataSender)(nil) - -// NewSFxMetricDataSender creates a new SignalFx metric protocol sender that will send -// to the specified port after Start is called. -func NewSFxMetricDataSender(port int) *SFxMetricsDataSender { - return &SFxMetricsDataSender{port: port} -} - -// Start the sender. -func (sf *SFxMetricsDataSender) Start() error { - cfg := &signalfxexporter.Config{ - IngestURL: fmt.Sprintf("http://localhost:%d/v2/datapoint", sf.port), - APIURL: "http://localhost", - AccessToken: "access_token", - } - - factory := signalfxexporter.Factory{} - exporter, err := factory.CreateMetricsExporter(zap.L(), cfg) - - if err != nil { - return err - } - - sf.exporter = exporter - return nil -} - -// SendMetrics sends metrics. Can be called after Start. -func (sf *SFxMetricsDataSender) SendMetrics(metrics consumerdata.MetricsData) error { - return sf.exporter.ConsumeMetricsData(context.Background(), metrics) -} - -// Flush previously sent metrics. -func (sf *SFxMetricsDataSender) Flush() { -} - -// GenConfigYAMLStr returns receiver config for the agent. -func (sf *SFxMetricsDataSender) GenConfigYAMLStr() string { - // Note that this generates a receiver config for agent. - return fmt.Sprintf(` - signalfx: - endpoint: "localhost:%d"`, sf.port) -} - -// GetCollectorPort returns receiver port for the Collector. -func (sf *SFxMetricsDataSender) GetCollectorPort() int { - return sf.port -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (sf *SFxMetricsDataSender) ProtocolName() string { - return "signalfx" -} - -// CarbonDataSender implements MetricDataSender for Carbon metrics protocol. -type CarbonDataSender struct { - exporter component.MetricsExporterOld - port int -} - -// Ensure CarbonDataSender implements MetricDataSenderOld. -var _ testbed.MetricDataSenderOld = (*CarbonDataSender)(nil) - -// NewCarbonDataSender creates a new Carbon metric protocol sender that will send -// to the specified port after Start is called. -func NewCarbonDataSender(port int) *CarbonDataSender { - return &CarbonDataSender{port: port} -} - -// Start the sender. -func (cs *CarbonDataSender) Start() error { - cfg := &carbonexporter.Config{ - Endpoint: fmt.Sprintf("localhost:%d", cs.port), - Timeout: 5 * time.Second, - } - - factory := carbonexporter.Factory{} - exporter, err := factory.CreateMetricsExporter(zap.L(), cfg) - - if err != nil { - return err - } - - cs.exporter = exporter - return nil -} - -// SendMetrics sends metrics. Can be called after Start. -func (cs *CarbonDataSender) SendMetrics(metrics consumerdata.MetricsData) error { - return cs.exporter.ConsumeMetricsData(context.Background(), metrics) -} - -// Flush previously sent metrics. -func (cs *CarbonDataSender) Flush() { -} - -// GenConfigYAMLStr returns receiver config for the agent. -func (cs *CarbonDataSender) GenConfigYAMLStr() string { - // Note that this generates a receiver config for agent. - return fmt.Sprintf(` - carbon: - endpoint: localhost:%d`, cs.port) -} - -// GetCollectorPort returns receiver port for the Collector. -func (cs *CarbonDataSender) GetCollectorPort() int { - return cs.port -} - -// ProtocolName returns protocol name as it is specified in Collector config. -func (cs *CarbonDataSender) ProtocolName() string { - return "carbon" -} diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index 23274d430911..1061beff63d3 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -22,6 +22,9 @@ import ( "go.opentelemetry.io/collector/testbed/testbed" scenarios "go.opentelemetry.io/collector/testbed/tests" + + "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datareceivers" + "github.com/open-telemetry/opentelemetry-collector-contrib/testbed/datasenders" ) // TestMain is used to initiate setup, execution and tear down of testbed. @@ -47,8 +50,8 @@ func TestTrace10kSPS(t *testing.T) { }, { "SAPM", - NewSapmDataSender(testbed.GetAvailablePort(t)), - NewSapmDataReceiver(testbed.GetAvailablePort(t)), + datasenders.NewSapmDataSender(testbed.GetAvailablePort(t)), + datareceivers.NewSapmDataReceiver(testbed.GetAvailablePort(t)), testbed.ResourceSpec{ ExpectedMaxCPU: 24, ExpectedMaxRAM: 100,