Merge pull request #6787 from concourse/bump-otel

Bump opentelemetry to 0.19.0
concourse · Apr 15, 2021 · 2ee85a6 · 2ee85a6
2 parents 22f2b4b + b543052
commit 2ee85a6
Show file tree

Hide file tree

Showing 48 changed files with 345 additions and 1,606 deletions.
diff --git a/atc/db/build.go b/atc/db/build.go
@@ -14,7 +14,7 @@ import (
 	"github.com/concourse/concourse/atc/creds"
 	"github.com/concourse/concourse/vars"
 	"github.com/lib/pq"
-	"go.opentelemetry.io/otel/api/propagation"
+	"go.opentelemetry.io/otel/propagation"
 
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/db/encryption"
@@ -39,7 +39,7 @@ type BuildInput struct {
 	Context SpanContext
 }
 
-func (bi BuildInput) SpanContext() propagation.HTTPSupplier {
+func (bi BuildInput) SpanContext() propagation.TextMapCarrier {
 	return bi.Context
 }
 
@@ -194,7 +194,7 @@ type Build interface {
 	IsDrained() bool
 	SetDrained(bool) error
 
-	SpanContext() propagation.HTTPSupplier
+	SpanContext() propagation.TextMapCarrier
 
 	SavePipeline(
 		pipelineRef atc.PipelineRef,
@@ -1699,7 +1699,7 @@ func (b *build) Resources() ([]BuildInput, []BuildOutput, error) {
 	return inputs, outputs, nil
 }
 
-func (b *build) SpanContext() propagation.HTTPSupplier {
+func (b *build) SpanContext() propagation.TextMapCarrier {
 	return b.spanContext
 }
 

diff --git a/atc/db/dbfakes/fake_build.go b/atc/db/dbfakes/fake_build.go
diff --git a/atc/db/dbfakes/fake_resource_config_version.go b/atc/db/dbfakes/fake_resource_config_version.go
diff --git a/atc/db/job_test.go b/atc/db/job_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/concourse/concourse/tracing"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"go.opentelemetry.io/otel/api/trace/tracetest"
+	"go.opentelemetry.io/otel/oteltest"
 )
 
 var _ = Describe("Job", func() {
@@ -1941,7 +1941,7 @@ var _ = Describe("Job", func() {
 
 			Context("when tracing is configured", func() {
 				BeforeEach(func() {
-					tracing.ConfigureTraceProvider(tracetest.NewProvider())
+					tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
 				})
 
 				AfterEach(func() {
@@ -1950,7 +1950,7 @@ var _ = Describe("Job", func() {
 
 				It("propagates span context", func() {
 					ctx, span := tracing.StartSpan(context.Background(), "fake-operation", nil)
-					traceID := span.SpanContext().TraceID.String()
+					traceID := span.SpanContext().TraceID().String()
 
 					job.EnsurePendingBuildExists(ctx)
 

diff --git a/atc/db/resource_config_version.go b/atc/db/resource_config_version.go
@@ -6,7 +6,7 @@ import (
 
 	sq "github.com/Masterminds/squirrel"
 	"github.com/concourse/concourse/atc"
-	"go.opentelemetry.io/otel/api/propagation"
+	"go.opentelemetry.io/otel/propagation"
 )
 
 //go:generate counterfeiter . ResourceConfigVersion
@@ -16,7 +16,7 @@ type ResourceConfigVersion interface {
 	Version() Version
 	Metadata() ResourceConfigMetadataFields
 	CheckOrder() int
-	SpanContext() propagation.HTTPSupplier
+	SpanContext() propagation.TextMapCarrier
 
 	Reload() (bool, error)
 }
@@ -79,7 +79,7 @@ func (r *resourceConfigVersion) ID() int                                { return
 func (r *resourceConfigVersion) Version() Version                       { return r.version }
 func (r *resourceConfigVersion) Metadata() ResourceConfigMetadataFields { return r.metadata }
 func (r *resourceConfigVersion) CheckOrder() int                        { return r.checkOrder }
-func (r *resourceConfigVersion) SpanContext() propagation.HTTPSupplier {
+func (r *resourceConfigVersion) SpanContext() propagation.TextMapCarrier {
 	return r.spanContext
 }
 

diff --git a/atc/db/resource_test.go b/atc/db/resource_test.go
@@ -12,8 +12,8 @@ import (
 	"github.com/concourse/concourse/tracing"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"go.opentelemetry.io/otel/api/trace"
-	"go.opentelemetry.io/otel/api/trace/tracetest"
+	"go.opentelemetry.io/otel/oteltest"
+	"go.opentelemetry.io/otel/trace"
 )
 
 var _ = Describe("Resource", func() {
@@ -520,7 +520,7 @@ var _ = Describe("Resource", func() {
 			var span trace.Span
 
 			BeforeEach(func() {
-				tracing.ConfigureTraceProvider(tracetest.NewProvider())
+				tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
 
 				ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
 			})
@@ -530,7 +530,7 @@ var _ = Describe("Resource", func() {
 			})
 
 			It("propagates span context", func() {
-				traceID := span.SpanContext().TraceID.String()
+				traceID := span.SpanContext().TraceID().String()
 				buildContext := build.SpanContext()
 				traceParent := buildContext.Get("traceparent")
 				Expect(traceParent).To(ContainSubstring(traceID))

diff --git a/atc/db/resource_type_test.go b/atc/db/resource_type_test.go
@@ -11,8 +11,8 @@ import (
 	"github.com/concourse/concourse/tracing"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	"go.opentelemetry.io/otel/api/trace"
-	"go.opentelemetry.io/otel/api/trace/tracetest"
+	"go.opentelemetry.io/otel/oteltest"
+	"go.opentelemetry.io/otel/trace"
 )
 
 var _ = Describe("ResourceType", func() {
@@ -563,7 +563,7 @@ var _ = Describe("ResourceType", func() {
 			var span trace.Span
 
 			BeforeEach(func() {
-				tracing.ConfigureTraceProvider(tracetest.NewProvider())
+				tracing.ConfigureTraceProvider(oteltest.NewTracerProvider())
 
 				ctx, span = tracing.StartSpan(context.Background(), "fake-operation", nil)
 			})
@@ -573,7 +573,7 @@ var _ = Describe("ResourceType", func() {
 			})
 
 			It("propagates span context", func() {
-				traceID := span.SpanContext().TraceID.String()
+				traceID := span.SpanContext().TraceID().String()
 				buildContext := build.SpanContext()
 				traceParent := buildContext.Get("traceparent")
 				Expect(traceParent).To(ContainSubstring(traceID))

diff --git a/atc/db/span_context.go b/atc/db/span_context.go
@@ -26,3 +26,14 @@ func (sc SpanContext) Set(key, value string) {
 		sc[key] = value
 	}
 }
+
+func (sc SpanContext) Keys() []string {
+	if sc == nil {
+		return nil
+	}
+	keys := make([]string, 0, len(sc))
+	for key := range sc {
+		keys = append(keys, key)
+	}
+	return keys
+}
diff --git a/atc/db/versions_db.go b/atc/db/versions_db.go
@@ -13,8 +13,8 @@ import (
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/tracing"
 	gocache "github.com/patrickmn/go-cache"
-	"go.opentelemetry.io/otel/api/trace"
-	"go.opentelemetry.io/otel/label"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 type VersionsDB struct {
@@ -583,7 +583,7 @@ func (versions VersionsDB) migrateSingle(ctx context.Context, buildID int) (stri
 	ctx, span := tracing.StartSpan(ctx, "VersionsDB.migrateSingle", tracing.Attrs{})
 	defer span.End()
 
-	span.SetAttributes(label.Int("buildID", buildID))
+	span.SetAttributes(attribute.Int("buildID", buildID))
 
 	var outputs string
 	err := versions.conn.QueryRowContext(ctx, `
@@ -622,7 +622,7 @@ func (versions VersionsDB) migrateSingle(ctx context.Context, buildID int) (stri
 		return "", err
 	}
 
-	span.AddEvent(ctx, "build migrated")
+	span.AddEvent("build migrated")
 
 	return outputs, nil
 }
@@ -745,7 +745,7 @@ func (bs *PaginatedBuilds) migrateLimit(ctx context.Context) (bool, error) {
 	ctx, span := tracing.StartSpan(ctx, "PaginatedBuilds.migrateLimit", tracing.Attrs{})
 	defer span.End()
 
-	span.SetAttributes(label.Int("jobID", bs.jobID))
+	span.SetAttributes(attribute.Int("jobID", bs.jobID))
 
 	buildsToMigrateQueryBuilder := psql.Select("id", "job_id", "rerun_of").
 		From("builds").
@@ -802,9 +802,8 @@ func (bs *PaginatedBuilds) migrateLimit(ctx context.Context) (bool, error) {
 	}
 
 	trace.SpanFromContext(ctx).AddEvent(
-		ctx,
 		"builds migrated",
-		label.Int64("rows", rowsAffected),
+		trace.WithAttributes(attribute.Int64("rows", rowsAffected)),
 	)
 
 	if rowsAffected == 0 {

diff --git a/atc/engine/build_step_delegate.go b/atc/engine/build_step_delegate.go
@@ -19,7 +19,7 @@ import (
 	"github.com/concourse/concourse/atc/policy"
 	"github.com/concourse/concourse/atc/worker"
 	"github.com/concourse/concourse/tracing"
-	"go.opentelemetry.io/otel/api/trace"
+	"go.opentelemetry.io/otel/trace"
 )
 
 type buildStepDelegate struct {

diff --git a/atc/exec/build_step_delegate.go b/atc/exec/build_step_delegate.go
@@ -5,7 +5,7 @@ import (
 	"io"
 
 	"code.cloudfoundry.org/lager"
-	"go.opentelemetry.io/otel/api/trace"
+	"go.opentelemetry.io/otel/trace"
 
 	"github.com/concourse/concourse/atc"
 	"github.com/concourse/concourse/atc/worker"