feat: move jaeger tests to a separate package (#403)

* feat: move jaeger tests to a separate package move jaeger usage to a separate package to let module pruning do the magic and remove it from the module graph for downstream clients. * lint: remove unused funcs * lint: fix linter issues
elastic · Dec 4, 2024 · 1c68dad · 1c68dad
1 parent 6037746
commit 1c68dad
Show file tree

Hide file tree

Showing 26 changed files with 721 additions and 680 deletions.
diff --git a/input/jaeger/jaeger_test.go b/input/jaeger/jaeger_test.go
diff --git a/...proved/jaeger_sampling_rate.approved.json → ...proved/jaeger_sampling_rate.approved.json b/...proved/jaeger_sampling_rate.approved.json → ...proved/jaeger_sampling_rate.approved.json
diff --git a/...metadata_jaeger-no-language.approved.json → ...metadata_jaeger-no-language.approved.json b/...metadata_jaeger-no-language.approved.json → ...metadata_jaeger-no-language.approved.json
diff --git a/...ved/metadata_jaeger-version.approved.json → ...ved/metadata_jaeger-version.approved.json b/...ved/metadata_jaeger-version.approved.json → ...ved/metadata_jaeger-version.approved.json
diff --git a/...st_approved/metadata_jaeger.approved.json → ...st_approved/metadata_jaeger.approved.json b/...st_approved/metadata_jaeger.approved.json → ...st_approved/metadata_jaeger.approved.json
diff --git a/...ved/metadata_jaeger_minimal.approved.json → ...ved/metadata_jaeger_minimal.approved.json b/...ved/metadata_jaeger_minimal.approved.json → ...ved/metadata_jaeger_minimal.approved.json
diff --git a/...approved/span_jaeger_custom.approved.json → ...approved/span_jaeger_custom.approved.json b/...approved/span_jaeger_custom.approved.json → ...approved/span_jaeger_custom.approved.json
diff --git a/...ved/span_jaeger_data_stream.approved.json → ...ved/span_jaeger_data_stream.approved.json b/...ved/span_jaeger_data_stream.approved.json → ...ved/span_jaeger_data_stream.approved.json
diff --git a/...eger_data_stream_with_error.approved.json → ...eger_data_stream_with_error.approved.json b/...eger_data_stream_with_error.approved.json → ...eger_data_stream_with_error.approved.json
diff --git a/...est_approved/span_jaeger_db.approved.json → ...est_approved/span_jaeger_db.approved.json b/...est_approved/span_jaeger_db.approved.json → ...est_approved/span_jaeger_db.approved.json
diff --git a/...t_approved/span_jaeger_http.approved.json → ...t_approved/span_jaeger_http.approved.json b/...t_approved/span_jaeger_http.approved.json → ...t_approved/span_jaeger_http.approved.json
diff --git a/...pan_jaeger_http_status_code.approved.json → ...pan_jaeger_http_status_code.approved.json b/...pan_jaeger_http_status_code.approved.json → ...pan_jaeger_http_status_code.approved.json
diff --git a/...n_jaeger_https_default_port.approved.json → ...n_jaeger_https_default_port.approved.json b/...n_jaeger_https_default_port.approved.json → ...n_jaeger_https_default_port.approved.json
diff --git a/...roved/span_jaeger_messaging.approved.json → ...roved/span_jaeger_messaging.approved.json b/...roved/span_jaeger_messaging.approved.json → ...roved/span_jaeger_messaging.approved.json
diff --git a/...an_jaeger_subtype_component.approved.json → ...an_jaeger_subtype_component.approved.json b/...an_jaeger_subtype_component.approved.json → ...an_jaeger_subtype_component.approved.json
diff --git a/...d/transaction_jaeger_custom.approved.json → ...d/transaction_jaeger_custom.approved.json b/...d/transaction_jaeger_custom.approved.json → ...d/transaction_jaeger_custom.approved.json
diff --git a/...nsaction_jaeger_data_stream.approved.json → ...nsaction_jaeger_data_stream.approved.json b/...nsaction_jaeger_data_stream.approved.json → ...nsaction_jaeger_data_stream.approved.json
diff --git a/...eger_data_stream_with_error.approved.json → ...eger_data_stream_with_error.approved.json b/...eger_data_stream_with_error.approved.json → ...eger_data_stream_with_error.approved.json
diff --git a/...ved/transaction_jaeger_full.approved.json → ...ved/transaction_jaeger_full.approved.json b/...ved/transaction_jaeger_full.approved.json → ...ved/transaction_jaeger_full.approved.json
diff --git a/...transaction_jaeger_no_attrs.approved.json → ...transaction_jaeger_no_attrs.approved.json b/...transaction_jaeger_no_attrs.approved.json → ...transaction_jaeger_no_attrs.approved.json
diff --git a/...ction_jaeger_type_component.approved.json → ...ction_jaeger_type_component.approved.json b/...ction_jaeger_type_component.approved.json → ...ction_jaeger_type_component.approved.json
diff --git a/...ction_jaeger_type_messaging.approved.json → ...ction_jaeger_type_messaging.approved.json b/...ction_jaeger_type_messaging.approved.json → ...ction_jaeger_type_messaging.approved.json
diff --git a/...saction_jaeger_type_request.approved.json → ...saction_jaeger_type_request.approved.json b/...saction_jaeger_type_request.approved.json → ...saction_jaeger_type_request.approved.json
diff --git a/..._jaeger_type_request_result.approved.json → ..._jaeger_type_request_result.approved.json b/..._jaeger_type_request_result.approved.json → ..._jaeger_type_request_result.approved.json
diff --git a/input/otlp/metrics_test.go b/input/otlp/metrics_test.go
@@ -1152,6 +1152,14 @@ func transformMetrics(t *testing.T, metrics pmetric.Metrics) ([]*modelpb.APMEven
 	return *batches[0], consumer.Stats(), result, err
 }
 
+func batchRecorderBatchProcessor(out *[]*modelpb.Batch) modelpb.BatchProcessor {
+	return modelpb.ProcessBatchFunc(func(ctx context.Context, batch *modelpb.Batch) error {
+		batchCopy := batch.Clone()
+		*out = append(*out, &batchCopy)
+		return nil
+	})
+}
+
 // eventsMatch aims to compare the expected and actual APMEvents however, it will
 // be indeterministic for more than one samples and more than one APMEvents
 func eventsMatch(t *testing.T, expected []*modelpb.APMEvent, actual []*modelpb.APMEvent) {