Merge pull request #24 from pjanotti/update-otelcol-to-alpha

Update OTelCol to Alpha v0.2.0
open-telemetry · Oct 4, 2019 · a662bb1 · a662bb1
2 parents 484f74b + 64aa45e
commit a662bb1
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 16 deletions.
diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod
@@ -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

diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum
@@ -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=

diff --git a/exporter/stackdriverexporter/testdata/config.yaml b/exporter/stackdriverexporter/testdata/config.yaml
@@ -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]
 
diff --git a/receiver/zipkinscribereceiver/go.mod b/receiver/zipkinscribereceiver/go.mod
@@ -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
 )
diff --git a/receiver/zipkinscribereceiver/go.sum b/receiver/zipkinscribereceiver/go.sum
@@ -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=

diff --git a/receiver/zipkinscribereceiver/testdata/config.yaml b/receiver/zipkinscribereceiver/testdata/config.yaml
@@ -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]