Skip to content

Commit f631ea8

Browse files
committed
ClickHouse changes patch
1 parent 89db5aa commit f631ea8

File tree

8 files changed

+42
-40
lines changed

8 files changed

+42
-40
lines changed

cmd/otelcontribcol/components.go

Lines changed: 22 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
44

55
go 1.21.0
66

7-
toolchain go1.21.12
7+
toolchain go1.22.5
88

99
require (
1010
github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.105.0
@@ -105,9 +105,9 @@ require (
105105
github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.105.0
106106
github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.105.0
107107
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.105.0
108-
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.105.0
109108
github.com/open-telemetry/opentelemetry-collector-contrib/processor/loghouseprocessor v0.105.0
110109
github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor v0.105.0
110+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.105.0
111111
github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.105.0
112112
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.105.0
113113
github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.105.0

cmd/otelcontribcol/main.go

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/main_windows.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

processor/loghouseprocessor/factory.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,14 @@ import (
1212
"go.opentelemetry.io/otel/metric"
1313
)
1414

15-
const (
16-
// The value of "type" key in configuration.
17-
typeStr = "loghouse"
15+
var (
16+
// LoghouseProcessorType component.Type = "loghouseprocessor"
1817
)
1918

2019
// NewFactory creates a factory for the routing processor.
2120
func NewFactory() processor.Factory {
2221
return processor.NewFactory(
23-
typeStr,
22+
component.MustNewType("json_log_encoding"),
2423
createDefaultConfig,
2524
processor.WithLogs(createLogsProcessor, component.StabilityLevelBeta),
2625
)

processor/loghouseprocessor/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,11 @@ require (
1010
go.opentelemetry.io/collector/pdata v1.0.2-0.20240125183026-3cacd40b27e8
1111
go.opentelemetry.io/collector/processor v0.93.1-0.20240125183026-3cacd40b27e8
1212
go.opentelemetry.io/otel/metric v1.22.0
13-
go.opentelemetry.io/otel/sdk/metric v1.22.0
1413
go.uber.org/zap v1.26.0
1514
)
1615

1716
require (
1817
github.com/davecgh/go-spew v1.1.1 // indirect
19-
github.com/go-logr/logr v1.4.1 // indirect
20-
github.com/go-logr/stdr v1.2.2 // indirect
2118
github.com/gogo/protobuf v1.3.2 // indirect
2219
github.com/golang/protobuf v1.5.3 // indirect
2320
github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -32,7 +29,6 @@ require (
3229
go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240125183026-3cacd40b27e8 // indirect
3330
go.opentelemetry.io/collector/confmap v0.93.1-0.20240125183026-3cacd40b27e8 // indirect
3431
go.opentelemetry.io/otel v1.22.0 // indirect
35-
go.opentelemetry.io/otel/sdk v1.22.0 // indirect
3632
go.opentelemetry.io/otel/trace v1.22.0 // indirect
3733
go.uber.org/multierr v1.11.0 // indirect
3834
golang.org/x/net v0.20.0 // indirect

processor/loghouseprocessor/go.sum

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
type: processor
2+
scope_name: otelcol/loghouse
3+
4+
status:
5+
class: processor
6+
stability:
7+
alpha: [traces, metrics, logs]
8+
distributions: [core, contrib]
9+
warnings: [Orphaned Telemetry, Other]
10+
codeowners:
11+
active: [RoryCrispin]
12+
tests:
13+
config:

0 commit comments

Comments
 (0)