From 8fc43a00f877da9ca6b49f69d249cd2f4a1124ba Mon Sep 17 00:00:00 2001 From: Nityananda Gohain Date: Fri, 28 Mar 2025 20:19:37 +0530 Subject: [PATCH] fix: collector connection to opamp without orgID (#7474) --- pkg/query-service/app/logparsingpipeline/controller.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/query-service/app/logparsingpipeline/controller.go b/pkg/query-service/app/logparsingpipeline/controller.go index 20cec17ad7..f7dff26f92 100644 --- a/pkg/query-service/app/logparsingpipeline/controller.go +++ b/pkg/query-service/app/logparsingpipeline/controller.go @@ -145,11 +145,12 @@ func (ic *LogParsingPipelineController) getEffectivePipelinesByVersion( // todo(nitya): remove this once we fix agents in multitenancy defaultOrgID, err := ic.GetDefaultOrgID(ctx) if err != nil { - return nil, model.WrapApiError(err, "failed to get default org ID") + // we don't want to fail the request if we can't get the default org ID + // we will just return an empty list of pipelines + zap.L().Warn("failed to get default org ID", zap.Error(err)) + return result, nil } - fmt.Println("defaultOrgID", defaultOrgID) - if version >= 0 { savedPipelines, errors := ic.getPipelinesByVersion(ctx, defaultOrgID, version) if errors != nil {