Update core to latest, fix calling delete while keeping reference (#1402

) Signed-off-by: Bogdan Drutu <[email protected]>
asuresh4 · Oct 28, 2020 · 7268b25 · 7268b25
1 parent 92cfa83
commit 7268b25
Show file tree

Hide file tree

Showing 101 changed files with 157 additions and 239 deletions.
diff --git a/exporter/alibabacloudlogserviceexporter/go.mod b/exporter/alibabacloudlogserviceexporter/go.mod
@@ -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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/alibabacloudlogserviceexporter/go.sum b/exporter/alibabacloudlogserviceexporter/go.sum
@@ -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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsemfexporter/go.mod b/exporter/awsemfexporter/go.mod
@@ -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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
 )
diff --git a/exporter/awsemfexporter/go.sum b/exporter/awsemfexporter/go.sum
@@ -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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/awsxrayexporter/go.mod b/exporter/awsxrayexporter/go.mod
@@ -6,7 +6,7 @@ require (
  github.com/aws/aws-sdk-go v1.35.14
  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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  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

diff --git a/exporter/awsxrayexporter/go.sum b/exporter/awsxrayexporter/go.sum
@@ -1120,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/azuremonitorexporter/go.mod b/exporter/azuremonitorexporter/go.mod
@@ -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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  golang.org/x/net v0.0.0-20200822124328-c89045814202
  google.golang.org/grpc v1.32.0

diff --git a/exporter/azuremonitorexporter/go.sum b/exporter/azuremonitorexporter/go.sum
@@ -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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/carbonexporter/go.mod b/exporter/carbonexporter/go.mod
@@ -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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
 )
diff --git a/exporter/carbonexporter/go.sum b/exporter/carbonexporter/go.sum
@@ -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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/datadogexporter/go.mod b/exporter/datadogexporter/go.mod
@@ -9,7 +9,7 @@ require (
  github.com/stretchr/testify v1.6.1
  github.com/zorkian/go-datadog-api v2.29.0+incompatible // indirect
  go.opencensus.io v0.22.4
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  gopkg.in/DataDog/dd-trace-go.v1 v1.26.0
  gopkg.in/zorkian/go-datadog-api.v2 v2.30.0

diff --git a/exporter/datadogexporter/go.sum b/exporter/datadogexporter/go.sum
@@ -1138,8 +1138,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/elasticexporter/go.mod b/exporter/elasticexporter/go.mod
@@ -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.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
 )
diff --git a/exporter/elasticexporter/go.sum b/exporter/elasticexporter/go.sum
@@ -1133,8 +1133,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/honeycombexporter/go.mod b/exporter/honeycombexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/honeycombio/libhoney-go v1.14.1
  github.com/klauspost/compress v1.11.1
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/grpc v1.32.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect

diff --git a/exporter/honeycombexporter/go.sum b/exporter/honeycombexporter/go.sum
@@ -1138,8 +1138,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/jaegerthrifthttpexporter/go.mod b/exporter/jaegerthrifthttpexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/google/go-cmp v0.5.2
  github.com/jaegertracing/jaeger v1.20.0
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/jaegerthrifthttpexporter/go.sum b/exporter/jaegerthrifthttpexporter/go.sum
@@ -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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/kinesisexporter/go.mod b/exporter/kinesisexporter/go.mod
@@ -9,7 +9,7 @@ require (
  github.com/gogo/googleapis v1.3.1 // indirect
  github.com/signalfx/omnition-kinesis-producer v0.5.0
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
 )
diff --git a/exporter/kinesisexporter/go.sum b/exporter/kinesisexporter/go.sum
@@ -1124,8 +1124,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/logzioexporter/go.mod b/exporter/logzioexporter/go.mod
@@ -8,7 +8,7 @@ require (
  github.com/jaegertracing/jaeger v1.20.0
  github.com/logzio/jaeger-logzio v0.0.0-20201026090333-8336e3e13ec6
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/protobuf v1.25.0
 )
diff --git a/exporter/logzioexporter/go.sum b/exporter/logzioexporter/go.sum
@@ -1141,8 +1141,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.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/newrelicexporter/go.mod b/exporter/newrelicexporter/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/newrelic/newrelic-telemetry-sdk-go v0.4.0
  github.com/stretchr/testify v1.6.1
  go.opencensus.io v0.22.5
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
  google.golang.org/grpc/examples v0.0.0-20200728194956-1c32b02682df // indirect
  google.golang.org/protobuf v1.25.0

diff --git a/exporter/newrelicexporter/go.sum b/exporter/newrelicexporter/go.sum
@@ -1119,8 +1119,8 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5 h1:dntmOdLpSpHlVqbW5Eay97DelsZHe+55D+xC6i0dDS0=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47 h1:LUSECbIh5nGAahLbqTvNmz4FwSe0LafFgOZd9wCyHis=
-go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d h1:nUwK2Q6fk2kIt/uEtBegKj5R5CYLLepZu8y8dVaeuwo=
+go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d/go.mod h1:UB7wWD7RrEx8GFSaUR47TO1GAqxSi5+Kq68tI1icwJk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=

diff --git a/exporter/sapmexporter/exporter.go b/exporter/sapmexporter/exporter.go
@@ -92,13 +92,13 @@ func (se *sapmExporter) tracesByAccessToken(td pdata.Traces) map[string]pdata.Tr
  accessToken := ""
  if !resourceSpan.Resource().IsNil() {
  attrs := resourceSpan.Resource().Attributes()
- attributeValue, ok := attrs.Get(splunk.SFxAccessTokenLabel)
- if ok {
- attrs.Delete(splunk.SFxAccessTokenLabel)
- if se.config.AccessTokenPassthrough {
+ if se.config.AccessTokenPassthrough {
+ attributeValue, ok := attrs.Get(splunk.SFxAccessTokenLabel)
+ if ok {
  accessToken = attributeValue.StringVal()
  }
  }
+ attrs.Delete(splunk.SFxAccessTokenLabel)
  }
 
  traceForToken, ok := tracesByToken[accessToken]

diff --git a/exporter/sapmexporter/go.mod b/exporter/sapmexporter/go.mod
@@ -3,11 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmex
 go 1.14
 
 require (
+ github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
+ github.com/go-ole/go-ole v1.2.4 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.0.0-00010101000000-000000000000
  github.com/signalfx/sapm-proto v0.6.2
- github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20201015185032-52a4f97df2a4
  github.com/stretchr/testify v1.6.1
- go.opentelemetry.io/collector v0.13.1-0.20201026193812-7de4bf9a2b47
+ go.opentelemetry.io/collector v0.13.1-0.20201027215027-6ae66159741d
  go.uber.org/zap v1.16.0
 )