diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod index ead3989048ef..1245c8b2c4ed 100644 --- a/exporter/awsxrayexporter/go.mod +++ b/exporter/awsxrayexporter/go.mod @@ -7,7 +7,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 github.com/mattn/go-isatty v0.0.10 // indirect - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 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 6128e6ed57f8..4d7fe2902f42 100644 --- a/exporter/awsxrayexporter/go.sum +++ b/exporter/awsxrayexporter/go.sum @@ -912,8 +912,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod index 551d17e38d15..2c39df5f42ef 100644 --- a/exporter/azuremonitorexporter/go.mod +++ b/exporter/azuremonitorexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/aws/aws-sdk-go v1.23.20 // indirect github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect go.uber.org/multierr v1.4.0 // indirect diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum index 6c80c62c0022..d96544fb0c2b 100644 --- a/exporter/azuremonitorexporter/go.sum +++ b/exporter/azuremonitorexporter/go.sum @@ -834,8 +834,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod index 853ed09e5773..c558175ea05b 100644 --- a/exporter/carbonexporter/go.mod +++ b/exporter/carbonexporter/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.uber.org/zap v1.10.0 ) diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum index c50687b81e0c..22e38a6e054e 100644 --- a/exporter/carbonexporter/go.sum +++ b/exporter/carbonexporter/go.sum @@ -829,8 +829,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod index 6ed83ac5deff..37a7d4fefffc 100644 --- a/exporter/honeycombexporter/go.mod +++ b/exporter/honeycombexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/google/go-cmp v0.4.0 github.com/honeycombio/opentelemetry-exporter-go v0.3.1 github.com/klauspost/compress v1.10.2 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.5.1 go.opentelemetry.io/otel v0.3.0 go.uber.org/zap v1.14.0 diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum index 1ae9197d3807..89cba37d5b00 100644 --- a/exporter/honeycombexporter/go.sum +++ b/exporter/honeycombexporter/go.sum @@ -854,8 +854,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod index 357f6dcaddf4..eac0530e3157 100644 --- a/exporter/jaegerthrifthttpexporter/go.mod +++ b/exporter/jaegerthrifthttpexporter/go.mod @@ -8,7 +8,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/google/go-cmp v0.4.0 github.com/jaegertracing/jaeger v1.17.0 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.uber.org/zap v1.10.0 ) diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum index 0898e6e778eb..9b40f00ff8f0 100644 --- a/exporter/jaegerthrifthttpexporter/go.sum +++ b/exporter/jaegerthrifthttpexporter/go.sum @@ -820,8 +820,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/kinesisexporter/go.mod b/exporter/kinesisexporter/go.mod index 519ee33d3862..221c502a5d92 100644 --- a/exporter/kinesisexporter/go.mod +++ b/exporter/kinesisexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kinesi go 1.14 require ( - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/signalfx/opencensus-go-exporter-kinesis v0.4.2 github.com/stretchr/testify v1.4.0 go.uber.org/zap v1.10.0 diff --git a/exporter/kinesisexporter/go.sum b/exporter/kinesisexporter/go.sum index a7891c17d459..69680753b1f0 100644 --- a/exporter/kinesisexporter/go.sum +++ b/exporter/kinesisexporter/go.sum @@ -839,8 +839,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/lightstepexporter/go.mod b/exporter/lightstepexporter/go.mod index 8824677d9986..38c489c6d7a7 100644 --- a/exporter/lightstepexporter/go.mod +++ b/exporter/lightstepexporter/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/lightstep/opentelemetry-exporter-go v0.1.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.opentelemetry.io/otel v0.2.3 go.uber.org/zap v1.14.0 diff --git a/exporter/lightstepexporter/go.sum b/exporter/lightstepexporter/go.sum index cd36ad5e2b03..4fc0c36d8bc5 100644 --- a/exporter/lightstepexporter/go.sum +++ b/exporter/lightstepexporter/go.sum @@ -846,8 +846,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod index 881346128783..11ba98947d26 100644 --- a/exporter/sapmexporter/go.mod +++ b/exporter/sapmexporter/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmex go 1.14 require ( - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/signalfx/sapm-proto v0.3.0 github.com/stretchr/testify v1.4.0 go.uber.org/multierr v1.4.0 // indirect diff --git a/exporter/sapmexporter/go.sum b/exporter/sapmexporter/go.sum index e5a8d7bdd9a4..3b0f8e93581d 100644 --- a/exporter/sapmexporter/go.sum +++ b/exporter/sapmexporter/go.sum @@ -854,8 +854,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/signalfxexporter/go.mod b/exporter/signalfxexporter/go.mod index 2aecd9965a84..d9522e68ba39 100644 --- a/exporter/signalfxexporter/go.mod +++ b/exporter/signalfxexporter/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190530013331-054be550cb49 github.com/stretchr/testify v1.4.0 go.uber.org/zap v1.12.0 diff --git a/exporter/signalfxexporter/go.sum b/exporter/signalfxexporter/go.sum index 74ac1342c343..ae6d0f9ed6e2 100644 --- a/exporter/signalfxexporter/go.sum +++ b/exporter/signalfxexporter/go.sum @@ -831,8 +831,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/exporter/stackdriverexporter/go.mod b/exporter/stackdriverexporter/go.mod index 85f0e56554e6..8a4320993456 100644 --- a/exporter/stackdriverexporter/go.mod +++ b/exporter/stackdriverexporter/go.mod @@ -6,7 +6,7 @@ require ( contrib.go.opencensus.io/exporter/stackdriver v0.13.1 github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.opencensus.io v0.22.3 go.uber.org/zap v1.10.0 diff --git a/exporter/stackdriverexporter/go.sum b/exporter/stackdriverexporter/go.sum index 394dcd495bad..36afd3790a7e 100644 --- a/exporter/stackdriverexporter/go.sum +++ b/exporter/stackdriverexporter/go.sum @@ -837,8 +837,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/extension/observer/go.sum b/extension/observer/go.sum new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/go.mod b/go.mod index 35072320a2bf..13a51bdef1c3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/client9/misspell v0.3.4 github.com/google/addlicense v0.0.0-20200301095109-7c013a14f2e2 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.0.0 @@ -16,7 +16,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/stackdriverexporter v0.0.0 - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-20200417175348-2f20d0c404f4 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sprocessor v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.0.0 diff --git a/go.sum b/go.sum index cfd851ae7502..fe5f70aa4cc2 100644 --- a/go.sum +++ b/go.sum @@ -933,10 +933,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-20200417175348-2f20d0c404f4 h1:PZFHe3iV5eO1ODxpFi7WYYprnsqe1sdK5GiuRRLOaBc= -github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0-20200417175348-2f20d0c404f4/go.mod h1:0CKaqU1lHv0dWPhVSXDprfZ8vjBhxXJjXMUYIBU/0zQ= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/processor/k8sprocessor/go.mod b/processor/k8sprocessor/go.mod index 9c3e8fee9f76..989e14e98dc2 100644 --- a/processor/k8sprocessor/go.mod +++ b/processor/k8sprocessor/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.opencensus.io v0.22.3 go.uber.org/zap v1.13.0 diff --git a/processor/k8sprocessor/go.sum b/processor/k8sprocessor/go.sum index 05c89a6b89cc..e270f1c13ee7 100644 --- a/processor/k8sprocessor/go.sum +++ b/processor/k8sprocessor/go.sum @@ -830,8 +830,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/carbonreceiver/go.mod b/receiver/carbonreceiver/go.mod index 4c0e6bcc77e0..cc70d2d0e8f8 100644 --- a/receiver/carbonreceiver/go.mod +++ b/receiver/carbonreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.4.0 go.opencensus.io v0.22.3 diff --git a/receiver/carbonreceiver/go.sum b/receiver/carbonreceiver/go.sum index 2547dc808322..6777f89b16da 100644 --- a/receiver/carbonreceiver/go.sum +++ b/receiver/carbonreceiver/go.sum @@ -832,8 +832,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/collectdreceiver/go.mod b/receiver/collectdreceiver/go.mod index 42439d19de46..79463a5d39e7 100644 --- a/receiver/collectdreceiver/go.mod +++ b/receiver/collectdreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.opencensus.io v0.22.3 go.uber.org/zap v1.10.0 diff --git a/receiver/collectdreceiver/go.sum b/receiver/collectdreceiver/go.sum index dd861c8482c3..9602f6513956 100644 --- a/receiver/collectdreceiver/go.sum +++ b/receiver/collectdreceiver/go.sum @@ -833,8 +833,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/jaegerlegacyreceiver/go.mod b/receiver/jaegerlegacyreceiver/go.mod index 86e84a6c9f45..7f70e33c0bc1 100644 --- a/receiver/jaegerlegacyreceiver/go.mod +++ b/receiver/jaegerlegacyreceiver/go.mod @@ -5,7 +5,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/google/go-cmp v0.4.0 github.com/jaegertracing/jaeger v1.17.0 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/jaegerthrifthttpexporter v0.0.0-20200403025519-839fe1ccfc10 github.com/spf13/viper v1.6.2 github.com/stretchr/testify v1.4.0 diff --git a/receiver/jaegerlegacyreceiver/go.sum b/receiver/jaegerlegacyreceiver/go.sum index 54885c836068..a2b604ba2ef0 100644 --- a/receiver/jaegerlegacyreceiver/go.sum +++ b/receiver/jaegerlegacyreceiver/go.sum @@ -833,8 +833,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/receivercreator/go.mod b/receiver/receivercreator/go.mod index b9fb992db976..c6852c245b38 100644 --- a/receiver/receivercreator/go.mod +++ b/receiver/receivercreator/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.0.0 github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.6.2 diff --git a/receiver/receivercreator/go.sum b/receiver/receivercreator/go.sum index cc51b2868d85..8d3f239a9bd2 100644 --- a/receiver/receivercreator/go.sum +++ b/receiver/receivercreator/go.sum @@ -830,8 +830,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/redisreceiver/go.mod b/receiver/redisreceiver/go.mod index 8f13bc9f59df..565ac05a8e51 100644 --- a/receiver/redisreceiver/go.mod +++ b/receiver/redisreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/go-redis/redis/v7 v7.2.0 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/stretchr/testify v1.4.0 go.uber.org/zap v1.10.0 ) diff --git a/receiver/redisreceiver/go.sum b/receiver/redisreceiver/go.sum index 9c3847a48ed7..da2f702a1b0f 100644 --- a/receiver/redisreceiver/go.sum +++ b/receiver/redisreceiver/go.sum @@ -807,8 +807,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/sapmreceiver/factory.go b/receiver/sapmreceiver/factory.go index bc5c83efa31e..aa21d3b30af4 100644 --- a/receiver/sapmreceiver/factory.go +++ b/receiver/sapmreceiver/factory.go @@ -26,7 +26,6 @@ import ( "github.com/open-telemetry/opentelemetry-collector/config/configerror" "github.com/open-telemetry/opentelemetry-collector/config/configmodels" "github.com/open-telemetry/opentelemetry-collector/consumer" - "go.uber.org/zap" ) const ( @@ -83,9 +82,9 @@ func extractPortFromEndpoint(endpoint string) (int, error) { // CreateTraceReceiver creates a trace receiver based on provided config. func (f *Factory) CreateTraceReceiver( ctx context.Context, - logger *zap.Logger, + params component.ReceiverCreateParams, cfg configmodels.Receiver, - nextConsumer consumer.TraceConsumerOld, + nextConsumer consumer.TraceConsumer, ) (component.TraceReceiver, error) { // assert config is SAPM config rCfg := cfg.(*Config) @@ -104,14 +103,15 @@ func (f *Factory) CreateTraceReceiver( } // Create the receiver. - return New(ctx, logger, rCfg, nextConsumer) + return New(ctx, params, rCfg, nextConsumer) } // CreateMetricsReceiver creates a metrics receiver based on provided config. func (f *Factory) CreateMetricsReceiver( - logger *zap.Logger, - cfg configmodels.Receiver, - consumer consumer.MetricsConsumerOld, + _ context.Context, + _ component.ReceiverCreateParams, + _ configmodels.Receiver, + _ consumer.MetricsConsumer, ) (component.MetricsReceiver, error) { return nil, configerror.ErrDataTypeIsNotSupported } diff --git a/receiver/sapmreceiver/factory_test.go b/receiver/sapmreceiver/factory_test.go index 180728c2c5f4..24bcbee15410 100644 --- a/receiver/sapmreceiver/factory_test.go +++ b/receiver/sapmreceiver/factory_test.go @@ -18,6 +18,7 @@ import ( "context" "testing" + "github.com/open-telemetry/opentelemetry-collector/component" "github.com/open-telemetry/opentelemetry-collector/config/configcheck" "github.com/open-telemetry/opentelemetry-collector/config/configerror" "github.com/stretchr/testify/assert" @@ -35,11 +36,12 @@ func TestCreateReceiver(t *testing.T) { factory := Factory{} cfg := factory.CreateDefaultConfig() - tReceiver, err := factory.CreateTraceReceiver(context.Background(), zap.NewNop(), cfg, nil) + params := component.ReceiverCreateParams{Logger: zap.NewNop()} + tReceiver, err := factory.CreateTraceReceiver(context.Background(), params, cfg, nil) assert.NoError(t, err, "receiver creation failed") assert.NotNil(t, tReceiver, "receiver creation failed") - mReceiver, err := factory.CreateMetricsReceiver(zap.NewNop(), cfg, nil) + mReceiver, err := factory.CreateMetricsReceiver(context.Background(), params, cfg, nil) assert.Equal(t, err, configerror.ErrDataTypeIsNotSupported) assert.Nil(t, mReceiver) } @@ -50,7 +52,8 @@ func TestCreateInvalidHTTPEndpoint(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "" - _, err := factory.CreateTraceReceiver(context.Background(), zap.NewNop(), cfg, nil) + params := component.ReceiverCreateParams{Logger: zap.NewNop()} + _, err := factory.CreateTraceReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no endpoints must fail") } @@ -60,7 +63,8 @@ func TestCreateNoPort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:" - _, err := factory.CreateTraceReceiver(context.Background(), zap.NewNop(), cfg, nil) + params := component.ReceiverCreateParams{Logger: zap.NewNop()} + _, err := factory.CreateTraceReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with no port number must fail") } @@ -70,6 +74,7 @@ func TestCreateLargePort(t *testing.T) { rCfg := cfg.(*Config) rCfg.Endpoint = "localhost:65536" - _, err := factory.CreateTraceReceiver(context.Background(), zap.NewNop(), cfg, nil) + params := component.ReceiverCreateParams{Logger: zap.NewNop()} + _, err := factory.CreateTraceReceiver(context.Background(), params, cfg, nil) assert.Error(t, err, "receiver creation with too large port number must fail") } diff --git a/receiver/sapmreceiver/go.mod b/receiver/sapmreceiver/go.mod index 9bd8324d2902..fb119e933c8f 100644 --- a/receiver/sapmreceiver/go.mod +++ b/receiver/sapmreceiver/go.mod @@ -4,13 +4,12 @@ go 1.14 require ( cloud.google.com/go v0.49.0 // indirect - github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/google/go-cmp v0.4.0 github.com/gorilla/mux v1.7.3 github.com/jaegertracing/jaeger v1.17.0 github.com/jstemmer/go-junit-report v0.9.1 // indirect - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 + github.com/open-telemetry/opentelemetry-proto v0.3.0 github.com/signalfx/sapm-proto v0.3.0 github.com/stretchr/testify v1.4.0 go.opencensus.io v0.22.3 diff --git a/receiver/sapmreceiver/go.sum b/receiver/sapmreceiver/go.sum index 72dcef2a8eb0..619708d0229b 100644 --- a/receiver/sapmreceiver/go.sum +++ b/receiver/sapmreceiver/go.sum @@ -853,8 +853,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/sapmreceiver/trace_receiver.go b/receiver/sapmreceiver/trace_receiver.go index 0d46a26ee330..714dd26a86a9 100644 --- a/receiver/sapmreceiver/trace_receiver.go +++ b/receiver/sapmreceiver/trace_receiver.go @@ -57,7 +57,7 @@ type sapmReceiver struct { config *Config server *http.Server - nextConsumer consumer.TraceConsumerOld + nextConsumer consumer.TraceConsumer // defaultResponse is a placeholder. For now this receiver returns an empty sapm response. // This defaultResponse is an optimization so we don't have to proto.Marshal the response @@ -82,15 +82,14 @@ func (sr *sapmReceiver) handleRequest(ctx context.Context, req *http.Request) er // convert the jager batches to OCProto // TODO: the translator never returns error change the function signature. - td, _ := jaegertranslator.ProtoBatchToOCProto(*batch) - numSpans += len(td.Spans) + td := jaegertranslator.ProtoBatchToInternalTraces(*batch) + numSpans += td.SpanCount() if err != nil { continue } - td.SourceFormat = traceSource // pass the trace data to the next consumer - err = sr.nextConsumer.ConsumeTraceData(ctx, td) + err = sr.nextConsumer.ConsumeTraces(ctx, td) if err != nil { err = fmt.Errorf("error passing trace data to next consumer: %v", err.Error()) } @@ -212,14 +211,19 @@ func (sr *sapmReceiver) Shutdown(context.Context) error { var _ component.TraceReceiver = (*sapmReceiver)(nil) // New creates a sapmReceiver that receives SAPM over http -func New(ctx context.Context, logger *zap.Logger, config *Config, nextConsumer consumer.TraceConsumerOld) (component.TraceReceiver, error) { +func New( + ctx context.Context, + params component.ReceiverCreateParams, + config *Config, + nextConsumer consumer.TraceConsumer, +) (component.TraceReceiver, error) { // build the response message defaultResponse, err := proto.Marshal(&splunksapm.PostSpansResponse{}) if err != nil { return nil, fmt.Errorf("failed to marshal default response body for %s receiver: %v", config.Name(), err) } return &sapmReceiver{ - logger: logger, + logger: params.Logger, config: config, nextConsumer: nextConsumer, defaultResponse: defaultResponse, diff --git a/receiver/sapmreceiver/trace_receiver_test.go b/receiver/sapmreceiver/trace_receiver_test.go index fb20b1b41a23..b471fca41fde 100644 --- a/receiver/sapmreceiver/trace_receiver_test.go +++ b/receiver/sapmreceiver/trace_receiver_test.go @@ -24,17 +24,16 @@ import ( "testing" "time" - commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1" - tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1" "github.com/golang/protobuf/proto" - "github.com/golang/protobuf/ptypes/timestamp" - "github.com/google/go-cmp/cmp" "github.com/jaegertracing/jaeger/model" + "github.com/open-telemetry/opentelemetry-collector/component" "github.com/open-telemetry/opentelemetry-collector/component/componenttest" "github.com/open-telemetry/opentelemetry-collector/config/configmodels" - "github.com/open-telemetry/opentelemetry-collector/consumer/consumerdata" + "github.com/open-telemetry/opentelemetry-collector/consumer/pdata" "github.com/open-telemetry/opentelemetry-collector/exporter/exportertest" + "github.com/open-telemetry/opentelemetry-collector/translator/conventions" tracetranslator "github.com/open-telemetry/opentelemetry-collector/translator/trace" + otlptrace "github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1" splunksapm "github.com/signalfx/sapm-proto/gen" "github.com/signalfx/sapm-proto/sapmprotocol" "github.com/stretchr/testify/assert" @@ -42,74 +41,47 @@ import ( "go.uber.org/zap" ) -func expectedTraceData(t1, t2, t3 time.Time) []consumerdata.TraceData { - traceID := []byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80} - parentSpanID := []byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18} - childSpanID := []byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8} - - return []consumerdata.TraceData{ - { - Node: &commonpb.Node{ - ServiceInfo: &commonpb.ServiceInfo{Name: "issaTest"}, - LibraryInfo: &commonpb.LibraryInfo{}, - Identifier: &commonpb.ProcessIdentifier{}, - Attributes: map[string]string{ - "bool": "true", - "string": "yes", - "int64": "10000000", - }, - }, - Spans: []*tracepb.Span{ - { - TraceId: traceID, - SpanId: childSpanID, - ParentSpanId: parentSpanID, - Name: &tracepb.TruncatableString{Value: "DBSearch"}, - StartTime: ×tamp.Timestamp{Seconds: t1.UnixNano() / 1e9, Nanos: int32(t1.UnixNano() % 1e9)}, - EndTime: ×tamp.Timestamp{Seconds: t2.UnixNano() / 1e9, Nanos: int32(t2.UnixNano() % 1e9)}, - Status: &tracepb.Status{ - Code: trace.StatusCodeNotFound, - Message: "Stale indices", - }, - Attributes: &tracepb.Span_Attributes{ - AttributeMap: map[string]*tracepb.AttributeValue{ - "error": { - Value: &tracepb.AttributeValue_BoolValue{BoolValue: true}, - }, - }, - }, - Links: &tracepb.Span_Links{ - Link: []*tracepb.Span_Link{ - { - TraceId: traceID, - SpanId: parentSpanID, - Type: tracepb.Span_Link_PARENT_LINKED_SPAN, - }, - }, - }, - }, - { - TraceId: traceID, - SpanId: parentSpanID, - Name: &tracepb.TruncatableString{Value: "ProxyFetch"}, - StartTime: ×tamp.Timestamp{Seconds: t2.UnixNano() / 1e9, Nanos: int32(t2.UnixNano() % 1e9)}, - EndTime: ×tamp.Timestamp{Seconds: t3.UnixNano() / 1e9, Nanos: int32(t3.UnixNano() % 1e9)}, - Status: &tracepb.Status{ - Code: trace.StatusCodeInternal, - Message: "Frontend crash", - }, - Attributes: &tracepb.Span_Attributes{ - AttributeMap: map[string]*tracepb.AttributeValue{ - "error": { - Value: &tracepb.AttributeValue_BoolValue{BoolValue: true}, - }, - }, - }, - }, - }, - SourceFormat: traceSource, - }, - } +func expectedTraceData(t1, t2, t3 time.Time) pdata.Traces { + traceID := pdata.TraceID( + []byte{0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF, 0x80}) + parentSpanID := pdata.SpanID([]byte{0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18}) + childSpanID := pdata.SpanID([]byte{0xAF, 0xAE, 0xAD, 0xAC, 0xAB, 0xAA, 0xA9, 0xA8}) + + traces := pdata.NewTraces() + traces.ResourceSpans().Resize(1) + rs := traces.ResourceSpans().At(0) + rs.Resource().InitEmpty() + rs.Resource().Attributes().InsertString(conventions.AttributeServiceName, "issaTest") + rs.Resource().Attributes().InsertBool("bool", true) + rs.Resource().Attributes().InsertString("string", "yes") + rs.Resource().Attributes().InsertInt("int64", 10000000) + rs.InstrumentationLibrarySpans().Resize(1) + rs.InstrumentationLibrarySpans().At(0).Spans().Resize(2) + + span0 := rs.InstrumentationLibrarySpans().At(0).Spans().At(0) + span0.SetSpanID(childSpanID) + span0.SetParentSpanID(parentSpanID) + span0.SetTraceID(traceID) + span0.SetName("DBSearch") + span0.SetStartTime(pdata.TimestampUnixNano(uint64(t1.UnixNano()))) + span0.SetEndTime(pdata.TimestampUnixNano(uint64(t2.UnixNano()))) + span0.Status().InitEmpty() + span0.Status().SetCode(pdata.StatusCode(otlptrace.Status_NotFound)) + span0.Status().SetMessage("Stale indices") + span0.Attributes().InsertBool("error", true) + + span1 := rs.InstrumentationLibrarySpans().At(0).Spans().At(1) + span1.SetSpanID(parentSpanID) + span1.SetTraceID(traceID) + span1.SetName("ProxyFetch") + span1.SetStartTime(pdata.TimestampUnixNano(uint64(t2.UnixNano()))) + span1.SetEndTime(pdata.TimestampUnixNano(uint64(t3.UnixNano()))) + span1.Status().InitEmpty() + span1.Status().SetCode(pdata.StatusCode(otlptrace.Status_InternalError)) + span1.Status().SetMessage("Frontend crash") + span1.Attributes().InsertBool("error", true) + + return traces } func grpcFixture(t1 time.Time, d1, d2 time.Duration) *model.Batch { @@ -225,7 +197,7 @@ func TestReception(t *testing.T) { tests := []struct { name string args args - want []consumerdata.TraceData + want pdata.Traces }{ { name: "receive uncompressed sapm", @@ -254,9 +226,10 @@ func TestReception(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - sink := new(exportertest.SinkTraceExporterOld) + sink := new(exportertest.SinkTraceExporter) - sr, err := New(context.Background(), zap.NewNop(), tt.args.config, sink) + params := component.ReceiverCreateParams{Logger: zap.NewNop()} + sr, err := New(context.Background(), params, tt.args.config, sink) assert.NoError(t, err, "should not have failed to create the SAPM receiver") t.Log("Starting") defer sr.Shutdown(context.Background()) @@ -272,13 +245,11 @@ func TestReception(t *testing.T) { // retrieve received traces got := sink.AllTraces() + assert.Equal(t, 1, len(got)) // compare what we got to what we wanted t.Log("Comparing expected data to trace data") - if diff := cmp.Diff(got, tt.want); diff != "" { - t.Errorf("Mismatched responses\n-Got +Want:\n\t%s", diff) - } - + assert.EqualValues(t, tt.want, got[0]) }) } } diff --git a/receiver/signalfxreceiver/go.mod b/receiver/signalfxreceiver/go.mod index e4547efd88d7..ded5e0032f2d 100644 --- a/receiver/signalfxreceiver/go.mod +++ b/receiver/signalfxreceiver/go.mod @@ -6,7 +6,7 @@ require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 github.com/gorilla/mux v1.7.3 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0-20200110233337-37711984b8d4 github.com/signalfx/com_signalfx_metrics_protobuf v0.0.0-20190530013331-054be550cb49 github.com/stretchr/testify v1.4.0 diff --git a/receiver/signalfxreceiver/go.sum b/receiver/signalfxreceiver/go.sum index ff0f3ef97978..b5834571ed1e 100644 --- a/receiver/signalfxreceiver/go.sum +++ b/receiver/signalfxreceiver/go.sum @@ -832,8 +832,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/wavefrontreceiver/go.mod b/receiver/wavefrontreceiver/go.mod index 2b07c868c150..11841933bafa 100644 --- a/receiver/wavefrontreceiver/go.mod +++ b/receiver/wavefrontreceiver/go.mod @@ -5,7 +5,7 @@ go 1.14 require ( github.com/census-instrumentation/opencensus-proto v0.2.1 github.com/golang/protobuf v1.3.5 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 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.4.0 diff --git a/receiver/wavefrontreceiver/go.sum b/receiver/wavefrontreceiver/go.sum index 9c8a10a5119d..09f2ef794906 100644 --- a/receiver/wavefrontreceiver/go.sum +++ b/receiver/wavefrontreceiver/go.sum @@ -829,8 +829,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/receiver/zipkinscribereceiver/go.mod b/receiver/zipkinscribereceiver/go.mod index 35bedc072e65..f79285972840 100644 --- a/receiver/zipkinscribereceiver/go.mod +++ b/receiver/zipkinscribereceiver/go.mod @@ -8,7 +8,7 @@ require ( github.com/golang/protobuf v1.3.5 github.com/jaegertracing/jaeger v1.17.0 github.com/omnition/scribe-go v1.0.0 - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 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 index fb45f82967da..fa3430c85570 100644 --- a/receiver/zipkinscribereceiver/go.sum +++ b/receiver/zipkinscribereceiver/go.sum @@ -836,8 +836,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/testbed/go.mod b/testbed/go.mod index b80030f3482c..1ba3f34d9ec0 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -3,7 +3,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/testbed go 1.14 require ( - github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e + github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter v0.0.0 github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter v0.0.0 diff --git a/testbed/go.sum b/testbed/go.sum index 4ab67728bead..f9f1c5fd8311 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -876,8 +876,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.9.0 h1:R1uwffexN6Pr340GtYRIdZmAiN4J+iw6WG4wog1DUXg= github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e h1:w67eqMTZ7ggKmTJDV3+ertwhWpmPltreRMZ6+DRKk98= -github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200414190247-75ae9198a89e/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519 h1:j4lzNcXgPE50pZ7n77s/Mnh7EKBZ2e+k34Qhsuiv36c= +github.com/open-telemetry/opentelemetry-collector v0.3.1-0.20200423174807-6c194144a519/go.mod h1:aZAL+YwTtk+1YkTj8dDgTvv06dU8twzOdRowRtBfEKo= github.com/open-telemetry/opentelemetry-proto v0.3.0 h1:+ASAtcayvoELyCF40+rdCMlBOhZIn5TPDez85zSYc30= github.com/open-telemetry/opentelemetry-proto v0.3.0/go.mod h1:PMR5GI0F7BSpio+rBGFxNm6SLzg3FypDTcFuQZnO+F8= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= diff --git a/testbed/tests/metric_test.go b/testbed/tests/metric_test.go index 4db7086d706e..d2462783a55e 100644 --- a/testbed/tests/metric_test.go +++ b/testbed/tests/metric_test.go @@ -64,6 +64,7 @@ func TestMetric10kDPS(t *testing.T) { test.sender, test.receiver, test.resourceSpec, + nil, ) }) } diff --git a/testbed/tests/receivers.go b/testbed/tests/receivers.go index 2a7fd48fade3..a8b78ff82ee2 100644 --- a/testbed/tests/receivers.go +++ b/testbed/tests/receivers.go @@ -49,7 +49,8 @@ func (sr *SapmDataReceiver) Start(tc *testbed.MockTraceConsumer, mc *testbed.Moc }, } var err error - sr.receiver, err = sapmreceiver.New(context.Background(), zap.L(), &sapmCfg, tc) + params := component.ReceiverCreateParams{Logger: zap.L()} + sr.receiver, err = sapmreceiver.New(context.Background(), params, &sapmCfg, tc) if err != nil { return err } diff --git a/testbed/tests/trace_test.go b/testbed/tests/trace_test.go index d303ff280107..ddcf29107ec2 100644 --- a/testbed/tests/trace_test.go +++ b/testbed/tests/trace_test.go @@ -56,6 +56,12 @@ func TestTrace10kSPS(t *testing.T) { }, } + processors := map[string]string{ + "batch": ` + batch: +`, + } + for _, test := range tests { t.Run(test.name, func(t *testing.T) { scenarios.Scenario10kItemsPerSecond( @@ -63,6 +69,7 @@ func TestTrace10kSPS(t *testing.T) { test.sender, test.receiver, test.resourceSpec, + processors, ) }) }