Repository: lightstep/otel-launcher-go
Pull request #50 (2021-03-12 21:27:24)

Update dependencies to v0.18.0
Updating otel-go dependencies to 0.18.0


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06381c6..ca929a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Unreleased
 
 ### Changed
+- Update OpenTelemetry dependencies to 0.18.0
 - Update OpenTelemetry dependencies to 0.17.0
 
 ## 0.16.1
diff --git a/examples/metrics/metrics.go b/examples/metrics/metrics.go
index e3f5021..3714a2b 100644
--- a/examples/metrics/metrics.go
+++ b/examples/metrics/metrics.go
@@ -31,7 +31,7 @@ import (
 	"time"
 
 	"github.com/lightstep/otel-launcher-go/launcher"
-	"go.opentelemetry.io/otel/label"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/metric"
 	metricglobal "go.opentelemetry.io/otel/metric/global"
 )
@@ -90,9 +90,9 @@ func main() {
 		func(_ context.Context, result metric.Float64ObserverResult) {
 			secs := float64(time.Now().UnixNano()) / float64(time.Second)
 
-			result.Observe(math.Sin(secs/(200*math.Pi)), label.String("period", "fast"))
-			result.Observe(math.Sin(secs/(1000*math.Pi)), label.String("period", "regular"))
-			result.Observe(math.Sin(secs/(5000*math.Pi)), label.String("period", "slow"))
+			result.Observe(math.Sin(secs/(200*math.Pi)), attribute.String("period", "fast"))
+			result.Observe(math.Sin(secs/(1000*math.Pi)), attribute.String("period", "regular"))
+			result.Observe(math.Sin(secs/(5000*math.Pi)), attribute.String("period", "slow"))
 		},
 	)
 
diff --git a/examples/tracing/trace.go b/examples/tracing/trace.go
index 83ca3bf..1e6269e 100644
--- a/examples/tracing/trace.go
+++ b/examples/tracing/trace.go
@@ -25,7 +25,7 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/label"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/sdk/resource"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
@@ -68,15 +68,15 @@ func getSpan(ctx context.Context) {
 // example of adding an attribute to a span
 func addAttribute(ctx context.Context) {
 	span := trace.SpanFromContext(ctx)
-	span.SetAttributes(label.String("attr1", "value1"))
+	span.SetAttributes(attribute.String("attr1", "value1"))
 }
 
 // example of adding an event to a span
 func addEvent(ctx context.Context) {
 	span := trace.SpanFromContext(ctx)
-	span.AddEvent("event1", trace.WithAttributes([]label.KeyValue{
-		label.String("event-attr1", "event-string1"),
-		label.Int64("event-attr2", 10),
+	span.AddEvent("event1", trace.WithAttributes([]attribute.KeyValue{
+		attribute.String("event-attr1", "event-string1"),
+		attribute.Int64("event-attr2", 10),
 	}...))
 }
 
@@ -97,10 +97,10 @@ func createChild(ctx context.Context, tracer trace.Tracer) {
 // example of setting resource attributes
 func setResourceAttributes() {
 	host, _ := os.Hostname()
-	attributes := []label.KeyValue{
-		label.String(conventions.AttributeServiceName, "service123"),
-		label.String(conventions.AttributeServiceVersion, "1.2.3"),
-		label.String(conventions.AttributeHostName, host),
+	attributes := []attribute.KeyValue{
+		attribute.String(conventions.AttributeServiceName, "service123"),
+		attribute.String(conventions.AttributeServiceVersion, "1.2.3"),
+		attribute.String(conventions.AttributeHostName, host),
 	}
 	tp := sdktrace.NewTracerProvider(
 		sdktrace.WithResource(resource.NewWithAttributes(attributes...)),
@@ -111,8 +111,8 @@ func setResourceAttributes() {
 // example of setting baggage
 func setBaggage() {
 	ctx := baggage.ContextWithValues(context.Background(),
-		label.String("keyone", "foo1"),
-		label.String("keytwo", "bar1"),
+		attribute.String("keyone", "foo1"),
+		attribute.String("keytwo", "bar1"),
 	)
 
 	fmt.Printf("key keyone: %v\n", baggage.Value(ctx, "keyone"))
diff --git a/go.mod b/go.mod
index 53c87bc..6be783a 100644
--- a/go.mod
+++ b/go.mod
@@ -8,17 +8,17 @@ require (
 	github.com/shirou/gopsutil v3.20.12+incompatible // indirect
 	github.com/stretchr/testify v1.7.0
 	go.opentelemetry.io/collector v0.18.0
-	go.opentelemetry.io/contrib/instrumentation/host v0.17.0
-	go.opentelemetry.io/contrib/instrumentation/runtime v0.17.0
-	go.opentelemetry.io/contrib/propagators v0.17.0
-	go.opentelemetry.io/otel v0.17.0
-	go.opentelemetry.io/otel/exporters/otlp v0.17.0
-	go.opentelemetry.io/otel/metric v0.17.0
-	go.opentelemetry.io/otel/sdk v0.17.0
-	go.opentelemetry.io/otel/sdk/metric v0.17.0
-	go.opentelemetry.io/otel/trace v0.17.0
+	go.opentelemetry.io/contrib/instrumentation/host v0.18.0
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.18.0
+	go.opentelemetry.io/contrib/propagators v0.18.0
+	go.opentelemetry.io/otel v0.18.0
+	go.opentelemetry.io/otel/exporters/otlp v0.18.0
+	go.opentelemetry.io/otel/metric v0.18.0
+	go.opentelemetry.io/otel/sdk v0.18.0
+	go.opentelemetry.io/otel/sdk/metric v0.18.0
+	go.opentelemetry.io/otel/trace v0.18.0
 	golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
 	golang.org/x/sys v0.0.0-20210123111255-9b0068b26619 // indirect
 	google.golang.org/genproto v0.0.0-20210122163508-8081c04a3579 // indirect
-	google.golang.org/grpc v1.35.0
+	google.golang.org/grpc v1.36.0
 )
diff --git a/go.sum b/go.sum
index f939c69..1b20642 100644
--- a/go.sum
+++ b/go.sum
@@ -798,7 +798,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 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=
@@ -850,30 +849,30 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opentelemetry.io/collector v0.18.0 h1:Y9f40zmV5gfIuyy8CHujW0vdBpCYs7d10GAyFGBhs+U=
 go.opentelemetry.io/collector v0.18.0/go.mod h1:AtTlgj8BFatJAkL4+2lM5+DkK7tqHzjeci6rB97HbhQ=
-go.opentelemetry.io/contrib v0.17.0 h1:F9qs5F/A+BF7wvN9pXNHs67bsEyq0cCCwockpVJ1URk=
-go.opentelemetry.io/contrib v0.17.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
-go.opentelemetry.io/contrib/instrumentation/host v0.17.0 h1:+zerUAqRUUwRI/9XVXZJb54IuYSFrlyYYpKxISYM2e8=
-go.opentelemetry.io/contrib/instrumentation/host v0.17.0/go.mod h1:HsdFfBFdE+RXGitdRmq9MFvGfHdvkpirBy80XZ+H19s=
-go.opentelemetry.io/contrib/instrumentation/runtime v0.17.0 h1:I0ZechaMABQG5aUE4toVqQ+EcYf3QBLGGgJ03xlLp5k=
-go.opentelemetry.io/contrib/instrumentation/runtime v0.17.0/go.mod h1:KlSzJIvPsq63RdpQ7wEGLDEh5hYCpfFUsdBWUtWgfSE=
-go.opentelemetry.io/contrib/propagators v0.17.0 h1:RF/Zw9963kzKbxA9Ev7KQ9a3tw5LefqO0ZtANtlD/HA=
-go.opentelemetry.io/contrib/propagators v0.17.0/go.mod h1:b5jP8CtexBTADTeieiUpqQ/SV1IblFEIQYTNvmQavyc=
-go.opentelemetry.io/otel v0.17.0 h1:6MKOu8WY4hmfpQ4oQn34u6rYhnf2sWf1LXYO/UFm71U=
-go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s=
-go.opentelemetry.io/otel/exporters/otlp v0.17.0 h1:XLRaBlDNyLY+QlE4CDIJG+p90grYxNznbufFGphqJtE=
-go.opentelemetry.io/otel/exporters/otlp v0.17.0/go.mod h1:yf9oXQ8NaX2VgZmRvJjdYG+M4nVRdCBwxTeLGACg0c8=
-go.opentelemetry.io/otel/metric v0.17.0 h1:t+5EioN8YFXQ2EH+1j6FHCKMUj+57zIDSnSGr/mWuug=
-go.opentelemetry.io/otel/metric v0.17.0/go.mod h1:hUz9lH1rNXyEwWAhIWCMFWKhYtpASgSnObJFnU26dJ0=
-go.opentelemetry.io/otel/oteltest v0.17.0 h1:TyAihUowTDLqb4+m5ePAsR71xPJaTBJl4KDArIdi9k4=
-go.opentelemetry.io/otel/oteltest v0.17.0/go.mod h1:JT/LGFxPwpN+nlsTiinSYjdIx3hZIGqHCpChcIZmdoE=
-go.opentelemetry.io/otel/sdk v0.17.0 h1:eHXQwanmbtSHM/GcJYbJ8FyyH/sT9a0e+1Z9ZWkF7Ug=
-go.opentelemetry.io/otel/sdk v0.17.0/go.mod h1:INs1PePjjF2hf842AXsxGTe5lH023QfLTZRFPiV/RUk=
-go.opentelemetry.io/otel/sdk/export/metric v0.17.0 h1:RKOa26LDq4JBRwUnWwY64ccc27v1rA20z0q71aq4WFs=
-go.opentelemetry.io/otel/sdk/export/metric v0.17.0/go.mod h1:G9SxRFvGmGpdmJ8TEXnTEnnRuR5p3cg/tRvWkA/XHvo=
-go.opentelemetry.io/otel/sdk/metric v0.17.0 h1:l9W/OcHwyq3ZPqk4V6OS5ED50z9A6yI8N9gWeKS7zAY=
-go.opentelemetry.io/otel/sdk/metric v0.17.0/go.mod h1:zAX55SrmDMpZwfQrz1PKIPbCP5beU+JPQTfNko01deo=
-go.opentelemetry.io/otel/trace v0.17.0 h1:SBOj64/GAOyWzs5F680yW1ITIfJkm6cJWL2YAvuL9xY=
-go.opentelemetry.io/otel/trace v0.17.0/go.mod h1:bIujpqg6ZL6xUTubIUgziI1jSaUPthmabA/ygf/6Cfg=
+go.opentelemetry.io/contrib v0.18.0 h1:uqBh0brileIvG6luvBjdxzoFL8lxDGuhxJWsvK3BveI=
+go.opentelemetry.io/contrib v0.18.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc=
+go.opentelemetry.io/contrib/instrumentation/host v0.18.0 h1:Yc0vXo6fLfYPTFe2UCUqzHn8fbSMkEh0THt67E/Sxto=
+go.opentelemetry.io/contrib/instrumentation/host v0.18.0/go.mod h1:odl6q+f2Dz/fzKnp2dOOJPBoVaEA6HNlK2GMeGaXUWo=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.18.0 h1:jR/LN3VhLVDJocVofmyWaMIjKViE3Fd7rkVf4J23Zps=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.18.0/go.mod h1:G836dpLZVQdc1xwDiaglbI7ehCCvfCv51NGYNkbp8Uc=
+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/exporters/otlp v0.18.0 h1:mRsntnUe1FjGSkLXDYRufa5F0ofs4idyZDrrc4TIkfI=
+go.opentelemetry.io/otel/exporters/otlp v0.18.0/go.mod h1:MXL3kW65kZDllGxuuaKZyWYuk2jmf1/E4CtXb6iyVyI=
+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/sdk v0.18.0 h1:/UiFHiJxJyEoUN2tQ6l+5f0/P01V0G9YuHeVarktRDw=
+go.opentelemetry.io/otel/sdk v0.18.0/go.mod h1:nT+UdAeGQWSeTnz9vY8BBq7SEGpmWAetyo/xHUcQvxo=
+go.opentelemetry.io/otel/sdk/export/metric v0.18.0 h1:0CP4KxCGeaVO2l69NNzRCULaaGiW6UGPDSF/b6gRqDs=
+go.opentelemetry.io/otel/sdk/export/metric v0.18.0/go.mod h1:CFUAd+HdaQT3efTnVFYaXXp56b6bFUqkck4iRB9wu0g=
+go.opentelemetry.io/otel/sdk/metric v0.18.0 h1:16ryqzWeYMl6uzwz7or3IQlCDf366Ppfm50215Mte5I=
+go.opentelemetry.io/otel/sdk/metric v0.18.0/go.mod h1:NY9c56grMpjqdaYvOFon8nnsgMPBaXpde5SO1ulDyCo=
+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/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
@@ -1263,8 +1262,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
 google.golang.org/grpc v1.34.1/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
 google.golang.org/grpc/examples v0.0.0-20200728065043-dfc0c05b2da9/go.mod h1:5j1uub0jRGhRiSghIlrThmBUgcgLXOVJQ/l1getT4uo=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
diff --git a/launcher/config.go b/launcher/config.go
index 8e5ce76..59eae7b 100644
--- a/launcher/config.go
+++ b/launcher/config.go
@@ -29,9 +29,9 @@ import (
 	runtimeMetrics "go.opentelemetry.io/contrib/instrumentation/runtime"
 	"go.opentelemetry.io/contrib/propagators/b3"
 	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/otlp"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpgrpc"
-	"go.opentelemetry.io/otel/label"
 	metricglobal "go.opentelemetry.io/otel/metric/global"
 	"go.opentelemetry.io/otel/propagation"
 	controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
@@ -310,18 +310,18 @@ func newResource(c *Config) *resource.Resource {
 		os.Unsetenv("OTEL_RESOURCE_LABELS")
 	}
 
-	attributes := []label.KeyValue{
-		label.String(conventions.AttributeTelemetrySDKName, "launcher"),
-		label.String(conventions.AttributeTelemetrySDKLanguage, "go"),
-		label.String(conventions.AttributeTelemetrySDKVersion, version),
+	attributes := []attribute.KeyValue{
+		attribute.String(conventions.AttributeTelemetrySDKName, "launcher"),
+		attribute.String(conventions.AttributeTelemetrySDKLanguage, "go"),
+		attribute.String(conventions.AttributeTelemetrySDKVersion, version),
 	}
 
 	if len(c.ServiceName) > 0 {
-		attributes = append(attributes, label.String(conventions.AttributeServiceName, c.ServiceName))
+		attributes = append(attributes, attribute.String(conventions.AttributeServiceName, c.ServiceName))
 	}
 
 	if len(c.ServiceVersion) > 0 {
-		attributes = append(attributes, label.String(conventions.AttributeServiceVersion, c.ServiceVersion))
+		attributes = append(attributes, attribute.String(conventions.AttributeServiceVersion, c.ServiceVersion))
 	}
 
 	for key, value := range c.resourceAttributes {
@@ -329,7 +329,7 @@ func newResource(c *Config) *resource.Resource {
 			if key == conventions.AttributeHostName {
 				hostnameSet = true
 			}
-			attributes = append(attributes, label.String(key, value))
+			attributes = append(attributes, attribute.String(key, value))
 		}
 	}
 
@@ -338,7 +338,7 @@ func newResource(c *Config) *resource.Resource {
 		if err != nil {
 			c.logger.Debugf("unable to set host.name. Set OTEL_RESOURCE_ATTRIBUTES=\"host.name=<your_host_name>\" env var or configure WithResourceAttributes in code: %v", err)
 		} else {
-			attributes = append(attributes, label.String(conventions.AttributeHostName, hostname))
+			attributes = append(attributes, attribute.String(conventions.AttributeHostName, hostname))
 		}
 	}
 


Test patch:
diff --git a/launcher/config_test.go b/launcher/config_test.go
index a252e33..bdbdcce 100644
--- a/launcher/config_test.go
+++ b/launcher/config_test.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/baggage"
-	"go.opentelemetry.io/otel/label"
 	"go.opentelemetry.io/otel/sdk/resource"
 )
 
@@ -296,12 +296,12 @@ func TestDefaultConfig(t *testing.T) {
 		WithErrorHandler(handler),
 	)
 
-	attributes := []label.KeyValue{
-		label.String("host.name", host()),
-		label.String("service.version", "unknown"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.version", version),
+	attributes := []attribute.KeyValue{
+		attribute.String("host.name", host()),
+		attribute.String("service.version", "unknown"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 
 	expected := Config{
@@ -332,13 +332,13 @@ func TestEnvironmentVariables(t *testing.T) {
 		WithErrorHandler(handler),
 	)
 
-	attributes := []label.KeyValue{
-		label.String("host.name", host()),
-		label.String("service.name", "test-service-name"),
-		label.String("service.version", "test-service-version"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.version", version),
+	attributes := []attribute.KeyValue{
+		attribute.String("host.name", host()),
+		attribute.String("service.name", "test-service-name"),
+		attribute.String("service.version", "test-service-version"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 
 	expected := Config{
@@ -379,13 +379,13 @@ func TestConfigurationOverrides(t *testing.T) {
 		WithPropagators([]string{"b3"}),
 	)
 
-	attributes := []label.KeyValue{
-		label.String("host.name", host()),
-		label.String("service.name", "override-service-name"),
-		label.String("service.version", "override-service-version"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.version", version),
+	attributes := []attribute.KeyValue{
+		attribute.String("host.name", host()),
+		attribute.String("service.name", "override-service-name"),
+		attribute.String("service.version", "override-service-version"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 
 	expected := Config{
@@ -410,6 +410,14 @@ type TestCarrier struct {
 	values map[string]string
 }
 
+func (t TestCarrier) Keys() []string {
+	keys := make([]string, 0, len(t.values))
+	for k := range t.values {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
 func (t TestCarrier) Get(key string) string {
 	return t.values[key]
 }
@@ -420,8 +428,8 @@ func (t TestCarrier) Set(key string, value string) {
 
 func TestConfigurePropagators(t *testing.T) {
 	ctx := baggage.ContextWithValues(context.Background(),
-		label.String("keyone", "foo1"),
-		label.String("keytwo", "bar1"),
+		attribute.String("keyone", "foo1"),
+		attribute.String("keytwo", "bar1"),
 	)
 	unsetEnvironment()
 	logger := &testLogger{}
@@ -483,15 +491,15 @@ func TestConfigureResourcesAttributes(t *testing.T) {
 		ServiceVersion: "test-version",
 	}
 	resource := newResource(&config)
-	expected := []label.KeyValue{
-		label.String("host.name", host()),
-		label.String("label1", "value1"),
-		label.String("label2", "value2"),
-		label.String("service.name", "test-service"),
-		label.String("service.version", "test-version"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.version", version),
+	expected := []attribute.KeyValue{
+		attribute.String("host.name", host()),
+		attribute.String("label1", "value1"),
+		attribute.String("label2", "value2"),
+		attribute.String("service.name", "test-service"),
+		attribute.String("service.version", "test-version"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 	assert.Equal(t, expected, resource.Attributes())
 
@@ -501,13 +509,13 @@ func TestConfigureResourcesAttributes(t *testing.T) {
 		ServiceVersion: "test-version",
 	}
 	resource = newResource(&config)
-	expected = []label.KeyValue{
-		label.String("host.name", host()),
-		label.String("service.name", "test-service"),
-		label.String("service.version", "test-version"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.version", version),
+	expected = []attribute.KeyValue{
+		attribute.String("host.name", host()),
+		attribute.String("service.name", "test-service"),
+		attribute.String("service.version", "test-version"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 	assert.Equal(t, expected, resource.Attributes())
 
@@ -517,13 +525,13 @@ func TestConfigureResourcesAttributes(t *testing.T) {
 		ServiceVersion: "test-version",
 	}
 	resource = newResource(&config)
-	expected = []label.KeyValue{
-		label.String("host.name", "host123"),
-		label.String("service.name", "test-service-b"),
-		label.String("service.version", "test-version"),
-		label.String("telemetry.sdk.language", "go"),
-		label.String("telemetry.sdk.name", "launcher"),
-		label.String("telemetry.sdk.version", version),
+	expected = []attribute.KeyValue{
+		attribute.String("host.name", "host123"),
+		attribute.String("service.name", "test-service-b"),
+		attribute.String("service.version", "test-version"),
+		attribute.String("telemetry.sdk.language", "go"),
+		attribute.String("telemetry.sdk.name", "launcher"),
+		attribute.String("telemetry.sdk.version", version),
 	}
 	assert.Equal(t, expected, resource.Attributes())
 }