From 256c7c3536b45b92029d4308ee9aaf7f4119a929 Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Mon, 22 Apr 2024 03:23:21 -0400 Subject: [PATCH 1/6] [cmd/builder] Allow configuring confmap providers (#9513) **Description:** Allow configuring confmap providers in the builder's config. If the field isn't set, the default set of providers is used. **Link to tracking Issue:** Resolves https://github.com/open-telemetry/opentelemetry-collector/issues/4759. **Testing:** Extended unit tests. **Documentation:** Updated the readme to include the new options in the example manifest file. cc @mx-psi --------- Co-authored-by: Evan Bradley Co-authored-by: Pablo Baeyens --- .chloggen/builder-confmap-providers.yaml | 31 +++++++ cmd/builder/README.md | 14 +++- cmd/builder/internal/builder/config.go | 77 ++++++++++++++--- cmd/builder/internal/builder/config_test.go | 83 ++++++++++++++++++- cmd/builder/internal/builder/main.go | 3 +- cmd/builder/internal/builder/main_test.go | 70 +++++++++++++--- .../internal/builder/templates/go.mod.tmpl | 6 ++ .../internal/builder/templates/main.go.tmpl | 28 ++++++- cmd/builder/internal/command.go | 3 +- cmd/builder/internal/config/default.yaml | 7 ++ cmd/otelcorecol/builder-config.yaml | 7 ++ cmd/otelcorecol/main.go | 7 +- 12 files changed, 305 insertions(+), 31 deletions(-) create mode 100755 .chloggen/builder-confmap-providers.yaml diff --git a/.chloggen/builder-confmap-providers.yaml b/.chloggen/builder-confmap-providers.yaml new file mode 100755 index 00000000000..f617b1f058e --- /dev/null +++ b/.chloggen/builder-confmap-providers.yaml @@ -0,0 +1,31 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: enhancement + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: cmd/builder + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allow configuring `confmap.Provider`s in the builder. + +# One or more tracking issues or pull requests related to the change +issues: [4759] + +# (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: | + If no providers are specified, the defaults are used. + The default providers are: env, file, http, https, and yaml. + + To configure providers, use the `providers` key in your OCB build + manifest with a list of Go modules for your providers. + The modules will work the same as other Collector components. + +# 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: [user] diff --git a/cmd/builder/README.md b/cmd/builder/README.md index 47f50399737..bfc72adab46 100644 --- a/cmd/builder/README.md +++ b/cmd/builder/README.md @@ -12,14 +12,20 @@ dist: description: Local OpenTelemetry Collector binary output_path: /tmp/dist exporters: - - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.86.0 - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.86.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.99.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.86.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.86.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0 + +providers: + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + +converters: + - gomod: go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0 EOF $ builder --config=otelcol-builder.yaml $ cat > /tmp/otelcol.yaml <= 0.86.0") if err != nil { return err @@ -124,6 +133,20 @@ func (c *Config) SetRequireOtelColModule() error { } c.Distribution.RequireOtelColModule = constraint.Check(otelColVersion) + + // check whether confmap factories are supported + constraint, err = version.NewConstraint(">= 0.99.0") + if err != nil { + return err + } + + otelColVersion, err = version.NewVersion(c.Distribution.OtelColVersion) + if err != nil { + return err + } + + c.Distribution.SupportsConfmapFactories = constraint.Check(otelColVersion) + return nil } @@ -156,6 +179,36 @@ func (c *Config) ParseModules() error { return err } + if c.Providers != nil { + providers, err := parseModules(*c.Providers) + if err != nil { + return err + } + c.Providers = &providers + } else { + providers, err := parseModules([]Module{ + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/envprovider v" + c.Distribution.OtelColVersion, + }, + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/fileprovider v" + c.Distribution.OtelColVersion, + }, + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/httpprovider v" + c.Distribution.OtelColVersion, + }, + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/httpsprovider v" + c.Distribution.OtelColVersion, + }, + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/yamlprovider v" + c.Distribution.OtelColVersion, + }, + }) + if err != nil { + return err + } + c.Providers = &providers + } + return nil } diff --git a/cmd/builder/internal/builder/config_test.go b/cmd/builder/internal/builder/config_test.go index dccee464fe4..cd81b9f2887 100644 --- a/cmd/builder/internal/builder/config_test.go +++ b/cmd/builder/internal/builder/config_test.go @@ -220,8 +220,89 @@ func TestRequireOtelColModule(t *testing.T) { t.Run(tt.Version, func(t *testing.T) { cfg := NewDefaultConfig() cfg.Distribution.OtelColVersion = tt.Version - require.NoError(t, cfg.SetRequireOtelColModule()) + require.NoError(t, cfg.SetBackwardsCompatibility()) assert.Equal(t, tt.ExpectedRequireOtelColModule, cfg.Distribution.RequireOtelColModule) }) } } + +func TestConfmapFactoryVersions(t *testing.T) { + testCases := []struct { + version string + supported bool + err bool + }{ + { + version: "x.0.0", + supported: false, + err: true, + }, + { + version: "0.x.0", + supported: false, + err: true, + }, + { + version: "0.0.0", + supported: false, + }, + { + version: "0.98.0", + supported: false, + }, + { + version: "0.98.1", + supported: false, + }, + { + version: "0.99.0", + supported: true, + }, + { + version: "0.99.7", + supported: true, + }, + { + version: "0.100.0", + supported: true, + }, + { + version: "0.100.1", + supported: true, + }, + { + version: "1.0", + supported: true, + }, + { + version: "1.0.0", + supported: true, + }, + } + + for _, tt := range testCases { + t.Run(tt.version, func(t *testing.T) { + cfg := NewDefaultConfig() + cfg.Distribution.OtelColVersion = tt.version + if !tt.err { + require.NoError(t, cfg.SetBackwardsCompatibility()) + assert.Equal(t, tt.supported, cfg.Distribution.SupportsConfmapFactories) + } else { + require.Error(t, cfg.SetBackwardsCompatibility()) + } + }) + } +} + +func TestAddsDefaultProviders(t *testing.T) { + cfg := NewDefaultConfig() + cfg.Providers = nil + assert.NoError(t, cfg.ParseModules()) + assert.Len(t, *cfg.Providers, 5) +} + +func TestSkipsNilFieldValidation(t *testing.T) { + cfg := NewDefaultConfig() + cfg.Providers = nil + assert.NoError(t, cfg.Validate()) +} diff --git a/cmd/builder/internal/builder/main.go b/cmd/builder/internal/builder/main.go index 5acfd2275f0..c3458b890b4 100644 --- a/cmd/builder/internal/builder/main.go +++ b/cmd/builder/internal/builder/main.go @@ -235,7 +235,8 @@ func (c *Config) allComponents() []Module { append(c.Receivers, append(c.Processors, append(c.Extensions, - c.Connectors...)...)...)...) + append(c.Connectors, + *c.Providers...)...)...)...)...) } func (c *Config) readGoModFile() (string, map[string]string, error) { diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 721b27b1456..884ed8f99d9 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -33,12 +33,23 @@ require ( )`) ) +func newInitializedConfig(t *testing.T) Config { + cfg := NewDefaultConfig() + // Validate and ParseModules will be called before the config is + // given to Generate. + assert.NoError(t, cfg.Validate()) + assert.NoError(t, cfg.SetBackwardsCompatibility()) + assert.NoError(t, cfg.ParseModules()) + + return cfg +} + func TestGenerateDefault(t *testing.T) { - require.NoError(t, Generate(NewDefaultConfig())) + require.NoError(t, Generate(newInitializedConfig(t))) } func TestGenerateInvalidOutputPath(t *testing.T) { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.OutputPath = "/:invalid" err := Generate(cfg) require.Error(t, err) @@ -54,7 +65,7 @@ func TestVersioning(t *testing.T) { { description: "defaults", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.Go = "go" return cfg }, @@ -63,7 +74,7 @@ func TestVersioning(t *testing.T) { { description: "require otelcol", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.Go = "go" cfg.Distribution.RequireOtelColModule = true return cfg @@ -73,7 +84,7 @@ func TestVersioning(t *testing.T) { { description: "only gomod file, skip generate", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) tempDir := t.TempDir() err := makeModule(tempDir, goModTestFile) require.NoError(t, err) @@ -87,7 +98,7 @@ func TestVersioning(t *testing.T) { { description: "old otel version", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Verbose = true cfg.Distribution.Go = "go" cfg.Distribution.OtelColVersion = "0.97.0" @@ -105,6 +116,12 @@ func TestVersioning(t *testing.T) { }, }) require.NoError(t, err) + *cfg.Providers, err = parseModules([]Module{ + { + GoMod: "go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0", + }, + }) + require.NoError(t, err) return cfg }, expectedErr: nil, @@ -112,7 +129,7 @@ func TestVersioning(t *testing.T) { { description: "old component version", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.Go = "go" cfg.Exporters = []Module{ { @@ -126,7 +143,7 @@ func TestVersioning(t *testing.T) { { description: "old component version without strict mode", cfgBuilder: func() Config { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.Go = "go" cfg.SkipStrictVersioning = true cfg.Exporters = []Module{ @@ -142,7 +159,7 @@ func TestVersioning(t *testing.T) { for _, tc := range tests { t.Run(tc.description, func(t *testing.T) { cfg := tc.cfgBuilder() - require.NoError(t, cfg.SetRequireOtelColModule()) + require.NoError(t, cfg.SetBackwardsCompatibility()) require.NoError(t, cfg.Validate()) require.NoError(t, cfg.ParseModules()) err := GenerateAndCompile(cfg) @@ -152,7 +169,7 @@ func TestVersioning(t *testing.T) { } func TestSkipGenerate(t *testing.T) { - cfg := NewDefaultConfig() + cfg := newInitializedConfig(t) cfg.Distribution.OutputPath = t.TempDir() cfg.SkipGenerate = true err := Generate(cfg) @@ -241,6 +258,38 @@ func TestGenerateAndCompile(t *testing.T) { return cfg }, }, + { + testCase: "No providers", + cfgBuilder: func(t *testing.T) Config { + cfg := NewDefaultConfig() + cfg.Distribution.OutputPath = t.TempDir() + cfg.Replaces = append(cfg.Replaces, replaces...) + cfg.Providers = &[]Module{} + return cfg + }, + }, + { + testCase: "Pre-confmap factories", + cfgBuilder: func(t *testing.T) Config { + cfg := NewDefaultConfig() + cfg.Distribution.OutputPath = t.TempDir() + cfg.Replaces = append(cfg.Replaces, replaces...) + cfg.Distribution.OtelColVersion = "0.98.0" + cfg.SkipStrictVersioning = true + return cfg + }, + }, + { + testCase: "With confmap factories", + cfgBuilder: func(t *testing.T) Config { + cfg := NewDefaultConfig() + cfg.Distribution.OutputPath = t.TempDir() + cfg.Replaces = append(cfg.Replaces, replaces...) + cfg.Distribution.OtelColVersion = "0.99.0" + cfg.SkipStrictVersioning = true + return cfg + }, + }, } for _, tt := range testCases { @@ -248,6 +297,7 @@ func TestGenerateAndCompile(t *testing.T) { cfg := tt.cfgBuilder(t) assert.NoError(t, cfg.Validate()) assert.NoError(t, cfg.SetGoPath()) + assert.NoError(t, cfg.ParseModules()) require.NoError(t, GenerateAndCompile(cfg)) }) } diff --git a/cmd/builder/internal/builder/templates/go.mod.tmpl b/cmd/builder/internal/builder/templates/go.mod.tmpl index f70306ae95b..ad6fd3f78f6 100644 --- a/cmd/builder/internal/builder/templates/go.mod.tmpl +++ b/cmd/builder/internal/builder/templates/go.mod.tmpl @@ -5,6 +5,12 @@ module {{.Distribution.Module}} go 1.21 require ( + {{if .Distribution.SupportsConfmapFactories -}} + go.opentelemetry.io/collector/confmap/converter/expandconverter v{{.Distribution.OtelColVersion}} + {{- range .Providers}} + {{if .GoMod}}{{.GoMod}}{{end}} + {{- end}} + {{- end}} {{- range .Connectors}} {{if .GoMod}}{{.GoMod}}{{end}} {{- end}} diff --git a/cmd/builder/internal/builder/templates/main.go.tmpl b/cmd/builder/internal/builder/templates/main.go.tmpl index 64a81295bcb..f9964c5d5ec 100644 --- a/cmd/builder/internal/builder/templates/main.go.tmpl +++ b/cmd/builder/internal/builder/templates/main.go.tmpl @@ -7,6 +7,13 @@ import ( "log" "go.opentelemetry.io/collector/component" + {{- if .Distribution.SupportsConfmapFactories}} + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/converter/expandconverter" + {{- range .Providers}} + {{.Name}} "{{.Import}}" + {{- end}} + {{- end}} "go.opentelemetry.io/collector/otelcol" ) @@ -17,7 +24,26 @@ func main() { Version: "{{ .Distribution.Version }}", } - if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil { + set := otelcol.CollectorSettings{ + BuildInfo: info, + Factories: components, + {{- if .Distribution.SupportsConfmapFactories}} + ConfigProviderSettings: otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + ProviderFactories: []confmap.ProviderFactory{ + {{- range .Providers}} + {{.Name}}.NewFactory(), + {{- end}} + }, + ConverterFactories: []confmap.ConverterFactory{ + expandconverter.NewFactory(), + }, + }, + }, + {{- end}} + } + + if err := run(set); err != nil { log.Fatal(err) } } diff --git a/cmd/builder/internal/command.go b/cmd/builder/internal/command.go index 9ced5aa6c28..b6cc41a9ba5 100644 --- a/cmd/builder/internal/command.go +++ b/cmd/builder/internal/command.go @@ -66,7 +66,7 @@ configuration is provided, ocb will generate a default Collector. return fmt.Errorf("go not found: %w", err) } - if err := cfg.SetRequireOtelColModule(); err != nil { + if err := cfg.SetBackwardsCompatibility(); err != nil { return fmt.Errorf("unable to compare otelcol version: %w", err) } @@ -170,6 +170,7 @@ func applyCfgFromFile(flags *flag.FlagSet, cfgFromFile builder.Config) { cfg.Receivers = cfgFromFile.Receivers cfg.Processors = cfgFromFile.Processors cfg.Connectors = cfgFromFile.Connectors + cfg.Providers = cfgFromFile.Providers cfg.Replaces = cfgFromFile.Replaces cfg.Excludes = cfgFromFile.Excludes diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 68aa48b8211..978eaea6775 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -24,3 +24,10 @@ processors: connectors: - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.98.0 +providers: + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.95.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.95.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.95.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.95.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.95.0 + diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 11170523329..9946db772de 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -24,6 +24,13 @@ processors: connectors: - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.98.0 +providers: + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 + replaces: - go.opentelemetry.io/collector => ../../ - go.opentelemetry.io/collector/otelcol => ../../otelcol diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index ad081f185cd..27ebe7aaa11 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -17,7 +17,12 @@ func main() { Version: "0.98.0-dev", } - if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: components}); err != nil { + set := otelcol.CollectorSettings{ + BuildInfo: info, + Factories: components, + } + + if err := run(set); err != nil { log.Fatal(err) } } From 6611edfa5a69f7dd3205115a14f9f92cd40c5f23 Mon Sep 17 00:00:00 2001 From: Tyler Helmuth <12352919+TylerHelmuth@users.noreply.github.com> Date: Mon, 22 Apr 2024 01:41:14 -0600 Subject: [PATCH 2/6] Remove `GetExporters` from component.Host (#9987) **Description:** Remove the deprecated `GetExporters` function from `component.Host` **Link to tracking Issue:** Related to https://github.com/open-telemetry/opentelemetry-collector/issues/7370 --- .../component-host-remove-getexporters.yaml | 25 +++++++++++++++++++ component/componenttest/nop_host_test.go | 1 - component/host.go | 20 --------------- service/host.go | 6 +++++ 4 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 .chloggen/component-host-remove-getexporters.yaml diff --git a/.chloggen/component-host-remove-getexporters.yaml b/.chloggen/component-host-remove-getexporters.yaml new file mode 100644 index 00000000000..001ed23ca18 --- /dev/null +++ b/.chloggen/component-host-remove-getexporters.yaml @@ -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: component + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Removed deprecated function `GetExporters` from `component.Host` interface + +# One or more tracking issues or pull requests related to the change +issues: [9987] + +# (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: [api] diff --git a/component/componenttest/nop_host_test.go b/component/componenttest/nop_host_test.go index 4aada24b1be..111c8f33574 100644 --- a/component/componenttest/nop_host_test.go +++ b/component/componenttest/nop_host_test.go @@ -17,7 +17,6 @@ func TestNewNopHost(t *testing.T) { require.NotNil(t, nh) require.IsType(t, &nopHost{}, nh) - assert.Nil(t, nh.GetExporters()) // nolint: staticcheck assert.Nil(t, nh.GetExtensions()) assert.Nil(t, nh.GetFactory(component.KindReceiver, component.MustNewType("test"))) } diff --git a/component/host.go b/component/host.go index 4b6933baaef..50472a6d88c 100644 --- a/component/host.go +++ b/component/host.go @@ -27,24 +27,4 @@ type Host interface { // GetExtensions can be called by the component anytime after Component.Start() begins and // until Component.Shutdown() ends. GetExtensions() map[ID]Component - - // GetExporters returns the map of exporters. Only enabled and created exporters will be returned. - // Typically is used to find exporters by type or by full config name. Both cases - // can be done by iterating the returned map. There are typically very few exporters, - // so there are no performance implications due to iteration. - // This returns a map by DataType of maps by exporter configs to the exporter instance. - // Note that an exporter with the same name may be attached to multiple pipelines and - // thus we may have an instance of the exporter for multiple data types. - // This is an experimental function that may change or even be removed completely. - // - // GetExporters can be called by the component anytime after Component.Start() begins and - // until Component.Shutdown() ends. - // - // Deprecated: [0.79.0] This function will be removed in the future. - // Several components in the contrib repository use this function so it cannot be removed - // before those cases are removed. In most cases, use of this function can be replaced by a - // connector. See https://github.com/open-telemetry/opentelemetry-collector/issues/7370 and - // https://github.com/open-telemetry/opentelemetry-collector/pull/7390#issuecomment-1483710184 - // for additional information. - GetExporters() map[DataType]map[ID]Component } diff --git a/service/host.go b/service/host.go index 870e0bfc446..ce8dc530d40 100644 --- a/service/host.go +++ b/service/host.go @@ -14,6 +14,12 @@ import ( "go.opentelemetry.io/collector/service/internal/graph" ) +// TODO: remove as part of https://github.com/open-telemetry/opentelemetry-collector/issues/7370 for service 1.0 +type getExporters interface { + GetExporters() map[component.DataType]map[component.ID]component.Component +} + +var _ getExporters = (*serviceHost)(nil) var _ component.Host = (*serviceHost)(nil) type serviceHost struct { From bb48107f4242301357872eae21a1f5d319b92161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juraci=20Paix=C3=A3o=20Kr=C3=B6hling?= Date: Mon, 22 Apr 2024 17:28:45 +0200 Subject: [PATCH 3/6] [exporter/otlp] Allow DNS scheme to be used in endpoint (#10010) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #4274 Signed-off-by: Juraci Paixão Kröhling --- .../4274-allow-dns-as-scheme-for-endpoint.yaml | 13 +++++++++++++ exporter/otlpexporter/config.go | 2 ++ exporter/otlpexporter/config_test.go | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 .chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml diff --git a/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml b/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml new file mode 100644 index 00000000000..85668494ce8 --- /dev/null +++ b/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml @@ -0,0 +1,13 @@ +# Use this changelog template to create an entry for release notes. + +# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' +change_type: bug_fix + +# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) +component: exporter/otlp + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Allow DNS scheme to be used in endpoint + +# One or more tracking issues or pull requests related to the change +issues: [4274] diff --git a/exporter/otlpexporter/config.go b/exporter/otlpexporter/config.go index 8b449fbbca3..62956f293ed 100644 --- a/exporter/otlpexporter/config.go +++ b/exporter/otlpexporter/config.go @@ -49,6 +49,8 @@ func (c *Config) sanitizedEndpoint() string { return strings.TrimPrefix(c.Endpoint, "http://") case strings.HasPrefix(c.Endpoint, "https://"): return strings.TrimPrefix(c.Endpoint, "https://") + case strings.HasPrefix(c.Endpoint, "dns:///"): + return strings.TrimPrefix(c.Endpoint, "dns:///") default: return c.Endpoint } diff --git a/exporter/otlpexporter/config_test.go b/exporter/otlpexporter/config_test.go index e183ebc5ef2..7a644b7ef0e 100644 --- a/exporter/otlpexporter/config_test.go +++ b/exporter/otlpexporter/config_test.go @@ -130,3 +130,10 @@ func TestUnmarshalInvalidConfig(t *testing.T) { } } + +func TestValidDNSEndpoint(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig().(*Config) + cfg.Endpoint = "dns:///backend.example.com:4317" + assert.NoError(t, cfg.Validate()) +} From cc9e3dd3ec26cf9c5e8d8995175a06de9382853b Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 22 Apr 2024 08:32:35 -0700 Subject: [PATCH 4/6] [mdatagen] Rename include/exclude config options (#9960) The `include` and `exclude ` options in the resource attributes group sound confusing. It's easy to assume that matching filters will include or exclude resource attributes themselves while they control emitted resource metrics. The proposal is to change the include/exclude options to `metrics_include`/`metrics_exclude` with detailed comments. These names make it cleaner that matching rules limit the emitted metrics, not resource attributes. Updates https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/25134 --- .../internal/metadata/generated_config.go | 11 +++- .../internal/metadata/generated_metrics.go | 66 +++++++++---------- .../internal/metadata/testdata/config.yaml | 32 ++++----- cmd/mdatagen/templates/config.go.tmpl | 9 ++- cmd/mdatagen/templates/metrics.go.tmpl | 10 +-- .../templates/testdata/config.yaml.tmpl | 4 +- 6 files changed, 71 insertions(+), 61 deletions(-) diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config.go index 8c76156626a..05ddc47ac40 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_config.go @@ -57,9 +57,14 @@ func DefaultMetricsConfig() MetricsConfig { // ResourceAttributeConfig provides common config for a particular resource attribute. type ResourceAttributeConfig struct { - Enabled bool `mapstructure:"enabled"` - Include []filter.Config `mapstructure:"include"` - Exclude []filter.Config `mapstructure:"exclude"` + Enabled bool `mapstructure:"enabled"` + // Experimental: MetricsInclude defines a list of filters for attribute values. + // If the list is not empty, only metrics with matching resource attribute values will be emitted. + MetricsInclude []filter.Config `mapstructure:"metrics_include"` + // Experimental: MetricsExclude defines a list of filters for attribute values. + // If the list is not empty, metrics with matching resource attribute values will not be emitted. + // MetricsInclude has higher priority than MetricsExclude. + MetricsExclude []filter.Config `mapstructure:"metrics_exclude"` enabledSetByUser bool } diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go index 6a4c7753c2f..344599e2c40 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_metrics.go @@ -357,7 +357,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting if !mbc.ResourceAttributes.StringResourceAttrDisableWarning.enabledSetByUser { settings.Logger.Warn("[WARNING] Please set `enabled` field explicitly for `string.resource.attr_disable_warning`: This resource_attribute will be disabled by default soon.") } - if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.enabledSetByUser || mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Include != nil || mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Exclude != nil { + if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.enabledSetByUser || mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsInclude != nil || mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsExclude != nil { settings.Logger.Warn("[WARNING] `string.resource.attr_remove_warning` should not be configured: This resource_attribute is deprecated and will be removed soon.") } if mbc.ResourceAttributes.StringResourceAttrToBeRemoved.Enabled { @@ -376,53 +376,53 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting resourceAttributeIncludeFilter: make(map[string]filter.Filter), resourceAttributeExcludeFilter: make(map[string]filter.Filter), } - if mbc.ResourceAttributes.MapResourceAttr.Include != nil { - mb.resourceAttributeIncludeFilter["map.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.MapResourceAttr.Include) + if mbc.ResourceAttributes.MapResourceAttr.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["map.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.MapResourceAttr.MetricsInclude) } - if mbc.ResourceAttributes.MapResourceAttr.Exclude != nil { - mb.resourceAttributeExcludeFilter["map.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.MapResourceAttr.Exclude) + if mbc.ResourceAttributes.MapResourceAttr.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["map.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.MapResourceAttr.MetricsExclude) } - if mbc.ResourceAttributes.OptionalResourceAttr.Include != nil { - mb.resourceAttributeIncludeFilter["optional.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.OptionalResourceAttr.Include) + if mbc.ResourceAttributes.OptionalResourceAttr.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["optional.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.OptionalResourceAttr.MetricsInclude) } - if mbc.ResourceAttributes.OptionalResourceAttr.Exclude != nil { - mb.resourceAttributeExcludeFilter["optional.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.OptionalResourceAttr.Exclude) + if mbc.ResourceAttributes.OptionalResourceAttr.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["optional.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.OptionalResourceAttr.MetricsExclude) } - if mbc.ResourceAttributes.SliceResourceAttr.Include != nil { - mb.resourceAttributeIncludeFilter["slice.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.SliceResourceAttr.Include) + if mbc.ResourceAttributes.SliceResourceAttr.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["slice.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.SliceResourceAttr.MetricsInclude) } - if mbc.ResourceAttributes.SliceResourceAttr.Exclude != nil { - mb.resourceAttributeExcludeFilter["slice.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.SliceResourceAttr.Exclude) + if mbc.ResourceAttributes.SliceResourceAttr.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["slice.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.SliceResourceAttr.MetricsExclude) } - if mbc.ResourceAttributes.StringEnumResourceAttr.Include != nil { - mb.resourceAttributeIncludeFilter["string.enum.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringEnumResourceAttr.Include) + if mbc.ResourceAttributes.StringEnumResourceAttr.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["string.enum.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringEnumResourceAttr.MetricsInclude) } - if mbc.ResourceAttributes.StringEnumResourceAttr.Exclude != nil { - mb.resourceAttributeExcludeFilter["string.enum.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringEnumResourceAttr.Exclude) + if mbc.ResourceAttributes.StringEnumResourceAttr.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["string.enum.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringEnumResourceAttr.MetricsExclude) } - if mbc.ResourceAttributes.StringResourceAttr.Include != nil { - mb.resourceAttributeIncludeFilter["string.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttr.Include) + if mbc.ResourceAttributes.StringResourceAttr.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["string.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttr.MetricsInclude) } - if mbc.ResourceAttributes.StringResourceAttr.Exclude != nil { - mb.resourceAttributeExcludeFilter["string.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttr.Exclude) + if mbc.ResourceAttributes.StringResourceAttr.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["string.resource.attr"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttr.MetricsExclude) } - if mbc.ResourceAttributes.StringResourceAttrDisableWarning.Include != nil { - mb.resourceAttributeIncludeFilter["string.resource.attr_disable_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrDisableWarning.Include) + if mbc.ResourceAttributes.StringResourceAttrDisableWarning.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["string.resource.attr_disable_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrDisableWarning.MetricsInclude) } - if mbc.ResourceAttributes.StringResourceAttrDisableWarning.Exclude != nil { - mb.resourceAttributeExcludeFilter["string.resource.attr_disable_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrDisableWarning.Exclude) + if mbc.ResourceAttributes.StringResourceAttrDisableWarning.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["string.resource.attr_disable_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrDisableWarning.MetricsExclude) } - if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Include != nil { - mb.resourceAttributeIncludeFilter["string.resource.attr_remove_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Include) + if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["string.resource.attr_remove_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsInclude) } - if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Exclude != nil { - mb.resourceAttributeExcludeFilter["string.resource.attr_remove_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrRemoveWarning.Exclude) + if mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["string.resource.attr_remove_warning"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrRemoveWarning.MetricsExclude) } - if mbc.ResourceAttributes.StringResourceAttrToBeRemoved.Include != nil { - mb.resourceAttributeIncludeFilter["string.resource.attr_to_be_removed"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrToBeRemoved.Include) + if mbc.ResourceAttributes.StringResourceAttrToBeRemoved.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["string.resource.attr_to_be_removed"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrToBeRemoved.MetricsInclude) } - if mbc.ResourceAttributes.StringResourceAttrToBeRemoved.Exclude != nil { - mb.resourceAttributeExcludeFilter["string.resource.attr_to_be_removed"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrToBeRemoved.Exclude) + if mbc.ResourceAttributes.StringResourceAttrToBeRemoved.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["string.resource.attr_to_be_removed"] = filter.CreateFilter(mbc.ResourceAttributes.StringResourceAttrToBeRemoved.MetricsExclude) } for _, op := range options { diff --git a/cmd/mdatagen/internal/samplereceiver/internal/metadata/testdata/config.yaml b/cmd/mdatagen/internal/samplereceiver/internal/metadata/testdata/config.yaml index 3786910e06d..c4b7edd6568 100644 --- a/cmd/mdatagen/internal/samplereceiver/internal/metadata/testdata/config.yaml +++ b/cmd/mdatagen/internal/samplereceiver/internal/metadata/testdata/config.yaml @@ -61,67 +61,67 @@ filter_set_include: resource_attributes: map.resource.attr: enabled: true - include: + metrics_include: - regexp: ".*" optional.resource.attr: enabled: true - include: + metrics_include: - regexp: ".*" slice.resource.attr: enabled: true - include: + metrics_include: - regexp: ".*" string.enum.resource.attr: enabled: true - include: + metrics_include: - regexp: ".*" string.resource.attr: enabled: true - include: + metrics_include: - regexp: ".*" string.resource.attr_disable_warning: enabled: true - include: + metrics_include: - regexp: ".*" string.resource.attr_remove_warning: enabled: true - include: + metrics_include: - regexp: ".*" string.resource.attr_to_be_removed: enabled: true - include: + metrics_include: - regexp: ".*" filter_set_exclude: resource_attributes: map.resource.attr: enabled: true - exclude: + metrics_exclude: - regexp: ".*" optional.resource.attr: enabled: true - exclude: + metrics_exclude: - strict: "optional.resource.attr-val" slice.resource.attr: enabled: true - exclude: + metrics_exclude: - regexp: ".*" string.enum.resource.attr: enabled: true - exclude: + metrics_exclude: - strict: "one" string.resource.attr: enabled: true - exclude: + metrics_exclude: - strict: "string.resource.attr-val" string.resource.attr_disable_warning: enabled: true - exclude: + metrics_exclude: - strict: "string.resource.attr_disable_warning-val" string.resource.attr_remove_warning: enabled: true - exclude: + metrics_exclude: - strict: "string.resource.attr_remove_warning-val" string.resource.attr_to_be_removed: enabled: true - exclude: + metrics_exclude: - strict: "string.resource.attr_to_be_removed-val" diff --git a/cmd/mdatagen/templates/config.go.tmpl b/cmd/mdatagen/templates/config.go.tmpl index e4a9f52f8fc..877d435754b 100644 --- a/cmd/mdatagen/templates/config.go.tmpl +++ b/cmd/mdatagen/templates/config.go.tmpl @@ -52,8 +52,13 @@ func DefaultMetricsConfig() MetricsConfig { type ResourceAttributeConfig struct { Enabled bool `mapstructure:"enabled"` {{- if .Metrics }} - Include []filter.Config `mapstructure:"include"` - Exclude []filter.Config `mapstructure:"exclude"` + // Experimental: MetricsInclude defines a list of filters for attribute values. + // If the list is not empty, only metrics with matching resource attribute values will be emitted. + MetricsInclude []filter.Config `mapstructure:"metrics_include"` + // Experimental: MetricsExclude defines a list of filters for attribute values. + // If the list is not empty, metrics with matching resource attribute values will not be emitted. + // MetricsInclude has higher priority than MetricsExclude. + MetricsExclude []filter.Config `mapstructure:"metrics_exclude"` {{- end }} enabledSetByUser bool diff --git a/cmd/mdatagen/templates/metrics.go.tmpl b/cmd/mdatagen/templates/metrics.go.tmpl index 1e1de647fd3..14428451c1e 100644 --- a/cmd/mdatagen/templates/metrics.go.tmpl +++ b/cmd/mdatagen/templates/metrics.go.tmpl @@ -184,7 +184,7 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting } {{- end }} {{- if $attr.Warnings.IfConfigured }} - if mbc.ResourceAttributes.{{ $name.Render }}.enabledSetByUser || mbc.ResourceAttributes.{{ $name.Render }}.Include != nil || mbc.ResourceAttributes.{{ $name.Render }}.Exclude != nil { + if mbc.ResourceAttributes.{{ $name.Render }}.enabledSetByUser || mbc.ResourceAttributes.{{ $name.Render }}.MetricsInclude != nil || mbc.ResourceAttributes.{{ $name.Render }}.MetricsExclude != nil { settings.Logger.Warn("[WARNING] `{{ $name }}` should not be configured: {{ $attr.Warnings.IfConfigured }}") } {{- end }} @@ -203,11 +203,11 @@ func NewMetricsBuilder(mbc MetricsBuilderConfig, settings receiver.CreateSetting {{- end }} } {{- range $name, $attr := .ResourceAttributes }} - if mbc.ResourceAttributes.{{ $name.Render }}.Include != nil { - mb.resourceAttributeIncludeFilter["{{ $name }}"] = filter.CreateFilter(mbc.ResourceAttributes.{{ $name.Render }}.Include) + if mbc.ResourceAttributes.{{ $name.Render }}.MetricsInclude != nil { + mb.resourceAttributeIncludeFilter["{{ $name }}"] = filter.CreateFilter(mbc.ResourceAttributes.{{ $name.Render }}.MetricsInclude) } - if mbc.ResourceAttributes.{{ $name.Render }}.Exclude != nil { - mb.resourceAttributeExcludeFilter["{{ $name }}"] = filter.CreateFilter(mbc.ResourceAttributes.{{ $name.Render }}.Exclude) + if mbc.ResourceAttributes.{{ $name.Render }}.MetricsExclude != nil { + mb.resourceAttributeExcludeFilter["{{ $name }}"] = filter.CreateFilter(mbc.ResourceAttributes.{{ $name.Render }}.MetricsExclude) } {{- end }} diff --git a/cmd/mdatagen/templates/testdata/config.yaml.tmpl b/cmd/mdatagen/templates/testdata/config.yaml.tmpl index a587b803cdc..394646cc297 100644 --- a/cmd/mdatagen/templates/testdata/config.yaml.tmpl +++ b/cmd/mdatagen/templates/testdata/config.yaml.tmpl @@ -35,7 +35,7 @@ filter_set_include: {{- range $name, $attr := .ResourceAttributes }} {{ $name }}: enabled: true - include: + metrics_include: - regexp: ".*" {{- end }} filter_set_exclude: @@ -43,7 +43,7 @@ filter_set_exclude: {{- range $name, $attr := .ResourceAttributes }} {{ $name }}: enabled: true - exclude: + metrics_exclude: {{- if eq $attr.Type.String "Str" }} - strict: {{ $attr.TestValue }} {{- else }} From b47303424f422ab44fa8f918ef46b1baf088d6b0 Mon Sep 17 00:00:00 2001 From: Evan Bradley <11745660+evan-bradley@users.noreply.github.com> Date: Mon, 22 Apr 2024 15:34:38 -0400 Subject: [PATCH 5/6] [chore][cmd/builder] Include replaces in builder versioning tests (#10016) #### Description This is necessary when testing the builder with unreleased versions of Collector modules. #### Link to tracking issue Fixes https://github.com/open-telemetry/opentelemetry-collector/issues/10014 --- cmd/builder/internal/builder/main_test.go | 113 +++++++++++++--------- 1 file changed, 66 insertions(+), 47 deletions(-) diff --git a/cmd/builder/internal/builder/main_test.go b/cmd/builder/internal/builder/main_test.go index 884ed8f99d9..6c0bc5a4880 100644 --- a/cmd/builder/internal/builder/main_test.go +++ b/cmd/builder/internal/builder/main_test.go @@ -57,6 +57,7 @@ func TestGenerateInvalidOutputPath(t *testing.T) { } func TestVersioning(t *testing.T) { + replaces := generateReplaces() tests := []struct { description string cfgBuilder func() Config @@ -65,8 +66,9 @@ func TestVersioning(t *testing.T) { { description: "defaults", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() cfg.Distribution.Go = "go" + cfg.Replaces = append(cfg.Replaces, replaces...) return cfg }, expectedErr: nil, @@ -74,9 +76,10 @@ func TestVersioning(t *testing.T) { { description: "require otelcol", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() cfg.Distribution.Go = "go" cfg.Distribution.RequireOtelColModule = true + cfg.Replaces = append(cfg.Replaces, replaces...) return cfg }, expectedErr: nil, @@ -84,7 +87,7 @@ func TestVersioning(t *testing.T) { { description: "only gomod file, skip generate", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() tempDir := t.TempDir() err := makeModule(tempDir, goModTestFile) require.NoError(t, err) @@ -98,7 +101,7 @@ func TestVersioning(t *testing.T) { { description: "old otel version", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() cfg.Verbose = true cfg.Distribution.Go = "go" cfg.Distribution.OtelColVersion = "0.97.0" @@ -116,12 +119,13 @@ func TestVersioning(t *testing.T) { }, }) require.NoError(t, err) - *cfg.Providers, err = parseModules([]Module{ + providers, err := parseModules([]Module{ { GoMod: "go.opentelemetry.io/collector/confmap/provider/envprovider v0.97.0", }, }) require.NoError(t, err) + cfg.Providers = &providers return cfg }, expectedErr: nil, @@ -129,13 +133,15 @@ func TestVersioning(t *testing.T) { { description: "old component version", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() cfg.Distribution.Go = "go" cfg.Exporters = []Module{ { GoMod: "go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0", }, } + cfg.Providers = &[]Module{} + cfg.Replaces = append(cfg.Replaces, replaces...) return cfg }, expectedErr: nil, @@ -143,7 +149,7 @@ func TestVersioning(t *testing.T) { { description: "old component version without strict mode", cfgBuilder: func() Config { - cfg := newInitializedConfig(t) + cfg := NewDefaultConfig() cfg.Distribution.Go = "go" cfg.SkipStrictVersioning = true cfg.Exporters = []Module{ @@ -151,6 +157,8 @@ func TestVersioning(t *testing.T) { GoMod: "go.opentelemetry.io/collector/exporter/otlpexporter v0.96.0", }, } + cfg.Providers = &[]Module{} + cfg.Replaces = append(cfg.Replaces, replaces...) return cfg }, expectedErr: nil, @@ -184,46 +192,7 @@ func TestSkipGenerate(t *testing.T) { } func TestGenerateAndCompile(t *testing.T) { - // This test is dependent on the current file structure. - // The goal is find the root of the repo so we can replace the root module. - _, thisFile, _, _ := runtime.Caller(0) - workspaceDir := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(thisFile))))) - replaces := []string{fmt.Sprintf("go.opentelemetry.io/collector => %s", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/component => %s/component", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/config/confignet => %s/config/confignet", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/config/configtelemetry => %s/config/configtelemetry", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap => %s/confmap", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/converter/expandconverter => %s/confmap/converter/expandconverter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/envprovider => %s/confmap/provider/envprovider", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/fileprovider => %s/confmap/provider/fileprovider", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/httpprovider => %s/confmap/provider/httpprovider", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/httpsprovider => %s/confmap/provider/httpsprovider", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/yamlprovider => %s/confmap/provider/yamlprovider", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/consumer => %s/consumer", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/connector => %s/connector", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter => %s/exporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter/debugexporter => %s/exporter/debugexporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter/loggingexporter => %s/exporter/loggingexporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter/nopexporter => %s/exporter/nopexporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlpexporter => %s/exporter/otlpexporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlphttpexporter => %s/exporter/otlphttpexporter", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/extension => %s/extension", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/extension/ballastextension => %s/extension/ballastextension", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/extension/zpagesextension => %s/extension/zpagesextension", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/featuregate => %s/featuregate", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/processor => %s/processor", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/processor/batchprocessor => %s/processor/batchprocessor", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/processor/memorylimiterprocessor => %s/processor/memorylimiterprocessor", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/receiver => %s/receiver", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/receiver/nopreceiver => %s/receiver/nopreceiver", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/receiver/otlpreceiver => %s/receiver/otlpreceiver", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/otelcol => %s/otelcol", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/pdata => %s/pdata", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/pdata/testdata => %s/pdata/testdata", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/semconv => %s/semconv", workspaceDir), - fmt.Sprintf("go.opentelemetry.io/collector/service => %s/service", workspaceDir), - } - + replaces := generateReplaces() testCases := []struct { testCase string cfgBuilder func(t *testing.T) Config @@ -319,3 +288,53 @@ func makeModule(dir string, fileContents []byte) error { } return nil } + +func generateReplaces() []string { + // This test is dependent on the current file structure. + // The goal is find the root of the repo so we can replace the root module. + _, thisFile, _, _ := runtime.Caller(0) + workspaceDir := filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(filepath.Dir(thisFile))))) + return []string{fmt.Sprintf("go.opentelemetry.io/collector => %s", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/component => %s/component", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configauth => %s/config/configauth", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configcompression => %s/config/configcompression", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configgrpc => %s/config/configgrpc", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/confignet => %s/config/confignet", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configopaque => %s/config/configopaque", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configretry => %s/config/configretry", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configtelemetry => %s/config/configtelemetry", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/configtls => %s/config/configtls", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/config/internal => %s/config/internal", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap => %s/confmap", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/converter/expandconverter => %s/confmap/converter/expandconverter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/envprovider => %s/confmap/provider/envprovider", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/fileprovider => %s/confmap/provider/fileprovider", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/httpprovider => %s/confmap/provider/httpprovider", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/httpsprovider => %s/confmap/provider/httpsprovider", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/confmap/provider/yamlprovider => %s/confmap/provider/yamlprovider", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/consumer => %s/consumer", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/connector => %s/connector", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter => %s/exporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter/debugexporter => %s/exporter/debugexporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter/loggingexporter => %s/exporter/loggingexporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter/nopexporter => %s/exporter/nopexporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlpexporter => %s/exporter/otlpexporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/exporter/otlphttpexporter => %s/exporter/otlphttpexporter", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/extension => %s/extension", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/extension/auth => %s/extension/auth", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/extension/ballastextension => %s/extension/ballastextension", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/extension/zpagesextension => %s/extension/zpagesextension", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/featuregate => %s/featuregate", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/processor => %s/processor", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/processor/batchprocessor => %s/processor/batchprocessor", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/processor/memorylimiterprocessor => %s/processor/memorylimiterprocessor", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/receiver => %s/receiver", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/receiver/nopreceiver => %s/receiver/nopreceiver", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/receiver/otlpreceiver => %s/receiver/otlpreceiver", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/otelcol => %s/otelcol", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/pdata => %s/pdata", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/pdata/testdata => %s/pdata/testdata", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/semconv => %s/semconv", workspaceDir), + fmt.Sprintf("go.opentelemetry.io/collector/service => %s/service", workspaceDir), + } +} From fb9d80d3c44c9007f2064baecc59687588d48499 Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Mon, 22 Apr 2024 21:51:15 +0200 Subject: [PATCH 6/6] [chore] Prepare release v1.6.0/v0.99.0 (#10018) The following commands were run to prepare this release: - make chlog-update VERSION=v1.6.0/v0.99.0 - make prepare-release PREVIOUS_VERSION=1.5.0 RELEASE_CANDIDATE=1.6.0 MODSET=stable - make prepare-release PREVIOUS_VERSION=0.98.0 RELEASE_CANDIDATE=0.99.0 MODSET=beta --- ...4274-allow-dns-as-scheme-for-endpoint.yaml | 13 --- .chloggen/bnchmk-zstd.yaml | 25 ------ .chloggen/builder-confmap-providers.yaml | 31 ------- .chloggen/builder-strict-versioning.yaml | 29 ------ .chloggen/codeboten_dep-context-methods.yaml | 25 ------ .chloggen/codeboten_fix-sampler-typo.yaml | 25 ------ .chloggen/codeboten_mdatagen-goleak.yaml | 25 ------ .chloggen/codeboten_use-config-sdk.yaml | 25 ------ .../component-host-remove-getexporters.yaml | 25 ------ .chloggen/configauth-add-NewDefault-func.yaml | 25 ------ .chloggen/configtls-add-newdefault-funcs.yaml | 25 ------ .chloggen/configtls-depr-context-funcs.yaml | 25 ------ .chloggen/fix-429-logic.yaml | 25 ------ .chloggen/fix_negative_uint_config.yaml | 25 ------ .chloggen/mdatagen-filter.yaml | 25 ------ ...atagen-introduce-config-factory-tests.yaml | 26 ------ .chloggen/metric-metadata.yaml | 25 ------ .chloggen/pass-confmap-settings.yaml | 25 ------ .chloggen/update-internal-metric-levels.yaml | 37 -------- CHANGELOG-API.md | 17 ++++ CHANGELOG.md | 52 +++++++++++ cmd/builder/internal/builder/config.go | 2 +- cmd/builder/internal/config/default.yaml | 40 ++++----- cmd/builder/test/core.builder.yaml | 8 +- cmd/mdatagen/go.mod | 18 ++-- cmd/otelcorecol/builder-config.yaml | 40 ++++----- cmd/otelcorecol/go.mod | 88 +++++++++---------- cmd/otelcorecol/main.go | 23 ++++- component/go.mod | 6 +- config/configauth/go.mod | 12 +-- config/configgrpc/go.mod | 30 +++---- config/confighttp/go.mod | 26 +++--- config/configopaque/go.mod | 2 +- config/configtls/go.mod | 2 +- config/internal/go.mod | 4 +- confmap/converter/expandconverter/go.mod | 2 +- confmap/provider/envprovider/go.mod | 2 +- confmap/provider/fileprovider/go.mod | 2 +- confmap/provider/httpprovider/go.mod | 2 +- confmap/provider/httpsprovider/go.mod | 2 +- confmap/provider/yamlprovider/go.mod | 2 +- connector/forwardconnector/go.mod | 14 +-- connector/go.mod | 14 +-- consumer/go.mod | 4 +- exporter/debugexporter/go.mod | 20 ++--- exporter/go.mod | 20 ++--- exporter/loggingexporter/go.mod | 20 ++--- exporter/nopexporter/go.mod | 14 +-- exporter/otlpexporter/go.mod | 40 ++++----- exporter/otlphttpexporter/go.mod | 36 ++++---- extension/auth/go.mod | 10 +-- extension/ballastextension/go.mod | 12 +-- extension/go.mod | 8 +- extension/memorylimiterextension/go.mod | 12 +-- extension/zpagesextension/go.mod | 14 +-- filter/go.mod | 2 +- go.mod | 14 +-- internal/e2e/go.mod | 42 ++++----- otelcol/go.mod | 42 ++++----- pdata/testdata/go.mod | 2 +- processor/batchprocessor/go.mod | 16 ++-- processor/go.mod | 14 +-- processor/memorylimiterprocessor/go.mod | 16 ++-- receiver/go.mod | 12 +-- receiver/nopreceiver/go.mod | 12 +-- receiver/otlpreceiver/go.mod | 38 ++++---- service/go.mod | 32 +++---- versions.yaml | 4 +- 68 files changed, 478 insertions(+), 874 deletions(-) delete mode 100644 .chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml delete mode 100644 .chloggen/bnchmk-zstd.yaml delete mode 100755 .chloggen/builder-confmap-providers.yaml delete mode 100644 .chloggen/builder-strict-versioning.yaml delete mode 100644 .chloggen/codeboten_dep-context-methods.yaml delete mode 100644 .chloggen/codeboten_fix-sampler-typo.yaml delete mode 100644 .chloggen/codeboten_mdatagen-goleak.yaml delete mode 100644 .chloggen/codeboten_use-config-sdk.yaml delete mode 100644 .chloggen/component-host-remove-getexporters.yaml delete mode 100644 .chloggen/configauth-add-NewDefault-func.yaml delete mode 100755 .chloggen/configtls-add-newdefault-funcs.yaml delete mode 100644 .chloggen/configtls-depr-context-funcs.yaml delete mode 100644 .chloggen/fix-429-logic.yaml delete mode 100755 .chloggen/fix_negative_uint_config.yaml delete mode 100755 .chloggen/mdatagen-filter.yaml delete mode 100644 .chloggen/mdatagen-introduce-config-factory-tests.yaml delete mode 100644 .chloggen/metric-metadata.yaml delete mode 100755 .chloggen/pass-confmap-settings.yaml delete mode 100755 .chloggen/update-internal-metric-levels.yaml diff --git a/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml b/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml deleted file mode 100644 index 85668494ce8..00000000000 --- a/.chloggen/4274-allow-dns-as-scheme-for-endpoint.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: exporter/otlp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allow DNS scheme to be used in endpoint - -# One or more tracking issues or pull requests related to the change -issues: [4274] diff --git a/.chloggen/bnchmk-zstd.yaml b/.chloggen/bnchmk-zstd.yaml deleted file mode 100644 index 5a974afd274..00000000000 --- a/.chloggen/bnchmk-zstd.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Disable concurrency in zstd compression - -# One or more tracking issues or pull requests related to the change -issues: [8216] - -# (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: [] diff --git a/.chloggen/builder-confmap-providers.yaml b/.chloggen/builder-confmap-providers.yaml deleted file mode 100755 index f617b1f058e..00000000000 --- a/.chloggen/builder-confmap-providers.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: cmd/builder - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Allow configuring `confmap.Provider`s in the builder. - -# One or more tracking issues or pull requests related to the change -issues: [4759] - -# (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: | - If no providers are specified, the defaults are used. - The default providers are: env, file, http, https, and yaml. - - To configure providers, use the `providers` key in your OCB build - manifest with a list of Go modules for your providers. - The modules will work the same as other Collector components. - -# 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: [user] diff --git a/.chloggen/builder-strict-versioning.yaml b/.chloggen/builder-strict-versioning.yaml deleted file mode 100644 index 5c52ba135ea..00000000000 --- a/.chloggen/builder-strict-versioning.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# 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: builder - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add strict version checking when using the builder. Add the temporary flag `--skip-strict-versioning `for skipping this check. - -# One or more tracking issues or pull requests related to the change -issues: [9896] - -# (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: | - Strict version checking will error on major and minor version mismatches - between the `otelcol_version` configured and the builder version or versions - in the go.mod. This check can be temporarily disabled by using the `--skip-strict-versioning` - flag. This flag will be removed in a future minor version. - -# 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: [] diff --git a/.chloggen/codeboten_dep-context-methods.yaml b/.chloggen/codeboten_dep-context-methods.yaml deleted file mode 100644 index 21cc0d9d7aa..00000000000 --- a/.chloggen/codeboten_dep-context-methods.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: confighttp - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: deprecate ToClientContext, ToServerContext, ToListenerContext, replaced by ToClient, ToServer, ToListener - -# One or more tracking issues or pull requests related to the change -issues: [9807] - -# (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: [api] diff --git a/.chloggen/codeboten_fix-sampler-typo.yaml b/.chloggen/codeboten_fix-sampler-typo.yaml deleted file mode 100644 index 051981a5d3e..00000000000 --- a/.chloggen/codeboten_fix-sampler-typo.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: fix record sampler configuration - -# One or more tracking issues or pull requests related to the change -issues: [9968] - -# (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: [] diff --git a/.chloggen/codeboten_mdatagen-goleak.yaml b/.chloggen/codeboten_mdatagen-goleak.yaml deleted file mode 100644 index 2103e9743aa..00000000000 --- a/.chloggen/codeboten_mdatagen-goleak.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: enable goleak tests by default via mdatagen - -# One or more tracking issues or pull requests related to the change -issues: [9959] - -# (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: [] diff --git a/.chloggen/codeboten_use-config-sdk.yaml b/.chloggen/codeboten_use-config-sdk.yaml deleted file mode 100644 index 3a351c962e0..00000000000 --- a/.chloggen/codeboten_use-config-sdk.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: ensure the tracer provider is configured via go.opentelemetry.io/contrib/config - -# One or more tracking issues or pull requests related to the change -issues: [9967] - -# (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: [] diff --git a/.chloggen/component-host-remove-getexporters.yaml b/.chloggen/component-host-remove-getexporters.yaml deleted file mode 100644 index 001ed23ca18..00000000000 --- a/.chloggen/component-host-remove-getexporters.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# 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: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Removed deprecated function `GetExporters` from `component.Host` interface - -# One or more tracking issues or pull requests related to the change -issues: [9987] - -# (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: [api] diff --git a/.chloggen/configauth-add-NewDefault-func.yaml b/.chloggen/configauth-add-NewDefault-func.yaml deleted file mode 100644 index c6c2d6be5a4..00000000000 --- a/.chloggen/configauth-add-NewDefault-func.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configauth - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Adds `NewDefault*` functions for all the config structs. - -# One or more tracking issues or pull requests related to the change -issues: [9821] - -# (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: [api] diff --git a/.chloggen/configtls-add-newdefault-funcs.yaml b/.chloggen/configtls-add-newdefault-funcs.yaml deleted file mode 100755 index 2ee397e49af..00000000000 --- a/.chloggen/configtls-add-newdefault-funcs.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configtls - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Adds `NewDefault*` functions for all the config structs. - -# One or more tracking issues or pull requests related to the change -issues: [9658] - -# (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: [api] diff --git a/.chloggen/configtls-depr-context-funcs.yaml b/.chloggen/configtls-depr-context-funcs.yaml deleted file mode 100644 index b1d680f557d..00000000000 --- a/.chloggen/configtls-depr-context-funcs.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: deprecation - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: configtls - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Deprecates `ClientConfig.LoadTLSConfigContext` and `ServerConfig.LoadTLSConfigContext`, use `ClientConfig.LoadTLSConfig` and `ServerConfig.LoadTLSConfig` instead. - -# One or more tracking issues or pull requests related to the change -issues: [9945] - -# (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: [api] diff --git a/.chloggen/fix-429-logic.yaml b/.chloggen/fix-429-logic.yaml deleted file mode 100644 index c3323ea7fac..00000000000 --- a/.chloggen/fix-429-logic.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: otlphttpexporter - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Fixes a bug that was preventing the otlp http exporter from propagating status. - -# One or more tracking issues or pull requests related to the change -issues: [9892] - -# (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: [user] diff --git a/.chloggen/fix_negative_uint_config.yaml b/.chloggen/fix_negative_uint_config.yaml deleted file mode 100755 index 7d9f74de78f..00000000000 --- a/.chloggen/fix_negative_uint_config.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# 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: Fix decoding negative configuration values into uints - -# One or more tracking issues or pull requests related to the change -issues: [9060] - -# (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: [] \ No newline at end of file diff --git a/.chloggen/mdatagen-filter.yaml b/.chloggen/mdatagen-filter.yaml deleted file mode 100755 index 78b446c232f..00000000000 --- a/.chloggen/mdatagen-filter.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: "cmd/mdatagen" - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: "support excluding some metrics based on string and regexes in resource_attributes" - -# One or more tracking issues or pull requests related to the change -issues: [9661] - -# (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: [user] diff --git a/.chloggen/mdatagen-introduce-config-factory-tests.yaml b/.chloggen/mdatagen-introduce-config-factory-tests.yaml deleted file mode 100644 index d42c2468f0e..00000000000 --- a/.chloggen/mdatagen-introduce-config-factory-tests.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: cmd/mdatagen - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Generate config and factory tests covering their requirements. - -# One or more tracking issues or pull requests related to the change -issues: [9940] - -# (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: | - The tests are moved from cmd/builder. - -# 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: [] diff --git a/.chloggen/metric-metadata.yaml b/.chloggen/metric-metadata.yaml deleted file mode 100644 index 46581467afe..00000000000 --- a/.chloggen/metric-metadata.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: pmetric - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Support metric.metadata in pdata/pmetric - -# One or more tracking issues or pull requests related to the change -issues: [10006] - -# (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: [api] diff --git a/.chloggen/pass-confmap-settings.yaml b/.chloggen/pass-confmap-settings.yaml deleted file mode 100755 index dc038a45d26..00000000000 --- a/.chloggen/pass-confmap-settings.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Use this changelog template to create an entry for release notes. - -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: enhancement - -# 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: Add `ProviderSettings`, `ConverterSettings`, `ProviderFactories`, and `ConverterFactories` fields to `confmap.ResolverSettings` - -# One or more tracking issues or pull requests related to the change -issues: [9516] - -# (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: This allows configuring providers and converters, which are instantiated by `NewResolver` using the given factories. - -# 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: [] diff --git a/.chloggen/update-internal-metric-levels.yaml b/.chloggen/update-internal-metric-levels.yaml deleted file mode 100755 index 6870096bf8f..00000000000 --- a/.chloggen/update-internal-metric-levels.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# 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: telemetry - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Distributed internal metrics across different levels. - -# One or more tracking issues or pull requests related to the change -issues: [7890] - -# (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: | - The internal metrics levels are updated along with reported metrics: - - The default level is changed from `basic` to `normal`, which can be overridden with `service::telmetry::metrics::level` configuration. - - Batch processor metrics are updated to be reported starting from `normal` level: - - `processor_batch_batch_send_size` - - `processor_batch_metadata_cardinality` - - `processor_batch_timeout_trigger_send` - - `processor_batch_size_trigger_send` - - GRPC/HTTP server and client metrics are updated to be reported starting from `detailed` level: - - http.client.* metrics - - http.server.* metrics - - rpc.server.* metrics - - rpc.client.* metrics - -# 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: [user] \ No newline at end of file diff --git a/CHANGELOG-API.md b/CHANGELOG-API.md index 02c994bdddf..aee75744cc2 100644 --- a/CHANGELOG-API.md +++ b/CHANGELOG-API.md @@ -7,6 +7,23 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG +## v1.6.0/v0.99.0 + +### 🛑 Breaking changes 🛑 + +- `component`: Removed deprecated function `GetExporters` from `component.Host` interface (#9987) + +### 🚩 Deprecations 🚩 + +- `confighttp`: deprecate ToClientContext, ToServerContext, ToListenerContext, replaced by ToClient, ToServer, ToListener (#9807) +- `configtls`: Deprecates `ClientConfig.LoadTLSConfigContext` and `ServerConfig.LoadTLSConfigContext`, use `ClientConfig.LoadTLSConfig` and `ServerConfig.LoadTLSConfig` instead. (#9945) + +### 💡 Enhancements 💡 + +- `configauth`: Adds `NewDefault*` functions for all the config structs. (#9821) +- `configtls`: Adds `NewDefault*` functions for all the config structs. (#9658) +- `pmetric`: Support metric.metadata in pdata/pmetric (#10006) + ## v1.5.0/v0.98.0 ### 🛑 Breaking changes 🛑 diff --git a/CHANGELOG.md b/CHANGELOG.md index a6dec7da12b..9423a91a02f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,58 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./ +## v1.6.0/v0.99.0 + +### 🛑 Breaking changes 🛑 + +- `builder`: Add strict version checking when using the builder. Add the temporary flag `--skip-strict-versioning `for skipping this check. (#9896) + Strict version checking will error on major and minor version mismatches + between the `otelcol_version` configured and the builder version or versions + in the go.mod. This check can be temporarily disabled by using the `--skip-strict-versioning` + flag. This flag will be removed in a future minor version. + +- `telemetry`: Distributed internal metrics across different levels. (#7890) + The internal metrics levels are updated along with reported metrics: + - The default level is changed from `basic` to `normal`, which can be overridden with `service::telmetry::metrics::level` configuration. + - Batch processor metrics are updated to be reported starting from `normal` level: + - `processor_batch_batch_send_size` + - `processor_batch_metadata_cardinality` + - `processor_batch_timeout_trigger_send` + - `processor_batch_size_trigger_send` + - GRPC/HTTP server and client metrics are updated to be reported starting from `detailed` level: + - http.client.* metrics + - http.server.* metrics + - rpc.server.* metrics + - rpc.client.* metrics + + +### 💡 Enhancements 💡 + +- `confighttp`: Disable concurrency in zstd compression (#8216) +- `cmd/builder`: Allow configuring `confmap.Provider`s in the builder. (#4759) + If no providers are specified, the defaults are used. + The default providers are: env, file, http, https, and yaml. + + To configure providers, use the `providers` key in your OCB build + manifest with a list of Go modules for your providers. + The modules will work the same as other Collector components. + +- `mdatagen`: enable goleak tests by default via mdatagen (#9959) +- `cmd/mdatagen`: support excluding some metrics based on string and regexes in resource_attributes (#9661) +- `cmd/mdatagen`: Generate config and factory tests covering their requirements. (#9940) + The tests are moved from cmd/builder. + +- `confmap`: Add `ProviderSettings`, `ConverterSettings`, `ProviderFactories`, and `ConverterFactories` fields to `confmap.ResolverSettings` (#9516) + This allows configuring providers and converters, which are instantiated by `NewResolver` using the given factories. + +### 🧰 Bug fixes 🧰 + +- `exporter/otlp`: Allow DNS scheme to be used in endpoint (#4274) +- `service`: fix record sampler configuration (#9968) +- `service`: ensure the tracer provider is configured via go.opentelemetry.io/contrib/config (#9967) +- `otlphttpexporter`: Fixes a bug that was preventing the otlp http exporter from propagating status. (#9892) +- `confmap`: Fix decoding negative configuration values into uints (#9060) + ## v1.5.0/v0.98.0 ### 🛑 Breaking changes 🛑 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 2c6ffd88340..50e8b4e76c3 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -16,7 +16,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.98.0" +const defaultOtelColVersion = "0.99.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 978eaea6775..42bb14dfce9 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,32 +2,32 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.98.0-dev - otelcol_version: 0.98.0 + version: 0.99.0-dev + otelcol_version: 0.99.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.98.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.99.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.99.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.98.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.98.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.99.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.99.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.98.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.98.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.99.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.95.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.95.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.95.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.95.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.95.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 7583616770f..d5ca1640784 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.98.0 + otelcol_version: 0.99.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.98.0 + gomod: go.opentelemetry.io/collector v0.99.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.98.0 + gomod: go.opentelemetry.io/collector v0.99.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/debugexporter - gomod: go.opentelemetry.io/collector v0.98.0 + gomod: go.opentelemetry.io/collector v0.99.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod index 30a8bd6a7eb..054810f7628 100644 --- a/cmd/mdatagen/go.mod +++ b/cmd/mdatagen/go.mod @@ -5,14 +5,14 @@ go 1.21 require ( github.com/google/go-cmp v0.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/filter v0.0.0-20240415172132-06424935fda1 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/receiver v0.98.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/filter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/receiver v0.99.0 + go.opentelemetry.io/collector/semconv v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -43,7 +43,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 9946db772de..9041748c961 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,34 +2,34 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.98.0-dev - otelcol_version: 0.98.0 + version: 0.99.0-dev + otelcol_version: 0.99.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.98.0 - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0 + - gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.99.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.98.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.0 + - gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.99.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.98.0 - - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.98.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.99.0 + - gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.99.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.98.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0 connectors: - - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.98.0 + - gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.99.0 providers: - - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 - - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 + - gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index c8761006346..0c560fdc62c 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -5,26 +5,33 @@ module go.opentelemetry.io/collector/cmd/otelcorecol go 1.21 require ( - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/connector v0.98.0 - go.opentelemetry.io/collector/connector/forwardconnector v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/exporter/debugexporter v0.98.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.98.0 - go.opentelemetry.io/collector/exporter/nopexporter v0.98.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.98.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/extension/ballastextension v0.98.0 - go.opentelemetry.io/collector/extension/memorylimiterextension v0.98.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 - go.opentelemetry.io/collector/otelcol v0.98.0 - go.opentelemetry.io/collector/processor v0.98.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.98.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 - go.opentelemetry.io/collector/receiver/nopreceiver v0.98.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 + go.opentelemetry.io/collector/connector v0.99.0 + go.opentelemetry.io/collector/connector/forwardconnector v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/exporter/debugexporter v0.99.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.99.0 + go.opentelemetry.io/collector/exporter/nopexporter v0.99.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/extension/ballastextension v0.99.0 + go.opentelemetry.io/collector/extension/memorylimiterextension v0.99.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 + go.opentelemetry.io/collector/otelcol v0.99.0 + go.opentelemetry.io/collector/processor v0.99.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.99.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 + go.opentelemetry.io/collector/receiver/nopreceiver v0.99.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0 go.uber.org/goleak v1.3.0 golang.org/x/sys v0.19.0 ) @@ -71,30 +78,23 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect - go.opentelemetry.io/collector/config/configgrpc v0.98.0 // indirect - go.opentelemetry.io/collector/config/confighttp v0.98.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.98.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtls v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 // indirect - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 // indirect - go.opentelemetry.io/collector/consumer v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect - go.opentelemetry.io/collector/semconv v0.98.0 // indirect - go.opentelemetry.io/collector/service v0.98.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect + go.opentelemetry.io/collector/config/configgrpc v0.99.0 // indirect + go.opentelemetry.io/collector/config/confighttp v0.99.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.99.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtls v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/consumer v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect + go.opentelemetry.io/collector/semconv v0.99.0 // indirect + go.opentelemetry.io/collector/service v0.99.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index 27ebe7aaa11..1ccdf70ddc5 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -7,6 +7,13 @@ import ( "log" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/converter/expandconverter" + envprovider "go.opentelemetry.io/collector/confmap/provider/envprovider" + fileprovider "go.opentelemetry.io/collector/confmap/provider/fileprovider" + httpprovider "go.opentelemetry.io/collector/confmap/provider/httpprovider" + httpsprovider "go.opentelemetry.io/collector/confmap/provider/httpsprovider" + yamlprovider "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/otelcol" ) @@ -14,12 +21,26 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.98.0-dev", + Version: "0.99.0-dev", } set := otelcol.CollectorSettings{ BuildInfo: info, Factories: components, + ConfigProviderSettings: otelcol.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + ProviderFactories: []confmap.ProviderFactory{ + envprovider.NewFactory(), + fileprovider.NewFactory(), + httpprovider.NewFactory(), + httpsprovider.NewFactory(), + yamlprovider.NewFactory(), + }, + ConverterFactories: []confmap.ConverterFactory{ + expandconverter.NewFactory(), + }, + }, + }, } if err := run(set); err != nil { diff --git a/component/go.mod b/component/go.mod index 760d0e5319e..d974bfb7c7c 100644 --- a/component/go.mod +++ b/component/go.mod @@ -7,9 +7,9 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.52.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/exporters/prometheus v0.47.0 go.opentelemetry.io/otel/metric v1.25.0 diff --git a/config/configauth/go.mod b/config/configauth/go.mod index 3efd9c8c039..2ab854bf96a 100644 --- a/config/configauth/go.mod +++ b/config/configauth/go.mod @@ -4,9 +4,9 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/extension/auth v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/extension/auth v0.99.0 go.uber.org/goleak v1.3.0 ) @@ -20,9 +20,9 @@ require ( 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/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/trace v1.25.0 // indirect diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod index 8af35bf3197..80182d86ce9 100644 --- a/config/configgrpc/go.mod +++ b/config/configgrpc/go.mod @@ -5,18 +5,18 @@ go 1.21 require ( github.com/mostynb/go-grpc-compression v1.2.2 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configauth v0.98.0 - go.opentelemetry.io/collector/config/configcompression v1.5.0 - go.opentelemetry.io/collector/config/confignet v0.98.0 - go.opentelemetry.io/collector/config/configopaque v1.5.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/config/internal v0.98.0 - go.opentelemetry.io/collector/extension/auth v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configauth v0.99.0 + go.opentelemetry.io/collector/config/configcompression v1.6.0 + go.opentelemetry.io/collector/config/confignet v0.99.0 + go.opentelemetry.io/collector/config/configopaque v1.6.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/config/internal v0.99.0 + go.opentelemetry.io/collector/extension/auth v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 go.opentelemetry.io/otel v1.25.0 go.uber.org/goleak v1.3.0 @@ -49,9 +49,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod index 44e19a024bd..773b5595037 100644 --- a/config/confighttp/go.mod +++ b/config/confighttp/go.mod @@ -7,15 +7,15 @@ require ( github.com/klauspost/compress v1.17.8 github.com/rs/cors v1.10.1 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configauth v0.98.0 - go.opentelemetry.io/collector/config/configcompression v1.5.0 - go.opentelemetry.io/collector/config/configopaque v1.5.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/config/internal v0.98.0 - go.opentelemetry.io/collector/extension/auth v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configauth v0.99.0 + go.opentelemetry.io/collector/config/configcompression v1.6.0 + go.opentelemetry.io/collector/config/configopaque v1.6.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/config/internal v0.99.0 + go.opentelemetry.io/collector/extension/auth v0.99.0 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 go.opentelemetry.io/otel v1.25.0 go.uber.org/goleak v1.3.0 @@ -44,10 +44,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/config/configopaque/go.mod b/config/configopaque/go.mod index 83f5af811e8..1511548539c 100644 --- a/config/configopaque/go.mod +++ b/config/configopaque/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 gopkg.in/yaml.v3 v3.0.1 ) diff --git a/config/configtls/go.mod b/config/configtls/go.mod index 13163ae4005..1ae12fda056 100644 --- a/config/configtls/go.mod +++ b/config/configtls/go.mod @@ -5,7 +5,7 @@ go 1.21 require ( github.com/fsnotify/fsnotify v1.7.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/config/configopaque v1.5.0 + go.opentelemetry.io/collector/config/configopaque v1.6.0 ) require ( diff --git a/config/internal/go.mod b/config/internal/go.mod index 8a86118de58..9f1b72d87ee 100644 --- a/config/internal/go.mod +++ b/config/internal/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 + go.opentelemetry.io/collector v0.99.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) @@ -13,7 +13,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/hashicorp/go-version v1.6.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod index 2b5207311e8..e6622894b27 100644 --- a/confmap/converter/expandconverter/go.mod +++ b/confmap/converter/expandconverter/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod index d810834a34d..647f97972b6 100644 --- a/confmap/provider/envprovider/go.mod +++ b/confmap/provider/envprovider/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 ) diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod index ad9928303ae..02c96c1ebe3 100644 --- a/confmap/provider/fileprovider/go.mod +++ b/confmap/provider/fileprovider/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpprovider/go.mod b/confmap/provider/httpprovider/go.mod index e4bfe5a7b7f..4a986e0a2fa 100644 --- a/confmap/provider/httpprovider/go.mod +++ b/confmap/provider/httpprovider/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/httpsprovider/go.mod b/confmap/provider/httpsprovider/go.mod index 35ec761e62f..9cde76ec9ce 100644 --- a/confmap/provider/httpsprovider/go.mod +++ b/confmap/provider/httpsprovider/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 ) diff --git a/confmap/provider/yamlprovider/go.mod b/confmap/provider/yamlprovider/go.mod index 059c02b94d6..30e6dd1066f 100644 --- a/confmap/provider/yamlprovider/go.mod +++ b/confmap/provider/yamlprovider/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 ) diff --git a/connector/forwardconnector/go.mod b/connector/forwardconnector/go.mod index f53355674b7..1a0c97bb6b2 100644 --- a/connector/forwardconnector/go.mod +++ b/connector/forwardconnector/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/connector v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/connector v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/connector/go.mod b/connector/go.mod index 6a3aeba71f3..b4fa9048981 100644 --- a/connector/go.mod +++ b/connector/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -36,8 +36,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect diff --git a/consumer/go.mod b/consumer/go.mod index 1435ded0b20..5142fc7b5e1 100644 --- a/consumer/go.mod +++ b/consumer/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.uber.org/goleak v1.3.0 ) diff --git a/exporter/debugexporter/go.mod b/exporter/debugexporter/go.mod index 93ac5bdc107..8668a8be559 100644 --- a/exporter/debugexporter/go.mod +++ b/exporter/debugexporter/go.mod @@ -4,12 +4,12 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -39,10 +39,10 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/receiver v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/exporter/go.mod b/exporter/go.mod index 1db8dfc403e..fd140524067 100644 --- a/exporter/go.mod +++ b/exporter/go.mod @@ -6,15 +6,15 @@ require ( github.com/cenkalti/backoff/v4 v4.3.0 github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configretry v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configretry v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/sdk v1.25.0 @@ -47,7 +47,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect golang.org/x/net v0.23.0 // indirect diff --git a/exporter/loggingexporter/go.mod b/exporter/loggingexporter/go.mod index 65cebf6c037..eca754b76a9 100644 --- a/exporter/loggingexporter/go.mod +++ b/exporter/loggingexporter/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -39,11 +39,11 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/config/configretry v0.98.0 // indirect - go.opentelemetry.io/collector/consumer v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/config/configretry v0.99.0 // indirect + go.opentelemetry.io/collector/consumer v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/receiver v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/exporter/nopexporter/go.mod b/exporter/nopexporter/go.mod index 7348ab95faf..d87970cce1f 100644 --- a/exporter/nopexporter/go.mod +++ b/exporter/nopexporter/go.mod @@ -6,11 +6,11 @@ toolchain go1.21.6 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/receiver v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/exporter/otlpexporter/go.mod b/exporter/otlpexporter/go.mod index dbc87b209bc..7fbc7e097ca 100644 --- a/exporter/otlpexporter/go.mod +++ b/exporter/otlpexporter/go.mod @@ -4,19 +4,19 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configauth v0.98.0 - go.opentelemetry.io/collector/config/configcompression v1.5.0 - go.opentelemetry.io/collector/config/configgrpc v0.98.0 - go.opentelemetry.io/collector/config/configopaque v1.5.0 - go.opentelemetry.io/collector/config/configretry v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configauth v0.99.0 + go.opentelemetry.io/collector/config/configcompression v1.6.0 + go.opentelemetry.io/collector/config/configgrpc v0.99.0 + go.opentelemetry.io/collector/config/configopaque v1.6.0 + go.opentelemetry.io/collector/config/configretry v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -55,13 +55,13 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect + go.opentelemetry.io/collector/receiver v0.99.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect diff --git a/exporter/otlphttpexporter/go.mod b/exporter/otlphttpexporter/go.mod index 6d0967d7cdb..a1cc1d67030 100644 --- a/exporter/otlphttpexporter/go.mod +++ b/exporter/otlphttpexporter/go.mod @@ -4,17 +4,17 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configcompression v1.5.0 - go.opentelemetry.io/collector/config/confighttp v0.98.0 - go.opentelemetry.io/collector/config/configopaque v1.5.0 - go.opentelemetry.io/collector/config/configretry v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configcompression v1.6.0 + go.opentelemetry.io/collector/config/confighttp v0.99.0 + go.opentelemetry.io/collector/config/configopaque v1.6.0 + go.opentelemetry.io/collector/config/configretry v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -54,13 +54,13 @@ require ( github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect - go.opentelemetry.io/collector/receiver v0.98.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect + go.opentelemetry.io/collector/receiver v0.99.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect diff --git a/extension/auth/go.mod b/extension/auth/go.mod index 06488ba9d95..4e3c7f3addb 100644 --- a/extension/auth/go.mod +++ b/extension/auth/go.mod @@ -4,8 +4,8 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 go.uber.org/goleak v1.3.0 google.golang.org/grpc v1.63.2 ) @@ -28,9 +28,9 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect diff --git a/extension/ballastextension/go.mod b/extension/ballastextension/go.mod index d4a318e2750..187bfe4d36b 100644 --- a/extension/ballastextension/go.mod +++ b/extension/ballastextension/go.mod @@ -5,10 +5,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -41,8 +41,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/extension/go.mod b/extension/go.mod index d42ff3d6e43..f34dd5269b5 100644 --- a/extension/go.mod +++ b/extension/go.mod @@ -5,8 +5,8 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 go.uber.org/goleak v1.3.0 ) @@ -28,8 +28,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/metric v1.25.0 // indirect diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod index 5d6f8abb3eb..eaa92733f60 100644 --- a/extension/memorylimiterextension/go.mod +++ b/extension/memorylimiterextension/go.mod @@ -4,10 +4,10 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -40,8 +40,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod index f81dc8eff17..100f4592f66 100644 --- a/extension/zpagesextension/go.mod +++ b/extension/zpagesextension/go.mod @@ -4,11 +4,11 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/confignet v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/confignet v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 go.opentelemetry.io/contrib/zpages v0.50.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/sdk v1.25.0 @@ -38,8 +38,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect diff --git a/filter/go.mod b/filter/go.mod index 9b12143a47e..b7779a35205 100644 --- a/filter/go.mod +++ b/filter/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/confmap v0.98.0 + go.opentelemetry.io/collector/confmap v0.99.0 ) require ( diff --git a/go.mod b/go.mod index a76c574e155..ddc3ecddd44 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/shirou/gopsutil/v3 v3.24.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/featuregate v1.5.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/featuregate v1.6.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.opentelemetry.io/contrib/config v0.5.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -48,7 +48,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.25.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.25.0 // indirect diff --git a/internal/e2e/go.mod b/internal/e2e/go.mod index be5e985428d..a944e8e080e 100644 --- a/internal/e2e/go.mod +++ b/internal/e2e/go.mod @@ -4,19 +4,19 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configgrpc v0.98.0 - go.opentelemetry.io/collector/config/confighttp v0.98.0 - go.opentelemetry.io/collector/config/configretry v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configgrpc v0.99.0 + go.opentelemetry.io/collector/config/confighttp v0.99.0 + go.opentelemetry.io/collector/config/configretry v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 go.opentelemetry.io/collector/exporter/otlpexporter v0.98.0 go.opentelemetry.io/collector/exporter/otlphttpexporter v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 go.opentelemetry.io/collector/receiver/otlpreceiver v0.98.0 go.uber.org/goleak v1.3.0 ) @@ -52,16 +52,16 @@ require ( github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect - go.opentelemetry.io/collector/config/confignet v0.98.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect + go.opentelemetry.io/collector/config/confignet v0.99.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect diff --git a/otelcol/go.mod b/otelcol/go.mod index daa8ba06a9a..eae1e3ca0ea 100644 --- a/otelcol/go.mod +++ b/otelcol/go.mod @@ -5,22 +5,22 @@ go 1.21 require ( github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/confmap/converter/expandconverter v0.98.0 - go.opentelemetry.io/collector/confmap/provider/envprovider v0.98.0 - go.opentelemetry.io/collector/confmap/provider/fileprovider v0.98.0 - go.opentelemetry.io/collector/confmap/provider/httpprovider v0.98.0 - go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.98.0 - go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.98.0 - go.opentelemetry.io/collector/connector v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/featuregate v1.5.0 - go.opentelemetry.io/collector/processor v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 - go.opentelemetry.io/collector/service v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/confmap/converter/expandconverter v0.99.0 + go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0 + go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0 + go.opentelemetry.io/collector/connector v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/featuregate v1.6.0 + go.opentelemetry.io/collector/processor v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 + go.opentelemetry.io/collector/service v0.99.0 go.uber.org/goleak v1.3.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.0 @@ -67,11 +67,11 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/collector v0.98.0 // indirect - go.opentelemetry.io/collector/consumer v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.98.0 // indirect - go.opentelemetry.io/collector/semconv v0.98.0 // indirect + go.opentelemetry.io/collector v0.99.0 // indirect + go.opentelemetry.io/collector/consumer v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.99.0 // indirect + go.opentelemetry.io/collector/semconv v0.99.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.25.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect diff --git a/pdata/testdata/go.mod b/pdata/testdata/go.mod index e5123050953..75049a616e0 100644 --- a/pdata/testdata/go.mod +++ b/pdata/testdata/go.mod @@ -2,7 +2,7 @@ module go.opentelemetry.io/collector/pdata/testdata go 1.21 -require go.opentelemetry.io/collector/pdata v1.5.0 +require go.opentelemetry.io/collector/pdata v1.6.0 require ( github.com/gogo/protobuf v1.3.2 // indirect diff --git a/processor/batchprocessor/go.mod b/processor/batchprocessor/go.mod index 1cc65c2388d..3d48c5b47ad 100644 --- a/processor/batchprocessor/go.mod +++ b/processor/batchprocessor/go.mod @@ -7,14 +7,14 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/prometheus/common v0.52.3 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 - go.opentelemetry.io/collector/processor v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 + go.opentelemetry.io/collector/processor v0.99.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/exporters/prometheus v0.47.0 go.opentelemetry.io/otel/metric v1.25.0 diff --git a/processor/go.mod b/processor/go.mod index 8d0c06f22e1..b36cbd3f551 100644 --- a/processor/go.mod +++ b/processor/go.mod @@ -5,12 +5,12 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 @@ -40,7 +40,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect diff --git a/processor/memorylimiterprocessor/go.mod b/processor/memorylimiterprocessor/go.mod index abb1f6cbeec..c69aafa74e1 100644 --- a/processor/memorylimiterprocessor/go.mod +++ b/processor/memorylimiterprocessor/go.mod @@ -4,12 +4,12 @@ go 1.21 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/processor v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/processor v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -44,8 +44,8 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata/testdata v0.98.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata/testdata v0.99.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/receiver/go.mod b/receiver/go.mod index 8bd0a2ba84c..5faffd46962 100644 --- a/receiver/go.mod +++ b/receiver/go.mod @@ -5,11 +5,11 @@ go 1.21 require ( github.com/google/uuid v1.6.0 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 go.opentelemetry.io/otel v1.25.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/sdk v1.25.0 @@ -40,7 +40,7 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/confmap v0.98.0 // indirect + go.opentelemetry.io/collector/confmap v0.99.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk/metric v1.25.0 // indirect golang.org/x/net v0.23.0 // indirect diff --git a/receiver/nopreceiver/go.mod b/receiver/nopreceiver/go.mod index eb2b4b7d37b..c2a5f94fde6 100644 --- a/receiver/nopreceiver/go.mod +++ b/receiver/nopreceiver/go.mod @@ -6,10 +6,10 @@ toolchain go1.21.6 require ( github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -37,8 +37,8 @@ require ( github.com/prometheus/client_model v0.6.1 // indirect github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/pdata v1.5.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/pdata v1.6.0 // indirect go.opentelemetry.io/otel v1.25.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.47.0 // indirect go.opentelemetry.io/otel/sdk v1.25.0 // indirect diff --git a/receiver/otlpreceiver/go.mod b/receiver/otlpreceiver/go.mod index 397f2b17bf7..b2f5d1d8106 100644 --- a/receiver/otlpreceiver/go.mod +++ b/receiver/otlpreceiver/go.mod @@ -6,17 +6,17 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/klauspost/compress v1.17.8 github.com/stretchr/testify v1.9.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/configgrpc v0.98.0 - go.opentelemetry.io/collector/config/confighttp v0.98.0 - go.opentelemetry.io/collector/config/confignet v0.98.0 - go.opentelemetry.io/collector/config/configtls v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/configgrpc v0.99.0 + go.opentelemetry.io/collector/config/confighttp v0.99.0 + go.opentelemetry.io/collector/config/confignet v0.99.0 + go.opentelemetry.io/collector/config/configtls v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 go.opentelemetry.io/otel/metric v1.25.0 go.opentelemetry.io/otel/trace v1.25.0 go.uber.org/goleak v1.3.0 @@ -55,14 +55,14 @@ require ( github.com/prometheus/common v0.52.3 // indirect github.com/prometheus/procfs v0.12.0 // indirect github.com/rs/cors v1.10.1 // indirect - go.opentelemetry.io/collector/config/configauth v0.98.0 // indirect - go.opentelemetry.io/collector/config/configcompression v1.5.0 // indirect - go.opentelemetry.io/collector/config/configopaque v1.5.0 // indirect - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 // indirect - go.opentelemetry.io/collector/config/internal v0.98.0 // indirect - go.opentelemetry.io/collector/extension v0.98.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.98.0 // indirect - go.opentelemetry.io/collector/featuregate v1.5.0 // indirect + go.opentelemetry.io/collector/config/configauth v0.99.0 // indirect + go.opentelemetry.io/collector/config/configcompression v1.6.0 // indirect + go.opentelemetry.io/collector/config/configopaque v1.6.0 // indirect + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect + go.opentelemetry.io/collector/config/internal v0.99.0 // indirect + go.opentelemetry.io/collector/extension v0.99.0 // indirect + go.opentelemetry.io/collector/extension/auth v0.99.0 // indirect + go.opentelemetry.io/collector/featuregate v1.6.0 // indirect go.opentelemetry.io/contrib/config v0.5.0 // indirect go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.50.0 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0 // indirect diff --git a/service/go.mod b/service/go.mod index 3913202ed3e..2d1ff902b57 100644 --- a/service/go.mod +++ b/service/go.mod @@ -10,22 +10,22 @@ require ( github.com/shirou/gopsutil/v3 v3.24.3 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 - go.opentelemetry.io/collector v0.98.0 - go.opentelemetry.io/collector/component v0.98.0 - go.opentelemetry.io/collector/config/confignet v0.98.0 - go.opentelemetry.io/collector/config/configtelemetry v0.98.0 - go.opentelemetry.io/collector/confmap v0.98.0 - go.opentelemetry.io/collector/connector v0.98.0 - go.opentelemetry.io/collector/consumer v0.98.0 - go.opentelemetry.io/collector/exporter v0.98.0 - go.opentelemetry.io/collector/extension v0.98.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.98.0 - go.opentelemetry.io/collector/featuregate v1.5.0 - go.opentelemetry.io/collector/pdata v1.5.0 - go.opentelemetry.io/collector/pdata/testdata v0.98.0 - go.opentelemetry.io/collector/processor v0.98.0 - go.opentelemetry.io/collector/receiver v0.98.0 - go.opentelemetry.io/collector/semconv v0.98.0 + go.opentelemetry.io/collector v0.99.0 + go.opentelemetry.io/collector/component v0.99.0 + go.opentelemetry.io/collector/config/confignet v0.99.0 + go.opentelemetry.io/collector/config/configtelemetry v0.99.0 + go.opentelemetry.io/collector/confmap v0.99.0 + go.opentelemetry.io/collector/connector v0.99.0 + go.opentelemetry.io/collector/consumer v0.99.0 + go.opentelemetry.io/collector/exporter v0.99.0 + go.opentelemetry.io/collector/extension v0.99.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.99.0 + go.opentelemetry.io/collector/featuregate v1.6.0 + go.opentelemetry.io/collector/pdata v1.6.0 + go.opentelemetry.io/collector/pdata/testdata v0.99.0 + go.opentelemetry.io/collector/processor v0.99.0 + go.opentelemetry.io/collector/receiver v0.99.0 + go.opentelemetry.io/collector/semconv v0.99.0 go.opentelemetry.io/contrib/config v0.5.0 go.opentelemetry.io/contrib/propagators/b3 v1.25.0 go.opentelemetry.io/otel v1.25.0 diff --git a/versions.yaml b/versions.yaml index 9770aad2f22..6c8181f48bf 100644 --- a/versions.yaml +++ b/versions.yaml @@ -3,14 +3,14 @@ module-sets: stable: - version: v1.5.0 + version: v1.6.0 modules: - go.opentelemetry.io/collector/featuregate - go.opentelemetry.io/collector/pdata - go.opentelemetry.io/collector/config/configopaque - go.opentelemetry.io/collector/config/configcompression beta: - version: v0.98.0 + version: v0.99.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/cmd/builder