Skip to content

fix prometheus imports #1367

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.

Sign up for GitHub

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

Closed
wants to merge 3 commits into from
Closed

fix prometheus imports #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5324e4
fix prometheus imports
lizthegrey Jul 15, 2020
477e1e3
ignore protobuf deprecation for lint
lizthegrey Jul 15, 2020
b27b05d
s/scrape.Appendable/storage.Appendable/
lizthegrey Jul 15, 2020
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
2 changes: 1 addition & 1 deletion consumer/pdata/metric_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"

gogoproto "github.com/gogo/protobuf/proto"
goproto "github.com/golang/protobuf/proto"
goproto "github.com/golang/protobuf/proto" //nolint:staticcheck
otlpmetrics_goproto "github.com/open-telemetry/opentelemetry-proto/gen/go/metrics/v1"
"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion consumer/pdata/trace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"testing"

gogoproto "github.com/gogo/protobuf/proto"
goproto "github.com/golang/protobuf/proto"
goproto "github.com/golang/protobuf/proto" //nolint:staticcheck
otlptrace_goproto "github.com/open-telemetry/opentelemetry-proto/gen/go/trace/v1"
"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion consumer/pdatautil/pdatautil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck

"go.opentelemetry.io/collector/consumer/consumerdata"
"go.opentelemetry.io/collector/consumer/pdata"
Expand Down
2 changes: 1 addition & 1 deletion exporter/fileexporter/file_exporter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck

"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer/consumerdata"
Expand Down
12 changes: 8 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,24 @@ require (
contrib.go.opencensus.io/exporter/jaeger v0.1.1-0.20190430175949-e8b55949d948
contrib.go.opencensus.io/exporter/ocagent v0.6.0
contrib.go.opencensus.io/exporter/prometheus v0.2.0
github.com/OneOfOne/xxhash v1.2.5 // indirect
github.com/apache/thrift v0.13.0
github.com/cenkalti/backoff v2.2.1+incompatible
github.com/census-instrumentation/opencensus-proto v0.2.1
github.com/client9/misspell v0.3.4
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/go-kit/kit v0.10.0
github.com/gogo/googleapis v1.3.0 // indirect
github.com/gogo/protobuf v1.3.1
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
github.com/golang/protobuf v1.3.5
github.com/golang/protobuf v1.4.1
github.com/golangci/golangci-lint v1.28.1
github.com/google/addlicense v0.0.0-20200622132530-df58acafd6d5
github.com/google/go-github v17.0.0+incompatible
github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.4
github.com/grpc-ecosystem/grpc-gateway v1.14.6
github.com/hashicorp/go-msgpack v0.5.5 // indirect
github.com/jaegertracing/jaeger v1.18.2-0.20200707061226-97d2319ff2be
github.com/joshdk/go-junit v0.0.0-20200702055522-6efcf4050909
github.com/jstemmer/go-junit-report v0.9.1
Expand All @@ -32,14 +35,15 @@ require (
github.com/ory/x v0.0.109 // indirect
github.com/pavius/impi v0.0.3
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.5.1
github.com/prometheus/client_golang v1.6.0
github.com/prometheus/common v0.10.0
github.com/prometheus/procfs v0.1.3
github.com/prometheus/prometheus v1.8.2-0.20190924101040-52e0504f83ea
github.com/prometheus/prometheus v1.8.2-0.20200626085723-c448ada63d83
github.com/rs/cors v1.7.0
github.com/securego/gosec v0.0.0-20200316084457-7da9f46445fd
github.com/shirou/gopsutil v0.0.0-20200517204708-c89193f22d93 // c89193f22d9359848988f32aee972122bb2abdc2
github.com/soheilhy/cmux v0.1.4
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/spf13/cast v1.3.1
github.com/spf13/cobra v1.0.0
github.com/spf13/viper v1.7.0
Expand All @@ -53,7 +57,7 @@ require (
golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980
golang.org/x/text v0.3.3
golang.org/x/tools v0.0.0-20200707222132-065b96d36cf8 // indirect
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884
google.golang.org/genproto v0.0.0-20200603110839-e855014d5736
google.golang.org/grpc v1.29.1
gopkg.in/yaml.v2 v2.3.0
honnef.co/go/tools v0.0.1-2020.1.4
Expand Down
380 changes: 278 additions & 102 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion internal/data/metric.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package data

import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck

"go.opentelemetry.io/collector/consumer/pdata"
otlpmetrics "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/metrics/v1"
Expand Down
2 changes: 1 addition & 1 deletion internal/goldendataset/resource_generator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package goldendataset
import (
"testing"

"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/assert"

otlpresource "go.opentelemetry.io/collector/internal/data/opentelemetry-proto-gen/resource/v1"
Expand Down
2 changes: 1 addition & 1 deletion processor/cloningfanoutconnector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck

"go.opentelemetry.io/collector/component/componenterror"
"go.opentelemetry.io/collector/consumer"
Expand Down
2 changes: 1 addition & 1 deletion receiver/opencensusreceiver/ocmetrics/opencensus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
agentmetricspb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/metrics/v1"
metricspb "github.com/census-instrumentation/opencensus-proto/gen-go/metrics/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/require"
"google.golang.org/grpc"

Expand Down
2 changes: 1 addition & 1 deletion receiver/opencensusreceiver/octrace/opencensus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1"
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/require"
"go.opencensus.io/trace"
"go.opencensus.io/trace/tracestate"
Expand Down
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/otlp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
Expand Down
6 changes: 3 additions & 3 deletions receiver/prometheusreceiver/internal/ocastore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ const (
var idSeq int64
var noop = &noopAppender{}

// OcaStore is an interface combines io.Closer and prometheus' scrape.Appendable
// OcaStore is an interface combines io.Closer and prometheus' storage.Appendable
type OcaStore interface {
scrape.Appendable
storage.Appendable
io.Closer
SetScrapeManager(*scrape.Manager)
}
Expand All @@ -59,7 +59,7 @@ type ocaStore struct {
receiverName string
}

// NewOcaStore returns an ocaStore instance, which can be acted as prometheus' scrape.Appendable
// NewOcaStore returns an ocaStore instance, which can be acted as prometheus' storage.Appendable
func NewOcaStore(ctx context.Context, sink consumer.MetricsConsumerOld, logger *zap.Logger, jobsMap *JobsMap, useStartTimeMetric bool, receiverName string) OcaStore {
return &ocaStore{
running: runningStateInit,
Expand Down
2 changes: 1 addition & 1 deletion receiver/prometheusreceiver/internal/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"testing"
"time"

"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/pkg/labels"
"github.com/prometheus/prometheus/scrape"
Expand Down
2 changes: 1 addition & 1 deletion receiver/zipkinreceiver/proto_parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
zipkin_proto3 "github.com/openzipkin/zipkin-go/proto/v2"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion service/builder/pipelines_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
commonpb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
resourcepb "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
tracepb "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion translator/internaldata/oc_to_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
occommon "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1"
ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/assert"

"go.opentelemetry.io/collector/consumer/pdata"
Expand Down
2 changes: 1 addition & 1 deletion translator/internaldata/oc_to_traces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
occommon "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
octrace "github.com/census-instrumentation/opencensus-proto/gen-go/trace/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/golang/protobuf/ptypes"
"github.com/stretchr/testify/assert"

Expand Down
2 changes: 1 addition & 1 deletion translator/internaldata/resource_to_oc_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
occommon "github.com/census-instrumentation/opencensus-proto/gen-go/agent/common/v1"
agenttracepb "github.com/census-instrumentation/opencensus-proto/gen-go/agent/trace/v1"
ocresource "github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/proto" //nolint:staticcheck
"github.com/stretchr/testify/assert"

"go.opentelemetry.io/collector/consumer/pdata"
Expand Down