Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OTelCol to Alpha v0.2.0 #24

Merged
merged 1 commit into from
Oct 4, 2019
Merged

Update OTelCol to Alpha v0.2.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion exporter/stackdriverexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.12
require (
// TODO: pin a released version
contrib.go.opencensus.io/exporter/stackdriver v0.12.8-0.20190917133925-4339afab4a99
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb
github.com/open-telemetry/opentelemetry-collector v0.2.0
github.com/stretchr/testify v1.4.0
go.uber.org/zap v1.10.0
google.golang.org/api v0.10.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/stackdriverexporter/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV
github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb h1:tOutCHTwxpEb+DQTSMqDTKLVkWAl2XWkrX7/BauXcQw=
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb/go.mod h1:I/j+uLw2nsjhVHFyu+uJEVcpUioc5vbOhhz334pBlxY=
github.com/open-telemetry/opentelemetry-collector v0.2.0 h1:38/NrGdEEXufWqYFkW/6yeW3koRvb1QbE/2owKSNQvI=
github.com/open-telemetry/opentelemetry-collector v0.2.0/go.mod h1:zZf9V+57o0Fd3ik5HzaHamVsWhudJTOwnKw9kJvWoDo=
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
Expand Down
11 changes: 6 additions & 5 deletions exporter/stackdriverexporter/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ exporters:
stackdriver/disabled: # will be ignored
disabled: true

pipelines:
traces:
receivers: [examplereceiver]
processors: [exampleprocessor]
exporters: [stackdriver]
service:
pipelines:
traces:
receivers: [examplereceiver]
processors: [exampleprocessor]
exporters: [stackdriver]

2 changes: 1 addition & 1 deletion receiver/zipkinscribereceiver/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/golang/protobuf v1.3.2
github.com/jaegertracing/jaeger v1.14.0
github.com/omnition/scribe-go v1.0.0
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb
github.com/open-telemetry/opentelemetry-collector v0.2.0
github.com/stretchr/testify v1.4.0
go.uber.org/zap v1.10.0
)
4 changes: 2 additions & 2 deletions receiver/zipkinscribereceiver/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,8 +320,8 @@ github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGV
github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb h1:tOutCHTwxpEb+DQTSMqDTKLVkWAl2XWkrX7/BauXcQw=
github.com/open-telemetry/opentelemetry-collector v0.0.3-0.20190927211703-dc6b290e3cfb/go.mod h1:I/j+uLw2nsjhVHFyu+uJEVcpUioc5vbOhhz334pBlxY=
github.com/open-telemetry/opentelemetry-collector v0.2.0 h1:38/NrGdEEXufWqYFkW/6yeW3koRvb1QbE/2owKSNQvI=
github.com/open-telemetry/opentelemetry-collector v0.2.0/go.mod h1:zZf9V+57o0Fd3ik5HzaHamVsWhudJTOwnKw9kJvWoDo=
github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w=
github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
Expand Down
11 changes: 6 additions & 5 deletions receiver/zipkinscribereceiver/testdata/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ processors:
exporters:
exampleexporter:

pipelines:
traces:
receivers: [zipkin-scribe, zipkin-scribe/category]
processors: [exampleprocessor]
exporters: [exampleexporter]
service:
pipelines:
traces:
receivers: [zipkin-scribe, zipkin-scribe/category]
processors: [exampleprocessor]
exporters: [exampleexporter]