Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move api/unit to top level #1185

Merged
merged 3 commits into from
Sep 20, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Don't consider unset environment variable for resource detection to be an error. (#1170)
- Rename `go.opentelemetry.io/otel/api/metric.ConfigureInstrument` to `NewInstrumentConfig` and
`go.opentelemetry.io/otel/api/metric.ConfigureMeter` to `NewMeterConfig`.
- Move the `go.opentelemetry.io/otel/api/unit` package to `go.opentelemetry.io/otel/unit`. (#1185)

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion api/metric/api_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/api/metric/metrictest"
mockTest "go.opentelemetry.io/otel/api/metric/metrictest"
"go.opentelemetry.io/otel/api/unit"
"go.opentelemetry.io/otel/label"
"go.opentelemetry.io/otel/unit"

"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion api/metric/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package metric

import "go.opentelemetry.io/otel/api/unit"
import "go.opentelemetry.io/otel/unit"

// InstrumentConfig contains options for instrument descriptors.
type InstrumentConfig struct {
Expand Down
2 changes: 1 addition & 1 deletion api/metric/descriptor.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package metric

import "go.opentelemetry.io/otel/api/unit"
import "go.opentelemetry.io/otel/unit"

// Descriptor contains all the settings that describe an instrument,
// including its name, metric kind, number kind, and the configurable
Expand Down
2 changes: 1 addition & 1 deletion exporters/otlp/internal/transform/metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ import (
metricpb "go.opentelemetry.io/otel/exporters/otlp/internal/opentelemetry-proto-gen/metrics/v1"

"go.opentelemetry.io/otel/api/metric"
"go.opentelemetry.io/otel/api/unit"
"go.opentelemetry.io/otel/label"
export "go.opentelemetry.io/otel/sdk/export/metric"
"go.opentelemetry.io/otel/sdk/export/metric/aggregation"
"go.opentelemetry.io/otel/sdk/export/metric/metrictest"
"go.opentelemetry.io/otel/sdk/metric/aggregator/minmaxsumcount"
sumAgg "go.opentelemetry.io/otel/sdk/metric/aggregator/sum"
"go.opentelemetry.io/otel/unit"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion api/unit/doc.go → unit/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
// limitations under the License.

// Package unit provides units.
package unit // import "go.opentelemetry.io/otel/api/unit"
package unit // import "go.opentelemetry.io/otel/unit"
File renamed without changes.