dea68b8b37
This commit reverts most of #1853 and replaces it with functionally identical logic, using the notion of status message-specific sinks. In other words, where the original commit implemented ephemeral status messages by adding an `isStatus` parameter to most of the logging methdos in pulumi/pulumi, this implements ephemeral status messages as a parallel logging sink, which emits _only_ ephemeral status messages. The original commit message in that PR was: > Allow log events to be marked "status" events > > This commit will introduce a field, IsStatus to LogRequest. A "status" > logging event will be displayed in the Info column of the main > display, but will not be printed out at the end, when resource > operations complete. > > For example, for complex resource initialization, we'd like to display > a series of intermediate results: [1/4] Service object created, for > example. We'd like these to appear in the Info column, but not at the > end, where they are not helpful to the user.
75 lines
2.4 KiB
Go
75 lines
2.4 KiB
Go
// Copyright 2016-2018, Pulumi Corporation.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package plugin
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/opentracing/opentracing-go"
|
|
|
|
"github.com/pulumi/pulumi/pkg/diag"
|
|
"github.com/pulumi/pulumi/pkg/util/rpcutil"
|
|
)
|
|
|
|
// Context is used to group related operations together so that associated OS resources can be cached, shared, and
|
|
// reclaimed as appropriate.
|
|
type Context struct {
|
|
Diag diag.Sink // the diagnostics sink to use for messages.
|
|
StatusDiag diag.Sink // the diagnostics sink to use for status messages.
|
|
Host Host // the host that can be used to fetch providers.
|
|
Pwd string // the working directory to spawn all plugins in.
|
|
|
|
tracingSpan opentracing.Span // the OpenTracing span to parent requests within.
|
|
}
|
|
|
|
// NewContext allocates a new context with a given sink and host. Note that the host is "owned" by this context from
|
|
// here forwards, such that when the context's resources are reclaimed, so too are the host's.
|
|
func NewContext(d, statusD diag.Sink, host Host, cfg ConfigSource, events Events,
|
|
pwd string, runtimeOptions map[string]interface{}, parentSpan opentracing.Span) (*Context, error) {
|
|
ctx := &Context{
|
|
Diag: d,
|
|
StatusDiag: statusD,
|
|
Host: host,
|
|
Pwd: pwd,
|
|
tracingSpan: parentSpan,
|
|
}
|
|
if host == nil {
|
|
h, err := NewDefaultHost(ctx, cfg, events, runtimeOptions)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ctx.Host = h
|
|
}
|
|
return ctx, nil
|
|
}
|
|
|
|
// Request allocates a request sub-context.
|
|
func (ctx *Context) Request() context.Context {
|
|
// TODO[pulumi/pulumi#143]: support cancellation.
|
|
return opentracing.ContextWithSpan(context.Background(), ctx.tracingSpan)
|
|
}
|
|
|
|
// Close reclaims all resources associated with this context.
|
|
func (ctx *Context) Close() error {
|
|
if ctx.tracingSpan != nil {
|
|
ctx.tracingSpan.Finish()
|
|
}
|
|
err := ctx.Host.Close()
|
|
if err != nil && !rpcutil.IsBenignCloseErr(err) {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|