Skip to content

Commit

Permalink
Add changes on production environment
Browse files Browse the repository at this point in the history
Add changes on production environment
  • Loading branch information
etaques authored Aug 30, 2023
2 parents 5baf08d + cac8e44 commit 0d08807
Show file tree
Hide file tree
Showing 100 changed files with 2,181 additions and 1,520 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.26.0
0.27.0
4 changes: 2 additions & 2 deletions agent/backend/diode/scrape.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package diode

import (
"context"
"go.opentelemetry.io/otel/sdk/metric"
"strconv"
"time"

Expand All @@ -15,7 +16,6 @@ import (
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -73,7 +73,7 @@ func (d *diodeBackend) receiveOtlp() {
TelemetrySettings: component.TelemetrySettings{
Logger: d.logger,
TracerProvider: trace.NewNoopTracerProvider(),
MeterProvider: global.MeterProvider(),
MeterProvider: metric.NewMeterProvider(),
},
BuildInfo: component.NewDefaultBuildInfo(),
}
Expand Down
4 changes: 2 additions & 2 deletions agent/backend/pktvisor/scrape.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/sdk/metric"
"go.opentelemetry.io/otel/trace"
"go.uber.org/zap"
)
Expand Down Expand Up @@ -160,7 +160,7 @@ func (p *pktvisorBackend) receiveOtlp() {
TelemetrySettings: component.TelemetrySettings{
Logger: p.logger,
TracerProvider: trace.NewNoopTracerProvider(),
MeterProvider: global.MeterProvider(),
MeterProvider: metric.NewMeterProvider(),
},
BuildInfo: component.NewDefaultBuildInfo(),
}
Expand Down
4 changes: 2 additions & 2 deletions agent/otel/otlpmqttexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package otlpmqttexporter
import (
"context"
"fmt"
"go.opentelemetry.io/otel/sdk/metric"

"github.com/orb-community/orb/agent/otel"
"go.uber.org/zap"
Expand All @@ -12,7 +13,6 @@ import (
"go.opentelemetry.io/collector/consumer"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/otel/metric/global"
"go.opentelemetry.io/otel/trace"
)

Expand Down Expand Up @@ -56,7 +56,7 @@ func CreateDefaultSettings(logger *zap.Logger) exporter.CreateSettings {
TelemetrySettings: component.TelemetrySettings{
Logger: logger,
TracerProvider: trace.NewNoopTracerProvider(),
MeterProvider: global.MeterProvider(),
MeterProvider: metric.NewMeterProvider(),
},
BuildInfo: component.NewDefaultBuildInfo(),
}
Expand Down
108 changes: 62 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,34 @@ require (
github.com/lib/pq v1.10.7
github.com/mainflux/mainflux v0.0.0-20220415135135-92d8fb99bf82
github.com/mattn/go-sqlite3 v1.14.16
github.com/mitchellh/mapstructure v1.5.0
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.75.0
github.com/mitchellh/mapstructure v1.5.1-0.20220423185008-bf980b35cac4
github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.81.0
github.com/opentracing/opentracing-go v1.2.0
github.com/ory/dockertest/v3 v3.10.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/profile v1.7.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/prometheus v0.43.0
github.com/rubenv/sql-migrate v1.1.1
github.com/spf13/cobra v1.7.0
github.com/spf13/viper v1.15.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
github.com/uber/jaeger-client-go v2.30.0+incompatible
go.opentelemetry.io/collector/component v0.75.0
go.opentelemetry.io/collector/confmap v0.75.0
go.opentelemetry.io/collector/consumer v0.75.0
go.opentelemetry.io/collector/exporter v0.75.0
go.opentelemetry.io/collector/receiver v0.75.0
go.opentelemetry.io/collector/component v0.81.0
go.opentelemetry.io/collector/config/confighttp v0.81.0
go.opentelemetry.io/collector/config/configtelemetry v0.81.0
go.opentelemetry.io/collector/config/configtls v0.81.0
go.opentelemetry.io/collector/confmap v0.81.0
go.opentelemetry.io/collector/consumer v0.81.0
go.opentelemetry.io/collector/exporter v0.81.0
go.opentelemetry.io/collector/processor v0.81.0
go.opentelemetry.io/collector/receiver v0.81.0
go.opentelemetry.io/otel/sdk/metric v0.39.0
go.uber.org/multierr v1.11.0
go.uber.org/zap v1.24.0
golang.org/x/exp v0.0.0-20230321023759-10a507213a29
google.golang.org/grpc v1.54.0
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc
google.golang.org/grpc v1.56.1
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
Expand All @@ -55,11 +62,11 @@ require (
github.com/gogo/protobuf v1.3.2
github.com/google/uuid v1.3.0
github.com/prometheus/common v0.44.0 // indirect
go.opentelemetry.io/collector v0.75.0
go.opentelemetry.io/collector/pdata v1.0.0-rc9
go.opentelemetry.io/otel/metric v0.37.0
go.opentelemetry.io/otel/trace v1.14.0
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4
go.opentelemetry.io/collector v0.81.0
go.opentelemetry.io/collector/pdata v1.0.0-rcv0013
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0
google.golang.org/genproto v0.0.0-20230525234025-438c736192d0 // indirect
k8s.io/client-go v0.26.3
)

Expand All @@ -84,7 +91,7 @@ require (
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/google/go-cmp v0.5.9 // indirect
Expand All @@ -94,12 +101,13 @@ require (
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/iancoleman/strcase v0.2.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.16.3 // indirect
github.com/klauspost/compress v1.16.7 // indirect
github.com/knadh/koanf v1.5.0 // indirect
github.com/knadh/koanf/v2 v2.0.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mainflux/senml v1.5.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
Expand All @@ -108,25 +116,24 @@ require (
github.com/moby/term v0.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.1.17 // indirect
github.com/nats-io/jwt/v2 v2.3.0 // indirect
github.com/nats-io/nats-server/v2 v2.7.4 // indirect
github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d // indirect
github.com/nats-io/nkeys v0.3.0 // indirect
github.com/mostynb/go-grpc-compression v1.2.0 // indirect
github.com/nats-io/nats-server/v2 v2.9.20 // indirect
github.com/nats-io/nats.go v1.27.0 // indirect
github.com/nats-io/nkeys v0.4.4 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/observiq/ctimefmt v1.0.0 // indirect
github.com/oklog/ulid/v2 v2.0.2 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.75.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/ottl v0.81.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.2 // indirect
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
github.com/opencontainers/runc v1.1.5 // indirect
github.com/ory/keto/proto/ory/keto/acl/v1alpha1 v0.0.0-20210616104402-80e043246cf9 // indirect
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/sirupsen/logrus v1.9.0 // indirect
github.com/spf13/afero v1.9.3 // indirect
github.com/spf13/cast v1.5.0 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
Expand All @@ -138,18 +145,27 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.75.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect
go.opentelemetry.io/otel v1.14.0 // indirect
go.opentelemetry.io/collector/config/configauth v0.81.0 // indirect
go.opentelemetry.io/collector/config/configcompression v0.81.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.81.0 // indirect
go.opentelemetry.io/collector/config/confignet v0.81.0 // indirect
go.opentelemetry.io/collector/config/configopaque v0.81.0 // indirect
go.opentelemetry.io/collector/config/internal v0.81.0 // indirect
go.opentelemetry.io/collector/extension v0.81.0 // indirect
go.opentelemetry.io/collector/extension/auth v0.81.0 // indirect
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0013 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.1-0.20230612162650-64be7e574a17 // indirect
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.7.0 // indirect
golang.org/x/crypto v0.10.0 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/net v0.11.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.9.0 // indirect
golang.org/x/term v0.9.0 // indirect
golang.org/x/text v0.10.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand All @@ -164,7 +180,7 @@ require (
//These libs are used to allow orb extend opentelemetry features
require (
github.com/Shopify/sarama v1.37.2
github.com/apache/thrift v0.17.0 // indirect
github.com/apache/thrift v0.18.1 // indirect
github.com/eapache/go-resiliency v1.3.0 // indirect
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
github.com/eapache/queue v1.1.0 // indirect
Expand All @@ -177,7 +193,7 @@ require (
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/jaegertracing/jaeger v1.38.1
github.com/jaegertracing/jaeger v1.41.0
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
github.com/jcmturner/gofork v1.7.6 // indirect
Expand All @@ -186,19 +202,19 @@ require (
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.75.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.62.0
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.81.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.81.0
github.com/orb-community/diode v0.0.0-20230419222319-4ec19ba89e9f
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.8.3 // indirect
github.com/rs/cors v1.9.0 // indirect
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
github.com/xdg-go/scram v1.1.1
github.com/xdg-go/stringprep v1.0.3 // indirect
go.opentelemetry.io/collector/receiver/otlpreceiver v0.75.0
go.opentelemetry.io/collector/semconv v0.75.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.40.0 // indirect
github.com/xdg-go/scram v1.1.2
github.com/xdg-go/stringprep v1.0.4 // indirect
go.opentelemetry.io/collector/receiver/otlpreceiver v0.81.0
go.opentelemetry.io/collector/semconv v0.81.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
)
Loading

0 comments on commit 0d08807

Please sign in to comment.