From aa26c451f7260bb2ba8b0776fdf8914d966e50d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Apr 2024 06:45:07 +0000 Subject: [PATCH] build(deps): bump go.opentelemetry.io/contrib/zpages Bumps [go.opentelemetry.io/contrib/zpages](https://github.com/open-telemetry/opentelemetry-go-contrib) from 0.49.0 to 0.51.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.49.0...zpages/v0.51.0) --- updated-dependencies: - dependency-name: go.opentelemetry.io/contrib/zpages dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- .../contrib/zpages/boundaries.go | 13 +------------ .../contrib/zpages/bucket.go | 2 ++ .../go.opentelemetry.io/contrib/zpages/doc.go | 13 +------------ .../contrib/zpages/internal/gen.go | 13 +------------ .../contrib/zpages/spanprocessor.go | 2 ++ .../contrib/zpages/templates.go | 18 +++++++++++++++--- .../contrib/zpages/tracez.go | 2 ++ .../contrib/zpages/version.go | 15 ++------------- vendor/modules.txt | 4 ++-- 11 files changed, 31 insertions(+), 57 deletions(-) diff --git a/go.mod b/go.mod index 656133ef40..65922ad282 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( go-micro.dev/v4 v4.10.2 go.etcd.io/bbolt v1.3.9 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 - go.opentelemetry.io/contrib/zpages v0.49.0 + go.opentelemetry.io/contrib/zpages v0.51.0 go.opentelemetry.io/otel v1.26.0 go.opentelemetry.io/otel/exporters/jaeger v1.17.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0 diff --git a/go.sum b/go.sum index d1cf89403c..2be9e3050f 100644 --- a/go.sum +++ b/go.sum @@ -2106,8 +2106,8 @@ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.4 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.48.0/go.mod h1:tIKj3DbO8N9Y2xo52og3irLsPI4GW02DSMtrVgNMgxg= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 h1:Xs2Ncz0gNihqu9iosIZ5SkBbWo5T8JhhLJFMQL1qmLI= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0/go.mod h1:vy+2G/6NvVMpwGX/NyLqcC41fxepnuKHk16E6IZUcJc= -go.opentelemetry.io/contrib/zpages v0.49.0 h1:Wk217PkNBxcKWnIQpwtbZZE286K4ZY9uajnM5woSeLU= -go.opentelemetry.io/contrib/zpages v0.49.0/go.mod h1:6alLi5mmkZWbAtZMRPd1ffIgkTcsU9OTHQF2NbSOhrQ= +go.opentelemetry.io/contrib/zpages v0.51.0 h1:psVr4JTWd0qtISPj9EA6AODGJ09bvsOxWiuKqiGdSCA= +go.opentelemetry.io/contrib/zpages v0.51.0/go.mod h1:PKtp+NEp1gTTLmFHpynYgYCSkKtisPntOb9S1mQjFKg= go.opentelemetry.io/otel v1.26.0 h1:LQwgL5s/1W7YiiRwxf03QGnWLb2HW4pLiAhaA5cZXBs= go.opentelemetry.io/otel v1.26.0/go.mod h1:UmLkJHUAidDval2EICqBMbnAd0/m2vmpf/dAM+fvFs4= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= diff --git a/vendor/go.opentelemetry.io/contrib/zpages/boundaries.go b/vendor/go.opentelemetry.io/contrib/zpages/boundaries.go index 51fad83380..cebeaade70 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/boundaries.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/boundaries.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// SPDX-License-Identifier: Apache-2.0 package zpages // import "go.opentelemetry.io/contrib/zpages" diff --git a/vendor/go.opentelemetry.io/contrib/zpages/bucket.go b/vendor/go.opentelemetry.io/contrib/zpages/bucket.go index f88c73a341..3711ccd8a2 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/bucket.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/bucket.go @@ -1,4 +1,6 @@ // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // Copyright 2017, OpenCensus Authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vendor/go.opentelemetry.io/contrib/zpages/doc.go b/vendor/go.opentelemetry.io/contrib/zpages/doc.go index e663fa1c2e..5052fada9c 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/doc.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/doc.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// SPDX-License-Identifier: Apache-2.0 // Package zpages implements a collection of HTML pages that display // telemetry stats. diff --git a/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go b/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go index 5972035f82..b00306c91a 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/internal/gen.go @@ -1,16 +1,5 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// SPDX-License-Identifier: Apache-2.0 package internal // import "go.opentelemetry.io/contrib/zpages/internal" diff --git a/vendor/go.opentelemetry.io/contrib/zpages/spanprocessor.go b/vendor/go.opentelemetry.io/contrib/zpages/spanprocessor.go index 189a04a746..3049f3c99f 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/spanprocessor.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/spanprocessor.go @@ -1,4 +1,6 @@ // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // Copyright 2017, OpenCensus Authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vendor/go.opentelemetry.io/contrib/zpages/templates.go b/vendor/go.opentelemetry.io/contrib/zpages/templates.go index 98ab6aa032..cc9b1dec0e 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/templates.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/templates.go @@ -1,4 +1,6 @@ // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // Copyright 2017, OpenCensus Authors // // Licensed under the Apache License, Version 2.0 (the "License"); @@ -58,7 +60,6 @@ func parseTemplate(name string) *template.Template { return template.Must(template.New(name).Funcs(templateFunctions).Parse(string(text))) } -//nolint:gosec // G203: The used method does not auto-escape HTML. Tracked under https://github.com/open-telemetry/opentelemetry-go-contrib/issues/4451. func spanRowFormatter(r spanRow) template.HTML { if !r.SpanContext.IsValid() { return "" @@ -67,10 +68,21 @@ func spanRowFormatter(r spanRow) template.HTML { if r.SpanContext.IsSampled() { col = "blue" } + + tpl := fmt.Sprintf( + `trace_id: %s span_id: %s`, + col, + r.SpanContext.TraceID(), + r.SpanContext.SpanID(), + ) if r.ParentSpanContext.IsValid() { - return template.HTML(fmt.Sprintf(`trace_id: %s span_id: %s parent_span_id: %s`, col, r.SpanContext.TraceID(), r.SpanContext.SpanID(), r.ParentSpanContext.SpanID())) + tpl += fmt.Sprintf(` parent_span_id: %s`, r.ParentSpanContext.SpanID()) } - return template.HTML(fmt.Sprintf(`trace_id: %s span_id: %s`, col, r.SpanContext.TraceID(), r.SpanContext.SpanID())) + + //nolint:gosec // G203: None of the dynamic attributes (TraceID/SpanID) can + // contain characters that need escaping so this lint issue is a false + // positive. + return template.HTML(tpl) } func even(x int) bool { diff --git a/vendor/go.opentelemetry.io/contrib/zpages/tracez.go b/vendor/go.opentelemetry.io/contrib/zpages/tracez.go index cb3325a039..b0ca486d31 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/tracez.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/tracez.go @@ -1,4 +1,6 @@ // Copyright The OpenTelemetry Authors +// SPDX-License-Identifier: Apache-2.0 + // Copyright 2017, OpenCensus Authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vendor/go.opentelemetry.io/contrib/zpages/version.go b/vendor/go.opentelemetry.io/contrib/zpages/version.go index 527a1d37e2..d4042102bc 100644 --- a/vendor/go.opentelemetry.io/contrib/zpages/version.go +++ b/vendor/go.opentelemetry.io/contrib/zpages/version.go @@ -1,22 +1,11 @@ // Copyright The OpenTelemetry Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// 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. +// SPDX-License-Identifier: Apache-2.0 package zpages // import "go.opentelemetry.io/contrib/zpages" // Version is the current release version of the zpages span processor. func Version() string { - return "0.49.0" + return "0.51.0" // This string is updated by the pre_release.sh script during release } diff --git a/vendor/modules.txt b/vendor/modules.txt index d65c561854..d12306b1d2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1952,8 +1952,8 @@ 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/semconv go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/internal/semconvutil -# go.opentelemetry.io/contrib/zpages v0.49.0 -## explicit; go 1.20 +# go.opentelemetry.io/contrib/zpages v0.51.0 +## explicit; go 1.21 go.opentelemetry.io/contrib/zpages go.opentelemetry.io/contrib/zpages/internal # go.opentelemetry.io/otel v1.26.0