mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-09-18 17:19:58 +00:00
771c2f8512
I'm working on Stackdriver monitoring in another branch, which required updating `google.golang.org/genproto`, which required updating `google.golang.org/grpc`, which required updating `github.com/golang/protobuf`, and so on. This PR updates all of the Google-provided deps to their latest versions. In addition, there is: - A change in config.go to reflect an updated type name - Five files changed by `make fmt` Tested with `make build`, `make test`, and `make testacc`.
22 lines
602 B
Go
22 lines
602 B
Go
// Copyright 2017 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// +build !go1.7
|
|
|
|
package trace
|
|
|
|
import "golang.org/x/net/context"
|
|
|
|
// NewContext returns a copy of the parent context
|
|
// and associates it with a Trace.
|
|
func NewContext(ctx context.Context, tr Trace) context.Context {
|
|
return context.WithValue(ctx, contextKey, tr)
|
|
}
|
|
|
|
// FromContext returns the Trace bound to the context, if any.
|
|
func FromContext(ctx context.Context) (tr Trace, ok bool) {
|
|
tr, ok = ctx.Value(contextKey).(Trace)
|
|
return
|
|
}
|