diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cae1c4b904..5a4e8cc3eae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm - Slice-valued attributes can correctly be used as map keys. (#2223) +### Removed + +- Removed the deprecated package `go.opentelemetry.io/otel/bridge/opencensus/utils`. (#2233) + ## [1.0.0-RC3] - 2021-09-02 ### Added diff --git a/bridge/opencensus/utils/utils.go b/bridge/opencensus/utils/utils.go deleted file mode 100644 index 2d6472d6381..00000000000 --- a/bridge/opencensus/utils/utils.go +++ /dev/null @@ -1,44 +0,0 @@ -// 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 utils provides utilities for the OpenCensus bridge. -// -// Deprecated: Use the equivalent functions from the bridge/opencensus package -// instead. -package utils // import "go.opentelemetry.io/otel/bridge/opencensus/utils" - -import ( - octrace "go.opencensus.io/trace" - - "go.opentelemetry.io/otel/bridge/opencensus/internal/oc2otel" - "go.opentelemetry.io/otel/bridge/opencensus/internal/otel2oc" - "go.opentelemetry.io/otel/trace" -) - -// OTelSpanContextToOC converts from an OpenTelemetry SpanContext to an -// OpenCensus SpanContext, and handles any incompatibilities with the global -// error handler. -// -// Deprecated: Use OTelSpanContextToOC from bridge/opencensus instead. -func OTelSpanContextToOC(sc trace.SpanContext) octrace.SpanContext { - return otel2oc.SpanContext(sc) -} - -// OCSpanContextToOTel converts from an OpenCensus SpanContext to an -// OpenTelemetry SpanContext. -// -// Deprecated: Use OCSpanContextToOTel from bridge/opencensus instead. -func OCSpanContextToOTel(sc octrace.SpanContext) trace.SpanContext { - return oc2otel.SpanContext(sc) -}