Skip to content

Commit 39896a2

Browse files
authored
OTel-Arrow receiver cleanups for Collector-Contrib (#146)
Keeping changes in sync between this repo and open-telemetry/opentelemetry-collector-contrib#30766 Remove two dead files that will be regenerated in contrib. Remove `otlpReceiver` type name, use `otelArrowReceiver`. Move sharedcomponent to internal package location.
1 parent 01295d5 commit 39896a2

File tree

25 files changed

+71
-261
lines changed

25 files changed

+71
-261
lines changed

collector/cmd/otelarrowcol/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,3 @@ require (
165165
gopkg.in/yaml.v2 v2.4.0 // indirect
166166
gopkg.in/yaml.v3 v3.0.1 // indirect
167167
)
168-
169-
170-
171-
172-
173-
174-
175-
176-
177-
178-

collector/cmd/otelarrowcol/go.sum

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,26 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssette
807807
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.92.0 h1:UjQc8SnDLcj0wbIuPNB7N0Mcw1ZHlXSMeeypal5Bb5Q=
808808
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.92.0/go.mod h1:/JuyfhH5UwguhZc2Vl/u7h/5QOrY/raD6OXOxzTE0Bs=
809809
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.92.0 h1:x36ZvOy+ad363p3viPF2FZnaxcM2yoUPQpg9VX89unw=
810+
github.com/open-telemetry/otel-arrow v0.16.0 h1:lCBAkExvNym3iBetqI3y+/neeM2sOxxa+3hX0E7iYZ4=
811+
github.com/open-telemetry/otel-arrow v0.16.0/go.mod h1:p66iQDCGJxXV3QKfVgvAtDVblf9SUp9YzKMqdW7rPmg=
812+
github.com/open-telemetry/otel-arrow/collector v0.16.0 h1:EykDdwy1LPvriYsLRY8DhB5f5d1lZ+zTjI1hm6NMwDI=
813+
github.com/open-telemetry/otel-arrow/collector v0.16.0/go.mod h1:6nX1w0Pci4sxuoiuclVWhJPGDynp/3XiOgMVnS3uiXE=
814+
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.16.0 h1:rdhzGbujIjHGlDtoCBRYNNC6RjT8gqV8M6NgbbL4D+w=
815+
github.com/open-telemetry/otel-arrow/collector/connector/validationconnector v0.16.0/go.mod h1:ftlfbXQTx4VJCCT+jInqmPQJ5sl5iYRoSdC/OeV4CkM=
816+
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.16.0 h1:x9A36jWAIOcLEOz834KpIxCMsHeuw5c3f48fCvoQzVM=
817+
github.com/open-telemetry/otel-arrow/collector/exporter/fileexporter v0.16.0/go.mod h1:Z9dfy8km1PN1JIKqTrVsvxMrC0OkfgCLGDtkGco83cg=
818+
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.16.0 h1:XCPMwhY3vK5KjvZ2GnPE+O/RrxBJm+56ZINFEddDrYs=
819+
github.com/open-telemetry/otel-arrow/collector/exporter/otelarrowexporter v0.16.0/go.mod h1:QWKiFqd/7FY2vkl5jdp/TaCGFduM2ZV2OL9nKIo5tFY=
820+
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.16.0 h1:iFBHkJZqduFftCez3FvI4MPIfZGdpnNaU8WYcjJtRec=
821+
github.com/open-telemetry/otel-arrow/collector/processor/concurrentbatchprocessor v0.16.0/go.mod h1:fULZXBcZmrHDkrPmXGXzJVGEk6c05EaLfT0EBnoTP3U=
822+
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.16.0 h1:byzzswjvyDgMMbtWgP87a8KvEw6Ee5bs08ThT3Z82A0=
823+
github.com/open-telemetry/otel-arrow/collector/processor/experimentprocessor v0.16.0/go.mod h1:TUDjHTlcvlnUVaLhKuMcTGUGCSCohAFQC5QmusAkr0Y=
824+
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.16.0 h1:92s+yh8kmNy3z6buS+N5sEThzi4MPjXuODUOVlwjhLw=
825+
github.com/open-telemetry/otel-arrow/collector/processor/obfuscationprocessor v0.16.0/go.mod h1:z6O7z4VKallWgjxHlxYJRAdYdtPP/1sw9Kr3pLfqh1Y=
826+
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.16.0 h1:7SaVxbvwm/BrDfSAztcwwBrqOYCAk1D1fDR8y/l2xdQ=
827+
github.com/open-telemetry/otel-arrow/collector/receiver/filereceiver v0.16.0/go.mod h1:F/je/e0DndXL/CDQ2LeXu7qbBug85VNuDw1odRQcb+U=
828+
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.16.0 h1:oOC3xWCsDqR/nCeOLCpbArne+oo5FnM999srq2zJNUU=
829+
github.com/open-telemetry/otel-arrow/collector/receiver/otelarrowreceiver v0.16.0/go.mod h1:HMJv7zXL185VJoZeXB1LxIend7gx3xH/w5Ni9zl9/44=
810830
github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
811831
github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
812832
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=

collector/connector/validationconnector/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,3 @@ require (
4343
google.golang.org/protobuf v1.32.0 // indirect
4444
gopkg.in/yaml.v3 v3.0.1 // indirect
4545
)
46-
47-
48-
49-
50-
51-
52-
53-
54-
55-
56-

collector/connector/validationconnector/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
3636
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
3737
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
3838
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
39+
github.com/open-telemetry/otel-arrow v0.16.0 h1:lCBAkExvNym3iBetqI3y+/neeM2sOxxa+3hX0E7iYZ4=
40+
github.com/open-telemetry/otel-arrow v0.16.0/go.mod h1:p66iQDCGJxXV3QKfVgvAtDVblf9SUp9YzKMqdW7rPmg=
3941
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
4042
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4143
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=

collector/examples/printer/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,3 @@ require (
1919
google.golang.org/grpc v1.60.1 // indirect
2020
google.golang.org/protobuf v1.32.0 // indirect
2121
)
22-
23-
24-
25-
26-
27-
28-
29-
30-
31-
32-

collector/exporter/fileexporter/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,3 @@ require (
5050
google.golang.org/protobuf v1.32.0 // indirect
5151
gopkg.in/yaml.v3 v3.0.1 // indirect
5252
)
53-
54-
55-
56-
57-
58-
59-
60-
61-
62-
63-

collector/exporter/fileexporter/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
7575
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
7676
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
7777
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
78+
github.com/open-telemetry/otel-arrow/collector v0.16.0 h1:EykDdwy1LPvriYsLRY8DhB5f5d1lZ+zTjI1hm6NMwDI=
79+
github.com/open-telemetry/otel-arrow/collector v0.16.0/go.mod h1:6nX1w0Pci4sxuoiuclVWhJPGDynp/3XiOgMVnS3uiXE=
7880
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
7981
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8082
github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk=

collector/exporter/otelarrowexporter/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,3 @@ require (
8585
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
8686
gopkg.in/yaml.v3 v3.0.1 // indirect
8787
)
88-
89-
90-
91-
92-
93-
94-
95-
96-
97-
98-

collector/exporter/otelarrowexporter/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
121121
github.com/mostynb/go-grpc-compression v1.2.2 h1:XaDbnRvt2+1vgr0b/l0qh4mJAfIxE0bKXtz2Znl3GGI=
122122
github.com/mostynb/go-grpc-compression v1.2.2/go.mod h1:GOCr2KBxXcblCuczg3YdLQlcin1/NfyDA348ckuCH6w=
123123
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
124+
github.com/open-telemetry/otel-arrow v0.16.0 h1:lCBAkExvNym3iBetqI3y+/neeM2sOxxa+3hX0E7iYZ4=
125+
github.com/open-telemetry/otel-arrow v0.16.0/go.mod h1:p66iQDCGJxXV3QKfVgvAtDVblf9SUp9YzKMqdW7rPmg=
126+
github.com/open-telemetry/otel-arrow/collector v0.16.0 h1:EykDdwy1LPvriYsLRY8DhB5f5d1lZ+zTjI1hm6NMwDI=
127+
github.com/open-telemetry/otel-arrow/collector v0.16.0/go.mod h1:6nX1w0Pci4sxuoiuclVWhJPGDynp/3XiOgMVnS3uiXE=
124128
github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
125129
github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
126130
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

collector/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,3 @@ require (
5050
google.golang.org/protobuf v1.32.0 // indirect
5151
gopkg.in/yaml.v3 v3.0.1 // indirect
5252
)
53-
54-
55-
56-
57-
58-
59-
60-
61-
62-
63-

collector/processor/concurrentbatchprocessor/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,3 @@ require (
6161
google.golang.org/protobuf v1.32.0 // indirect
6262
gopkg.in/yaml.v3 v3.0.1 // indirect
6363
)
64-
65-
66-
67-
68-
69-
70-
71-
72-
73-
74-

collector/processor/experimentprocessor/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,3 @@ require (
4343
google.golang.org/protobuf v1.32.0 // indirect
4444
gopkg.in/yaml.v3 v3.0.1 // indirect
4545
)
46-
47-
48-
49-
50-
51-
52-
53-
54-
55-
56-

collector/processor/obfuscationprocessor/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,3 @@ require (
5959
google.golang.org/protobuf v1.32.0 // indirect
6060
gopkg.in/yaml.v3 v3.0.1 // indirect
6161
)
62-
63-
64-
65-
66-
67-
68-
69-
70-
71-
72-

collector/receiver/filereceiver/go.mod

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,3 @@ require (
4343
google.golang.org/protobuf v1.32.0 // indirect
4444
gopkg.in/yaml.v3 v3.0.1 // indirect
4545
)
46-
47-
48-
49-
50-
51-
52-
53-
54-
55-
56-

collector/receiver/otelarrowreceiver/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)