Bump go.opentelemetry.io/contrib/propagators from 0.16.0 to 0.18.0 (#193

) (#200) * Bump go.opentelemetry.io/contrib/propagators from 0.16.0 to 0.18.0 Bumps [go.opentelemetry.io/contrib/propagators](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.16.0 to 0.18.0. - [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md) - [Commits](open-telemetry/opentelemetry-go-contrib@v0.16.0...v0.18.0) Signed-off-by: dependabot[bot] <support@github.com> * Upgrade to the 0.18 propagation interface * Remove go 1.12, 1.13, add 1.16 to test matrix Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vera Reynolds <verareynolds@honeycomb.io> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
honeycombio · Apr 7, 2021 · e12c928 · e12c928
1 parent 12d49fb
commit e12c928
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,10 +43,9 @@ workflows:
           matrix:
             parameters:
               go-version:
-                - "1.12"
-                - "1.13"
                 - "1.14"
                 - "1.15"
+                - "1.16"
   build:
     jobs:
       - test:

diff --git a/go.mod b/go.mod
@@ -19,9 +19,10 @@ require (
 	github.com/labstack/echo/v4 v4.2.1
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
-	github.com/stretchr/testify v1.6.1
-	go.opentelemetry.io/contrib/propagators v0.16.0
-	go.opentelemetry.io/otel v0.16.0
+	github.com/stretchr/testify v1.7.0
+	go.opentelemetry.io/contrib/propagators v0.18.0
+	go.opentelemetry.io/otel v0.18.0
+	go.opentelemetry.io/otel/trace v0.18.0
 	goji.io/v3 v3.0.0
 	google.golang.org/grpc v1.36.1
 	gopkg.in/yaml.v2 v2.3.0 // indirect

diff --git a/go.sum b/go.sum
@@ -338,6 +338,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
@@ -357,10 +359,16 @@ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
-go.opentelemetry.io/contrib/propagators v0.16.0 h1:6M16whHin+Uz2zMefuxmFG5CITQ2Q1CHnt2vKxWcQ+A=
-go.opentelemetry.io/contrib/propagators v0.16.0/go.mod h1:5kVVCrfVbGf6mu9Lk6DS91EDrkdneQdqUkJhmZXrOrA=
-go.opentelemetry.io/otel v0.16.0 h1:uIWEbdeb4vpKPGITLsRVUS44L5oDbDUCZxn8lkxhmgw=
-go.opentelemetry.io/otel v0.16.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA=
+go.opentelemetry.io/contrib/propagators v0.18.0 h1:9LxmzJYs2T4LhbzlFeOTN5h96t2I7K2Jher9gNNPnJc=
+go.opentelemetry.io/contrib/propagators v0.18.0/go.mod h1:SNtQQp2mFhV3CBjE1ZzXam/G4wct6QC64uaWV4SpR3s=
+go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8=
+go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78=
+go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY=
+go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE=
+go.opentelemetry.io/otel/oteltest v0.18.0 h1:FbKDFm/LnQDOHuGjED+fy3s5YMVg0z019GJ9Er66hYo=
+go.opentelemetry.io/otel/oteltest v0.18.0/go.mod h1:NyierCU3/G8DLTva7KRzGii2fdxdR89zXKH1bNWY7Bo=
+go.opentelemetry.io/otel/trace v0.18.0 h1:ilCfc/fptVKaDMK1vWk0elxpolurJbEgey9J6g6s+wk=
+go.opentelemetry.io/otel/trace v0.18.0/go.mod h1:FzdUu3BPwZSZebfQ1vl5/tAa8LyMLXSJN57AXIt/iDk=
 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/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=

diff --git a/propagation/w3c.go b/propagation/w3c.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/propagation"
 	"go.opentelemetry.io/otel/trace"
 )
@@ -129,7 +129,7 @@ func (os otelSpan) SetAttribute(k string, v interface{}) {
 }
 
 // SetAttributes does nothing. It exists to satisfy the trace.Span interface.
-func (os otelSpan) SetAttributes(attributes ...label.KeyValue) {
+func (os otelSpan) SetAttributes(attributes ...attribute.KeyValue) {
 	return
 }
 
@@ -154,7 +154,7 @@ func (os otelSpan) AddEvent(name string, options ...trace.EventOption) {
 }
 
 // AddEventWithTimestamp does nothing. It exists to satisfy the trace.Span interface.
-func (os otelSpan) AddEventWithTimestamp(ctx context.Context, timestamp time.Time, name string, attrs ...label.KeyValue) {
+func (os otelSpan) AddEventWithTimestamp(ctx context.Context, timestamp time.Time, name string, attrs ...attribute.KeyValue) {
 	return
 }
 
@@ -182,3 +182,13 @@ func (m supplier) Get(key string) string {
 func (m supplier) Set(key string, value string) {
 	m.values[key] = value
 }
+
+// Keys returns the keys for which this carrier has a value.
+func (m supplier) Keys() []string {
+	keys := make([]string, 0, len(m.values))
+
+	for k := range m.values {
+		keys = append(keys, k)
+	}
+	return keys
+}