[confmap] Mark `confmap.strictlyTypedInput` as stable (#10793)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description <!-- Issue number if applicable --> Marks `confmap.strictlyTypedInput` as stable. #### Link to tracking issue Fixes #10552 Blocked by: - #10794 - #10795
This commit is contained in:
Pablo Baeyens
GitHub
parent
d2ed276a92
commit
e477c3a348
|
|
@ -0,0 +1,25 @@
|
|||
# Use this changelog template to create an entry for release notes.
|
||||
|
||||
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
|
||||
change_type: breaking
|
||||
|
||||
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
|
||||
component: confmap
|
||||
|
||||
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
|
||||
note: Mark `confmap.strictlyTypedInput` as stable
|
||||
|
||||
# One or more tracking issues or pull requests related to the change
|
||||
issues: [10552]
|
||||
|
||||
# (Optional) One or more lines of additional information to render under the primary note.
|
||||
# These lines will be padded with 2 spaces and then inserted directly into the document.
|
||||
# Use pipe (|) for multiline entries.
|
||||
subtext:
|
||||
|
||||
# Optional: The change log or logs in which this entry should be included.
|
||||
# e.g. '[user]' or '[user, api]'
|
||||
# Include 'user' if the change is relevant to end users.
|
||||
# Include 'api' if there is a change to a library API.
|
||||
# Default: '[user]'
|
||||
change_logs: []
|
||||
|
|
@ -32,7 +32,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -48,8 +47,6 @@ require (
|
|||
github.com/prometheus/common v0.55.0 // indirect
|
||||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -95,8 +92,6 @@ retract (
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ require (
|
|||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -23,8 +22,6 @@ require (
|
|||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.28.0 // indirect
|
||||
|
|
@ -52,8 +49,4 @@ replace go.opentelemetry.io/collector/extension => ../../extension
|
|||
|
||||
replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.28.0 // indirect
|
||||
|
|
@ -73,8 +72,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/client => ../../client
|
||||
|
||||
replace go.opentelemetry.io/collector/config/configauth => ../configauth
|
||||
|
|
|
|||
|
|
@ -50,7 +50,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
go.opentelemetry.io/otel/metric v1.28.0 // indirect
|
||||
|
|
@ -68,8 +67,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/config/configauth => ../configauth
|
||||
|
||||
replace go.opentelemetry.io/collector/config/configcompression => ../configcompression
|
||||
|
|
|
|||
|
|
@ -36,8 +36,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import (
|
|||
"github.com/knadh/koanf/v2"
|
||||
|
||||
encoder "go.opentelemetry.io/collector/confmap/internal/mapstructure"
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -187,7 +186,7 @@ func decodeConfig(m *Conf, result any, errorUnused bool, skipTopLevelUnmarshaler
|
|||
ErrorUnused: errorUnused,
|
||||
Result: result,
|
||||
TagName: "mapstructure",
|
||||
WeaklyTypedInput: !globalgates.StrictlyTypedInputGate.IsEnabled(),
|
||||
WeaklyTypedInput: false,
|
||||
MatchName: caseSensitiveMatchName,
|
||||
DecodeHook: mapstructure.ComposeDecodeHookFunc(
|
||||
useExpandValue(),
|
||||
|
|
@ -239,7 +238,7 @@ func caseSensitiveMatchName(a, b string) bool {
|
|||
|
||||
func castTo(exp expandedValue, useOriginal bool) (any, error) {
|
||||
// If the target field is a string, use `exp.Original` or fail if not available.
|
||||
if globalgates.StrictlyTypedInputGate.IsEnabled() && useOriginal {
|
||||
if useOriginal {
|
||||
return exp.Original, nil
|
||||
}
|
||||
// Otherwise, use the parsed value (previous behavior).
|
||||
|
|
|
|||
|
|
@ -14,21 +14,14 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -7,12 +7,8 @@ import (
|
|||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
// schemePattern defines the regexp pattern for scheme names.
|
||||
|
|
@ -192,41 +188,13 @@ func (mr *Resolver) findAndExpandURI(ctx context.Context, input string) (any, bo
|
|||
return input, false, err
|
||||
}
|
||||
|
||||
var repl string
|
||||
if globalgates.StrictlyTypedInputGate.IsEnabled() {
|
||||
repl, err = expanded.AsString()
|
||||
} else {
|
||||
repl, err = toString(expanded)
|
||||
}
|
||||
repl, err := expanded.AsString()
|
||||
if err != nil {
|
||||
return input, false, fmt.Errorf("expanding %v: %w", uri, err)
|
||||
}
|
||||
return strings.ReplaceAll(input, uri, repl), true, err
|
||||
}
|
||||
|
||||
// toString attempts to convert input to a string.
|
||||
func toString(ret *Retrieved) (string, error) {
|
||||
// This list must be kept in sync with checkRawConfType.
|
||||
input, err := ret.AsRaw()
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
val := reflect.ValueOf(input)
|
||||
switch val.Kind() {
|
||||
case reflect.String:
|
||||
return val.String(), nil
|
||||
case reflect.Int, reflect.Int32, reflect.Int64:
|
||||
return strconv.FormatInt(val.Int(), 10), nil
|
||||
case reflect.Float32, reflect.Float64:
|
||||
return strconv.FormatFloat(val.Float(), 'f', -1, 64), nil
|
||||
case reflect.Bool:
|
||||
return strconv.FormatBool(val.Bool()), nil
|
||||
default:
|
||||
return "", fmt.Errorf("expected convertable to string value type, got %q(%T)", input, input)
|
||||
}
|
||||
}
|
||||
|
||||
func (mr *Resolver) expandURI(ctx context.Context, input string) (*Retrieved, error) {
|
||||
// strip ${ and }
|
||||
uri := input[2 : len(input)-1]
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ require (
|
|||
github.com/knadh/koanf/providers/confmap v0.1.0
|
||||
github.com/knadh/koanf/v2 v2.1.1
|
||||
github.com/stretchr/testify v1.9.0
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0
|
||||
go.uber.org/goleak v1.3.0
|
||||
go.uber.org/multierr v1.11.0
|
||||
go.uber.org/zap v1.27.0
|
||||
|
|
@ -17,18 +16,15 @@ require (
|
|||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/kr/pretty v0.3.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
github.com/rogpeppe/go-internal v1.10.0 // indirect
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
|
||||
)
|
||||
|
||||
retract (
|
||||
v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module, use v0.76.1
|
||||
v0.69.0 // Release failed, use v0.69.1
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -1,25 +1,29 @@
|
|||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0/go.mod h1:2uLhxQzJnyHKfxG927awZC7+fyHFdQkd697K4MdLnIU=
|
||||
github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM=
|
||||
github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es=
|
||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
|
||||
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
|
||||
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
|
||||
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
|
||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
||||
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
|
||||
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
|
||||
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
|
||||
|
|
|
|||
|
|
@ -7,14 +7,11 @@ require (
|
|||
go.opentelemetry.io/collector/confmap v0.107.0
|
||||
go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.0
|
||||
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.0
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -31,7 +28,3 @@ replace go.opentelemetry.io/collector/confmap => ../../
|
|||
replace go.opentelemetry.io/collector/confmap/provider/fileprovider => ../../provider/fileprovider
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../provider/envprovider
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ import (
|
|||
"go.opentelemetry.io/collector/confmap"
|
||||
"go.opentelemetry.io/collector/confmap/provider/envprovider"
|
||||
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
|
||||
"go.opentelemetry.io/collector/featuregate"
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
type TargetField string
|
||||
|
|
@ -89,161 +87,6 @@ func AssertResolvesTo(t *testing.T, resolver *confmap.Resolver, tt Test) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestTypeCasting(t *testing.T) {
|
||||
values := []Test{
|
||||
{
|
||||
value: "123",
|
||||
targetField: TargetFieldInt,
|
||||
expected: 123,
|
||||
},
|
||||
{
|
||||
value: "123",
|
||||
targetField: TargetFieldString,
|
||||
expected: "123",
|
||||
},
|
||||
{
|
||||
value: "123",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 123 expansion",
|
||||
},
|
||||
{
|
||||
value: "0123",
|
||||
targetField: TargetFieldInt,
|
||||
expected: 83,
|
||||
},
|
||||
{
|
||||
value: "0123",
|
||||
targetField: TargetFieldString,
|
||||
expected: "83",
|
||||
},
|
||||
{
|
||||
value: "0123",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 83 expansion",
|
||||
},
|
||||
{
|
||||
value: "0xdeadbeef",
|
||||
targetField: TargetFieldInt,
|
||||
expected: 3735928559,
|
||||
},
|
||||
{
|
||||
value: "0xdeadbeef",
|
||||
targetField: TargetFieldString,
|
||||
expected: "3735928559",
|
||||
},
|
||||
{
|
||||
value: "0xdeadbeef",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 3735928559 expansion",
|
||||
},
|
||||
{
|
||||
value: "\"0123\"",
|
||||
targetField: TargetFieldString,
|
||||
expected: "0123",
|
||||
},
|
||||
{
|
||||
value: "\"0123\"",
|
||||
targetField: TargetFieldInt,
|
||||
expected: 83,
|
||||
},
|
||||
{
|
||||
value: "\"0123\"",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 0123 expansion",
|
||||
},
|
||||
{
|
||||
value: "!!str 0123",
|
||||
targetField: TargetFieldString,
|
||||
expected: "0123",
|
||||
},
|
||||
{
|
||||
value: "!!str 0123",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 0123 expansion",
|
||||
},
|
||||
{
|
||||
value: "'!!str 0123'",
|
||||
targetField: TargetFieldString,
|
||||
expected: "!!str 0123",
|
||||
},
|
||||
{
|
||||
value: "\"!!str 0123\"",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with !!str 0123 expansion",
|
||||
},
|
||||
{
|
||||
value: "''",
|
||||
targetField: TargetFieldString,
|
||||
expected: "",
|
||||
},
|
||||
{
|
||||
value: "\"\"",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with expansion",
|
||||
},
|
||||
{
|
||||
value: "t",
|
||||
targetField: TargetFieldBool,
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
value: "23",
|
||||
targetField: TargetFieldBool,
|
||||
expected: true,
|
||||
},
|
||||
{
|
||||
value: "foo\nbar",
|
||||
targetField: TargetFieldString,
|
||||
expected: "foo bar",
|
||||
},
|
||||
{
|
||||
value: "foo\nbar",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with foo bar expansion",
|
||||
},
|
||||
{
|
||||
value: "\"1111:1111:1111:1111:1111::\"",
|
||||
targetField: TargetFieldString,
|
||||
expected: "1111:1111:1111:1111:1111::",
|
||||
},
|
||||
{
|
||||
value: "\"1111:1111:1111:1111:1111::\"",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 1111:1111:1111:1111:1111:: expansion",
|
||||
},
|
||||
{
|
||||
value: "2006-01-02T15:04:05Z07:00",
|
||||
targetField: TargetFieldString,
|
||||
expected: "2006-01-02T15:04:05Z07:00",
|
||||
},
|
||||
{
|
||||
value: "2006-01-02T15:04:05Z07:00",
|
||||
targetField: TargetFieldInlineString,
|
||||
expected: "inline field with 2006-01-02T15:04:05Z07:00 expansion",
|
||||
},
|
||||
}
|
||||
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, false)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
for _, tt := range values {
|
||||
t.Run(tt.value+"/"+string(tt.targetField), func(t *testing.T) {
|
||||
testFile := "types_expand.yaml"
|
||||
if tt.targetField == TargetFieldInlineString {
|
||||
testFile = "types_expand_inline.yaml"
|
||||
}
|
||||
resolver := NewResolver(t, testFile)
|
||||
t.Setenv("ENV", tt.value)
|
||||
AssertResolvesTo(t, resolver, tt)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestStrictTypeCasting(t *testing.T) {
|
||||
t.Setenv("ENV_VALUE", "testreceiver")
|
||||
|
||||
|
|
@ -458,14 +301,6 @@ func TestStrictTypeCasting(t *testing.T) {
|
|||
},
|
||||
}
|
||||
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
for _, tt := range values {
|
||||
t.Run(tt.value+"/"+string(tt.targetField)+"/"+"direct", func(t *testing.T) {
|
||||
testFile := "types_expand.yaml"
|
||||
|
|
@ -515,14 +350,6 @@ func TestRecursiveInlineString(t *testing.T) {
|
|||
},
|
||||
}
|
||||
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, err)
|
||||
}()
|
||||
|
||||
for _, tt := range values {
|
||||
t.Run(tt.value+"/"+string(tt.targetField), func(t *testing.T) {
|
||||
testFile := "types_expand.yaml"
|
||||
|
|
@ -541,15 +368,6 @@ func TestRecursiveInlineString(t *testing.T) {
|
|||
|
||||
func TestRecursiveMaps(t *testing.T) {
|
||||
value := "{value: 123}"
|
||||
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
seterr := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, seterr)
|
||||
}()
|
||||
|
||||
resolver := NewResolver(t, "types_expand.yaml")
|
||||
t.Setenv("ENV", `{env: "${env:ENV2}", inline: "inline ${env:ENV2}"}`)
|
||||
t.Setenv("ENV2", `{env2: "${env:ENV3}"}`)
|
||||
|
|
@ -597,14 +415,6 @@ func TestRecursiveMaps(t *testing.T) {
|
|||
|
||||
// Test that comments with invalid ${env:...} references do not prevent configuration from loading.
|
||||
func TestIssue10787(t *testing.T) {
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
seterr := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, seterr)
|
||||
}()
|
||||
|
||||
resolver := NewResolver(t, "issue-10787-main.yaml")
|
||||
conf, err := resolver.Resolve(context.Background())
|
||||
require.NoError(t, err)
|
||||
|
|
@ -649,14 +459,6 @@ func TestIssue10787(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestStructMappingIssue10787(t *testing.T) {
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
seterr := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, seterr)
|
||||
}()
|
||||
|
||||
resolver := NewResolver(t, "types_expand.yaml")
|
||||
t.Setenv("ENV", `# this is a comment
|
||||
logging:
|
||||
|
|
@ -699,14 +501,6 @@ logging:
|
|||
}
|
||||
|
||||
func TestStructMappingIssue10787_ExpandComment(t *testing.T) {
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
seterr := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, seterr)
|
||||
}()
|
||||
|
||||
resolver := NewResolver(t, "types_expand.yaml")
|
||||
t.Setenv("EXPAND_ME", "an expanded env var")
|
||||
t.Setenv("ENV", `# this is a comment with ${EXPAND_ME}
|
||||
|
|
@ -750,14 +544,6 @@ logging:
|
|||
}
|
||||
|
||||
func TestIndirectSliceEnvVar(t *testing.T) {
|
||||
previousValue := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
err := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true)
|
||||
require.NoError(t, err)
|
||||
defer func() {
|
||||
seterr := featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, previousValue)
|
||||
require.NoError(t, seterr)
|
||||
}()
|
||||
|
||||
// This replicates the situation in https://github.com/open-telemetry/opentelemetry-collector/issues/10799
|
||||
// where a configuration file is loaded that contains a reference to a slice of strings in an environment variable.
|
||||
t.Setenv("BASE_FOLDER", "testdata")
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ import (
|
|||
|
||||
"go.uber.org/zap"
|
||||
"gopkg.in/yaml.v3"
|
||||
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
// ProviderSettings are the settings to initialize a Provider.
|
||||
|
|
@ -137,20 +135,14 @@ func withStringRepresentation(stringRepresentation string) RetrievedOption {
|
|||
func NewRetrievedFromYAML(yamlBytes []byte, opts ...RetrievedOption) (*Retrieved, error) {
|
||||
var rawConf any
|
||||
if err := yaml.Unmarshal(yamlBytes, &rawConf); err != nil {
|
||||
if globalgates.StrictlyTypedInputGate.IsEnabled() {
|
||||
// If the string is not valid YAML, we try to use it verbatim as a string.
|
||||
strRep := string(yamlBytes)
|
||||
return NewRetrieved(strRep, append(opts, withStringRepresentation(strRep))...)
|
||||
}
|
||||
return nil, err
|
||||
// If the string is not valid YAML, we try to use it verbatim as a string.
|
||||
strRep := string(yamlBytes)
|
||||
return NewRetrieved(strRep, append(opts, withStringRepresentation(strRep))...)
|
||||
}
|
||||
|
||||
switch v := rawConf.(type) {
|
||||
switch rawConf.(type) {
|
||||
case string:
|
||||
val := v
|
||||
if globalgates.StrictlyTypedInputGate.IsEnabled() {
|
||||
val = string(yamlBytes)
|
||||
}
|
||||
val := string(yamlBytes)
|
||||
return NewRetrieved(val, append(opts, withStringRepresentation(val))...)
|
||||
default:
|
||||
opts = append(opts, withStringRepresentation(string(yamlBytes)))
|
||||
|
|
|
|||
|
|
@ -12,21 +12,14 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -11,22 +11,15 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -11,22 +11,15 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -11,22 +11,15 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -11,22 +11,15 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
|
|
@ -53,8 +53,6 @@ replace go.opentelemetry.io/collector/component/componentprofiles => ../../compo
|
|||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -41,8 +40,6 @@ require (
|
|||
go.opentelemetry.io/collector/component/componentprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -63,8 +60,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
||||
replace go.opentelemetry.io/collector/connector => ../
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -69,8 +69,6 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -45,8 +44,6 @@ require (
|
|||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumertest v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
|
|
@ -67,8 +64,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -37,8 +37,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/extension => ../../extension
|
||||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ require (
|
|||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -54,8 +53,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
golang.org/x/net v0.26.0 // indirect
|
||||
|
|
@ -67,8 +64,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../component
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../confmap
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -45,8 +44,6 @@ require (
|
|||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumertest v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
|
|
@ -67,8 +64,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -39,8 +38,6 @@ require (
|
|||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
|
|
@ -76,8 +73,6 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver
|
|||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@ require (
|
|||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
|
||||
go.opentelemetry.io/contrib/config v0.8.0 // indirect
|
||||
|
|
@ -142,8 +141,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -62,7 +62,6 @@ require (
|
|||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/receiver v0.107.0 // indirect
|
||||
go.opentelemetry.io/contrib/config v0.8.0 // indirect
|
||||
|
|
@ -137,8 +136,6 @@ retract (
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -33,8 +32,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/confmap v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -62,8 +59,4 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component/componentstatus => ../../component/componentstatus
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -43,8 +42,6 @@ require (
|
|||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||
go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -64,8 +61,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ require (
|
|||
github.com/go-logr/stdr v1.2.2 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -32,8 +31,6 @@ require (
|
|||
github.com/prometheus/common v0.55.0 // indirect
|
||||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -60,8 +57,4 @@ replace go.opentelemetry.io/collector/pdata => ../pdata
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component/componentstatus => ../component/componentstatus
|
||||
|
|
|
|||
|
|
@ -17,8 +17,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
|
|
@ -42,8 +41,6 @@ require (
|
|||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||
go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
|
|
@ -63,8 +60,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../../confmap
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ require (
|
|||
go.opentelemetry.io/collector/config/internal v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/contrib/config v0.8.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
|
||||
|
|
@ -123,8 +122,6 @@ replace go.opentelemetry.io/collector/config/confighttp => ../../config/confight
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -10,22 +10,15 @@ require (
|
|||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
github.com/knadh/koanf/v2 v2.1.1 // indirect
|
||||
github.com/mitchellh/copystructure v1.2.0 // indirect
|
||||
github.com/mitchellh/reflectwalk v1.0.2 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
||||
replace go.opentelemetry.io/collector/confmap => ../confmap
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0 h1:gHnMa2Y/pIxElCH2GlZZ1lZSsn6XMtufpGyP1XxdC/w=
|
||||
github.com/go-viper/mapstructure/v2 v2.1.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/knadh/koanf/maps v0.1.1 h1:G5TjmUh2D7G2YWf5SQQqSiHRJEjaicvU0KpypqB3NIs=
|
||||
github.com/knadh/koanf/maps v0.1.1/go.mod h1:npD/QZY3V6ghQDdcQzl1W4ICNVTkohC8E73eI2xW4yI=
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 h1:gOkxhHkemwG4LezxxN8DMOFopOPghxRVp7JbIvdvqzU=
|
||||
|
|
|
|||
3
go.mod
3
go.mod
|
|
@ -62,7 +62,6 @@ require (
|
|||
github.com/yusufpapurcu/wmi v1.2.4 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.4.0 // indirect
|
||||
|
|
@ -118,6 +117,4 @@ retract (
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ./pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ./internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ./consumer/consumerprofiles
|
||||
|
|
|
|||
|
|
@ -166,8 +166,6 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
@ -187,3 +185,5 @@ replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extensi
|
|||
replace go.opentelemetry.io/collector/service => ../../service
|
||||
|
||||
replace go.opentelemetry.io/collector/component/componentprofiles => ../../component/componentprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../globalgates
|
||||
|
|
|
|||
|
|
@ -13,9 +13,10 @@ var UseUnifiedEnvVarExpansionRules = featuregate.GlobalRegistry().MustRegister("
|
|||
|
||||
const StrictlyTypedInputID = "confmap.strictlyTypedInput"
|
||||
|
||||
var StrictlyTypedInputGate = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID,
|
||||
featuregate.StageBeta,
|
||||
var _ = featuregate.GlobalRegistry().MustRegister(StrictlyTypedInputID,
|
||||
featuregate.StageStable,
|
||||
featuregate.WithRegisterFromVersion("v0.103.0"),
|
||||
featuregate.WithRegisterToVersion("v0.109.0"),
|
||||
featuregate.WithRegisterDescription("Makes type casting rules during configuration unmarshaling stricter. See https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/env-vars.md for more details."),
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,16 +6,8 @@ package otelcol // import "go.opentelemetry.io/collector/otelcol"
|
|||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"go.opentelemetry.io/collector/confmap"
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
var (
|
||||
strictlyTypedMessageCoda = `Hint: Temporarily restore the previous behavior by disabling
|
||||
the ` + fmt.Sprintf("`%s`", globalgates.StrictlyTypedInputID) + ` feature gate. More details at:
|
||||
https://github.com/open-telemetry/opentelemetry-collector/issues/10552`
|
||||
)
|
||||
|
||||
// ConfigProvider provides the service configuration.
|
||||
|
|
@ -105,26 +97,7 @@ func (cm *configProvider) Get(ctx context.Context, factories Factories) (*Config
|
|||
|
||||
var cfg *configSettings
|
||||
if cfg, err = unmarshal(conf, factories); err != nil {
|
||||
err = fmt.Errorf("cannot unmarshal the configuration: %w", err)
|
||||
|
||||
if globalgates.StrictlyTypedInputGate.IsEnabled() {
|
||||
var shouldAddCoda bool
|
||||
for _, errorStr := range []string{
|
||||
"got unconvertible type", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L610
|
||||
"source data must be", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L1114
|
||||
"expected a map, got 'slice'", // https://github.com/mitchellh/mapstructure/blob/8508981/mapstructure.go#L831
|
||||
} {
|
||||
shouldAddCoda = strings.Contains(err.Error(), errorStr)
|
||||
if shouldAddCoda {
|
||||
break
|
||||
}
|
||||
}
|
||||
if shouldAddCoda {
|
||||
err = fmt.Errorf("%w\n\n%s", err, strictlyTypedMessageCoda)
|
||||
}
|
||||
}
|
||||
|
||||
return nil, err
|
||||
return nil, fmt.Errorf("cannot unmarshal the configuration: %w", err)
|
||||
}
|
||||
|
||||
return &Config{
|
||||
|
|
|
|||
|
|
@ -14,8 +14,6 @@ import (
|
|||
"gopkg.in/yaml.v3"
|
||||
|
||||
"go.opentelemetry.io/collector/confmap"
|
||||
"go.opentelemetry.io/collector/featuregate"
|
||||
"go.opentelemetry.io/collector/internal/globalgates"
|
||||
)
|
||||
|
||||
func newConfig(yamlBytes []byte, factories Factories) (*Config, error) {
|
||||
|
|
@ -139,75 +137,3 @@ func TestGetConfmap(t *testing.T) {
|
|||
|
||||
assert.EqualValues(t, yamlMap, cmap.ToStringMap())
|
||||
}
|
||||
|
||||
func TestStrictlyTypedCoda(t *testing.T) {
|
||||
tests := []struct {
|
||||
basename string
|
||||
// isErrFromStrictTypes indicates whether the test should expect an error when the feature gate is
|
||||
// disabled. If so, we check that it errs both with and without the feature gate and that the coda is never
|
||||
// present.
|
||||
isErrFromStrictTypes bool
|
||||
}{
|
||||
{basename: "weak-implicit-bool-to-string.yaml"},
|
||||
{basename: "weak-implicit-int-to-string.yaml"},
|
||||
{basename: "weak-implicit-bool-to-int.yaml"},
|
||||
{basename: "weak-implicit-string-to-int.yaml"},
|
||||
{basename: "weak-implicit-int-to-bool.yaml"},
|
||||
{basename: "weak-implicit-string-to-bool.yaml"},
|
||||
{basename: "weak-empty-map-to-empty-array.yaml"},
|
||||
{basename: "weak-slice-of-maps-to-map.yaml"},
|
||||
{basename: "weak-single-element-to-slice.yaml"},
|
||||
{
|
||||
basename: "otelcol-invalid-components.yaml",
|
||||
isErrFromStrictTypes: true,
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.basename, func(t *testing.T) {
|
||||
filename := filepath.Join("testdata", tt.basename)
|
||||
uriLocation := "file:" + filename
|
||||
fileProvider := newFakeProvider("file", func(_ context.Context, _ string, _ confmap.WatcherFunc) (*confmap.Retrieved, error) {
|
||||
return confmap.NewRetrieved(newConfFromFile(t, filename))
|
||||
})
|
||||
cp, err := NewConfigProvider(ConfigProviderSettings{
|
||||
ResolverSettings: confmap.ResolverSettings{
|
||||
URIs: []string{uriLocation},
|
||||
ProviderFactories: []confmap.ProviderFactory{fileProvider},
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
factories, err := nopFactories()
|
||||
require.NoError(t, err)
|
||||
|
||||
// Save the previous value of the feature gate and restore it after the test.
|
||||
prev := globalgates.StrictlyTypedInputGate.IsEnabled()
|
||||
defer func() {
|
||||
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, prev))
|
||||
}()
|
||||
|
||||
// Ensure the error does not appear with the feature gate disabled.
|
||||
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, false))
|
||||
_, errWeakTypes := cp.Get(context.Background(), factories)
|
||||
if tt.isErrFromStrictTypes {
|
||||
require.Error(t, errWeakTypes)
|
||||
// Ensure coda is **NOT** present.
|
||||
assert.NotContains(t, errWeakTypes.Error(), strictlyTypedMessageCoda)
|
||||
} else {
|
||||
require.NoError(t, errWeakTypes)
|
||||
}
|
||||
|
||||
// Test with the feature gate enabled.
|
||||
require.NoError(t, featuregate.GlobalRegistry().Set(globalgates.StrictlyTypedInputID, true))
|
||||
_, errStrictTypes := cp.Get(context.Background(), factories)
|
||||
require.Error(t, errStrictTypes)
|
||||
if tt.isErrFromStrictTypes {
|
||||
// Ensure coda is **NOT** present.
|
||||
assert.NotContains(t, errStrictTypes.Error(), strictlyTypedMessageCoda)
|
||||
} else {
|
||||
// Ensure coda is present.
|
||||
assert.ErrorContains(t, errStrictTypes, strictlyTypedMessageCoda)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,33 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: {} # <-- Empty map casted to empty array
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
logs:
|
||||
sampling:
|
||||
initial: true # <-- Implicit cast bool to int
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: true # <-- Implicit cast bool to string
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
logs:
|
||||
sampling:
|
||||
enabled: 1 # <-- Implicit cast int to bool
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: 0xdeadbeef # <-- Implicit cast int to string
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
logs:
|
||||
sampling:
|
||||
enabled: t # <-- Implicit cast string to bool
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
logs:
|
||||
sampling:
|
||||
initial: "100" # <-- Implicit cast string to int
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
extensions: nop # <-- Single element casted to slice
|
||||
pipelines:
|
||||
traces:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
receivers:
|
||||
nop:
|
||||
|
||||
processors:
|
||||
nop:
|
||||
|
||||
exporters:
|
||||
nop:
|
||||
|
||||
extensions:
|
||||
nop:
|
||||
|
||||
connectors:
|
||||
nop/con:
|
||||
|
||||
service:
|
||||
telemetry:
|
||||
metrics:
|
||||
address: localhost:8888
|
||||
extensions: [nop]
|
||||
pipelines:
|
||||
- traces: # <-- Slice of maps casted to map
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop, nop/con]
|
||||
metrics:
|
||||
receivers: [nop]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
- logs:
|
||||
receivers: [nop, nop/con]
|
||||
processors: [nop]
|
||||
exporters: [nop]
|
||||
|
|
@ -31,7 +31,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -48,8 +47,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
|
||||
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
|
||||
|
|
@ -65,8 +62,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/processor => ../
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -69,8 +69,6 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
|
|||
|
||||
replace go.opentelemetry.io/collector/config/configtelemetry => ../config/configtelemetry
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -48,8 +47,6 @@ require (
|
|||
go.opentelemetry.io/collector/component/componentstatus v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/testdata v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
|
|
@ -71,8 +68,6 @@ require (
|
|||
|
||||
replace go.opentelemetry.io/collector => ../../
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/processor => ../
|
||||
|
||||
replace go.opentelemetry.io/collector/component => ../../component
|
||||
|
|
|
|||
|
|
@ -22,8 +22,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -41,8 +41,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
|
|||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer => ../../consumer
|
||||
|
|
|
|||
|
|
@ -69,8 +69,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../config/config
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ require (
|
|||
github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
|
||||
github.com/gogo/protobuf v1.3.2 // indirect
|
||||
github.com/google/uuid v1.6.0 // indirect
|
||||
github.com/hashicorp/go-version v1.7.0 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/knadh/koanf/maps v0.1.1 // indirect
|
||||
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
|
||||
|
|
@ -38,8 +37,6 @@ require (
|
|||
github.com/prometheus/procfs v0.15.1 // indirect
|
||||
go.opentelemetry.io/collector/config/configtelemetry v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/consumer/consumerprofiles v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/otel v1.28.0 // indirect
|
||||
|
|
@ -75,8 +72,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
|
|||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
||||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
|
|
|||
|
|
@ -19,8 +19,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
|
|||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
|
||||
github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ require (
|
|||
go.opentelemetry.io/collector/extension v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/extension/auth v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/featuregate v1.13.0 // indirect
|
||||
go.opentelemetry.io/collector/internal/globalgates v0.107.0 // indirect
|
||||
go.opentelemetry.io/collector/pdata/pprofile v0.107.0 // indirect
|
||||
go.opentelemetry.io/contrib/config v0.8.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
|
||||
|
|
@ -141,8 +140,6 @@ retract (
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
|
|||
|
||||
replace go.opentelemetry.io/collector => ../..
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
|
||||
|
||||
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
|
||||
|
|
|
|||
|
|
@ -159,8 +159,6 @@ replace go.opentelemetry.io/collector/config/configcompression => ../config/conf
|
|||
|
||||
replace go.opentelemetry.io/collector/pdata/pprofile => ../pdata/pprofile
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumerprofiles => ../consumer/consumerprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
|
||||
|
|
@ -168,3 +166,5 @@ replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consu
|
|||
replace go.opentelemetry.io/collector/component/componentprofiles => ../component/componentprofiles
|
||||
|
||||
replace go.opentelemetry.io/collector/client => ../client
|
||||
|
||||
replace go.opentelemetry.io/collector/internal/globalgates => ../internal/globalgates
|
||||
|
|
|
|||
Loading…
Reference in New Issue