tag v0.155.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.155.0 ---------------- * Fedora 43: add shadow-utils when LockRoot is enabled, update cloud-init service name (osbuild/images#1618) * Author: Achilleas Koutsou, Reviewers: Gianluca Zuccarelli, Michael Vogt * Update osbuild dependency commit ID to latest (osbuild/images#1609) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250626 (osbuild/images#1623) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: xz compress azure-cvm image type [HMS-8587] (osbuild/images#1620) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: introduce new image type: Azure SAP Apps [HMS-8738] (osbuild/images#1612) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * distro/rhel: move ansible-core to sap_extras_pkgset (osbuild/images#1624) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Tomáš Hozza * github/create-tag: allow passing the version when run manually (osbuild/images#1621) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: move image-config into pure YAML (HMS-8593) (osbuild/images#1616) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * test: split manifest checksums into separate files (osbuild/images#1625) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-30 --- tag v0.156.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.156.0 ---------------- * Many: delete repositories for EOL distributions (HMS-7044) (osbuild/images#1607) * Author: Tomáš Hozza, Reviewers: Michael Vogt, Simon de Vlieger * RHSM/facts: add 'image-builder CLI' API type (osbuild/images#1640) * Author: Tomáš Hozza, Reviewers: Brian C. Lane, Simon de Vlieger * Update dependencies 2025-06-29 (osbuild/images#1628) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1627) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * [RFC] image: drop `InstallWeakDeps` from image.DiskImage (osbuild/images#1642) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger, Tomáš Hozza * build(deps): bump the go-deps group across 1 directory with 3 updates (osbuild/images#1632) * Author: dependabot[bot], Reviewers: SchutzBot, Tomáš Hozza * distro/rhel10: xz compress azure-cvm image type (osbuild/images#1638) * Author: Achilleas Koutsou, Reviewers: Brian C. Lane, Simon de Vlieger * distro: cleanup/refactor distro/{defs,generic} (HMS-8744) (osbuild/images#1570) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: remove some hardcoded values from generic/images.go (osbuild/images#1636) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: small tweaks for the YAML based imagetypes (osbuild/images#1622) * Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger * fedora/wsl: packages and locale (osbuild/images#1635) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * image/many: make compression more generic (osbuild/images#1634) * Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt * manifest: handle content template name with spaces (osbuild/images#1641) * Author: Bryttanie, Reviewers: Brian C. Lane, Michael Vogt, Tomáš Hozza * many: implement gzip (osbuild/images#1633) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Tomáš Hozza * rhel/azure: set GRUB_TERMINAL based on architecture [RHEL-91383] (osbuild/images#1626) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-07-07 ---
98 lines
3.3 KiB
Go
98 lines
3.3 KiB
Go
// Copyright 2025 Google LLC
|
|
//
|
|
// 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.
|
|
|
|
package storage
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
|
|
internalTrace "cloud.google.com/go/internal/trace"
|
|
"cloud.google.com/go/storage/internal"
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
otelcodes "go.opentelemetry.io/otel/codes"
|
|
"go.opentelemetry.io/otel/trace"
|
|
)
|
|
|
|
const (
|
|
storageOtelTracingDevVar = "GO_STORAGE_DEV_OTEL_TRACING"
|
|
defaultTracerName = "cloud.google.com/go/storage"
|
|
gcpClientRepo = "googleapis/google-cloud-go"
|
|
gcpClientArtifact = "cloud.google.com/go/storage"
|
|
)
|
|
|
|
// isOTelTracingDevEnabled checks the development flag until experimental feature is launched.
|
|
// TODO: Remove development flag upon experimental launch.
|
|
func isOTelTracingDevEnabled() bool {
|
|
return os.Getenv(storageOtelTracingDevVar) == "true"
|
|
}
|
|
|
|
func tracer() trace.Tracer {
|
|
return otel.Tracer(defaultTracerName, trace.WithInstrumentationVersion(internal.Version))
|
|
}
|
|
|
|
// startSpan creates a span and a context.Context containing the newly-created span.
|
|
// If the context.Context provided in `ctx` contains a span then the newly-created
|
|
// span will be a child of that span, otherwise it will be a root span.
|
|
func startSpan(ctx context.Context, name string, opts ...trace.SpanStartOption) (context.Context, trace.Span) {
|
|
name = appendPackageName(name)
|
|
// TODO: Remove internalTrace upon experimental launch.
|
|
if !isOTelTracingDevEnabled() {
|
|
ctx = internalTrace.StartSpan(ctx, name)
|
|
return ctx, nil
|
|
}
|
|
opts = append(opts, getCommonTraceOptions()...)
|
|
ctx, span := tracer().Start(ctx, name, opts...)
|
|
return ctx, span
|
|
}
|
|
|
|
// endSpan retrieves the current span from ctx and completes the span.
|
|
// If an error occurs, the error is recorded as an exception span event for this span,
|
|
// and the span status is set in the form of a code and a description.
|
|
func endSpan(ctx context.Context, err error) {
|
|
// TODO: Remove internalTrace upon experimental launch.
|
|
if !isOTelTracingDevEnabled() {
|
|
internalTrace.EndSpan(ctx, err)
|
|
} else {
|
|
span := trace.SpanFromContext(ctx)
|
|
if err != nil {
|
|
span.SetStatus(otelcodes.Error, err.Error())
|
|
span.RecordError(err)
|
|
}
|
|
span.End()
|
|
}
|
|
}
|
|
|
|
// getCommonTraceOptions makes a SpanStartOption with common attributes.
|
|
func getCommonTraceOptions() []trace.SpanStartOption {
|
|
opts := []trace.SpanStartOption{
|
|
trace.WithAttributes(getCommonAttributes()...),
|
|
}
|
|
return opts
|
|
}
|
|
|
|
// getCommonAttributes includes the common attributes used for Cloud Trace adoption tracking.
|
|
func getCommonAttributes() []attribute.KeyValue {
|
|
return []attribute.KeyValue{
|
|
attribute.String("gcp.client.version", internal.Version),
|
|
attribute.String("gcp.client.repo", gcpClientRepo),
|
|
attribute.String("gcp.client.artifact", gcpClientArtifact),
|
|
}
|
|
}
|
|
|
|
func appendPackageName(spanName string) string {
|
|
return fmt.Sprintf("%s.%s", gcpClientArtifact, spanName)
|
|
}
|