ClickHouse changes patch

ClickHouse · Jul 19, 2024 · f631ea8 · f631ea8
1 parent 89db5aa
commit f631ea8
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 40 deletions.
diff --git a/cmd/otelcontribcol/components.go b/cmd/otelcontribcol/components.go
diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod
@@ -4,7 +4,7 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib
 
 go 1.21.0
 
-toolchain go1.21.12
+toolchain go1.22.5
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/confmap/provider/s3provider v0.105.0
@@ -105,9 +105,9 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.105.0
-	github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/loghouseprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor v0.105.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricsgenerationprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.105.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.105.0

diff --git a/cmd/otelcontribcol/main.go b/cmd/otelcontribcol/main.go
diff --git a/cmd/otelcontribcol/main_windows.go b/cmd/otelcontribcol/main_windows.go
diff --git a/processor/loghouseprocessor/factory.go b/processor/loghouseprocessor/factory.go
@@ -12,15 +12,14 @@ import (
 	"go.opentelemetry.io/otel/metric"
 )
 
-const (
-	// The value of "type" key in configuration.
-	typeStr = "loghouse"
+var (
+// LoghouseProcessorType component.Type = "loghouseprocessor"
 )
 
 // NewFactory creates a factory for the routing processor.
 func NewFactory() processor.Factory {
 	return processor.NewFactory(
-		typeStr,
+		component.MustNewType("json_log_encoding"),
 		createDefaultConfig,
 		processor.WithLogs(createLogsProcessor, component.StabilityLevelBeta),
 	)

diff --git a/processor/loghouseprocessor/go.mod b/processor/loghouseprocessor/go.mod
@@ -10,14 +10,11 @@ require (
 	go.opentelemetry.io/collector/pdata v1.0.2-0.20240125183026-3cacd40b27e8
 	go.opentelemetry.io/collector/processor v0.93.1-0.20240125183026-3cacd40b27e8
 	go.opentelemetry.io/otel/metric v1.22.0
-	go.opentelemetry.io/otel/sdk/metric v1.22.0
 	go.uber.org/zap v1.26.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
@@ -32,7 +29,6 @@ require (
 	go.opentelemetry.io/collector/config/configtelemetry v0.93.1-0.20240125183026-3cacd40b27e8 // indirect
 	go.opentelemetry.io/collector/confmap v0.93.1-0.20240125183026-3cacd40b27e8 // indirect
 	go.opentelemetry.io/otel v1.22.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
 	go.opentelemetry.io/otel/trace v1.22.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/net v0.20.0 // indirect

diff --git a/processor/loghouseprocessor/go.sum b/processor/loghouseprocessor/go.sum
diff --git a/processor/loghouseprocessor/metadata.yaml b/processor/loghouseprocessor/metadata.yaml
@@ -0,0 +1,13 @@
+type: processor
+scope_name: otelcol/loghouse
+
+status:
+  class: processor
+  stability:
+    alpha: [traces, metrics, logs]
+  distributions: [core, contrib]
+  warnings: [Orphaned Telemetry, Other]
+  codeowners:
+    active: [RoryCrispin]
+tests:
+  config: