Skip to content

Commit

Permalink
Update opencensus imports and go mod (open-telemetry#4870)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexperez52 committed Aug 25, 2021
1 parent 584f0f6 commit 6cac213
Show file tree
Hide file tree
Showing 48 changed files with 148 additions and 30 deletions.
3 changes: 3 additions & 0 deletions exporter/alibabacloudlogserviceexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ require (
github.com/aliyun/aliyun-log-go-sdk v0.1.21
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/gogo/protobuf v1.3.2
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
go.uber.org/zap v1.19.0
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/testutil/metricstestutil"
"go.opentelemetry.io/collector/translator/internaldata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestNewMetricsExporter(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion exporter/awsemfexporter/datapoint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ import (
"github.com/golang/protobuf/ptypes/wrappers"
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

aws "github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics"
)

Expand Down
3 changes: 2 additions & 1 deletion exporter/awsemfexporter/emf_exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ import (
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/consumer/consumererror"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func init() {
Expand Down
5 changes: 5 additions & 0 deletions exporter/awsemfexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ require (
github.com/google/uuid v1.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
Expand All @@ -20,3 +21,7 @@ require (
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics => ./../../internal/aws/metrics

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil => ./../../internal/aws/awsutil

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ./../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ./../../internal/coreinternal
3 changes: 2 additions & 1 deletion exporter/awsemfexporter/grouped_metric_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ import (
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/model/pdata"
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestAddToGroupedMetric(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion exporter/awsemfexporter/metric_translator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ import (
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/model/pdata"
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"go.uber.org/zap/zaptest/observer"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func readFromFile(filename string) string {
Expand Down
3 changes: 2 additions & 1 deletion exporter/awsemfexporter/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ import (
"github.com/stretchr/testify/assert"
"go.opentelemetry.io/collector/model/pdata"
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestReplacePatternValidTaskId(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion exporter/carbonexporter/exporter.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

// newCarbonExporter returns a new Carbon exporter.
Expand Down
3 changes: 2 additions & 1 deletion exporter/carbonexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/testutil"
"go.opentelemetry.io/collector/testutil/metricstestutil"
"go.opentelemetry.io/collector/translator/internaldata"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func TestNew(t *testing.T) {
Expand Down
6 changes: 6 additions & 0 deletions exporter/carbonexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,14 @@ go 1.16
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
google.golang.org/protobuf v1.27.1

)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
5 changes: 5 additions & 0 deletions exporter/googlecloudexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.0.0-RC2
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opencensus.io v0.23.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
Expand All @@ -19,3 +20,7 @@ require (
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
3 changes: 2 additions & 1 deletion exporter/googlecloudexporter/googlecloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ import (
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/model/pdata"
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
"go.opentelemetry.io/collector/translator/internaldata"
sdktrace "go.opentelemetry.io/otel/sdk/trace"
"google.golang.org/api/option"
"google.golang.org/grpc"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

// traceExporter is a wrapper struct of OT cloud trace exporter
Expand Down
3 changes: 2 additions & 1 deletion exporter/googlecloudexporter/googlecloud_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/testutil/metricstestutil"
"go.opentelemetry.io/collector/translator/internaldata"
"google.golang.org/api/option"
cloudmetricpb "google.golang.org/genproto/googleapis/api/metric"
cloudtracepb "google.golang.org/genproto/googleapis/devtools/cloudtrace/v2"
Expand All @@ -40,6 +39,8 @@ import (
"google.golang.org/grpc/metadata"
"google.golang.org/protobuf/types/known/emptypb"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

type testServer struct {
Expand Down
5 changes: 5 additions & 0 deletions exporter/newrelicexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/golang/protobuf v1.5.2
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/newrelic/newrelic-telemetry-sdk-go v0.8.1
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opencensus.io v0.23.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
Expand All @@ -16,3 +17,7 @@ require (
google.golang.org/grpc v1.40.0
google.golang.org/protobuf v1.27.1
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
3 changes: 2 additions & 1 deletion exporter/newrelicexporter/newrelic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ import (
"go.opentelemetry.io/collector/component/componenttest"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"
"google.golang.org/grpc/metadata"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

const (
Expand Down
3 changes: 2 additions & 1 deletion exporter/splunkhecexporter/exporter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ import (
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/testutil/metricstestutil"
conventions "go.opentelemetry.io/collector/translator/conventions/v1.5.0"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk"
)

Expand Down
5 changes: 5 additions & 0 deletions exporter/splunkhecexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.16
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
Expand All @@ -14,3 +15,7 @@ require (
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/splunk => ../../internal/splunk

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
4 changes: 4 additions & 0 deletions exporter/stackdriverexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ require (
)

replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter => ../googlecloudexporter

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
2 changes: 2 additions & 0 deletions exporter/zipkinexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ require (
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/zipkin => ../../pkg/translator/zipkin

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus
4 changes: 4 additions & 0 deletions pkg/translator/zipkin/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,15 @@ require (
github.com/google/go-cmp v0.5.6
github.com/jaegertracing/jaeger v1.25.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.0.0-00010101000000-000000000000
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/openzipkin/zipkin-go v0.2.5
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
google.golang.org/protobuf v1.27.1

)

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../../internal/coreinternal

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../../pkg/translator/opencensus
3 changes: 2 additions & 1 deletion pkg/translator/zipkin/zipkinv1/to_translator.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ package zipkinv1

import (
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

func toTraces(ocTraces []traceData) (pdata.Traces, error) {
Expand Down
6 changes: 6 additions & 0 deletions processor/metricstransformprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,15 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/google/go-cmp v0.5.6
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
go.uber.org/zap v1.19.0
google.golang.org/protobuf v1.27.1

)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ import (
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/types/known/timestamppb"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

type metricsTransformProcessor struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ import (
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/processor/processorhelper"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"
"google.golang.org/protobuf/testing/protocmp"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"
)

type metricsGroupingTest struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ import (
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/processor/processorhelper"
"go.opentelemetry.io/collector/translator/internaldata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"go.uber.org/zap"
"google.golang.org/protobuf/testing/protocmp"
)
Expand Down
6 changes: 6 additions & 0 deletions processor/resourcedetectionprocessor/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,14 @@ require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/docker/docker v20.10.8+incompatible
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6
go.uber.org/zap v1.19.0

)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ import (
"go.opentelemetry.io/collector/config"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/model/pdata"
"go.opentelemetry.io/collector/translator/internaldata"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor/internal/env"
Expand Down
7 changes: 6 additions & 1 deletion receiver/carbonreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,15 @@ go 1.16
require (
github.com/census-instrumentation/opencensus-proto v0.3.0
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.0.0-00010101000000-000000000000
github.com/stretchr/testify v1.7.0
go.opencensus.io v0.23.0
go.opentelemetry.io/collector v0.33.1-0.20210820002854-d3000232f8f6
go.opentelemetry.io/collector/model v0.33.1-0.20210820002854-d3000232f8f6 // indirect
go.uber.org/zap v1.19.0
google.golang.org/protobuf v1.27.1

)

replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus => ../../pkg/translator/opencensus

replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal => ../../internal/coreinternal
3 changes: 2 additions & 1 deletion receiver/carbonreceiver/receiver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/consumer/consumertest"
"go.opentelemetry.io/collector/testutil"
"go.opentelemetry.io/collector/translator/internaldata"
"go.uber.org/zap"

internaldata "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/protocol"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver/transport/client"
Expand Down
Loading

0 comments on commit 6cac213

Please sign in to comment.