Skip to content

Commit 6ac069f

Browse files
Reenable OTLP HTTP canary exporter (#4544)
* Reenable OTLP HTTP canary exporter * Remove obsolete comment
1 parent 7edde56 commit 6ac069f

File tree

2 files changed

+213
-208
lines changed

2 files changed

+213
-208
lines changed

cmd/profilecli/canary_exporter.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func newCanaryExporter(params *canaryExporterParams) *canaryExporter {
160160
}
161161

162162
ce.queryProbes = append(ce.queryProbes, &queryProbe{name: "query-select-merge-profile", f: ce.testSelectMergeProfile})
163-
// ce.queryProbes = append(ce.queryProbes, &queryProbe{name: "query-select-merge-otlp-profile", f: ce.testSelectMergeOTLPProfile})
163+
ce.queryProbes = append(ce.queryProbes, &queryProbe{name: "query-select-merge-otlp-profile", f: ce.testSelectMergeOTLPProfile})
164164

165165
if params.QueryProbeSet == "all" {
166166
ce.queryProbes = append(ce.queryProbes, &queryProbe{"query-profile-types", ce.testProfileTypes})
@@ -332,20 +332,19 @@ func (ce *canaryExporter) testPyroscopeCell(ctx context.Context) error {
332332
// }
333333

334334
// ingest via OTLP HTTP/JSON
335-
// Note: HTTP endpoints are not yet implemented in Pyroscope (see pkg/api/api.go:204-205)
336-
// if err := ce.runProbe(ctx, "ingest-otlp-http-json", func(rCtx context.Context) error {
337-
// return ce.testIngestOTLPHttpJson(rCtx, now)
338-
// }); err != nil {
339-
// ingestErrors.Add(fmt.Errorf("error during OTLP HTTP/JSON ingestion: %w", err))
340-
// }
335+
if err := ce.runProbe(ctx, "ingest-otlp-http-json", func(rCtx context.Context) error {
336+
return ce.testIngestOTLPHttpJson(rCtx, now)
337+
}); err != nil {
338+
ingestErrors.Add(fmt.Errorf("error during OTLP HTTP/JSON ingestion: %w", err))
339+
}
341340

342341
// ingest via OTLP HTTP/Protobuf
343342
// Note: HTTP endpoints are not yet implemented in Pyroscope (see pkg/api/api.go:204-205)
344-
// if err := ce.runProbe(ctx, "ingest-otlp-http-protobuf", func(rCtx context.Context) error {
345-
// return ce.testIngestOTLPHttpProtobuf(rCtx, now)
346-
// }); err != nil {
347-
// ingestErrors.Add(fmt.Errorf("error during OTLP HTTP/Protobuf ingestion: %w", err))
348-
// }
343+
if err := ce.runProbe(ctx, "ingest-otlp-http-protobuf", func(rCtx context.Context) error {
344+
return ce.testIngestOTLPHttpProtobuf(rCtx, now)
345+
}); err != nil {
346+
ingestErrors.Add(fmt.Errorf("error during OTLP HTTP/Protobuf ingestion: %w", err))
347+
}
349348

350349
// Report ingestion errors if any
351350
if ingestErrors.Err() != nil {

0 commit comments

Comments
 (0)