move bridge/opencensus/opencensusmetric to bridge/opencensus/internal…

…/ocmetric/
open-telemetry · Sep 19, 2022 · 4d7cd5c · 4d7cd5c
1 parent a12b717
commit 4d7cd5c
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 167 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -28,15 +28,6 @@ updates:
     schedule:
       interval: weekly
       day: sunday
-  - package-ecosystem: gomod
-    directory: /bridge/opencensus/opencensusmetric
-    labels:
-      - dependencies
-      - go
-      - Skip Changelog
-    schedule:
-      interval: weekly
-      day: sunday
   - package-ecosystem: gomod
     directory: /bridge/opencensus/test
     labels:

diff --git a/bridge/opencensus/go.mod b/bridge/opencensus/go.mod
@@ -5,7 +5,7 @@ go 1.17
 require (
 	go.opencensus.io v0.23.0
 	go.opentelemetry.io/otel v1.10.0
-	go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric v0.0.0-00010101000000-000000000000
+	go.opentelemetry.io/otel/metric v0.32.0
 	go.opentelemetry.io/otel/sdk/metric v0.32.0
 	go.opentelemetry.io/otel/trace v1.10.0
 )
@@ -14,7 +14,6 @@ require (
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	go.opentelemetry.io/otel/metric v0.32.0 // indirect
 	go.opentelemetry.io/otel/sdk v0.0.0-00010101000000-000000000000 // indirect
 	golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
 )
@@ -28,5 +27,3 @@ replace go.opentelemetry.io/otel/sdk => ../../sdk
 replace go.opentelemetry.io/otel/metric => ../../metric
 
 replace go.opentelemetry.io/otel/sdk/metric => ../../sdk/metric
-
-replace go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric => ./opencensusmetric
diff --git a/bridge/opencensus/go.sum b/bridge/opencensus/go.sum
@@ -34,15 +34,13 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

diff --git a/...ensus/opencensusmetric/internal/metric.go → ...ge/opencensus/internal/ocmetric/metric.go b/...ensus/opencensusmetric/internal/metric.go → ...ge/opencensus/internal/ocmetric/metric.go
@@ -15,7 +15,7 @@
 //go:build go1.18
 // +build go1.18
 
-package internal // import "go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric/internal"
+package internal // import "go.opentelemetry.io/otel/bridge/opencensus/internal/ocmetric"
 
 import (
 	"errors"

diff --git a/.../opencensusmetric/internal/metric_test.go → ...encensus/internal/ocmetric/metric_test.go b/.../opencensusmetric/internal/metric_test.go → ...encensus/internal/ocmetric/metric_test.go
diff --git a/bridge/opencensus/metric.go b/bridge/opencensus/metric.go
@@ -20,7 +20,7 @@ import (
 	"go.opencensus.io/metric/metricdata"
 	"go.opencensus.io/metric/metricexport"
 
-	"go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric/internal"
+	"go.opentelemetry.io/otel/bridge/opencensus/internal/ocmetric"
 	"go.opentelemetry.io/otel/sdk/metric"
 )
 
@@ -39,7 +39,7 @@ func NewMetricExporter(base metric.Exporter) metricexport.Exporter {
 // ExportMetrics implements the OpenCensus metric Exporter interface by sending
 // to an OpenTelemetry exporter.
 func (e *exporter) ExportMetrics(ctx context.Context, ocmetrics []*metricdata.Metric) error {
-	otelmetrics, err := internal.ConvertMetrics(ocmetrics)
+	otelmetrics, err := ocmetric.ConvertMetrics(ocmetrics)
 	if err != nil {
 		return err
 	}

diff --git a/bridge/opencensus/opencensusmetric/doc.go b/bridge/opencensus/opencensusmetric/doc.go
diff --git a/bridge/opencensus/opencensusmetric/go.mod b/bridge/opencensus/opencensusmetric/go.mod
diff --git a/bridge/opencensus/opencensusmetric/go.sum b/bridge/opencensus/opencensusmetric/go.sum
diff --git a/bridge/opencensus/test/go.mod b/bridge/opencensus/test/go.mod
@@ -14,9 +14,8 @@ require (
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-	go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric v0.0.0-00010101000000-000000000000 // indirect
-	go.opentelemetry.io/otel/metric v0.0.0-00010101000000-000000000000 // indirect
-	go.opentelemetry.io/otel/sdk/metric v0.0.0-00010101000000-000000000000 // indirect
+	go.opentelemetry.io/otel/metric v0.32.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v0.32.0 // indirect
 	golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7 // indirect
 )
 
@@ -31,5 +30,3 @@ replace go.opentelemetry.io/otel/trace => ../../../trace
 replace go.opentelemetry.io/otel/metric => ../../../metric
 
 replace go.opentelemetry.io/otel/sdk/metric => ../../../sdk/metric
-
-replace go.opentelemetry.io/otel/bridge/opencensus/opencensusmetric => ../opencensusmetric