Skip to content

Commit

Permalink
Merge branch 'upstream'
Browse files Browse the repository at this point in the history
  • Loading branch information
mxiamxia committed Oct 13, 2020
2 parents d249e41 + 3b6d4e3 commit e47c40c
Show file tree
Hide file tree
Showing 158 changed files with 2,131 additions and 521 deletions.
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ run:
# default value is empty list, but default dirs are skipped independently
# from this option's value (see skip-dirs-use-default).
skip-dirs:
- third_party

# default is true. Enables skipping of directories:
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
Expand Down
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,50 @@

## Unreleased

## v0.12.0

# 🎉 OpenTelemetry Collector Contrib v0.12.0 (Beta) 🎉

The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-collector release](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.12.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.

## 🚀 New components 🚀

- `awsemf` exporter to support exporting metrics to AWS CloudWatch (#498, #1169)
- `http_forwarder` extension that forwards HTTP requests to a specified target (#979, #1014, #1150)
- `datadog` exporter that sends metric and trace data to Datadog (#1142, #1178, #1181, #1212)
- `awsecscontainermetrics` receiver to collect metrics from Amazon ECS Task Metadata Endpoint (#1089, #1148, #1160)

## 💡 Enhancements 💡

- `signalfx` exporter:
- Add host metadata synchronization (#1039, #1118)
- Add `copy_dimensions` translator option (#1126)
- Update `k8s_cluster` metric translations (#1121)
- Add option to exclude metrics (#1156)
- Add `avg` aggregation method (#1151)
- Fallback to host if cloud resource id not found (#1170)
- Add backwards compatible translation rules for the `dockerstatsreceiver` (#1201)
- Enable queuing and retries (#1223)
- `splunkhec` exporter:
- Add log support (#875)
- Enable queuing and retries (#1222)
- `k8scluster` receiver: Standardize metric names (#1119)
- `awsxray` exporter:
- Support AWS EKS attributes (#1090)
- Store resource attributes in X-Ray segments (#1174)
- `honeycomb` exporter:
- Add span kind to the event sent to Honeycomb (#474)
- Add option to adjust the sample rate using an attribute on the span (#1162)
- `jmxmetrics` extension: Add subprocess manager to manage child java processes (#1028)
- `elastic` exporter: Initial metrics support (#1173)
- `k8s` processor: Rename default attr names for label/annotation extraction (#1214)
- Add common SignalFx host id extraction (#1100)
- Allow MSI upgrades (#1165)

## 🧰 Bug fixes 🧰

- `awsxray` exporter: Don't set origin to EC2 when not on AWS (#1115)

## v0.11.0

# 🎉 OpenTelemetry Collector Contrib v0.11.0 (Beta) 🎉
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ integration-tests-with-cover:
# Long-running e2e tests
.PHONY: stability-tests
stability-tests: otelcontribcol
$(MAKE) -C testbed run-stability-tests
@echo Stability tests are disabled until we have a stable performance environment.
@echo To enable the tests replace this echo by $(MAKE) -C testbed run-stability-tests

.PHONY: gotidy
gotidy:
Expand Down
3 changes: 2 additions & 1 deletion Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
SRC_ROOT := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))

ALL_SRC := $(shell find . -name '*.go' \
-not -path '*/third_party/*' \
-type f | sort)

# All source code and documents. Used in spell check.
Expand Down Expand Up @@ -127,4 +128,4 @@ impi:

.PHONY: dep
dep:
go mod download
go mod download
44 changes: 22 additions & 22 deletions cmd/otelcontribcol/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func components() (component.Factories, error) {
}

extensions := []component.ExtensionFactory{
k8sobserver.NewFactory(),
hostobserver.NewFactory(),
httpforwarder.NewFactory(),
k8sobserver.NewFactory(),
}

for _, ext := range factories.Extensions {
Expand All @@ -82,22 +82,22 @@ func components() (component.Factories, error) {
}

receivers := []component.ReceiverFactory{
collectdreceiver.NewFactory(),
sapmreceiver.NewFactory(),
signalfxreceiver.NewFactory(),
awsecscontainermetricsreceiver.NewFactory(),
awsxrayreceiver.NewFactory(),
carbonreceiver.NewFactory(),
wavefrontreceiver.NewFactory(),
redisreceiver.NewFactory(),
kubeletstatsreceiver.NewFactory(),
simpleprometheusreceiver.NewFactory(),
collectdreceiver.NewFactory(),
dockerstatsreceiver.NewFactory(),
k8sclusterreceiver.NewFactory(),
kubeletstatsreceiver.NewFactory(),
prometheusexecreceiver.NewFactory(),
receivercreator.NewFactory(),
statsdreceiver.NewFactory(),
awsxrayreceiver.NewFactory(),
redisreceiver.NewFactory(),
sapmreceiver.NewFactory(),
signalfxreceiver.NewFactory(),
simpleprometheusreceiver.NewFactory(),
splunkhecreceiver.NewFactory(),
dockerstatsreceiver.NewFactory(),
awsecscontainermetricsreceiver.NewFactory(),
statsdreceiver.NewFactory(),
wavefrontreceiver.NewFactory(),
}
for _, rcv := range factories.Receivers {
receivers = append(receivers, rcv)
Expand All @@ -108,21 +108,21 @@ func components() (component.Factories, error) {
}

exporters := []component.ExporterFactory{
stackdriverexporter.NewFactory(),
azuremonitorexporter.NewFactory(),
signalfxexporter.NewFactory(),
sapmexporter.NewFactory(),
kinesisexporter.NewFactory(),
alibabacloudlogserviceexporter.NewFactory(),
awsemfexporter.NewFactory(),
awsxrayexporter.NewFactory(),
azuremonitorexporter.NewFactory(),
carbonexporter.NewFactory(),
elasticexporter.NewFactory(),
honeycombexporter.NewFactory(),
jaegerthrifthttpexporter.NewFactory(),
kinesisexporter.NewFactory(),
newrelicexporter.NewFactory(),
splunkhecexporter.NewFactory(),
elasticexporter.NewFactory(),
alibabacloudlogserviceexporter.NewFactory(),
awsemfexporter.NewFactory(),
sapmexporter.NewFactory(),
sentryexporter.NewFactory(),
signalfxexporter.NewFactory(),
splunkhecexporter.NewFactory(),
stackdriverexporter.NewFactory(),
}
for _, exp := range factories.Exporters {
exporters = append(exporters, exp)
Expand All @@ -134,8 +134,8 @@ func components() (component.Factories, error) {

processors := []component.ProcessorFactory{
k8sprocessor.NewFactory(),
resourcedetectionprocessor.NewFactory(),
metricstransformprocessor.NewFactory(),
resourcedetectionprocessor.NewFactory(),
routingprocessor.NewFactory(),
}
for _, pr := range factories.Processors {
Expand Down
50 changes: 50 additions & 0 deletions cmd/otelcontribcol/components_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// 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 main

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestDefaultComponents(t *testing.T) {
factories, err := components()
assert.NoError(t, err)

exts := factories.Extensions
for k, v := range exts {
assert.Equal(t, k, v.Type())
assert.Equal(t, k, v.CreateDefaultConfig().Type())
}

recvs := factories.Receivers
for k, v := range recvs {
assert.Equal(t, k, v.Type())
assert.Equal(t, k, v.CreateDefaultConfig().Type())
}

procs := factories.Processors
for k, v := range procs {
assert.Equal(t, k, v.Type())
assert.Equal(t, k, v.CreateDefaultConfig().Type())
}

exps := factories.Exporters
for k, v := range exps {
assert.Equal(t, k, v.Type())
assert.Equal(t, k, v.CreateDefaultConfig().Type())
}
}
2 changes: 1 addition & 1 deletion exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/gogo/protobuf v1.3.1
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
google.golang.org/protobuf v1.25.0
)
4 changes: 2 additions & 2 deletions exporter/alibabacloudlogserviceexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1025,8 +1025,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ require (
github.com/golang/protobuf v1.4.2
github.com/google/uuid v1.1.2
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
)
4 changes: 2 additions & 2 deletions exporter/awsemfexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
8 changes: 5 additions & 3 deletions exporter/awsxrayexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxra
go 1.14

require (
github.com/aws/aws-sdk-go v1.35.2
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.11.1-0.20200928205243-e3493cedf4b6
github.com/aws/aws-sdk-go v1.35.7
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray => ./../../internal/awsxray
15 changes: 4 additions & 11 deletions exporter/awsxrayexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,8 @@ github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:o
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.34.9/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
github.com/aws/aws-sdk-go v1.34.30/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
github.com/aws/aws-sdk-go v1.34.32/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
github.com/aws/aws-sdk-go v1.35.2 h1:qK+noh6b9KW+5CP1NmmWsQCUbnzucSGrjHEs69MEl6A=
github.com/aws/aws-sdk-go v1.35.2/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
github.com/aws/aws-sdk-go v1.35.7 h1:FHMhVhyc/9jljgFAcGkQDYjpC9btM0B8VfkLBfctdNE=
github.com/aws/aws-sdk-go v1.35.7/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k=
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
Expand Down Expand Up @@ -825,11 +823,6 @@ github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoT
github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
github.com/open-telemetry/opentelemetry-collector-contrib v0.11.0 h1:1rkTd2NRFlGEV4uXdZUJnwpSwRNOujt8t/VHIiG92K0=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.11.0 h1:KHYut+Y7RAWxIGljqOvsUt7oqJfsdNZfZ32S5xM5Xq0=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.11.0/go.mod h1:6bGWPFByRSNacjQeJxwaNVefGQAJALvJGCcLQ7dTr5M=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.11.1-0.20200928205243-e3493cedf4b6 h1:ZPFtEZPYhDyqSCZpxak/pke+zKeBftVLeHajgl2k584=
github.com/open-telemetry/opentelemetry-collector-contrib/internal/awsxray v0.11.1-0.20200928205243-e3493cedf4b6/go.mod h1:eZWSl+b/eq7KdZ0U4Sq5Ux1paDCeJI3M8CvCHmqIJas=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI=
Expand Down Expand Up @@ -1127,8 +1120,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/azuremonitorexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/microsoft/ApplicationInsights-Go v0.4.3
github.com/stretchr/testify v1.6.1
github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
golang.org/x/net v0.0.0-20200822124328-c89045814202
google.golang.org/grpc v1.32.0
Expand Down
4 changes: 2 additions & 2 deletions exporter/azuremonitorexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1126,8 +1126,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/carbonexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.14
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/stretchr/testify v1.6.1
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
4 changes: 2 additions & 2 deletions exporter/carbonexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1116,8 +1116,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/datadogexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.15
require (
github.com/stretchr/testify v1.6.1
github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
gopkg.in/zorkian/go-datadog-api.v2 v2.29.0
)
4 changes: 2 additions & 2 deletions exporter/datadogexporter/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1118,8 +1118,8 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opencensus.io v0.22.4 h1:LYy1Hy3MJdrCdMwwzxA/dRok4ejH+RwNGbuoD9fCjto=
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27 h1:FflsmcoJxW74nE/AlTfxkD3dKZOJcfTyjfkWJ80Oe/M=
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197 h1:skHaG66dUEwwbI2NBDVjWQORhS+OI1rH5zZ+dIQYNWs=
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197/go.mod h1:mKQha2MeRhJi0rHS8yvZlzFk28ZVBCf6qMTsjGX0n1Y=
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=
Expand Down
2 changes: 1 addition & 1 deletion exporter/elasticexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.6.1
go.elastic.co/apm v1.8.1-0.20200515083825-95e54b2e24ea
go.elastic.co/fastjson v1.1.0
go.opentelemetry.io/collector v0.11.1-0.20201006165100-07236c11fb27
go.opentelemetry.io/collector v0.12.1-0.20201012183541-526f34200197
go.uber.org/zap v1.16.0
google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
)
Loading

0 comments on commit e47c40c

Please sign in to comment.