first working version of spans + httptraces

.github/workflows/releaser.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@268d8c0ca0432bb2cf416faae41297df9d262d7f # pin@v3
         with:
-          go-version: '1.19.3'
+          go-version: '1.19.4'
       - name: Log in to Docker Hub
         uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # pin@f054a8b539a109f9f41c372932f1ae047eff08c9
         with:

.goreleaser.yaml

@@ -79,7 +79,7 @@ brews:
 
     # Template of your app's description.
     # Default is empty.
-    description: "TLS ingress reverse proxy and multiplexer with autocert and simple routing rules"
+    description: "Fortio + open telemetry tracing"
 
     # SPDX identifier of your app's license.
     # Default is empty.

README.md

@@ -7,7 +7,7 @@
 using golang 1.18+
 
 ```shell
-go install github.com/fortio/fortiotel@latest
+go install fortio.org/fortiotel@latest
 ```
 
 You can also download one of the many binary [releases](https://github.com/fortio/fortiotel/releases)
@@ -23,13 +23,15 @@ docker run -p 16686:16686 -p 4317:4317 jaegertracing/all-in-one:latest --collect
 
 Run fortio server and then for instance:
 ```
-go run . load localhost:8080
+OTEL_SERVICE_NAME=fortio go run . load localhost:8080
 ```
 
-Get disjoint traces (for now): http://localhost:16686/search
+Get traces: http://localhost:16686/search
 
 # Documentation
 
-Loosely based on
+Initially loosely based on
 
 https://github.com/open-telemetry/opentelemetry-go-contrib/tree/main/instrumentation/net/http/httptrace/otelhttptrace
+
+(which doesn't work without an outer span setup first in the context, see [simple/](simple/))

fortio_with_otel.go

@@ -18,6 +18,8 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"net/http/httptrace"
+	"time"
 
 	"fortio.org/fortio/cli"
 	"fortio.org/fortio/fhttp"
@@ -28,6 +30,7 @@ import (
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // changeDefaults sets some flags to true by default instead of false.
@@ -65,9 +68,41 @@ func installExportPipeline(ctx context.Context) (func(context.Context) error, er
 
 var shutdown func(context.Context) error
 
+type OtelLogger struct {
+	tracer trace.Tracer
+}
+
+type OtelSpan struct {
+}
+
+// Before each Run().
+func (o *OtelLogger) Start(ctx context.Context, threadID periodic.ThreadID, iter int64, startTime time.Time) context.Context {
+	ctx, span := o.tracer.Start(ctx, fmt.Sprintf("run %d", threadID))
+	return context.WithValue(ctx, OtelSpan{}, span)
+}
+
+// Report logs a single request to a file.
+func (o *OtelLogger) Report(ctx context.Context, thread periodic.ThreadID, iter int64, startTime time.Time, latency float64, status bool, details string) {
+	span := ctx.Value(OtelSpan{}).(trace.Span)
+	span.End()
+}
+
+// Info is used to print information about the logger.
+func (o *OtelLogger) Info() string {
+	return "otel"
+}
+
+func CreateTrace(ctx context.Context) *httptrace.ClientTrace {
+	return otelhttptrace.NewClientTrace(ctx)
+}
+
 func hook(ho *fhttp.HTTPOptions, ro *periodic.RunnerOptions) {
 	ctx := context.Background()
-	ho.ClientTrace = otelhttptrace.NewClientTrace(ctx)
+	o := OtelLogger{
+		tracer: otel.Tracer("fortio.org/fortio"),
+	}
+	ro.AccessLogger = &o
+	ho.ClientTrace = CreateTrace
 	// Registers a tracer Provider globally.
 	var err error
 	shutdown, err = installExportPipeline(ctx)

go.mod

@@ -1,14 +1,15 @@
-module github.com/fortio/fortiotel
+module fortio.org/fortiotel
 
 go 1.18
 
 require (
-	fortio.org/fortio v1.39.0-pre4
+	fortio.org/fortio v1.39.0-pre6
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.37.0
 	go.opentelemetry.io/otel v1.11.2
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.11.2
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.11.2
 	go.opentelemetry.io/otel/sdk v1.11.2
+	go.opentelemetry.io/otel/trace v1.11.2
 )
 
 // During development, point to local repo for fortio
@@ -23,12 +24,11 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect
-	go.opentelemetry.io/otel/trace v1.11.2 // indirect
 	go.opentelemetry.io/proto/otlp v0.19.0 // indirect
 	golang.org/x/exp v0.0.0-20221111204811-129d8d6c17ab // indirect
-	golang.org/x/net v0.2.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/text v0.4.0 // indirect
+	golang.org/x/net v0.4.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/text v0.5.0 // indirect
 	google.golang.org/genproto v0.0.0-20220714211235-042d03aeabc9 // indirect
 	google.golang.org/grpc v1.51.0 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect

go.sum

@@ -32,8 +32,8 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 fortio.org/assert v1.1.2 h1:t6WGDqPD5VFrUvx30U0+3mgXXcoPonrdKqt0vfJHn8E=
-fortio.org/fortio v1.39.0-pre4 h1:iWAz/unbyIfdRAxhc6jWHaE7f74UwJ2JVjvpD738mTo=
-fortio.org/fortio v1.39.0-pre4/go.mod h1:/LdEwYl4/s2bWbvqTaqw6HFs2+2s05wluaeRfBQtcig=
+fortio.org/fortio v1.39.0-pre6 h1:Fkvc1hi+5M/u4CnvEPkxahLst9oDRKWy5P2D/1Io/2A=
+fortio.org/fortio v1.39.0-pre6/go.mod h1:4DhI17BkI3sU0DR4Z2HwochdpphTae+8NgZwWy6epRk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
@@ -244,8 +244,8 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -289,17 +289,17 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
-golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

simple/otel_httptrace_simple.go

@@ -56,7 +56,7 @@ func main() {
 		log.Fatalf("Error setting up export pipeline: %v", err)
 	}
 	log.Printf("OTEL export pipeline setup successfully")
-
+	// Without this the httptrace spans are disjoint.
 	ctx, span := otel.Tracer("github.com/fortio/fortiotel").Start(ctx, "main")
 	clientTrace := otelhttptrace.NewClientTrace(ctx)
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://www.google.com/", nil)