Skip to content

Commit

Permalink
Merge branch 'main' into rm-dep-view-example
Browse files Browse the repository at this point in the history
  • Loading branch information
MrAlias committed Nov 13, 2023
2 parents 78ccce0 + 27c5c73 commit a3d3e0f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 20 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Removed

- Remove the deprecated `go.opentelemetry.io/otel/bridge/opencensus.NewTracer`. (#4706)
- Remove the deprecated `go.opentelemetry.io/otel/example/view` module. (#4708)

## [1.20.0/0.43.0] 2023-11-10
Expand Down
11 changes: 0 additions & 11 deletions bridge/opencensus/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,10 @@
package opencensus_test

import (
octrace "go.opencensus.io/trace"

"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/bridge/opencensus"
"go.opentelemetry.io/otel/sdk/metric"
)

func ExampleNewTracer() {
// Create an OpenTelemetry Tracer to use to record spans.
tracer := otel.GetTracerProvider().Tracer("go.opentelemetry.io/otel/bridge/opencensus")
// Overwrite the OpenCensus DefaultTracer so that it uses OpenTelemetry
// rather than OpenCensus.
octrace.DefaultTracer = opencensus.NewTracer(tracer)
}

func ExampleNewMetricProducer() {
// Create the OpenCensus Metric bridge.
bridge := opencensus.NewMetricProducer()
Expand Down
9 changes: 0 additions & 9 deletions bridge/opencensus/trace.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@ import (
"go.opentelemetry.io/otel/trace"
)

// NewTracer returns an implementation of the OpenCensus Tracer interface which
// uses OpenTelemetry APIs. Using this implementation of Tracer "upgrades"
// libraries that use OpenCensus to OpenTelemetry to facilitate a migration.
//
// Deprecated: Use InstallTraceBridge instead.
func NewTracer(tracer trace.Tracer) octrace.Tracer {
return internal.NewTracer(tracer)
}

// InstallTraceBridge installs the OpenCensus trace bridge, which overwrites
// the global OpenCensus tracer implementation. Once the bridge is installed,
// spans recorded using OpenCensus are redirected to the OpenTelemetry SDK.
Expand Down

0 comments on commit a3d3e0f

Please sign in to comment.