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.

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

Jump to bottom

Update upstream dependencies to 0.61.0 #1525

Merged
merged 4 commits into from
Sep 29, 2022
Merged

Update upstream dependencies to 0.61.0 #1525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b6f38a
Update dependencies to v0.61.0
bryan-aguilar Sep 29, 2022
3924fbe
Update flags.go to match upstream
bryan-aguilar Sep 29, 2022
5f9e3f7
Merge branch 'main' into upstream61
bryan-aguilar Sep 29, 2022
1f4c7b8
Update go.mod comment
bryan-aguilar Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/awscollector/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/spf13/cobra"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/featuregate"
"go.opentelemetry.io/collector/service"
"go.opentelemetry.io/collector/service/featuregate"
"go.uber.org/zap"

"github.com/aws-observability/aws-otel-collector/pkg/config"
Expand Down Expand Up @@ -102,6 +102,7 @@ func setCollectorConfigFromExtraCfg(extraCfg *extraconfig.ExtraConfig) {

// newCommand constructs a new cobra.Command using the given settings.
func newCommand(params service.CollectorSettings) *cobra.Command {
flagSet := config.Flags()
// build the Command we will use that only has config/set flags
rootCmd := &cobra.Command{
Use: params.BuildInfo.Command,
Expand All @@ -112,7 +113,7 @@ func newCommand(params service.CollectorSettings) *cobra.Command {
return err
}
// Initialize provider after flags have been set
params.ConfigProvider = config.GetConfigProvider()
params.ConfigProvider = config.GetConfigProvider(flagSet)
col, err := service.New(params)
if err != nil {
return fmt.Errorf("failed to construct the application: %w", err)
Expand All @@ -121,6 +122,6 @@ func newCommand(params service.CollectorSettings) *cobra.Command {
},
}

rootCmd.Flags().AddGoFlagSet(config.Flags())
rootCmd.Flags().AddGoFlagSet(flagSet)
return rootCmd
}
232 changes: 120 additions & 112 deletions go.mod
View file
Open in desktop

Large diffs are not rendered by default.

1,267 changes: 1,039 additions & 228 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions pkg/config/config_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package config

import (
"flag"
"log"
"os"

Expand All @@ -33,10 +34,10 @@ const (
envKey = "AOT_CONFIG_CONTENT"
)

func GetConfigProvider() service.ConfigProvider {
func GetConfigProvider(flags *flag.FlagSet) service.ConfigProvider {
// aws-otel-collector supports loading yaml config from Env Var
// including SSM parameter store for ECS use case
loc := getConfigFlag()
loc := getConfigFlag(flags)
if configContent, ok := os.LookupEnv(envKey); ok {
log.Printf("Reading AOT config from environment: %v\n", configContent)
loc = []string{"env:" + envKey}
Expand All @@ -55,7 +56,7 @@ func GetConfigProvider() service.ConfigProvider {
ResolverSettings: confmap.ResolverSettings{
URIs: loc,
Providers: mapProviders,
Converters: []confmap.Converter{expandconverter.New(), overwritepropertiesconverter.New(getSetFlag())},
Converters: []confmap.Converter{expandconverter.New(), overwritepropertiesconverter.New(getSetFlag(flags))},
},
}

Expand Down
35 changes: 17 additions & 18 deletions pkg/config/config_factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ package config

import (
"context"
"fmt"
"os"
"path/filepath"
"testing"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
Expand All @@ -29,30 +31,28 @@ import (
"github.com/aws-observability/aws-otel-collector/pkg/defaultcomponents"
)

func getValidTestConfigPath() string {
return filepath.Join("testdata", "config.yaml")
}
func TestGetCfgFactoryConfig(t *testing.T) {
factories, _ := defaultcomponents.Components()
params := service.CollectorSettings{
Factories: factories,
}

resetFlag := func() {
configFlag = new(stringArrayValue)
setFlag = new(stringArrayValue)
}

t.Run("test_invalid_path", func(t *testing.T) {
cmd := &cobra.Command{
Use: params.BuildInfo.Command,
Version: params.BuildInfo.Version,
SilenceUsage: true,
}
cmd.Flags().AddGoFlagSet(Flags())
flagSet := Flags()
cmd.Flags().AddGoFlagSet(flagSet)
err := cmd.ParseFlags([]string{
"--config=invalid-path/otelcol-config.yaml",
})
t.Cleanup(resetFlag)
require.NoError(t, err)
provider := GetConfigProvider()
provider := GetConfigProvider(flagSet)
_, err = provider.Get(context.Background(), factories)
require.Error(t, err)
})
Expand All @@ -66,14 +66,14 @@ func TestGetCfgFactoryConfig(t *testing.T) {
Version: params.BuildInfo.Version,
SilenceUsage: true,
}
flagSet := Flags()

cmd.Flags().AddGoFlagSet(Flags())
cmd.Flags().AddGoFlagSet(flagSet)
err := cmd.ParseFlags([]string{
"--config=testdata/config.yaml",
fmt.Sprintf("--config=%s", getValidTestConfigPath()),
})
t.Cleanup(resetFlag)
require.NoError(t, err)
provider := GetConfigProvider()
provider := GetConfigProvider(flagSet)
cfg, err := provider.Get(context.Background(), factories)
require.NoError(t, err)
require.NotNil(t, cfg)
Expand All @@ -88,14 +88,13 @@ func TestGetCfgFactoryConfig(t *testing.T) {
Version: params.BuildInfo.Version,
SilenceUsage: true,
}

cmd.Flags().AddGoFlagSet(Flags())
flagSet := Flags()
cmd.Flags().AddGoFlagSet(flagSet)
err := cmd.ParseFlags([]string{
"--config=testdata/config.yaml",
fmt.Sprintf("--config=%s", getValidTestConfigPath()),
})
t.Cleanup(resetFlag)
require.NoError(t, err)
provider := GetConfigProvider()
provider := GetConfigProvider(flagSet)
cfg, err := provider.Get(context.Background(), factories)
require.NoError(t, err)
require.NotNil(t, cfg)
Expand All @@ -112,7 +111,7 @@ func TestGetMapProviderContainer(t *testing.T) {
t.Setenv(envKey, "extensions:\n health_check:\n pprof:\n endpoint: '${PPROF_ENDPOINT}'\nreceivers:\n otlp:\n protocols:\n grpc:\n endpoint: 0.0.0.0:4317\nprocessors:\n batch:\nexporters:\n logging:\n loglevel: debug\n awsxray:\n local_mode: true\n region: 'us-west-2'\n awsemf:\n region: 'us-west-2'\nservice:\n pipelines:\n traces:\n receivers: [otlp]\n exporters: [logging,awsxray]\n metrics:\n receivers: [otlp]\n exporters: [awsemf]\n extensions: [pprof]")

factories, _ := defaultcomponents.Components()
provider := GetConfigProvider()
provider := GetConfigProvider(Flags())
cfg, err := provider.Get(context.Background(), factories)
require.NoError(t, err)
require.NotNil(t, cfg)
Expand Down
36 changes: 20 additions & 16 deletions pkg/config/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ import (
"flag"
"strings"

"go.opentelemetry.io/collector/service/featuregate"
"go.opentelemetry.io/collector/featuregate"
)

const (
configFlag = "config"
setFlag = "set"
)

var (
// Command-line flag that control the configuration file.
configFlag = new(stringArrayValue)
setFlag = new(stringArrayValue)
GatesList = featuregate.FlagValue{}
GatesList = featuregate.FlagValue{}
)

type stringArrayValue struct {
Expand All @@ -42,26 +45,27 @@ func (s *stringArrayValue) String() string {
}
func Flags() *flag.FlagSet {
flagSet := new(flag.FlagSet)
flagSet.Var(
GatesList,
"feature-gates",
"Comma-delimited list of feature gate identifiers. Prefix with '-' to disable the feature. '+' or no prefix will enable the feature.")

flagSet.Var(configFlag, "config", "Locations to the config file(s), note that only a"+
" single location can be set per flag entry e.g. `-config=file:/path/to/first --config=file:path/to/second`.")
flagSet.Var(new(stringArrayValue), configFlag, "Locations to the config file(s), note that only a"+
" single location can be set per flag entry e.g. `--config=file:/path/to/first --config=file:path/to/second`.")

flagSet.Var(setFlag, "set",
flagSet.Var(new(stringArrayValue), setFlag,
"Set arbitrary component config property. The component has to be defined in the config file and the flag"+
" has a higher precedence. Array config properties are overridden and maps are joined, note that only a single"+
" (first) array property can be set e.g. -set=processors.attributes.actions.key=some_key. Example --set=processors.batch.timeout=2s")
" (first) array property can be set e.g. --set=processors.attributes.actions.key=some_key. Example --set=processors.batch.timeout=2s")

flagSet.Var(
GatesList,
"feature-gates",
"Comma-delimited list of feature gate identifiers. Prefix with '-' to disable the feature. '+' or no prefix will enable the feature.")

return flagSet
}

func getConfigFlag() []string {
return configFlag.values
func getConfigFlag(flagSet *flag.FlagSet) []string {
return flagSet.Lookup(configFlag).Value.(*stringArrayValue).values
}

func getSetFlag() []string {
return setFlag.values
func getSetFlag(flagSet *flag.FlagSet) []string {
return flagSet.Lookup(setFlag).Value.(*stringArrayValue).values
}
78 changes: 42 additions & 36 deletions pkg/lambdacomponents/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@ module github.com/aws-observability/aws-otel-collector/pkg/lambdacomponents
go 1.18

require (
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.60.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.61.0
github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.61.0
github.com/stretchr/testify v1.8.0
go.opentelemetry.io/collector v0.60.0
go.opentelemetry.io/collector v0.61.0
go.uber.org/multierr v1.8.0
)

require (
github.com/aws/aws-sdk-go v1.44.96 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.14 // indirect
github.com/aws/aws-sdk-go-v2/config v1.17.5 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.18 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.22 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.21 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.17 // indirect
github.com/aws/smithy-go v1.13.2 // indirect
github.com/aws/aws-sdk-go v1.44.106 // indirect
github.com/aws/aws-sdk-go-v2 v1.16.16 // indirect
github.com/aws/aws-sdk-go-v2/config v1.17.7 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.12.20 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 // indirect
github.com/aws/smithy-go v1.13.3 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
Expand All @@ -42,7 +42,7 @@ require (
github.com/google/uuid v1.3.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.15.9 // indirect
github.com/klauspost/compress v1.15.10 // indirect
github.com/knadh/koanf v1.4.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
Expand All @@ -51,13 +51,13 @@ require (
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/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.60.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/xray v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.61.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.61.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
Expand All @@ -71,19 +71,19 @@ require (
github.com/tidwall/tinylru v1.1.0 // indirect
github.com/tidwall/wal v1.1.7 // indirect
go.opencensus.io v0.23.0 // indirect
go.opentelemetry.io/collector/pdata v0.60.0 // indirect
go.opentelemetry.io/collector/semconv v0.60.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 // indirect
go.opentelemetry.io/otel v1.9.0 // indirect
go.opentelemetry.io/otel/metric v0.31.0 // indirect
go.opentelemetry.io/otel/trace v1.9.0 // indirect
go.opentelemetry.io/collector/pdata v0.61.0 // indirect
go.opentelemetry.io/collector/semconv v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
go.opentelemetry.io/otel/metric v0.32.1 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 // indirect
golang.org/x/text v0.3.7 // indirect
google.golang.org/genproto v0.0.0-20220808204814-fd01256a5276 // indirect
google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de // indirect
google.golang.org/grpc v1.49.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand All @@ -94,3 +94,9 @@ exclude github.com/docker/distribution v2.8.0+incompatible

// see https://github.com/ionos-cloud/sdk-go/issues/27
exclude github.com/ionos-cloud/sdk-go/v6 v6.0.5851

// ambiguous import: found package cloud.google.com/go/compute/metadata in multiple modules:
// cloud.google.com/go
// cloud.google.com/go/compute
// Force cloud.google.com/go to be at least v0.100.2, so that the metadata is not present.
replace cloud.google.com/go => cloud.google.com/go v0.100.2