-
Notifications
You must be signed in to change notification settings - Fork 1.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a default build configuration to ocb. #5752
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright The OpenTelemetry Authors | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
|
||
package config // import "go.opentelemetry.io/collector/cmd/builder/internal/config" | ||
|
||
import ( | ||
"embed" | ||
|
||
"github.com/knadh/koanf" | ||
"github.com/knadh/koanf/providers/fs" | ||
) | ||
|
||
//go:embed *.yaml | ||
var configs embed.FS | ||
|
||
// DefaultProvider returns a koanf.Provider that provides the default build | ||
// configuration file. This is the same configuration that otelcorecol is | ||
// built with. | ||
func DefaultProvider() koanf.Provider { | ||
return fs.Provider(configs, "default.yaml") | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
dist: | ||
module: go.opentelemetry.io/collector/cmd/otelcorecol | ||
name: otelcorecol | ||
description: Local OpenTelemetry Collector binary, testing only. | ||
version: 0.59.0-dev | ||
otelcol_version: 0.59.0 | ||
|
||
receivers: | ||
- import: go.opentelemetry.io/collector/receiver/otlpreceiver | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
exporters: | ||
- import: go.opentelemetry.io/collector/exporter/loggingexporter | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
- import: go.opentelemetry.io/collector/exporter/otlpexporter | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
- import: go.opentelemetry.io/collector/exporter/otlphttpexporter | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
extensions: | ||
- import: go.opentelemetry.io/collector/extension/ballastextension | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
- import: go.opentelemetry.io/collector/extension/zpagesextension | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
processors: | ||
- import: go.opentelemetry.io/collector/processor/batchprocessor | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
- import: go.opentelemetry.io/collector/processor/memorylimiterprocessor | ||
gomod: go.opentelemetry.io/collector v0.59.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
extensions: | ||
zpages: | ||
|
||
receivers: | ||
otlp: | ||
protocols: | ||
grpc: | ||
|
||
processors: | ||
|
||
exporters: | ||
logging: | ||
|
||
service: | ||
extensions: [zpages] | ||
pipelines: | ||
traces: | ||
receivers: | ||
- otlp | ||
processors: [] | ||
exporters: | ||
- logging |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need to use FS here or could we use file.Provider instead? I ask bc Fs is listed as experimental still.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Where is it marked experimental?
https://pkg.go.dev/github.com/knadh/koanf@v1.4.2/providers/fs
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found it marked experimental on the github page: https://github.com/knadh/koanf#bundled-providers. That particular line hasn't been updated in 13 months, so could be out of date.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see. I was looking at the source and godoc, which doesn't mention experimental status. We can switch to the file provider, but the code needed for that will be basically the same as the fs one, so I don't think there's much benefit.