diff --git a/go.mod b/go.mod index 380b2295b0..da996530de 100644 --- a/go.mod +++ b/go.mod @@ -90,7 +90,7 @@ require ( go.etcd.io/bbolt v1.4.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 - go.opentelemetry.io/contrib/zpages v0.60.0 + go.opentelemetry.io/contrib/zpages v0.61.0 go.opentelemetry.io/otel v1.36.0 go.opentelemetry.io/otel/exporters/jaeger v1.17.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 diff --git a/go.sum b/go.sum index 1bb80e41a1..21bba3825b 100644 --- a/go.sum +++ b/go.sum @@ -1170,8 +1170,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0/go.mod h1:rg+RlpR5dKwaS95IyyZqj5Wd4E13lk/msnTS0Xl9lJM= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= -go.opentelemetry.io/contrib/zpages v0.60.0 h1:wOM9ie1Hz4H88L9KE6GrGbKJhfm+8F1NfW/Y3q9Xt+8= -go.opentelemetry.io/contrib/zpages v0.60.0/go.mod h1:xqfToSRGh2MYUsfyErNz8jnNDPlnpZqWM/y6Z2Cx7xw= +go.opentelemetry.io/contrib/zpages v0.61.0 h1:tYvUj377Dn3k1wf1le/f8YWSNQ8k0byS3jK8PiIXu9Y= +go.opentelemetry.io/contrib/zpages v0.61.0/go.mod h1:MFNPHMJOGA1P6m5501ANjOJDp4A9BUQja1Y53CDL8LQ= go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg= go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= diff --git a/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go b/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go index 33a0a76746..956018e1b9 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go @@ -1,6 +1,7 @@ // Copyright The OpenTelemetry Authors // SPDX-License-Identifier: Apache-2.0 +// Package internal provides non-public types for the zpages package. package internal // import "go.opentelemetry.io/contrib/zpages/internal" import "embed" diff --git a/vendor/go.opentelemetry.io/contrib/zpages/templates.go b/vendor/go.opentelemetry.io/contrib/zpages/templates.go index cc9b1dec0e..ccad6c2ae4 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/templates.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/templates.go @@ -61,19 +61,19 @@ func parseTemplate(name string) *template.Template { } func spanRowFormatter(r spanRow) template.HTML { - if !r.SpanContext.IsValid() { + if !r.IsValid() { return "" } col := "black" - if r.SpanContext.IsSampled() { + if r.IsSampled() { col = "blue" } tpl := fmt.Sprintf( `trace_id: %s span_id: %s`, col, - r.SpanContext.TraceID(), - r.SpanContext.SpanID(), + r.TraceID(), + r.SpanID(), ) if r.ParentSpanContext.IsValid() { tpl += fmt.Sprintf(` parent_span_id: %s`, r.ParentSpanContext.SpanID()) diff --git a/vendor/go.opentelemetry.io/contrib/zpages/version.go b/vendor/go.opentelemetry.io/contrib/zpages/version.go index a70c3a72a4..538cbc38b4 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/version.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/version.go @@ -5,13 +5,6 @@ package zpages // import "go.opentelemetry.io/contrib/zpages" // Version is the current release version of the zpages span processor. func Version() string { - return "0.60.0" + return "0.61.0" // This string is updated by the pre_release.sh script during release } - -// SemVersion is the semantic version to be supplied to tracer/meter creation. -// -// Deprecated: Use [Version] instead. -func SemVersion() string { - return Version() -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 932dd4931e..131d2f28fd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2045,8 +2045,8 @@ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/request go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconv go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil -# go.opentelemetry.io/contrib/zpages v0.60.0 -## explicit; go 1.22.0 +# go.opentelemetry.io/contrib/zpages v0.61.0 +## explicit; go 1.23.0 go.opentelemetry.io/contrib/zpages go.opentelemetry.io/contrib/zpages/internal # go.opentelemetry.io/otel v1.36.0