Update to v1.0.0-RC1

CHANGELOG.md

@@ -8,6 +8,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## Unreleased
 
+## [1.0.0-RC1](https://github.com/lightstep/otel-launcher-go/releases/tag/v1.0.0-RC1) - 2021-06-21
+
+### Changed
+- Update OpenTelemetry tracing dependencies to 1.0.0-RC1
+- Update OpenTelemetry metrics dependencies to 0.21.0
+- Remove support for deprecated `OTEL_RESOURCE_LABELS` environment variable, as
+  it has been replaced by `OTEL_RESOURCE_ATTRIBUTES` upstream.
+
 ## [0.20.0](https://github.com/lightstep/otel-launcher-go/releases/tag/v0.20.0) - 2021-05-10
 
 ### Changed

Makefile

@@ -30,7 +30,7 @@ ifeq ($(UNAME_S),Darwin)
 	endif
 endif
 
-GOTEST_MIN = go test -v -timeout 30s
+GOTEST_MIN = go test -v -timeout 60s
 GOTEST = $(GOTEST_MIN) -race
 GOTEST_WITH_COVERAGE = $(GOTEST) -coverprofile=coverage.txt -covermode=atomic -coverpkg=./...
 
@@ -163,4 +163,4 @@ endif
 
 release_tag:
 	git tag v`cat ./VERSION`
-	git push origin v`cat ./VERSION`
+	git push origin v`cat ./VERSION`

examples/tracing/trace.go

@@ -18,21 +18,25 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"os"
 
 	"github.com/lightstep/otel-launcher-go/launcher"
-	"go.opentelemetry.io/collector/translator/conventions"
 	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/baggage"
 	"go.opentelemetry.io/otel/codes"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/sdk/resource"
-	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	"go.opentelemetry.io/otel/trace"
 )
 
 func main() {
-	lsLauncher := launcher.ConfigureOpentelemetry()
+	attributes := map[string]string{
+		"book.condition": "good",
+		"book.category":  "science",
+	}
+
+	lsLauncher := launcher.ConfigureOpentelemetry(
+		// example for setting resource attributes:
+		launcher.WithResourceAttributes(attributes),
+	)
 	defer lsLauncher.Shutdown()
 	tracer := otel.Tracer("ex.com/basic")
 
@@ -44,7 +48,7 @@ func main() {
 	ctx2, finish2 := tracer.Start(ctx1, "bar")
 	defer finish2.End()
 
-	ctx3, finish3 := tracer.Start(ctx2, "baz")
+	ctx3, finish3 := tracer.Start(setBaggage(ctx2), "baz")
 	defer finish3.End()
 
 	ctx := ctx3
@@ -53,16 +57,14 @@ func main() {
 	addEvent(ctx)
 	recordException(ctx)
 	createChild(ctx, tracer)
-	setResourceAttributes()
-	setBaggage()
 
 	fmt.Println("OpenTelemetry example")
 }
 
 // example of getting the current span
 func getSpan(ctx context.Context) {
 	span := trace.SpanFromContext(ctx)
-	fmt.Printf("current span: %v\n", span)
+	fmt.Printf("current span: %v\n", span.SpanContext().SpanID())
 }
 
 // example of adding an attribute to a span
@@ -91,30 +93,14 @@ func recordException(ctx context.Context) {
 func createChild(ctx context.Context, tracer trace.Tracer) {
 	_, childSpan := tracer.Start(ctx, "child")
 	defer childSpan.End()
-	fmt.Printf("child span: %v\n", childSpan)
-}
-
-// example of setting resource attributes
-func setResourceAttributes() {
-	host, _ := os.Hostname()
-	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...)),
-	)
-	otel.SetTracerProvider(tp)
+	fmt.Printf("child span: %v\n", childSpan.SpanContext().SpanID())
 }
 
 // example of setting baggage
-func setBaggage() {
-	ctx := baggage.ContextWithValues(context.Background(),
-		attribute.String("keyone", "foo1"),
-		attribute.String("keytwo", "bar1"),
-	)
+func setBaggage(ctx context.Context) context.Context {
+	mem1, _ := baggage.NewMember("keyone", "foo1")
+	mem2, _ := baggage.NewMember("keytwo", "bar1")
+	bag, _ := baggage.New(mem1, mem2)
 
-	fmt.Printf("key keyone: %v\n", baggage.Value(ctx, "keyone"))
-	fmt.Printf("key keytwo: %v\n", baggage.Value(ctx, "keytwo"))
+	return baggage.ContextWithBaggage(ctx, bag)
 }

go.mod

@@ -3,22 +3,20 @@ module github.com/lightstep/otel-launcher-go
 go 1.14
 
 require (
-	github.com/go-ole/go-ole v1.2.5 // indirect
 	github.com/sethvargo/go-envconfig v0.3.2
-	github.com/shirou/gopsutil v3.20.12+incompatible // indirect
 	github.com/stretchr/testify v1.7.0
-	go.opentelemetry.io/collector v0.20.0
-	go.opentelemetry.io/contrib/instrumentation/host v0.20.0
-	go.opentelemetry.io/contrib/instrumentation/runtime v0.20.0
-	go.opentelemetry.io/contrib/propagators v0.20.0
-	go.opentelemetry.io/otel v0.20.0
-	go.opentelemetry.io/otel/exporters/otlp v0.20.0
-	go.opentelemetry.io/otel/metric v0.20.0
-	go.opentelemetry.io/otel/sdk v0.20.0
-	go.opentelemetry.io/otel/sdk/metric v0.20.0
-	go.opentelemetry.io/otel/trace v0.20.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.37.0
+	go.opentelemetry.io/collector v0.28.0
+	go.opentelemetry.io/contrib/instrumentation/host v0.21.0
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.21.0
+	go.opentelemetry.io/contrib/propagators v0.21.0
+	go.opentelemetry.io/otel v1.0.0-RC1
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.21.0
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.21.0
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.0-RC1
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.0-RC1
+	go.opentelemetry.io/otel/metric v0.21.0
+	go.opentelemetry.io/otel/sdk v1.0.0-RC1
+	go.opentelemetry.io/otel/sdk/metric v0.21.0
+	go.opentelemetry.io/otel/trace v1.0.0-RC1
+	google.golang.org/grpc v1.38.0
 )