Merge branch 'main' into chore/models-in-sharedpublishkafka

Author: Antoine Gelloz

sharedotlp/go.mod

@@ -3,6 +3,9 @@ module github.com/numary/go-libs/sharedotlp
 go 1.18
 
 require (
+	github.com/spf13/cobra v1.5.0
+	github.com/spf13/pflag v1.0.5
+	github.com/spf13/viper v1.12.0
 	github.com/stretchr/testify v1.8.0
 	go.opentelemetry.io/otel v1.8.0
 	go.opentelemetry.io/otel/exporters/jaeger v1.8.0
@@ -23,22 +26,35 @@ require (
 require (
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pelletier/go-toml v1.9.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/spf13/afero v1.8.2 // indirect
+	github.com/spf13/cast v1.5.0 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/subosito/gotenv v1.3.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.8.0 // indirect
 	go.opentelemetry.io/proto/otlp v0.18.0 // indirect
-	go.uber.org/atomic v1.6.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/dig v1.14.0 // indirect
-	go.uber.org/multierr v1.5.0 // indirect
-	go.uber.org/zap v1.16.0 // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
-	golang.org/x/sys v0.0.0-20210903071746-97244b99971b // indirect
-	golang.org/x/text v0.3.5 // indirect
-	google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.17.0 // indirect
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
 	google.golang.org/grpc v1.46.2 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/ini.v1 v1.66.4 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

sharedotlp/go.sum

@@ -1,6 +1,8 @@
 package sharedotlp
 
-import "context"
+import (
+	"context"
+)
 
 func RecordErrorOnRecover(ctx context.Context, forwardPanic bool) func() {
 	return func() {

sharedotlp/error.go renamed to sharedotlp/pkg/error.go

@@ -0,0 +1,42 @@
+package sharedotlpmetrics
+
+import (
+	flag "github.com/spf13/pflag"
+	"github.com/spf13/viper"
+	"go.uber.org/fx"
+)
+
+const (
+	OtelMetricsFlag                     = "otel-metrics"
+	OtelMetricsExporterFlag             = "otel-metrics-exporter"
+	OtelMetricsExporterOTLPModeFlag     = "otel-metrics-exporter-otlp-mode"
+	OtelMetricsExporterOTLPEndpointFlag = "otel-metrics-exporter-otlp-endpoint"
+	OtelMetricsExporterOTLPInsecureFlag = "otel-metrics-exporter-otlp-insecure"
+)
+
+func InitOTLPMetricsFlags(flags *flag.FlagSet) {
+	flags.Bool(OtelMetricsFlag, false, "Enable OpenTelemetry metrics support")
+	flags.String(OtelMetricsExporterFlag, "stdout", "OpenTelemetry metrics exporter")
+	flags.String(OtelMetricsExporterOTLPModeFlag, "grpc", "OpenTelemetry metrics OTLP exporter mode (grpc|http)")
+	flags.String(OtelMetricsExporterOTLPEndpointFlag, "", "OpenTelemetry metrics grpc endpoint")
+	flags.Bool(OtelMetricsExporterOTLPInsecureFlag, false, "OpenTelemetry metrics grpc insecure")
+}
+
+func CLIMetricsModule(v *viper.Viper) fx.Option {
+	if v.GetBool(OtelMetricsFlag) {
+		return MetricsModule(MetricsModuleConfig{
+			Exporter: v.GetString(OtelMetricsExporterFlag),
+			OTLPConfig: func() *OTLPMetricsConfig {
+				if v.GetString(OtelMetricsExporterFlag) != OTLPMetricsExporter {
+					return nil
+				}
+				return &OTLPMetricsConfig{
+					Mode:     v.GetString(OtelMetricsExporterOTLPModeFlag),
+					Endpoint: v.GetString(OtelMetricsExporterOTLPEndpointFlag),
+					Insecure: v.GetBool(OtelMetricsExporterOTLPInsecureFlag),
+				}
+			}(),
+		})
+	}
+	return nil
+}

sharedotlp/otlp.go renamed to sharedotlp/pkg/otlp.go

@@ -0,0 +1,51 @@
+package sharedotlpmetrics
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"reflect"
+	"testing"
+
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+	"github.com/stretchr/testify/require"
+	"go.opentelemetry.io/otel/metric"
+	controller "go.opentelemetry.io/otel/sdk/metric/controller/basic"
+	"go.uber.org/fx"
+)
+
+func TestOTLPMetricsModule(t *testing.T) {
+	cmd := &cobra.Command{
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			return viper.BindPFlags(cmd.Flags())
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			app := fx.New(
+				fx.NopLogger,
+				CLIMetricsModule(viper.GetViper()),
+				fx.Invoke(func(lc fx.Lifecycle, provider metric.MeterProvider) {
+					lc.Append(fx.Hook{
+						OnStart: func(ctx context.Context) error {
+							if !reflect.TypeOf(provider).
+								AssignableTo(reflect.TypeOf(&controller.Controller{})) {
+								return errors.New("global.GetMeterProvider() should return a *controller.Controller instance")
+							}
+							return nil
+						},
+					})
+				}))
+			require.NoError(t, app.Start(cmd.Context()))
+			require.NoError(t, app.Err())
+			return nil
+		},
+	}
+	InitOTLPMetricsFlags(cmd.Flags())
+
+	cmd.SetArgs([]string{
+		fmt.Sprintf("--%s", OtelMetricsFlag),
+		fmt.Sprintf("--%s=%s", OtelMetricsExporterFlag, "otlp"),
+	})
+
+	require.NoError(t, cmd.Execute())
+}

sharedotlp/recover.go renamed to sharedotlp/pkg/recover.go

@@ -1,7 +1,7 @@
 package sharedotlpmetrics
 
 import (
-	opentelemetry "github.com/numary/go-libs/sharedotlp"
+	opentelemetry "github.com/numary/go-libs/sharedotlp/pkg"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc"
 	"go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp"
 	"go.uber.org/fx"