Add scheme

client/opentelemetry.go

@@ -67,23 +67,26 @@ func (t *openTelemetryTransport) Submit(op *runtime.ClientOperation) (interface{
 
 func createOpenTelemetryClientSpan(op *runtime.ClientOperation, _ http.Header, host string, opts []trace.SpanStartOption) trace.Span {
 	ctx := op.Context
-	span := trace.SpanFromContext(ctx)
-
-	if span != nil {
+	if span := trace.SpanFromContext(ctx); span.IsRecording() {
 		// TODO: Can we get the version number for use with trace.WithInstrumentationVersion?
 		tracer := otel.GetTracerProvider().Tracer("")
 
 		ctx, span = tracer.Start(ctx, operationName(op), opts...)
 		op.Context = ctx
 
+		//TODO: There's got to be a better way to do this without the request, right?
+		var scheme string
+		if len(op.Schemes) == 1 {
+			scheme = op.Schemes[0]
+		}
+
 		span.SetAttributes(
 			attribute.String("net.peer.name", host),
 			// attribute.String("net.peer.port", ""),
 			attribute.String(string(semconv.HTTPRouteKey), op.PathPattern),
 			attribute.String(string(semconv.HTTPMethodKey), op.Method),
 			attribute.String("span.kind", trace.SpanKindClient.String()),
-			//TODO: Figure out the best way to get the scheme?
-			attribute.String("http.scheme", op.Schemes[0]),
+			attribute.String("http.scheme", scheme),
 		)
 
 		return span

client/opentelemetry_test.go

@@ -7,7 +7,6 @@ import (
 	"github.com/go-openapi/runtime"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"

client/runtime.go

@@ -31,13 +31,14 @@ import (
 	"sync"
 	"time"
 
+	"github.com/opentracing/opentracing-go"
+	"go.opentelemetry.io/otel/trace"
+
 	"github.com/go-openapi/runtime"
 	"github.com/go-openapi/runtime/logger"
 	"github.com/go-openapi/runtime/middleware"
 	"github.com/go-openapi/runtime/yamlpc"
 	"github.com/go-openapi/strfmt"
-	"github.com/opentracing/opentracing-go"
-	"go.opentelemetry.io/otel/trace"
 )
 
 // TLSClientOptions to configure client authentication with mutual TLS