Jan 2, 2024 · Dec 21, 2023
diff --git a/coderd/agentapi/api.go b/coderd/agentapi/api.go
 "github.com/coder/coder/v2/coderd/tracing"
 "github.com/coder/coder/v2/codersdk/agentsdk"
 "github.com/coder/coder/v2/tailnet"
 tailnetproto "github.com/coder/coder/v2/tailnet/proto"
 )

 const AgentAPIVersionDRPC = "2.0"
 *AppsAPI
 *MetadataAPI
 *LogsAPI
 *tailnet.DRPCService

 mu                sync.Mutex
 cachedWorkspaceID uuid.UUID
 PublishWorkspaceAgentLogsUpdateFn: opts.PublishWorkspaceAgentLogsUpdateFn,
 }

 api.DRPCService = &tailnet.DRPCService{
 CoordPtr:               opts.TailnetCoordinator,
 Logger:                 opts.Log,
 DerpMapUpdateFrequency: opts.DerpMapUpdateFrequency,
 DerpMapFn:              opts.DerpMapFn,
 }

 return api
 }

 return nil, xerrors.Errorf("register agent API protocol in DRPC mux: %w", err)
 }

 err = tailnetproto.DRPCRegisterTailnet(mux, a)
 if err != nil {
 return nil, xerrors.Errorf("register tailnet API protocol in DRPC mux: %w", err)
 }

 return drpcserver.NewWithOptions(&tracing.DRPCHandler{Handler: mux},
 drpcserver.Options{
 Log: func(err error) {
diff --git a/coderd/workspaceagentsrpc.go b/coderd/workspaceagentsrpc.go
 import (
 "context"
 "database/sql"
 "fmt"
 "net/http"
 "runtime/pprof"
 "sync/atomic"
 "github.com/coder/coder/v2/coderd/httpmw"
 "github.com/coder/coder/v2/coderd/util/ptr"
 "github.com/coder/coder/v2/codersdk"
 "github.com/coder/coder/v2/tailnet"
 )

 // @Summary Workspace agent RPC API
 UpdateAgentMetricsFn: api.UpdateAgentMetrics,
 })

 streamID := tailnet.StreamID{
 Name: fmt.Sprintf("%s-%s-%s", owner.Username, workspace.Name, workspaceAgent.Name),
 ID:   workspaceAgent.ID,
 Auth: tailnet.AgentTunnelAuth{},
 }
 ctx = tailnet.WithStreamID(ctx, streamID)

 closeCtx, closeCtxCancel := context.WithCancel(ctx)
 go func() {
 defer closeCtxCancel()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,7 @@ import (
		"github.com/coder/coder/v2/coderd/tracing"
		"github.com/coder/coder/v2/codersdk/agentsdk"
		"github.com/coder/coder/v2/tailnet"
		tailnetproto "github.com/coder/coder/v2/tailnet/proto"
		)

		const AgentAPIVersionDRPC = "2.0"
Expand All		@@ -42,6 +43,7 @@ type API struct {
		*AppsAPI
		*MetadataAPI
		*LogsAPI
		*tailnet.DRPCService

		mu sync.Mutex
		cachedWorkspaceID uuid.UUID
Expand DownExpand Up		@@ -145,6 +147,13 @@ func New(opts Options) *API {
		PublishWorkspaceAgentLogsUpdateFn: opts.PublishWorkspaceAgentLogsUpdateFn,
		}

		api.DRPCService = &tailnet.DRPCService{
		CoordPtr: opts.TailnetCoordinator,
		Logger: opts.Log,
		DerpMapUpdateFrequency: opts.DerpMapUpdateFrequency,
		DerpMapFn: opts.DerpMapFn,
		}

		return api
		}

Expand All		@@ -155,6 +164,11 @@ func (a API) Server(ctx context.Context) (drpcserver.Server, error) {
		return nil, xerrors.Errorf("register agent API protocol in DRPC mux: %w", err)
		}

		err = tailnetproto.DRPCRegisterTailnet(mux, a)
		if err != nil {
		return nil, xerrors.Errorf("register tailnet API protocol in DRPC mux: %w", err)
		}

		return drpcserver.NewWithOptions(&tracing.DRPCHandler{Handler: mux},
		drpcserver.Options{
		Log: func(err error) {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,6 +3,7 @@ package coderd
		import (
		"context"
		"database/sql"
		"fmt"
		"net/http"
		"runtime/pprof"
		"sync/atomic"
Expand All		@@ -22,6 +23,7 @@ import (
		"github.com/coder/coder/v2/coderd/httpmw"
		"github.com/coder/coder/v2/coderd/util/ptr"
		"github.com/coder/coder/v2/codersdk"
		"github.com/coder/coder/v2/tailnet"
		)

		// @Summary Workspace agent RPC API
Expand DownExpand Up		@@ -128,6 +130,13 @@ func (api API) workspaceAgentRPC(rw http.ResponseWriter, r http.Request) {
		UpdateAgentMetricsFn: api.UpdateAgentMetrics,
		})

		streamID := tailnet.StreamID{
		Name: fmt.Sprintf("%s-%s-%s", owner.Username, workspace.Name, workspaceAgent.Name),
		ID: workspaceAgent.ID,
		Auth: tailnet.AgentTunnelAuth{},
		}
		ctx = tailnet.WithStreamID(ctx, streamID)

		closeCtx, closeCtxCancel := context.WithCancel(ctx)
		go func() {
		defer closeCtxCancel()
Expand Down