Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
27 changes: 27 additions & 0 deletions .chloggen/faro-receiver-logic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: faroreceiver

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Completes the implementation of the Faro receiver.

# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
issues: [19180]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# If your change doesn't affect end users or the exported elements of any package,
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
1 change: 1 addition & 0 deletions cmd/otelcontribcol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ receivers:
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/envoyalsreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver v0.125.0
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver v0.125.0
Expand Down
28 changes: 27 additions & 1 deletion receiver/faroreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,30 @@
[development]: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#development
<!-- end autogenerated section -->

TODO
# Faro Receiver

This receiver can receive telemetry data in [Faro format](https://github.com/grafana/faro) that adhere to the [Faro OpenAPI schema](https://github.com/grafana/faro/blob/main/spec/gen/faro.gen.yaml).

## Receiver Configuration

Faro follows the [confighttp] configuration, some examples are shown below


### Example Configuration

```yaml
receivers:
faro:
endpoint: 'localhost:8081'
```

### Advanced Configuration
```yaml
receivers:
faro:
endpoint: 'localhost:8081'
cors:

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this is incorrect. his should be something like:

receivers:
  faro:
    protocols:
      http:
        endpoint: 'localhost:8081'
        cors:
          ..

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually I'm not even sure the cors implementation works at all. Both the config I've posted above and the example in the readme do not change the cors response headers.

allowed_origins: "*"
```

[confighttp]: https://github.com/open-telemetry/opentelemetry-collector/tree/main/config/confighttp#server-configuration
48 changes: 48 additions & 0 deletions receiver/faroreceiver/config_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
// Copyright The OpenTelemetry Authors
// SPDX-License-Identifier: Apache-2.0

package faroreceiver // import "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver"

import (
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
)

func TestUnmarshalDefaultConfig(t *testing.T) {
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "empty.yaml"))
require.NoError(t, err)
factory := NewFactory()
cfg := factory.CreateDefaultConfig()
require.NoError(t, cm.Unmarshal(&cfg))
assert.Equal(t, factory.CreateDefaultConfig(), cfg)
}

func TestUnmarshalConfig(t *testing.T) {
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
require.NoError(t, err)
factory := NewFactory()
cfg := factory.CreateDefaultConfig()
require.NoError(t, cm.Unmarshal(&cfg))
assert.Equal(t,
&Config{
ServerConfig: confighttp.ServerConfig{
Endpoint: "localhost:8080",
TLSSetting: &configtls.ServerConfig{
Config: configtls.Config{
CertFile: "test.crt",
KeyFile: "test.key",
},
},
CORS: &confighttp.CORSConfig{
AllowedOrigins: []string{"https://*.test.com", "https://test.com"},
MaxAge: 7200,
},
},
}, cfg)
}
70 changes: 55 additions & 15 deletions receiver/faroreceiver/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,37 @@ package faroreceiver // import "github.com/open-telemetry/opentelemetry-collecto

import (
"context"
"fmt"

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/config/confighttp"
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/receiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/faroreceiver/internal/metadata"
)

const (
defaultFaroEndpoint = "localhost:8080"
)

// This is the map of already created Faro receivers for particular configurations.
// We maintain this map because the receiver.Factory is asked trace and log receivers separately
// when it gets createFaroReceiverTraces() and createFaroReceiverLogs() but they must not
// create separate objects, they must use one faroReceiver 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()

func createDefaultConfig() component.Config {
return &Config{
ServerConfig: confighttp.ServerConfig{
Endpoint: defaultFaroEndpoint,
},
}
}

func NewFactory() receiver.Factory {
return receiver.NewFactory(
metadata.Type,
Expand All @@ -26,30 +44,52 @@ func NewFactory() receiver.Factory {
receiver.WithLogs(createFaroReceiverLogs, metadata.LogsStability))
}

func createDefaultConfig() component.Config {
return &Config{
ServerConfig: confighttp.ServerConfig{
Endpoint: defaultFaroEndpoint,
},
func newFaroReceiverFactory(fCfg *Config, set *receiver.Settings, err *error) func() component.Component {
return func() component.Component {
var rcv component.Component
rcv, *err = newFaroReceiver(fCfg, set)
return rcv
}
}

func createFaroReceiverTraces(
_ context.Context,
_ receiver.Settings,
conf component.Config,
consumer consumer.Traces,
set receiver.Settings,
cfg component.Config,
nextTraces consumer.Traces,
) (receiver.Traces, error) {
cfg := conf.(*Config)
return newTraceReceiverTraces(cfg, consumer), nil
fCfg, ok := cfg.(*Config)
if !ok {
return nil, fmt.Errorf("invalid configuration: %T", cfg)
}
var err error
receiver := receivers.GetOrAdd(fCfg, newFaroReceiverFactory(fCfg, &set, &err))
if err != nil {
return nil, err
}

receiver.Unwrap().(*faroReceiver).RegisterTracesConsumer(nextTraces)

return receiver, nil
}

func createFaroReceiverLogs(
_ context.Context,
_ receiver.Settings,
conf component.Config,
consumer consumer.Logs,
set receiver.Settings,
cfg component.Config,
nextLogs consumer.Logs,
) (receiver.Logs, error) {
cfg := conf.(*Config)
return newTraceReceiverLogs(cfg, consumer), nil
fCfg, ok := cfg.(*Config)
if !ok {
return nil, fmt.Errorf("invalid configuration: %T", cfg)
}
var err error
receiver := receivers.GetOrAdd(fCfg, newFaroReceiverFactory(fCfg, &set, &err))
if err != nil {
return nil, err
}

receiver.Unwrap().(*faroReceiver).RegisterLogsConsumer(nextLogs)

return receiver, nil
}
32 changes: 30 additions & 2 deletions receiver/faroreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,46 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/receiver/farore
go 1.23.3

require (
github.com/grafana/faro/pkg/go v0.0.0-20250314155512-06a06da3b8bc
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component/componentstatus v0.125.1-0.20250505155216-829157cef7bb
go.opentelemetry.io/collector/config/confighttp v0.125.1-0.20250505155216-829157cef7bb
go.opentelemetry.io/collector/consumer/consumertest v0.125.1-0.20250505155216-829157cef7bb
go.opentelemetry.io/collector/receiver/receiverhelper v0.125.1-0.20250505155216-829157cef7bb
go.opentelemetry.io/collector/receiver/receivertest v0.125.1-0.20250505155216-829157cef7bb
go.uber.org/goleak v1.3.0
)

require go.opentelemetry.io/collector/extension/extensionauth v1.31.1-0.20250505152726-56c7da210783 // indirect

require (
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/bahlo/generic-list-go v0.2.0 // indirect
github.com/buger/jsonparser v1.1.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/go-tpm v0.9.3 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
github.com/knadh/koanf/v2 v2.2.0 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oapi-codegen/runtime v1.1.1 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil v0.125.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/zeebo/xxh3 v1.0.2 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/config/configmiddleware v0.125.1-0.20250505155216-829157cef7bb // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.125.1-0.20250505155216-829157cef7bb // indirect
Expand All @@ -55,6 +69,10 @@ require (
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v1.0.0 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden v0.125.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.125.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/faro v0.124.1
github.com/pierrec/lz4/v4 v4.1.22 // indirect
github.com/rs/cors v1.11.1 // indirect
go.opentelemetry.io/collector/client v1.31.1-0.20250505152726-56c7da210783 // indirect
Expand All @@ -63,7 +81,7 @@ require (
go.opentelemetry.io/collector/config/configauth v0.125.1-0.20250505155216-829157cef7bb // indirect
go.opentelemetry.io/collector/config/configcompression v1.31.1-0.20250505152726-56c7da210783 // indirect
go.opentelemetry.io/collector/config/configopaque v1.31.1-0.20250505152726-56c7da210783 // indirect
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783 // indirect
go.opentelemetry.io/collector/config/configtls v1.31.1-0.20250505152726-56c7da210783
go.opentelemetry.io/collector/confmap v1.31.1-0.20250505152726-56c7da210783
go.opentelemetry.io/collector/consumer v1.31.1-0.20250505152726-56c7da210783
go.opentelemetry.io/collector/consumer/xconsumer v0.125.1-0.20250505155216-829157cef7bb // indirect
Expand All @@ -78,7 +96,17 @@ require (
golang.org/x/net v0.39.0 // indirect
golang.org/x/sys v0.32.0 // indirect
golang.org/x/text v0.24.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/grpc v1.72.0 // indirect
google.golang.org/protobuf v1.36.6 // indirect
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/sharedcomponent => ../../internal/sharedcomponent

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/faro => ../../pkg/translator/faro
Loading
Loading