Skip to content

Commit eed03b9

Browse files
obs-gh-alexlewobs-gh-alexlew
committed
feat: update components for processor + processor changes
1 parent 5cf6459 commit eed03b9

File tree

14 files changed

+84
-181
lines changed

14 files changed

+84
-181
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ release:
99

1010
## install-ocb: Installs correct version of ocb binary
1111
install-ocb:
12-
curl --proto '=https' --tlsv1.2 -L -o "$(HOME)/bin/ocb" https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2Fv0.104.0/ocb_0.104.0_darwin_arm64
12+
curl --proto '=https' --tlsv1.2 -L -o "$(HOME)/bin/ocb" https://github.com/open-telemetry/opentelemetry-collector/releases/download/cmd%2Fbuilder%2Fv0.105.0/ocb_0.105.0_darwin_arm64
1313
@chmod +x "$(HOME)/bin/ocb"
1414

1515
## build-ocb: Builds project using ocb

‎builder-config.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ processors:
2121
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.105.0
2222
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.105.0
2323
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.105.0
24+
- gomod: github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000
25+
path: ./components/processors/observek8sattributesprocessor
2426

2527
receivers:
2628
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.105.0
@@ -48,7 +50,6 @@ extensions:
4850

4951
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.105.0
5052
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.105.0
51-
5253
connectors:
5354
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.105.0
5455

‎cmd/collector/components.go

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

‎cmd/collector/go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
module observe/otelcol
44

5-
go 1.21.0
6-
7-
toolchain go1.22.3
5+
go 1.22.3
86

97
require (
8+
github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000
109
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.105.0
1110
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.105.0
1211
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.105.0
@@ -312,8 +311,8 @@ require (
312311
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
313312
gopkg.in/yaml.v2 v2.4.0 // indirect
314313
gopkg.in/yaml.v3 v3.0.1 // indirect
315-
k8s.io/api v0.29.3 // indirect
316-
k8s.io/apimachinery v0.29.3 // indirect
314+
k8s.io/api v0.30.3 // indirect
315+
k8s.io/apimachinery v0.30.3 // indirect
317316
k8s.io/client-go v0.29.3 // indirect
318317
k8s.io/klog/v2 v2.120.1 // indirect
319318
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
@@ -323,3 +322,5 @@ require (
323322
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
324323
sigs.k8s.io/yaml v1.3.0 // indirect
325324
)
325+
326+
replace github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000 => /Users/alex.lew/dev/observe-agent/components/processors/observek8sattributesprocessor

‎cmd/collector/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,12 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
570570
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
571571
github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
572572
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
573-
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
574-
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
573+
github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY=
574+
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
575575
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
576576
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
577-
github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
578-
github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
577+
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
578+
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
579579
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.105.0 h1:dCq7P9MfGeBCQwxDu1TlS94KXkVjZhueCm4fSFlEG38=
580580
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.105.0/go.mod h1:x/H4ulXmk8HU7HzBOHrJL+C4dHMGauV6f5CxFXyP4rE=
581581
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.105.0 h1:I3I7FaUgATms/w1O+aKvg7/cjlQg+J/BCECUHHP80rI=
@@ -1394,11 +1394,11 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
13941394
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
13951395
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
13961396
k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s=
1397-
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
1398-
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
1397+
k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ=
1398+
k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04=
13991399
k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY=
1400-
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
1401-
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
1400+
k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
1401+
k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
14021402
k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs=
14031403
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
14041404
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=

‎components/processors/observek8sattributesprocessor/factory.go

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,43 @@
11
package observek8sattributesprocessor
22

33
import (
4+
"context"
5+
46
"go.opentelemetry.io/collector/component"
57
"go.opentelemetry.io/collector/consumer"
68
"go.opentelemetry.io/collector/processor"
7-
8-
"observe-agent/components/processors/observek8sattributesprocessor/internal/metadata"
9+
"go.opentelemetry.io/collector/processor/processorhelper"
910
)
1011

1112
var processorCapabilities = consumer.Capabilities{MutatesData: true}
1213

1314
func NewFactory() processor.Factory {
1415
return processor.NewFactory(
15-
metadata.Type,
16+
Type,
1617
createDefaultConfig,
18+
processor.WithLogs(createLogsProcessor, LogsStability),
1719
)
1820
}
1921

2022
func createDefaultConfig() component.Config {
2123
return &Config{}
2224
}
25+
26+
func createLogsProcessor(
27+
ctx context.Context,
28+
set processor.Settings,
29+
cfg component.Config,
30+
nextConsumer consumer.Logs,
31+
) (processor.Logs, error) {
32+
kep := newK8sEventsProcessor(set.Logger, cfg)
33+
return processorhelper.NewLogsProcessor(
34+
ctx,
35+
set,
36+
cfg,
37+
nextConsumer,
38+
kep.processLogs,
39+
processorhelper.WithCapabilities(processorCapabilities),
40+
processorhelper.WithStart(kep.Start),
41+
processorhelper.WithShutdown(kep.Shutdown),
42+
)
43+
}

‎components/processors/observek8sattributesprocessor/internal/metadata/generated_status.go renamed to ‎components/processors/observek8sattributesprocessor/generated_status.go

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

‎components/processors/observek8sattributesprocessor/go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ require (
4242
github.com/prometheus/client_model v0.6.1 // indirect
4343
github.com/prometheus/common v0.55.0 // indirect
4444
github.com/prometheus/procfs v0.15.1 // indirect
45+
go.opentelemetry.io/collector v0.105.0 // indirect
4546
go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
4647
go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect
4748
go.opentelemetry.io/collector/pdata/pprofile v0.105.0 // indirect

‎components/processors/observek8sattributesprocessor/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
6969
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
7070
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
7171
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
72+
go.opentelemetry.io/collector v0.105.0 h1:Qw/ONVMPT3aD8HjdDRcXCGoZrtSWH3jx4BkwAN1yrEM=
73+
go.opentelemetry.io/collector v0.105.0/go.mod h1:UVapTqB4fJeZpGU/YgOo6665cxCSytqYmMkVmRlu2cg=
7274
go.opentelemetry.io/collector/component v0.105.0 h1:/OdkWHd1xTNX7JRq9iW3AFoJAnYUOGZZyOprNQkGoTI=
7375
go.opentelemetry.io/collector/component v0.105.0/go.mod h1:s8KoxOrhNIBzetkb0LHmzX1OI67DyZbaaUPOWIXS1mg=
7476
go.opentelemetry.io/collector/config/configtelemetry v0.105.0 h1:wEfUxAjjstp47aLr2s1cMZiH0dt+k42m6VC6HigqgJA=

‎components/processors/observek8sattributesprocessor/internal/metadata/generated_telemetry.go

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)