refactor(tools/cloudgda)!: update description and parameter name for cloudgda tool (#2288)

- Refactors the 'cloud-gemini-data-analytics-query' tool to update its
default description with detailed tool guidance and usage guidance.
- Append the default description to the tools.yaml description no matter
whether the tools.yaml description exists since this guidance will
always be useful to the agent on how to use the tool.
- Renames the input parameter from 'prompt' to 'query' for better
consistency.

CONTRIBUTING.md

@@ -92,11 +92,11 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
   `newdb.go`. Create a `Config` struct to include all the necessary parameters
   for connecting to the database (e.g., host, port, username, password, database
   name) and a `Source` struct to store necessary parameters for tools (e.g.,
-  Name, Type, connection object, additional config).
+  Name, Kind, connection object, additional config).
 * **Implement the
   [`SourceConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L57)
   interface**. This interface requires two methods:
-  * `SourceConfigType() string`: Returns a unique string identifier for your
+  * `SourceConfigKind() string`: Returns a unique string identifier for your
     data source (e.g., `"newdb"`).
   * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
     Creates a new instance of your data source and establishes a connection to
@@ -104,7 +104,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
   [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
   interface**. This interface requires one method:
-  * `SourceType() string`: Returns the same string identifier as `SourceConfigType()`.
+  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
 * **Implement `init()`** to register the new Source.
 * **Implement Unit Tests** in a file named `newdb_test.go`.
 
@@ -126,7 +126,7 @@ tools.
 * **Implement the
   [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
   interface**. This interface requires one method:
-  * `ToolConfigType() string`: Returns a unique string identifier for your tool
+  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
     (e.g., `"newdb-tool"`).
   * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
     instance of your tool and validates that it can connect to the specified
@@ -243,7 +243,7 @@ resources.
   | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |
 
   Pull requests should always add scope whenever possible. The scope is
-  formatted as `<scope-resource>/<scope-type>` (e.g., `sources/postgres`, or
+  formatted as `<scope-type>/<scope-kind>` (e.g., `sources/postgres`, or
   `tools/mssql-sql`).
   
   Ideally, **each PR covers only one scope**, if this is

README.md

@@ -954,7 +954,7 @@ For more details on configuring different types of sources, see the
 ### Tools
 
 The `tools` section of a `tools.yaml` define the actions an agent can take: what
-type of tool it is, which source(s) it affects, what parameters it uses, etc.
+kind of tool it is, which source(s) it affects, what parameters it uses, etc.
 
 ```yaml
 tools:

cmd/root.go

@@ -15,7 +15,6 @@
 package cmd
 
 import (
-	"bytes"
 	"context"
 	_ "embed"
 	"fmt"
@@ -426,103 +425,6 @@ func parseEnv(input string) (string, error) {
 	return output, err
 }
 
-func convertToolsFile(ctx context.Context, raw []byte) ([]byte, error) {
-	logger, err := util.LoggerFromContext(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// TODO: add embeddingmodels when available
-	keysToCheck := []string{"sources", "authServices", "authSources", "tools", "prompts", "toolsets"}
-	var input yaml.MapSlice
-	decoder := yaml.NewDecoder(bytes.NewReader(raw), yaml.UseOrderedMap())
-	if err := decoder.Decode(&input); err != nil {
-		return nil, err
-	}
-
-	// Convert raw MapSlice to a helper map for quick lookup
-	// while keeping the values as MapSlices to preserve internal order
-	lookup := make(map[string]yaml.MapSlice)
-	for _, item := range input {
-		key := item.Key.(string)
-		if slice, ok := item.Value.(yaml.MapSlice); ok {
-			// convert authSources to authServices
-			if key == "authSources" {
-				logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
-				key = "authServices"
-			}
-			// works even if lookup[key] is nil
-			lookup[key] = append(lookup[key], slice...)
-		} else {
-			// toolsfile is already v2
-			if key == "kind" {
-				return raw, nil
-			}
-			return nil, fmt.Errorf("'%s' is not a map", key)
-		}
-	}
-	// convert to tools file v2
-	var buf bytes.Buffer
-	encoder := yaml.NewEncoder(&buf)
-	for _, kind := range keysToCheck {
-		data, exists := lookup[kind]
-		if !exists {
-			// if this is skipped for all keys, the tools file is in v2
-			continue
-		}
-		// Transform each entry
-		for _, entry := range data {
-			entryName := entry.Key.(string)
-			entryBody := ProcessValue(entry.Value, kind == "toolsets")
-
-			transformed := yaml.MapSlice{
-				{Key: "kind", Value: kind},
-				{Key: "name", Value: entryName},
-			}
-
-			// Merge the transformed body into our result
-			if bodySlice, ok := entryBody.(yaml.MapSlice); ok {
-				transformed = append(transformed, bodySlice...)
-			} else {
-				return nil, fmt.Errorf("unable to convert entryBody to MapSlice")
-			}
-
-			if err := encoder.Encode(transformed); err != nil {
-				return nil, err
-			}
-		}
-	}
-	return buf.Bytes(), nil
-}
-
-// ProcessValue recursively looks for MapSlices to rename 'kind' -> 'type'
-func ProcessValue(v any, isToolset bool) any {
-	switch val := v.(type) {
-	case yaml.MapSlice:
-		for i := range val {
-			// Perform renaming
-			if val[i].Key == "kind" {
-				val[i].Key = "type"
-			}
-			// Recursive call for nested values (e.g., nested objects or lists)
-			val[i].Value = ProcessValue(val[i].Value, false)
-		}
-		return val
-	case []any:
-		// Process lists: If it's a toolset top-level list, wrap it.
-		if isToolset {
-			return yaml.MapSlice{{Key: "tools", Value: val}}
-		}
-		// Otherwise, recurse into list items (to catch nested objects)
-		for i := range val {
-			val[i] = ProcessValue(val[i], false)
-		}
-		return val
-	default:
-		return val
-	}
-}
-
 // parseToolsFile parses the provided yaml into appropriate configs.
 func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
 	var toolsFile ToolsFile

cmd/root_test.go

@@ -23,14 +23,12 @@ import (
 	"os"
 	"path"
 	"path/filepath"
-	"reflect"
 	"regexp"
 	"runtime"
 	"strings"
 	"testing"
 	"time"
 
-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
 
 	"github.com/googleapis/genai-toolbox/internal/auth/google"
@@ -496,235 +494,6 @@ func TestDefaultLogLevel(t *testing.T) {
 	}
 }
 
-func TestConvertToolsFile(t *testing.T) {
-	ctx, cancelCtx := context.WithTimeout(context.Background(), time.Minute)
-	defer cancelCtx()
-	pr, pw := io.Pipe()
-	defer pw.Close()
-	defer pr.Close()
-
-	logger, err := log.NewStdLogger(pw, pw, "DEBUG")
-	if err != nil {
-		t.Fatalf("failed to setup logger %s", err)
-	}
-	ctx = util.WithLogger(ctx, logger)
-
-	tcs := []struct {
-		desc   string
-		in     string
-		want   string
-		isErr  bool
-		errStr string
-	}{
-		{
-			desc: "basic convert",
-			in: `
-            sources:
-                my-pg-instance:
-                    kind: cloud-sql-postgres
-                    project: my-project
-                    region: my-region
-                    instance: my-instance
-                    database: my_db
-                    user: my_user
-                    password: my_pass
-            tools:
-                example_tool:
-                    kind: postgres-sql
-                    source: my-pg-instance
-                    description: some description
-                    statement: |
-                      SELECT * FROM SQL_STATEMENT;
-                    parameters:
-                        - name: country
-                          type: string
-                          description: some description
-            toolsets:
-                example_toolset:
-                    - example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
----
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
-- name: country
-  type: string
-  description: some description
----
-kind: toolsets
-name: example_toolset
-tools:
-- example_tool`,
-		},
-		{
-			desc: "rearrange resource order",
-			in: `
-            tools:
-                example_tool:
-                    kind: postgres-sql
-                    source: my-pg-instance
-                    description: some description
-                    statement: |
-                        SELECT * FROM SQL_STATEMENT;
-                    parameters:
-                        - name: country
-                          type: string
-                          description: some description
-            sources:
-                my-pg-instance:
-                    kind: cloud-sql-postgres
-                    project: my-project
-                    region: my-region
-                    instance: my-instance
-                    database: my_db
-                    user: my_user
-                    password: my_pass
-            toolsets:
-                example_toolset:
-                    - example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
----
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
-- name: country
-  type: string
-  description: some description
----
-kind: toolsets
-name: example_toolset
-tools:
-- example_tool`,
-		},
-		{
-			desc: "no convertion needed",
-			in: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
----
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
-- name: country
-  type: string
-  description: some description
----
-kind: toolsets
-name: example_toolset
-tools:
-- example_tool`,
-			want: `
-kind: sources
-name: my-pg-instance
-type: cloud-sql-postgres
-project: my-project
-region: my-region
-instance: my-instance
-database: my_db
-user: my_user
-password: my_pass
----
-kind: tools
-name: example_tool
-type: postgres-sql
-source: my-pg-instance
-description: some description
-statement: |
-    SELECT * FROM SQL_STATEMENT;
-parameters:
-- name: country
-  type: string
-  description: some description
----
-kind: toolsets
-name: example_toolset
-tools:
-- example_tool`,
-		},
-		{
-			desc:   "invalid source",
-			in:     `sources: invalid`,
-			isErr:  true,
-			errStr: "'sources' is not a map",
-		},
-		{
-			desc:   "invalid toolset",
-			in:     `toolsets: invalid`,
-			isErr:  true,
-			errStr: "'toolsets' is not a map",
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			output, err := convertToolsFile(ctx, []byte(tc.in))
-			if tc.isErr {
-				if err == nil {
-					t.Fatalf("missing error: %s", tc.errStr)
-				}
-				if err.Error() != tc.errStr {
-					t.Fatalf("invalid error string: got %s, want %s", err, tc.errStr)
-				}
-				return
-			}
-			if err != nil {
-				t.Fatalf("unexpected error: %s", err)
-			}
-
-			// ensures that the order is correct
-			var doc1, doc2 yaml.MapSlice
-			if err := yaml.Unmarshal(output, &doc1); err != nil {
-				t.Fatalf("unable to unmarshal output: %s", string(output))
-			}
-			if err := yaml.Unmarshal([]byte(tc.want), &doc2); err != nil {
-				t.Fatalf("unable to unmarshal output: %s", tc.want)
-			}
-			if !reflect.DeepEqual(doc1, doc2) {
-				t.Fatalf("incorrect output: got %s, want %s", doc1, doc2)
-			}
-		})
-	}
-}
-
 func TestParseToolFile(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
@@ -766,7 +535,7 @@ func TestParseToolFile(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -779,7 +548,7 @@ func TestParseToolFile(t *testing.T) {
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:        "example_tool",
-						Type:        "postgres-sql",
+						Kind:        "postgres-sql",
 						Source:      "my-pg-instance",
 						Description: "some description",
 						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
@@ -920,7 +689,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -933,19 +702,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1020,7 +789,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -1033,19 +802,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthSources: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1122,7 +891,7 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-pg-instance": cloudsqlpgsrc.Config{
 						Name:     "my-pg-instance",
-						Type:     cloudsqlpgsrc.SourceType,
+						Kind:     cloudsqlpgsrc.SourceKind,
 						Project:  "my-project",
 						Region:   "my-region",
 						Instance: "my-instance",
@@ -1135,19 +904,19 @@ func TestParseToolFileWithAuth(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "my-client-id",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "other-client-id",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": postgressql.Config{
 						Name:         "example_tool",
-						Type:         "postgres-sql",
+						Kind:         "postgres-sql",
 						Source:       "my-pg-instance",
 						Description:  "some description",
 						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -1293,7 +1062,7 @@ func TestEnvVarReplacement(t *testing.T) {
 				Sources: server.SourceConfigs{
 					"my-http-instance": httpsrc.Config{
 						Name:           "my-http-instance",
-						Type:           httpsrc.SourceType,
+						Kind:           httpsrc.SourceKind,
 						BaseURL:        "http://test_server/",
 						Timeout:        "10s",
 						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
@@ -1303,19 +1072,19 @@ func TestEnvVarReplacement(t *testing.T) {
 				AuthServices: server.AuthServiceConfigs{
 					"my-google-service": google.Config{
 						Name:     "my-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID",
 					},
 					"other-google-service": google.Config{
 						Name:     "other-google-service",
-						Type:     google.AuthServiceType,
+						Kind:     google.AuthServiceKind,
 						ClientID: "ACTUAL_CLIENT_ID_2",
 					},
 				},
 				Tools: server.ToolConfigs{
 					"example_tool": http.Config{
 						Name:         "example_tool",
-						Type:         "http",
+						Kind:         "http",
 						Source:       "my-instance",
 						Method:       "GET",
 						Path:         "search?name=alice&pet=cat",

docs/en/resources/tools/cloudgda/cloud-gda-query.md

@@ -41,13 +41,13 @@ tools:
 
 ### Usage Flow
 
-When using this tool, a `prompt` parameter containing a natural language query is provided to the tool (typically by an agent). The tool then interacts with the Gemini Data Analytics API using the context defined in your configuration.
+When using this tool, a `query` parameter containing a natural language query is provided to the tool (typically by an agent). The tool then interacts with the Gemini Data Analytics API using the context defined in your configuration.
 
 The structure of the response depends on the `generationOptions` configured in your tool definition (e.g., enabling `generateQueryResult` will include the SQL query results).
 
 See [Data Analytics API REST documentation](https://clouddocs.devsite.corp.google.com/gemini/docs/conversational-analytics-api/reference/rest/v1alpha/projects.locations/queryData?rep_location=global) for details.
 
-**Example Input Prompt:**
+**Example Input Query:**
 
 ```text
 How many accounts who have region in Prague are eligible for loans? A3 contains the data of region.

internal/auth/auth.go

@@ -21,13 +21,13 @@ import (
 
 // AuthServiceConfig is the interface for configuring authentication services.
 type AuthServiceConfig interface {
-	AuthServiceConfigType() string
+	AuthServiceConfigKind() string
 	Initialize() (AuthService, error)
 }
 
 // AuthService is the interface for authentication services.
 type AuthService interface {
-	AuthServiceType() string
+	AuthServiceKind() string
 	GetName() string
 	GetClaimsFromHeader(context.Context, http.Header) (map[string]any, error)
 	ToConfig() AuthServiceConfig

internal/auth/google/google.go

@@ -23,7 +23,7 @@ import (
 	"google.golang.org/api/idtoken"
 )
 
-const AuthServiceType string = "google"
+const AuthServiceKind string = "google"
 
 // validate interface
 var _ auth.AuthServiceConfig = Config{}
@@ -31,13 +31,13 @@ var _ auth.AuthServiceConfig = Config{}
 // Auth service configuration
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	ClientID string `yaml:"clientId" validate:"required"`
 }
 
-// Returns the auth service type
-func (cfg Config) AuthServiceConfigType() string {
-	return AuthServiceType
+// Returns the auth service kind
+func (cfg Config) AuthServiceConfigKind() string {
+	return AuthServiceKind
 }
 
 // Initialize a Google auth service
@@ -55,9 +55,9 @@ type AuthService struct {
 	Config
 }
 
-// Returns the auth service type
-func (a AuthService) AuthServiceType() string {
-	return AuthServiceType
+// Returns the auth service kind
+func (a AuthService) AuthServiceKind() string {
+	return AuthServiceKind
 }
 
 func (a AuthService) ToConfig() auth.AuthServiceConfig {

internal/embeddingmodels/embeddingmodels.go

@@ -22,12 +22,12 @@ import (
 
 // EmbeddingModelConfig is the interface for configuring embedding models.
 type EmbeddingModelConfig interface {
-	EmbeddingModelConfigType() string
+	EmbeddingModelConfigKind() string
 	Initialize(context.Context) (EmbeddingModel, error)
 }
 
 type EmbeddingModel interface {
-	EmbeddingModelType() string
+	EmbeddingModelKind() string
 	ToConfig() EmbeddingModelConfig
 	EmbedParameters(context.Context, []string) ([][]float32, error)
 }

internal/embeddingmodels/gemini/gemini.go

@@ -23,22 +23,22 @@ import (
 	"google.golang.org/genai"
 )
 
-const EmbeddingModelType string = "gemini"
+const EmbeddingModelKind string = "gemini"
 
 // validate interface
 var _ embeddingmodels.EmbeddingModelConfig = Config{}
 
 type Config struct {
 	Name      string `yaml:"name" validate:"required"`
-	Type      string `yaml:"kind" validate:"required"`
+	Kind      string `yaml:"kind" validate:"required"`
 	Model     string `yaml:"model" validate:"required"`
 	ApiKey    string `yaml:"apiKey"`
 	Dimension int32  `yaml:"dimension"`
 }
 
-// Returns the embedding model type
-func (cfg Config) EmbeddingModelConfigType() string {
-	return EmbeddingModelType
+// Returns the embedding model kind
+func (cfg Config) EmbeddingModelConfigKind() string {
+	return EmbeddingModelKind
 }
 
 // Initialize a Gemini embedding model
@@ -69,9 +69,9 @@ type EmbeddingModel struct {
 	Config
 }
 
-// Returns the embedding model type
-func (m EmbeddingModel) EmbeddingModelType() string {
-	return EmbeddingModelType
+// Returns the embedding model kind
+func (m EmbeddingModel) EmbeddingModelKind() string {
+	return EmbeddingModelKind
 }
 
 func (m EmbeddingModel) ToConfig() embeddingmodels.EmbeddingModelConfig {

internal/embeddingmodels/gemini/gemini_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlGemini(t *testing.T) {
 			want: map[string]embeddingmodels.EmbeddingModelConfig{
 				"my-gemini-model": gemini.Config{
 					Name:  "my-gemini-model",
-					Type:  gemini.EmbeddingModelType,
+					Kind:  gemini.EmbeddingModelKind,
 					Model: "text-embedding-004",
 				},
 			},
@@ -60,7 +60,7 @@ func TestParseFromYamlGemini(t *testing.T) {
 			want: map[string]embeddingmodels.EmbeddingModelConfig{
 				"complex-gemini": gemini.Config{
 					Name:      "complex-gemini",
-					Type:      gemini.EmbeddingModelType,
+					Kind:      gemini.EmbeddingModelKind,
 					Model:     "text-embedding-004",
 					ApiKey:    "test-api-key",
 					Dimension: 768,

internal/prompts/custom/custom.go

@@ -27,10 +27,10 @@ type Message = prompts.Message
 
 const kind = "custom"
 
-// init registers this prompt type with the prompt framework.
+// init registers this prompt kind with the prompt framework.
 func init() {
 	if !prompts.Register(kind, newConfig) {
-		panic(fmt.Sprintf("prompt type %q already registered", kind))
+		panic(fmt.Sprintf("prompt kind %q already registered", kind))
 	}
 }
 
@@ -56,7 +56,7 @@ type Config struct {
 var _ prompts.PromptConfig = Config{}
 var _ prompts.Prompt = Prompt{}
 
-func (c Config) PromptConfigType() string {
+func (c Config) PromptConfigKind() string {
 	return kind
 }
 

internal/prompts/custom/custom_test.go

@@ -50,8 +50,8 @@ func TestConfig(t *testing.T) {
 	if p == nil {
 		t.Fatal("Initialize() returned a nil prompt")
 	}
-	if cfg.PromptConfigType() != "custom" {
-		t.Errorf("PromptConfigType() = %q, want %q", cfg.PromptConfigType(), "custom")
+	if cfg.PromptConfigKind() != "custom" {
+		t.Errorf("PromptConfigKind() = %q, want %q", cfg.PromptConfigKind(), "custom")
 	}
 
 	t.Run("Manifest", func(t *testing.T) {

internal/prompts/prompts.go

@@ -52,7 +52,7 @@ func DecodeConfig(ctx context.Context, kind, name string, decoder *yaml.Decoder)
 	}
 
 	if !found {
-		return nil, fmt.Errorf("unknown prompt type: %q", kind)
+		return nil, fmt.Errorf("unknown prompt kind: %q", kind)
 	}
 
 	promptConfig, err := factory(ctx, name, decoder)
@@ -63,7 +63,7 @@ func DecodeConfig(ctx context.Context, kind, name string, decoder *yaml.Decoder)
 }
 
 type PromptConfig interface {
-	PromptConfigType() string
+	PromptConfigKind() string
 	Initialize() (Prompt, error)
 }
 

internal/prompts/prompts_test.go

@@ -29,16 +29,16 @@ import (
 
 type mockPromptConfig struct {
 	name string
-	Type string
+	kind string
 }
 
-func (m *mockPromptConfig) PromptConfigType() string            { return m.Type }
+func (m *mockPromptConfig) PromptConfigKind() string            { return m.kind }
 func (m *mockPromptConfig) Initialize() (prompts.Prompt, error) { return nil, nil }
 
 var errMockFactory = errors.New("mock factory error")
 
 func mockFactory(ctx context.Context, name string, decoder *yaml.Decoder) (prompts.PromptConfig, error) {
-	return &mockPromptConfig{name: name, Type: "mockType"}, nil
+	return &mockPromptConfig{name: name, kind: "mockKind"}, nil
 }
 
 func mockErrorFactory(ctx context.Context, name string, decoder *yaml.Decoder) (prompts.PromptConfig, error) {
@@ -50,7 +50,7 @@ func TestRegistry(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("RegisterAndDecodeSuccess", func(t *testing.T) {
-		kind := "testTypeSuccess"
+		kind := "testKindSuccess"
 		if !prompts.Register(kind, mockFactory) {
 			t.Fatal("expected registration to succeed")
 		}
@@ -69,19 +69,19 @@ func TestRegistry(t *testing.T) {
 		}
 	})
 
-	t.Run("DecodeUnknownType", func(t *testing.T) {
+	t.Run("DecodeUnknownKind", func(t *testing.T) {
 		decoder := yaml.NewDecoder(strings.NewReader(""))
-		_, err := prompts.DecodeConfig(ctx, "unregisteredType", "testPrompt", decoder)
+		_, err := prompts.DecodeConfig(ctx, "unregisteredKind", "testPrompt", decoder)
 		if err == nil {
 			t.Fatal("expected an error for unknown kind, but got nil")
 		}
-		if !strings.Contains(err.Error(), "unknown prompt type") {
-			t.Errorf("expected error to contain 'unknown prompt type', but got: %v", err)
+		if !strings.Contains(err.Error(), "unknown prompt kind") {
+			t.Errorf("expected error to contain 'unknown prompt kind', but got: %v", err)
 		}
 	})
 
 	t.Run("FactoryReturnsError", func(t *testing.T) {
-		kind := "testTypeError"
+		kind := "testKindError"
 		if !prompts.Register(kind, mockErrorFactory) {
 			t.Fatal("expected registration to succeed")
 		}
@@ -105,8 +105,8 @@ func TestRegistry(t *testing.T) {
 		if config == nil {
 			t.Fatal("expected a non-nil config for default kind")
 		}
-		if config.PromptConfigType() != "custom" {
-			t.Errorf("expected default kind to be 'custom', but got %q", config.PromptConfigType())
+		if config.PromptConfigKind() != "custom" {
+			t.Errorf("expected default kind to be 'custom', but got %q", config.PromptConfigKind())
 		}
 	})
 }

internal/server/config.go

@@ -198,7 +198,7 @@ func (c *AuthServiceConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(i
 			return fmt.Errorf("error creating decoder: %w", err)
 		}
 		switch kind {
-		case google.AuthServiceType:
+		case google.AuthServiceKind:
 			actual := google.Config{Name: name}
 			if err := dec.DecodeContext(ctx, &actual); err != nil {
 				return fmt.Errorf("unable to parse as %q: %w", kind, err)
@@ -242,7 +242,7 @@ func (c *EmbeddingModelConfigs) UnmarshalYAML(ctx context.Context, unmarshal fun
 			return fmt.Errorf("error creating decoder: %w", err)
 		}
 		switch kind {
-		case gemini.EmbeddingModelType:
+		case gemini.EmbeddingModelKind:
 			actual := gemini.Config{Name: name}
 			if err := dec.DecodeContext(ctx, &actual); err != nil {
 				return fmt.Errorf("unable to parse as %q: %w", kind, err)

internal/server/resources/resources_test.go

@@ -32,7 +32,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source",
-				Type: "alloydb-postgres",
+				Kind: "alloydb-postgres",
 			},
 		},
 	}
@@ -92,7 +92,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source2": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source2",
-				Type: "alloydb-postgres",
+				Kind: "alloydb-postgres",
 			},
 		},
 	}

internal/server/server.go

@@ -82,7 +82,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			childCtx, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/source/init",
-				trace.WithAttributes(attribute.String("source_type", sc.SourceConfigType())),
+				trace.WithAttributes(attribute.String("source_kind", sc.SourceConfigKind())),
 				trace.WithAttributes(attribute.String("source_name", name)),
 			)
 			defer span.End()
@@ -110,7 +110,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/auth/init",
-				trace.WithAttributes(attribute.String("auth_type", sc.AuthServiceConfigType())),
+				trace.WithAttributes(attribute.String("auth_kind", sc.AuthServiceConfigKind())),
 				trace.WithAttributes(attribute.String("auth_name", name)),
 			)
 			defer span.End()
@@ -138,7 +138,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/embeddingmodel/init",
-				trace.WithAttributes(attribute.String("model_type", ec.EmbeddingModelConfigType())),
+				trace.WithAttributes(attribute.String("model_kind", ec.EmbeddingModelConfigKind())),
 				trace.WithAttributes(attribute.String("model_name", name)),
 			)
 			defer span.End()
@@ -166,7 +166,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/tool/init",
-				trace.WithAttributes(attribute.String("tool_type", tc.ToolConfigType())),
+				trace.WithAttributes(attribute.String("tool_kind", tc.ToolConfigKind())),
 				trace.WithAttributes(attribute.String("tool_name", name)),
 			)
 			defer span.End()
@@ -235,7 +235,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/prompt/init",
-				trace.WithAttributes(attribute.String("prompt_type", pc.PromptConfigType())),
+				trace.WithAttributes(attribute.String("prompt_kind", pc.PromptConfigKind())),
 				trace.WithAttributes(attribute.String("prompt_name", name)),
 			)
 			defer span.End()

internal/server/server_test.go

@@ -141,7 +141,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source",
-				Type: "alloydb-postgres",
+				Kind: "alloydb-postgres",
 			},
 		},
 	}

internal/sources/alloydbadmin/alloydbadmin.go

@@ -32,14 +32,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceType string = "alloydb-admin"
+const SourceKind string = "alloydb-admin"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -53,13 +53,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string `yaml:"name" validate:"required"`
-	Type           string `yaml:"kind" validate:"required"`
+	Kind           string `yaml:"kind" validate:"required"`
 	DefaultProject string `yaml:"defaultProject"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -106,8 +106,8 @@ type Source struct {
 	Service *alloydbrestapi.Service
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/alloydbadmin/alloydbadmin_test.go

@@ -41,7 +41,7 @@ func TestParseFromYamlAlloyDBAdmin(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-alloydb-admin-instance": alloydbadmin.Config{
 					Name:           "my-alloydb-admin-instance",
-					Type:           alloydbadmin.SourceType,
+					Kind:           alloydbadmin.SourceKind,
 					UseClientOAuth: false,
 				},
 			},
@@ -57,7 +57,7 @@ func TestParseFromYamlAlloyDBAdmin(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-alloydb-admin-instance": alloydbadmin.Config{
 					Name:           "my-alloydb-admin-instance",
-					Type:           alloydbadmin.SourceType,
+					Kind:           alloydbadmin.SourceKind,
 					UseClientOAuth: true,
 				},
 			},

internal/sources/alloydbpg/alloydb_pg.go

@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "alloydb-postgres"
+const SourceKind string = "alloydb-postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,7 +50,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string         `yaml:"name" validate:"required"`
-	Type     string         `yaml:"kind" validate:"required"`
+	Kind     string         `yaml:"kind" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Cluster  string         `yaml:"cluster" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	Database string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -183,7 +183,7 @@ func getConnectionConfig(ctx context.Context, user, pass, dbname string) (string
 
 func initAlloyDBPgConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, cluster, instance, ipType, user, pass, dbname string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	dsn, useIAM, err := getConnectionConfig(ctx, user, pass, dbname)

internal/sources/alloydbpg/alloydb_pg_test.go

@@ -48,7 +48,7 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Type:     alloydbpg.SourceType,
+					Kind:     alloydbpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",
@@ -78,7 +78,7 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Type:     alloydbpg.SourceType,
+					Kind:     alloydbpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",
@@ -108,7 +108,7 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Type:     alloydbpg.SourceType,
+					Kind:     alloydbpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",

internal/sources/bigquery/bigquery.go

@@ -41,7 +41,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceType string = "bigquery"
+const SourceKind string = "bigquery"
 
 // CloudPlatformScope is a broad scope for Google Cloud Platform services.
 const CloudPlatformScope = "https://www.googleapis.com/auth/cloud-platform"
@@ -65,8 +65,8 @@ type BigQuerySessionProvider func(ctx context.Context) (*Session, error)
 type DataplexClientCreator func(tokenString string) (*dataplexapi.CatalogClient, error)
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -81,7 +81,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// BigQuery configs
 	Name                      string              `yaml:"name" validate:"required"`
-	Type                      string              `yaml:"kind" validate:"required"`
+	Kind                      string              `yaml:"kind" validate:"required"`
 	Project                   string              `yaml:"project" validate:"required"`
 	Location                  string              `yaml:"location"`
 	WriteMode                 string              `yaml:"writeMode"`
@@ -119,9 +119,9 @@ func (s *StringOrStringSlice) UnmarshalYAML(unmarshal func(any) error) error {
 	return fmt.Errorf("cannot unmarshal %T into StringOrStringSlice", v)
 }
 
-func (r Config) SourceConfigType() string {
+func (r Config) SourceConfigKind() string {
 	// Returns BigQuery source kind
-	return SourceType
+	return SourceKind
 }
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
 	if r.WriteMode == "" {
@@ -302,9 +302,9 @@ type Session struct {
 	LastUsed     time.Time
 }
 
-func (s *Source) SourceType() string {
+func (s *Source) SourceKind() string {
 	// Returns BigQuery Google SQL source kind
-	return SourceType
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -665,7 +665,7 @@ func initBigQueryConnection(
 	impersonateServiceAccount string,
 	scopes []string,
 ) (*bigqueryapi.Client, *bigqueryrestapi.Service, oauth2.TokenSource, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
@@ -741,7 +741,7 @@ func initBigQueryConnectionWithOAuthToken(
 	tokenString string,
 	wantRestService bool,
 ) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 	// Construct token source
 	token := &oauth2.Token{
@@ -801,7 +801,7 @@ func initDataplexConnection(
 	var clientCreator DataplexClientCreator
 	var err error
 
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)

internal/sources/bigquery/bigquery_test.go

@@ -46,7 +46,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:      "my-instance",
-					Type:      bigquery.SourceType,
+					Kind:      bigquery.SourceKind,
 					Project:   "my-project",
 					Location:  "",
 					WriteMode: "",
@@ -66,7 +66,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:           "my-instance",
-					Type:           bigquery.SourceType,
+					Kind:           bigquery.SourceKind,
 					Project:        "my-project",
 					Location:       "asia",
 					WriteMode:      "blocked",
@@ -87,7 +87,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:           "my-instance",
-					Type:           bigquery.SourceType,
+					Kind:           bigquery.SourceKind,
 					Project:        "my-project",
 					Location:       "us",
 					UseClientOAuth: true,
@@ -108,7 +108,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:            "my-instance",
-					Type:            bigquery.SourceType,
+					Kind:            bigquery.SourceKind,
 					Project:         "my-project",
 					Location:        "us",
 					AllowedDatasets: []string{"my_dataset"},
@@ -128,7 +128,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:                      "my-instance",
-					Type:                      bigquery.SourceType,
+					Kind:                      bigquery.SourceKind,
 					Project:                   "my-project",
 					Location:                  "us",
 					ImpersonateServiceAccount: "service-account@my-project.iam.gserviceaccount.com",
@@ -150,7 +150,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:     "my-instance",
-					Type:     bigquery.SourceType,
+					Kind:     bigquery.SourceKind,
 					Project:  "my-project",
 					Location: "us",
 					Scopes:   []string{"https://www.googleapis.com/auth/bigquery", "https://www.googleapis.com/auth/cloud-platform"},
@@ -170,7 +170,7 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": bigquery.Config{
 					Name:               "my-instance",
-					Type:               bigquery.SourceType,
+					Kind:               bigquery.SourceKind,
 					Project:            "my-project",
 					Location:           "us",
 					MaxQueryResultRows: 10,
@@ -260,7 +260,7 @@ func TestInitialize_MaxQueryResultRows(t *testing.T) {
 			desc: "default value",
 			cfg: bigquery.Config{
 				Name:           "test-default",
-				Type:           bigquery.SourceType,
+				Kind:           bigquery.SourceKind,
 				Project:        "test-project",
 				UseClientOAuth: true,
 			},
@@ -270,7 +270,7 @@ func TestInitialize_MaxQueryResultRows(t *testing.T) {
 			desc: "configured value",
 			cfg: bigquery.Config{
 				Name:               "test-configured",
-				Type:               bigquery.SourceType,
+				Kind:               bigquery.SourceKind,
 				Project:            "test-project",
 				UseClientOAuth:     true,
 				MaxQueryResultRows: 100,

internal/sources/bigtable/bigtable.go

@@ -27,14 +27,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceType string = "bigtable"
+const SourceKind string = "bigtable"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -48,13 +48,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Instance string `yaml:"instance" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -77,8 +77,8 @@ type Source struct {
 	Client *bigtable.Client
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -179,7 +179,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, configParam param
 
 func initBigtableClient(ctx context.Context, tracer trace.Tracer, name, project, instance string) (*bigtable.Client, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Set up Bigtable data operations client.

internal/sources/bigtable/bigtable_test.go

@@ -43,7 +43,7 @@ func TestParseFromYamlBigtableDb(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-bigtable-instance": bigtable.Config{
 					Name:     "my-bigtable-instance",
-					Type:     bigtable.SourceType,
+					Kind:     bigtable.SourceKind,
 					Project:  "my-project",
 					Instance: "my-instance",
 				},

internal/sources/cassandra/cassandra.go

@@ -25,11 +25,11 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "cassandra"
+const SourceKind string = "cassandra"
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -43,7 +43,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name                   string   `yaml:"name" validate:"required"`
-	Type                   string   `yaml:"kind" validate:"required"`
+	Kind                   string   `yaml:"kind" validate:"required"`
 	Hosts                  []string `yaml:"hosts" validate:"required"`
 	Keyspace               string   `yaml:"keyspace"`
 	ProtoVersion           int      `yaml:"protoVersion"`
@@ -68,9 +68,9 @@ func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 	return s, nil
 }
 
-// SourceConfigType implements sources.SourceConfig.
-func (c Config) SourceConfigType() string {
-	return SourceType
+// SourceConfigKind implements sources.SourceConfig.
+func (c Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 var _ sources.SourceConfig = Config{}
@@ -89,9 +89,9 @@ func (s *Source) ToConfig() sources.SourceConfig {
 	return s.Config
 }
 
-// SourceType implements sources.Source.
-func (s *Source) SourceType() string {
-	return SourceType
+// SourceKind implements sources.Source.
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) RunSQL(ctx context.Context, statement string, params parameters.ParamValues) (any, error) {
@@ -120,7 +120,7 @@ var _ sources.Source = &Source{}
 
 func initCassandraSession(ctx context.Context, tracer trace.Tracer, c Config) (*gocql.Session, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, c.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, c.Name)
 	defer span.End()
 
 	// Validate authentication configuration

internal/sources/cassandra/cassandra_test.go

@@ -43,7 +43,7 @@ func TestParseFromYamlCassandra(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-cassandra-instance": cassandra.Config{
 					Name:                   "my-cassandra-instance",
-					Type:                   cassandra.SourceType,
+					Kind:                   cassandra.SourceKind,
 					Hosts:                  []string{"my-host1", "my-host2"},
 					Username:               "",
 					Password:               "",
@@ -77,7 +77,7 @@ func TestParseFromYamlCassandra(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-cassandra-instance": cassandra.Config{
 					Name:                   "my-cassandra-instance",
-					Type:                   cassandra.SourceType,
+					Kind:                   cassandra.SourceKind,
 					Hosts:                  []string{"my-host1", "my-host2"},
 					Username:               "user",
 					Password:               "pass",

internal/sources/clickhouse/clickhouse.go

@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "clickhouse"
+const SourceKind string = "clickhouse"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -49,7 +49,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	Database string `yaml:"database" validate:"required"`
@@ -59,8 +59,8 @@ type Config struct {
 	Secure   bool   `yaml:"secure"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -88,8 +88,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -174,7 +174,7 @@ func validateConfig(protocol string) error {
 
 func initClickHouseConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, protocol string, secure bool) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	if protocol == "" {

internal/sources/clickhouse/clickhouse_test.go

@@ -25,10 +25,10 @@ import (
 	"go.opentelemetry.io/otel"
 )
 
-func TestConfigSourceConfigType(t *testing.T) {
+func TestConfigSourceConfigKind(t *testing.T) {
 	config := Config{}
-	if config.SourceConfigType() != SourceType {
-		t.Errorf("Expected %s, got %s", SourceType, config.SourceConfigType())
+	if config.SourceConfigKind() != SourceKind {
+		t.Errorf("Expected %s, got %s", SourceKind, config.SourceConfigKind())
 	}
 }
 
@@ -53,7 +53,7 @@ func TestNewConfig(t *testing.T) {
 			`,
 			expected: Config{
 				Name:     "test-clickhouse",
-				Type:     "clickhouse",
+				Kind:     "clickhouse",
 				Host:     "localhost",
 				Port:     "8443",
 				User:     "default",
@@ -75,7 +75,7 @@ func TestNewConfig(t *testing.T) {
 			`,
 			expected: Config{
 				Name:     "minimal-clickhouse",
-				Type:     "clickhouse",
+				Kind:     "clickhouse",
 				Host:     "127.0.0.1",
 				Port:     "8123",
 				User:     "testuser",
@@ -100,7 +100,7 @@ func TestNewConfig(t *testing.T) {
 			`,
 			expected: Config{
 				Name:     "http-clickhouse",
-				Type:     "clickhouse",
+				Kind:     "clickhouse",
 				Host:     "clickhouse.example.com",
 				Port:     "8123",
 				User:     "analytics",
@@ -125,7 +125,7 @@ func TestNewConfig(t *testing.T) {
 			`,
 			expected: Config{
 				Name:     "secure-clickhouse",
-				Type:     "clickhouse",
+				Kind:     "clickhouse",
 				Host:     "secure.clickhouse.io",
 				Port:     "8443",
 				User:     "secureuser",
@@ -196,10 +196,10 @@ func TestNewConfigInvalidYAML(t *testing.T) {
 	}
 }
 
-func TestSource_SourceType(t *testing.T) {
+func TestSource_SourceKind(t *testing.T) {
 	source := &Source{}
-	if source.SourceType() != SourceType {
-		t.Errorf("Expected %s, got %s", SourceType, source.SourceType())
+	if source.SourceKind() != SourceKind {
+		t.Errorf("Expected %s, got %s", SourceKind, source.SourceKind())
 	}
 }
 

internal/sources/cloudgda/cloud_gda.go

@@ -29,15 +29,15 @@ import (
 	"golang.org/x/oauth2/google"
 )
 
-const SourceType string = "cloud-gemini-data-analytics"
+const SourceKind string = "cloud-gemini-data-analytics"
 const Endpoint string = "https://geminidataanalytics.googleapis.com"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,13 +51,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string `yaml:"name" validate:"required"`
-	Type           string `yaml:"kind" validate:"required"`
+	Kind           string `yaml:"kind" validate:"required"`
 	ProjectID      string `yaml:"projectId" validate:"required"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize initializes a Gemini Data Analytics Source instance.
@@ -102,8 +102,8 @@ type Source struct {
 	userAgent string
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/cloudgda/cloud_gda_test.go

@@ -47,7 +47,7 @@ func TestParseFromYamlCloudGDA(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-gda-instance": cloudgda.Config{
 					Name:           "my-gda-instance",
-					Type:           cloudgda.SourceType,
+					Kind:           cloudgda.SourceKind,
 					ProjectID:      "test-project-id",
 					UseClientOAuth: false,
 				},
@@ -65,7 +65,7 @@ func TestParseFromYamlCloudGDA(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-gda-instance": cloudgda.Config{
 					Name:           "my-gda-instance",
-					Type:           cloudgda.SourceType,
+					Kind:           cloudgda.SourceKind,
 					ProjectID:      "another-project",
 					UseClientOAuth: true,
 				},
@@ -153,12 +153,12 @@ func TestInitialize(t *testing.T) {
 	}{
 		{
 			desc:            "initialize with ADC",
-			cfg:             cloudgda.Config{Name: "test-gda", Type: cloudgda.SourceType, ProjectID: "test-proj"},
+			cfg:             cloudgda.Config{Name: "test-gda", Kind: cloudgda.SourceKind, ProjectID: "test-proj"},
 			wantClientOAuth: false,
 		},
 		{
 			desc:            "initialize with client OAuth",
-			cfg:             cloudgda.Config{Name: "test-gda-oauth", Type: cloudgda.SourceType, ProjectID: "test-proj", UseClientOAuth: true},
+			cfg:             cloudgda.Config{Name: "test-gda-oauth", Kind: cloudgda.SourceKind, ProjectID: "test-proj", UseClientOAuth: true},
 			wantClientOAuth: true,
 		},
 	}

internal/sources/cloudhealthcare/cloud_healthcare.go

@@ -34,7 +34,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceType string = "cloud-healthcare"
+const SourceKind string = "cloud-healthcare"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
@@ -42,8 +42,8 @@ var _ sources.SourceConfig = Config{}
 type HealthcareServiceCreator func(tokenString string) (*healthcare.Service, error)
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -58,7 +58,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Healthcare configs
 	Name               string   `yaml:"name" validate:"required"`
-	Type               string   `yaml:"kind" validate:"required"`
+	Kind               string   `yaml:"kind" validate:"required"`
 	Project            string   `yaml:"project" validate:"required"`
 	Region             string   `yaml:"region" validate:"required"`
 	Dataset            string   `yaml:"dataset" validate:"required"`
@@ -67,8 +67,8 @@ type Config struct {
 	UseClientOAuth     bool     `yaml:"useClientOAuth"`
 }
 
-func (c Config) SourceConfigType() string {
-	return SourceType
+func (c Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -144,7 +144,7 @@ func newHealthcareServiceCreator(ctx context.Context, tracer trace.Tracer, name
 }
 
 func initHealthcareConnectionWithOAuthToken(ctx context.Context, tracer trace.Tracer, name string, userAgent string, tokenString string) (*healthcare.Service, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 	// Construct token source
 	token := &oauth2.Token{
@@ -162,7 +162,7 @@ func initHealthcareConnectionWithOAuthToken(ctx context.Context, tracer trace.Tr
 }
 
 func initHealthcareConnection(ctx context.Context, tracer trace.Tracer, name string) (*healthcare.Service, oauth2.TokenSource, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	cred, err := google.FindDefaultCredentials(ctx, healthcare.CloudHealthcareScope)
@@ -194,8 +194,8 @@ type Source struct {
 	allowedDICOMStores map[string]struct{}
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -517,14 +517,14 @@ func (s *Source) RetrieveRenderedDICOMInstance(storeID, study, series, sop strin
 	return base64String, nil
 }
 
-func (s *Source) SearchDICOM(toolType, storeID, dicomWebPath, tokenStr string, opts []googleapi.CallOption) (any, error) {
+func (s *Source) SearchDICOM(toolKind, storeID, dicomWebPath, tokenStr string, opts []googleapi.CallOption) (any, error) {
 	svc, err := s.getService(tokenStr)
 	if err != nil {
 		return nil, err
 	}
 	name := fmt.Sprintf("projects/%s/locations/%s/datasets/%s/dicomStores/%s", s.Project(), s.Region(), s.DatasetID(), storeID)
 	var resp *http.Response
-	switch toolType {
+	switch toolKind {
 	case "cloud-healthcare-search-dicom-instances":
 		resp, err = svc.Projects.Locations.Datasets.DicomStores.SearchForInstances(name, dicomWebPath).Do(opts...)
 	case "cloud-healthcare-search-dicom-series":
@@ -532,7 +532,7 @@ func (s *Source) SearchDICOM(toolType, storeID, dicomWebPath, tokenStr string, o
 	case "cloud-healthcare-search-dicom-studies":
 		resp, err = svc.Projects.Locations.Datasets.DicomStores.SearchForStudies(name, dicomWebPath).Do(opts...)
 	default:
-		return nil, fmt.Errorf("incompatible tool type: %s", toolType)
+		return nil, fmt.Errorf("incompatible tool kind: %s", toolKind)
 	}
 	if err != nil {
 		return nil, fmt.Errorf("failed to search dicom series: %w", err)

internal/sources/cloudhealthcare/cloud_healthcare_test.go

@@ -43,7 +43,7 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudhealthcare.Config{
 					Name:           "my-instance",
-					Type:           cloudhealthcare.SourceType,
+					Kind:           cloudhealthcare.SourceKind,
 					Project:        "my-project",
 					Region:         "us-central1",
 					Dataset:        "my-dataset",
@@ -65,7 +65,7 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudhealthcare.Config{
 					Name:           "my-instance",
-					Type:           cloudhealthcare.SourceType,
+					Kind:           cloudhealthcare.SourceKind,
 					Project:        "my-project",
 					Region:         "us",
 					Dataset:        "my-dataset",
@@ -91,7 +91,7 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudhealthcare.Config{
 					Name:               "my-instance",
-					Type:               cloudhealthcare.SourceType,
+					Kind:               cloudhealthcare.SourceKind,
 					Project:            "my-project",
 					Region:             "us",
 					Dataset:            "my-dataset",

internal/sources/cloudmonitoring/cloud_monitoring.go

@@ -29,14 +29,14 @@ import (
 	monitoring "google.golang.org/api/monitoring/v3"
 )
 
-const SourceType string = "cloud-monitoring"
+const SourceKind string = "cloud-monitoring"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,12 +50,12 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string `yaml:"name" validate:"required"`
-	Type           string `yaml:"kind" validate:"required"`
+	Kind           string `yaml:"kind" validate:"required"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize initializes a Cloud Monitoring Source instance.
@@ -99,8 +99,8 @@ type Source struct {
 	userAgent string
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/cloudmonitoring/cloud_monitoring_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-cloud-monitoring-instance": cloudmonitoring.Config{
 					Name:           "my-cloud-monitoring-instance",
-					Type:           cloudmonitoring.SourceType,
+					Kind:           cloudmonitoring.SourceKind,
 					UseClientOAuth: false,
 				},
 			},
@@ -58,7 +58,7 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-cloud-monitoring-instance": cloudmonitoring.Config{
 					Name:           "my-cloud-monitoring-instance",
-					Type:           cloudmonitoring.SourceType,
+					Kind:           cloudmonitoring.SourceKind,
 					UseClientOAuth: true,
 				},
 			},

internal/sources/cloudsqladmin/cloud_sql_admin.go

@@ -34,7 +34,7 @@ import (
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const SourceType string = "cloud-sql-admin"
+const SourceKind string = "cloud-sql-admin"
 
 var targetLinkRegex = regexp.MustCompile(`/projects/([^/]+)/instances/([^/]+)/databases/([^/]+)`)
 
@@ -42,8 +42,8 @@ var targetLinkRegex = regexp.MustCompile(`/projects/([^/]+)/instances/([^/]+)/da
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -57,13 +57,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string `yaml:"name" validate:"required"`
-	Type           string `yaml:"kind" validate:"required"`
+	Kind           string `yaml:"kind" validate:"required"`
 	DefaultProject string `yaml:"defaultProject"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize initializes a CloudSQL Admin Source instance.
@@ -110,8 +110,8 @@ type Source struct {
 	Service *sqladmin.Service
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/cloudsqladmin/cloud_sql_admin_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlCloudSQLAdmin(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-cloud-sql-admin-instance": cloudsqladmin.Config{
 					Name:           "my-cloud-sql-admin-instance",
-					Type:           cloudsqladmin.SourceType,
+					Kind:           cloudsqladmin.SourceKind,
 					UseClientOAuth: false,
 				},
 			},
@@ -58,7 +58,7 @@ func TestParseFromYamlCloudSQLAdmin(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-cloud-sql-admin-instance": cloudsqladmin.Config{
 					Name:           "my-cloud-sql-admin-instance",
-					Type:           cloudsqladmin.SourceType,
+					Kind:           cloudsqladmin.SourceKind,
 					UseClientOAuth: true,
 				},
 			},

internal/sources/cloudsqlmssql/cloud_sql_mssql.go

@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "cloud-sql-mssql"
+const SourceKind string = "cloud-sql-mssql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,7 +51,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Cloud SQL MSSQL configs
 	Name      string         `yaml:"name" validate:"required"`
-	Type      string         `yaml:"kind" validate:"required"`
+	Kind      string         `yaml:"kind" validate:"required"`
 	Project   string         `yaml:"project" validate:"required"`
 	Region    string         `yaml:"region" validate:"required"`
 	Instance  string         `yaml:"instance" validate:"required"`
@@ -62,9 +62,9 @@ type Config struct {
 	Database  string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
+func (r Config) SourceConfigKind() string {
 	// Returns Cloud SQL MSSQL source kind
-	return SourceType
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -94,9 +94,9 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceType() string {
+func (s *Source) SourceKind() string {
 	// Returns Cloud SQL MSSQL source kind
-	return SourceType
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -152,7 +152,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initCloudSQLMssqlConnection(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)

internal/sources/cloudsqlmssql/cloud_sql_mssql_test.go

@@ -46,7 +46,7 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudsqlmssql.Config{
 					Name:     "my-instance",
-					Type:     cloudsqlmssql.SourceType,
+					Kind:     cloudsqlmssql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -74,7 +74,7 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudsqlmssql.Config{
 					Name:     "my-instance",
-					Type:     cloudsqlmssql.SourceType,
+					Kind:     cloudsqlmssql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -102,7 +102,7 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": cloudsqlmssql.Config{
 					Name:      "my-instance",
-					Type:      cloudsqlmssql.SourceType,
+					Kind:      cloudsqlmssql.SourceKind,
 					Project:   "my-project",
 					Region:    "my-region",
 					Instance:  "my-instance",

internal/sources/cloudsqlmysql/cloud_sql_mysql.go

@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "cloud-sql-mysql"
+const SourceKind string = "cloud-sql-mysql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,7 +51,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string         `yaml:"name" validate:"required"`
-	Type     string         `yaml:"kind" validate:"required"`
+	Kind     string         `yaml:"kind" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Instance string         `yaml:"instance" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	Database string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -184,7 +184,7 @@ func getConnectionConfig(ctx context.Context, user, pass string) (string, string
 
 func initCloudSQLMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database

internal/sources/cloudsqlmysql/cloud_sql_mysql_test.go

@@ -46,7 +46,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     cloudsqlmysql.SourceType,
+					Kind:     cloudsqlmysql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -74,7 +74,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     cloudsqlmysql.SourceType,
+					Kind:     cloudsqlmysql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -102,7 +102,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     cloudsqlmysql.SourceType,
+					Kind:     cloudsqlmysql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -130,7 +130,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     cloudsqlmysql.SourceType,
+					Kind:     cloudsqlmysql.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",

internal/sources/cloudsqlpg/cloud_sql_pg.go

@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "cloud-sql-postgres"
+const SourceKind string = "cloud-sql-postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -49,7 +49,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string         `yaml:"name" validate:"required"`
-	Type     string         `yaml:"kind" validate:"required"`
+	Kind     string         `yaml:"kind" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Instance string         `yaml:"instance" validate:"required"`
@@ -59,8 +59,8 @@ type Config struct {
 	Password string         `yaml:"password"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -88,8 +88,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -162,7 +162,7 @@ func getConnectionConfig(ctx context.Context, user, pass, dbname string) (string
 
 func initCloudSQLPgConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database

internal/sources/cloudsqlpg/cloud_sql_pg_test.go

@@ -46,7 +46,7 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Type:     cloudsqlpg.SourceType,
+					Kind:     cloudsqlpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -74,7 +74,7 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Type:     cloudsqlpg.SourceType,
+					Kind:     cloudsqlpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -102,7 +102,7 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Type:     cloudsqlpg.SourceType,
+					Kind:     cloudsqlpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -130,7 +130,7 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Type:     cloudsqlpg.SourceType,
+					Kind:     cloudsqlpg.SourceKind,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",

internal/sources/couchbase/couchbase.go

@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "couchbase"
+const SourceKind string = "couchbase"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,7 +50,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name                 string `yaml:"name" validate:"required"`
-	Type                 string `yaml:"kind" validate:"required"`
+	Kind                 string `yaml:"kind" validate:"required"`
 	ConnectionString     string `yaml:"connectionString" validate:"required"`
 	Bucket               string `yaml:"bucket" validate:"required"`
 	Scope                string `yaml:"scope" validate:"required"`
@@ -66,8 +66,8 @@ type Config struct {
 	QueryScanConsistency uint   `yaml:"queryScanConsistency"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -96,8 +96,8 @@ type Source struct {
 	Scope *gocb.Scope
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/couchbase/couchbase_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlCouchbase(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-couchbase-instance": couchbase.Config{
 					Name:             "my-couchbase-instance",
-					Type:             couchbase.SourceType,
+					Kind:             couchbase.SourceKind,
 					ConnectionString: "localhost",
 					Username:         "Administrator",
 					Password:         "password",
@@ -74,7 +74,7 @@ func TestParseFromYamlCouchbase(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-couchbase-instance": couchbase.Config{
 					Name:                 "my-couchbase-instance",
-					Type:                 couchbase.SourceType,
+					Kind:                 couchbase.SourceKind,
 					ConnectionString:     "couchbases://localhost",
 					Bucket:               "travel-sample",
 					Scope:                "inventory",

internal/sources/dataplex/dataplex.go

@@ -29,14 +29,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceType string = "dataplex"
+const SourceKind string = "dataplex"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,13 +51,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Dataplex configs
 	Name    string `yaml:"name" validate:"required"`
-	Type    string `yaml:"kind" validate:"required"`
+	Kind    string `yaml:"kind" validate:"required"`
 	Project string `yaml:"project" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
+func (r Config) SourceConfigKind() string {
 	// Returns Dataplex source kind
-	return SourceType
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -81,9 +81,9 @@ type Source struct {
 	Client *dataplexapi.CatalogClient
 }
 
-func (s *Source) SourceType() string {
+func (s *Source) SourceKind() string {
 	// Returns Dataplex source kind
-	return SourceType
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -104,7 +104,7 @@ func initDataplexConnection(
 	name string,
 	project string,
 ) (*dataplexapi.CatalogClient, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	cred, err := google.FindDefaultCredentials(ctx)

internal/sources/dataplex/dataplex_test.go

@@ -41,7 +41,7 @@ func TestParseFromYamlDataplex(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": dataplex.Config{
 					Name:    "my-instance",
-					Type:    dataplex.SourceType,
+					Kind:    dataplex.SourceKind,
 					Project: "my-project",
 				},
 			},

internal/sources/dgraph/dgraph.go

@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "dgraph"
+const SourceKind string = "dgraph"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -67,7 +67,7 @@ type DgraphClient struct {
 
 type Config struct {
 	Name      string `yaml:"name" validate:"required"`
-	Type      string `yaml:"kind" validate:"required"`
+	Kind      string `yaml:"kind" validate:"required"`
 	DgraphUrl string `yaml:"dgraphUrl" validate:"required"`
 	User      string `yaml:"user"`
 	Password  string `yaml:"password"`
@@ -75,8 +75,8 @@ type Config struct {
 	ApiKey    string `yaml:"apiKey"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -103,8 +103,8 @@ type Source struct {
 	Client *DgraphClient `yaml:"client"`
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -139,7 +139,7 @@ func (s *Source) RunSQL(statement string, params parameters.ParamValues, isQuery
 
 func initDgraphHttpClient(ctx context.Context, tracer trace.Tracer, r Config) (*DgraphClient, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, r.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, r.Name)
 	defer span.End()
 
 	if r.DgraphUrl == "" {

internal/sources/dgraph/dgraph_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlDgraph(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-dgraph-instance": dgraph.Config{
 					Name:      "my-dgraph-instance",
-					Type:      dgraph.SourceType,
+					Kind:      dgraph.SourceKind,
 					DgraphUrl: "https://localhost:8080",
 					ApiKey:    "abc123",
 					Password:  "pass@123",
@@ -65,7 +65,7 @@ func TestParseFromYamlDgraph(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-dgraph-instance": dgraph.Config{
 					Name:      "my-dgraph-instance",
-					Type:      dgraph.SourceType,
+					Kind:      dgraph.SourceKind,
 					DgraphUrl: "https://localhost:8080",
 				},
 			},

internal/sources/elasticsearch/elasticsearch.go

@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "elasticsearch"
+const SourceKind string = "elasticsearch"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,15 +51,15 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name      string   `yaml:"name" validate:"required"`
-	Type      string   `yaml:"kind" validate:"required"`
+	Kind      string   `yaml:"kind" validate:"required"`
 	Addresses []string `yaml:"addresses" validate:"required"`
 	Username  string   `yaml:"username"`
 	Password  string   `yaml:"password"`
 	APIKey    string   `yaml:"apikey"`
 }
 
-func (c Config) SourceConfigType() string {
-	return SourceType
+func (c Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 type EsClient interface {
@@ -139,9 +139,9 @@ func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 	return s, nil
 }
 
-// SourceType returns the kind string for this source.
-func (s *Source) SourceType() string {
-	return SourceType
+// SourceKind returns the kind string for this source.
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/elasticsearch/elasticsearch_test.go

@@ -43,7 +43,7 @@ func TestParseFromYamlElasticsearch(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-es-instance": elasticsearch.Config{
 					Name:      "my-es-instance",
-					Type:      elasticsearch.SourceType,
+					Kind:      elasticsearch.SourceKind,
 					Addresses: []string{"http://localhost:9200"},
 					APIKey:    "somekey",
 				},

internal/sources/firebird/firebird.go

@@ -27,13 +27,13 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 )
 
-const SourceType string = "firebird"
+const SourceKind string = "firebird"
 
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -47,7 +47,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -55,8 +55,8 @@ type Config struct {
 	Database string `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -84,8 +84,8 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -144,7 +144,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 }
 
 func initFirebirdConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string) (*sql.DB, error) {
-	_, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	_, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// urlExample := "user:password@host:port/path/to/database.fdb"

internal/sources/firebird/firebird_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlFirebird(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-fdb-instance": firebird.Config{
 					Name:     "my-fdb-instance",
-					Type:     firebird.SourceType,
+					Kind:     firebird.SourceKind,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",

internal/sources/firestore/firestore.go

@@ -31,14 +31,14 @@ import (
 	"google.golang.org/genproto/googleapis/type/latlng"
 )
 
-const SourceType string = "firestore"
+const SourceKind string = "firestore"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -53,14 +53,14 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Firestore configs
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Database string `yaml:"database"` // Optional, defaults to "(default)"
 }
 
-func (r Config) SourceConfigType() string {
+func (r Config) SourceConfigKind() string {
 	// Returns Firestore source kind
-	return SourceType
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -92,9 +92,9 @@ type Source struct {
 	RulesClient *firebaserules.Service
 }
 
-func (s *Source) SourceType() string {
+func (s *Source) SourceKind() string {
 	// Returns Firestore source kind
-	return SourceType
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -594,7 +594,7 @@ func initFirestoreConnection(
 	project string,
 	database string,
 ) (*firestore.Client, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)

internal/sources/firestore/firestore_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlFirestore(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-firestore": firestore.Config{
 					Name:     "my-firestore",
-					Type:     firestore.SourceType,
+					Kind:     firestore.SourceKind,
 					Project:  "my-project",
 					Database: "",
 				},
@@ -60,7 +60,7 @@ func TestParseFromYamlFirestore(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-firestore": firestore.Config{
 					Name:     "my-firestore",
-					Type:     firestore.SourceType,
+					Kind:     firestore.SourceKind,
 					Project:  "my-project",
 					Database: "my-database",
 				},

internal/sources/http/http.go

@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "http"
+const SourceKind string = "http"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,7 +50,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name                   string            `yaml:"name" validate:"required"`
-	Type                   string            `yaml:"kind" validate:"required"`
+	Kind                   string            `yaml:"kind" validate:"required"`
 	BaseURL                string            `yaml:"baseUrl"`
 	Timeout                string            `yaml:"timeout"`
 	DefaultHeaders         map[string]string `yaml:"headers"`
@@ -58,8 +58,8 @@ type Config struct {
 	DisableSslVerification bool              `yaml:"disableSslVerification"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize initializes an HTTP Source instance.
@@ -122,8 +122,8 @@ type Source struct {
 	client *http.Client
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/http/http_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlHttp(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-http-instance": http.Config{
 					Name:                   "my-http-instance",
-					Type:                   http.SourceType,
+					Kind:                   http.SourceKind,
 					BaseURL:                "http://test_server/",
 					Timeout:                "30s",
 					DisableSslVerification: false,
@@ -68,7 +68,7 @@ func TestParseFromYamlHttp(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-http-instance": http.Config{
 					Name:                   "my-http-instance",
-					Type:                   http.SourceType,
+					Kind:                   http.SourceKind,
 					BaseURL:                "http://test_server/",
 					Timeout:                "10s",
 					DefaultHeaders:         map[string]string{"Authorization": "test_header", "Custom-Header": "custom"},

internal/sources/looker/looker.go

@@ -33,14 +33,14 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const SourceType string = "looker"
+const SourceKind string = "looker"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -64,7 +64,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name               string `yaml:"name" validate:"required"`
-	Type               string `yaml:"kind" validate:"required"`
+	Kind               string `yaml:"kind" validate:"required"`
 	BaseURL            string `yaml:"base_url" validate:"required"`
 	ClientId           string `yaml:"client_id"`
 	ClientSecret       string `yaml:"client_secret"`
@@ -79,8 +79,8 @@ type Config struct {
 	SessionLength      int64  `yaml:"sessionLength"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize initializes a Looker Source instance.
@@ -154,8 +154,8 @@ type Source struct {
 	AuthTokenHeaderName string
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/looker/looker_test.go

@@ -44,7 +44,7 @@ func TestParseFromYamlLooker(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-looker-instance": looker.Config{
 					Name:               "my-looker-instance",
-					Type:               looker.SourceType,
+					Kind:               looker.SourceKind,
 					BaseURL:            "http://example.looker.com/",
 					ClientId:           "jasdl;k;tjl",
 					ClientSecret:       "sdakl;jgflkasdfkfg",

internal/sources/mindsdb/mindsdb.go

@@ -27,14 +27,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "mindsdb"
+const SourceKind string = "mindsdb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -48,7 +48,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name         string `yaml:"name" validate:"required"`
-	Type         string `yaml:"kind" validate:"required"`
+	Kind         string `yaml:"kind" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -57,8 +57,8 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -86,8 +86,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -159,7 +159,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initMindsDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database

internal/sources/mindsdb/mindsdb_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlMindsDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mindsdb-instance": mindsdb.Config{
 					Name:     "my-mindsdb-instance",
-					Type:     mindsdb.SourceType,
+					Kind:     mindsdb.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -70,7 +70,7 @@ func TestParseFromYamlMindsDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mindsdb-instance": mindsdb.Config{
 					Name:         "my-mindsdb-instance",
-					Type:         mindsdb.SourceType,
+					Kind:         mindsdb.SourceKind,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",

internal/sources/mongodb/mongodb.go

@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "mongodb"
+const SourceKind string = "mongodb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,12 +50,12 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name string `yaml:"name" validate:"required"`
-	Type string `yaml:"kind" validate:"required"`
+	Kind string `yaml:"kind" validate:"required"`
 	Uri  string `yaml:"uri" validate:"required"` // MongoDB Atlas connection URI
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -84,8 +84,8 @@ type Source struct {
 	Client *mongo.Client
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -293,7 +293,7 @@ func (s *Source) DeleteOne(ctx context.Context, filterString, database, collecti
 
 func initMongoDBClient(ctx context.Context, tracer trace.Tracer, name, uri string) (*mongo.Client, error) {
 	// Start a tracing span
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)

internal/sources/mongodb/mongodb_test.go

@@ -41,7 +41,7 @@ func TestParseFromYamlMongoDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"mongo-db": mongodb.Config{
 					Name: "mongo-db",
-					Type: mongodb.SourceType,
+					Kind: mongodb.SourceKind,
 					Uri:  "mongodb+srv://username:password@host/dbname",
 				},
 			},

internal/sources/mssql/mssql.go

@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "mssql"
+const SourceKind string = "mssql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -50,7 +50,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Cloud SQL MSSQL configs
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -59,9 +59,9 @@ type Config struct {
 	Encrypt  string `yaml:"encrypt"`
 }
 
-func (r Config) SourceConfigType() string {
+func (r Config) SourceConfigKind() string {
 	// Returns Cloud SQL MSSQL source kind
-	return SourceType
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -91,9 +91,9 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceType() string {
+func (s *Source) SourceKind() string {
 	// Returns Cloud SQL MSSQL source kind
-	return SourceType
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -156,7 +156,7 @@ func initMssqlConnection(
 	error,
 ) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)

internal/sources/mssql/mssql_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlMssql(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mssql-instance": mssql.Config{
 					Name:     "my-mssql-instance",
-					Type:     mssql.SourceType,
+					Kind:     mssql.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -70,7 +70,7 @@ func TestParseFromYamlMssql(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mssql-instance": mssql.Config{
 					Name:     "my-mssql-instance",
-					Type:     mssql.SourceType,
+					Kind:     mssql.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",

internal/sources/mysql/mysql.go

@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "mysql"
+const SourceKind string = "mysql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,7 +51,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name         string            `yaml:"name" validate:"required"`
-	Type         string            `yaml:"kind" validate:"required"`
+	Kind         string            `yaml:"kind" validate:"required"`
 	Host         string            `yaml:"host" validate:"required"`
 	Port         string            `yaml:"port" validate:"required"`
 	User         string            `yaml:"user" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	QueryParams  map[string]string `yaml:"queryParams"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -158,7 +158,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string, queryParams map[string]string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Build query parameters via url.Values for deterministic order and proper escaping.

internal/sources/mysql/mysql_test.go

@@ -50,7 +50,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": mysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     mysql.SourceType,
+					Kind:     mysql.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -75,7 +75,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": mysql.Config{
 					Name:         "my-mysql-instance",
-					Type:         mysql.SourceType,
+					Kind:         mysql.SourceKind,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",
@@ -103,7 +103,7 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-mysql-instance": mysql.Config{
 					Name:     "my-mysql-instance",
-					Type:     mysql.SourceType,
+					Kind:     mysql.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -211,7 +211,7 @@ func TestFailInitialization(t *testing.T) {
 
 	cfg := mysql.Config{
 		Name:         "instance",
-		Type:         "mysql",
+		Kind:         "mysql",
 		Host:         "localhost",
 		Port:         "3306",
 		Database:     "db",

internal/sources/neo4j/neo4j.go

@@ -29,7 +29,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "neo4j"
+const SourceKind string = "neo4j"
 
 var sourceClassifier *classifier.QueryClassifier = classifier.NewQueryClassifier()
 
@@ -37,8 +37,8 @@ var sourceClassifier *classifier.QueryClassifier = classifier.NewQueryClassifier
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -52,15 +52,15 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Uri      string `yaml:"uri" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
 	Password string `yaml:"password" validate:"required"`
 	Database string `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -91,8 +91,8 @@ type Source struct {
 	Driver neo4j.DriverWithContext
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -182,7 +182,7 @@ func addPlanChildren(p neo4j.Plan) []map[string]any {
 
 func initNeo4jDriver(ctx context.Context, tracer trace.Tracer, uri, user, password, name string) (neo4j.DriverWithContext, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	auth := neo4j.BasicAuth(user, password, "")

internal/sources/neo4j/neo4j_test.go

@@ -44,7 +44,7 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-neo4j-instance": neo4j.Config{
 					Name:     "my-neo4j-instance",
-					Type:     neo4j.SourceType,
+					Kind:     neo4j.SourceKind,
 					Uri:      "neo4j+s://my-host:7687",
 					Database: "my_db",
 					User:     "my_user",

internal/sources/oceanbase/oceanbase.go

@@ -27,14 +27,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "oceanbase"
+const SourceKind string = "oceanbase"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -48,7 +48,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name         string `yaml:"name" validate:"required"`
-	Type         string `yaml:"kind" validate:"required"`
+	Kind         string `yaml:"kind" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -57,8 +57,8 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -86,8 +86,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -153,7 +153,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 }
 
 func initOceanBaseConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
-	_, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	_, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, pass, host, port, dbname)

internal/sources/oceanbase/oceanbase_test.go

@@ -46,7 +46,7 @@ func TestParseFromYamlOceanBase(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-oceanbase-instance": oceanbase.Config{
 					Name:     "my-oceanbase-instance",
-					Type:     oceanbase.SourceType,
+					Kind:     oceanbase.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "2881",
 					Database: "ob_db",
@@ -71,7 +71,7 @@ func TestParseFromYamlOceanBase(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-oceanbase-instance": oceanbase.Config{
 					Name:         "my-oceanbase-instance",
-					Type:         oceanbase.SourceType,
+					Kind:         oceanbase.SourceKind,
 					Host:         "0.0.0.0",
 					Port:         "2881",
 					Database:     "ob_db",

internal/sources/oracle/oracle.go

@@ -18,14 +18,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "oracle"
+const SourceKind string = "oracle"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -45,7 +45,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name             string `yaml:"name" validate:"required"`
-	Type             string `yaml:"kind" validate:"required"`
+	Kind             string `yaml:"kind" validate:"required"`
 	ConnectionString string `yaml:"connectionString,omitempty"`
 	TnsAlias         string `yaml:"tnsAlias,omitempty"`
 	TnsAdmin         string `yaml:"tnsAdmin,omitempty"`
@@ -95,8 +95,8 @@ func (c Config) validate() error {
 	return nil
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -124,8 +124,8 @@ type Source struct {
 	DB *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -239,7 +239,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initOracleConnection(ctx context.Context, tracer trace.Tracer, config Config) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, config.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, config.Name)
 	defer span.End()
 
 	logger, err := util.LoggerFromContext(ctx)

internal/sources/oracle/oracle_test.go

@@ -33,7 +33,7 @@ func TestParseFromYamlOracle(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-oracle-cs": oracle.Config{
 					Name:             "my-oracle-cs",
-					Type:             oracle.SourceType,
+					Kind:             oracle.SourceKind,
 					ConnectionString: "my-host:1521/XEPDB1",
 					User:             "my_user",
 					Password:         "my_pass",
@@ -56,7 +56,7 @@ func TestParseFromYamlOracle(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-oracle-host": oracle.Config{
 					Name:        "my-oracle-host",
-					Type:        oracle.SourceType,
+					Kind:        oracle.SourceKind,
 					Host:        "my-host",
 					Port:        1521,
 					ServiceName: "ORCLPDB",
@@ -81,7 +81,7 @@ func TestParseFromYamlOracle(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-oracle-tns-oci": oracle.Config{
 					Name:     "my-oracle-tns-oci",
-					Type:     oracle.SourceType,
+					Kind:     oracle.SourceKind,
 					TnsAlias: "FINANCE_DB",
 					TnsAdmin: "/opt/oracle/network/admin",
 					User:     "my_user",

internal/sources/postgres/postgres.go

@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "postgres"
+const SourceKind string = "postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -49,7 +49,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name        string            `yaml:"name" validate:"required"`
-	Type        string            `yaml:"kind" validate:"required"`
+	Kind        string            `yaml:"kind" validate:"required"`
 	Host        string            `yaml:"host" validate:"required"`
 	Port        string            `yaml:"port" validate:"required"`
 	User        string            `yaml:"user" validate:"required"`
@@ -58,8 +58,8 @@ type Config struct {
 	QueryParams map[string]string `yaml:"queryParams"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -87,8 +87,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -128,7 +128,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initPostgresConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string, queryParams map[string]string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 	userAgent, err := util.UserAgentFromContext(ctx)
 	if err != nil {

internal/sources/postgres/postgres_test.go

@@ -47,7 +47,7 @@ func TestParseFromYamlPostgres(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": postgres.Config{
 					Name:     "my-pg-instance",
-					Type:     postgres.SourceType,
+					Kind:     postgres.SourceKind,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",
@@ -74,7 +74,7 @@ func TestParseFromYamlPostgres(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-pg-instance": postgres.Config{
 					Name:     "my-pg-instance",
-					Type:     postgres.SourceType,
+					Kind:     postgres.SourceKind,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",

internal/sources/redis/redis.go

@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "redis"
+const SourceKind string = "redis"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -45,7 +45,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name           string   `yaml:"name" validate:"required"`
-	Type           string   `yaml:"kind" validate:"required"`
+	Kind           string   `yaml:"kind" validate:"required"`
 	Address        []string `yaml:"address" validate:"required"`
 	Username       string   `yaml:"username"`
 	Password       string   `yaml:"password"`
@@ -54,8 +54,8 @@ type Config struct {
 	ClusterEnabled bool     `yaml:"clusterEnabled"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // RedisClient is an interface for `redis.Client` and `redis.ClusterClient
@@ -141,8 +141,8 @@ type Source struct {
 	Client RedisClient
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/redis/redis_test.go

@@ -43,7 +43,7 @@ func TestParseFromYamlRedis(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-redis-instance": redis.Config{
 					Name:           "my-redis-instance",
-					Type:           redis.SourceType,
+					Kind:           redis.SourceKind,
 					Address:        []string{"127.0.0.1"},
 					ClusterEnabled: false,
 					UseGCPIAM:      false,
@@ -66,7 +66,7 @@ func TestParseFromYamlRedis(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-redis-instance": redis.Config{
 					Name:           "my-redis-instance",
-					Type:           redis.SourceType,
+					Kind:           redis.SourceKind,
 					Address:        []string{"127.0.0.1"},
 					Password:       "my-pass",
 					Database:       1,

internal/sources/serverlessspark/serverlessspark.go

@@ -33,14 +33,14 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
-const SourceType string = "serverless-spark"
+const SourceKind string = "serverless-spark"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -54,13 +54,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Location string `yaml:"location" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -94,8 +94,8 @@ type Source struct {
 	OpsClient *longrunning.OperationsClient
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/serverlessspark/serverlessspark_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlServerlessSpark(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-instance": serverlessspark.Config{
 					Name:     "my-instance",
-					Type:     serverlessspark.SourceType,
+					Kind:     serverlessspark.SourceKind,
 					Project:  "my-project",
 					Location: "my-location",
 				},

internal/sources/singlestore/singlestore.go

@@ -29,15 +29,15 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-// SourceType for SingleStore source
-const SourceType string = "singlestore"
+// SourceKind for SingleStore source
+const SourceKind string = "singlestore"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -52,7 +52,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 // Config holds the configuration parameters for connecting to a SingleStore database.
 type Config struct {
 	Name         string `yaml:"name" validate:"required"`
-	Type         string `yaml:"kind" validate:"required"`
+	Kind         string `yaml:"kind" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -61,9 +61,9 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-// SourceConfigType returns the kind of the source configuration.
-func (r Config) SourceConfigType() string {
-	return SourceType
+// SourceConfigKind returns the kind of the source configuration.
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 // Initialize sets up the SingleStore connection pool and returns a Source.
@@ -93,9 +93,9 @@ type Source struct {
 	Pool *sql.DB
 }
 
-// SourceType returns the kind of the source configuration.
-func (s *Source) SourceType() string {
-	return SourceType
+// SourceKind returns the kind of the source configuration.
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -162,7 +162,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSingleStoreConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database

internal/sources/singlestore/singlestore_test.go

@@ -45,7 +45,7 @@ func TestParseFromYaml(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-s2-instance": singlestore.Config{
 					Name:     "my-s2-instance",
-					Type:     singlestore.SourceType,
+					Kind:     singlestore.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -70,7 +70,7 @@ func TestParseFromYaml(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-s2-instance": singlestore.Config{
 					Name:         "my-s2-instance",
-					Type:         singlestore.SourceType,
+					Kind:         singlestore.SourceKind,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",

internal/sources/snowflake/snowflake.go

@@ -25,14 +25,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "snowflake"
+const SourceKind string = "snowflake"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -46,7 +46,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name      string `yaml:"name" validate:"required"`
-	Type      string `yaml:"kind" validate:"required"`
+	Kind      string `yaml:"kind" validate:"required"`
 	Account   string `yaml:"account" validate:"required"`
 	User      string `yaml:"user" validate:"required"`
 	Password  string `yaml:"password" validate:"required"`
@@ -56,8 +56,8 @@ type Config struct {
 	Role      string `yaml:"role"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -85,8 +85,8 @@ type Source struct {
 	DB *sqlx.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -137,7 +137,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSnowflakeConnection(ctx context.Context, tracer trace.Tracer, name, account, user, password, database, schema, warehouse, role string) (*sqlx.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Set defaults for optional parameters

internal/sources/snowflake/snowflake_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlSnowflake(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-snowflake-instance": snowflake.Config{
 					Name:      "my-snowflake-instance",
-					Type:      snowflake.SourceType,
+					Kind:      snowflake.SourceKind,
 					Account:   "my-account",
 					User:      "my_user",
 					Password:  "my_pass",

internal/sources/sources.go

@@ -31,46 +31,46 @@ var sourceRegistry = make(map[string]SourceConfigFactory)
 
 // Register registers a new source kind with its factory.
 // It returns false if the kind is already registered.
-func Register(sourceType string, factory SourceConfigFactory) bool {
-	if _, exists := sourceRegistry[sourceType]; exists {
+func Register(kind string, factory SourceConfigFactory) bool {
+	if _, exists := sourceRegistry[kind]; exists {
 		// Source with this kind already exists, do not overwrite.
 		return false
 	}
-	sourceRegistry[sourceType] = factory
+	sourceRegistry[kind] = factory
 	return true
 }
 
 // DecodeConfig decodes a source configuration using the registered factory for the given kind.
-func DecodeConfig(ctx context.Context, sourceType string, name string, decoder *yaml.Decoder) (SourceConfig, error) {
-	factory, found := sourceRegistry[sourceType]
+func DecodeConfig(ctx context.Context, kind string, name string, decoder *yaml.Decoder) (SourceConfig, error) {
+	factory, found := sourceRegistry[kind]
 	if !found {
-		return nil, fmt.Errorf("unknown source kind: %q", sourceType)
+		return nil, fmt.Errorf("unknown source kind: %q", kind)
 	}
 	sourceConfig, err := factory(ctx, name, decoder)
 	if err != nil {
-		return nil, fmt.Errorf("unable to parse source %q as %q: %w", name, sourceType, err)
+		return nil, fmt.Errorf("unable to parse source %q as %q: %w", name, kind, err)
 	}
 	return sourceConfig, err
 }
 
 // SourceConfig is the interface for configuring a source.
 type SourceConfig interface {
-	SourceConfigType() string
+	SourceConfigKind() string
 	Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)
 }
 
 // Source is the interface for the source itself.
 type Source interface {
-	SourceType() string
+	SourceKind() string
 	ToConfig() SourceConfig
 }
 
 // InitConnectionSpan adds a span for database pool connection initialization
-func InitConnectionSpan(ctx context.Context, tracer trace.Tracer, sourceType, sourceName string) (context.Context, trace.Span) {
+func InitConnectionSpan(ctx context.Context, tracer trace.Tracer, sourceKind, sourceName string) (context.Context, trace.Span) {
 	ctx, span := tracer.Start(
 		ctx,
 		"toolbox/server/source/connect",
-		trace.WithAttributes(attribute.String("source_type", sourceType)),
+		trace.WithAttributes(attribute.String("source_kind", sourceKind)),
 		trace.WithAttributes(attribute.String("source_name", sourceName)),
 	)
 	return ctx, span

internal/sources/spanner/spanner.go

@@ -28,14 +28,14 @@ import (
 	"google.golang.org/api/iterator"
 )
 
-const SourceType string = "spanner"
+const SourceKind string = "spanner"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -49,15 +49,15 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string          `yaml:"name" validate:"required"`
-	Type     string          `yaml:"kind" validate:"required"`
+	Kind     string          `yaml:"kind" validate:"required"`
 	Project  string          `yaml:"project" validate:"required"`
 	Instance string          `yaml:"instance" validate:"required"`
 	Dialect  sources.Dialect `yaml:"dialect" validate:"required"`
 	Database string          `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -80,8 +80,8 @@ type Source struct {
 	Client *spanner.Client
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -171,7 +171,7 @@ func (s *Source) RunSQL(ctx context.Context, readOnly bool, statement string, pa
 
 func initSpannerClient(ctx context.Context, tracer trace.Tracer, name, project, instance, dbname string) (*spanner.Client, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the connection to the database

internal/sources/spanner/spanner_test.go

@@ -44,7 +44,7 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Type:     spanner.SourceType,
+					Kind:     spanner.SourceKind,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "googlesql",
@@ -66,7 +66,7 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Type:     spanner.SourceType,
+					Kind:     spanner.SourceKind,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "googlesql",
@@ -88,7 +88,7 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Type:     spanner.SourceType,
+					Kind:     spanner.SourceKind,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "postgresql",

internal/sources/sqlite/sqlite.go

@@ -27,14 +27,14 @@ import (
 	_ "modernc.org/sqlite" // Pure Go SQLite driver
 )
 
-const SourceType string = "sqlite"
+const SourceKind string = "sqlite"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -48,12 +48,12 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Database string `yaml:"database" validate:"required"` // Path to SQLite database file
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -81,8 +81,8 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -155,7 +155,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSQLiteConnection(ctx context.Context, tracer trace.Tracer, name, dbPath string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Open database connection

internal/sources/sqlite/sqlite_test.go

@@ -42,7 +42,7 @@ func TestParseFromYamlSQLite(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-sqlite-db": sqlite.Config{
 					Name:     "my-sqlite-db",
-					Type:     sqlite.SourceType,
+					Kind:     sqlite.SourceKind,
 					Database: "/path/to/database.db",
 				},
 			},

internal/sources/tidb/tidb.go

@@ -27,15 +27,15 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "tidb"
+const SourceKind string = "tidb"
 const TiDBCloudHostPattern string = `gateway\d{2}\.(.+)\.(prod|dev|staging)\.(.+)\.tidbcloud\.com`
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -55,7 +55,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Type     string `yaml:"kind" validate:"required"`
+	Kind     string `yaml:"kind" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -64,8 +64,8 @@ type Config struct {
 	UseSSL   bool   `yaml:"ssl"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -93,8 +93,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -189,7 +189,7 @@ func IsTiDBCloudHost(host string) bool {
 
 func initTiDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string, useSSL bool) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database

internal/sources/tidb/tidb_test.go

@@ -45,7 +45,7 @@ func TestParseFromYamlTiDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-tidb-instance": tidb.Config{
 					Name:     "my-tidb-instance",
-					Type:     tidb.SourceType,
+					Kind:     tidb.SourceKind,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -71,7 +71,7 @@ func TestParseFromYamlTiDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-tidb-cloud": tidb.Config{
 					Name:     "my-tidb-cloud",
-					Type:     tidb.SourceType,
+					Kind:     tidb.SourceKind,
 					Host:     "gateway01.us-west-2.prod.aws.tidbcloud.com",
 					Port:     "4000",
 					Database: "test_db",
@@ -96,7 +96,7 @@ func TestParseFromYamlTiDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-tidb-cloud": tidb.Config{
 					Name:     "my-tidb-cloud",
-					Type:     tidb.SourceType,
+					Kind:     tidb.SourceKind,
 					Host:     "gateway01.us-west-2.prod.aws.tidbcloud.com",
 					Port:     "4000",
 					Database: "test_db",

internal/sources/trino/trino.go

@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "trino"
+const SourceKind string = "trino"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -51,7 +51,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name                   string `yaml:"name" validate:"required"`
-	Type                   string `yaml:"kind" validate:"required"`
+	Kind                   string `yaml:"kind" validate:"required"`
 	Host                   string `yaml:"host" validate:"required"`
 	Port                   string `yaml:"port" validate:"required"`
 	User                   string `yaml:"user"`
@@ -67,8 +67,8 @@ type Config struct {
 	DisableSslVerification bool   `yaml:"disableSslVerification"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -96,8 +96,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -160,7 +160,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initTrinoConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, password, catalog, schema, queryTimeout, accessToken string, kerberosEnabled, sslEnabled bool, sslCertPath, sslCert string, disableSslVerification bool) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 
 	// Build Trino DSN

internal/sources/trino/trino_test.go

@@ -165,7 +165,7 @@ func TestParseFromYamlTrino(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-trino-instance": Config{
 					Name:    "my-trino-instance",
-					Type:    SourceType,
+					Kind:    SourceKind,
 					Host:    "localhost",
 					Port:    "8080",
 					User:    "testuser",
@@ -194,7 +194,7 @@ func TestParseFromYamlTrino(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-trino-instance": Config{
 					Name:            "my-trino-instance",
-					Type:            SourceType,
+					Kind:            SourceKind,
 					Host:            "localhost",
 					Port:            "8443",
 					User:            "testuser",
@@ -222,7 +222,7 @@ func TestParseFromYamlTrino(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-trino-anonymous": Config{
 					Name:    "my-trino-anonymous",
-					Type:    SourceType,
+					Kind:    SourceKind,
 					Host:    "localhost",
 					Port:    "8080",
 					Catalog: "hive",
@@ -252,7 +252,7 @@ func TestParseFromYamlTrino(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-trino-ssl-cert": Config{
 					Name:                   "my-trino-ssl-cert",
-					Type:                   SourceType,
+					Kind:                   SourceKind,
 					Host:                   "localhost",
 					Port:                   "8443",
 					User:                   "testuser",

internal/sources/valkey/valkey.go

@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "valkey"
+const SourceKind string = "valkey"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -45,7 +45,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Type         string   `yaml:"kind" validate:"required"`
+	Kind         string   `yaml:"kind" validate:"required"`
 	Address      []string `yaml:"address" validate:"required"`
 	Username     string   `yaml:"username"`
 	Password     string   `yaml:"password"`
@@ -54,8 +54,8 @@ type Config struct {
 	DisableCache bool     `yaml:"disableCache"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -114,8 +114,8 @@ type Source struct {
 	Client valkey.Client
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {

internal/sources/valkey/valkey_test.go

@@ -44,7 +44,7 @@ func TestParseFromYamlValkey(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-valkey-instance": valkey.Config{
 					Name:         "my-valkey-instance",
-					Type:         valkey.SourceType,
+					Kind:         valkey.SourceKind,
 					Address:      []string{"127.0.0.1"},
 					Username:     "",
 					Password:     "",
@@ -71,7 +71,7 @@ func TestParseFromYamlValkey(t *testing.T) {
 			want: map[string]sources.SourceConfig{
 				"my-valkey-instance": valkey.Config{
 					Name:         "my-valkey-instance",
-					Type:         valkey.SourceType,
+					Kind:         valkey.SourceKind,
 					Address:      []string{"127.0.0.1"},
 					Username:     "user",
 					Password:     "pass",

internal/sources/yugabytedb/yugabytedb.go

@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceType string = "yugabytedb"
+const SourceKind string = "yugabytedb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceType, newConfig) {
-		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	if !sources.Register(SourceKind, newConfig) {
+		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
 	}
 }
 
@@ -45,7 +45,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 
 type Config struct {
 	Name                            string `yaml:"name" validate:"required"`
-	Type                            string `yaml:"kind" validate:"required"`
+	Kind                            string `yaml:"kind" validate:"required"`
 	Host                            string `yaml:"host" validate:"required"`
 	Port                            string `yaml:"port" validate:"required"`
 	User                            string `yaml:"user" validate:"required"`
@@ -58,8 +58,8 @@ type Config struct {
 	FailedHostReconnectDelaySeconds string `yaml:"failedHostReconnectDelaySecs"`
 }
 
-func (r Config) SourceConfigType() string {
-	return SourceType
+func (r Config) SourceConfigKind() string {
+	return SourceKind
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -87,8 +87,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceType() string {
-	return SourceType
+func (s *Source) SourceKind() string {
+	return SourceKind
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -130,7 +130,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initYugabyteDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, loadBalance, topologyKeys, refreshInterval, explicitFallback, failedHostTTL string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
 	defer span.End()
 	// urlExample := "postgres://username:password@localhost:5433/database_name"
 	i := fmt.Sprintf("postgres://%s:%s@%s:%s/%s", user, pass, host, port, dbname)

internal/sources/yugabytedb/yugabytedb_test.go

@@ -49,7 +49,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:     "my-yb-instance",
-					Type:     "yugabytedb",
+					Kind:     "yugabytedb",
 					Host:     "yb-host",
 					Port:     "yb-port",
 					User:     "yb_user",
@@ -75,7 +75,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:        "my-yb-instance",
-					Type:        "yugabytedb",
+					Kind:        "yugabytedb",
 					Host:        "yb-host",
 					Port:        "yb-port",
 					User:        "yb_user",
@@ -103,7 +103,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:         "my-yb-instance",
-					Type:         "yugabytedb",
+					Kind:         "yugabytedb",
 					Host:         "yb-host",
 					Port:         "yb-port",
 					User:         "yb_user",
@@ -133,7 +133,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                       "my-yb-instance",
-					Type:                       "yugabytedb",
+					Kind:                       "yugabytedb",
 					Host:                       "yb-host",
 					Port:                       "yb-port",
 					User:                       "yb_user",
@@ -164,7 +164,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                            "my-yb-instance",
-					Type:                            "yugabytedb",
+					Kind:                            "yugabytedb",
 					Host:                            "yb-host",
 					Port:                            "yb-port",
 					User:                            "yb_user",
@@ -197,7 +197,7 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 			want: server.SourceConfigs{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                            "my-yb-instance",
-					Type:                            "yugabytedb",
+					Kind:                            "yugabytedb",
 					Host:                            "yb-host",
 					Port:                            "yb-port",
 					User:                            "yb_user",

internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go

@@ -29,7 +29,7 @@ const kind string = "alloydb-create-cluster"
 
 func init() {
 	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool type %q already registered", kind))
+		panic(fmt.Sprintf("tool kind %q already registered", kind))
 	}
 }
 
@@ -50,7 +50,7 @@ type compatibleSource interface {
 // Configuration for the create-cluster tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Type         string   `yaml:"kind" validate:"required"`
+	Kind         string   `yaml:"kind" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +59,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigType returns the kind of the tool.
-func (cfg Config) ToolConfigType() string {
+// ToolConfigKind returns the kind of the tool.
+func (cfg Config) ToolConfigKind() string {
 	return kind
 }
 
@@ -123,7 +123,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 
 // Invoke executes the tool's logic.
 func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
 	if err != nil {
 		return nil, err
 	}
@@ -187,7 +187,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
 	if err != nil {
 		return false, err
 	}

internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster_test.go

@@ -46,7 +46,7 @@ func TestParseFromYaml(t *testing.T) {
 			want: server.ToolConfigs{
 				"create-my-cluster": alloydbcreatecluster.Config{
 					Name:         "create-my-cluster",
-					Type:         "alloydb-create-cluster",
+					Kind:         "alloydb-create-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -68,7 +68,7 @@ func TestParseFromYaml(t *testing.T) {
 			want: server.ToolConfigs{
 				"create-my-cluster-auth": alloydbcreatecluster.Config{
 					Name:         "create-my-cluster-auth",
-					Type:         "alloydb-create-cluster",
+					Kind:         "alloydb-create-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},