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

Merged
merged 11 commits into from
Nov 26, 2024
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

# 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 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(
mx-psi marked this conversation as resolved.
Show resolved Hide resolved
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