Skip to content

Commit 08f50a2

Browse files
obs-gh-alexlewobs-gh-alexlew
authored
build(deps): add spanprocessor and tcplog receiver (#66)
### Description OB-35138 Adds the spanprocessor OB-35146 Add tcplogreceiver ### Checklist - [ ] Created tests which fail without the change (if possible) - [ ] Extended the README / documentation, if necessary
1 parent 66a6c6b commit 08f50a2

File tree

28 files changed

+1619
-5
lines changed

28 files changed

+1619
-5
lines changed

‎README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ make build-ocb
2727

2828
This command should add the new dependencies and code in the correct places. You can build the agent afterwards with `go build` to confirm.
2929

30+
Afterwards, you should add the new component to the `Components` section below.
31+
3032
## Running
3133

3234
To start the observe agent after building the binary run the following command.
@@ -50,8 +52,8 @@ This section lists the components that are included in the Observe Distribution
5052
| [filestats][filestatsreceiver] | [memory_limiter][memorylimiterprocessor] | | | |
5153
| [hostmetrics][hostmetricsreceiver] | [observek8sattributes][observek8sattributesprocessor] | | | |
5254
| [iis][iisreceiver] | [resourcedetection][resourcedetectionprocessor] | | | |
53-
| [journald][journaldreceiver] | [transform][transformprocessor] | | | |
54-
| [k8s_cluster][k8sclusterreceiver] | | | | |
55+
| [journald][journaldreceiver] | [span][spanprocessor] | | | |
56+
| [k8s_cluster][k8sclusterreceiver] | [transform][transformprocessor] | | | |
5557
| [k8sobjects][k8sobjectsreceiver] | | | | |
5658
| [kafkametrics][kafkametricsreceiver] | | | | |
5759
| [kafka][kafkareceiver] | | | | |
@@ -60,6 +62,7 @@ This section lists the components that are included in the Observe Distribution
6062
| [prometheus][prometheusreceiver] | | | | |
6163
| [redis][redisreceiver] | | | | |
6264
| [statsd][statsdreceiver] | | | | |
65+
| [tcplog][tcplogreceiver] | | | | |
6366
| [windowseventlog][windowseventlogreceiver] | | | | |
6467

6568
[awsecscontainermetricsreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/receiver/awsecscontainermetricsreceiver
@@ -79,6 +82,7 @@ This section lists the components that are included in the Observe Distribution
7982
[prometheusreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/receiver/prometheusreceiver
8083
[redisreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.102.0/receiver/redisreceiver
8184
[statsdreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/receiver/statsdreceiver
85+
[tcplogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/receiver/tcplogreceiver
8286
[windowseventlogreceiver]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/receiver/windowseventlogreceiver
8387
[attributesprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/processor/attributesprocessor
8488
[batchprocessor]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.105.0/processor/batchprocessor
@@ -87,6 +91,7 @@ This section lists the components that are included in the Observe Distribution
8791
[memorylimiterprocessor]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.105.0/processor/memorylimiterprocessor
8892
[observek8sattributesprocessor]: ./components/processors/observek8sattributesprocessor
8993
[resourcedetectionprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/processor/resourcedetectionprocessor
94+
[spanprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/processor/spanprocessor
9095
[transformprocessor]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/processor/transformprocessor
9196
[debugexporter]: https://github.com/open-telemetry/opentelemetry-collector/tree/v0.105.0/exporter/debugexporter
9297
[fileexporter]: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/v0.105.0/exporter/fileexporter

‎builder-config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ 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/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.105.0
2425
- gomod: github.com/observeinc/observe-agent/components/processors/observek8sattributesprocessor v0.0.0-00010101000000-000000000000
2526
path: ./components/processors/observek8sattributesprocessor
2627

@@ -43,6 +44,7 @@ receivers:
4344
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.105.0
4445
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.105.0
4546
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.105.0
47+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.105.0
4648
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.105.0
4749

4850
extensions:

‎cmd/collector/components.go

Lines changed: 6 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.105.0
1515
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.105.0
1616
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.105.0
17+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.105.0
1718
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.105.0
1819
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.105.0
1920
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.105.0
@@ -31,6 +32,7 @@ require (
3132
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.105.0
3233
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.105.0
3334
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.105.0
35+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.105.0
3436
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.105.0
3537
github.com/spf13/cobra v1.8.1
3638
go.opentelemetry.io/collector/component v0.105.0

‎cmd/collector/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattribute
654654
github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.105.0/go.mod h1:pranRmnWRkzDsn9a16BzSqX6HJ6XjjVVFmMhyZPEzt0=
655655
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.105.0 h1:c/amt4jBLbjIpi4CtRUjQW2gdQbVA607TEX8BCgCwe4=
656656
github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.105.0/go.mod h1:HIqvjexbr/OzqucODsCSJabuXZPS8PaLYhNPeeU8xUA=
657+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.105.0 h1:gHr1z0EpNmolRkEEEr01Lq/OYm/nNYaWRN+V32J0cuk=
658+
github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.105.0/go.mod h1:FXzm0twR7yvayJ8ozR0d6JY4X4ehUbyRwFPnh10wf3k=
657659
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.105.0 h1:/6i9boKkDmL6hAa4rXPAH4iLVIKAPFfl33OX21usXZk=
658660
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.105.0/go.mod h1:5BAgFbVX+kgOXqFZVOZNko/xUSXIWbHgHC2hwdhAMbo=
659661
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver v0.105.0 h1:grQp+Da5IeTn4PGTnBU2fwu9ktSsytmTvQ4oYYXXD0s=
@@ -688,6 +690,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver
688690
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.105.0/go.mod h1:fmDaERWZHzWKfGe4QVqJNMou6zjdmuu86oCUCikxZ44=
689691
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.105.0 h1:Lys0FAkWPs64Mt754aEynmlxy5RMOqdcyVEu96YPCFQ=
690692
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.105.0/go.mod h1:ci0in9sSH/2OOjW95Xq5f67j4bTYYWQ7RUuZPTfyh3o=
693+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.105.0 h1:cQeHLKssdlnTS8P69LhJcPQRRwXQnkfTJ8B6hlHq+1M=
694+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver v0.105.0/go.mod h1:zvImfBdXzdRXcq+pnPEqQVvbgAw2UgSBKWy0ymz/Gk4=
691695
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.105.0 h1:7TK97dlX5yKl/Hlj1KvfC3RQPtwc9uGBVGDTvsLIHQU=
692696
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.105.0/go.mod h1:OV/epvVwWKgGny7ZRuL2q4Ge4RRx0hoWiIppHy8ndXc=
693697
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

‎components/processors/observek8sattributesprocessor/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,10 @@ go 1.22.5
55
require (
66
github.com/stretchr/testify v1.9.0
77
go.opentelemetry.io/collector/component v0.105.0
8-
go.opentelemetry.io/collector/config/configtelemetry v0.105.0
98
go.opentelemetry.io/collector/confmap v0.105.0
109
go.opentelemetry.io/collector/consumer v0.105.0
1110
go.opentelemetry.io/collector/pdata v1.12.0
1211
go.opentelemetry.io/collector/processor v0.105.0
13-
go.opentelemetry.io/otel/metric v1.28.0
14-
go.opentelemetry.io/otel/trace v1.28.0
1512
go.uber.org/goleak v1.3.0
1613
go.uber.org/zap v1.27.0
1714
k8s.io/api v0.30.3
@@ -43,14 +40,17 @@ require (
4340
github.com/prometheus/common v0.55.0 // indirect
4441
github.com/prometheus/procfs v0.15.1 // indirect
4542
go.opentelemetry.io/collector v0.105.0 // indirect
43+
go.opentelemetry.io/collector/config/configtelemetry v0.105.0 // indirect
4644
go.opentelemetry.io/collector/featuregate v1.12.0 // indirect
4745
go.opentelemetry.io/collector/internal/globalgates v0.105.0 // indirect
4846
go.opentelemetry.io/collector/pdata/pprofile v0.105.0 // indirect
4947
go.opentelemetry.io/collector/pdata/testdata v0.105.0 // indirect
5048
go.opentelemetry.io/otel v1.28.0 // indirect
5149
go.opentelemetry.io/otel/exporters/prometheus v0.50.0 // indirect
50+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
5251
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
5352
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
53+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
5454
go.uber.org/multierr v1.11.0 // indirect
5555
golang.org/x/net v0.26.0 // indirect
5656
golang.org/x/sys v0.21.0 // indirect

‎go.work.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cloud.google.com/go v0.114.0/go.mod h1:ZV9La5YYxctro1HTPug5lXH/GefROyW8PPD4T8n9J
55
cloud.google.com/go/bigquery v1.8.0 h1:PQcPefKFdaIzjQFbiyOgAqyx8q5djaE7x9Sqe712DPA=
66
cloud.google.com/go/compute v1.23.0 h1:tP41Zoavr8ptEqaW6j+LQOnyBBhO7OkOMAGrgLopTwY=
77
cloud.google.com/go/compute v1.23.3 h1:6sVlXXBmbd7jNX0Ipq0trII3e4n1/MsADLK6a+aiVlk=
8+
cloud.google.com/go/compute v1.23.3/go.mod h1:VCgBUoMnIVIR0CscqQiPJLAG25E3ZRZMzcFZeQ+h8CI=
89
cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg=
910
cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40=
1011
cloud.google.com/go/datastore v1.1.0 h1:/May9ojXjRkPBNVrq+oWLqmWCkr4OU5uRY29bu0mRyQ=
@@ -213,6 +214,8 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb
213214
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8=
214215
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4=
215216
github.com/hashicorp/go-syslog v1.0.0 h1:KaodqZuhUoZereWVIYmpUgZysurB1kBLX2j0MwMrUAE=
217+
github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
218+
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
216219
github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y=
217220
github.com/hashicorp/mdns v1.0.4 h1:sY0CMhFmjIPDMlTB+HfymFHCaYLhgifZ0QhjaYKD/UQ=
218221
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
@@ -300,6 +303,8 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf
300303
github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f h1:UFr9zpz4xgTnIE5yIMtWAMngCdZ9p/+q6lTbgelo80M=
301304
github.com/sagikazarmark/crypt v0.19.0 h1:WMyLTjHBo64UvNcWqpzY3pbZTYgnemZU8FBZigKc42E=
302305
github.com/sagikazarmark/crypt v0.19.0/go.mod h1:c6vimRziqqERhtSe0MhIvzE1w54FrCHtrXb5NH/ja78=
306+
github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
307+
github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
303308
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c h1:aqg5Vm5dwtvL+YgDpBcK1ITf3o96N/K7/wsRXQnUTEs=
304309
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c/go.mod h1:owqhoLW1qZoYLZzLnBw+QkPP9WZnjlSWihhxAJC1+/M=
305310
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=

0 commit comments

Comments
 (0)