feat: add ability to filter and export markers

exporter/honeycombmarkerexporter/README.md

@@ -8,8 +8,7 @@ The following configuration options are supported:
 * `api_key` (Required): This is the API key (also called Write Key) for your Honeycomb account.
 * `api_url` (Required): You can set the hostname to send marker data to.
 * `markers` (Required): This specifies the exact configuration to create an event marker. 
-  * `type`: Specifies the marker type. Markers with the same type will appear in the same color in Honeycomb. MarkerType or MarkerColor should be set.  
-  * `color`: Specifies the marker color. Will only be used if MarkerType is not set.
+  * `type`: Specifies the marker type. Markers with the same type will appear in the same color in Honeycomb.  
   * `messagefield`: This is the attribute that will be used as the message. If necessary the value will be converted to a string.
   * `urlfield`: This is the attribute that will be used as the url. If necessary the value will be converted to a string.
   * `rules`: This is a list of OTTL rules that determine when to create an event marker. 
@@ -31,12 +30,4 @@ exporters:
               - IsMatch(attributes["test"], ".*")
           - logconditions:
               - body == "test"
-      - color: "green",
-        messagefield: "another test message",
-        urlfield: "https://api.testhost.io",
-        rules:
-          - resourceconditions:
-              - IsMatch(attributes["test"], ".*")
-          - logconditions:
-              - body == "test"
 ```

exporter/honeycombmarkerexporter/config.go

@@ -5,13 +5,17 @@ package honeycombmarkerexporter // import "github.com/open-telemetry/opentelemet
 
 import (
 	"fmt"
+	"go.opentelemetry.io/collector/exporter/exporterhelper"
+
+	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/expr"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterottl"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl/contexts/ottllog"
 
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/config/confighttp"
 	"go.opentelemetry.io/collector/config/configopaque"
 	"go.uber.org/zap"
-
-	"github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter/filterottl"
-	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl"
 )
 
 // Config defines configuration for the Honeycomb Marker exporter.
@@ -24,33 +28,37 @@ type Config struct {
 
 	// Markers is the list of markers to create
 	Markers []Marker `mapstructure:"markers"`
+
+	confighttp.HTTPClientSettings `mapstructure:",squash"` // squash ensures fields are correctly decoded in embedded struct.
+	exporterhelper.QueueSettings  `mapstructure:"sending_queue"`
+	exporterhelper.RetrySettings  `mapstructure:"retry_on_failure"`
 }
 
 type Marker struct {
-	// Type defines the type of Marker.  Markers with the same type appear in Honeycomb with the same color
+	// Type defines the type of Marker.
 	Type string `mapstructure:"type"`
 
-	// Color is the color of the Marker. Will only be used if the Type does not already exist.
-	Color string `mapstructure:"color"`
-
-	// MessageField is the attribute that will be used as the message.
+	// MessageKey is the attribute that will be used as the message.
 	// If necessary the value will be converted to a string.
-	MessageField string `mapstructure:"message_field"`
+	MessageKey string `mapstructure:"message_key"`
 
-	// URLField is the attribute that will be used as the url.
+	// URLKey is the attribute that will be used as the url.
 	// If necessary the value will be converted to a string.
-	URLField string `mapstructure:"url_field"`
+	URLKey string `mapstructure:"url_key"`
 
 	// Rules are the OTTL rules that determine when a piece of telemetry should be turned into a Marker
 	Rules Rules `mapstructure:"rules"`
+
+	// DatasetSlug is the endpoint that specifies the Honeycomb environment
+	DatasetSlug string `mapstructure:"datasetslug"`
 }
 
 type Rules struct {
-	// ResourceConditions is the list of ottlresource conditions that determine a match
-	ResourceConditions []string `mapstructure:"resource_conditions"`
-
 	// LogConditions is the list of ottllog conditions that determine a match
 	LogConditions []string `mapstructure:"log_conditions"`
+
+	//
+	logBoolExpr expr.BoolExpr[ottllog.TransformContext]
 }
 
 var defaultCfg = createDefaultConfig().(*Config)
@@ -66,16 +74,15 @@ func (cfg *Config) Validate() error {
 
 	if len(cfg.Markers) != 0 {
 		for _, m := range cfg.Markers {
-			if len(m.Rules.ResourceConditions) == 0 && len(m.Rules.LogConditions) == 0 {
-				return fmt.Errorf("no rules supplied for Marker %v", m)
+			if m.Type == "" {
+				return fmt.Errorf("marker must have a type #{m}")
 			}
 
-			_, err := filterottl.NewBoolExprForResource(m.Rules.ResourceConditions, filterottl.StandardResourceFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()})
-			if err != nil {
-				return err
+			if len(m.Rules.LogConditions) == 0 {
+				return fmt.Errorf("no rules supplied for Marker %v", m)
 			}
 
-			_, err = filterottl.NewBoolExprForLog(m.Rules.LogConditions, filterottl.StandardLogFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()})
+			_, err := filterottl.NewBoolExprForLog(m.Rules.LogConditions, filterottl.StandardLogFuncs(), ottl.PropagateError, component.TelemetrySettings{Logger: zap.NewNop()})
 			if err != nil {
 				return err
 			}

exporter/honeycombmarkerexporter/config_test.go

@@ -4,6 +4,7 @@
 package honeycombmarkerexporter
 
 import (
+	"go.opentelemetry.io/collector/exporter/exporterhelper"
 	"path/filepath"
 	"testing"
 
@@ -28,39 +29,16 @@ func TestLoadConfig(t *testing.T) {
 		{
 			id: component.NewIDWithName("honeycomb", ""),
 			expected: &Config{
-				APIKey: "test-apikey",
-				APIURL: "https://api.testhost.io",
+				QueueSettings: exporterhelper.NewDefaultQueueSettings(),
+				RetrySettings: exporterhelper.NewDefaultRetrySettings(),
+				APIKey:        "test-apikey",
+				APIURL:        "https://api.testhost.io",
 				Markers: []Marker{
 					{
-						Type:         "fooType",
-						MessageField: "test message",
-						URLField:     "https://api.testhost.io",
+						Type:       "fooType",
+						MessageKey: "test message",
+						URLKey:     "https://api.testhost.io",
 						Rules: Rules{
-							ResourceConditions: []string{
-								`IsMatch(attributes["test"], ".*")`,
-							},
-							LogConditions: []string{
-								`body == "test"`,
-							},
-						},
-					},
-				},
-			},
-		},
-		{
-			id: component.NewIDWithName("honeycomb", "color_no_type"),
-			expected: &Config{
-				APIKey: "test-apikey",
-				APIURL: "https://api.testhost.io",
-				Markers: []Marker{
-					{
-						Color:        "green",
-						MessageField: "test message",
-						URLField:     "https://api.testhost.io",
-						Rules: Rules{
-							ResourceConditions: []string{
-								`IsMatch(attributes["test"], ".*")`,
-							},
 							LogConditions: []string{
 								`body == "test"`,
 							},

exporter/honeycombmarkerexporter/factory.go

@@ -5,7 +5,6 @@ package honeycombmarkerexporter // import "github.com/open-telemetry/opentelemet
 
 import (
 	"context"
-
 	"go.opentelemetry.io/collector/component"
 	"go.opentelemetry.io/collector/exporter"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
@@ -36,12 +35,19 @@ func createLogsExporter(
 ) (exporter.Logs, error) {
 	cf := cfg.(*Config)
 
-	exporter := newLogsExporter(set.Logger, cf)
+	logsExp, err := newHoneycombLogsExporter(set.TelemetrySettings, cf)
+	if err != nil {
+		return nil, err
+	}
 
 	return exporterhelper.NewLogsExporter(
 		ctx,
 		set,
 		cfg,
-		exporter.exportLogs,
+		logsExp.exportMarkers,
+		exporterhelper.WithTimeout(exporterhelper.TimeoutSettings{Timeout: 0}),
+		exporterhelper.WithRetry(cf.RetrySettings),
+		exporterhelper.WithQueue(cf.QueueSettings),
+		exporterhelper.WithStart(logsExp.start),
 	)
 }

exporter/honeycombmarkerexporter/go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.87.0
 	github.com/stretchr/testify v1.8.4
 	go.opentelemetry.io/collector/component v0.87.1-0.20231017160804-ec0725874313
+	go.opentelemetry.io/collector/config/confighttp v0.87.0
 	go.opentelemetry.io/collector/config/configopaque v0.87.1-0.20231017160804-ec0725874313
 	go.opentelemetry.io/collector/confmap v0.87.1-0.20231017160804-ec0725874313
 	go.opentelemetry.io/collector/exporter v0.87.1-0.20231017160804-ec0725874313
@@ -18,13 +19,19 @@ require (
 	github.com/alecthomas/participle/v2 v2.1.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/fsnotify/fsnotify v1.6.0 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.1 // indirect
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.1 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
 	github.com/knadh/koanf/v2 v2.0.1 // indirect
@@ -35,12 +42,19 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.87.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rs/cors v1.10.1 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/collector v0.87.1-0.20231017160804-ec0725874313 // indirect
+	go.opentelemetry.io/collector/config/configauth v0.87.0 // indirect
+	go.opentelemetry.io/collector/config/configcompression v0.87.0 // indirect
 	go.opentelemetry.io/collector/config/configtelemetry v0.87.1-0.20231017160804-ec0725874313 // indirect
+	go.opentelemetry.io/collector/config/configtls v0.87.0 // indirect
+	go.opentelemetry.io/collector/config/internal v0.87.0 // indirect
 	go.opentelemetry.io/collector/consumer v0.87.1-0.20231017160804-ec0725874313 // indirect
 	go.opentelemetry.io/collector/extension v0.87.1-0.20231017160804-ec0725874313 // indirect
+	go.opentelemetry.io/collector/extension/auth v0.87.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.0.0-rcv0016.0.20231017160804-ec0725874313 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
 	go.opentelemetry.io/otel v1.19.0 // indirect
 	go.opentelemetry.io/otel/metric v1.19.0 // indirect
 	go.opentelemetry.io/otel/trace v1.19.0 // indirect