Skip to content
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

[service] ensure otlp emitted logs respect severity #11718

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .chloggen/codeboten_fix-11717.yaml
Original file line number Diff line number Diff line change
@@ -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: 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 otlp emitted logs respect severity
codeboten marked this conversation as resolved.
Show resolved Hide resolved

# One or more tracking issues or pull requests related to the change
issues: [11718]

# (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: []
2 changes: 1 addition & 1 deletion cmd/builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Finally, load the OpenTelemetry Collector as a project in the IDE, configure deb
The configuration file is composed of two main parts: `dist` and module types. All `dist` options can be specified via command line flags:

```console
ocb --config=config.yaml --name="my-otelcol"
ocb --config=config.yaml
codeboten marked this conversation as resolved.
Show resolved Hide resolved
```

The module types are specified at the top-level, and might be: `extensions`, `exporters`, `receivers` and `processors`. They all accept a list of components, and each component is required to have at least the `gomod` entry. When not specified, the `import` value is inferred from the `gomod`. When not specified, the `name` is inferred from the `import`.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"devDependencies": {
"markdown-link-check": "3.12.2"
"markdown-link-check": "3.13.6"
mx-psi marked this conversation as resolved.
Show resolved Hide resolved
codeboten marked this conversation as resolved.
Show resolved Hide resolved
}
}
5 changes: 3 additions & 2 deletions service/telemetry/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,13 @@ func newLogger(set Settings, cfg Config) (*zap.Logger, log.LoggerProvider, error
lp = set.SDK.LoggerProvider()

logger = logger.WithOptions(zap.WrapCore(func(c zapcore.Core) zapcore.Core {
return zapcore.NewTee(
core, _ := zapcore.NewIncreaseLevelCore(zapcore.NewTee(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we panic when this error is returned? Ignoring the error feels weird. I think we should also add unit tests for every level to check for this error as well

c,
otelzap.NewCore("go.opentelemetry.io/collector/service/telemetry",
otelzap.WithLoggerProvider(lp),
),
)
), zap.NewAtomicLevelAt(cfg.Logs.Level))
return core
}))
}

Expand Down
2 changes: 1 addition & 1 deletion service/telemetry/logger_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func TestNewLogger(t *testing.T) {
},
},
},
wantCoreType: "zapcore.multiCore",
wantCoreType: "*zapcore.levelFilterCore",
},
}
for _, tt := range tests {
Expand Down
Loading