-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add options to opencensus bridge, and install tracer instead of retur…
…ning (#4567) * Add options to opencensus bridge, and install tracer instead of returning * add unit test * update unit tests * fix example * import ordering --------- Co-authored-by: Tyler Yahn <[email protected]>
- Loading branch information
Showing
7 changed files
with
149 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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 opencensus // import "go.opentelemetry.io/otel/bridge/opencensus" | ||
|
|
||
| import ( | ||
| "go.opentelemetry.io/otel" | ||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| const scopeName = "go.opentelemetry.io/otel/bridge/opencensus" | ||
|
|
||
| // newTraceConfig returns a config configured with options. | ||
| func newTraceConfig(options []TraceOption) traceConfig { | ||
| conf := traceConfig{tp: otel.GetTracerProvider()} | ||
| for _, o := range options { | ||
| conf = o.apply(conf) | ||
| } | ||
| return conf | ||
| } | ||
|
|
||
| type traceConfig struct { | ||
| tp trace.TracerProvider | ||
| } | ||
|
|
||
| // TraceOption applies a configuration option value to an OpenCensus bridge | ||
| // Tracer. | ||
| type TraceOption interface { | ||
| apply(traceConfig) traceConfig | ||
| } | ||
|
|
||
| // traceOptionFunc applies a set of options to a config. | ||
| type traceOptionFunc func(traceConfig) traceConfig | ||
|
|
||
| // apply returns a config with option(s) applied. | ||
| func (o traceOptionFunc) apply(conf traceConfig) traceConfig { | ||
| return o(conf) | ||
| } | ||
|
|
||
| // WithTracerProvider specifies a tracer provider to use for creating a tracer. | ||
| func WithTracerProvider(tp trace.TracerProvider) TraceOption { | ||
| return traceOptionFunc(func(conf traceConfig) traceConfig { | ||
| conf.tp = tp | ||
| return conf | ||
| }) | ||
| } | ||
|
|
||
| type metricConfig struct{} | ||
|
|
||
| // MetricOption applies a configuration option value to an OpenCensus bridge | ||
| // MetricProducer. | ||
| type MetricOption interface { | ||
| apply(metricConfig) metricConfig | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright The OpenTelemetry Authors | ||
| // | ||
| // 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 opencensus // import "go.opentelemetry.io/otel/bridge/opencensus" | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
|
|
||
| "go.opentelemetry.io/otel" | ||
| "go.opentelemetry.io/otel/trace" | ||
| ) | ||
|
|
||
| func TestNewTraceConfig(t *testing.T) { | ||
| globalTP := trace.NewNoopTracerProvider() | ||
| customTP := trace.NewNoopTracerProvider() | ||
| otel.SetTracerProvider(globalTP) | ||
| for _, tc := range []struct { | ||
| desc string | ||
| opts []TraceOption | ||
| expected traceConfig | ||
| }{ | ||
| { | ||
| desc: "default", | ||
| expected: traceConfig{ | ||
| tp: globalTP, | ||
| }, | ||
| }, | ||
| { | ||
| desc: "overridden", | ||
| opts: []TraceOption{ | ||
| WithTracerProvider(customTP), | ||
| }, | ||
| expected: traceConfig{ | ||
| tp: customTP, | ||
| }, | ||
| }, | ||
| } { | ||
| t.Run(tc.desc, func(t *testing.T) { | ||
| cfg := newTraceConfig(tc.opts) | ||
| assert.Equal(t, tc.expected, cfg) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters