Skip to content

Fix nil reference panic due to variable shadowing bug #43733

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Oct 23, 2025
+51 −10
Merged

Fix nil reference panic due to variable shadowing bug #43733

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
589ed42
Fix nil reference panic due to variable shadowing bug
lukasbindreiter Oct 22, 2025
1d8f2cb
Add changelog entry
lukasbindreiter Oct 23, 2025
3e7e30a
Merge branch 'main' into main
ChrsMark Oct 23, 2025
ba36c4d
Merge branch 'main' into main
ChrsMark Oct 23, 2025
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
7 changes: 7 additions & 0 deletions exporter/clickhouseexporter/exporter_logs_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter/internal/sqltemplates"
)

// anyLogsExporter is an interface that satisfies both the default map logsExporter and the logsJSONExporter
type anyLogsExporter interface {
start(context.Context, component.Host) error
shutdown(context.Context) error
pushLogsData(context.Context, plog.Logs) error
}

type logsJSONExporter struct {
cfg *Config
logger *zap.Logger
Expand Down
7 changes: 7 additions & 0 deletions exporter/clickhouseexporter/exporter_traces_json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter/internal/sqltemplates"
)

// anyTracesExporter is an interface that satisfies both the default map tracesExporter and the tracesJSONExporter
type anyTracesExporter interface {
start(context.Context, component.Host) error
shutdown(context.Context) error
pushTraceData(ctx context.Context, td ptrace.Traces) error
}

type tracesJSONExporter struct {
cfg *Config
logger *zap.Logger
Expand Down
20 changes: 10 additions & 10 deletions exporter/clickhouseexporter/factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ func createLogsExporter(
c := cfg.(*Config)
c.collectorVersion = set.BuildInfo.Version

exp := newLogsExporter(set.Logger, c)
startOpt := exporterhelper.WithStart(exp.start)
var exp anyLogsExporter
if featureGateJSON.IsEnabled() {
exp := newLogsJSONExporter(set.Logger, c)
startOpt = exporterhelper.WithStart(exp.start)
exp = newLogsJSONExporter(set.Logger, c)
} else {
exp = newLogsExporter(set.Logger, c)
}

return exporterhelper.NewLogs(
ctx,
set,
cfg,
exp.pushLogsData,
startOpt,
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.shutdown),
exporterhelper.WithTimeout(c.TimeoutSettings),
exporterhelper.WithQueue(c.QueueSettings),
Expand All @@ -65,19 +65,19 @@ func createTracesExporter(
c := cfg.(*Config)
c.collectorVersion = set.BuildInfo.Version

exp := newTracesExporter(set.Logger, c)
startOpt := exporterhelper.WithStart(exp.start)
var exp anyTracesExporter
if featureGateJSON.IsEnabled() {
exp := newTracesJSONExporter(set.Logger, c)
startOpt = exporterhelper.WithStart(exp.start)
exp = newTracesJSONExporter(set.Logger, c)
} else {
exp = newTracesExporter(set.Logger, c)
}

return exporterhelper.NewTraces(
ctx,
set,
cfg,
exp.pushTraceData,
startOpt,
exporterhelper.WithStart(exp.start),
exporterhelper.WithShutdown(exp.shutdown),
exporterhelper.WithTimeout(c.TimeoutSettings),
exporterhelper.WithQueue(c.QueueSettings),
Expand Down
Loading