Update package.go

Author: bbernays

serve/package.go

@@ -117,7 +117,7 @@ func (s *PluginServe) writeTablesJSON(ctx context.Context, dir string) error {
 	return os.WriteFile(outputPath, buffer.Bytes(), 0644)
 }
 
-func (s *PluginServe) build(pluginDirectory string, target plugin.BuildTarget, distPath, pluginVersion string) (*TargetBuild, error) {
+func (s *PluginServe) build(pluginDirectory string, target plugin.BuildTarget, distPath, pluginVersion, buildTags string) (*TargetBuild, error) {
 	pluginFileName := fmt.Sprintf("plugin-%s-%s-%s-%s", s.plugin.Name(), pluginVersion, target.OS, target.Arch)
 	pluginPath := path.Join(distPath, pluginFileName)
 	importPath, err := s.getModuleName(pluginDirectory)
@@ -134,7 +134,7 @@ func (s *PluginServe) build(pluginDirectory string, target plugin.BuildTarget, d
 	args = append(args, "-ldflags", ldFlags)
 	// This disables gRPC tracing, which introduces a dependency that blocks dead code elimination\
 	// https://github.com/grpc/grpc-go/blob/030938e543b4a721cd426d15611d50ecf097dcf3/trace_notrace.go#L23-L25
-	args = append(args, "-tags", "grpcnotrace")
+	args = append(args, "-tags", buildTags)
 	cmd := exec.Command("go", args...)
 	cmd.Dir = pluginDirectory
 	cmd.Stdout = os.Stdout
@@ -404,6 +404,10 @@ func (s *PluginServe) newCmdPluginPackage() *cobra.Command {
 				message = string(messageBytes)
 			}
 			message = normalizeMessage(message)
+			buildTags := "grpcnotrace"
+			if cmd.Flag("build-tags").Changed {
+				buildTags = cmd.Flag("build-tags").Value.String()
+			}
 
 			if err := os.MkdirAll(distPath, 0755); err != nil {
 				return err
@@ -437,7 +441,7 @@ func (s *PluginServe) newCmdPluginPackage() *cobra.Command {
 			targets := []TargetBuild{}
 			for _, target := range s.plugin.Targets() {
 				fmt.Println("Building for OS: " + target.OS + ", ARCH: " + target.Arch)
-				targetBuild, err := s.build(pluginDirectory, target, distPath, pluginVersion)
+				targetBuild, err := s.build(pluginDirectory, target, distPath, pluginVersion, buildTags)
 				if err != nil {
 					return fmt.Errorf("failed to build plugin for %s/%s: %w", target.OS, target.Arch, err)
 				}
@@ -458,6 +462,7 @@ func (s *PluginServe) newCmdPluginPackage() *cobra.Command {
 	cmd.Flags().StringP("dist-dir", "D", "", "dist directory to output the built plugin. (default: <plugin_directory>/dist)")
 	cmd.Flags().StringP("docs-dir", "", "", "docs directory containing markdown files to copy to the dist directory. (default: <plugin_directory>/docs)")
 	cmd.Flags().StringP("message", "m", "", "message that summarizes what is new or changed in this version. Use @<file> to read from file. Supports markdown.")
+	cmd.Flags().StringP("build-tags", "", "", "build tags to use when building the plugin. (default: grpcnotrace)")
 	return cmd
 }