mirror of
https://github.com/hanzoai/traces.git
synced 2026-11-03 04:05:45 +00:00
f2cf9f3911
Bumps the opentelemetry-collector group with 19 updates: | Package | From | To | | --- | --- | --- | | [go.opentelemetry.io/collector/component](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/confmap](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/consumer](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/pdata](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/client](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/component/componenttest](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/config/configgrpc](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/config/confighttp](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/config/configopaque](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/config/configtls](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/exporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/exporter/exportertest](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/exporter/otlpexporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/exporter/otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/otelcol](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/pdata/testdata](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | | [go.opentelemetry.io/collector/processor](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/receiver](https://github.com/open-telemetry/opentelemetry-collector) | `1.36.0` | `1.36.1` | | [go.opentelemetry.io/collector/receiver/otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector) | `0.130.0` | `0.130.1` | Updates `go.opentelemetry.io/collector/component` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/confmap` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/consumer` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/pdata` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/client` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/component/componenttest` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/config/configgrpc` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/config/confighttp` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/config/configopaque` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/config/configtls` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/exporter` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/exporter/exportertest` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/exporter/otlpexporter` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/exporter/otlphttpexporter` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/otelcol` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/pdata/testdata` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) Updates `go.opentelemetry.io/collector/processor` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/receiver` from 1.36.0 to 1.36.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/pdata/v1.36.0...pdata/v1.36.1) Updates `go.opentelemetry.io/collector/receiver/otlpreceiver` from 0.130.0 to 0.130.1 - [Release notes](https://github.com/open-telemetry/opentelemetry-collector/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-collector/blob/main/CHANGELOG-API.md) - [Commits](https://github.com/open-telemetry/opentelemetry-collector/compare/v0.130.0...v0.130.1) --- updated-dependencies: - dependency-name: go.opentelemetry.io/collector/component dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/confmap dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/consumer dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/pdata dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/client dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/component/componenttest dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configgrpc dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/confighttp dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configopaque dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/config/configtls dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/exportertest dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/otlpexporter dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/exporter/otlphttpexporter dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/otelcol dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/pdata/testdata dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/processor dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/receiver dependency-version: 1.36.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector - dependency-name: go.opentelemetry.io/collector/receiver/otlpreceiver dependency-version: 0.130.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: opentelemetry-collector ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
197 lines
4.7 KiB
Go
197 lines
4.7 KiB
Go
// Copyright The OpenTelemetry Authors
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package xconfmap // import "go.opentelemetry.io/collector/confmap/xconfmap"
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"reflect"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"go.opentelemetry.io/collector/confmap"
|
|
)
|
|
|
|
// As interface types are only used for static typing, a common idiom to find the reflection Type
|
|
// for an interface type Foo is to use a *Foo value.
|
|
var configValidatorType = reflect.TypeOf((*Validator)(nil)).Elem()
|
|
|
|
// Validator defines an optional interface for configurations to implement to do validation.
|
|
type Validator interface {
|
|
// Validate the configuration and returns an error if invalid.
|
|
Validate() error
|
|
}
|
|
|
|
// Validate validates a config, by doing this:
|
|
// - Call Validate on the config itself if the config implements ConfigValidator.
|
|
func Validate(cfg any) error {
|
|
var err error
|
|
|
|
for _, validationErr := range validate(reflect.ValueOf(cfg)) {
|
|
err = errors.Join(err, validationErr)
|
|
}
|
|
|
|
return err
|
|
}
|
|
|
|
type pathError struct {
|
|
err error
|
|
path []string
|
|
}
|
|
|
|
func (pe pathError) Error() string {
|
|
if len(pe.path) > 0 {
|
|
var path string
|
|
sb := strings.Builder{}
|
|
|
|
_, _ = sb.WriteString(pe.path[len(pe.path)-1])
|
|
for i := len(pe.path) - 2; i >= 0; i-- {
|
|
_, _ = sb.WriteString(confmap.KeyDelimiter)
|
|
_, _ = sb.WriteString(pe.path[i])
|
|
}
|
|
path = sb.String()
|
|
|
|
return fmt.Sprintf("%s: %s", path, pe.err)
|
|
}
|
|
|
|
return pe.err.Error()
|
|
}
|
|
|
|
func (pe pathError) Unwrap() error {
|
|
return pe.err
|
|
}
|
|
|
|
func validate(v reflect.Value) []pathError {
|
|
errs := []pathError{}
|
|
// Validate the value itself.
|
|
switch v.Kind() {
|
|
case reflect.Invalid:
|
|
return nil
|
|
case reflect.Ptr, reflect.Interface:
|
|
return validate(v.Elem())
|
|
case reflect.Struct:
|
|
err := callValidateIfPossible(v)
|
|
if err != nil {
|
|
errs = append(errs, pathError{err: err})
|
|
}
|
|
|
|
// Reflect on the pointed data and check each of its fields.
|
|
for i := 0; i < v.NumField(); i++ {
|
|
if !v.Type().Field(i).IsExported() {
|
|
continue
|
|
}
|
|
field := v.Type().Field(i)
|
|
path := fieldName(field)
|
|
|
|
subpathErrs := validate(v.Field(i))
|
|
for _, err := range subpathErrs {
|
|
errs = append(errs, pathError{
|
|
err: err.err,
|
|
path: append(err.path, path),
|
|
})
|
|
}
|
|
}
|
|
return errs
|
|
case reflect.Slice, reflect.Array:
|
|
err := callValidateIfPossible(v)
|
|
if err != nil {
|
|
errs = append(errs, pathError{err: err})
|
|
}
|
|
|
|
// Reflect on the pointed data and check each of its fields.
|
|
for i := 0; i < v.Len(); i++ {
|
|
subPathErrs := validate(v.Index(i))
|
|
|
|
for _, err := range subPathErrs {
|
|
errs = append(errs, pathError{
|
|
err: err.err,
|
|
path: append(err.path, strconv.Itoa(i)),
|
|
})
|
|
}
|
|
}
|
|
return errs
|
|
case reflect.Map:
|
|
err := callValidateIfPossible(v)
|
|
if err != nil {
|
|
errs = append(errs, pathError{err: err})
|
|
}
|
|
|
|
iter := v.MapRange()
|
|
for iter.Next() {
|
|
keyErrs := validate(iter.Key())
|
|
valueErrs := validate(iter.Value())
|
|
key := stringifyMapKey(iter.Key())
|
|
|
|
for _, err := range keyErrs {
|
|
errs = append(errs, pathError{err: err.err, path: append(err.path, key)})
|
|
}
|
|
|
|
for _, err := range valueErrs {
|
|
errs = append(errs, pathError{err: err.err, path: append(err.path, key)})
|
|
}
|
|
}
|
|
return errs
|
|
default:
|
|
err := callValidateIfPossible(v)
|
|
if err != nil {
|
|
return []pathError{{err: err}}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
}
|
|
|
|
func callValidateIfPossible(v reflect.Value) error {
|
|
// If the value type implements ConfigValidator just call Validate
|
|
if v.Type().Implements(configValidatorType) {
|
|
return v.Interface().(Validator).Validate()
|
|
}
|
|
|
|
// If the pointer type implements ConfigValidator call Validate on the pointer to the current value.
|
|
if reflect.PointerTo(v.Type()).Implements(configValidatorType) {
|
|
// If not addressable, then create a new *V pointer and set the value to current v.
|
|
if !v.CanAddr() {
|
|
pv := reflect.New(reflect.PointerTo(v.Type()).Elem())
|
|
pv.Elem().Set(v)
|
|
v = pv.Elem()
|
|
}
|
|
return v.Addr().Interface().(Validator).Validate()
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func fieldName(field reflect.StructField) string {
|
|
var fieldName string
|
|
if tag, ok := field.Tag.Lookup(confmap.MapstructureTag); ok {
|
|
tags := strings.Split(tag, ",")
|
|
if len(tags) > 0 {
|
|
fieldName = tags[0]
|
|
}
|
|
}
|
|
// Even if the mapstructure tag exists, the field name may not
|
|
// be available, so set it if it is still blank.
|
|
if fieldName == "" {
|
|
fieldName = strings.ToLower(field.Name)
|
|
}
|
|
|
|
return fieldName
|
|
}
|
|
|
|
func stringifyMapKey(val reflect.Value) string {
|
|
switch v := val.Interface().(type) {
|
|
case string:
|
|
return v
|
|
case fmt.Stringer:
|
|
return v.String()
|
|
default:
|
|
switch val.Kind() {
|
|
case reflect.Ptr, reflect.Interface, reflect.Struct, reflect.Slice, reflect.Array, reflect.Map:
|
|
return fmt.Sprintf("[%T key]", val.Interface())
|
|
default:
|
|
return fmt.Sprintf("%v", val.Interface())
|
|
}
|
|
}
|
|
}
|