You've already forked opentelemetry-go
mirror of
https://github.com/open-telemetry/opentelemetry-go.git
synced 2026-06-03 18:35:08 +02:00
442cdbdd94
Fix https://github.com/open-telemetry/opentelemetry-go/issues/8299 Relevant upstream v1.41.0 release notes: > ### 🛑 Breaking changes 🛑 > > - `graphql`: Change `graphql.document` attribute requirement level from Recommended to Opt-In due to sensitive data, cardinality, and size concerns ([#2985](https://github.com/open-telemetry/semantic-conventions/issues/2985)) > - `process`: Move process.executable to its own entity. ([#3535](https://github.com/open-telemetry/semantic-conventions/issues/3535)) > - `process`: Update requirement levels for process attributes to ensure consistent identification and description across platforms. ([#864](https://github.com/open-telemetry/semantic-conventions/issues/864)) > - `rpc`: Remove `client.address` and `client.port` attributes from RPC server spans. ([#3487](https://github.com/open-telemetry/semantic-conventions/issues/3487), [#3488](https://github.com/open-telemetry/semantic-conventions/issues/3488)) > > ### 💡 Enhancements 💡 > > - `Go`: Add opt-in go.memory.gc.pause.duration histogram metric. ([#3353](https://github.com/open-telemetry/semantic-conventions/issues/3353)) > - `deployment`: Stabilize `deployment.environment.name` attribute. ([#3339](https://github.com/open-telemetry/semantic-conventions/issues/3339)) > - `deployment`: Add enum values for `deployment.environment.name` attribute. ([#2910](https://github.com/open-telemetry/semantic-conventions/issues/2910)) > - `go`: Add the go.cpu.time opt-in metric, and add go.cpu.detailed_state and go.memory.detailed_type attributes to CPU and memory metrics respectively with wildcard values. ([#3354](https://github.com/open-telemetry/semantic-conventions/issues/3354)) > - `go`: Add the opt-in go.memory.gc.cycles metric. ([#3353](https://github.com/open-telemetry/semantic-conventions/issues/3353)) > - `telemetry`: Promote `telemetry.distro.name` and `telemetry.distro.version` attributes to 'stable'. ([#3650](https://github.com/open-telemetry/semantic-conventions/issues/3650)) This PR also: - fixes semconv migration generation to ignore unexported declarations when computing renames/removals - upgrades repo imports, depguard, docs, templates, and schema URL expectations to `go.opentelemetry.io/otel/semconv/v1.41.0` - adds missing generated-file headers to semconvkit templates and regenerates the affected `v1.41.0` files via `TAG="v1.41.0" make semconv-generate` --------- Co-authored-by: David Ashpole <dashpole@google.com>
96 lines
2.5 KiB
Go
96 lines
2.5 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package resource // import "go.opentelemetry.io/otel/sdk/resource"
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"os"
|
|
"strings"
|
|
|
|
"go.opentelemetry.io/otel"
|
|
"go.opentelemetry.io/otel/attribute"
|
|
semconv "go.opentelemetry.io/otel/semconv/v1.41.0"
|
|
)
|
|
|
|
const (
|
|
// resourceAttrKey is the environment variable name OpenTelemetry Resource information will be read from.
|
|
resourceAttrKey = "OTEL_RESOURCE_ATTRIBUTES" //nolint:gosec // False positive G101: Potential hardcoded credentials
|
|
|
|
// svcNameKey is the environment variable name that Service Name information will be read from.
|
|
svcNameKey = "OTEL_SERVICE_NAME"
|
|
)
|
|
|
|
// errMissingValue is returned when a resource value is missing.
|
|
var errMissingValue = fmt.Errorf("%w: missing value", ErrPartialResource)
|
|
|
|
// fromEnv is a Detector that implements the Detector and collects
|
|
// resources from environment. This Detector is included as a
|
|
// builtin.
|
|
type fromEnv struct{}
|
|
|
|
// compile time assertion that FromEnv implements Detector interface.
|
|
var _ Detector = fromEnv{}
|
|
|
|
// Detect collects resources from environment.
|
|
func (fromEnv) Detect(context.Context) (*Resource, error) {
|
|
attrs := strings.TrimSpace(os.Getenv(resourceAttrKey))
|
|
svcName := strings.TrimSpace(os.Getenv(svcNameKey))
|
|
|
|
if attrs == "" && svcName == "" {
|
|
return Empty(), nil
|
|
}
|
|
|
|
var res *Resource
|
|
|
|
if svcName != "" {
|
|
res = NewSchemaless(semconv.ServiceName(svcName))
|
|
}
|
|
|
|
r2, err := constructOTResources(attrs)
|
|
|
|
// Ensure that the resource with the service name from OTEL_SERVICE_NAME
|
|
// takes precedence, if it was defined.
|
|
res, err2 := Merge(r2, res)
|
|
|
|
if err == nil {
|
|
err = err2
|
|
} else if err2 != nil {
|
|
err = fmt.Errorf("detecting resources: %s", []string{err.Error(), err2.Error()})
|
|
}
|
|
|
|
return res, err
|
|
}
|
|
|
|
func constructOTResources(s string) (*Resource, error) {
|
|
if s == "" {
|
|
return Empty(), nil
|
|
}
|
|
pairs := strings.Split(s, ",")
|
|
var attrs []attribute.KeyValue
|
|
var invalid []string
|
|
for _, p := range pairs {
|
|
k, v, found := strings.Cut(p, "=")
|
|
if !found {
|
|
invalid = append(invalid, p)
|
|
continue
|
|
}
|
|
key := strings.TrimSpace(k)
|
|
val, err := url.PathUnescape(strings.TrimSpace(v))
|
|
if err != nil {
|
|
// Retain original value if decoding fails, otherwise it will be
|
|
// an empty string.
|
|
val = v
|
|
otel.Handle(err)
|
|
}
|
|
attrs = append(attrs, attribute.String(key, val))
|
|
}
|
|
var err error
|
|
if len(invalid) > 0 {
|
|
err = fmt.Errorf("%w: %v", errMissingValue, invalid)
|
|
}
|
|
return NewSchemaless(attrs...), err
|
|
}
|