Merge branch 'main' into renovate/golangci-golangci-lint-action-9.x

Author: kodiakhq[bot]

.github/workflows/lint_golang.yml

@@ -15,7 +15,7 @@ jobs:
     name: Lint with GolangCI
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         id: go
         with:

.github/workflows/regen.yml

@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-go@v6
         id: go
         with:

.github/workflows/unittest.yml

@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Set up Go 1.x
         uses: actions/setup-go@v6
         with:

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.26.27"
+  ".": "1.27.0"
 }

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [1.27.0](https://github.com/cloudquery/plugin-pb-go/compare/v1.26.27...v1.27.0) (2025-12-01)
+
+
+### Features
+
+* Support logging of tenant ID ([#580](https://github.com/cloudquery/plugin-pb-go/issues/580)) ([4634b49](https://github.com/cloudquery/plugin-pb-go/commit/4634b49256cba6ebe9e39c5aacc4092263b86102))
+
+
+### Bug Fixes
+
+* **deps:** Update module github.com/docker/docker to v28.5.2+incompatible ([#576](https://github.com/cloudquery/plugin-pb-go/issues/576)) ([2794c32](https://github.com/cloudquery/plugin-pb-go/commit/2794c326338db4776ead3950aa116358e02daf44))
+* **deps:** Update module google.golang.org/grpc to v1.77.0 ([#575](https://github.com/cloudquery/plugin-pb-go/issues/575)) ([bdbb9be](https://github.com/cloudquery/plugin-pb-go/commit/bdbb9be94979705b89e30a27022a8cfcdfbd9109))
+* Generate Go Code from `plugin-pb` ([#573](https://github.com/cloudquery/plugin-pb-go/issues/573)) ([1ac0dfc](https://github.com/cloudquery/plugin-pb-go/commit/1ac0dfc2caeb12e9a4f89a0bd87a44bd67bd6f34))
+
 ## [1.26.27](https://github.com/cloudquery/plugin-pb-go/compare/v1.26.26...v1.26.27) (2025-11-18)
 
 

internal/env/env.go

@@ -0,0 +1,7 @@
+package env
+
+import "os"
+
+func TenantID() string {
+	return os.Getenv("_CQ_TENANT_ID")
+}

managedplugin/logging.go

@@ -2,10 +2,15 @@ package managedplugin
 
 import "github.com/rs/zerolog"
 
-func (c *Client) jsonToLog(l zerolog.Logger, msg map[string]any) {
+func (c *Client) jsonToLog(l zerolog.Logger, msg map[string]any, protectedFields []string) {
 	level := msg["level"]
 	// The log level is part of the log message received from the plugin, so we need to remove it before logging
 	delete(msg, "level")
+
+	// Remove protected fields from log message to avoid duplication
+	for _, field := range protectedFields {
+		delete(msg, field)
+	}
 	switch level {
 	case "trace":
 		l.Trace().Fields(msg).Msg("")

managedplugin/plugin.go

@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/avast/retry-go/v4"
+	"github.com/cloudquery/plugin-pb-go/internal/env"
 	pbBase "github.com/cloudquery/plugin-pb-go/pb/base/v0"
 	pbDiscovery "github.com/cloudquery/plugin-pb-go/pb/discovery/v0"
 	pbDiscoveryV1 "github.com/cloudquery/plugin-pb-go/pb/discovery/v1"
@@ -557,6 +558,12 @@ func (c *Client) readLogLines(reader io.ReadCloser) {
 	lr := NewLogReader(reader)
 	// reset the context to avoid duplicate fields in the logs when streaming logs from plugins
 	pluginsLogger := c.logger.With().Reset().Timestamp().Logger()
+	protectedFields := make([]string, 0)
+	tenantID := env.TenantID()
+	if tenantID != "" {
+		pluginsLogger = pluginsLogger.With().Str("tenant_id", tenantID).Logger()
+		protectedFields = append(protectedFields, "tenant_id")
+	}
 	for {
 		line, err := lr.NextLine()
 		if errors.Is(err, io.EOF) {
@@ -574,7 +581,7 @@ func (c *Client) readLogLines(reader io.ReadCloser) {
 		if err := json.Unmarshal(line, &structuredLogLine); err != nil {
 			c.logger.Info().Str("level", "unknown").Msg(string(line))
 		} else {
-			c.jsonToLog(pluginsLogger, structuredLogLine)
+			c.jsonToLog(pluginsLogger, structuredLogLine, protectedFields)
 		}
 	}
 }