build(deps): bump go.opentelemetry.io/contrib/zpages

Bumps [go.opentelemetry.io/contrib/zpages](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.62.0 to 0.63.0.
- [Release notes](https://github.com/open-telemetry/opentelemetry-go-contrib/releases)
- [Changelog](https://github.com/open-telemetry/opentelemetry-go-contrib/blob/main/CHANGELOG.md)
- [Commits](https://github.com/open-telemetry/opentelemetry-go-contrib/compare/zpages/v0.62.0...zpages/v0.63.0)

---
updated-dependencies:
- dependency-name: go.opentelemetry.io/contrib/zpages
  dependency-version: 0.63.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot]
2025-09-10 14:17:08 +00:00
committed by Ralf Haferkamp
parent a3dd18294e
commit 25ae8a3fc2
8 changed files with 47 additions and 22 deletions

2
go.mod
View File

@@ -96,7 +96,7 @@ require (
go.etcd.io/bbolt v1.4.3
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
go.opentelemetry.io/contrib/zpages v0.62.0
go.opentelemetry.io/contrib/zpages v0.63.0
go.opentelemetry.io/otel v1.38.0
go.opentelemetry.io/otel/exporters/jaeger v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0

4
go.sum
View File

@@ -1244,8 +1244,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.6
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0/go.mod h1:fvPi2qXDqFs8M4B4fmJhE92TyQs9Ydjlg3RvfUp+NbQ=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 h1:RbKq8BG0FI8OiXhBfcRtqqHcZcka+gU3cskNuf05R18=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0/go.mod h1:h06DGIukJOevXaj/xrNjhi/2098RZzcLTbc0jDAUbsg=
go.opentelemetry.io/contrib/zpages v0.62.0 h1:9fUYTLmrK0x/lweM2uM+BOx069jLx8PxVqWhegGJ9Bo=
go.opentelemetry.io/contrib/zpages v0.62.0/go.mod h1:C8kXoiC1Ytvereztus2R+kqdSa6W/MZ8FfS8Zwj+LiM=
go.opentelemetry.io/contrib/zpages v0.63.0 h1:TppOKuZGbqXMgsfjqq3i09N5Vbo1JLtLImUqiTPGnX4=
go.opentelemetry.io/contrib/zpages v0.63.0/go.mod h1:5F8uugz75ay/MMhRRhxAXY33FuaI8dl7jTxefrIy5qk=
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4=

View File

@@ -199,3 +199,33 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
--------------------------------------------------------------------------------
Copyright 2009 The Go Authors.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google LLC nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -4,7 +4,7 @@
package zpages // import "go.opentelemetry.io/contrib/zpages"
import (
"sort"
"slices"
"time"
)
@@ -31,9 +31,7 @@ type boundaries struct {
// newBoundaries returns a new boundaries.
func newBoundaries(durations []time.Duration) *boundaries {
sort.Slice(durations, func(i, j int) bool {
return durations[i] < durations[j]
})
slices.Sort(durations)
return &boundaries{durations: durations}
}

View File

@@ -75,13 +75,13 @@ func (ssm *SpanProcessor) OnEnd(span sdktrace.ReadOnlySpan) {
}
// Shutdown does nothing.
func (ssm *SpanProcessor) Shutdown(context.Context) error {
func (*SpanProcessor) Shutdown(context.Context) error {
// Do nothing
return nil
}
// ForceFlush does nothing.
func (ssm *SpanProcessor) ForceFlush(context.Context) error {
func (*SpanProcessor) ForceFlush(context.Context) error {
// Do nothing
return nil
}
@@ -99,11 +99,11 @@ func (ssm *SpanProcessor) spanStoreForName(name string) *sampleStore {
// spansPerMethod returns a summary of what spans are being stored for each span name.
func (ssm *SpanProcessor) spansPerMethod() map[string]*perMethodSummary {
out := make(map[string]*perMethodSummary)
ssm.spanSampleStores.Range(func(name, s interface{}) bool {
ssm.spanSampleStores.Range(func(name, s any) bool {
out[name.(string)] = s.(*sampleStore).perMethodSummary()
return true
})
ssm.activeSpansStore.Range(func(_, sp interface{}) bool {
ssm.activeSpansStore.Range(func(_, sp any) bool {
span := sp.(sdktrace.ReadOnlySpan)
if pms, ok := out[span.Name()]; ok {
pms.activeSpans++
@@ -118,7 +118,7 @@ func (ssm *SpanProcessor) spansPerMethod() map[string]*perMethodSummary {
// activeSpans returns the active spans for the given name.
func (ssm *SpanProcessor) activeSpans(name string) []sdktrace.ReadOnlySpan {
var out []sdktrace.ReadOnlySpan
ssm.activeSpansStore.Range(func(_, sp interface{}) bool {
ssm.activeSpansStore.Range(func(_, sp any) bool {
span := sp.(sdktrace.ReadOnlySpan)
if span.Name() == name {
out = append(out, span)
@@ -160,7 +160,7 @@ type sampleStore struct {
}
// newSampleStore creates a sampleStore.
func newSampleStore(latencyBucketSize uint, errorBucketSize uint) *sampleStore {
func newSampleStore(latencyBucketSize, errorBucketSize uint) *sampleStore {
s := &sampleStore{
latency: make([]*bucket, defaultBoundaries.numBuckets()),
errors: newBucket(errorBucketSize),
@@ -208,11 +208,8 @@ func (ss *sampleStore) sampleSpan(span sdktrace.ReadOnlySpan) {
return
}
latency := span.EndTime().Sub(span.StartTime())
// In case of time skew or wrong time, sample as 0 latency.
if latency < 0 {
latency = 0
}
latency := max(span.EndTime().Sub(span.StartTime()), 0)
ss.latency[defaultBoundaries.getBucketIndex(latency)].add(span)
}

View File

@@ -46,16 +46,16 @@ type headerData struct {
func parseTemplate(name string) *template.Template {
f, err := internal.Templates.Open("templates/" + name + ".html")
if err != nil {
log.Panicf("%v: %v", name, err) // nolint: revive // Called during initialization.
log.Panicf("%v: %v", name, err) //nolint:revive // Called during initialization.
}
defer func() {
if err = f.Close(); err != nil {
log.Panicf("%v: %v", name, err) // nolint: revive // Called during initialization.
log.Panicf("%v: %v", name, err) //nolint:revive // Called during initialization.
}
}()
text, err := io.ReadAll(f)
if err != nil {
log.Panicf("%v: %v", name, err) // nolint: revive // Called during initialization.
log.Panicf("%v: %v", name, err) //nolint:revive // Called during initialization.
}
return template.Must(template.New(name).Funcs(templateFunctions).Parse(string(text)))
}

View File

@@ -5,6 +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.62.0"
return "0.63.0"
// This string is updated by the pre_release.sh script during release
}

2
vendor/modules.txt vendored
View File

@@ -2179,7 +2179,7 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc/inte
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/zpages v0.62.0
# go.opentelemetry.io/contrib/zpages v0.63.0
## explicit; go 1.23.0
go.opentelemetry.io/contrib/zpages
go.opentelemetry.io/contrib/zpages/internal