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

Reverting OTEL version back for patch #28

Merged
merged 1 commit into from
May 24, 2022
Merged
Show file tree
Hide file tree
Changes from all 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
21 changes: 21 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# CODEOWNERS
#
# documentation for this file can be found at:
# https://help.github.com/en/articles/about-code-owners

# These are the default owners for the code and will
# be requested for review when someone opens a pull request.
# order is alphabetical for easier maintenance.
#
# Michael Edegware (medegw01)
# Sean Gallacher (gallacher)
# Trevor Dawe (tdawe)
# Alexander Hoppe (hoppea2)
# Alik Saring (alikdell)
# Aaron Tye (atye)
# Florian Coulombel (coulof)
# Shayna Finocchiaro (shaynafinocchiaro)
# Sharmila Ramamoorthy (sharmilarama)

# for all files:
* @medegw01 @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @sharmilarama
7 changes: 2 additions & 5 deletions cmd/metrics-powerstore/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ import (

_ "net/http/pprof"

"github.com/dell/csi-powerstore/pkg/array"
"github.com/dell/csi-powerstore/pkg/common/fs"
"github.com/dell/csm-metrics-powerstore/internal/common"
"github.com/dell/csm-metrics-powerstore/internal/entrypoint"
"github.com/dell/csm-metrics-powerstore/internal/k8s"
"github.com/dell/csm-metrics-powerstore/internal/service"
otlexporters "github.com/dell/csm-metrics-powerstore/opentelemetry/exporters"
tracer "github.com/dell/csm-metrics-powerstore/opentelemetry/tracers"
"github.com/dell/gofsutil"
"github.com/sirupsen/logrus"

"os"
Expand Down Expand Up @@ -197,8 +195,7 @@ func updateTracing(logger *logrus.Logger) {
}

func updatePowerStoreConnection(powerStoreSvc *service.PowerStoreService, logger *logrus.Logger) {
f := &fs.Fs{Util: &gofsutil.FS{}}
arrays, _, _, err := array.GetPowerStoreArrays(f, defaultStorageSystemConfigFile)
arrays, _, _, err := common.GetPowerStoreArrays(defaultStorageSystemConfigFile, logger)
if err != nil {
logger.WithError(err).Fatal("initialize arrays in controller service")
}
Expand Down
81 changes: 67 additions & 14 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,23 +1,76 @@
module github.com/dell/csm-metrics-powerstore

go 1.14
go 1.17

require (
github.com/dell/csi-powerstore v0.0.0-20210923102620-2b6d0e23ab2e
github.com/dell/gofsutil v1.6.0
github.com/dell/gopowerstore v1.5.0
github.com/fsnotify/fsnotify v1.4.9
github.com/golang/mock v1.4.3
github.com/jarcoal/httpmock v1.0.6 // indirect
github.com/sirupsen/logrus v1.6.0
github.com/spf13/viper v1.7.1
github.com/dell/gocsi v1.5.0
github.com/dell/gopowerstore v1.6.0
github.com/fsnotify/fsnotify v1.5.1
github.com/golang/mock v1.6.0
github.com/sirupsen/logrus v1.8.1
github.com/spf13/viper v1.10.1
github.com/stretchr/testify v1.7.0
go.opentelemetry.io/otel v0.7.0
go.opentelemetry.io/otel/exporters/otlp v0.7.0
go.opentelemetry.io/otel/exporters/trace/zipkin v0.7.0
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
google.golang.org/grpc v1.38.0
k8s.io/api v0.20.0
k8s.io/apimachinery v0.20.0
k8s.io/client-go v0.20.0
google.golang.org/grpc v1.43.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.23.3
k8s.io/apimachinery v0.23.3
k8s.io/client-go v0.23.3
)

require (
github.com/DataDog/sketches-go v0.0.0-20190923095040-43f19ad77ff7 // indirect
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-openapi/errors v0.19.8 // indirect
github.com/go-openapi/strfmt v0.20.0 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/jarcoal/httpmock v1.0.6 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mitchellh/mapstructure v1.4.3 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.4 // indirect
github.com/open-telemetry/opentelemetry-proto v0.4.0 // indirect
github.com/openzipkin/zipkin-go v0.2.2 // indirect
github.com/pelletier/go-toml v1.9.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cast v1.4.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.2.0 // indirect
go.mongodb.org/mongo-driver v1.4.3 // indirect
golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20211210111614-af8b64212486 // indirect
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/klog/v2 v2.30.0 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)
Loading