Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OpenTelemetry Protocol with Apache Arrow Receiver initial skeleton #30766

Merged
merged 37 commits into from
Feb 7, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
cd217a1
empty package
jmacd Jan 23, 2024
55b5117
skeleton code & lint
jmacd Jan 24, 2024
3e8ad65
lint
jmacd Jan 24, 2024
edbbe3c
revert one file
jmacd Jan 24, 2024
89c94a5
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 25, 2024
b372a1c
lint
jmacd Jan 25, 2024
3d045ca
version update
jmacd Jan 25, 2024
084ad4e
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 26, 2024
8089387
version update
jmacd Jan 26, 2024
f7fbcce
this is stupid
jmacd Jan 26, 2024
40a2201
make failed me, do this manually
jmacd Jan 26, 2024
3af8198
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 29, 2024
cca45f2
[chore] multimod update stable modules
jmacd Jan 29, 2024
9d61be7
[chore] multimod update beta modules
jmacd Jan 29, 2024
b8efa66
i.d.k. make update-otel
jmacd Jan 29, 2024
baca4f4
goporto
jmacd Jan 29, 2024
9487d45
again
jmacd Jan 29, 2024
32f6f3a
manual
jmacd Jan 29, 2024
23b9ade
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 30, 2024
420ebb4
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 30, 2024
85e3b76
manual
jmacd Jan 30, 2024
6e42111
one sum fix
jmacd Jan 30, 2024
22bd384
try again
jmacd Jan 30, 2024
7b1a2e9
again
jmacd Jan 30, 2024
a97992c
gendist
jmacd Jan 30, 2024
67942a8
versions.yaml
jmacd Jan 30, 2024
044bf4c
oh
jmacd Jan 31, 2024
d0c306f
fix mod
jmacd Jan 31, 2024
60ecbb6
porto-gci
jmacd Jan 31, 2024
cfa836f
repackage
jmacd Jan 31, 2024
ea166ae
gci
jmacd Jan 31, 2024
ca9ee88
Merge branch 'main' of github.com:open-telemetry/opentelemetry-collec…
jmacd Jan 31, 2024
fce4631
use this repo's sharedcomponent
jmacd Jan 31, 2024
ab60883
use metadata; crosslink
jmacd Jan 31, 2024
86e7771
tidy
jmacd Jan 31, 2024
6a55c31
grrr
jmacd Jan 31, 2024
6a0acc3
remove func
jmacd Jan 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use this repo's sharedcomponent
  • Loading branch information
jmacd committed Jan 31, 2024
commit fce4631867347440311cb34c1afd46153f52b8a7
31 changes: 17 additions & 14 deletions receiver/otelarrowreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package otelarrowreceiver // import "github.com/open-telemetry/opentelemetry-col
import (
"context"

"github.com/open-telemetry/otel-arrow/collector/sharedcomponent"
"github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/configgrpc"
"go.opentelemetry.io/collector/config/confignet"
Expand Down Expand Up @@ -57,16 +57,17 @@ func createTraces(
set receiver.CreateSettings,
cfg component.Config,
nextConsumer consumer.Traces,
) (receiver.Traces, error) {
) (_ receiver.Traces, err error) {
oCfg := cfg.(*Config)
r, err := receivers.GetOrAdd(oCfg, func() (*otelArrowReceiver, error) {
return newOTelArrowReceiver(oCfg, set)
r := receivers.GetOrAdd(oCfg, func() (comp component.Component) {
comp, err = newOTelArrowReceiver(oCfg, set)
return
})
if err != nil {
return nil, err
}

if err = r.Unwrap().registerTraceConsumer(nextConsumer); err != nil {
if err = r.Unwrap().(*otelArrowReceiver).registerTraceConsumer(nextConsumer); err != nil {
return nil, err
}
return r, nil
Expand All @@ -78,16 +79,17 @@ func createMetrics(
set receiver.CreateSettings,
cfg component.Config,
consumer consumer.Metrics,
) (receiver.Metrics, error) {
) (_ receiver.Metrics, err error) {
oCfg := cfg.(*Config)
r, err := receivers.GetOrAdd(oCfg, func() (*otelArrowReceiver, error) {
return newOTelArrowReceiver(oCfg, set)
r := receivers.GetOrAdd(oCfg, func() (comp component.Component) {
comp, err = newOTelArrowReceiver(oCfg, set)
return comp
})
if err != nil {
return nil, err
}

if err = r.Unwrap().registerMetricsConsumer(consumer); err != nil {
if err = r.Unwrap().(*otelArrowReceiver).registerMetricsConsumer(consumer); err != nil {
return nil, err
}
return r, nil
Expand All @@ -99,16 +101,17 @@ func createLog(
set receiver.CreateSettings,
cfg component.Config,
consumer consumer.Logs,
) (receiver.Logs, error) {
) (_ receiver.Logs, err error) {
oCfg := cfg.(*Config)
r, err := receivers.GetOrAdd(oCfg, func() (*otelArrowReceiver, error) {
return newOTelArrowReceiver(oCfg, set)
r := receivers.GetOrAdd(oCfg, func() (comp component.Component) {
comp, err = newOTelArrowReceiver(oCfg, set)
return comp
})
if err != nil {
return nil, err
}

if err = r.Unwrap().registerLogsConsumer(consumer); err != nil {
if err = r.Unwrap().(*otelArrowReceiver).registerLogsConsumer(consumer); err != nil {
return nil, err
}
return r, nil
Expand All @@ -120,4 +123,4 @@ func createLog(
// create separate objects, they must use one otelArrowReceiver object per configuration.
// When the receiver is shutdown it should be removed from this map so the same configuration
// can be recreated successfully.
var receivers = sharedcomponent.NewSharedComponents[*Config, *otelArrowReceiver]()
var receivers = sharedcomponent.NewSharedComponents()
1 change: 1 addition & 0 deletions receiver/otelarrowreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.2.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.93.0 // indirect
github.com/pierrec/lz4/v4 v4.1.18 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
Expand Down
7 changes: 7 additions & 0 deletions receiver/otelarrowreceiver/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions receiver/otelarrowreceiver/internal/sharedcomponent/doc.go

This file was deleted.

This file was deleted.

This file was deleted.

Loading