From 80f5f1414d476b489fc80aa15000d19dfefd414d Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Mon, 20 Jun 2022 16:21:12 +0000 Subject: [PATCH 001/144] Initial commit on private mirror for rearchitecture on OTel platform. --- README.md | 2 ++ go.mod | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index dad3cafd99..5cee811f53 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ # Amazon CloudWatch Agent The Amazon CloudWatch Agent is software developed for the [CloudWatch Agent](https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/Install-CloudWatch-Agent.html) +This repo is for the effort to port CloudWatch Agent to run on the OpenTelemetry framework. + ## Overview The Amazon CloudWatch Agent enables you to do the following: diff --git a/go.mod b/go.mod index cb8cbb148f..2f7932a044 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aws/amazon-cloudwatch-agent +module github.com/aws/private-amazon-cloudwatch-agent-staging go 1.18 From aa5ae9bbcaa9ead125bd01860ec1cc18de74b761 Mon Sep 17 00:00:00 2001 From: Ben Strauss Date: Thu, 23 Jun 2022 15:09:18 +0000 Subject: [PATCH 002/144] Rename all occurrences of github.com/aws/amazon-cloudwatch-agent to github.com/aws/private-amazon-cloudwatch-agent-staging to fix build. --- .golangci.yml | 2 +- Makefile | 58 ++++++------- .../source/Dockerfile | 12 +-- awscsm/csm/csmiface/interface.go | 2 +- awscsm/csm/customizations_test.go | 2 +- .../customizations_test.go | 2 +- .../sdkmetricsdataplaneiface/interface.go | 2 +- cfg/agentinfo/info.go | 2 +- cfg/agentinfo/info_test.go | 2 +- .../wizard.go | 20 ++--- .../wizard_test.go | 20 ++--- .../amazon-cloudwatch-agent.go | 16 ++-- .../register_event_logger_notwindows.go | 2 +- .../register_event_logger_windows.go | 4 +- cmd/config-downloader/downloader.go | 12 +-- cmd/config-translator/translator.go | 10 +-- cmd/config-translator/translator_test.go | 4 +- cmd/start-amazon-cloudwatch-agent/path.go | 6 +- .../path_darwin.go | 4 +- .../path_linux.go | 4 +- .../start-amazon-cloudwatch-agent.go | 2 +- integration/generator/test_case_generator.go | 6 +- integration/terraform/ec2/README.md | 12 +-- integration/test/ca_bundle/ca_bundle_test.go | 2 +- .../test/cloudwatchlogs/publish_logs_test.go | 2 +- integration/test/cwl_util.go | 2 +- .../ecs/ecs_metadata/ecs_metadata_test.go | 19 +++-- .../metrics_number_dimension_test.go | 4 +- integration/test/sanity/sanity_test.go | 2 +- .../ecsservicediscovery/servicediscovery.go | 2 +- internal/k8sCommon/k8sclient/endpoint.go | 9 +- internal/k8sCommon/k8sclient/endpoint_test.go | 3 +- internal/k8sCommon/k8sclient/node_test.go | 3 +- internal/k8sCommon/k8sclient/pod_test.go | 3 +- internal/k8sCommon/k8sclient/replicaset.go | 2 +- .../k8sCommon/k8sclient/replicaset_test.go | 3 +- .../k8sCommon/kubeletutil/kubeletclient.go | 2 +- .../kubeletutil/kubeletclient_test.go | 3 +- internal/mapWithExpiry/mapWithExpiry_test.go | 3 +- internal/models/awscsm_pipeline.go | 2 +- logger/lumberjack_const.go | 1 - logger/lumberjack_const_test.go | 2 +- .../regular/regular_distribution.go | 2 +- metric/distribution/seh1/seh1_distribution.go | 2 +- plugins/inputs/awscsm/aggregation_record.go | 4 +- .../inputs/awscsm/aggregation_record_test.go | 6 +- plugins/inputs/awscsm/awscsm_listener.go | 6 +- plugins/inputs/awscsm/samples.go | 2 +- plugins/inputs/cadvisor/cadvisor.go | 4 +- .../cadvisor/container_info_processor.go | 8 +- .../cadvisor/extractors/cpu_extractor.go | 4 +- .../cadvisor/extractors/cpu_extractor_test.go | 2 +- .../cadvisor/extractors/diskio_extractor.go | 4 +- .../extractors/diskio_extractor_test.go | 2 +- .../inputs/cadvisor/extractors/extractor.go | 2 +- .../cadvisor/extractors/extractor_test.go | 2 +- .../cadvisor/extractors/fs_extractor.go | 2 +- .../cadvisor/extractors/fs_extractor_test.go | 2 +- .../cadvisor/extractors/mem_extractor.go | 4 +- .../cadvisor/extractors/mem_extractor_test.go | 2 +- .../cadvisor/extractors/net_extractor.go | 4 +- .../cadvisor/extractors/net_extractor_test.go | 2 +- plugins/inputs/cadvisor/merger.go | 4 +- plugins/inputs/k8sapiserver/k8sapiserver.go | 4 +- .../inputs/k8sapiserver/k8sapiserver_test.go | 4 +- plugins/inputs/logfile/fileconfig.go | 4 +- plugins/inputs/logfile/logfile.go | 8 +- plugins/inputs/logfile/logfile_test.go | 6 +- plugins/inputs/logfile/logfilter.go | 2 +- plugins/inputs/logfile/tail/tail.go | 2 +- plugins/inputs/logfile/tail/tail_test.go | 4 +- plugins/inputs/logfile/tail/tail_windows.go | 2 +- plugins/inputs/logfile/tailersrc.go | 5 +- plugins/inputs/logfile/tailersrc_test.go | 6 +- plugins/inputs/logfile/tmpfile_windows.go | 2 +- .../prometheus_scraper/delta_calculator.go | 2 +- .../metric_type_handler_test.go | 5 +- .../prometheus_scraper/metrics_handler.go | 4 +- .../prometheus_scraper/metrics_receiver.go | 5 +- .../metrics_receiver_test.go | 3 +- .../metrics_type_handler.go | 3 +- .../prometheus_scraper/prometheus_scraper.go | 2 +- plugins/inputs/prometheus_scraper/start.go | 13 +-- plugins/inputs/statsd/statsd.go | 4 +- plugins/inputs/statsd/statsd_test.go | 4 +- .../windows_event_log/windows_event_log.go | 6 +- .../wineventlog/wineventlog.go | 2 +- plugins/outputs/awscsm/adapters.go | 4 +- plugins/outputs/awscsm/adapters_test.go | 4 +- plugins/outputs/awscsm/awscsm.go | 18 ++-- plugins/outputs/awscsm/awscsm_test.go | 6 +- plugins/outputs/awscsm/csm_writer.go | 8 +- .../outputs/awscsm/metametrics/listener.go | 2 +- .../awscsm/metametrics/listener_test.go | 4 +- .../awscsm/providers/config_provider.go | 6 +- .../awscsm/providers/config_provider_test.go | 4 +- .../awscsm/providers/default_definitions.go | 2 +- .../awscsm/providers/dynamic_schema.go | 2 +- .../awscsm/providers/dynamic_schema_test.go | 2 +- .../awscsm/providers/event_key_type.go | 2 +- .../awscsm/providers/event_key_type_test.go | 4 +- .../outputs/awscsm/providers/metric_type.go | 2 +- .../awscsm/providers/metric_type_test.go | 4 +- .../awscsm/providers/mock_config_provider.go | 2 +- plugins/outputs/awscsm/record_ring.go | 4 +- plugins/outputs/awscsm/record_ring_test.go | 2 +- plugins/outputs/awscsm/record_size.go | 2 +- plugins/outputs/awscsm/record_size_test.go | 2 +- plugins/outputs/awscsm/retry_rules.go | 2 +- plugins/outputs/awscsm/retry_rules_test.go | 2 +- plugins/outputs/awscsm/samples.go | 2 +- plugins/outputs/cloudwatch/aggregator.go | 2 +- plugins/outputs/cloudwatch/aggregator_test.go | 4 +- plugins/outputs/cloudwatch/cloudwatch.go | 16 ++-- plugins/outputs/cloudwatch/cloudwatch_test.go | 8 +- plugins/outputs/cloudwatch/util.go | 6 +- plugins/outputs/cloudwatch/util_test.go | 6 +- .../outputs/cloudwatchlogs/cloudwatchlogs.go | 12 +-- plugins/outputs/cloudwatchlogs/pusher.go | 4 +- plugins/parsers/emf/parser.go | 2 +- plugins/parsers/emf/parser_test.go | 2 +- plugins/parsers/registry.go | 4 +- plugins/plugins.go | 38 ++++----- plugins/processors/ec2tagger/ec2tagger.go | 4 +- .../processors/ec2tagger/ec2tagger_test.go | 4 +- .../processors/ecsdecorator/ecsdecorator.go | 6 +- .../ecsdecorator/ecsdecorator_test.go | 4 +- plugins/processors/ecsdecorator/ecsinfo.go | 2 +- plugins/processors/ecsdecorator/metricRule.go | 4 +- .../ecsdecorator/metricRule_test.go | 4 +- .../processors/emfProcessor/emfProcessor.go | 2 +- .../emfProcessor/emfProcessor_test.go | 2 +- .../emfProcessor/metricDefinition.go | 2 +- .../emfProcessor/metricDefinition_test.go | 2 +- .../processors/k8sdecorator/k8sdecorator.go | 8 +- .../k8sdecorator/stores/nodeinfo.go | 4 +- .../k8sdecorator/stores/nodeinfo_test.go | 2 +- .../k8sdecorator/stores/podstore.go | 10 +-- .../k8sdecorator/stores/podstore_test.go | 6 +- .../k8sdecorator/stores/servicestore.go | 4 +- .../processors/k8sdecorator/stores/utils.go | 4 +- .../k8sdecorator/stores/utils_test.go | 3 +- .../structuredlogsadapter/metricruletagger.go | 4 +- .../metricruletagger_test.go | 4 +- .../structuredlogsadapter/utils.go | 6 +- .../structuredlogsadapter/utils_test.go | 2 +- tool/data/config.go | 6 +- tool/data/config/agent.go | 4 +- tool/data/config/agent_test.go | 4 +- tool/data/config/logs.go | 4 +- tool/data/config/logs/collection.go | 4 +- tool/data/config/logs/config.go | 2 +- tool/data/config/logs/config_test.go | 2 +- tool/data/config/logs/eventConfig.go | 2 +- tool/data/config/logs/eventConfig_test.go | 2 +- tool/data/config/logs/events.go | 2 +- tool/data/config/logs/events_test.go | 2 +- tool/data/config/logs/files.go | 2 +- tool/data/config/logs/files_test.go | 2 +- tool/data/config/logs_test.go | 2 +- .../config/metric/aggregationDimensions.go | 2 +- .../metric/aggregationDimensions_test.go | 2 +- tool/data/config/metric/appendDimensions.go | 2 +- .../config/metric/appendDimensions_test.go | 2 +- tool/data/config/metric/collectd/collectd.go | 2 +- .../config/metric/collectd/collectd_test.go | 2 +- tool/data/config/metric/collection.go | 12 +-- tool/data/config/metric/collection_test.go | 4 +- tool/data/config/metric/linux/cpu.go | 4 +- tool/data/config/metric/linux/cpu_test.go | 2 +- tool/data/config/metric/linux/disk.go | 4 +- tool/data/config/metric/linux/disk_test.go | 2 +- tool/data/config/metric/linux/diskio.go | 4 +- tool/data/config/metric/linux/diskio_test.go | 2 +- tool/data/config/metric/linux/memory.go | 4 +- tool/data/config/metric/linux/memory_test.go | 2 +- tool/data/config/metric/linux/net.go | 4 +- tool/data/config/metric/linux/net_test.go | 2 +- tool/data/config/metric/linux/netstat.go | 4 +- tool/data/config/metric/linux/netstat_test.go | 2 +- tool/data/config/metric/linux/swap.go | 4 +- tool/data/config/metric/linux/swap_test.go | 2 +- tool/data/config/metric/statsd/statsd.go | 2 +- tool/data/config/metric/statsd/statsd_test.go | 2 +- .../data/config/metric/windows/logicalDisk.go | 4 +- .../config/metric/windows/logicalDisk_test.go | 2 +- tool/data/config/metric/windows/memory.go | 4 +- .../data/config/metric/windows/memory_test.go | 2 +- .../config/metric/windows/networkInterface.go | 4 +- .../metric/windows/networkInterface_test.go | 2 +- tool/data/config/metric/windows/pagingFile.go | 4 +- .../config/metric/windows/pagingFile_test.go | 2 +- .../config/metric/windows/physicalDisk.go | 4 +- .../metric/windows/physicalDisk_test.go | 2 +- tool/data/config/metric/windows/processor.go | 4 +- .../config/metric/windows/processor_test.go | 2 +- tool/data/config/metric/windows/tcpv4.go | 4 +- tool/data/config/metric/windows/tcpv4_test.go | 2 +- tool/data/config/metric/windows/tcpv6.go | 4 +- tool/data/config/metric/windows/tcpv6_test.go | 2 +- tool/data/config/metrics.go | 4 +- tool/data/config/metrics_test.go | 4 +- tool/data/config_test.go | 4 +- tool/data/interfaze/convertibleToMap.go | 2 +- tool/processors/agentconfig/agentConfig.go | 10 +-- .../agentconfig/agentConfig_test.go | 6 +- tool/processors/basicInfo/basicInfo.go | 10 +-- tool/processors/basicInfo/basicInfo_test.go | 10 +-- tool/processors/collectd/collectd.go | 14 ++-- tool/processors/collectd/collectd_test.go | 12 +-- .../defaultConfig/advancedPlan/plan.go | 16 ++-- .../defaultConfig/basicPlan/plan.go | 14 ++-- .../processors/defaultConfig/defaultConfig.go | 20 ++--- .../defaultConfig/defaultConfig_test.go | 10 +-- .../defaultConfig/standardPlan/plan.go | 16 ++-- .../migration/linux/knownConfigKeys.go | 2 +- .../migration/linux/linuxMigration.go | 12 +-- .../migration/linux/linuxMigration_test.go | 12 +-- tool/processors/migration/migration.go | 12 +-- tool/processors/migration/migration_test.go | 10 +-- .../migration/windows/windows_migration.go | 12 +-- .../windows/windows_migration_test.go | 4 +- tool/processors/processor.go | 4 +- tool/processors/question/events/events.go | 12 +-- .../processors/question/events/events_test.go | 10 +-- tool/processors/question/logs/logs.go | 14 ++-- tool/processors/question/logs/logs_test.go | 12 +-- tool/processors/question/metrics/metrics.go | 16 ++-- .../question/metrics/metrics_test.go | 12 +-- tool/processors/question/question.go | 8 +- tool/processors/question/question_test.go | 6 +- .../processors/serialization/serialization.go | 10 +-- .../serialization/serialization_test.go | 6 +- tool/processors/ssm/ssm.go | 8 +- tool/processors/ssm/ssm_test.go | 6 +- tool/processors/statsd/statsd.go | 12 +-- tool/processors/statsd/statsd_test.go | 10 +-- tool/processors/template/template.go | 6 +- tool/testutil/testutil.go | 2 +- tool/util/util.go | 8 +- tool/util/util_test.go | 2 +- translator/cmdutil/translatorutil.go | 14 ++-- translator/cmdutil/userutil.go | 4 +- translator/cmdutil/userutil_windows.go | 2 +- translator/context/context.go | 2 +- translator/jsonconfig/mergeJsonConfig.go | 10 +-- translator/jsonconfig/mergeJsonConfig_test.go | 6 +- translator/jsonconfig/mergeJsonUtil/util.go | 4 +- translator/osParameter.go | 2 +- translator/toenvconfig/toEnvConfig.go | 12 +-- translator/toenvconfig/toEnvConfig_test.go | 10 +-- translator/totomlconfig/toTomlConfig.go | 84 +++++++++---------- translator/totomlconfig/toTomlConfig_test.go | 14 ++-- translator/translate/agent/agent.go | 6 +- translator/translate/agent/agent_test.go | 6 +- .../translate/agent/ruleCollectionJitter.go | 2 +- translator/translate/agent/ruleCommonCreds.go | 6 +- .../translate/agent/ruleCommonCreds_test.go | 8 +- translator/translate/agent/ruleDebug.go | 2 +- .../translate/agent/ruleFlushInterval.go | 2 +- translator/translate/agent/ruleFlushJitter.go | 2 +- .../translate/agent/ruleGlobalCredentials.go | 2 +- .../agent/ruleGlobalCredentials_test.go | 2 +- translator/translate/agent/ruleHostname.go | 6 +- translator/translate/agent/ruleInternal.go | 2 +- translator/translate/agent/ruleInterval.go | 2 +- translator/translate/agent/ruleLogFile.go | 8 +- translator/translate/agent/ruleLogTarget.go | 2 +- .../translate/agent/ruleMetricBatchSize.go | 2 +- .../translate/agent/ruleMetricBufferLimit.go | 2 +- .../translate/agent/ruleOmitHostname.go | 4 +- translator/translate/agent/rulePrecision.go | 2 +- translator/translate/agent/ruleQuiet.go | 2 +- translator/translate/agent/ruleRegion.go | 6 +- .../translate/agent/ruleRoundInterval.go | 2 +- translator/translate/csm/csm.go | 14 ++-- translator/translate/csm/csmPortUtils.go | 2 +- translator/translate/csm/csm_test.go | 4 +- translator/translate/csm/ruleDataFormat.go | 2 +- .../translate/csm/ruleEndpointOverride.go | 4 +- translator/translate/csm/ruleLogLevel.go | 4 +- .../translate/csm/ruleMemoryLimitInMb.go | 4 +- translator/translate/csm/rulePort.go | 6 +- translator/translate/globaltags/globaltags.go | 2 +- translator/translate/logs/logs.go | 10 +-- .../files/collect_list/collect_list.go | 14 ++-- .../files/collect_list/collect_list_test.go | 6 +- .../files/collect_list/ruleAutoRemovel.go | 2 +- .../files/collect_list/ruleBlackList.go | 2 +- .../files/collect_list/ruleEncoding.go | 2 +- .../files/collect_list/ruleFilePath.go | 2 +- .../files/collect_list/ruleFromBeginning.go | 2 +- .../files/collect_list/ruleLogFilters.go | 2 +- .../files/collect_list/ruleLogFilters_test.go | 2 +- .../files/collect_list/ruleLogGroupName.go | 6 +- .../files/collect_list/ruleLogStreamName.go | 6 +- .../files/collect_list/rulePipe.go | 2 +- .../collect_list/rulePublishMultiLogs.go | 2 +- .../files/collect_list/ruleRetentionInDays.go | 2 +- .../files/collect_list/ruleTimestampFormat.go | 2 +- .../logs/logs_collected/files/files.go | 8 +- .../files/ruleFileStateFolder.go | 2 +- .../logs/logs_collected/logs_collected.go | 10 +-- .../collect_list/collectlist.go | 12 +-- .../collect_list/collectlist_test.go | 2 +- .../collect_list/ruleEventFormat.go | 2 +- .../collect_list/ruleLogGroupName.go | 6 +- .../collect_list/ruleLogStreamName.go | 6 +- .../collect_list/ruleRetentionInDays.go | 2 +- .../windows_events/ruleFileStateFolder.go | 2 +- .../windows_events/windows_event.go | 8 +- .../windows_events/windows_event_test.go | 4 +- translator/translate/logs/logs_test.go | 8 +- .../ecs/cadvisor/cadvisor.go | 4 +- .../ecs/cadvisor/ruleInterval.go | 2 +- .../ecs/ec2tagger/ec2tagger.go | 4 +- .../logs/metrics_collected/ecs/ecs.go | 10 +-- .../ecs/ecsdecorator/ecsdecorator.go | 4 +- .../ecs/ecsdecorator/ruleHostIp.go | 4 +- .../logs/metrics_collected/emf/emf.go | 6 +- .../emf/ruleServiceAddress.go | 4 +- .../metrics_collected/emf/structuredlog.go | 6 +- .../kubernetes/cadvisor/cadvisor.go | 4 +- .../kubernetes/cadvisor/ruleDetailMode.go | 2 +- .../kubernetes/cadvisor/ruleInterval.go | 2 +- .../kubernetes/ec2tagger/ec2tagger.go | 4 +- .../kubernetes/k8sapiserver/k8sapiserver.go | 4 +- .../kubernetes/k8sapiserver/ruleInterval.go | 2 +- .../kubernetes/k8sapiserver/ruleNodeName.go | 4 +- .../kubernetes/k8sdecorator/hostIP.go | 4 +- .../kubernetes/k8sdecorator/k8sdecorator.go | 4 +- .../k8sdecorator/ruleClusterName.go | 6 +- .../kubernetes/k8sdecorator/ruleNodeName.go | 4 +- .../k8sdecorator/rulePrefFullPodName.go | 2 +- .../kubernetes/k8sdecorator/ruleTagService.go | 2 +- .../kubernetes/kubernetes.go | 10 +-- .../metrics_collected/metrics_collected.go | 10 +-- .../dockerlabel/dockerlabel.go | 4 +- .../dockerlabel/ruleSDJobNameLabel.go | 2 +- .../dockerlabel/ruleSDMetricsPathLabel.go | 2 +- .../dockerlabel/ruleSDPortLabel.go | 2 +- .../ecsServiceDiscovery.go | 4 +- .../ruleSDClusterRegion.go | 4 +- .../ecsservicediscovery/ruleSDFrequency.go | 2 +- .../ecsservicediscovery/ruleSDResultFile.go | 2 +- .../ruleSDTargetCluster.go | 4 +- .../serviceendpoint/ruleSDMetricsPorts.go | 2 +- .../ruleSDServiceNamePattern.go | 2 +- .../serviceendpoint/serviceendpoint.go | 4 +- .../taskdefinition/ruleSDMetricsPorts.go | 2 +- .../ruleSDTaskDefinitionArnPattern.go | 2 +- .../taskdefinition/taskdefinition.go | 4 +- .../prometheus/emfprocessor/emfProcessor.go | 4 +- .../ruleMetricDeclarationDedup.go | 2 +- .../emfprocessor/ruleMetricNamespace.go | 6 +- .../prometheus/prometheus.go | 8 +- .../prometheus/ruleClusterName.go | 6 +- .../prometheus/ruleConfigPath.go | 4 +- .../prometheus/ruleLogGroupName.go | 8 +- .../translate/logs/ruleBasicLogConfig.go | 4 +- .../translate/logs/ruleEndpointOverride.go | 2 +- .../translate/logs/ruleForceFlushInterval.go | 2 +- .../translate/logs/ruleLogCredentials.go | 4 +- .../translate/logs/ruleLogCredentials_test.go | 4 +- .../translate/logs/ruleLogStreamName.go | 10 +-- .../translate/logs/util/file_state_folder.go | 6 +- .../logs/util/get_ecs_cluster_name.go | 4 +- .../logs/util/get_eks_cluster_name.go | 4 +- .../translate/logs/util/validate_retention.go | 2 +- .../append_dimensions/append_dimensions.go | 6 +- .../metrics/append_dimensions/ruleCreds.go | 2 +- .../append_dimensions/ruleCreds_test.go | 2 +- .../metrics/drop_origin/drop_origin.go | 6 +- .../metric_decoration/metric_decoration.go | 10 +-- translator/translate/metrics/metrics.go | 12 +-- .../metrics_collect/agentInternal/internal.go | 6 +- .../metrics_collect/collectd/collectd.go | 4 +- .../collectd/ruleCollectDAuthFile.go | 2 +- .../collectd/ruleCollectDSecurityLevel.go | 2 +- .../collectd/ruleCollectDTypesDB.go | 2 +- .../ruleMetricsAggregationInterval.go | 2 +- .../collectd/ruleNamePrefix.go | 2 +- .../collectd/ruleServiceAddress.go | 2 +- .../metrics/metrics_collect/cpu/cpu.go | 6 +- .../metrics_collect/cpu/cpuWindowsMetrics.go | 2 +- .../metrics_collect/cpu/ruleCollectCpuTime.go | 2 +- .../metrics/metrics_collect/cpu/rulePerCpu.go | 2 +- .../metrics_collect/cpu/ruleReportActive.go | 2 +- .../metrics_collect/cpu/ruleTotalCpu.go | 2 +- .../customizedmetrics/customizedmetric.go | 6 +- .../metrics/metrics_collect/disk/disk.go | 6 +- .../disk/diskWindowsMetrics.go | 2 +- .../metrics_collect/disk/ruleDropTags.go | 2 +- .../metrics_collect/disk/ruleMountPoints.go | 2 +- .../metrics/metrics_collect/diskio/diskio.go | 6 +- .../metrics_collect/diskio/ruleDevices.go | 2 +- .../metrics_collect/ethtool/ethtool.go | 4 +- .../ethtool/ruleInterfaceExclude.go | 2 +- .../ethtool/ruleInterfaceInclude.go | 2 +- .../ethtool/ruleMetricsInclude.go | 2 +- .../metrics/metrics_collect/gpu/nvidiaSmi.go | 8 +- .../metrics/metrics_collect/mem/mem.go | 6 +- .../metrics_collect/mem/memWindowsMetrics.go | 2 +- .../metrics_collect/metrics_collect.go | 10 +-- .../metrics/metrics_collect/net/net.go | 6 +- .../metrics_collect/net/netWindowsMetrics.go | 2 +- .../metrics_collect/net/ruleInterfaces.go | 2 +- .../metrics_collect/netstat/netstat.go | 6 +- .../metrics_collect/processes/processes.go | 6 +- .../processes/processesWindowsMetrics.go | 2 +- .../metrics_collect/procstat/procstat.go | 10 +-- .../metrics_collect/procstat/rulePidFinder.go | 2 +- .../statsd/ruleAllowedPendingMessages.go | 2 +- .../statsd/ruleMetricSeparator.go | 2 +- .../statsd/ruleMetricsAggregationInterval.go | 2 +- .../statsd/ruleMetricsCollectionInterval.go | 2 +- .../metrics_collect/statsd/ruleParseTags.go | 2 +- .../statsd/ruleServiceAddress.go | 2 +- .../metrics/metrics_collect/statsd/statsd.go | 4 +- .../metrics/metrics_collect/swap/swap.go | 6 +- translator/translate/metrics/metrics_test.go | 2 +- .../rollup_dimensions/rollupDimensions.go | 6 +- .../rollupDimensions_test.go | 2 +- .../translate/metrics/ruleEndpointOverride.go | 2 +- .../metrics/ruleForceFlushInterval.go | 2 +- .../translate/metrics/ruleMaxDatumsPerCall.go | 2 +- .../metrics/ruleMaxValuesPerDatum.go | 2 +- .../metrics/ruleMetricCredentials.go | 4 +- .../metrics/ruleMetricCredentials_test.go | 4 +- translator/translate/metrics/ruleNamespace.go | 2 +- .../translate/metrics/ruleTagExclude.go | 2 +- .../metrics/util/commonconfigutil.go | 8 +- .../translate/metrics/util/instanceutil.go | 2 +- .../translate/metrics/util/measurementutil.go | 6 +- translator/translate/translate.go | 6 +- translator/translate/util/credsutil.go | 2 +- translator/translate/util/credsutil_test.go | 2 +- translator/translate/util/placeholderUtil.go | 4 +- translator/translate/util/ruleutil.go | 2 +- translator/util/ec2util/ec2util.go | 4 +- translator/util/ecsutil/ecsutil.go | 8 +- translator/util/ioutil.go | 2 +- translator/util/proxyutil.go | 2 +- translator/util/sdkutil.go | 14 ++-- translator/util/sslutil.go | 2 +- 445 files changed, 1116 insertions(+), 1102 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 8ac8cd0774..af1c744b46 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -38,7 +38,7 @@ linters-settings: goimports: # Put imports beginning with prefix after 3rd-party packages. # It's a comma-separated list of prefixes. - local-prefixes: github.com/aws/amazon-cloudwatch-agent + local-prefixes: github.com/aws/private-amazon-cloudwatch-agent-staging misspell: # Correct spellings using locale preferences for US or UK. # Default is to use a neutral variety of English. diff --git a/Makefile b/Makefile index 4704332bac..46e315b2c4 100644 --- a/Makefile +++ b/Makefile @@ -18,8 +18,8 @@ endif BUILD := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") LDFLAGS = -s -w -LDFLAGS += -X github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo.VersionStr=${VERSION} -LDFLAGS += -X github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo.BuildStr=${BUILD} +LDFLAGS += -X github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo.VersionStr=${VERSION} +LDFLAGS += -X github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo.BuildStr=${BUILD} LINUX_AMD64_BUILD = CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_amd64 LINUX_ARM64_BUILD = CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/linux_arm64 WIN_BUILD = GOOS=windows GOARCH=amd64 go build -buildmode=${CWAGENT_BUILD_MODE} -ldflags="${LDFLAGS}" -o $(BUILD_SPACE)/bin/windows_amd64 @@ -42,7 +42,7 @@ AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/logger.WindowsLogPath=C:\\ProgramData\\ AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/extraconfig.unixExtraConfigPath=/opt/aws/amazon-cloudwatch-agent/cwagent-otel-collector/etc/extracfg.txt AOC_LDFLAGS += -X $(AOC_IMPORT_PATH)/pkg/extraconfig.windowsExtraConfigPath=C:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\CWAgentOtelCollector\\extracfg.txt -CW_AGENT_IMPORT_PATH=https://github.com/aws/amazon-cloudwatch-agent.git +CW_AGENT_IMPORT_PATH=https://github.com/aws/private-amazon-cloudwatch-agent-staging.git ALL_SRC := $(shell find . -name '*.go' -type f | sort) TOOLS_BIN_DIR := $(abspath ./build/tools) @@ -71,10 +71,10 @@ copy-version-file: create-version-file amazon-cloudwatch-agent: copy-version-file @echo Building amazon-cloudwatch-agent - $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent - $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent - $(WIN_BUILD)/amazon-cloudwatch-agent.exe github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent - $(DARWIN_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent + $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent + $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent + $(WIN_BUILD)/amazon-cloudwatch-agent.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent + $(DARWIN_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent # Save AWS OTEL Collector GIT SHA to a file so it can be easily referenced from outside this repository. update-submodule: @@ -89,44 +89,44 @@ cwagent-otel-collector: update-submodule config-translator: copy-version-file @echo Building config-translator - $(LINUX_AMD64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator - $(LINUX_ARM64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator - $(WIN_BUILD)/config-translator.exe github.com/aws/amazon-cloudwatch-agent/cmd/config-translator - $(DARWIN_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator + $(LINUX_AMD64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator + $(LINUX_ARM64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator + $(WIN_BUILD)/config-translator.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator + $(DARWIN_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator start-amazon-cloudwatch-agent: copy-version-file @echo Building start-amazon-cloudwatch-agent - $(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent - $(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent - $(WIN_BUILD)/start-amazon-cloudwatch-agent.exe github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent - $(DARWIN_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent + $(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent + $(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent + $(WIN_BUILD)/start-amazon-cloudwatch-agent.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent + $(DARWIN_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent amazon-cloudwatch-agent-config-wizard: copy-version-file @echo Building amazon-cloudwatch-agent-config-wizard - $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard - $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard - $(WIN_BUILD)/amazon-cloudwatch-agent-config-wizard.exe github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard - $(DARWIN_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent-config-wizard + $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard + $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard + $(WIN_BUILD)/amazon-cloudwatch-agent-config-wizard.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard + $(DARWIN_BUILD)/amazon-cloudwatch-agent-config-wizard github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent-config-wizard config-downloader: copy-version-file @echo Building config-downloader - $(LINUX_AMD64_BUILD)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader - $(LINUX_ARM64_BUILD)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader - $(WIN_BUILD)/config-downloader.exe github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader - $(DARWIN_BUILD)/config-downloader github.com/aws/amazon-cloudwatch-agent/cmd/config-downloader + $(LINUX_AMD64_BUILD)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader + $(LINUX_ARM64_BUILD)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader + $(WIN_BUILD)/config-downloader.exe github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader + $(DARWIN_BUILD)/config-downloader github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-downloader # A fast build that only builds amd64, we don't need wizard and config downloader build-for-docker: build-for-docker-amd64 build-for-docker-amd64: - $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent - $(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent - $(LINUX_AMD64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator + $(LINUX_AMD64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent + $(LINUX_AMD64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent + $(LINUX_AMD64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator build-for-docker-arm64: - $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/amazon-cloudwatch-agent - $(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/amazon-cloudwatch-agent/cmd/start-amazon-cloudwatch-agent - $(LINUX_ARM64_BUILD)/config-translator github.com/aws/amazon-cloudwatch-agent/cmd/config-translator + $(LINUX_ARM64_BUILD)/amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent + $(LINUX_ARM64_BUILD)/start-amazon-cloudwatch-agent github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/start-amazon-cloudwatch-agent + $(LINUX_ARM64_BUILD)/config-translator github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/config-translator #Install from source for golangci-lint is not recommended based on https://golangci-lint.run/usage/install/#install-from-source so using binary #installation diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile index 13950256c5..6615450b45 100644 --- a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile +++ b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile @@ -7,16 +7,16 @@ FROM $GO_IMAGE as builder # https://docs.docker.com/engine/reference/builder/#automatic-platform-args-in-the-global-scope ARG TARGETARCH ENV GOPROXY=direct -RUN mkdir -p /go/src/github.com/aws/amazon-cloudwatch-agent/ -WORKDIR /go/src/github.com/aws/amazon-cloudwatch-agent/ +RUN mkdir -p /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ +WORKDIR /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ ARG GO111MODULE="on" ENV GO111MODULE=${GO111MODULE} -COPY go.mod /go/src/github.com/aws/amazon-cloudwatch-agent/ -COPY go.sum /go/src/github.com/aws/amazon-cloudwatch-agent/ +COPY go.mod /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ +COPY go.sum /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ RUN go mod download -x -COPY . /go/src/github.com/aws/amazon-cloudwatch-agent/ +COPY . /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ RUN make build-for-docker-${TARGETARCH} # Install cert and binaries @@ -29,7 +29,7 @@ RUN mkdir -p /opt/aws/amazon-cloudwatch-agent/var RUN apt-get update && \ apt-get install -y ca-certificates && \ rm -rf /var/lib/apt/lists/* -COPY --from=builder /go/src/github.com/aws/amazon-cloudwatch-agent/build/bin/linux_${TARGETARCH}/ /opt/aws/amazon-cloudwatch-agent/bin +COPY --from=builder /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/build/bin/linux_${TARGETARCH}/ /opt/aws/amazon-cloudwatch-agent/bin FROM scratch diff --git a/awscsm/csm/csmiface/interface.go b/awscsm/csm/csmiface/interface.go index bbf81e9bcc..0461460803 100644 --- a/awscsm/csm/csmiface/interface.go +++ b/awscsm/csm/csmiface/interface.go @@ -12,9 +12,9 @@ package csmiface import ( - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) // CSMAPI provides an interface to enable mocking the diff --git a/awscsm/csm/customizations_test.go b/awscsm/csm/customizations_test.go index 8e6bd0e303..9be0930b23 100644 --- a/awscsm/csm/customizations_test.go +++ b/awscsm/csm/customizations_test.go @@ -11,10 +11,10 @@ import ( "io" "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/awstesting/unit" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) func TestOverrideAppJSONContentType(t *testing.T) { diff --git a/awscsm/sdkmetricsdataplane/customizations_test.go b/awscsm/sdkmetricsdataplane/customizations_test.go index 3c5364d7ab..5cc00148f5 100644 --- a/awscsm/sdkmetricsdataplane/customizations_test.go +++ b/awscsm/sdkmetricsdataplane/customizations_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/awstesting/unit" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) func TestOverrideAppJSONContentType(t *testing.T) { diff --git a/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go b/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go index 47d6660226..54130d1ace 100644 --- a/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go +++ b/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go @@ -12,9 +12,9 @@ package sdkmetricsdataplaneiface import ( - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) // SDKMetricsDataplaneAPI provides an interface to enable mocking the diff --git a/cfg/agentinfo/info.go b/cfg/agentinfo/info.go index 114eb14b92..8b1b138fb1 100644 --- a/cfg/agentinfo/info.go +++ b/cfg/agentinfo/info.go @@ -12,7 +12,7 @@ import ( "runtime" "strings" - "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" ) const ( diff --git a/cfg/agentinfo/info_test.go b/cfg/agentinfo/info_test.go index 659214b007..95c25ee401 100644 --- a/cfg/agentinfo/info_test.go +++ b/cfg/agentinfo/info_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" "github.com/stretchr/testify/assert" ) diff --git a/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go b/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go index 26046884a2..4466aba212 100644 --- a/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go +++ b/cmd/amazon-cloudwatch-agent-config-wizard/wizard.go @@ -9,16 +9,16 @@ import ( "fmt" "os" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/basicInfo" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/stdin" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/basicInfo" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type IMainProcessor interface { diff --git a/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go b/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go index ac31f678ef..b45b2b167a 100644 --- a/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go +++ b/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go @@ -7,16 +7,16 @@ import ( "path/filepath" "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/agentconfig" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/basicInfo" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/collectd" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/ssm" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/statsd" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/template" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/basicInfo" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/ssm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/template" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index a2b7e25812..9f3b6ede28 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -22,16 +22,16 @@ import ( "syscall" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" "github.com/influxdata/wlog" - "github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo" - "github.com/aws/amazon-cloudwatch-agent/cfg/migrate" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/profiler" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/migrate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - _ "github.com/aws/amazon-cloudwatch-agent/plugins" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins" "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/logger" @@ -46,7 +46,7 @@ import ( const ( defaultEnvCfgFileName = "env-config.json" - LogTargetEventLog = "eventlog" + LogTargetEventLog = "eventlog" ) var fDebug = flag.Bool("debug", false, diff --git a/cmd/amazon-cloudwatch-agent/register_event_logger_notwindows.go b/cmd/amazon-cloudwatch-agent/register_event_logger_notwindows.go index 135a75cd23..d6d8905cb7 100644 --- a/cmd/amazon-cloudwatch-agent/register_event_logger_notwindows.go +++ b/cmd/amazon-cloudwatch-agent/register_event_logger_notwindows.go @@ -14,4 +14,4 @@ package main func RegisterEventLogger() error { // Unreachable code, do nothing. return nil -} \ No newline at end of file +} diff --git a/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go b/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go index 9738d1a51f..8565b80c51 100644 --- a/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go +++ b/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go @@ -7,7 +7,7 @@ package main import ( - lumberjack "github.com/aws/amazon-cloudwatch-agent/logger" + lumberjack "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" "github.com/influxdata/telegraf/logger" ) @@ -21,4 +21,4 @@ func RegisterEventLogger() error { } logger.SetupLogging(logger.LogConfig{LogTarget: lumberjack.LogTargetLumberjack}) return nil -} \ No newline at end of file +} diff --git a/cmd/config-downloader/downloader.go b/cmd/config-downloader/downloader.go index ca5102a42b..e9b6e599fa 100644 --- a/cmd/config-downloader/downloader.go +++ b/cmd/config-downloader/downloader.go @@ -10,17 +10,17 @@ import ( "os" "strings" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util" - sdkutil "github.com/aws/amazon-cloudwatch-agent/translator/util" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + sdkutil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "fmt" "path/filepath" - commonconfig "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" diff --git a/cmd/config-translator/translator.go b/cmd/config-translator/translator.go index 4d2a929b9f..c791a2bf66 100644 --- a/cmd/config-translator/translator.go +++ b/cmd/config-translator/translator.go @@ -10,11 +10,11 @@ import ( "os/user" "path/filepath" - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/cmdutil" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - translatorUtil "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + translatorUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const ( diff --git a/cmd/config-translator/translator_test.go b/cmd/config-translator/translator_test.go index 661c1f88b0..6c7d6dfcad 100644 --- a/cmd/config-translator/translator_test.go +++ b/cmd/config-translator/translator_test.go @@ -8,9 +8,9 @@ import ( "regexp" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/cmdutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "github.com/stretchr/testify/assert" ) diff --git a/cmd/start-amazon-cloudwatch-agent/path.go b/cmd/start-amazon-cloudwatch-agent/path.go index 8cad87b48a..e589c033ce 100644 --- a/cmd/start-amazon-cloudwatch-agent/path.go +++ b/cmd/start-amazon-cloudwatch-agent/path.go @@ -14,9 +14,9 @@ import ( "os/exec" "syscall" - "github.com/aws/amazon-cloudwatch-agent/translator/cmdutil" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) const ( diff --git a/cmd/start-amazon-cloudwatch-agent/path_darwin.go b/cmd/start-amazon-cloudwatch-agent/path_darwin.go index c02edf1513..90ec48a952 100644 --- a/cmd/start-amazon-cloudwatch-agent/path_darwin.go +++ b/cmd/start-amazon-cloudwatch-agent/path_darwin.go @@ -7,8 +7,8 @@ package main import ( - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) func setCTXOS(ctx *context.Context) { diff --git a/cmd/start-amazon-cloudwatch-agent/path_linux.go b/cmd/start-amazon-cloudwatch-agent/path_linux.go index 99122114f4..b84c482ac5 100644 --- a/cmd/start-amazon-cloudwatch-agent/path_linux.go +++ b/cmd/start-amazon-cloudwatch-agent/path_linux.go @@ -7,8 +7,8 @@ package main import ( - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) func setCTXOS(ctx *context.Context) { diff --git a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go index 504f6a5cf4..254a84ce9c 100644 --- a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go +++ b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go @@ -11,7 +11,7 @@ import ( "os/exec" "syscall" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "gopkg.in/natefinch/lumberjack.v2" ) diff --git a/integration/generator/test_case_generator.go b/integration/generator/test_case_generator.go index 456c0e5f08..7ce48a9462 100644 --- a/integration/generator/test_case_generator.go +++ b/integration/generator/test_case_generator.go @@ -42,14 +42,14 @@ func main() { func genMatrix(targetOS string, testDirList []string) []map[string]string { openTestMatrix, err := os.Open(fmt.Sprintf("integration/generator/resources/%v_test_matrix.json", targetOS)) - + if err != nil { log.Panicf("can't read file %v_test_matrix.json err %v", targetOS, err) } - + byteValueTestMatrix, _ := ioutil.ReadAll(openTestMatrix) _ = openTestMatrix.Close() - + var testMatrix []map[string]string err = json.Unmarshal(byteValueTestMatrix, &testMatrix) if err != nil { diff --git a/integration/terraform/ec2/README.md b/integration/terraform/ec2/README.md index 5856575488..59a138c9da 100644 --- a/integration/terraform/ec2/README.md +++ b/integration/terraform/ec2/README.md @@ -181,7 +181,7 @@ on creating the key pair. ## Required parameters for Terraform to have handy -1. GitHub repo (ex: https://github.com/aws/amazon-cloudwatch-agent.git) +1. GitHub repo (ex: https://github.com/aws/private-amazon-cloudwatch-agent-staging.git) 2. GitHub SHA: `git checkout your-branch && git rev-parse --verify HEAD` 3. EC2 security groups (ex: `["sg-abc123"]`) 4. EC2 key name (the name of the `.pem` file, typically) @@ -265,7 +265,7 @@ Navigate to the localstack terraform directory, initialize Terraform and apply t cd ./integration/terraform/ec2/localstack terraform init terraform apply --auto-approve \ - -var="github_repo=${gh repo you want to use ex https://github.com/aws/amazon-cloudwatch-agent.git}" \ + -var="github_repo=${gh repo you want to use ex https://github.com/aws/private-amazon-cloudwatch-agent-staging.git}" \ -var="github_sha=${commit sha you want to use ex fb9229b9eaabb42461a4c049d235567f9c0439f8}" \ -var='vpc_security_group_ids=["${name of your security group}"]' \ -var="key_name=${name of key pair your created}" \ @@ -301,7 +301,7 @@ Start the linux integration tests (example): cd ../linux # assuming you are still in the ./integration/terraform/ec2/localstack directory terraform init terraform apply --auto-approve \ - -var="github_repo=${gh repo you want to use ex https://github.com/aws/amazon-cloudwatch-agent.git}" \ + -var="github_repo=${gh repo you want to use ex https://github.com/aws/private-amazon-cloudwatch-agent-staging.git}" \ -var="github_sha=${commit sha you want to use ex fb9229b9eaabb42461a4c049d235567f9c0439f8}" \ -var='vpc_security_group_ids=["${name of your security group}"]' \ -var="s3_bucket=${name of your s3 bucket created}" \ @@ -329,16 +329,16 @@ aws_instance.integration-test (remote-exec): --- PASS: TestBundle/resource_f aws_instance.integration-test (remote-exec): --- PASS: TestBundle/resource_file_location_resources/integration/ssl/with/original/bundle_find_target_true (61.06s) aws_instance.integration-test (remote-exec): --- PASS: TestBundle/resource_file_location_resources/integration/ssl/without/bundle_find_target_true (61.13s) aws_instance.integration-test (remote-exec): PASS -aws_instance.integration-test (remote-exec): ok github.com/aws/amazon-cloudwatch-agent/integration/test/ca_bundle 243.288s +aws_instance.integration-test (remote-exec): ok github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test/ca_bundle 243.288s aws_instance.integration-test (remote-exec): === RUN TestEmpty aws_instance.integration-test (remote-exec): --- PASS: TestEmpty (0.00s) aws_instance.integration-test (remote-exec): PASS -aws_instance.integration-test (remote-exec): ok github.com/aws/amazon-cloudwatch-agent/integration/test/empty 0.002s +aws_instance.integration-test (remote-exec): ok github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test/empty 0.002s aws_instance.integration-test (remote-exec): === RUN TestAgentStatus aws_instance.integration-test: Still creating... [5m30s elapsed] aws_instance.integration-test (remote-exec): --- PASS: TestAgentStatus (6.54s) aws_instance.integration-test (remote-exec): PASS -aws_instance.integration-test (remote-exec): ok github.com/aws/amazon-cloudwatch-agent/integration/test/sanity 6.541s +aws_instance.integration-test (remote-exec): ok github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test/sanity 6.541s aws_instance.integration-test: Creation complete after 5m35s [id=i-0f7f77a62c93df010] Apply complete! Resources: 1 added, 0 changed, 0 destroyed. diff --git a/integration/test/ca_bundle/ca_bundle_test.go b/integration/test/ca_bundle/ca_bundle_test.go index 32f3bbe14f..e934a2411d 100644 --- a/integration/test/ca_bundle/ca_bundle_test.go +++ b/integration/test/ca_bundle/ca_bundle_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) const configOutputPath = "/opt/aws/amazon-cloudwatch-agent/bin/config.json" diff --git a/integration/test/cloudwatchlogs/publish_logs_test.go b/integration/test/cloudwatchlogs/publish_logs_test.go index 3ba306d5a1..e03393c09f 100644 --- a/integration/test/cloudwatchlogs/publish_logs_test.go +++ b/integration/test/cloudwatchlogs/publish_logs_test.go @@ -12,7 +12,7 @@ import ( "os" "strings" - "github.com/aws/amazon-cloudwatch-agent/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" "testing" "time" diff --git a/integration/test/cwl_util.go b/integration/test/cwl_util.go index 7f7b789f7f..c50c71f0aa 100644 --- a/integration/test/cwl_util.go +++ b/integration/test/cwl_util.go @@ -181,7 +181,7 @@ func IsLogGroupExists(t *testing.T, logGroupName string) bool { if err != nil { t.Errorf("Error getting log group data %v", err) } - + if len(describeLogGroupOutput.LogGroups) > 0 { return true } diff --git a/integration/test/ecs/ecs_metadata/ecs_metadata_test.go b/integration/test/ecs/ecs_metadata/ecs_metadata_test.go index a818c16ac2..cb597a3f6a 100644 --- a/integration/test/ecs/ecs_metadata/ecs_metadata_test.go +++ b/integration/test/ecs/ecs_metadata/ecs_metadata_test.go @@ -12,19 +12,20 @@ import ( "log" "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/integration/test" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) -// Purpose: Detect the changes in metadata endpoint for ECS Container Agent https://github.com/aws/amazon-cloudwatch-agent/blob/master/translator/util/ecsutil/ecsutil.go#L67-L75 -// Implementation: Checking if a log group's the format(https://github.com/aws/amazon-cloudwatch-agent/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33) +// Purpose: Detect the changes in metadata endpoint for ECS Container Agent https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/util/ecsutil/ecsutil.go#L67-L75 +// Implementation: Checking if a log group's the format(https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33) // exists or not since the log group's format has the scrapping cluster name from metadata endpoint. const ( - RetryTime = 15 - // Log group format: https://github.com/aws/amazon-cloudwatch-agent/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33 + RetryTime = 15 + // Log group format: https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33 ECSLogGroupNameFormat = "/aws/ecs/containerinsights/%s" // Log stream based on job name: https://github.com/khanhntd/amazon-cloudwatch-agent/blob/ecs_metadata/integration/test/ecs/ecs_metadata/resources/extra_apps.tpl#L41 - LogStreamName = "prometheus-redis" + LogStreamName = "prometheus-redis" ) var clusterName = flag.String("clusterName", "", "Please provide the os preference, valid value: windows/linux.") @@ -37,9 +38,9 @@ func TestValidatingCloudWatchLogs(t *testing.T) { if currentRetry == RetryTime { t.Fatalf("Test metadata has exhausted %v retry time", RetryTime) } - - if test.IsLogGroupExists(t,logGroupName) { - test.DeleteLogGroupAndStream(logGroupName,LogStreamName) + + if test.IsLogGroupExists(t, logGroupName) { + test.DeleteLogGroupAndStream(logGroupName, LogStreamName) break } diff --git a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go index 78e020af8c..9faa887c38 100644 --- a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go +++ b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/integration/test" - cwPlugin "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/cloudwatch" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" + cwPlugin "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" ) const configOutputPath = "/opt/aws/amazon-cloudwatch-agent/bin/config.json" diff --git a/integration/test/sanity/sanity_test.go b/integration/test/sanity/sanity_test.go index b79eae2e1f..c30c2cd212 100644 --- a/integration/test/sanity/sanity_test.go +++ b/integration/test/sanity/sanity_test.go @@ -9,7 +9,7 @@ package sanity import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) func TestAgentStatus(t *testing.T) { diff --git a/internal/ecsservicediscovery/servicediscovery.go b/internal/ecsservicediscovery/servicediscovery.go index 73cd4b9b35..c3492edd45 100644 --- a/internal/ecsservicediscovery/servicediscovery.go +++ b/internal/ecsservicediscovery/servicediscovery.go @@ -8,10 +8,10 @@ import ( "sync" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" ) type ServiceDiscovery struct { diff --git a/internal/k8sCommon/k8sclient/endpoint.go b/internal/k8sCommon/k8sclient/endpoint.go index fb5bad4724..938308a147 100644 --- a/internal/k8sCommon/k8sclient/endpoint.go +++ b/internal/k8sCommon/k8sclient/endpoint.go @@ -7,14 +7,15 @@ import ( "context" "errors" "fmt" - "k8s.io/klog/v2" - "k8s.io/klog/v2/klogr" "log" "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sutil" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sutil" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/k8sCommon/k8sclient/endpoint_test.go b/internal/k8sCommon/k8sclient/endpoint_test.go index 484edd9dba..2b41d6d45b 100644 --- a/internal/k8sCommon/k8sclient/endpoint_test.go +++ b/internal/k8sCommon/k8sclient/endpoint_test.go @@ -4,11 +4,12 @@ package k8sclient import ( - "gotest.tools/v3/assert" "log" "testing" "time" + "gotest.tools/v3/assert" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awsutil" v1 "k8s.io/api/core/v1" diff --git a/internal/k8sCommon/k8sclient/node_test.go b/internal/k8sCommon/k8sclient/node_test.go index 384b38ff2c..b2e6eb527f 100644 --- a/internal/k8sCommon/k8sclient/node_test.go +++ b/internal/k8sCommon/k8sclient/node_test.go @@ -4,11 +4,12 @@ package k8sclient import ( - "github.com/stretchr/testify/assert" "log" "testing" "time" + "github.com/stretchr/testify/assert" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/k8sclient/pod_test.go b/internal/k8sCommon/k8sclient/pod_test.go index dc73ad1966..e4de02b4cd 100644 --- a/internal/k8sCommon/k8sclient/pod_test.go +++ b/internal/k8sCommon/k8sclient/pod_test.go @@ -4,10 +4,11 @@ package k8sclient import ( - "gotest.tools/v3/assert" "log" "testing" + "gotest.tools/v3/assert" + "github.com/aws/aws-sdk-go/aws/awsutil" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/internal/k8sCommon/k8sclient/replicaset.go b/internal/k8sCommon/k8sclient/replicaset.go index 0beef0605b..7eada403c3 100644 --- a/internal/k8sCommon/k8sclient/replicaset.go +++ b/internal/k8sCommon/k8sclient/replicaset.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/internal/k8sCommon/k8sclient/replicaset_test.go b/internal/k8sCommon/k8sclient/replicaset_test.go index 01b56ea0b7..55dd87e4ee 100644 --- a/internal/k8sCommon/k8sclient/replicaset_test.go +++ b/internal/k8sCommon/k8sclient/replicaset_test.go @@ -4,9 +4,10 @@ package k8sclient import ( - "gotest.tools/v3/assert" "testing" + "gotest.tools/v3/assert" + appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/kubeletutil/kubeletclient.go b/internal/k8sCommon/kubeletutil/kubeletclient.go index 0bd196180e..ee8c4fed08 100644 --- a/internal/k8sCommon/kubeletutil/kubeletclient.go +++ b/internal/k8sCommon/kubeletutil/kubeletclient.go @@ -14,7 +14,7 @@ import ( "errors" - "github.com/aws/amazon-cloudwatch-agent/internal/tls" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/tls" corev1 "k8s.io/api/core/v1" ) diff --git a/internal/k8sCommon/kubeletutil/kubeletclient_test.go b/internal/k8sCommon/kubeletutil/kubeletclient_test.go index 96a553df33..e799cec326 100644 --- a/internal/k8sCommon/kubeletutil/kubeletclient_test.go +++ b/internal/k8sCommon/kubeletutil/kubeletclient_test.go @@ -4,12 +4,13 @@ package kubeletutil import ( - "github.com/stretchr/testify/assert" "io/ioutil" "net/http" "strings" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" ) diff --git a/internal/mapWithExpiry/mapWithExpiry_test.go b/internal/mapWithExpiry/mapWithExpiry_test.go index dc4836a649..8104233ca0 100644 --- a/internal/mapWithExpiry/mapWithExpiry_test.go +++ b/internal/mapWithExpiry/mapWithExpiry_test.go @@ -4,9 +4,10 @@ package mapWithExpiry import ( - "github.com/stretchr/testify/assert" "testing" "time" + + "github.com/stretchr/testify/assert" ) func TestMapWithExpiry_add(t *testing.T) { diff --git a/internal/models/awscsm_pipeline.go b/internal/models/awscsm_pipeline.go index 1b005b122a..1e86f9813e 100644 --- a/internal/models/awscsm_pipeline.go +++ b/internal/models/awscsm_pipeline.go @@ -7,7 +7,7 @@ import ( "log" "math" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/selfstat" ) diff --git a/logger/lumberjack_const.go b/logger/lumberjack_const.go index fb54ee59d8..97ba6e6a31 100644 --- a/logger/lumberjack_const.go +++ b/logger/lumberjack_const.go @@ -6,4 +6,3 @@ package logger const ( LogTargetLumberjack = "lumberjack" ) - diff --git a/logger/lumberjack_const_test.go b/logger/lumberjack_const_test.go index 1593f65a0f..bf03942276 100644 --- a/logger/lumberjack_const_test.go +++ b/logger/lumberjack_const_test.go @@ -101,6 +101,6 @@ func createBasicLogConfig(filename string) logger.LogConfig { Logfile: filename, LogTarget: LogTargetLumberjack, RotationMaxArchives: -1, - LogWithTimezone: "UTC", + LogWithTimezone: "UTC", } } diff --git a/metric/distribution/regular/regular_distribution.go b/metric/distribution/regular/regular_distribution.go index e8ff62069d..c675edf4c5 100644 --- a/metric/distribution/regular/regular_distribution.go +++ b/metric/distribution/regular/regular_distribution.go @@ -8,7 +8,7 @@ import ( "log" "math" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" ) type RegularDistribution struct { diff --git a/metric/distribution/seh1/seh1_distribution.go b/metric/distribution/seh1/seh1_distribution.go index 78e25378e7..c675639f71 100644 --- a/metric/distribution/seh1/seh1_distribution.go +++ b/metric/distribution/seh1/seh1_distribution.go @@ -8,7 +8,7 @@ import ( "log" "math" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" ) var bucketForZero int16 = math.MinInt16 diff --git a/plugins/inputs/awscsm/aggregation_record.go b/plugins/inputs/awscsm/aggregation_record.go index 5ac9d8f5a4..13a6546c0e 100644 --- a/plugins/inputs/awscsm/aggregation_record.go +++ b/plugins/inputs/awscsm/aggregation_record.go @@ -11,8 +11,8 @@ import ( "strings" "time" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) // AggregationRecords is a map of aggregation records diff --git a/plugins/inputs/awscsm/aggregation_record_test.go b/plugins/inputs/awscsm/aggregation_record_test.go index 52ae158b9f..f40e03b433 100644 --- a/plugins/inputs/awscsm/aggregation_record_test.go +++ b/plugins/inputs/awscsm/aggregation_record_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) func TestRecordConversion(t *testing.T) { diff --git a/plugins/inputs/awscsm/awscsm_listener.go b/plugins/inputs/awscsm/awscsm_listener.go index 02a5f2245e..694d109d62 100644 --- a/plugins/inputs/awscsm/awscsm_listener.go +++ b/plugins/inputs/awscsm/awscsm_listener.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/internal/models" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/models" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/plugins/inputs" diff --git a/plugins/inputs/awscsm/samples.go b/plugins/inputs/awscsm/samples.go index aff7f31a24..3ca6b4baa8 100644 --- a/plugins/inputs/awscsm/samples.go +++ b/plugins/inputs/awscsm/samples.go @@ -11,7 +11,7 @@ import ( "sort" "time" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) // Samples represent the raw request received from the input. diff --git a/plugins/inputs/cadvisor/cadvisor.go b/plugins/inputs/cadvisor/cadvisor.go index 35a0a28104..6731381726 100644 --- a/plugins/inputs/cadvisor/cadvisor.go +++ b/plugins/inputs/cadvisor/cadvisor.go @@ -12,8 +12,8 @@ import ( "net/http" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/cadvisor/mesos" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/mesos" "github.com/google/cadvisor/cache/memory" cadvisormetrics "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/containerd" diff --git a/plugins/inputs/cadvisor/container_info_processor.go b/plugins/inputs/cadvisor/container_info_processor.go index 4b30a58909..d2ee65c1b7 100644 --- a/plugins/inputs/cadvisor/container_info_processor.go +++ b/plugins/inputs/cadvisor/container_info_processor.go @@ -10,9 +10,9 @@ import ( "strings" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/cadvisor/extractors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/extractors" cinfo "github.com/google/cadvisor/info/v1" ) @@ -71,7 +71,7 @@ func processContainers(cInfos []*cinfo.ContainerInfo, detailMode bool, container // contained https://github.com/aws/amazon-cloudwatch-agent/issues/188 // docker systemd https://github.com/aws/amazon-cloudwatch-agent/pull/171 if len(metrics) == beforePod { - log.Printf("W! No pod metric collected, metrics count is still %d is containerd socket mounted? https://github.com/aws/amazon-cloudwatch-agent/issues/188", beforePod) + log.Printf("W! No pod metric collected, metrics count is still %d is containerd socket mounted? https://github.com/aws/private-amazon-cloudwatch-agent-staging/issues/188", beforePod) } metrics = mergeMetrics(metrics) @@ -197,7 +197,7 @@ func processPod(info *cinfo.ContainerInfo, podKeys map[string]podKey) []*extract // Check if it's a container running inside container, caller will drop the metric when return value is true. // The validation is based on ContainerReference.Name, which is essentially cgroup path. -// The first version is from https://github.com/aws/amazon-cloudwatch-agent/commit/e8daa5f5926c5a5f38e0ceb746c141be463e11e4#diff-599185154c116b295172b56311729990d20672f6659500870997c018ce072100 +// The first version is from https://github.com/aws/private-amazon-cloudwatch-agent-staging/commit/e8daa5f5926c5a5f38e0ceb746c141be463e11e4#diff-599185154c116b295172b56311729990d20672f6659500870997c018ce072100 // But the logic no longer works when docker is using systemd as cgroup driver, because a prefix like `kubepods` is attached to each segment. // The new name pattern with systemd is // - Guaranteed /kubepods.slice/kubepods-podc8f7bb69_65f2_4b61_ae5a_9b19ac47a239.slice/docker-523b624a86a2a74c2bedf586d8448c86887ef7858a8dec037d6559e5ad3fccb5.scope diff --git a/plugins/inputs/cadvisor/extractors/cpu_extractor.go b/plugins/inputs/cadvisor/extractors/cpu_extractor.go index f5c51b211f..fbdf5adfcd 100644 --- a/plugins/inputs/cadvisor/extractors/cpu_extractor.go +++ b/plugins/inputs/cadvisor/extractors/cpu_extractor.go @@ -6,8 +6,8 @@ package extractors import ( "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" cInfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go b/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go index 9e3a8ff654..68858e7f8f 100644 --- a/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/diskio_extractor.go b/plugins/inputs/cadvisor/extractors/diskio_extractor.go index 011da23ff3..846d9af062 100644 --- a/plugins/inputs/cadvisor/extractors/diskio_extractor.go +++ b/plugins/inputs/cadvisor/extractors/diskio_extractor.go @@ -9,8 +9,8 @@ import ( "strings" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go b/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go index 946bf3f72d..bddd48fc59 100644 --- a/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/extractor.go b/plugins/inputs/cadvisor/extractors/extractor.go index d076f18e11..39c9c42167 100644 --- a/plugins/inputs/cadvisor/extractors/extractor.go +++ b/plugins/inputs/cadvisor/extractors/extractor.go @@ -7,7 +7,7 @@ import ( "log" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/extractor_test.go b/plugins/inputs/cadvisor/extractors/extractor_test.go index 0a5b2d0da7..c6ac4d9633 100644 --- a/plugins/inputs/cadvisor/extractors/extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/extractor_test.go @@ -6,7 +6,7 @@ package extractors import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/stretchr/testify/assert" ) diff --git a/plugins/inputs/cadvisor/extractors/fs_extractor.go b/plugins/inputs/cadvisor/extractors/fs_extractor.go index e8f70f8cb5..4605962541 100644 --- a/plugins/inputs/cadvisor/extractors/fs_extractor.go +++ b/plugins/inputs/cadvisor/extractors/fs_extractor.go @@ -8,7 +8,7 @@ import ( "regexp" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/fs_extractor_test.go b/plugins/inputs/cadvisor/extractors/fs_extractor_test.go index 06cf401ec4..73b9345d10 100644 --- a/plugins/inputs/cadvisor/extractors/fs_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/fs_extractor_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" ) diff --git a/plugins/inputs/cadvisor/extractors/mem_extractor.go b/plugins/inputs/cadvisor/extractors/mem_extractor.go index 7e8be186fa..ee2454e117 100644 --- a/plugins/inputs/cadvisor/extractors/mem_extractor.go +++ b/plugins/inputs/cadvisor/extractors/mem_extractor.go @@ -6,8 +6,8 @@ package extractors import ( "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/mem_extractor_test.go b/plugins/inputs/cadvisor/extractors/mem_extractor_test.go index 505457b48c..b4a77f1503 100644 --- a/plugins/inputs/cadvisor/extractors/mem_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/mem_extractor_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/net_extractor.go b/plugins/inputs/cadvisor/extractors/net_extractor.go index 4cae233111..cade9126d0 100644 --- a/plugins/inputs/cadvisor/extractors/net_extractor.go +++ b/plugins/inputs/cadvisor/extractors/net_extractor.go @@ -7,8 +7,8 @@ import ( "log" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/extractors/net_extractor_test.go b/plugins/inputs/cadvisor/extractors/net_extractor_test.go index 169ab92694..a41c41fc8b 100644 --- a/plugins/inputs/cadvisor/extractors/net_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/net_extractor_test.go @@ -9,7 +9,7 @@ import ( "log" "testing" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" ) diff --git a/plugins/inputs/cadvisor/merger.go b/plugins/inputs/cadvisor/merger.go index f2bf9b751e..74e291d774 100644 --- a/plugins/inputs/cadvisor/merger.go +++ b/plugins/inputs/cadvisor/merger.go @@ -6,8 +6,8 @@ package cadvisor import ( "fmt" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/cadvisor/extractors" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/extractors" ) func mergeMetrics(metrics []*extractors.CAdvisorMetric) []*extractors.CAdvisorMetric { diff --git a/plugins/inputs/k8sapiserver/k8sapiserver.go b/plugins/inputs/k8sapiserver/k8sapiserver.go index fa025c8fea..3b77764910 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver.go @@ -11,8 +11,8 @@ import ( "strconv" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" v1 "k8s.io/api/core/v1" diff --git a/plugins/inputs/k8sapiserver/k8sapiserver_test.go b/plugins/inputs/k8sapiserver/k8sapiserver_test.go index 2e88be59f9..a10bae18d0 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver_test.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver_test.go @@ -8,8 +8,8 @@ import ( "os" "testing" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/plugins/inputs/logfile/fileconfig.go b/plugins/inputs/logfile/fileconfig.go index 7b96ac687b..8b446c4074 100644 --- a/plugins/inputs/logfile/fileconfig.go +++ b/plugins/inputs/logfile/fileconfig.go @@ -12,8 +12,8 @@ import ( "strings" "time" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/profiler" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" "golang.org/x/net/html/charset" "golang.org/x/text/encoding" diff --git a/plugins/inputs/logfile/logfile.go b/plugins/inputs/logfile/logfile.go index 80932ce553..57217ba726 100644 --- a/plugins/inputs/logfile/logfile.go +++ b/plugins/inputs/logfile/logfile.go @@ -14,10 +14,10 @@ import ( "strings" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/globpath" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/globpath" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" ) diff --git a/plugins/inputs/logfile/logfile_test.go b/plugins/inputs/logfile/logfile_test.go index 3fcc3e35a4..4e9f15021f 100644 --- a/plugins/inputs/logfile/logfile_test.go +++ b/plugins/inputs/logfile/logfile_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/encoding/simplifiedchinese" @@ -429,9 +429,9 @@ func createWriteRead(t *testing.T, prefix string, logFile *LogFile, done chan bo } t.Log("Verify every line written to the temp file is received.") for i := 0; i < numLines; i++ { - logEvent := <- evts + logEvent := <-evts require.Equal(t, msg, logEvent.Message()) - if i != numLines / 2 { + if i != numLines/2 { continue } // Halfway through start another goroutine to create another temp file. diff --git a/plugins/inputs/logfile/logfilter.go b/plugins/inputs/logfile/logfilter.go index 5cdcb34412..1a7078f092 100644 --- a/plugins/inputs/logfile/logfilter.go +++ b/plugins/inputs/logfile/logfilter.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/aws/amazon-cloudwatch-agent/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" ) const ( diff --git a/plugins/inputs/logfile/tail/tail.go b/plugins/inputs/logfile/tail/tail.go index 982449d485..622a566101 100644 --- a/plugins/inputs/logfile/tail/tail.go +++ b/plugins/inputs/logfile/tail/tail.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail/watch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/watch" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/models" "gopkg.in/tomb.v1" diff --git a/plugins/inputs/logfile/tail/tail_test.go b/plugins/inputs/logfile/tail/tail_test.go index ddd74a46bc..b73600a161 100644 --- a/plugins/inputs/logfile/tail/tail_test.go +++ b/plugins/inputs/logfile/tail/tail_test.go @@ -99,7 +99,7 @@ func TestStopAtEOF(t *testing.T) { assert.Equal(t, errStopAtEOF, tail.Err()) // Read to EOF - for i := 0; i < linesWrittenToFile - 3; i++ { + for i := 0; i < linesWrittenToFile-3; i++ { <-tail.Lines } @@ -107,7 +107,7 @@ func TestStopAtEOF(t *testing.T) { select { case <-done: t.Log("StopAtEOF() completed (as expected)") - case <- time.After(time.Second * 1): + case <-time.After(time.Second * 1): t.Fatalf("StopAtEOF() has not completed") } diff --git a/plugins/inputs/logfile/tail/tail_windows.go b/plugins/inputs/logfile/tail/tail_windows.go index 5d90eed51e..7f1e3abd60 100644 --- a/plugins/inputs/logfile/tail/tail_windows.go +++ b/plugins/inputs/logfile/tail/tail_windows.go @@ -6,7 +6,7 @@ package tail import ( "os" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail/winfile" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/winfile" ) func OpenFile(name string) (file *os.File, err error) { diff --git a/plugins/inputs/logfile/tailersrc.go b/plugins/inputs/logfile/tailersrc.go index fd16695508..8df95267d6 100644 --- a/plugins/inputs/logfile/tailersrc.go +++ b/plugins/inputs/logfile/tailersrc.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" "golang.org/x/text/encoding" ) @@ -76,6 +76,7 @@ type tailerSrc struct { startTailerOnce sync.Once cleanUpFns []func() } + // Verify tailerSrc implements LogSrc var _ logs.LogSrc = (*tailerSrc)(nil) diff --git a/plugins/inputs/logfile/tailersrc_test.go b/plugins/inputs/logfile/tailersrc_test.go index 4b478776cf..ae363b0e50 100644 --- a/plugins/inputs/logfile/tailersrc_test.go +++ b/plugins/inputs/logfile/tailersrc_test.go @@ -17,11 +17,11 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/profiler" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" "github.com/stretchr/testify/assert" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" ) type tailerTestResources struct { diff --git a/plugins/inputs/logfile/tmpfile_windows.go b/plugins/inputs/logfile/tmpfile_windows.go index 923fd4f227..337be38fe0 100644 --- a/plugins/inputs/logfile/tmpfile_windows.go +++ b/plugins/inputs/logfile/tmpfile_windows.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "os" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail/winfile" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/winfile" ) func createTempFile(dir, prefix string) (*os.File, error) { diff --git a/plugins/inputs/prometheus_scraper/delta_calculator.go b/plugins/inputs/prometheus_scraper/delta_calculator.go index 2ecf2a161c..76d9eda180 100644 --- a/plugins/inputs/prometheus_scraper/delta_calculator.go +++ b/plugins/inputs/prometheus_scraper/delta_calculator.go @@ -7,7 +7,7 @@ import ( "log" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" ) const ( diff --git a/plugins/inputs/prometheus_scraper/metric_type_handler_test.go b/plugins/inputs/prometheus_scraper/metric_type_handler_test.go index 7b05c64a86..da4db6cafb 100644 --- a/plugins/inputs/prometheus_scraper/metric_type_handler_test.go +++ b/plugins/inputs/prometheus_scraper/metric_type_handler_test.go @@ -4,11 +4,12 @@ package prometheus_scraper import ( - "github.com/prometheus/prometheus/model/labels" - "github.com/prometheus/prometheus/model/textparse" "net/url" "testing" + "github.com/prometheus/prometheus/model/labels" + "github.com/prometheus/prometheus/model/textparse" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/scrape" "github.com/stretchr/testify/assert" diff --git a/plugins/inputs/prometheus_scraper/metrics_handler.go b/plugins/inputs/prometheus_scraper/metrics_handler.go index e9045ca11c..0fdbd29094 100644 --- a/plugins/inputs/prometheus_scraper/metrics_handler.go +++ b/plugins/inputs/prometheus_scraper/metrics_handler.go @@ -8,8 +8,8 @@ import ( "strconv" "sync" - "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/influxdata/telegraf" ) diff --git a/plugins/inputs/prometheus_scraper/metrics_receiver.go b/plugins/inputs/prometheus_scraper/metrics_receiver.go index 61ceacd06f..3c46c5ae94 100644 --- a/plugins/inputs/prometheus_scraper/metrics_receiver.go +++ b/plugins/inputs/prometheus_scraper/metrics_receiver.go @@ -6,11 +6,12 @@ package prometheus_scraper import ( "context" "errors" + "log" + "math" + "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/value" - "log" - "math" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/storage" diff --git a/plugins/inputs/prometheus_scraper/metrics_receiver_test.go b/plugins/inputs/prometheus_scraper/metrics_receiver_test.go index 176bf5b960..ef43c1af25 100644 --- a/plugins/inputs/prometheus_scraper/metrics_receiver_test.go +++ b/plugins/inputs/prometheus_scraper/metrics_receiver_test.go @@ -4,9 +4,10 @@ package prometheus_scraper import ( + "testing" + "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - "testing" "github.com/stretchr/testify/assert" ) diff --git a/plugins/inputs/prometheus_scraper/metrics_type_handler.go b/plugins/inputs/prometheus_scraper/metrics_type_handler.go index c2e85ec9e7..5559911217 100644 --- a/plugins/inputs/prometheus_scraper/metrics_type_handler.go +++ b/plugins/inputs/prometheus_scraper/metrics_type_handler.go @@ -6,10 +6,11 @@ package prometheus_scraper import ( "errors" "fmt" - "github.com/prometheus/prometheus/model/textparse" "log" "strings" + "github.com/prometheus/prometheus/model/textparse" + "github.com/prometheus/prometheus/scrape" ) diff --git a/plugins/inputs/prometheus_scraper/prometheus_scraper.go b/plugins/inputs/prometheus_scraper/prometheus_scraper.go index 1a8e547229..57d9f27e0d 100644 --- a/plugins/inputs/prometheus_scraper/prometheus_scraper.go +++ b/plugins/inputs/prometheus_scraper/prometheus_scraper.go @@ -6,7 +6,7 @@ package prometheus_scraper import ( "sync" - "github.com/aws/amazon-cloudwatch-agent/internal/ecsservicediscovery" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/ecsservicediscovery" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" ) diff --git a/plugins/inputs/prometheus_scraper/start.go b/plugins/inputs/prometheus_scraper/start.go index 48b26804e6..ced0bf4580 100644 --- a/plugins/inputs/prometheus_scraper/start.go +++ b/plugins/inputs/prometheus_scraper/start.go @@ -21,6 +21,13 @@ package prometheus_scraper import ( "context" + "io/ioutil" + "os" + "os/signal" + "runtime" + "sync" + "syscall" + "github.com/go-kit/kit/log" "github.com/go-kit/kit/log/level" "github.com/oklog/run" @@ -36,14 +43,8 @@ import ( "github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/storage" promRuntime "github.com/prometheus/prometheus/util/runtime" - "io/ioutil" "k8s.io/klog/v2" "k8s.io/klog/v2/klogr" - "os" - "os/signal" - "runtime" - "sync" - "syscall" ) var ( diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go index 86d190f405..8969e7097d 100644 --- a/plugins/inputs/statsd/statsd.go +++ b/plugins/inputs/statsd/statsd.go @@ -14,8 +14,8 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/statsd/graphite" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/statsd/graphite" //"github.com/influxdata/telegraf/plugins/parsers/graphite" diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go index 3c24ed2e8a..f0fad60fa4 100644 --- a/plugins/inputs/statsd/statsd_test.go +++ b/plugins/inputs/statsd/statsd_test.go @@ -9,8 +9,8 @@ import ( "math" "testing" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/seh1" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" diff --git a/plugins/inputs/windows_event_log/windows_event_log.go b/plugins/inputs/windows_event_log/windows_event_log.go index 50df63f8b7..8f99c74811 100644 --- a/plugins/inputs/windows_event_log/windows_event_log.go +++ b/plugins/inputs/windows_event_log/windows_event_log.go @@ -13,9 +13,9 @@ import ( "strings" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/windows_event_log/wineventlog" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/windows_event_log/wineventlog" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" ) diff --git a/plugins/inputs/windows_event_log/wineventlog/wineventlog.go b/plugins/inputs/windows_event_log/wineventlog/wineventlog.go index 656839bc52..f8bfd33e56 100644 --- a/plugins/inputs/windows_event_log/wineventlog/wineventlog.go +++ b/plugins/inputs/windows_event_log/wineventlog/wineventlog.go @@ -19,7 +19,7 @@ import ( "encoding/xml" - "github.com/aws/amazon-cloudwatch-agent/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "golang.org/x/sys/windows" ) diff --git a/plugins/outputs/awscsm/adapters.go b/plugins/outputs/awscsm/adapters.go index c6c0deaeb7..957c2940f1 100644 --- a/plugins/outputs/awscsm/adapters.go +++ b/plugins/outputs/awscsm/adapters.go @@ -4,10 +4,10 @@ package awscsm import ( - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" ) func adaptToCSMFrequencyMetrics(m []awscsmmetrics.FrequencyMetric) []*sdkmetricsdataplane.FrequencyMetric { diff --git a/plugins/outputs/awscsm/adapters_test.go b/plugins/outputs/awscsm/adapters_test.go index 7b13a17228..6d206b3c4c 100644 --- a/plugins/outputs/awscsm/adapters_test.go +++ b/plugins/outputs/awscsm/adapters_test.go @@ -7,9 +7,9 @@ import ( "reflect" "testing" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) func TestAdaptFrequencyMetrics(t *testing.T) { diff --git a/plugins/outputs/awscsm/awscsm.go b/plugins/outputs/awscsm/awscsm.go index da11c8c62e..45805b3185 100644 --- a/plugins/outputs/awscsm/awscsm.go +++ b/plugins/outputs/awscsm/awscsm.go @@ -11,20 +11,20 @@ import ( "runtime" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" "github.com/influxdata/telegraf" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/handlers" - "github.com/aws/amazon-cloudwatch-agent/internal/models" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/models" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" "github.com/influxdata/telegraf/plugins/outputs" ) diff --git a/plugins/outputs/awscsm/awscsm_test.go b/plugins/outputs/awscsm/awscsm_test.go index 00fb772da0..69d8b03655 100644 --- a/plugins/outputs/awscsm/awscsm_test.go +++ b/plugins/outputs/awscsm/awscsm_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) type mockDataplane struct { diff --git a/plugins/outputs/awscsm/csm_writer.go b/plugins/outputs/awscsm/csm_writer.go index 2ec32b4421..18b2162064 100644 --- a/plugins/outputs/awscsm/csm_writer.go +++ b/plugins/outputs/awscsm/csm_writer.go @@ -7,12 +7,12 @@ import ( "fmt" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm/csmiface" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm/csmiface" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) const ( diff --git a/plugins/outputs/awscsm/metametrics/listener.go b/plugins/outputs/awscsm/metametrics/listener.go index ad719765a4..9e00a737ab 100644 --- a/plugins/outputs/awscsm/metametrics/listener.go +++ b/plugins/outputs/awscsm/metametrics/listener.go @@ -8,7 +8,7 @@ import ( "math/rand" "time" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" ) const ( diff --git a/plugins/outputs/awscsm/metametrics/listener_test.go b/plugins/outputs/awscsm/metametrics/listener_test.go index 50320c898c..8a2e68899d 100644 --- a/plugins/outputs/awscsm/metametrics/listener_test.go +++ b/plugins/outputs/awscsm/metametrics/listener_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" ) type mockWriter struct { diff --git a/plugins/outputs/awscsm/providers/config_provider.go b/plugins/outputs/awscsm/providers/config_provider.go index a74532ff6c..ccf4e46e48 100644 --- a/plugins/outputs/awscsm/providers/config_provider.go +++ b/plugins/outputs/awscsm/providers/config_provider.go @@ -10,10 +10,10 @@ import ( "sync/atomic" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm/csmiface" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm/csmiface" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" ) const ( diff --git a/plugins/outputs/awscsm/providers/config_provider_test.go b/plugins/outputs/awscsm/providers/config_provider_test.go index e199a59985..341523148a 100644 --- a/plugins/outputs/awscsm/providers/config_provider_test.go +++ b/plugins/outputs/awscsm/providers/config_provider_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" ) type mockCSMService struct { diff --git a/plugins/outputs/awscsm/providers/default_definitions.go b/plugins/outputs/awscsm/providers/default_definitions.go index 882080a183..ac6158f245 100644 --- a/plugins/outputs/awscsm/providers/default_definitions.go +++ b/plugins/outputs/awscsm/providers/default_definitions.go @@ -4,7 +4,7 @@ package providers import ( - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) // Key type definitions diff --git a/plugins/outputs/awscsm/providers/dynamic_schema.go b/plugins/outputs/awscsm/providers/dynamic_schema.go index d014b9a621..642cf47f99 100644 --- a/plugins/outputs/awscsm/providers/dynamic_schema.go +++ b/plugins/outputs/awscsm/providers/dynamic_schema.go @@ -7,7 +7,7 @@ import ( "fmt" "sort" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) // Definitions ... diff --git a/plugins/outputs/awscsm/providers/dynamic_schema_test.go b/plugins/outputs/awscsm/providers/dynamic_schema_test.go index 33cb513aa9..eb570dd8a3 100644 --- a/plugins/outputs/awscsm/providers/dynamic_schema_test.go +++ b/plugins/outputs/awscsm/providers/dynamic_schema_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) func TestAddSchema(t *testing.T) { diff --git a/plugins/outputs/awscsm/providers/event_key_type.go b/plugins/outputs/awscsm/providers/event_key_type.go index 3ec6102ab3..a5a25b8b77 100644 --- a/plugins/outputs/awscsm/providers/event_key_type.go +++ b/plugins/outputs/awscsm/providers/event_key_type.go @@ -6,7 +6,7 @@ package providers import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) var errEventEntryKeyTypeNil = newLoopControlError("metric key type is nil", loopStateContinue) diff --git a/plugins/outputs/awscsm/providers/event_key_type_test.go b/plugins/outputs/awscsm/providers/event_key_type_test.go index 3658b1ea05..47763a31b9 100644 --- a/plugins/outputs/awscsm/providers/event_key_type_test.go +++ b/plugins/outputs/awscsm/providers/event_key_type_test.go @@ -6,10 +6,10 @@ package providers_test import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) func TestEventEntryKeyType(t *testing.T) { diff --git a/plugins/outputs/awscsm/providers/metric_type.go b/plugins/outputs/awscsm/providers/metric_type.go index c935f00ea9..0024fae88b 100644 --- a/plugins/outputs/awscsm/providers/metric_type.go +++ b/plugins/outputs/awscsm/providers/metric_type.go @@ -6,7 +6,7 @@ package providers import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) // MetricType is a type aliased string used to diff --git a/plugins/outputs/awscsm/providers/metric_type_test.go b/plugins/outputs/awscsm/providers/metric_type_test.go index 9b5c4b0681..3276023d26 100644 --- a/plugins/outputs/awscsm/providers/metric_type_test.go +++ b/plugins/outputs/awscsm/providers/metric_type_test.go @@ -6,10 +6,10 @@ package providers_test import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/csm" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) func TestMetricType(t *testing.T) { diff --git a/plugins/outputs/awscsm/providers/mock_config_provider.go b/plugins/outputs/awscsm/providers/mock_config_provider.go index 1c795a8f98..1ee94fcafa 100644 --- a/plugins/outputs/awscsm/providers/mock_config_provider.go +++ b/plugins/outputs/awscsm/providers/mock_config_provider.go @@ -4,7 +4,7 @@ package providers import ( - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/metametrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" ) type MockConfigProvider struct{} diff --git a/plugins/outputs/awscsm/record_ring.go b/plugins/outputs/awscsm/record_ring.go index 87dd2078ea..6832334cea 100644 --- a/plugins/outputs/awscsm/record_ring.go +++ b/plugins/outputs/awscsm/record_ring.go @@ -6,8 +6,8 @@ package awscsm import ( "container/list" - awscsmmetrics "github.com/aws/amazon-cloudwatch-agent/awscsm" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" "github.com/influxdata/telegraf" ) diff --git a/plugins/outputs/awscsm/record_ring_test.go b/plugins/outputs/awscsm/record_ring_test.go index f36537d72c..dfb60d60e7 100644 --- a/plugins/outputs/awscsm/record_ring_test.go +++ b/plugins/outputs/awscsm/record_ring_test.go @@ -7,7 +7,7 @@ import ( "strconv" "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) func TestEmpty(t *testing.T) { diff --git a/plugins/outputs/awscsm/record_size.go b/plugins/outputs/awscsm/record_size.go index e2dcde4c7a..2702762093 100644 --- a/plugins/outputs/awscsm/record_size.go +++ b/plugins/outputs/awscsm/record_size.go @@ -8,7 +8,7 @@ import ( "time" "unsafe" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) const ( diff --git a/plugins/outputs/awscsm/record_size_test.go b/plugins/outputs/awscsm/record_size_test.go index b28208758d..039bf99e05 100644 --- a/plugins/outputs/awscsm/record_size_test.go +++ b/plugins/outputs/awscsm/record_size_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) const ( diff --git a/plugins/outputs/awscsm/retry_rules.go b/plugins/outputs/awscsm/retry_rules.go index 2234cdf1ff..0dddfad90b 100644 --- a/plugins/outputs/awscsm/retry_rules.go +++ b/plugins/outputs/awscsm/retry_rules.go @@ -4,8 +4,8 @@ package awscsm import ( - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) const ( diff --git a/plugins/outputs/awscsm/retry_rules_test.go b/plugins/outputs/awscsm/retry_rules_test.go index 266e642973..6aad27f00e 100644 --- a/plugins/outputs/awscsm/retry_rules_test.go +++ b/plugins/outputs/awscsm/retry_rules_test.go @@ -7,8 +7,8 @@ import ( "reflect" "testing" - "github.com/aws/amazon-cloudwatch-agent/awscsm/sdkmetricsdataplane" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) type mockError struct { diff --git a/plugins/outputs/awscsm/samples.go b/plugins/outputs/awscsm/samples.go index e16249d109..3e67546329 100644 --- a/plugins/outputs/awscsm/samples.go +++ b/plugins/outputs/awscsm/samples.go @@ -11,7 +11,7 @@ import ( "fmt" "hash/crc32" - "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm/providers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) var crc32cTable = crc32.MakeTable(crc32.Castagnoli) diff --git a/plugins/outputs/cloudwatch/aggregator.go b/plugins/outputs/cloudwatch/aggregator.go index b21edfd0d2..d82c9a5b87 100644 --- a/plugins/outputs/cloudwatch/aggregator.go +++ b/plugins/outputs/cloudwatch/aggregator.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" ) diff --git a/plugins/outputs/cloudwatch/aggregator_test.go b/plugins/outputs/cloudwatch/aggregator_test.go index 6dce07403d..8f415d341e 100644 --- a/plugins/outputs/cloudwatch/aggregator_test.go +++ b/plugins/outputs/cloudwatch/aggregator_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/seh1" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index 8332121bf9..72953f6bd5 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -13,18 +13,18 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/publisher" - "github.com/aws/amazon-cloudwatch-agent/internal/retryer" - - "github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - handlers "github.com/aws/amazon-cloudwatch-agent/handlers" - "github.com/aws/amazon-cloudwatch-agent/internal" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" + "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + handlers "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/outputs" ) diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go index 5f4635dd46..dcc6114fe0 100644 --- a/plugins/outputs/cloudwatch/cloudwatch_test.go +++ b/plugins/outputs/cloudwatch/cloudwatch_test.go @@ -12,14 +12,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/aws/amazon-cloudwatch-agent/internal" - "github.com/aws/amazon-cloudwatch-agent/internal/publisher" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/regular" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" diff --git a/plugins/outputs/cloudwatch/util.go b/plugins/outputs/cloudwatch/util.go index ae34ad9eec..15b31979a7 100644 --- a/plugins/outputs/cloudwatch/util.go +++ b/plugins/outputs/cloudwatch/util.go @@ -9,10 +9,10 @@ import ( "sort" "time" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/regular" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/seh1" "github.com/aws/aws-sdk-go/service/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" ) const ( diff --git a/plugins/outputs/cloudwatch/util_test.go b/plugins/outputs/cloudwatch/util_test.go index c03ae1920e..63fed9e25e 100644 --- a/plugins/outputs/cloudwatch/util_test.go +++ b/plugins/outputs/cloudwatch/util_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/regular" - "github.com/aws/amazon-cloudwatch-agent/metric/distribution/seh1" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" "github.com/stretchr/testify/assert" ) diff --git a/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go b/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go index 88776a66c1..56407a2926 100644 --- a/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go +++ b/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go @@ -10,15 +10,15 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/cfg/agentinfo" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/handlers" - "github.com/aws/amazon-cloudwatch-agent/internal" - "github.com/aws/amazon-cloudwatch-agent/internal/retryer" - "github.com/aws/amazon-cloudwatch-agent/logs" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/outputs" ) diff --git a/plugins/outputs/cloudwatchlogs/pusher.go b/plugins/outputs/cloudwatchlogs/pusher.go index da48bbb876..fe21d0f2a9 100644 --- a/plugins/outputs/cloudwatchlogs/pusher.go +++ b/plugins/outputs/cloudwatchlogs/pusher.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/logs" - "github.com/aws/amazon-cloudwatch-agent/profiler" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" "github.com/influxdata/telegraf" ) diff --git a/plugins/parsers/emf/parser.go b/plugins/parsers/emf/parser.go index 01f6486811..dac3e0c56c 100644 --- a/plugins/parsers/emf/parser.go +++ b/plugins/parsers/emf/parser.go @@ -11,7 +11,7 @@ import ( "strings" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" ) diff --git a/plugins/parsers/emf/parser_test.go b/plugins/parsers/emf/parser_test.go index cdd8d3c0f2..613228cd7b 100644 --- a/plugins/parsers/emf/parser_test.go +++ b/plugins/parsers/emf/parser_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" ) func TestParseValidValues_V1Only(t *testing.T) { diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go index 2f56de01dc..e9ece48681 100644 --- a/plugins/parsers/registry.go +++ b/plugins/parsers/registry.go @@ -4,8 +4,8 @@ package parsers import ( - "github.com/aws/amazon-cloudwatch-agent/plugins/parsers/awscsm" - "github.com/aws/amazon-cloudwatch-agent/plugins/parsers/emf" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/emf" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/parsers" ) diff --git a/plugins/plugins.go b/plugins/plugins.go index d103ac6aae..d6bf241e67 100644 --- a/plugins/plugins.go +++ b/plugins/plugins.go @@ -5,31 +5,31 @@ package plugins import ( //Enable cloudwatch-agent process plugins - _ "github.com/aws/amazon-cloudwatch-agent/plugins/processors/delta" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/processors/ec2tagger" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/processors/ecsdecorator" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/processors/emfProcessor" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/processors/k8sdecorator" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/delta" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/ec2tagger" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/ecsdecorator" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/emfProcessor" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/k8sdecorator" // Enabled parsers registry - _ "github.com/aws/amazon-cloudwatch-agent/plugins/parsers" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers" // Enabled cloudwatch-agent input plugins - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/awscsm" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/cadvisor" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/demo" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/k8sapiserver" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/prometheus_scraper" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/statsd" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/win_perf_counters" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/windows_event_log" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/awscsm" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/demo" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/k8sapiserver" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/prometheus_scraper" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/statsd" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/win_perf_counters" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/windows_event_log" // Enabled cloudwatch-agent output plugins - _ "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/awscsm" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/cloudwatch" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/cloudwatchlogs" - _ "github.com/aws/amazon-cloudwatch-agent/plugins/outputs/console" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatchlogs" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/console" // Enabled telegraf input plugins // NOTE: any plugins that are dependencies of the plugins enabled will be enabled too diff --git a/plugins/processors/ec2tagger/ec2tagger.go b/plugins/processors/ec2tagger/ec2tagger.go index 6bec709b12..f3cb88edb0 100644 --- a/plugins/processors/ec2tagger/ec2tagger.go +++ b/plugins/processors/ec2tagger/ec2tagger.go @@ -11,12 +11,12 @@ import ( "sync" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/internal" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" ) diff --git a/plugins/processors/ec2tagger/ec2tagger_test.go b/plugins/processors/ec2tagger/ec2tagger_test.go index 1554678b12..0e39157d74 100644 --- a/plugins/processors/ec2tagger/ec2tagger_test.go +++ b/plugins/processors/ec2tagger/ec2tagger_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/internal" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" "github.com/influxdata/telegraf" "github.com/aws/aws-sdk-go/aws/ec2metadata" diff --git a/plugins/processors/ecsdecorator/ecsdecorator.go b/plugins/processors/ecsdecorator/ecsdecorator.go index da8a0cd153..f877898771 100644 --- a/plugins/processors/ecsdecorator/ecsdecorator.go +++ b/plugins/processors/ecsdecorator/ecsdecorator.go @@ -6,9 +6,9 @@ package ecsdecorator import ( "fmt" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" ) diff --git a/plugins/processors/ecsdecorator/ecsdecorator_test.go b/plugins/processors/ecsdecorator/ecsdecorator_test.go index 531d7b4dcc..45d7f98fb0 100644 --- a/plugins/processors/ecsdecorator/ecsdecorator_test.go +++ b/plugins/processors/ecsdecorator/ecsdecorator_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" ) diff --git a/plugins/processors/ecsdecorator/ecsinfo.go b/plugins/processors/ecsdecorator/ecsinfo.go index bee0a15d54..816e3b4aea 100644 --- a/plugins/processors/ecsdecorator/ecsinfo.go +++ b/plugins/processors/ecsdecorator/ecsinfo.go @@ -11,7 +11,7 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/httpclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/httpclient" ) type ecsInfo struct { diff --git a/plugins/processors/ecsdecorator/metricRule.go b/plugins/processors/ecsdecorator/metricRule.go index bbaa0e72e4..34ac7e492d 100644 --- a/plugins/processors/ecsdecorator/metricRule.go +++ b/plugins/processors/ecsdecorator/metricRule.go @@ -4,8 +4,8 @@ package ecsdecorator import ( - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) const ( diff --git a/plugins/processors/ecsdecorator/metricRule_test.go b/plugins/processors/ecsdecorator/metricRule_test.go index 8cc97e64f3..02130e1e66 100644 --- a/plugins/processors/ecsdecorator/metricRule_test.go +++ b/plugins/processors/ecsdecorator/metricRule_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" ) diff --git a/plugins/processors/emfProcessor/emfProcessor.go b/plugins/processors/emfProcessor/emfProcessor.go index b74b5e6541..07007f9349 100644 --- a/plugins/processors/emfProcessor/emfProcessor.go +++ b/plugins/processors/emfProcessor/emfProcessor.go @@ -6,7 +6,7 @@ package emfProcessor import ( "log" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" ) diff --git a/plugins/processors/emfProcessor/emfProcessor_test.go b/plugins/processors/emfProcessor/emfProcessor_test.go index 7dd87c7362..ca50b9c04e 100644 --- a/plugins/processors/emfProcessor/emfProcessor_test.go +++ b/plugins/processors/emfProcessor/emfProcessor_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" diff --git a/plugins/processors/emfProcessor/metricDefinition.go b/plugins/processors/emfProcessor/metricDefinition.go index e5b1f41eb5..a067abbeaa 100644 --- a/plugins/processors/emfProcessor/metricDefinition.go +++ b/plugins/processors/emfProcessor/metricDefinition.go @@ -8,7 +8,7 @@ import ( "regexp" "sort" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) // Declare metric matcher to match metrics with {source_labels, label_separator, labels_matcher and metric_selectors}, diff --git a/plugins/processors/emfProcessor/metricDefinition_test.go b/plugins/processors/emfProcessor/metricDefinition_test.go index 34d79f22b6..56834b639a 100644 --- a/plugins/processors/emfProcessor/metricDefinition_test.go +++ b/plugins/processors/emfProcessor/metricDefinition_test.go @@ -8,7 +8,7 @@ import ( "sort" "testing" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/stretchr/testify/assert" ) diff --git a/plugins/processors/k8sdecorator/k8sdecorator.go b/plugins/processors/k8sdecorator/k8sdecorator.go index 187f008570..e2fe74d4be 100644 --- a/plugins/processors/k8sdecorator/k8sdecorator.go +++ b/plugins/processors/k8sdecorator/k8sdecorator.go @@ -6,10 +6,10 @@ package k8sdecorator import ( "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" - "github.com/aws/amazon-cloudwatch-agent/plugins/processors/k8sdecorator/stores" - "github.com/aws/amazon-cloudwatch-agent/plugins/processors/k8sdecorator/structuredlogsadapter" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/k8sdecorator/stores" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/k8sdecorator/structuredlogsadapter" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" ) diff --git a/plugins/processors/k8sdecorator/stores/nodeinfo.go b/plugins/processors/k8sdecorator/stores/nodeinfo.go index 7875acce8e..d2c834ef3e 100644 --- a/plugins/processors/k8sdecorator/stores/nodeinfo.go +++ b/plugins/processors/k8sdecorator/stores/nodeinfo.go @@ -13,8 +13,8 @@ import ( "sync" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" ) type nodeStats struct { diff --git a/plugins/processors/k8sdecorator/stores/nodeinfo_test.go b/plugins/processors/k8sdecorator/stores/nodeinfo_test.go index 95ef0cbab9..e514be5ade 100644 --- a/plugins/processors/k8sdecorator/stores/nodeinfo_test.go +++ b/plugins/processors/k8sdecorator/stores/nodeinfo_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" "github.com/stretchr/testify/assert" ) diff --git a/plugins/processors/k8sdecorator/stores/podstore.go b/plugins/processors/k8sdecorator/stores/podstore.go index 8182798a26..c664cac49c 100644 --- a/plugins/processors/k8sdecorator/stores/podstore.go +++ b/plugins/processors/k8sdecorator/stores/podstore.go @@ -10,11 +10,11 @@ import ( "sync" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sclient" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/kubeletutil" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" - "github.com/aws/amazon-cloudwatch-agent/profiler" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/kubeletutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" "github.com/influxdata/telegraf" corev1 "k8s.io/api/core/v1" ) diff --git a/plugins/processors/k8sdecorator/stores/podstore_test.go b/plugins/processors/k8sdecorator/stores/podstore_test.go index c398087c82..f870e0d375 100644 --- a/plugins/processors/k8sdecorator/stores/podstore_test.go +++ b/plugins/processors/k8sdecorator/stores/podstore_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/internal/mapWithExpiry" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sclient" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/plugins/processors/k8sdecorator/stores/servicestore.go b/plugins/processors/k8sdecorator/stores/servicestore.go index 719792c688..c4467eac67 100644 --- a/plugins/processors/k8sdecorator/stores/servicestore.go +++ b/plugins/processors/k8sdecorator/stores/servicestore.go @@ -8,8 +8,8 @@ import ( "sync" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sclient" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf" ) diff --git a/plugins/processors/k8sdecorator/stores/utils.go b/plugins/processors/k8sdecorator/stores/utils.go index 69f58dff8b..430609272e 100644 --- a/plugins/processors/k8sdecorator/stores/utils.go +++ b/plugins/processors/k8sdecorator/stores/utils.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/k8sCommon/k8sutil" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sutil" corev1 "k8s.io/api/core/v1" ) diff --git a/plugins/processors/k8sdecorator/stores/utils_test.go b/plugins/processors/k8sdecorator/stores/utils_test.go index 4bcffe4e42..3c9beb41cb 100644 --- a/plugins/processors/k8sdecorator/stores/utils_test.go +++ b/plugins/processors/k8sdecorator/stores/utils_test.go @@ -4,10 +4,11 @@ package stores import ( - "github.com/stretchr/testify/assert" "strconv" "testing" "time" + + "github.com/stretchr/testify/assert" ) func TestUtils_parseDeploymentFromReplicaSet(t *testing.T) { diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go index f17657688e..802491cb71 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go @@ -4,8 +4,8 @@ package structuredlogsadapter import ( - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" ) diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go index 2ac4cab523..b384010156 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" ) diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go b/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go index 936e0b575f..8ce0765391 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go @@ -6,9 +6,9 @@ package structuredlogsadapter import ( "fmt" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/logscommon" - "github.com/aws/amazon-cloudwatch-agent/internal/structuredlogscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" ) diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go b/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go index c24ad374a2..fab04208b0 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - . "github.com/aws/amazon-cloudwatch-agent/internal/containerinsightscommon" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config.go b/tool/data/config.go index 556d8b4b98..37b524f0cc 100644 --- a/tool/data/config.go +++ b/tool/data/config.go @@ -6,9 +6,9 @@ package data import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Config struct { diff --git a/tool/data/config/agent.go b/tool/data/config/agent.go index f531f8c2e1..b1dd90d857 100644 --- a/tool/data/config/agent.go +++ b/tool/data/config/agent.go @@ -4,8 +4,8 @@ package config import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) const RUNASUSER = "run_as_user" diff --git a/tool/data/config/agent_test.go b/tool/data/config/agent_test.go index 0ceefe3eb7..839729cd43 100644 --- a/tool/data/config/agent_test.go +++ b/tool/data/config/agent_test.go @@ -6,9 +6,9 @@ package config import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/logs.go b/tool/data/config/logs.go index eb9275af60..1cc29889aa 100644 --- a/tool/data/config/logs.go +++ b/tool/data/config/logs.go @@ -4,8 +4,8 @@ package config import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/logs" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) type Logs struct { diff --git a/tool/data/config/logs/collection.go b/tool/data/config/logs/collection.go index 44474999bd..da1e526296 100644 --- a/tool/data/config/logs/collection.go +++ b/tool/data/config/logs/collection.go @@ -4,8 +4,8 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Collection struct { diff --git a/tool/data/config/logs/config.go b/tool/data/config/logs/config.go index 0d5d5523ab..f1b5f7b735 100644 --- a/tool/data/config/logs/config.go +++ b/tool/data/config/logs/config.go @@ -3,7 +3,7 @@ package logs -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type Config struct { FilePath string `file_path` diff --git a/tool/data/config/logs/config_test.go b/tool/data/config/logs/config_test.go index 9a48766a6e..c60bd64990 100644 --- a/tool/data/config/logs/config_test.go +++ b/tool/data/config/logs/config_test.go @@ -6,7 +6,7 @@ package logs import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/logs/eventConfig.go b/tool/data/config/logs/eventConfig.go index 0bc5f7b6f6..0e05269705 100644 --- a/tool/data/config/logs/eventConfig.go +++ b/tool/data/config/logs/eventConfig.go @@ -3,7 +3,7 @@ package logs -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type EventConfig struct { EventName string `event_name` diff --git a/tool/data/config/logs/eventConfig_test.go b/tool/data/config/logs/eventConfig_test.go index adaf76a164..86afc1bcf8 100644 --- a/tool/data/config/logs/eventConfig_test.go +++ b/tool/data/config/logs/eventConfig_test.go @@ -6,7 +6,7 @@ package logs import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/logs/events.go b/tool/data/config/logs/events.go index afea5a319d..cc54699ea6 100644 --- a/tool/data/config/logs/events.go +++ b/tool/data/config/logs/events.go @@ -3,7 +3,7 @@ package logs -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type Events struct { EventConfigs []*EventConfig diff --git a/tool/data/config/logs/events_test.go b/tool/data/config/logs/events_test.go index 9020c75942..fa6adc87da 100644 --- a/tool/data/config/logs/events_test.go +++ b/tool/data/config/logs/events_test.go @@ -6,7 +6,7 @@ package logs import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/logs/files.go b/tool/data/config/logs/files.go index b44eb1c87d..a347474ba9 100644 --- a/tool/data/config/logs/files.go +++ b/tool/data/config/logs/files.go @@ -4,7 +4,7 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) type Files struct { diff --git a/tool/data/config/logs/files_test.go b/tool/data/config/logs/files_test.go index 66788ac5f0..92c130ab36 100644 --- a/tool/data/config/logs/files_test.go +++ b/tool/data/config/logs/files_test.go @@ -6,7 +6,7 @@ package logs import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/logs_test.go b/tool/data/config/logs_test.go index 001e9e2935..a3ada1094c 100644 --- a/tool/data/config/logs_test.go +++ b/tool/data/config/logs_test.go @@ -6,7 +6,7 @@ package config import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/aggregationDimensions.go b/tool/data/config/metric/aggregationDimensions.go index 04becde3fd..41233fb32e 100644 --- a/tool/data/config/metric/aggregationDimensions.go +++ b/tool/data/config/metric/aggregationDimensions.go @@ -3,7 +3,7 @@ package metric -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type AggregationDimensions struct { Dimensions [][]string diff --git a/tool/data/config/metric/aggregationDimensions_test.go b/tool/data/config/metric/aggregationDimensions_test.go index 58be88eaa4..625dcf40cd 100644 --- a/tool/data/config/metric/aggregationDimensions_test.go +++ b/tool/data/config/metric/aggregationDimensions_test.go @@ -6,7 +6,7 @@ package metric import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/appendDimensions.go b/tool/data/config/metric/appendDimensions.go index 27112cf522..30dbde749c 100644 --- a/tool/data/config/metric/appendDimensions.go +++ b/tool/data/config/metric/appendDimensions.go @@ -3,7 +3,7 @@ package metric -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type AppendDimensions struct { Dimensions map[string]interface{} diff --git a/tool/data/config/metric/appendDimensions_test.go b/tool/data/config/metric/appendDimensions_test.go index 62bfc1181d..71a5ebc697 100644 --- a/tool/data/config/metric/appendDimensions_test.go +++ b/tool/data/config/metric/appendDimensions_test.go @@ -6,7 +6,7 @@ package metric import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/collectd/collectd.go b/tool/data/config/metric/collectd/collectd.go index 0f45d3daf6..c807f80e07 100644 --- a/tool/data/config/metric/collectd/collectd.go +++ b/tool/data/config/metric/collectd/collectd.go @@ -4,7 +4,7 @@ package collectd import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) type CollectD struct { diff --git a/tool/data/config/metric/collectd/collectd_test.go b/tool/data/config/metric/collectd/collectd_test.go index 304eb889c3..81172b1b86 100644 --- a/tool/data/config/metric/collectd/collectd_test.go +++ b/tool/data/config/metric/collectd/collectd_test.go @@ -6,7 +6,7 @@ package collectd import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/collection.go b/tool/data/config/metric/collection.go index 002eba12dc..9f05060d8b 100644 --- a/tool/data/config/metric/collection.go +++ b/tool/data/config/metric/collection.go @@ -4,12 +4,12 @@ package metric import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/collectd" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/statsd" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Collection struct { diff --git a/tool/data/config/metric/collection_test.go b/tool/data/config/metric/collection_test.go index ec3307f217..64c93816b9 100644 --- a/tool/data/config/metric/collection_test.go +++ b/tool/data/config/metric/collection_test.go @@ -6,9 +6,9 @@ package metric import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/cpu.go b/tool/data/config/metric/linux/cpu.go index def40c23c1..19f2e813fa 100644 --- a/tool/data/config/metric/linux/cpu.go +++ b/tool/data/config/metric/linux/cpu.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type CPU struct { diff --git a/tool/data/config/metric/linux/cpu_test.go b/tool/data/config/metric/linux/cpu_test.go index b6fbb2b0d0..713c34215f 100644 --- a/tool/data/config/metric/linux/cpu_test.go +++ b/tool/data/config/metric/linux/cpu_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/disk.go b/tool/data/config/metric/linux/disk.go index 216186a4ad..3ed5d5a56a 100644 --- a/tool/data/config/metric/linux/disk.go +++ b/tool/data/config/metric/linux/disk.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Disk struct { diff --git a/tool/data/config/metric/linux/disk_test.go b/tool/data/config/metric/linux/disk_test.go index 45308e073d..f535e79d43 100644 --- a/tool/data/config/metric/linux/disk_test.go +++ b/tool/data/config/metric/linux/disk_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/diskio.go b/tool/data/config/metric/linux/diskio.go index b3abdd3a15..721397d4a1 100644 --- a/tool/data/config/metric/linux/diskio.go +++ b/tool/data/config/metric/linux/diskio.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type DiskIO struct { diff --git a/tool/data/config/metric/linux/diskio_test.go b/tool/data/config/metric/linux/diskio_test.go index 0d54d5b505..ffff690369 100644 --- a/tool/data/config/metric/linux/diskio_test.go +++ b/tool/data/config/metric/linux/diskio_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/memory.go b/tool/data/config/metric/linux/memory.go index 593914f038..42b92a5547 100644 --- a/tool/data/config/metric/linux/memory.go +++ b/tool/data/config/metric/linux/memory.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Memory struct { diff --git a/tool/data/config/metric/linux/memory_test.go b/tool/data/config/metric/linux/memory_test.go index 8e7d86888c..e4bc1def2c 100644 --- a/tool/data/config/metric/linux/memory_test.go +++ b/tool/data/config/metric/linux/memory_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/net.go b/tool/data/config/metric/linux/net.go index 3f941765a8..7250b6b1e6 100644 --- a/tool/data/config/metric/linux/net.go +++ b/tool/data/config/metric/linux/net.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Net struct { diff --git a/tool/data/config/metric/linux/net_test.go b/tool/data/config/metric/linux/net_test.go index 3df396db40..8b464f1f3b 100644 --- a/tool/data/config/metric/linux/net_test.go +++ b/tool/data/config/metric/linux/net_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/netstat.go b/tool/data/config/metric/linux/netstat.go index 11b500f58e..dfdab0e679 100644 --- a/tool/data/config/metric/linux/netstat.go +++ b/tool/data/config/metric/linux/netstat.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type NetStat struct { diff --git a/tool/data/config/metric/linux/netstat_test.go b/tool/data/config/metric/linux/netstat_test.go index 54945093cb..875b07f787 100644 --- a/tool/data/config/metric/linux/netstat_test.go +++ b/tool/data/config/metric/linux/netstat_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/linux/swap.go b/tool/data/config/metric/linux/swap.go index 701c551ae1..abaee831dd 100644 --- a/tool/data/config/metric/linux/swap.go +++ b/tool/data/config/metric/linux/swap.go @@ -4,8 +4,8 @@ package linux import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Swap struct { diff --git a/tool/data/config/metric/linux/swap_test.go b/tool/data/config/metric/linux/swap_test.go index 1560542f21..8b893e4a26 100644 --- a/tool/data/config/metric/linux/swap_test.go +++ b/tool/data/config/metric/linux/swap_test.go @@ -6,7 +6,7 @@ package linux import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/statsd/statsd.go b/tool/data/config/metric/statsd/statsd.go index 7c30e986d6..2ac8f519b8 100644 --- a/tool/data/config/metric/statsd/statsd.go +++ b/tool/data/config/metric/statsd/statsd.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) type StatsD struct { diff --git a/tool/data/config/metric/statsd/statsd_test.go b/tool/data/config/metric/statsd/statsd_test.go index c37b707386..52793e9a43 100644 --- a/tool/data/config/metric/statsd/statsd_test.go +++ b/tool/data/config/metric/statsd/statsd_test.go @@ -6,7 +6,7 @@ package statsd import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/logicalDisk.go b/tool/data/config/metric/windows/logicalDisk.go index 3949d0f1f5..c1b3b18970 100644 --- a/tool/data/config/metric/windows/logicalDisk.go +++ b/tool/data/config/metric/windows/logicalDisk.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type LogicalDisk struct { diff --git a/tool/data/config/metric/windows/logicalDisk_test.go b/tool/data/config/metric/windows/logicalDisk_test.go index 418e12d548..2c07b075e4 100644 --- a/tool/data/config/metric/windows/logicalDisk_test.go +++ b/tool/data/config/metric/windows/logicalDisk_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/memory.go b/tool/data/config/metric/windows/memory.go index cc102053ea..64b2dc7d84 100644 --- a/tool/data/config/metric/windows/memory.go +++ b/tool/data/config/metric/windows/memory.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Memory struct { diff --git a/tool/data/config/metric/windows/memory_test.go b/tool/data/config/metric/windows/memory_test.go index d2d06c5029..a6ad7a36f7 100644 --- a/tool/data/config/metric/windows/memory_test.go +++ b/tool/data/config/metric/windows/memory_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/networkInterface.go b/tool/data/config/metric/windows/networkInterface.go index 7d7dec9c86..5898bfcb6b 100644 --- a/tool/data/config/metric/windows/networkInterface.go +++ b/tool/data/config/metric/windows/networkInterface.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type NetworkInterface struct { diff --git a/tool/data/config/metric/windows/networkInterface_test.go b/tool/data/config/metric/windows/networkInterface_test.go index 4a8afee8c1..a517b0ab54 100644 --- a/tool/data/config/metric/windows/networkInterface_test.go +++ b/tool/data/config/metric/windows/networkInterface_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/pagingFile.go b/tool/data/config/metric/windows/pagingFile.go index a82cbeef05..a66739f8d8 100644 --- a/tool/data/config/metric/windows/pagingFile.go +++ b/tool/data/config/metric/windows/pagingFile.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type PagingFile struct { diff --git a/tool/data/config/metric/windows/pagingFile_test.go b/tool/data/config/metric/windows/pagingFile_test.go index 857163898c..1a94cae838 100644 --- a/tool/data/config/metric/windows/pagingFile_test.go +++ b/tool/data/config/metric/windows/pagingFile_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/physicalDisk.go b/tool/data/config/metric/windows/physicalDisk.go index 15bff70344..797da05512 100644 --- a/tool/data/config/metric/windows/physicalDisk.go +++ b/tool/data/config/metric/windows/physicalDisk.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type PhysicalDisk struct { diff --git a/tool/data/config/metric/windows/physicalDisk_test.go b/tool/data/config/metric/windows/physicalDisk_test.go index fee7e98a0b..58c1e39453 100644 --- a/tool/data/config/metric/windows/physicalDisk_test.go +++ b/tool/data/config/metric/windows/physicalDisk_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/processor.go b/tool/data/config/metric/windows/processor.go index fcba228932..aa1004f89e 100644 --- a/tool/data/config/metric/windows/processor.go +++ b/tool/data/config/metric/windows/processor.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type Processor struct { diff --git a/tool/data/config/metric/windows/processor_test.go b/tool/data/config/metric/windows/processor_test.go index f25408dcd4..e7e9e5ebb8 100644 --- a/tool/data/config/metric/windows/processor_test.go +++ b/tool/data/config/metric/windows/processor_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/tcpv4.go b/tool/data/config/metric/windows/tcpv4.go index 24de8dba2e..fe5ed4277f 100644 --- a/tool/data/config/metric/windows/tcpv4.go +++ b/tool/data/config/metric/windows/tcpv4.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type TCPv4 struct { diff --git a/tool/data/config/metric/windows/tcpv4_test.go b/tool/data/config/metric/windows/tcpv4_test.go index c8def354d2..bf524a32e3 100644 --- a/tool/data/config/metric/windows/tcpv4_test.go +++ b/tool/data/config/metric/windows/tcpv4_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metric/windows/tcpv6.go b/tool/data/config/metric/windows/tcpv6.go index 2218198b0d..ce156a4bf9 100644 --- a/tool/data/config/metric/windows/tcpv6.go +++ b/tool/data/config/metric/windows/tcpv6.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) type TCPv6 struct { diff --git a/tool/data/config/metric/windows/tcpv6_test.go b/tool/data/config/metric/windows/tcpv6_test.go index 14bb44615d..d3626a39e5 100644 --- a/tool/data/config/metric/windows/tcpv6_test.go +++ b/tool/data/config/metric/windows/tcpv6_test.go @@ -6,7 +6,7 @@ package windows import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config/metrics.go b/tool/data/config/metrics.go index 8fea5410fb..59bd4eda4e 100644 --- a/tool/data/config/metrics.go +++ b/tool/data/config/metrics.go @@ -4,8 +4,8 @@ package config import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) type Metrics struct { diff --git a/tool/data/config/metrics_test.go b/tool/data/config/metrics_test.go index ef4ecbcf55..fb5770a971 100644 --- a/tool/data/config/metrics_test.go +++ b/tool/data/config/metrics_test.go @@ -6,9 +6,9 @@ package config import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/config_test.go b/tool/data/config_test.go index 23deee97ae..3ace632732 100644 --- a/tool/data/config_test.go +++ b/tool/data/config_test.go @@ -6,8 +6,8 @@ package data import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/data/interfaze/convertibleToMap.go b/tool/data/interfaze/convertibleToMap.go index afa3192f5d..de6bd6e4af 100644 --- a/tool/data/interfaze/convertibleToMap.go +++ b/tool/data/interfaze/convertibleToMap.go @@ -3,7 +3,7 @@ package interfaze -import "github.com/aws/amazon-cloudwatch-agent/tool/runtime" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" type ConvertibleToMap interface { ToMap(context *runtime.Context) (string, map[string]interface{}) diff --git a/tool/processors/agentconfig/agentConfig.go b/tool/processors/agentconfig/agentConfig.go index 66b524db92..9eda3084a8 100644 --- a/tool/processors/agentconfig/agentConfig.go +++ b/tool/processors/agentconfig/agentConfig.go @@ -4,11 +4,11 @@ package agentconfig import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/statsd" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) const ( diff --git a/tool/processors/agentconfig/agentConfig_test.go b/tool/processors/agentconfig/agentConfig_test.go index aa366abcd9..69e7c57f05 100644 --- a/tool/processors/agentconfig/agentConfig_test.go +++ b/tool/processors/agentconfig/agentConfig_test.go @@ -6,9 +6,9 @@ package agentconfig import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/basicInfo/basicInfo.go b/tool/processors/basicInfo/basicInfo.go index d515b9cc90..ba8a7d4e4e 100644 --- a/tool/processors/basicInfo/basicInfo.go +++ b/tool/processors/basicInfo/basicInfo.go @@ -6,12 +6,12 @@ package basicInfo import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/agentconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/basicInfo/basicInfo_test.go b/tool/processors/basicInfo/basicInfo_test.go index 5e2cc23de4..c93a85ef36 100644 --- a/tool/processors/basicInfo/basicInfo_test.go +++ b/tool/processors/basicInfo/basicInfo_test.go @@ -6,12 +6,12 @@ package basicInfo import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/agentconfig" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "github.com/aws/amazon-cloudwatch-agent/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/collectd/collectd.go b/tool/processors/collectd/collectd.go index e7ea268294..73e4b3c5ae 100644 --- a/tool/processors/collectd/collectd.go +++ b/tool/processors/collectd/collectd.go @@ -4,13 +4,13 @@ package collectd import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/collectd" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/collectd/collectd_test.go b/tool/processors/collectd/collectd_test.go index 6ebc1628f8..acb114566a 100644 --- a/tool/processors/collectd/collectd_test.go +++ b/tool/processors/collectd/collectd_test.go @@ -6,14 +6,14 @@ package collectd import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "github.com/aws/amazon-cloudwatch-agent/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/defaultConfig/advancedPlan/plan.go b/tool/processors/defaultConfig/advancedPlan/plan.go index ae1ff58165..73e1b55b8b 100644 --- a/tool/processors/defaultConfig/advancedPlan/plan.go +++ b/tool/processors/defaultConfig/advancedPlan/plan.go @@ -4,14 +4,14 @@ package advancedPlan import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig/standardPlan" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig/standardPlan" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/defaultConfig/basicPlan/plan.go b/tool/processors/defaultConfig/basicPlan/plan.go index b7396543db..8c84150a35 100644 --- a/tool/processors/defaultConfig/basicPlan/plan.go +++ b/tool/processors/defaultConfig/basicPlan/plan.go @@ -4,13 +4,13 @@ package basicPlan import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/defaultConfig/defaultConfig.go b/tool/processors/defaultConfig/defaultConfig.go index 03cbf3f0f2..dfcd6da413 100644 --- a/tool/processors/defaultConfig/defaultConfig.go +++ b/tool/processors/defaultConfig/defaultConfig.go @@ -10,16 +10,16 @@ import ( "log" "strconv" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig/advancedPlan" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig/basicPlan" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig/standardPlan" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/logs" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig/advancedPlan" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig/basicPlan" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig/standardPlan" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/defaultConfig/defaultConfig_test.go b/tool/processors/defaultConfig/defaultConfig_test.go index 42ea094a03..7b21db3e1f 100644 --- a/tool/processors/defaultConfig/defaultConfig_test.go +++ b/tool/processors/defaultConfig/defaultConfig_test.go @@ -6,14 +6,14 @@ package defaultConfig import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/defaultConfig/standardPlan/plan.go b/tool/processors/defaultConfig/standardPlan/plan.go index b68f14115f..5257670845 100644 --- a/tool/processors/defaultConfig/standardPlan/plan.go +++ b/tool/processors/defaultConfig/standardPlan/plan.go @@ -4,14 +4,14 @@ package standardPlan import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig/basicPlan" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig/basicPlan" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/migration/linux/knownConfigKeys.go b/tool/processors/migration/linux/knownConfigKeys.go index d923c0c450..e7db352700 100644 --- a/tool/processors/migration/linux/knownConfigKeys.go +++ b/tool/processors/migration/linux/knownConfigKeys.go @@ -8,7 +8,7 @@ import ( "log" "strconv" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" "strings" diff --git a/tool/processors/migration/linux/linuxMigration.go b/tool/processors/migration/linux/linuxMigration.go index c1605e93ef..f6fe0ca393 100644 --- a/tool/processors/migration/linux/linuxMigration.go +++ b/tool/processors/migration/linux/linuxMigration.go @@ -6,12 +6,12 @@ package linux import ( "log" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/logs" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/bigkevmcd/go-configparser" ) diff --git a/tool/processors/migration/linux/linuxMigration_test.go b/tool/processors/migration/linux/linuxMigration_test.go index 346c7b1bcc..84f69c9dad 100644 --- a/tool/processors/migration/linux/linuxMigration_test.go +++ b/tool/processors/migration/linux/linuxMigration_test.go @@ -8,16 +8,16 @@ import ( "os" "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/migration/migration.go b/tool/processors/migration/migration.go index 6b449a80b1..99562e9e01 100644 --- a/tool/processors/migration/migration.go +++ b/tool/processors/migration/migration.go @@ -4,12 +4,12 @@ package migration import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/migration/migration_test.go b/tool/processors/migration/migration_test.go index 0c090c19d8..e12cb27384 100644 --- a/tool/processors/migration/migration_test.go +++ b/tool/processors/migration/migration_test.go @@ -6,12 +6,12 @@ package migration import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/migration/windows/windows_migration.go b/tool/processors/migration/windows/windows_migration.go index 3624f71ef9..463e45422a 100644 --- a/tool/processors/migration/windows/windows_migration.go +++ b/tool/processors/migration/windows/windows_migration.go @@ -10,12 +10,12 @@ import ( "fmt" "os" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/ssm" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/ssm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/migration/windows/windows_migration_test.go b/tool/processors/migration/windows/windows_migration_test.go index 96f75be84e..cac3b57bb9 100644 --- a/tool/processors/migration/windows/windows_migration_test.go +++ b/tool/processors/migration/windows/windows_migration_test.go @@ -9,8 +9,8 @@ import ( "path/filepath" "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/defaultConfig" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/processor.go b/tool/processors/processor.go index 0bb8258cc7..bd5cbca4b3 100644 --- a/tool/processors/processor.go +++ b/tool/processors/processor.go @@ -4,8 +4,8 @@ package processors import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) var StartProcessor Processor diff --git a/tool/processors/question/events/events.go b/tool/processors/question/events/events.go index 9c57cf8406..f66313817a 100644 --- a/tool/processors/question/events/events.go +++ b/tool/processors/question/events/events.go @@ -7,12 +7,12 @@ import ( "fmt" "strconv" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/tool/processors/question/events/events_test.go b/tool/processors/question/events/events_test.go index 42d8e35551..344ad3983c 100644 --- a/tool/processors/question/events/events_test.go +++ b/tool/processors/question/events/events_test.go @@ -6,13 +6,13 @@ package events import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/question/logs/logs.go b/tool/processors/question/logs/logs.go index 982671a53b..4fa87bd89b 100644 --- a/tool/processors/question/logs/logs.go +++ b/tool/processors/question/logs/logs.go @@ -8,14 +8,14 @@ import ( "strconv" "strings" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/events" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/events" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/question/logs/logs_test.go b/tool/processors/question/logs/logs_test.go index 3c709a9a93..791a223a19 100644 --- a/tool/processors/question/logs/logs_test.go +++ b/tool/processors/question/logs/logs_test.go @@ -6,14 +6,14 @@ package logs import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/events" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/serialization" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/events" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/question/metrics/metrics.go b/tool/processors/question/metrics/metrics.go index cd18533d71..4b21c8fdaa 100644 --- a/tool/processors/question/metrics/metrics.go +++ b/tool/processors/question/metrics/metrics.go @@ -4,14 +4,14 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/windows" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - linuxMigration "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/logs" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + linuxMigration "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/question/metrics/metrics_test.go b/tool/processors/question/metrics/metrics_test.go index 4e9c4b068c..a2f7a09443 100644 --- a/tool/processors/question/metrics/metrics_test.go +++ b/tool/processors/question/metrics/metrics_test.go @@ -6,15 +6,15 @@ package metrics import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/migration/linux" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/question/question.go b/tool/processors/question/question.go index a0eab66108..5d1686ed39 100644 --- a/tool/processors/question/question.go +++ b/tool/processors/question/question.go @@ -4,10 +4,10 @@ package question import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/metrics" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/question/question_test.go b/tool/processors/question/question_test.go index 6901f2af6d..a0e8216bbd 100644 --- a/tool/processors/question/question_test.go +++ b/tool/processors/question/question_test.go @@ -6,9 +6,9 @@ package question import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/question/metrics" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/serialization/serialization.go b/tool/processors/serialization/serialization.go index de5a611739..995e59ea21 100644 --- a/tool/processors/serialization/serialization.go +++ b/tool/processors/serialization/serialization.go @@ -6,11 +6,11 @@ package serialization import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/ssm" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/ssm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/serialization/serialization_test.go b/tool/processors/serialization/serialization_test.go index 51b732984c..c0e2243301 100644 --- a/tool/processors/serialization/serialization_test.go +++ b/tool/processors/serialization/serialization_test.go @@ -6,9 +6,9 @@ package serialization import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/ssm" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/ssm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/ssm/ssm.go b/tool/processors/ssm/ssm.go index 23fe6f513a..3eae459d74 100644 --- a/tool/processors/ssm/ssm.go +++ b/tool/processors/ssm/ssm.go @@ -4,13 +4,13 @@ package ssm import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "time" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "fmt" diff --git a/tool/processors/ssm/ssm_test.go b/tool/processors/ssm/ssm_test.go index 413f2b0699..3d0f685a6b 100644 --- a/tool/processors/ssm/ssm_test.go +++ b/tool/processors/ssm/ssm_test.go @@ -6,10 +6,10 @@ package ssm import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/statsd/statsd.go b/tool/processors/statsd/statsd.go index 0bf40e2d4d..9cbf32b7ed 100644 --- a/tool/processors/statsd/statsd.go +++ b/tool/processors/statsd/statsd.go @@ -6,12 +6,12 @@ package statsd import ( "strconv" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/statsd" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/collectd" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) var Processor processors.Processor = &processor{} diff --git a/tool/processors/statsd/statsd_test.go b/tool/processors/statsd/statsd_test.go index a3ff5c7e85..f9c543ca76 100644 --- a/tool/processors/statsd/statsd_test.go +++ b/tool/processors/statsd/statsd_test.go @@ -6,11 +6,11 @@ package statsd import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/data/config/metric/statsd" - "github.com/aws/amazon-cloudwatch-agent/tool/processors/collectd" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "github.com/stretchr/testify/assert" ) diff --git a/tool/processors/template/template.go b/tool/processors/template/template.go index 83c6b0da35..4344eb6638 100644 --- a/tool/processors/template/template.go +++ b/tool/processors/template/template.go @@ -4,9 +4,9 @@ package template import ( - "github.com/aws/amazon-cloudwatch-agent/tool/data" - "github.com/aws/amazon-cloudwatch-agent/tool/processors" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) var Processor processors.Processor = &processor{} diff --git a/tool/testutil/testutil.go b/tool/testutil/testutil.go index 0286cd6271..0f98ff1a07 100644 --- a/tool/testutil/testutil.go +++ b/tool/testutil/testutil.go @@ -6,7 +6,7 @@ package testutil import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/tool/stdin" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin" ) func SetUpTestInputStream() chan<- string { diff --git a/tool/util/util.go b/tool/util/util.go index 5dea79601f..0e962536a8 100644 --- a/tool/util/util.go +++ b/tool/util/util.go @@ -13,10 +13,10 @@ import ( sysruntime "runtime" "strconv" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/tool/data/interfaze" - "github.com/aws/amazon-cloudwatch-agent/tool/runtime" - "github.com/aws/amazon-cloudwatch-agent/tool/stdin" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/interfaze" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin" "net/http" "time" diff --git a/tool/util/util_test.go b/tool/util/util_test.go index 14143a5697..f5f133e03f 100644 --- a/tool/util/util_test.go +++ b/tool/util/util_test.go @@ -8,7 +8,7 @@ import ( "runtime" "testing" - "github.com/aws/amazon-cloudwatch-agent/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "os" diff --git a/translator/cmdutil/translatorutil.go b/translator/cmdutil/translatorutil.go index f564ddc762..fe09652f99 100644 --- a/translator/cmdutil/translatorutil.go +++ b/translator/cmdutil/translatorutil.go @@ -12,13 +12,13 @@ import ( "path/filepath" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/toenvconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/totomlconfig" - translatorUtil "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/toenvconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig" + translatorUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "github.com/xeipuuv/gojsonschema" ) diff --git a/translator/cmdutil/userutil.go b/translator/cmdutil/userutil.go index 672b2e3504..a39bf91b59 100644 --- a/translator/cmdutil/userutil.go +++ b/translator/cmdutil/userutil.go @@ -12,8 +12,8 @@ import ( "os" "path/filepath" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) var ( diff --git a/translator/cmdutil/userutil_windows.go b/translator/cmdutil/userutil_windows.go index 9e960457b7..bbb5e44097 100644 --- a/translator/cmdutil/userutil_windows.go +++ b/translator/cmdutil/userutil_windows.go @@ -6,7 +6,7 @@ package cmdutil -import "github.com/aws/amazon-cloudwatch-agent/translator/context" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" func SetupUser(u string) error { return nil diff --git a/translator/context/context.go b/translator/context/context.go index 43eb33e26f..689c13689c 100644 --- a/translator/context/context.go +++ b/translator/context/context.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( diff --git a/translator/jsonconfig/mergeJsonConfig.go b/translator/jsonconfig/mergeJsonConfig.go index 48d9704c03..2593f431fd 100644 --- a/translator/jsonconfig/mergeJsonConfig.go +++ b/translator/jsonconfig/mergeJsonConfig.go @@ -9,12 +9,12 @@ import ( "os" "sort" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) func MergeJsonConfigMaps(jsonConfigMapMap map[string]map[string]interface{}, defaultJsonConfigMap map[string]interface{}, multiConfig string) (map[string]interface{}, error) { diff --git a/translator/jsonconfig/mergeJsonConfig_test.go b/translator/jsonconfig/mergeJsonConfig_test.go index c75f032b4b..931fdaff7c 100644 --- a/translator/jsonconfig/mergeJsonConfig_test.go +++ b/translator/jsonconfig/mergeJsonConfig_test.go @@ -11,9 +11,9 @@ import ( "reflect" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator" - _ "github.com/aws/amazon-cloudwatch-agent/translator/totomlconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "github.com/stretchr/testify/assert" ) diff --git a/translator/jsonconfig/mergeJsonUtil/util.go b/translator/jsonconfig/mergeJsonUtil/util.go index 32184fa475..5e7c197dbf 100644 --- a/translator/jsonconfig/mergeJsonUtil/util.go +++ b/translator/jsonconfig/mergeJsonUtil/util.go @@ -7,8 +7,8 @@ import ( "fmt" "reflect" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" ) var MergeRuleMap = map[string]mergeJsonRule.MergeRule{} diff --git a/translator/osParameter.go b/translator/osParameter.go index e30c776e73..2e938d522a 100644 --- a/translator/osParameter.go +++ b/translator/osParameter.go @@ -4,7 +4,7 @@ package translator import ( - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) func GetTargetPlatform() string { diff --git a/translator/toenvconfig/toEnvConfig.go b/translator/toenvconfig/toEnvConfig.go index 0db8ac663f..3b6f408874 100644 --- a/translator/toenvconfig/toEnvConfig.go +++ b/translator/toenvconfig/toEnvConfig.go @@ -7,12 +7,12 @@ import ( "encoding/json" "log" - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/cfg/envconfig" - "github.com/aws/amazon-cloudwatch-agent/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const ( diff --git a/translator/toenvconfig/toEnvConfig_test.go b/translator/toenvconfig/toEnvConfig_test.go index 69d49d79ab..e554733652 100644 --- a/translator/toenvconfig/toEnvConfig_test.go +++ b/translator/toenvconfig/toEnvConfig_test.go @@ -9,15 +9,15 @@ import ( "io/ioutil" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "os" - commonconfig "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/stretchr/testify/assert" ) diff --git a/translator/totomlconfig/toTomlConfig.go b/translator/totomlconfig/toTomlConfig.go index e7506cd8c7..9925591475 100755 --- a/translator/totomlconfig/toTomlConfig.go +++ b/translator/totomlconfig/toTomlConfig.go @@ -7,48 +7,48 @@ import ( "bytes" "log" - "github.com/aws/amazon-cloudwatch-agent/translator/translate" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/csm" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/globaltags" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/files" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/files/collect_list" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/windows_events" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/windows_events/collect_list" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs/cadvisor" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs/ec2tagger" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs/ecsdecorator" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/emf" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes/cadvisor" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes/ec2tagger" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/emfprocessor" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/append_dimensions" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/drop_origin" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metric_decoration" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/agentInternal" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/collectd" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/cpu" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/customizedmetrics" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/disk" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/diskio" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/ethtool" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/gpu" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/mem" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/net" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/netstat" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/processes" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/procstat" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/statsd" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect/swap" - _ "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/rollup_dimensions" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/csm" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/globaltags" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/files" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/files/collect_list" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events/collect_list" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs/cadvisor" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs/ec2tagger" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs/ecsdecorator" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/emf" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes/cadvisor" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes/ec2tagger" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/emfprocessor" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/append_dimensions" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/drop_origin" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metric_decoration" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/agentInternal" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/collectd" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/cpu" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/customizedmetrics" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/disk" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/diskio" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/ethtool" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/gpu" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/mem" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/net" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/netstat" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/processes" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/procstat" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/statsd" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/swap" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/rollup_dimensions" "github.com/BurntSushi/toml" ) diff --git a/translator/totomlconfig/toTomlConfig_test.go b/translator/totomlconfig/toTomlConfig_test.go index f04afead2e..ef0fc57daf 100644 --- a/translator/totomlconfig/toTomlConfig_test.go +++ b/translator/totomlconfig/toTomlConfig_test.go @@ -12,21 +12,21 @@ import ( "testing" "github.com/BurntSushi/toml" - "github.com/aws/amazon-cloudwatch-agent/translator/totomlconfig/tomlConfigTemplate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig/tomlConfigTemplate" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/kr/pretty" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "os" - commonconfig "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/agent/agent.go b/translator/translate/agent/agent.go index 2951f4ab81..683c4c3a03 100644 --- a/translator/translate/agent/agent.go +++ b/translator/translate/agent/agent.go @@ -4,9 +4,9 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/agent/agent_test.go b/translator/translate/agent/agent_test.go index c04b02a723..93424b41f1 100644 --- a/translator/translate/agent/agent_test.go +++ b/translator/translate/agent/agent_test.go @@ -7,11 +7,11 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/logger" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "os" diff --git a/translator/translate/agent/ruleCollectionJitter.go b/translator/translate/agent/ruleCollectionJitter.go index ff639c5608..d3975360dc 100644 --- a/translator/translate/agent/ruleCollectionJitter.go +++ b/translator/translate/agent/ruleCollectionJitter.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type CollectionJitter struct { diff --git a/translator/translate/agent/ruleCommonCreds.go b/translator/translate/agent/ruleCommonCreds.go index c2ca9bb3e2..349849486e 100644 --- a/translator/translate/agent/ruleCommonCreds.go +++ b/translator/translate/agent/ruleCommonCreds.go @@ -4,9 +4,9 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type CommonCreds struct { diff --git a/translator/translate/agent/ruleCommonCreds_test.go b/translator/translate/agent/ruleCommonCreds_test.go index b342f06aa4..e13cab1074 100644 --- a/translator/translate/agent/ruleCommonCreds_test.go +++ b/translator/translate/agent/ruleCommonCreds_test.go @@ -6,10 +6,10 @@ package agent import ( "testing" - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/agent/ruleDebug.go b/translator/translate/agent/ruleDebug.go index bb18b58b25..97370d08be 100644 --- a/translator/translate/agent/ruleDebug.go +++ b/translator/translate/agent/ruleDebug.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Debug struct { diff --git a/translator/translate/agent/ruleFlushInterval.go b/translator/translate/agent/ruleFlushInterval.go index 11f1b8f947..d0857fe7a6 100644 --- a/translator/translate/agent/ruleFlushInterval.go +++ b/translator/translate/agent/ruleFlushInterval.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type FlushInterval struct { diff --git a/translator/translate/agent/ruleFlushJitter.go b/translator/translate/agent/ruleFlushJitter.go index 2bb765ea9f..40646c33bf 100644 --- a/translator/translate/agent/ruleFlushJitter.go +++ b/translator/translate/agent/ruleFlushJitter.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type FlushJitter struct { diff --git a/translator/translate/agent/ruleGlobalCredentials.go b/translator/translate/agent/ruleGlobalCredentials.go index b87396809c..1dc068d577 100644 --- a/translator/translate/agent/ruleGlobalCredentials.go +++ b/translator/translate/agent/ruleGlobalCredentials.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type GlobalCreds struct { diff --git a/translator/translate/agent/ruleGlobalCredentials_test.go b/translator/translate/agent/ruleGlobalCredentials_test.go index 5aabf2f1e5..f1162c1c5a 100644 --- a/translator/translate/agent/ruleGlobalCredentials_test.go +++ b/translator/translate/agent/ruleGlobalCredentials_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/agent/ruleHostname.go b/translator/translate/agent/ruleHostname.go index a9fc405eaf..8e6795629b 100644 --- a/translator/translate/agent/ruleHostname.go +++ b/translator/translate/agent/ruleHostname.go @@ -6,9 +6,9 @@ package agent import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) type Hostname struct { diff --git a/translator/translate/agent/ruleInternal.go b/translator/translate/agent/ruleInternal.go index dd3077b426..54365a9125 100644 --- a/translator/translate/agent/ruleInternal.go +++ b/translator/translate/agent/ruleInternal.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Internal struct { diff --git a/translator/translate/agent/ruleInterval.go b/translator/translate/agent/ruleInterval.go index d7f4c65090..1f65b028e5 100644 --- a/translator/translate/agent/ruleInterval.go +++ b/translator/translate/agent/ruleInterval.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Interval struct { diff --git a/translator/translate/agent/ruleLogFile.go b/translator/translate/agent/ruleLogFile.go index bff46e2717..7f7b553130 100644 --- a/translator/translate/agent/ruleLogFile.go +++ b/translator/translate/agent/ruleLogFile.go @@ -6,10 +6,10 @@ package agent import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const Linux_Darwin_Default_Log_Dir = "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log" diff --git a/translator/translate/agent/ruleLogTarget.go b/translator/translate/agent/ruleLogTarget.go index 046b164fb7..2ea6ea66e8 100644 --- a/translator/translate/agent/ruleLogTarget.go +++ b/translator/translate/agent/ruleLogTarget.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/logger" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" ) const ( diff --git a/translator/translate/agent/ruleMetricBatchSize.go b/translator/translate/agent/ruleMetricBatchSize.go index 031619144a..0db2eeed02 100644 --- a/translator/translate/agent/ruleMetricBatchSize.go +++ b/translator/translate/agent/ruleMetricBatchSize.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type MetricBatchSize struct { diff --git a/translator/translate/agent/ruleMetricBufferLimit.go b/translator/translate/agent/ruleMetricBufferLimit.go index 77d4072862..8dbdf54368 100644 --- a/translator/translate/agent/ruleMetricBufferLimit.go +++ b/translator/translate/agent/ruleMetricBufferLimit.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type MetricBufferLimit struct { diff --git a/translator/translate/agent/ruleOmitHostname.go b/translator/translate/agent/ruleOmitHostname.go index aed23ee715..240f849f8a 100644 --- a/translator/translate/agent/ruleOmitHostname.go +++ b/translator/translate/agent/ruleOmitHostname.go @@ -6,8 +6,8 @@ package agent import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) type OmitHostname struct { diff --git a/translator/translate/agent/rulePrecision.go b/translator/translate/agent/rulePrecision.go index 64535e00af..baf61a5373 100644 --- a/translator/translate/agent/rulePrecision.go +++ b/translator/translate/agent/rulePrecision.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Precision struct { diff --git a/translator/translate/agent/ruleQuiet.go b/translator/translate/agent/ruleQuiet.go index 368c5361d7..0ba23f1688 100644 --- a/translator/translate/agent/ruleQuiet.go +++ b/translator/translate/agent/ruleQuiet.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Quiet struct { diff --git a/translator/translate/agent/ruleRegion.go b/translator/translate/agent/ruleRegion.go index aee69f4df8..8502d637ef 100644 --- a/translator/translate/agent/ruleRegion.go +++ b/translator/translate/agent/ruleRegion.go @@ -6,9 +6,9 @@ package agent import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type Region struct { diff --git a/translator/translate/agent/ruleRoundInterval.go b/translator/translate/agent/ruleRoundInterval.go index da88cc7be3..ce16a55873 100644 --- a/translator/translate/agent/ruleRoundInterval.go +++ b/translator/translate/agent/ruleRoundInterval.go @@ -4,7 +4,7 @@ package agent import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type RoundInterval struct { diff --git a/translator/translate/csm/csm.go b/translator/translate/csm/csm.go index 0888d08371..497a29d9be 100644 --- a/translator/translate/csm/csm.go +++ b/translator/translate/csm/csm.go @@ -4,13 +4,13 @@ package csm import ( - "github.com/aws/amazon-cloudwatch-agent/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) const ( diff --git a/translator/translate/csm/csmPortUtils.go b/translator/translate/csm/csmPortUtils.go index a30163ec60..79749b1938 100644 --- a/translator/translate/csm/csmPortUtils.go +++ b/translator/translate/csm/csmPortUtils.go @@ -8,7 +8,7 @@ import ( "net" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) func computeIPv4LoopbackAddressFromPort(port interface{}) string { diff --git a/translator/translate/csm/csm_test.go b/translator/translate/csm/csm_test.go index e6dac6f09c..dfa9bbbf24 100644 --- a/translator/translate/csm/csm_test.go +++ b/translator/translate/csm/csm_test.go @@ -7,9 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/csm/ruleDataFormat.go b/translator/translate/csm/ruleDataFormat.go index b7708f6e81..863513ce18 100644 --- a/translator/translate/csm/ruleDataFormat.go +++ b/translator/translate/csm/ruleDataFormat.go @@ -4,7 +4,7 @@ package csm import ( - "github.com/aws/amazon-cloudwatch-agent/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" ) type DataFormat struct { diff --git a/translator/translate/csm/ruleEndpointOverride.go b/translator/translate/csm/ruleEndpointOverride.go index e716706c70..832df11e74 100644 --- a/translator/translate/csm/ruleEndpointOverride.go +++ b/translator/translate/csm/ruleEndpointOverride.go @@ -6,9 +6,9 @@ package csm import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/amazon-cloudwatch-agent/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" ) type EndpointOverride struct{} diff --git a/translator/translate/csm/ruleLogLevel.go b/translator/translate/csm/ruleLogLevel.go index 7a2f399c0b..04c6433891 100644 --- a/translator/translate/csm/ruleLogLevel.go +++ b/translator/translate/csm/ruleLogLevel.go @@ -4,8 +4,8 @@ package csm import ( - "github.com/aws/amazon-cloudwatch-agent/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type LogLevel struct { diff --git a/translator/translate/csm/ruleMemoryLimitInMb.go b/translator/translate/csm/ruleMemoryLimitInMb.go index 2b50cda7e8..147b218902 100644 --- a/translator/translate/csm/ruleMemoryLimitInMb.go +++ b/translator/translate/csm/ruleMemoryLimitInMb.go @@ -4,8 +4,8 @@ package csm import ( - "github.com/aws/amazon-cloudwatch-agent/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type MemoryLimitInMb struct { diff --git a/translator/translate/csm/rulePort.go b/translator/translate/csm/rulePort.go index 539e290811..a058f48416 100644 --- a/translator/translate/csm/rulePort.go +++ b/translator/translate/csm/rulePort.go @@ -6,9 +6,9 @@ package csm import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/internal/csm" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type Port struct { diff --git a/translator/translate/globaltags/globaltags.go b/translator/translate/globaltags/globaltags.go index b1f7f239dd..d7d1fef001 100644 --- a/translator/translate/globaltags/globaltags.go +++ b/translator/translate/globaltags/globaltags.go @@ -4,7 +4,7 @@ package globaltags import ( - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" ) const SectionKey = "global_tags" diff --git a/translator/translate/logs/logs.go b/translator/translate/logs/logs.go index a34d4f6c8e..83cf99134c 100644 --- a/translator/translate/logs/logs.go +++ b/translator/translate/logs/logs.go @@ -4,11 +4,11 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type Rule translator.Rule diff --git a/translator/translate/logs/logs_collected/files/collect_list/collect_list.go b/translator/translate/logs/logs_collected/files/collect_list/collect_list.go index ee0b4fe97b..b858768d28 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/collect_list.go +++ b/translator/translate/logs/logs_collected/files/collect_list/collect_list.go @@ -9,13 +9,13 @@ import ( "path/filepath" "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/files" - logUtil "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/files" + logUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" ) type Rule translator.Rule diff --git a/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go b/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go index 26337f3011..942c5f9fc9 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go +++ b/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleAutoRemovel.go b/translator/translate/logs/logs_collected/files/collect_list/ruleAutoRemovel.go index 9b305249c9..302665914d 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleAutoRemovel.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleAutoRemovel.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const AutoRemovalSectionKey = "auto_removal" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleBlackList.go b/translator/translate/logs/logs_collected/files/collect_list/ruleBlackList.go index 691dd4fc4e..b3139bec99 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleBlackList.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleBlackList.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const BlacklistSectionKey = "blacklist" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go b/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go index 975803c05e..a374f16a73 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go @@ -6,7 +6,7 @@ package collect_list import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "golang.org/x/net/html/charset" "golang.org/x/text/encoding/ianaindex" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleFilePath.go b/translator/translate/logs/logs_collected/files/collect_list/ruleFilePath.go index 498762ef0d..17bab88a42 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleFilePath.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleFilePath.go @@ -6,7 +6,7 @@ package collect_list import ( "strconv" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type FilePath struct { diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleFromBeginning.go b/translator/translate/logs/logs_collected/files/collect_list/ruleFromBeginning.go index 4ca398f034..000e8e2927 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleFromBeginning.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleFromBeginning.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type FromBeginning struct { diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters.go index 391e4ecaa7..983c5f84f8 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go index 1eb3f69699..f76c388bbf 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupName.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupName.go index 5754c30895..2b8c30f4ca 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupName.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleLogGroupName.go @@ -4,9 +4,9 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) const LogGroupNameSectionKey = "log_group_name" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogStreamName.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogStreamName.go index 314221480a..dda227d33b 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleLogStreamName.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleLogStreamName.go @@ -4,9 +4,9 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type LogStreamName struct { diff --git a/translator/translate/logs/logs_collected/files/collect_list/rulePipe.go b/translator/translate/logs/logs_collected/files/collect_list/rulePipe.go index b39e4a56f4..357b14ab6a 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/rulePipe.go +++ b/translator/translate/logs/logs_collected/files/collect_list/rulePipe.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Pipe struct { diff --git a/translator/translate/logs/logs_collected/files/collect_list/rulePublishMultiLogs.go b/translator/translate/logs/logs_collected/files/collect_list/rulePublishMultiLogs.go index 951c3163c9..1c12d932dc 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/rulePublishMultiLogs.go +++ b/translator/translate/logs/logs_collected/files/collect_list/rulePublishMultiLogs.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const PublishMultiLogsSectionKey = "publish_multi_logs" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleRetentionInDays.go b/translator/translate/logs/logs_collected/files/collect_list/ruleRetentionInDays.go index d6f7a3a783..176fcdd2f2 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleRetentionInDays.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleRetentionInDays.go @@ -4,7 +4,7 @@ package collect_list import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const RetentionInDaysSectionKey = "retention_in_days" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleTimestampFormat.go b/translator/translate/logs/logs_collected/files/collect_list/ruleTimestampFormat.go index a78307c52b..eab1fea23b 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleTimestampFormat.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleTimestampFormat.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) /* diff --git a/translator/translate/logs/logs_collected/files/files.go b/translator/translate/logs/logs_collected/files/files.go index 61b625f412..40cd58af78 100644 --- a/translator/translate/logs/logs_collected/files/files.go +++ b/translator/translate/logs/logs_collected/files/files.go @@ -4,10 +4,10 @@ package files import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/logs/logs_collected/files/ruleFileStateFolder.go b/translator/translate/logs/logs_collected/files/ruleFileStateFolder.go index 43213b8cc2..814d3bfb28 100644 --- a/translator/translate/logs/logs_collected/files/ruleFileStateFolder.go +++ b/translator/translate/logs/logs_collected/files/ruleFileStateFolder.go @@ -4,7 +4,7 @@ package files import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" ) type FileStateFolder struct { diff --git a/translator/translate/logs/logs_collected/logs_collected.go b/translator/translate/logs/logs_collected/logs_collected.go index 2f6f9f9c33..8664e5e607 100644 --- a/translator/translate/logs/logs_collected/logs_collected.go +++ b/translator/translate/logs/logs_collected/logs_collected.go @@ -6,11 +6,11 @@ package logs_collected import ( "log" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" ) type Rule translator.Rule diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist.go b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist.go index e9f7888dab..39b0861441 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist.go @@ -6,12 +6,12 @@ package collectlist import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected/windows_events" - logUtil "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events" + logUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type Rule translator.Rule diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go index 6b8eb96df7..04b36330f7 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleEventFormat.go b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleEventFormat.go index d3dc4352d8..152222c38a 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleEventFormat.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleEventFormat.go @@ -6,7 +6,7 @@ package collectlist import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogGroupName.go b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogGroupName.go index a07d4e2b1f..8b1221f46f 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogGroupName.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogGroupName.go @@ -4,9 +4,9 @@ package collectlist import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) const LogGroupNameSectionKey = "log_group_name" diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogStreamName.go b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogStreamName.go index b9783f1d47..2aae69c3ae 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogStreamName.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleLogStreamName.go @@ -4,9 +4,9 @@ package collectlist import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type LogStreamName struct { diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleRetentionInDays.go b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleRetentionInDays.go index f3ccb1a4e4..1be86b5ad6 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/ruleRetentionInDays.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/ruleRetentionInDays.go @@ -4,7 +4,7 @@ package collectlist import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const RetentionInDaysSectionKey = "retention_in_days" diff --git a/translator/translate/logs/logs_collected/windows_events/ruleFileStateFolder.go b/translator/translate/logs/logs_collected/windows_events/ruleFileStateFolder.go index c3686d1bf4..f9308365ac 100644 --- a/translator/translate/logs/logs_collected/windows_events/ruleFileStateFolder.go +++ b/translator/translate/logs/logs_collected/windows_events/ruleFileStateFolder.go @@ -3,7 +3,7 @@ package windows_events -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" type FileStateFolder struct { } diff --git a/translator/translate/logs/logs_collected/windows_events/windows_event.go b/translator/translate/logs/logs_collected/windows_events/windows_event.go index 6a420e56e3..843963fba0 100644 --- a/translator/translate/logs/logs_collected/windows_events/windows_event.go +++ b/translator/translate/logs/logs_collected/windows_events/windows_event.go @@ -4,10 +4,10 @@ package windows_events import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/logs_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/logs/logs_collected/windows_events/windows_event_test.go b/translator/translate/logs/logs_collected/windows_events/windows_event_test.go index f3e320379e..c0617f9270 100644 --- a/translator/translate/logs/logs_collected/windows_events/windows_event_test.go +++ b/translator/translate/logs/logs_collected/windows_events/windows_event_test.go @@ -7,8 +7,8 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/logs_test.go b/translator/translate/logs/logs_test.go index 820af5d7dd..eb73c114ac 100644 --- a/translator/translate/logs/logs_test.go +++ b/translator/translate/logs/logs_test.go @@ -8,11 +8,11 @@ import ( "os" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/metrics_collected/ecs/cadvisor/cadvisor.go b/translator/translate/logs/metrics_collected/ecs/cadvisor/cadvisor.go index c38b158cd7..c3f8c962e0 100644 --- a/translator/translate/logs/metrics_collected/ecs/cadvisor/cadvisor.go +++ b/translator/translate/logs/metrics_collected/ecs/cadvisor/cadvisor.go @@ -4,8 +4,8 @@ package cadvisor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/ecs/cadvisor/ruleInterval.go b/translator/translate/logs/metrics_collected/ecs/cadvisor/ruleInterval.go index d54a349cde..f4c17f218f 100644 --- a/translator/translate/logs/metrics_collected/ecs/cadvisor/ruleInterval.go +++ b/translator/translate/logs/metrics_collected/ecs/cadvisor/ruleInterval.go @@ -4,7 +4,7 @@ package cadvisor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Interval struct { diff --git a/translator/translate/logs/metrics_collected/ecs/ec2tagger/ec2tagger.go b/translator/translate/logs/metrics_collected/ecs/ec2tagger/ec2tagger.go index 64cbf252c7..b9cbfbeaea 100644 --- a/translator/translate/logs/metrics_collected/ecs/ec2tagger/ec2tagger.go +++ b/translator/translate/logs/metrics_collected/ecs/ec2tagger/ec2tagger.go @@ -4,8 +4,8 @@ package ec2tagger import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/ecs/ecs.go b/translator/translate/logs/metrics_collected/ecs/ecs.go index 903a4a87bf..468d6c5aee 100644 --- a/translator/translate/logs/metrics_collected/ecs/ecs.go +++ b/translator/translate/logs/metrics_collected/ecs/ecs.go @@ -6,11 +6,11 @@ package ecs import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected" ) type ECS struct{} diff --git a/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ecsdecorator.go b/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ecsdecorator.go index ae67790cdd..91fdbe8bd5 100644 --- a/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ecsdecorator.go +++ b/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ecsdecorator.go @@ -4,8 +4,8 @@ package ecsdecorator import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/ecs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/ecs" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ruleHostIp.go b/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ruleHostIp.go index daabdddb1e..e89c9d5a1b 100644 --- a/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ruleHostIp.go +++ b/translator/translate/logs/metrics_collected/ecs/ecsdecorator/ruleHostIp.go @@ -6,8 +6,8 @@ package ecsdecorator import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ec2util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" ) const ( diff --git a/translator/translate/logs/metrics_collected/emf/emf.go b/translator/translate/logs/metrics_collected/emf/emf.go index 21eabcefec..a2311fd9ae 100644 --- a/translator/translate/logs/metrics_collected/emf/emf.go +++ b/translator/translate/logs/metrics_collected/emf/emf.go @@ -4,9 +4,9 @@ package emf import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected" ) // diff --git a/translator/translate/logs/metrics_collected/emf/ruleServiceAddress.go b/translator/translate/logs/metrics_collected/emf/ruleServiceAddress.go index f7817112f0..878116dc4a 100644 --- a/translator/translate/logs/metrics_collected/emf/ruleServiceAddress.go +++ b/translator/translate/logs/metrics_collected/emf/ruleServiceAddress.go @@ -4,8 +4,8 @@ package emf import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) type ServiceAddress struct { diff --git a/translator/translate/logs/metrics_collected/emf/structuredlog.go b/translator/translate/logs/metrics_collected/emf/structuredlog.go index 114404c7d1..3d092290ce 100644 --- a/translator/translate/logs/metrics_collected/emf/structuredlog.go +++ b/translator/translate/logs/metrics_collected/emf/structuredlog.go @@ -4,9 +4,9 @@ package emf import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected" ) // diff --git a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/cadvisor.go b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/cadvisor.go index e2f106a8d3..db07edb1d8 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/cadvisor.go +++ b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/cadvisor.go @@ -4,8 +4,8 @@ package cadvisor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleDetailMode.go b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleDetailMode.go index 1d4b65d18f..66a5067565 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleDetailMode.go +++ b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleDetailMode.go @@ -4,7 +4,7 @@ package cadvisor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleInterval.go b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleInterval.go index d54a349cde..f4c17f218f 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleInterval.go +++ b/translator/translate/logs/metrics_collected/kubernetes/cadvisor/ruleInterval.go @@ -4,7 +4,7 @@ package cadvisor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Interval struct { diff --git a/translator/translate/logs/metrics_collected/kubernetes/ec2tagger/ec2tagger.go b/translator/translate/logs/metrics_collected/kubernetes/ec2tagger/ec2tagger.go index 29328eef6a..35b52b3b05 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/ec2tagger/ec2tagger.go +++ b/translator/translate/logs/metrics_collected/kubernetes/ec2tagger/ec2tagger.go @@ -4,8 +4,8 @@ package ec2tagger import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/k8sapiserver.go b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/k8sapiserver.go index ee10a6265c..06fb67b4eb 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/k8sapiserver.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/k8sapiserver.go @@ -4,8 +4,8 @@ package k8sapiserver import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleInterval.go b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleInterval.go index cae823b290..1c53c57152 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleInterval.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleInterval.go @@ -4,7 +4,7 @@ package k8sapiserver import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Interval struct { diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleNodeName.go b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleNodeName.go index 7b4da6ce3e..f1ded3e695 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleNodeName.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sapiserver/ruleNodeName.go @@ -6,8 +6,8 @@ package k8sapiserver import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/hostIP.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/hostIP.go index 2ba6d281fd..b110f253c3 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/hostIP.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/hostIP.go @@ -6,8 +6,8 @@ package k8sdecorator import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/k8sdecorator.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/k8sdecorator.go index 502c46959b..ccb8b2d96f 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/k8sdecorator.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/k8sdecorator.go @@ -4,8 +4,8 @@ package k8sdecorator import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/kubernetes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/kubernetes" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go index 44c67b939f..3f8cced19e 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go @@ -9,12 +9,12 @@ import ( "strings" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ec2util" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleNodeName.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleNodeName.go index 63375044a0..52052824b6 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleNodeName.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleNodeName.go @@ -6,8 +6,8 @@ package k8sdecorator import ( "os" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/rulePrefFullPodName.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/rulePrefFullPodName.go index 8c5b031dec..c971ae00ef 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/rulePrefFullPodName.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/rulePrefFullPodName.go @@ -4,7 +4,7 @@ package k8sdecorator import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleTagService.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleTagService.go index 86cebf9a2b..af8f8eefd1 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleTagService.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleTagService.go @@ -4,7 +4,7 @@ package k8sdecorator import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go index 3a4564ecc5..ae8f019177 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go +++ b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go @@ -6,11 +6,11 @@ package kubernetes import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected" ) const SectionKey = "kubernetes" diff --git a/translator/translate/logs/metrics_collected/metrics_collected.go b/translator/translate/logs/metrics_collected/metrics_collected.go index 50a88462ff..3d8cf8ee79 100644 --- a/translator/translate/logs/metrics_collected/metrics_collected.go +++ b/translator/translate/logs/metrics_collected/metrics_collected.go @@ -7,11 +7,11 @@ import ( "fmt" "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go index b4f4a1c8e2..2c8726da62 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go @@ -4,9 +4,9 @@ package dockerlabel import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDJobNameLabel.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDJobNameLabel.go index c1fc8824b9..70dfef61f3 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDJobNameLabel.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDJobNameLabel.go @@ -3,7 +3,7 @@ package dockerlabel -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( SectionKeySDJobNameLabel = "sd_job_name_label" diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDMetricsPathLabel.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDMetricsPathLabel.go index 512c0bd3e0..1d28e2ff2f 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDMetricsPathLabel.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDMetricsPathLabel.go @@ -3,7 +3,7 @@ package dockerlabel -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( SectionKeySDMetricsPathLabel = "sd_metrics_path_label" diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDPortLabel.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDPortLabel.go index 4b576dbfdb..fd61ba2666 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDPortLabel.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/ruleSDPortLabel.go @@ -3,7 +3,7 @@ package dockerlabel -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( SectionKeySDPortLabel = "sd_port_label" diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go index f613188e12..ebb4edef27 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go @@ -4,9 +4,9 @@ package ecsservicediscovery import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDClusterRegion.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDClusterRegion.go index fec46f3c52..59ad5f1b6a 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDClusterRegion.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDClusterRegion.go @@ -4,8 +4,8 @@ package ecsservicediscovery import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDFrequency.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDFrequency.go index 7249998f17..de689f622a 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDFrequency.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDFrequency.go @@ -4,7 +4,7 @@ package ecsservicediscovery import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDResultFile.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDResultFile.go index 7c6a2764e9..8b3fe2607e 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDResultFile.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDResultFile.go @@ -3,7 +3,7 @@ package ecsservicediscovery -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( SectionKeySDResultFile = "sd_result_file" diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDTargetCluster.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDTargetCluster.go index 3ad6eae658..afd3a0e32d 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDTargetCluster.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ruleSDTargetCluster.go @@ -4,8 +4,8 @@ package ecsservicediscovery import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDMetricsPorts.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDMetricsPorts.go index 6452855f3b..2a9aedd705 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDMetricsPorts.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDMetricsPorts.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDServiceNamePattern.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDServiceNamePattern.go index c3175b6859..4cef58a7b0 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDServiceNamePattern.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/ruleSDServiceNamePattern.go @@ -4,7 +4,7 @@ package serviceendpoint import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go index 9cad681a9e..3c96bc0b4d 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go @@ -4,9 +4,9 @@ package serviceendpoint import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDMetricsPorts.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDMetricsPorts.go index 2100d2720a..6d0fffb8b2 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDMetricsPorts.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDMetricsPorts.go @@ -7,7 +7,7 @@ import ( "fmt" "regexp" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDTaskDefinitionArnPattern.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDTaskDefinitionArnPattern.go index 9f65ea06fb..5bdc09d20c 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDTaskDefinitionArnPattern.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/ruleSDTaskDefinitionArnPattern.go @@ -4,7 +4,7 @@ package taskdefinition import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go index 94390a8660..ee327abe71 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go @@ -4,9 +4,9 @@ package taskdefinition import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/emfProcessor.go b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/emfProcessor.go index 926f885624..6ed9e326ea 100644 --- a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/emfProcessor.go +++ b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/emfProcessor.go @@ -4,8 +4,8 @@ package emfprocessor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected/prometheus" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus" ) type Rule translator.Rule diff --git a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricDeclarationDedup.go b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricDeclarationDedup.go index 4a35e49c70..57085555cd 100644 --- a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricDeclarationDedup.go +++ b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricDeclarationDedup.go @@ -3,7 +3,7 @@ package emfprocessor -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( SectionKeyMetricDeclarationDedup = "metric_declaration_dedup" diff --git a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricNamespace.go b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricNamespace.go index 6650ae3381..f5a2bbb770 100644 --- a/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricNamespace.go +++ b/translator/translate/logs/metrics_collected/prometheus/emfprocessor/ruleMetricNamespace.go @@ -4,9 +4,9 @@ package emfprocessor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/prometheus.go b/translator/translate/logs/metrics_collected/prometheus/prometheus.go index 8c2e78e51d..0e1eaafc59 100644 --- a/translator/translate/logs/metrics_collected/prometheus/prometheus.go +++ b/translator/translate/logs/metrics_collected/prometheus/prometheus.go @@ -4,10 +4,10 @@ package emfprocessor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/metrics_collected" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected" ) const SectionKey = "prometheus" diff --git a/translator/translate/logs/metrics_collected/prometheus/ruleClusterName.go b/translator/translate/logs/metrics_collected/prometheus/ruleClusterName.go index 8dc9ea17c8..73284f869f 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ruleClusterName.go +++ b/translator/translate/logs/metrics_collected/prometheus/ruleClusterName.go @@ -4,9 +4,9 @@ package emfprocessor import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go b/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go index 5cf3e66bab..4ebc9a690d 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go +++ b/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go @@ -9,8 +9,8 @@ import ( "os" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( diff --git a/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go b/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go index 8dbff42432..ec65a166a1 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go +++ b/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go @@ -6,10 +6,10 @@ package emfprocessor import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/logs/util" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) const ( diff --git a/translator/translate/logs/ruleBasicLogConfig.go b/translator/translate/logs/ruleBasicLogConfig.go index 07a9d37d37..a4cf45f769 100644 --- a/translator/translate/logs/ruleBasicLogConfig.go +++ b/translator/translate/logs/ruleBasicLogConfig.go @@ -4,8 +4,8 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) type BasicLogConfig struct { diff --git a/translator/translate/logs/ruleEndpointOverride.go b/translator/translate/logs/ruleEndpointOverride.go index 473eee07d9..71c649dea0 100644 --- a/translator/translate/logs/ruleEndpointOverride.go +++ b/translator/translate/logs/ruleEndpointOverride.go @@ -4,7 +4,7 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type EndpointOverride struct { diff --git a/translator/translate/logs/ruleForceFlushInterval.go b/translator/translate/logs/ruleForceFlushInterval.go index 2577af4667..f2373378c0 100644 --- a/translator/translate/logs/ruleForceFlushInterval.go +++ b/translator/translate/logs/ruleForceFlushInterval.go @@ -4,7 +4,7 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type ForceFlushInterval struct { diff --git a/translator/translate/logs/ruleLogCredentials.go b/translator/translate/logs/ruleLogCredentials.go index 701ba1af78..236b59f858 100644 --- a/translator/translate/logs/ruleLogCredentials.go +++ b/translator/translate/logs/ruleLogCredentials.go @@ -4,8 +4,8 @@ package logs import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type LogCreds struct { diff --git a/translator/translate/logs/ruleLogCredentials_test.go b/translator/translate/logs/ruleLogCredentials_test.go index 21e5a3db9a..a66af8367a 100644 --- a/translator/translate/logs/ruleLogCredentials_test.go +++ b/translator/translate/logs/ruleLogCredentials_test.go @@ -7,8 +7,8 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/logs/ruleLogStreamName.go b/translator/translate/logs/ruleLogStreamName.go index 681af8fe33..702fbb924b 100644 --- a/translator/translate/logs/ruleLogStreamName.go +++ b/translator/translate/logs/ruleLogStreamName.go @@ -8,11 +8,11 @@ import ( "os" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) type LogStreamName struct { diff --git a/translator/translate/logs/util/file_state_folder.go b/translator/translate/logs/util/file_state_folder.go index 467af7a531..415388ffc5 100644 --- a/translator/translate/logs/util/file_state_folder.go +++ b/translator/translate/logs/util/file_state_folder.go @@ -4,9 +4,9 @@ package util import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const File_State_Folder_Linux = "/opt/aws/amazon-cloudwatch-agent/logs/state" diff --git a/translator/translate/logs/util/get_ecs_cluster_name.go b/translator/translate/logs/util/get_ecs_cluster_name.go index 43f5f12cb2..c9dc6d3716 100644 --- a/translator/translate/logs/util/get_ecs_cluster_name.go +++ b/translator/translate/logs/util/get_ecs_cluster_name.go @@ -4,7 +4,7 @@ package util import ( - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) func GetECSClusterName(sectionKey string, input map[string]interface{}) string { @@ -18,4 +18,4 @@ func GetECSClusterName(sectionKey string, input map[string]interface{}) string { clusterName = ecsutil.GetECSUtilSingleton().Cluster } return clusterName -} \ No newline at end of file +} diff --git a/translator/translate/logs/util/get_eks_cluster_name.go b/translator/translate/logs/util/get_eks_cluster_name.go index 9091770616..50cffc9093 100644 --- a/translator/translate/logs/util/get_eks_cluster_name.go +++ b/translator/translate/logs/util/get_eks_cluster_name.go @@ -9,11 +9,11 @@ import ( "strings" "time" - configaws "github.com/aws/amazon-cloudwatch-agent/cfg/aws" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ec2util" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" ) const ( diff --git a/translator/translate/logs/util/validate_retention.go b/translator/translate/logs/util/validate_retention.go index e408917e31..b0abf91b81 100644 --- a/translator/translate/logs/util/validate_retention.go +++ b/translator/translate/logs/util/validate_retention.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ( diff --git a/translator/translate/metrics/append_dimensions/append_dimensions.go b/translator/translate/metrics/append_dimensions/append_dimensions.go index d6795afa15..f128d6e988 100644 --- a/translator/translate/metrics/append_dimensions/append_dimensions.go +++ b/translator/translate/metrics/append_dimensions/append_dimensions.go @@ -6,9 +6,9 @@ package append_dimensions import ( "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" - credsutil "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" + credsutil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type appendDimensions struct { diff --git a/translator/translate/metrics/append_dimensions/ruleCreds.go b/translator/translate/metrics/append_dimensions/ruleCreds.go index b0dff0c42b..478c39eedc 100644 --- a/translator/translate/metrics/append_dimensions/ruleCreds.go +++ b/translator/translate/metrics/append_dimensions/ruleCreds.go @@ -4,7 +4,7 @@ package append_dimensions import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) type Creds struct { diff --git a/translator/translate/metrics/append_dimensions/ruleCreds_test.go b/translator/translate/metrics/append_dimensions/ruleCreds_test.go index 5309e9423e..b678dd7ab9 100644 --- a/translator/translate/metrics/append_dimensions/ruleCreds_test.go +++ b/translator/translate/metrics/append_dimensions/ruleCreds_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/metrics/drop_origin/drop_origin.go b/translator/translate/metrics/drop_origin/drop_origin.go index 2c36c16598..f4ee03eef8 100644 --- a/translator/translate/metrics/drop_origin/drop_origin.go +++ b/translator/translate/metrics/drop_origin/drop_origin.go @@ -7,9 +7,9 @@ import ( "log" "reflect" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" ) type dropOrigin struct { diff --git a/translator/translate/metrics/metric_decoration/metric_decoration.go b/translator/translate/metrics/metric_decoration/metric_decoration.go index 262d53d22d..5ee771b52c 100755 --- a/translator/translate/metrics/metric_decoration/metric_decoration.go +++ b/translator/translate/metrics/metric_decoration/metric_decoration.go @@ -6,11 +6,11 @@ package metric_decoration import ( "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) const SectionKey = "metric_decoration" diff --git a/translator/translate/metrics/metrics.go b/translator/translate/metrics/metrics.go index 2d3d050d11..cc0ef037d1 100755 --- a/translator/translate/metrics/metrics.go +++ b/translator/translate/metrics/metrics.go @@ -6,12 +6,12 @@ package metrics import ( "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) type Rule translator.Rule diff --git a/translator/translate/metrics/metrics_collect/agentInternal/internal.go b/translator/translate/metrics/metrics_collect/agentInternal/internal.go index ccfc71660d..b03d358781 100644 --- a/translator/translate/metrics/metrics_collect/agentInternal/internal.go +++ b/translator/translate/metrics/metrics_collect/agentInternal/internal.go @@ -4,9 +4,9 @@ package agentInternal import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/collectd/collectd.go b/translator/translate/metrics/metrics_collect/collectd/collectd.go index 749960d031..ec0dda3094 100644 --- a/translator/translate/metrics/metrics_collect/collectd/collectd.go +++ b/translator/translate/metrics/metrics_collect/collectd/collectd.go @@ -4,8 +4,8 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" ) // diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDAuthFile.go b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDAuthFile.go index 9925ec7061..1334ff7fab 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDAuthFile.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDAuthFile.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type AuthFile struct { diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDSecurityLevel.go b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDSecurityLevel.go index 0d319750cd..ea2935610e 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDSecurityLevel.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDSecurityLevel.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type SecurityLevel struct { diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDTypesDB.go b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDTypesDB.go index 8f35af8ac2..fd6742fd16 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleCollectDTypesDB.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleCollectDTypesDB.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type TypesDB struct { diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleMetricsAggregationInterval.go b/translator/translate/metrics/metrics_collect/collectd/ruleMetricsAggregationInterval.go index fbe5db0ed1..4fd5191033 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleMetricsAggregationInterval.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleMetricsAggregationInterval.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type MetricsAggregationInterval struct { diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleNamePrefix.go b/translator/translate/metrics/metrics_collect/collectd/ruleNamePrefix.go index 2aad4d9837..9d3193b616 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleNamePrefix.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleNamePrefix.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type NamePrefix struct { diff --git a/translator/translate/metrics/metrics_collect/collectd/ruleServiceAddress.go b/translator/translate/metrics/metrics_collect/collectd/ruleServiceAddress.go index f62c8e2730..2f2eaacab1 100644 --- a/translator/translate/metrics/metrics_collect/collectd/ruleServiceAddress.go +++ b/translator/translate/metrics/metrics_collect/collectd/ruleServiceAddress.go @@ -4,7 +4,7 @@ package collected import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type ServiceAddress struct { diff --git a/translator/translate/metrics/metrics_collect/cpu/cpu.go b/translator/translate/metrics/metrics_collect/cpu/cpu.go index ace1570fa4..1a3437ded9 100644 --- a/translator/translate/metrics/metrics_collect/cpu/cpu.go +++ b/translator/translate/metrics/metrics_collect/cpu/cpu.go @@ -4,9 +4,9 @@ package cpu import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var CPU_ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/cpu/cpuWindowsMetrics.go b/translator/translate/metrics/metrics_collect/cpu/cpuWindowsMetrics.go index 4e29d731f4..4116a032a5 100644 --- a/translator/translate/metrics/metrics_collect/cpu/cpuWindowsMetrics.go +++ b/translator/translate/metrics/metrics_collect/cpu/cpuWindowsMetrics.go @@ -4,7 +4,7 @@ package cpu import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ObjectName = "Processor(*)" diff --git a/translator/translate/metrics/metrics_collect/cpu/ruleCollectCpuTime.go b/translator/translate/metrics/metrics_collect/cpu/ruleCollectCpuTime.go index 953e0aa09a..a3eb63dff9 100644 --- a/translator/translate/metrics/metrics_collect/cpu/ruleCollectCpuTime.go +++ b/translator/translate/metrics/metrics_collect/cpu/ruleCollectCpuTime.go @@ -6,7 +6,7 @@ package cpu import ( "strings" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type CollectCpuTime struct { diff --git a/translator/translate/metrics/metrics_collect/cpu/rulePerCpu.go b/translator/translate/metrics/metrics_collect/cpu/rulePerCpu.go index 539cd04155..3650714487 100644 --- a/translator/translate/metrics/metrics_collect/cpu/rulePerCpu.go +++ b/translator/translate/metrics/metrics_collect/cpu/rulePerCpu.go @@ -4,7 +4,7 @@ package cpu import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type PerCpu struct { diff --git a/translator/translate/metrics/metrics_collect/cpu/ruleReportActive.go b/translator/translate/metrics/metrics_collect/cpu/ruleReportActive.go index 07a618f73b..6119ad14ed 100644 --- a/translator/translate/metrics/metrics_collect/cpu/ruleReportActive.go +++ b/translator/translate/metrics/metrics_collect/cpu/ruleReportActive.go @@ -6,7 +6,7 @@ package cpu import ( "strings" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type ReportActive struct { diff --git a/translator/translate/metrics/metrics_collect/cpu/ruleTotalCpu.go b/translator/translate/metrics/metrics_collect/cpu/ruleTotalCpu.go index 33753d18e1..c6bab294c8 100644 --- a/translator/translate/metrics/metrics_collect/cpu/ruleTotalCpu.go +++ b/translator/translate/metrics/metrics_collect/cpu/ruleTotalCpu.go @@ -4,7 +4,7 @@ package cpu import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type TotalCpu struct { diff --git a/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go b/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go index 496fba81a7..afcc150790 100644 --- a/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go +++ b/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go @@ -7,9 +7,9 @@ import ( "reflect" "sort" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type customizedMetric struct { diff --git a/translator/translate/metrics/metrics_collect/disk/disk.go b/translator/translate/metrics/metrics_collect/disk/disk.go index c16f3ad933..80cec8be0b 100644 --- a/translator/translate/metrics/metrics_collect/disk/disk.go +++ b/translator/translate/metrics/metrics_collect/disk/disk.go @@ -4,9 +4,9 @@ package disk import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/disk/diskWindowsMetrics.go b/translator/translate/metrics/metrics_collect/disk/diskWindowsMetrics.go index 8743c5832b..2a67be8228 100644 --- a/translator/translate/metrics/metrics_collect/disk/diskWindowsMetrics.go +++ b/translator/translate/metrics/metrics_collect/disk/diskWindowsMetrics.go @@ -4,7 +4,7 @@ package disk import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ObjectName = "PhysicalDisk(*)" diff --git a/translator/translate/metrics/metrics_collect/disk/ruleDropTags.go b/translator/translate/metrics/metrics_collect/disk/ruleDropTags.go index 91bf8b14e3..48d5225f45 100644 --- a/translator/translate/metrics/metrics_collect/disk/ruleDropTags.go +++ b/translator/translate/metrics/metrics_collect/disk/ruleDropTags.go @@ -3,7 +3,7 @@ package disk -import "github.com/aws/amazon-cloudwatch-agent/translator" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" const ( tagExcludeKey = "tagexclude" diff --git a/translator/translate/metrics/metrics_collect/disk/ruleMountPoints.go b/translator/translate/metrics/metrics_collect/disk/ruleMountPoints.go index decdc8ade2..8eee0ad7aa 100644 --- a/translator/translate/metrics/metrics_collect/disk/ruleMountPoints.go +++ b/translator/translate/metrics/metrics_collect/disk/ruleMountPoints.go @@ -4,7 +4,7 @@ package disk import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type MountPoints struct { diff --git a/translator/translate/metrics/metrics_collect/diskio/diskio.go b/translator/translate/metrics/metrics_collect/diskio/diskio.go index 2404ad488a..eb173fcf72 100644 --- a/translator/translate/metrics/metrics_collect/diskio/diskio.go +++ b/translator/translate/metrics/metrics_collect/diskio/diskio.go @@ -4,9 +4,9 @@ package diskio import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/diskio/ruleDevices.go b/translator/translate/metrics/metrics_collect/diskio/ruleDevices.go index fb79efb9a2..2269d11844 100644 --- a/translator/translate/metrics/metrics_collect/diskio/ruleDevices.go +++ b/translator/translate/metrics/metrics_collect/diskio/ruleDevices.go @@ -3,7 +3,7 @@ package diskio -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" type Devices struct { } diff --git a/translator/translate/metrics/metrics_collect/ethtool/ethtool.go b/translator/translate/metrics/metrics_collect/ethtool/ethtool.go index 576f593f7c..367c889316 100644 --- a/translator/translate/metrics/metrics_collect/ethtool/ethtool.go +++ b/translator/translate/metrics/metrics_collect/ethtool/ethtool.go @@ -4,8 +4,8 @@ package ethtool import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceExclude.go b/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceExclude.go index b9abfcba1c..2bd0547563 100644 --- a/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceExclude.go +++ b/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceExclude.go @@ -4,7 +4,7 @@ package ethtool import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type InterfaceExclude struct { diff --git a/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceInclude.go b/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceInclude.go index 78751595ac..3222e23492 100644 --- a/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceInclude.go +++ b/translator/translate/metrics/metrics_collect/ethtool/ruleInterfaceInclude.go @@ -4,7 +4,7 @@ package ethtool import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type InterfaceInclude struct { diff --git a/translator/translate/metrics/metrics_collect/ethtool/ruleMetricsInclude.go b/translator/translate/metrics/metrics_collect/ethtool/ruleMetricsInclude.go index 99fabb1861..09a3bbd987 100644 --- a/translator/translate/metrics/metrics_collect/ethtool/ruleMetricsInclude.go +++ b/translator/translate/metrics/metrics_collect/ethtool/ruleMetricsInclude.go @@ -4,7 +4,7 @@ package ethtool import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type MetricsInclude struct { diff --git a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go index 3ff3557f5c..9910819a5c 100644 --- a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go +++ b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go @@ -1,10 +1,10 @@ package gpu import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/mem/mem.go b/translator/translate/metrics/metrics_collect/mem/mem.go index e274011547..9b9146e223 100644 --- a/translator/translate/metrics/metrics_collect/mem/mem.go +++ b/translator/translate/metrics/metrics_collect/mem/mem.go @@ -4,9 +4,9 @@ package mem import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/mem/memWindowsMetrics.go b/translator/translate/metrics/metrics_collect/mem/memWindowsMetrics.go index b1c8a3adff..51133a5d62 100644 --- a/translator/translate/metrics/metrics_collect/mem/memWindowsMetrics.go +++ b/translator/translate/metrics/metrics_collect/mem/memWindowsMetrics.go @@ -4,7 +4,7 @@ package mem import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ObjectName = "Memory" diff --git a/translator/translate/metrics/metrics_collect/metrics_collect.go b/translator/translate/metrics/metrics_collect/metrics_collect.go index ba192fdefd..136570ae33 100644 --- a/translator/translate/metrics/metrics_collect/metrics_collect.go +++ b/translator/translate/metrics/metrics_collect/metrics_collect.go @@ -6,11 +6,11 @@ package metrics_collect import ( "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" ) type Rule translator.Rule diff --git a/translator/translate/metrics/metrics_collect/net/net.go b/translator/translate/metrics/metrics_collect/net/net.go index 2b795da3e0..2e82126663 100644 --- a/translator/translate/metrics/metrics_collect/net/net.go +++ b/translator/translate/metrics/metrics_collect/net/net.go @@ -4,9 +4,9 @@ package net import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/net/netWindowsMetrics.go b/translator/translate/metrics/metrics_collect/net/netWindowsMetrics.go index de437ccb1a..38acadc9b8 100644 --- a/translator/translate/metrics/metrics_collect/net/netWindowsMetrics.go +++ b/translator/translate/metrics/metrics_collect/net/netWindowsMetrics.go @@ -4,7 +4,7 @@ package net import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ObjectName = "Network Interface(*)" diff --git a/translator/translate/metrics/metrics_collect/net/ruleInterfaces.go b/translator/translate/metrics/metrics_collect/net/ruleInterfaces.go index f469a33c29..06a7536e36 100644 --- a/translator/translate/metrics/metrics_collect/net/ruleInterfaces.go +++ b/translator/translate/metrics/metrics_collect/net/ruleInterfaces.go @@ -3,7 +3,7 @@ package net -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" type interfaces struct { } diff --git a/translator/translate/metrics/metrics_collect/netstat/netstat.go b/translator/translate/metrics/metrics_collect/netstat/netstat.go index eea447dfcb..754387d2c3 100644 --- a/translator/translate/metrics/metrics_collect/netstat/netstat.go +++ b/translator/translate/metrics/metrics_collect/netstat/netstat.go @@ -4,9 +4,9 @@ package netstat import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/processes/processes.go b/translator/translate/metrics/metrics_collect/processes/processes.go index f6b12cadd0..4e691c08cd 100644 --- a/translator/translate/metrics/metrics_collect/processes/processes.go +++ b/translator/translate/metrics/metrics_collect/processes/processes.go @@ -4,9 +4,9 @@ package processes import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/processes/processesWindowsMetrics.go b/translator/translate/metrics/metrics_collect/processes/processesWindowsMetrics.go index cf349f6247..83028b191e 100644 --- a/translator/translate/metrics/metrics_collect/processes/processesWindowsMetrics.go +++ b/translator/translate/metrics/metrics_collect/processes/processesWindowsMetrics.go @@ -4,7 +4,7 @@ package processes import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const ObjectName = "Process(*)" diff --git a/translator/translate/metrics/metrics_collect/procstat/procstat.go b/translator/translate/metrics/metrics_collect/procstat/procstat.go index 115f7354ae..45425d7ac7 100644 --- a/translator/translate/metrics/metrics_collect/procstat/procstat.go +++ b/translator/translate/metrics/metrics_collect/procstat/procstat.go @@ -4,11 +4,11 @@ package procstat import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonRule" - "github.com/aws/amazon-cloudwatch-agent/translator/jsonconfig/mergeJsonUtil" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_collect/procstat/rulePidFinder.go b/translator/translate/metrics/metrics_collect/procstat/rulePidFinder.go index be67f21a4d..4613cda4c4 100644 --- a/translator/translate/metrics/metrics_collect/procstat/rulePidFinder.go +++ b/translator/translate/metrics/metrics_collect/procstat/rulePidFinder.go @@ -4,7 +4,7 @@ package procstat import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type PidFinder struct{} diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleAllowedPendingMessages.go b/translator/translate/metrics/metrics_collect/statsd/ruleAllowedPendingMessages.go index a23e97841a..9d3a9e1517 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleAllowedPendingMessages.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleAllowedPendingMessages.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type AllowedPendingMessages struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleMetricSeparator.go b/translator/translate/metrics/metrics_collect/statsd/ruleMetricSeparator.go index 0359ac8328..f634f02446 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleMetricSeparator.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleMetricSeparator.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type MetricSeparator struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleMetricsAggregationInterval.go b/translator/translate/metrics/metrics_collect/statsd/ruleMetricsAggregationInterval.go index 9dc603a856..af333f2b66 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleMetricsAggregationInterval.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleMetricsAggregationInterval.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type MetricsAggregationInterval struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleMetricsCollectionInterval.go b/translator/translate/metrics/metrics_collect/statsd/ruleMetricsCollectionInterval.go index f2cfdb8c1c..a7adbdaa78 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleMetricsCollectionInterval.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleMetricsCollectionInterval.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) type MetricsCollectionInterval struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleParseTags.go b/translator/translate/metrics/metrics_collect/statsd/ruleParseTags.go index 5d683cf7e5..ec019a9aeb 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleParseTags.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleParseTags.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type ParseTags struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/ruleServiceAddress.go b/translator/translate/metrics/metrics_collect/statsd/ruleServiceAddress.go index 4322ec3232..c72e14fef6 100644 --- a/translator/translate/metrics/metrics_collect/statsd/ruleServiceAddress.go +++ b/translator/translate/metrics/metrics_collect/statsd/ruleServiceAddress.go @@ -4,7 +4,7 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type ServiceAddress struct { diff --git a/translator/translate/metrics/metrics_collect/statsd/statsd.go b/translator/translate/metrics/metrics_collect/statsd/statsd.go index e37bf6d469..7998e9021a 100644 --- a/translator/translate/metrics/metrics_collect/statsd/statsd.go +++ b/translator/translate/metrics/metrics_collect/statsd/statsd.go @@ -4,8 +4,8 @@ package statsd import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" ) // diff --git a/translator/translate/metrics/metrics_collect/swap/swap.go b/translator/translate/metrics/metrics_collect/swap/swap.go index 7a04b02064..71ad908858 100644 --- a/translator/translate/metrics/metrics_collect/swap/swap.go +++ b/translator/translate/metrics/metrics_collect/swap/swap.go @@ -4,9 +4,9 @@ package swap import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/metrics_collect" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) var ChildRule = map[string]translator.Rule{} diff --git a/translator/translate/metrics/metrics_test.go b/translator/translate/metrics/metrics_test.go index 680a4c5172..91b39573a3 100644 --- a/translator/translate/metrics/metrics_test.go +++ b/translator/translate/metrics/metrics_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/metrics/rollup_dimensions/rollupDimensions.go b/translator/translate/metrics/rollup_dimensions/rollupDimensions.go index e36a053aaa..fcad6b5b7b 100644 --- a/translator/translate/metrics/rollup_dimensions/rollupDimensions.go +++ b/translator/translate/metrics/rollup_dimensions/rollupDimensions.go @@ -4,9 +4,9 @@ package rollup_dimensions import ( - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" - parent "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" + parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics" ) type rollupDimensions struct { diff --git a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go index 007d5e5d69..3fcd28856d 100644 --- a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go +++ b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/metrics/ruleEndpointOverride.go b/translator/translate/metrics/ruleEndpointOverride.go index d658ea3114..927b704269 100644 --- a/translator/translate/metrics/ruleEndpointOverride.go +++ b/translator/translate/metrics/ruleEndpointOverride.go @@ -4,7 +4,7 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type EndpointOverride struct { diff --git a/translator/translate/metrics/ruleForceFlushInterval.go b/translator/translate/metrics/ruleForceFlushInterval.go index 8497aac616..b8f098cc67 100644 --- a/translator/translate/metrics/ruleForceFlushInterval.go +++ b/translator/translate/metrics/ruleForceFlushInterval.go @@ -4,7 +4,7 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type ForceFlushInterval struct { diff --git a/translator/translate/metrics/ruleMaxDatumsPerCall.go b/translator/translate/metrics/ruleMaxDatumsPerCall.go index 10c8fdb1f3..1bed9f9068 100644 --- a/translator/translate/metrics/ruleMaxDatumsPerCall.go +++ b/translator/translate/metrics/ruleMaxDatumsPerCall.go @@ -3,7 +3,7 @@ package metrics -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" type MaxDatumsPerCall struct { } diff --git a/translator/translate/metrics/ruleMaxValuesPerDatum.go b/translator/translate/metrics/ruleMaxValuesPerDatum.go index d5b83cff6f..0d9644dae0 100644 --- a/translator/translate/metrics/ruleMaxValuesPerDatum.go +++ b/translator/translate/metrics/ruleMaxValuesPerDatum.go @@ -3,7 +3,7 @@ package metrics -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" type MaxValuesPerDatum struct { } diff --git a/translator/translate/metrics/ruleMetricCredentials.go b/translator/translate/metrics/ruleMetricCredentials.go index 9f7878d217..d04e367d20 100644 --- a/translator/translate/metrics/ruleMetricCredentials.go +++ b/translator/translate/metrics/ruleMetricCredentials.go @@ -4,8 +4,8 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type MetricsCreds struct { diff --git a/translator/translate/metrics/ruleMetricCredentials_test.go b/translator/translate/metrics/ruleMetricCredentials_test.go index a786a968d4..9113a27fa9 100644 --- a/translator/translate/metrics/ruleMetricCredentials_test.go +++ b/translator/translate/metrics/ruleMetricCredentials_test.go @@ -7,8 +7,8 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/context" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/metrics/ruleNamespace.go b/translator/translate/metrics/ruleNamespace.go index b51cd73cf2..718d874c56 100644 --- a/translator/translate/metrics/ruleNamespace.go +++ b/translator/translate/metrics/ruleNamespace.go @@ -4,7 +4,7 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type Namespace struct { diff --git a/translator/translate/metrics/ruleTagExclude.go b/translator/translate/metrics/ruleTagExclude.go index 655a2f018d..5cec217821 100644 --- a/translator/translate/metrics/ruleTagExclude.go +++ b/translator/translate/metrics/ruleTagExclude.go @@ -4,7 +4,7 @@ package metrics import ( - "github.com/aws/amazon-cloudwatch-agent/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type TagExclude struct { diff --git a/translator/translate/metrics/util/commonconfigutil.go b/translator/translate/metrics/util/commonconfigutil.go index 5d9f1b3e8a..6a4b7f29c1 100755 --- a/translator/translate/metrics/util/commonconfigutil.go +++ b/translator/translate/metrics/util/commonconfigutil.go @@ -6,10 +6,10 @@ package util import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/util" ) const ( diff --git a/translator/translate/metrics/util/instanceutil.go b/translator/translate/metrics/util/instanceutil.go index 323afab2b5..9a2ada2aa5 100644 --- a/translator/translate/metrics/util/instanceutil.go +++ b/translator/translate/metrics/util/instanceutil.go @@ -6,7 +6,7 @@ package util import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" ) const Resource_Key = "resources" diff --git a/translator/translate/metrics/util/measurementutil.go b/translator/translate/metrics/util/measurementutil.go index bd8781bb90..078f83d153 100755 --- a/translator/translate/metrics/util/measurementutil.go +++ b/translator/translate/metrics/util/measurementutil.go @@ -9,9 +9,9 @@ import ( "reflect" "strings" - "github.com/aws/amazon-cloudwatch-agent/translator" - translatorConfig "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/metrics/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + translatorConfig "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" ) const field_pass_key = "fieldpass" diff --git a/translator/translate/translate.go b/translator/translate/translate.go index 22cc34f3b4..a49f48ff78 100644 --- a/translator/translate/translate.go +++ b/translator/translate/translate.go @@ -7,9 +7,9 @@ import ( "log" "sort" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) type Rule translator.Rule diff --git a/translator/translate/util/credsutil.go b/translator/translate/util/credsutil.go index 452d5d365e..bb871b4584 100644 --- a/translator/translate/util/credsutil.go +++ b/translator/translate/util/credsutil.go @@ -3,7 +3,7 @@ package util -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" type Creds struct { returnTargetKey string diff --git a/translator/translate/util/credsutil_test.go b/translator/translate/util/credsutil_test.go index 71dd5c2ded..b6b08e7a2a 100644 --- a/translator/translate/util/credsutil_test.go +++ b/translator/translate/util/credsutil_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" ) diff --git a/translator/translate/util/placeholderUtil.go b/translator/translate/util/placeholderUtil.go index a9a679ad5f..c78c3603fc 100644 --- a/translator/translate/util/placeholderUtil.go +++ b/translator/translate/util/placeholderUtil.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ec2util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" ) type Metadata struct { diff --git a/translator/translate/util/ruleutil.go b/translator/translate/util/ruleutil.go index dd607db3ba..b4449a3c07 100644 --- a/translator/translate/util/ruleutil.go +++ b/translator/translate/util/ruleutil.go @@ -3,7 +3,7 @@ package util -import "github.com/aws/amazon-cloudwatch-agent/translator/translate/agent" +import "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" type Region struct { returnTargetKey string diff --git a/translator/util/ec2util/ec2util.go b/translator/util/ec2util/ec2util.go index 66eae0eb39..17b7c652cf 100644 --- a/translator/util/ec2util/ec2util.go +++ b/translator/util/ec2util/ec2util.go @@ -9,10 +9,10 @@ import ( "sync" "time" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/context" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) // this is a singleton struct diff --git a/translator/util/ecsutil/ecsutil.go b/translator/util/ecsutil/ecsutil.go index 260584b668..2735536207 100644 --- a/translator/util/ecsutil/ecsutil.go +++ b/translator/util/ecsutil/ecsutil.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/util/httpclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/httpclient" ) const ( @@ -82,7 +82,7 @@ func (e *ecsUtil) getECSMetadata() (em *ecsMetadataResponse, err error) { func (e *ecsUtil) getMetadataResponse(endpoint string) (em *ecsMetadataResponse, err error) { em = &ecsMetadataResponse{} resp, err := e.httpClient.Request(endpoint) - + if err != nil { return } @@ -117,4 +117,4 @@ func (e *ecsUtil) parseClusterName(em *ecsMetadataResponse) { log.Printf("E! Invalid cluster arn: %s", em.Cluster) } e.Cluster = splitedContent[len(splitedContent)-1] -} \ No newline at end of file +} diff --git a/translator/util/ioutil.go b/translator/util/ioutil.go index f2ec306f37..6fccd9adff 100644 --- a/translator/util/ioutil.go +++ b/translator/util/ioutil.go @@ -8,7 +8,7 @@ import ( "fmt" "io/ioutil" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) // get the json map from the json byte array diff --git a/translator/util/proxyutil.go b/translator/util/proxyutil.go index 274fe57c0a..b37ebf4a2c 100644 --- a/translator/util/proxyutil.go +++ b/translator/util/proxyutil.go @@ -6,7 +6,7 @@ package util import ( "os" - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" ) func GetHttpProxy(proxyConfig map[string]string) (result map[string]string) { diff --git a/translator/util/sdkutil.go b/translator/util/sdkutil.go index f29e3ccd26..c137560325 100644 --- a/translator/util/sdkutil.go +++ b/translator/util/sdkutil.go @@ -10,12 +10,12 @@ import ( "path/filepath" "runtime" - commonconfig "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" - "github.com/aws/amazon-cloudwatch-agent/translator" - "github.com/aws/amazon-cloudwatch-agent/translator/config" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ec2util" - "github.com/aws/amazon-cloudwatch-agent/translator/util/ecsutil" "github.com/aws/aws-sdk-go/aws/session" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) const ( @@ -35,7 +35,7 @@ func DetectAgentMode(configuredMode string) string { fmt.Println("I! Detected from ENV instance is EC2") return config.ModeEC2 } - + if defaultEC2Region() != "" { fmt.Println("I! Detected the instance is EC2") return config.ModeEC2 @@ -101,7 +101,7 @@ func detectRegion(mode string, credsConfig map[string]string) (region string) { fmt.Println("I! Trying to detect region from ecs") region = defaultECSRegion() } - + return } diff --git a/translator/util/sslutil.go b/translator/util/sslutil.go index 7b6a9928ca..ac321e5d17 100644 --- a/translator/util/sslutil.go +++ b/translator/util/sslutil.go @@ -6,7 +6,7 @@ package util import ( "os" - "github.com/aws/amazon-cloudwatch-agent/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" ) func GetSSL(sslConfig map[string]string) (result map[string]string) { From 47b81f19a5c8ae4bbfe82c5d3579665b052ffa11 Mon Sep 17 00:00:00 2001 From: Ameen Date: Wed, 29 Jun 2022 13:40:11 -0400 Subject: [PATCH 003/144] Add toyamlconfig package (#1) * add toyamlconfig translator that converts json config to yaml to be used for otel adapted telegraf plugins --- cmd/config-translator/translator.go | 17 +- cmd/config-translator/translator_test.go | 8 +- go.mod | 56 +- go.sum | 509 +++--------------- translator/cmdutil/translatorutil.go | 54 +- translator/jsonconfig/mergeJsonConfig.go | 1 + translator/jsonconfig/mergeJsonConfig_test.go | 1 - .../register_rules.go} | 27 +- .../sampleConfig/advanced_config_linux.conf | 0 .../sampleConfig/advanced_config_linux.json | 0 .../sampleConfig/advanced_config_linux.yaml | 26 + .../sampleConfig/advanced_config_windows.conf | 0 .../sampleConfig/advanced_config_windows.json | 0 .../sampleConfig/advanced_config_windows.yaml | 12 + .../sampleConfig/basic_config_linux.conf | 0 .../sampleConfig/basic_config_linux.json | 0 .../sampleConfig/basic_config_linux.yaml | 14 + .../sampleConfig/basic_config_windows.conf | 0 .../sampleConfig/basic_config_windows.json | 0 .../sampleConfig/basic_config_windows.yaml | 12 + .../sampleConfig/collectd_config_linux.conf | 0 .../sampleConfig/collectd_config_linux.json | 0 .../sampleConfig/collectd_config_linux.yaml | 12 + .../sampleConfig/commonConfigTest.toml | 0 .../sampleConfig/complete_darwin_config.conf | 0 .../sampleConfig/complete_darwin_config.json | 3 +- .../sampleConfig/complete_darwin_config.yaml | 36 ++ .../sampleConfig/complete_linux_config.conf | 0 .../sampleConfig/complete_linux_config.json | 0 .../sampleConfig/complete_linux_config.yaml | 36 ++ .../sampleConfig/complete_windows_config.conf | 0 .../sampleConfig/complete_windows_config.json | 0 .../sampleConfig/complete_windows_config.yaml | 26 + .../sampleConfig/csm_only_config.json | 0 .../sampleConfig/csm_only_config_linux.conf | 0 .../sampleConfig/csm_only_config_linux.yaml | 12 + .../sampleConfig/csm_only_config_windows.conf | 0 .../sampleConfig/csm_only_config_windows.yaml | 12 + .../sampleConfig/csm_service_addresses.json | 0 .../csm_service_addresses_linux.conf | 0 .../csm_service_addresses_linux.yaml | 12 + .../csm_service_addresses_windows.conf | 0 .../csm_service_addresses_windows.yaml | 12 + .../sampleConfig/delta_config_linux.conf | 0 .../sampleConfig/delta_config_linux.json | 0 .../sampleConfig/delta_config_linux.yaml | 12 + .../sampleConfig/drop_origin_linux.conf | 0 .../sampleConfig/drop_origin_linux.json | 0 .../sampleConfig/drop_origin_linux.yaml | 16 + .../sampleConfig/log_ecs_metric_only.conf | 0 .../sampleConfig/log_ecs_metric_only.json | 0 .../sampleConfig/log_ecs_metric_only.yaml | 14 + .../sampleConfig/log_filter.conf | 0 .../sampleConfig/log_filter.json | 0 .../tocwconfig/sampleConfig/log_filter.yaml | 12 + .../sampleConfig/log_metric_and_log.conf | 0 .../sampleConfig/log_metric_and_log.json | 0 .../sampleConfig/log_metric_and_log.yaml | 18 + .../sampleConfig/log_metric_only.conf | 0 .../sampleConfig/log_metric_only.json | 0 .../sampleConfig/log_metric_only.yaml | 16 + .../sampleConfig/log_only_config_windows.conf | 0 .../sampleConfig/log_only_config_windows.json | 0 .../sampleConfig/log_only_config_windows.yaml | 14 + .../sampleConfig/prometheus_config_linux.conf | 0 .../sampleConfig/prometheus_config_linux.json | 0 .../sampleConfig/prometheus_config_linux.yaml | 12 + .../prometheus_config_windows.conf | 0 .../prometheus_config_windows.json | 0 .../prometheus_config_windows.yaml | 12 + .../sampleConfig/standard_config_linux.conf | 0 .../sampleConfig/standard_config_linux.json | 0 .../sampleConfig/standard_config_linux.yaml | 20 + ...ndard_config_linux_with_common_config.conf | 0 ...ndard_config_linux_with_common_config.yaml | 20 + .../sampleConfig/standard_config_windows.conf | 0 .../sampleConfig/standard_config_windows.json | 0 .../sampleConfig/standard_config_windows.yaml | 12 + ...ard_config_windows_with_common_config.conf | 0 ...ard_config_windows_with_common_config.yaml | 12 + .../sampleConfig/statsd_config.json | 0 .../sampleConfig/statsd_config_linux.conf | 0 .../sampleConfig/statsd_config_linux.yaml | 12 + .../sampleConfig/statsd_config_windows.conf | 0 .../sampleConfig/statsd_config_windows.yaml | 12 + .../windows_eventlog_only_config.conf | 0 .../windows_eventlog_only_config.json | 0 .../windows_eventlog_only_config.yaml | 12 + translator/tocwconfig/tocwconfig_test.go | 309 +++++++++++ .../toenvconfig/toEnvConfig.go | 0 .../tocwconfig/totomlconfig/toTomlConfig.go | 20 + .../tomlConfigTemplate/agentToml.conf | 0 .../tomlConfigTemplate/agentToml.json | 0 .../tomlConfigTemplate/tomlConfig.go | 0 .../toyamlconfig/encoder/encoder.go | 5 + .../encoder/mapstructure/encoder.go | 188 +++++++ .../encoder/mapstructure/encoder_test.go | 221 ++++++++ .../tocwconfig/toyamlconfig/toyamlconfig.go | 120 +++++ translator/toenvconfig/toEnvConfig_test.go | 191 ------- translator/totomlconfig/toTomlConfig_test.go | 240 --------- .../logs/metrics_collected/emf/emf.go | 4 +- .../metrics_collected/emf/structuredlog.go | 4 +- .../metrics_collect/collectd/collectd.go | 2 +- .../metrics/metrics_collect/statsd/statsd.go | 4 +- translator/util/config_util.go | 22 + 105 files changed, 1495 insertions(+), 959 deletions(-) rename translator/{totomlconfig/toTomlConfig.go => registerrules/register_rules.go} (89%) mode change 100755 => 100644 rename translator/{totomlconfig => tocwconfig}/sampleConfig/advanced_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/advanced_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/advanced_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/advanced_config_windows.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/advanced_config_windows.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/advanced_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/basic_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/basic_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/basic_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/basic_config_windows.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/basic_config_windows.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/basic_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/collectd_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/collectd_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/collectd_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/commonConfigTest.toml (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_darwin_config.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_darwin_config.json (99%) create mode 100644 translator/tocwconfig/sampleConfig/complete_darwin_config.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_linux_config.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_linux_config.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/complete_linux_config.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_windows_config.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/complete_windows_config.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/complete_windows_config.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_only_config.json (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_only_config_linux.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_only_config_windows.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_service_addresses.json (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_service_addresses_linux.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/csm_service_addresses_windows.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/delta_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/delta_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/delta_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/drop_origin_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/drop_origin_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/drop_origin_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_ecs_metric_only.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_ecs_metric_only.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_filter.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_filter.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/log_filter.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_metric_and_log.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_metric_and_log.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/log_metric_and_log.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_metric_only.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_metric_only.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/log_metric_only.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_only_config_windows.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/log_only_config_windows.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/log_only_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/prometheus_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/prometheus_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/prometheus_config_windows.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/prometheus_config_windows.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_linux.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_linux.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/standard_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_linux_with_common_config.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_windows.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_windows.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/standard_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/standard_config_windows_with_common_config.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/statsd_config.json (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/statsd_config_linux.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/statsd_config_linux.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/statsd_config_windows.conf (100%) create mode 100644 translator/tocwconfig/sampleConfig/statsd_config_windows.yaml rename translator/{totomlconfig => tocwconfig}/sampleConfig/windows_eventlog_only_config.conf (100%) rename translator/{totomlconfig => tocwconfig}/sampleConfig/windows_eventlog_only_config.json (100%) create mode 100644 translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml create mode 100644 translator/tocwconfig/tocwconfig_test.go rename translator/{ => tocwconfig}/toenvconfig/toEnvConfig.go (100%) create mode 100755 translator/tocwconfig/totomlconfig/toTomlConfig.go rename translator/{ => tocwconfig}/totomlconfig/tomlConfigTemplate/agentToml.conf (100%) rename translator/{ => tocwconfig}/totomlconfig/tomlConfigTemplate/agentToml.json (100%) rename translator/{ => tocwconfig}/totomlconfig/tomlConfigTemplate/tomlConfig.go (100%) create mode 100644 translator/tocwconfig/toyamlconfig/encoder/encoder.go create mode 100644 translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go create mode 100644 translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go create mode 100644 translator/tocwconfig/toyamlconfig/toyamlconfig.go delete mode 100644 translator/toenvconfig/toEnvConfig_test.go delete mode 100644 translator/totomlconfig/toTomlConfig_test.go create mode 100644 translator/util/config_util.go diff --git a/cmd/config-translator/translator.go b/cmd/config-translator/translator.go index c791a2bf66..28a97ec59f 100644 --- a/cmd/config-translator/translator.go +++ b/cmd/config-translator/translator.go @@ -5,6 +5,7 @@ package main import ( "flag" + "fmt" "log" "os" "os/user" @@ -18,9 +19,11 @@ import ( ) const ( - exitErrorMessage = "Configuration validation first phase failed. Agent version: %v. Verify the JSON input is only using features supported by this version.\n" - version = "1.0" - envConfigFileName = "env-config.json" + exitErrorMessage = "Configuration validation first phase failed. Agent version: %v. Verify the JSON input is only using features supported by this version.\n" + exitSuccessMessage = "Configuration validation first phase succeeded" + version = "1.0" + envConfigFileName = "env-config.json" + yamlConfigFileName = "amazon-cloudwatch-config.yaml" ) func initFlags() { @@ -105,8 +108,12 @@ func main() { } tomlConfigPath := cmdutil.GetTomlConfigPath(ctx.OutputTomlFilePath()) - cmdutil.TranslateJsonMapToTomlFile(mergedJsonConfigMap, tomlConfigPath) - // Put env config into the same folder as the toml config. + yamlConfigPath := filepath.Join(filepath.Dir(tomlConfigPath), yamlConfigFileName) + config := cmdutil.TranslateJsonMapToConfig(mergedJsonConfigMap) + cmdutil.ConfigToTomlFile(config, tomlConfigPath) + cmdutil.ConfigToYamlFile(config, yamlConfigPath) + fmt.Println(exitSuccessMessage) + // Put env config into the same folder as the toml config envConfigPath := filepath.Join(filepath.Dir(tomlConfigPath), envConfigFileName) cmdutil.TranslateJsonMapToEnvConfigFile(mergedJsonConfigMap, envConfigPath) } diff --git a/cmd/config-translator/translator_test.go b/cmd/config-translator/translator_test.go index 6c7d6dfcad..36d997a429 100644 --- a/cmd/config-translator/translator_test.go +++ b/cmd/config-translator/translator_test.go @@ -180,13 +180,13 @@ func TestInvalidLogFilterConfig(t *testing.T) { // Validate all sampleConfig files schema func TestSampleConfigSchema(t *testing.T) { - if files, err := ioutil.ReadDir("../../translator/totomlconfig/sampleConfig/"); err == nil { + if files, err := ioutil.ReadDir("../../translator/tocwconfig/sampleConfig/"); err == nil { re := regexp.MustCompile(".json") for _, file := range files { if re.MatchString(file.Name()) { - t.Logf("Validating ../../translator/totomlconfig/sampleConfig/%s\n", file.Name()) - checkIfSchemaValidateAsExpected(t, "../../translator/totomlconfig/sampleConfig/"+file.Name(), true, map[string]int{}) - t.Logf("Validated ../../translator/totomlconfig/sampleConfig/%s\n", file.Name()) + t.Logf("Validating ../../translator/tocwconfig/sampleConfig/%s\n", file.Name()) + checkIfSchemaValidateAsExpected(t, "../../translator/tocwconfig/sampleConfig/"+file.Name(), true, map[string]int{}) + t.Logf("Validated ../../translator/tocwconfig/sampleConfig/%s\n", file.Name()) } } } else { diff --git a/go.mod b/go.mod index 2f7932a044..b0168537cd 100644 --- a/go.mod +++ b/go.mod @@ -73,14 +73,16 @@ require ( github.com/kardianos/service v1.2.1 github.com/kr/pretty v0.3.0 github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 + github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 github.com/prometheus/common v0.34.0 github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 - github.com/shirou/gopsutil/v3 v3.22.3 + github.com/shirou/gopsutil/v3 v3.22.5 github.com/stretchr/testify v1.7.1 github.com/xeipuuv/gojsonschema v1.2.0 + go.opentelemetry.io/collector v0.53.0 golang.org/x/net v0.0.0-20220412020605-290c469a71a5 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20220412211240-33da011f77ad @@ -89,6 +91,7 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 gopkg.in/yaml.v2 v2.4.0 + gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.1.0 k8s.io/api v0.23.6 k8s.io/apimachinery v0.23.6 @@ -99,8 +102,8 @@ require ( require ( cloud.google.com/go/compute v1.6.0 // indirect collectd.org v0.4.0 // indirect + contrib.go.opencensus.io/exporter/prometheus v0.4.1 // indirect github.com/Azure/azure-sdk-for-go v63.0.0+incompatible // indirect - github.com/Azure/go-amqp v0.17.4 // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.25 // indirect github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect @@ -109,7 +112,6 @@ require ( github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect - github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e // indirect github.com/Microsoft/go-winio v0.5.1 // indirect github.com/StackExchange/wmi v1.2.1 // indirect github.com/alecthomas/participle v0.4.1 // indirect @@ -117,17 +119,13 @@ require ( github.com/antchfx/jsonquery v1.1.5 // indirect github.com/antchfx/xmlquery v1.3.9 // indirect github.com/antchfx/xpath v1.2.0 // indirect - github.com/apache/thrift v0.16.0 // indirect github.com/armon/go-metrics v0.3.10 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 // indirect github.com/aws/aws-sdk-go-v2/credentials v1.11.2 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.9 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3 // indirect github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.3 // indirect github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.26.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 // indirect github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 // indirect github.com/aws/aws-sdk-go-v2/service/sts v1.16.3 // indirect github.com/benbjohnson/clock v1.3.0 // indirect @@ -156,19 +154,17 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect - github.com/frankban/quicktest v1.14.2 // indirect github.com/fsnotify/fsnotify v1.5.1 // indirect - github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect github.com/go-kit/log v0.2.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect github.com/go-zookeeper/zk v1.0.2 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.2.0 // indirect - github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect @@ -188,26 +184,28 @@ require ( github.com/hashicorp/serf v0.9.6 // indirect github.com/hetznercloud/hcloud-go v1.33.1 // indirect github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect - github.com/jaegertracing/jaeger v1.33.0 // indirect github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.16.1 // indirect + github.com/knadh/koanf v1.4.1 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect - github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b // indirect github.com/linode/linodego v1.4.1 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/magiconair/properties v1.8.6 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/miekg/dns v1.1.48 // indirect github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 // indirect github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/mapstructure v1.4.3 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/sys/mountinfo v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect @@ -219,23 +217,23 @@ require ( github.com/opencontainers/runc v1.1.0 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/opencontainers/selinux v1.10.0 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect - github.com/pierrec/lz4/v4 v4.1.14 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/statsd_exporter v0.21.0 // indirect github.com/rogpeppe/go-internal v1.6.2 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 // indirect github.com/shirou/gopsutil v3.21.5+incompatible // indirect - github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 // indirect - github.com/signalfx/sapm-proto v0.9.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect + github.com/spf13/cobra v1.4.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/stretchr/objx v0.2.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect @@ -249,17 +247,22 @@ require ( github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vjeantet/grok v1.0.1 // indirect github.com/wavefronthq/wavefront-sdk-go v0.9.10 // indirect - github.com/xdg-go/scram v1.1.1 // indirect - github.com/xdg-go/stringprep v1.0.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - github.com/yuin/gopher-lua v0.0.0-20220413183635-c841877397d8 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/model v0.48.0 // indirect + go.opentelemetry.io/collector/pdata v0.53.0 // indirect + go.opentelemetry.io/collector/semconv v0.53.0 // indirect + go.opentelemetry.io/otel v1.7.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.30.0 // indirect + go.opentelemetry.io/otel/metric v0.30.0 // indirect + go.opentelemetry.io/otel/sdk v1.7.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.30.0 // indirect + go.opentelemetry.io/otel/trace v1.7.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect - go.uber.org/multierr v1.7.0 // indirect + go.uber.org/multierr v1.8.0 // indirect + go.uber.org/zap v1.21.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect @@ -270,15 +273,14 @@ require ( google.golang.org/api v0.77.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect - google.golang.org/grpc v1.46.0 // indirect + google.golang.org/grpc v1.47.0 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.66.4 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect - modernc.org/ccgo/v3 v3.16.2 // indirect - modernc.org/libc v1.15.0 // indirect + modernc.org/cc/v3 v3.35.26 // indirect + modernc.org/mathutil v1.4.1 // indirect + modernc.org/memory v1.0.7 // 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 diff --git a/go.sum b/go.sum index 417458747d..a3547e9083 100644 --- a/go.sum +++ b/go.sum @@ -27,7 +27,6 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= @@ -46,7 +45,6 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/iam v0.1.1 h1:4CapQyNFjiksks1/x7jsvsygFPhihslYk5GptIrlX68= cloud.google.com/go/monitoring v1.2.0 h1:fEvQITrhVcPM6vuDQcgPMbU5kZFeQFwZmE7v6+S8BPo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -59,11 +57,11 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= collectd.org v0.4.0 h1:nWNldfMqg7EVWAevG8oyOVsS9r/UHRG3LZRf6MdQho0= collectd.org v0.4.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= +contrib.go.opencensus.io/exporter/prometheus v0.4.1 h1:oObVeKo2NxpdF/fIfrPsNj6K0Prg0R0mHM+uANlYMiM= +contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= @@ -74,8 +72,7 @@ github.com/Azure/azure-sdk-for-go v63.0.0+incompatible h1:whPsa+jCHQSo5wGMPNLw4b github.com/Azure/azure-sdk-for-go v63.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= -github.com/Azure/go-amqp v0.17.4 h1:6t9wEiwA4uXMRoUj3Cd3K2gmH8cW8ylizmBnSeF0bzM= -github.com/Azure/go-amqp v0.17.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= +github.com/Azure/go-amqp v0.17.0 h1:HHXa3149nKrI0IZwyM7DRcRy5810t9ZICDutn4BYzj4= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -108,15 +105,12 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e h1:ZU22z/2YRFLyf/P4ZwUYSdNCWsMEI0VeyrFoI2rAhJQ= -github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= -github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnloDp7xxV0YvstAE7nKTaM= github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= @@ -149,23 +143,19 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 h1:6olZmdYuK84eO0PeCQX1iy2EFWlOl8G+JNBi4vFmcU8= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/sarama v1.31.0/go.mod h1:BeW3gXRc/CxgAsrSly2RE9nIXUfC9ezb7QHBPVhvzjI= github.com/Shopify/sarama v1.32.0 h1:P+RUjEaRU0GMMbYexGMDyrMkLhbbBVUVISDywi+IlFU= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/aerospike/aerospike-client-go/v5 v5.7.0 h1:Olgq011scnhKlGxo4AcGSXI8JRLF0aSEdl1PhjmKTUo= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/alecthomas/go-thrift v0.0.0-20170109061633-7914173639b2/go.mod h1:CxCgO+NdpMdi9SsTlGbc0W+/UNxO3I0AabOEJZ3w61w= github.com/alecthomas/kong v0.2.1/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI= github.com/alecthomas/participle v0.4.1 h1:P2PJWzwrSpuCWXKnzqvw0b0phSfH1kJo4p2HvLynVsI= @@ -183,7 +173,6 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE= github.com/antchfx/jsonquery v1.1.5/go.mod h1:RtMzTHohKaAerkfslTNjr3Y9MdxjKlSgIgaVjVKNiug= github.com/antchfx/xmlquery v1.3.9 h1:Y+zyMdiUZ4fasTQTkDb3DflOXP7+obcYEh80SISBmnQ= @@ -192,11 +181,8 @@ github.com/antchfx/xpath v1.1.7/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNY github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8= github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8= github.com/apache/arrow/go/arrow v0.0.0-20211006091945-a69884db78f4 h1:nPUln5QTzhftSpmld3xcXw/GOJ3z1E8fR8tUrrc0YWk= -github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= -github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= -github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/apache/thrift v0.15.0 h1:aGvdaR0v1t9XLgjtBYwxcBvBOTMqClzwE26CHOgjW1Y= github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3 h1:Bmjk+DjIi3tTAU0wxGaFbfjGUqlxxSXARq9A96Kgoos= github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 h1:FD4/ikKOFxwP8muWDypbmBWc634+YcAs3eBrYAmRdZY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -207,13 +193,9 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= @@ -228,8 +210,7 @@ github.com/aws/aws-sdk-go-v2 v1.13.0/go.mod h1:L6+ZpqHaLbAaxsqV0L4cvxZY7QupWJB4f github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= github.com/aws/aws-sdk-go-v2 v1.16.3 h1:0W1TSJ7O6OzwuEvIXAtJGvOeQ0SGAhcpxPN2/NK5EhM= github.com/aws/aws-sdk-go-v2 v1.16.3/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.2.0 h1:scBthy70MB3m4LCMFaBcmYCyR2XWOz6MxSfdSu/+fQo= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.15.3 h1:5AlQD0jhVXlGzwo+VORKiUuogkG7pQcLJNzIzK7eodw= github.com/aws/aws-sdk-go-v2/config v1.15.3/go.mod h1:9YL3v07Xc/ohTsxFXzan9ZpFpdTOFl4X65BAKYaz8jg= @@ -249,8 +230,6 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.3/go.mod h1:ssOhaLpRlh88 github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 h1:by9P+oy3P/CwggN4ClnW2D4oL91QV7pBzBICi1chZvQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.0 h1:cq+47u1zpHyH+PSkbBx1N9whx4TiM9m9ibimOPaNlBg= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.0/go.mod h1:Nf3QiqrNy2sj3Rku+9z4nN/bThI97gQmR7YxG3s+ez8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.5.0/go.mod h1:acH3+MQoiMzozT/ivU+DbRg7Ooo2298RdRaWcOv+4vM= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.18.1 h1:8PHGmLw1QbTdXfgEpXclOk3kob72vkc/cEoyBxkmR0M= @@ -260,12 +239,8 @@ github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.4/go.mod h1:R49Py2lGoK github.com/aws/aws-sdk-go-v2/service/dynamodb v1.14.0 h1:P+eF8PKkeaiTfN/VBe5GI3uNdhwCPVYCQxchRewJcWk= github.com/aws/aws-sdk-go-v2/service/ec2 v1.29.0 h1:7jk4NfzDnnSbaR9E4mOBWRZXQThq5rsqjlDC+uu9dsI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.29.0/go.mod h1:HoTu0hnXGafTpKIZQ60jw0ybhhCH1QYf20oL7GEJFdg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1 h1:T4pFel53bkHjL2mMo+4DKE6r6AuoZnM0fg7k1/ratr4= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1/go.mod h1:GeUru+8VzrTXV/83XyMJ80KpH8xO89VPoUileyNQ+tc= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 h1:I0dcwWitE752hVSMrsLCxqNQ+UdEp3nACx2bYNMQq+k= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3/go.mod h1:Seb8KNmD6kVTjwRjVEgOT5hPin6sq+v4C2ycJQDwuH8= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.3 h1:JUbFrnq5mEeM2anIJ2PUkaHpKPW/D+RYAQVv5HXYQg4= -github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.3/go.mod h1:lgGDXBzoot238KmAAn6zf9lkoxcYtJECnYURSbvNlfc= +github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.8.0 h1:wS94St7YDmLhrPJw3mjJfCfHHOABS3G9c//mDZRzELU= +github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.6.0 h1:q/O6wGx7MFwWfRNgTIVmGgXGBz9UKv16eSX1uuWdM7A= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.7.0/go.mod h1:K/qPe6AP2TGYv4l6n7c88zh9jWBDf6nHhvg1fx/EWfU= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3 h1:Gh1Gpyh01Yvn7ilO/b/hr01WgNpaszfbKMUgqM186xQ= @@ -276,8 +251,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2Ia github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc= github.com/aws/aws-sdk-go-v2/service/kinesis v1.13.0 h1:wqLvwC4qdrrGikudu8Z9X2sb79BYUYWAgMF5BGFQJY8= github.com/aws/aws-sdk-go-v2/service/kinesis v1.13.0 h1:wqLvwC4qdrrGikudu8Z9X2sb79BYUYWAgMF5BGFQJY8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.5 h1:A3PuAUlh1u47WHcM68CDaG9ZWjK7ewePjDp+0dY9yv4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.5/go.mod h1:qFKU5d+PAv+23bi9ZhtWeA+TmLUz7B/R59ZGXQ1Mmu4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.16.0 h1:dt1JQFj/135ozwGIWeCM3aQ8N/kB3Xu3Uu4r9zuOIyc= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 h1:frW4ikGcxfAEDfmQqWgMLp+F1n4nRo9sF39OcIb5BkQ= @@ -307,15 +281,12 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 h1:4UwtVL/bvcpWHPAUCtu8hKl7belqWxDEw94wkYFWem8= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579/go.mod h1:RI5D4DqbDX0Kb0SvKTuAKMYlkSBND3zLQZI/wiS5Ij0= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= @@ -325,8 +296,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -470,7 +441,6 @@ github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= @@ -490,21 +460,18 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/couchbase/go-couchbase v0.1.1 h1:ClFXELcKj/ojyoTYbsY34QUrrYCBi/1G749sXSCkdhk= github.com/couchbase/gomemcached v0.1.3 h1:HIc5qMYNbuhB7zNaiEtj61DCYkquAwrQlf64q7JzdEY= github.com/couchbase/goutils v0.1.0 h1:0WLlKJilu7IBm98T8nS9+J36lBFVLRUSIUtyD/uWpAE= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -512,10 +479,7 @@ github.com/denisenkom/go-mssqldb v0.12.0 h1:VtrkII767ttSPNRfFekePK3sctr+joXgO58s github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA= -github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.78.0 h1:hKMfHXChSMjZFMSev+m5R4/2rxZ3HPdhlpeA2pJI72M= @@ -537,7 +501,6 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -549,7 +512,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dynatrace-oss/dynatrace-metric-utils-go v0.3.0 h1:q2Ayh9s6Cr75bS5URiOUAoyFXemgKQaBJphbhAaJHCY= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q= -github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= @@ -568,11 +530,9 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4gg31M/xaciQlDml8= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= @@ -588,37 +548,29 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= -github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= -github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= -github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= -github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A= -github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -646,109 +598,38 @@ github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk= -github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= -github.com/go-openapi/analysis v0.20.1/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= -github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= -github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= -github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4= -github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o= -github.com/go-openapi/loads v0.21.0/go.mod h1:rHYve9nZrQ4CJhyeIIFJINGCg1tQpx2yJrrNo8sf1ws= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98= -github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= -github.com/go-openapi/runtime v0.22.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs= github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= -github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= -github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a3qwC9OsQ= -github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= -github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= -github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= -github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= -github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8= -github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4= -github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI= -github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0= -github.com/go-openapi/validate v0.20.3/go.mod h1:goDdqVGiigM3jChcrYJxD2joalke3ZXeftD16byIjA4= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c h1:fWdhUpCuoeNIPiQ+pkAmmERYEjhVx5/cbVGK7T99OkI= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -758,7 +639,6 @@ github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= @@ -794,7 +674,6 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= -github.com/gocql/gocql v0.0.0-20211222173705-d73e6b1002a7/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -806,7 +685,6 @@ github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZg github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= -github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -817,8 +695,7 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= -github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 h1:+eHOFJl1BaXrQxKX+T06f78590z4qA2ZzBTqahsKSE4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= @@ -867,7 +744,6 @@ github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.44.0 h1:523mBK94XHKAsU1TIQl/tYoPyYpWQdalf2CQ8Gv2Xek= github.com/google/cadvisor v0.44.0/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= -github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -934,13 +810,10 @@ github.com/gophercloud/gophercloud v0.24.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -960,14 +833,11 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gwos/tcg/sdk v0.0.0-20211223101342-35fbd1ae683c h1:befb5xGUwNCoBuN/akLFCKekUzr0ixyws3aAX/7TaOk= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/harlow/kinesis-consumer v0.3.5 h1:xeiDp2frP8DdKDeOzVuS+vaBX03JjifQO/Apzu4IOMA= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -986,9 +856,6 @@ github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9 github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -1003,7 +870,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -1017,13 +883,13 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -1042,7 +908,6 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hetznercloud/hcloud-go v1.33.1 h1:W1HdO2bRLTKU4WsyqAasDSpt54fYO4WNckWYfH5AuCQ= github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -1057,6 +922,7 @@ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/go-syslog/v3 v3.0.0 h1:jichmjSZlYK0VMmlz+k4WeOQd7z745YLsvGMqwtYt4I= github.com/influxdata/influxdb-observability/common v0.2.10 h1:5sQwU7KQYWSB7ZuPZXO39yQJ2nw2FPoxWeLoNK2jKRE= @@ -1087,23 +953,14 @@ github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= -github.com/jaegertracing/jaeger v1.31.0/go.mod h1:KukZMhuamI3NVbzWmngcmXbcnxiB3WyaNf0nxio+sUw= -github.com/jaegertracing/jaeger v1.33.0 h1:dQlFIzMjcKrLCPeqMrHYIzzooQndjgxQIMTbfv0URRM= -github.com/jaegertracing/jaeger v1.33.0/go.mod h1:e+VRpxSeRWWwlVN1ORhlG4Kv7IVmXkp6z80jtYsjtDU= +github.com/jaegertracing/jaeger v1.26.0 h1:4LbUdb9l/Mx83zYvjLbkrayheX+Aga26NEI+feo3xzA= github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a h1:JxcWget6X/VfBMKxPIc28Jel37LGREut2fpV+ObkwJ0= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA= -github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca h1:a0GZUdb+qnutF8shJxr2qs2qT3fnF+ptxTxPB8+oIvk= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1111,6 +968,7 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -1137,21 +995,17 @@ github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0Lh github.com/karrick/godirwalk v1.12.0 h1:nkS4xxsjiZMvVlazd0mFyiwD4BR9f3m6LXGhM2TUx3Y= github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4= -github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= +github.com/klauspost/compress v1.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= +github.com/knadh/koanf v1.4.1 h1:Z0VGW/uo8NJmjd+L1Dc3S5frq6c62w5xQ9Yf4Mg3wFQ= +github.com/knadh/koanf v1.4.1/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1173,27 +1027,21 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b h1:11UHH39z1RhZ5dc4y4r/4koJo6IYFgTRMe/LlwRTEw0= -github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= +github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= github.com/linode/linodego v1.4.1 h1:cgpY1jCZ47wfJvWH5V8in7Tphj8T0sR1URiH9e6G2bA= github.com/linode/linodego v1.4.1/go.mod h1:PVsRxSlOiJyvG4/scTszpmZDTdgS+to3X6eS8pRrWI8= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= -github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= -github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -1216,8 +1064,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= @@ -1243,8 +1089,8 @@ github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -1257,13 +1103,13 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/ipvs v1.0.1 h1:aoZ7fhLTXgDbzVrAnvV+XbKOU8kOET7B3+xULDF/1o0= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= @@ -1290,7 +1136,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mostynb/go-grpc-compression v1.1.16/go.mod h1:xxa6UoYynYS2h+5HB/Hglu81iYAp87ARaNmhhwi0s1s= +github.com/mostynb/go-grpc-compression v1.1.16 h1:D9tGUINmcII049pxOj9dl32Fzhp26TrDVQXECoKJqQg= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/multiplay/go-ts3 v1.0.1 h1:Ja8ho7UzUDNvNCwcDzPEPimLRub7MUqbD+sgMWkcR0A= @@ -1330,7 +1176,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U= -github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1343,7 +1188,6 @@ github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= @@ -1355,12 +1199,9 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1/go.mod h1:TpHOGTSMvUW2JRbpviXoD1s0X0+aThqN2MLROq4+33I= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1/go.mod h1:Jfr+P4ovAzqT6cqUJ2H3gzPF591Pk0yj+r9sXONuDHc= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1386,8 +1227,6 @@ github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= -github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -1395,25 +1234,20 @@ github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= -github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= -github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= -github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4= github.com/pion/dtls/v2 v2.0.13 h1:toLgXzq42/MEmfgkXDfzdnwLHMi4tfycaQPGkv9tzRE= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= @@ -1426,7 +1260,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -1445,6 +1278,7 @@ github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQ github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= @@ -1484,17 +1318,15 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731 h1:THs/itDqjnXLTblN7kE0QhcJ79IbokGJ5e06/WrwxCY= github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731/go.mod h1:X/u6JAiaI9Fsu9t7cGXMZCERQHLJjiB01Pue8BXz14s= +github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/riemann/riemann-go-client v0.5.0 h1:yPP7tz1vSYJkSZvZFCsMiDsHHXX57x8/fEX3qyEXuAA= -github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1503,8 +1335,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1513,33 +1345,26 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 h1:ZFfeKAhIQiiOrQaI3/znw0gOmYpO28Tcu1YaqMa/jtQ= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e h1:CGjiMQ0wMH4wtNWrlj6kiTbkPt2F3rbYnhGX6TWLfco= -github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/showwin/speedtest-go v1.1.4 h1:pcY1W5LYZu44lH6Fuu80nu/Pj67n//VArlZudbAgR6E= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REPKyIadvid5FPy2+VMgvbmKJ0= -github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= +github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 h1:X886QgwZH5qr9HIQkk3mWcNEhUxx6D8rUZumzLV4Wiw= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= github.com/signalfx/golib/v3 v3.3.43 h1:GvzjE2WaYU3oPhoek52/5zYZ5tPnt05EXUmszSZct+E= -github.com/signalfx/sapm-proto v0.9.0 h1:x4EfhzOZtBGyt2x8gc/C23Id9B+3lf1zE59VUWLKbpQ= -github.com/signalfx/sapm-proto v0.9.0/go.mod h1:OmhyyGyhBzoKQn6G2wM1vpEsGKGo0lym/kj0G41KqZk= +github.com/signalfx/sapm-proto v0.7.2 h1:iM/y3gezQm1/j7JBS0gXhEJ8ROeneb6DY7n0OcnvLks= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1559,33 +1384,27 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1597,7 +1416,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1622,10 +1440,8 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1633,19 +1449,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= -github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= -github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= -github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/vapourismo/knx-go v0.0.0-20211128234507-8198fa17db36 h1:JBj2CqnFwBhI3XsdMNn9MjKvehog+p5QZihotqq0Zuo= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= @@ -1668,15 +1477,10 @@ github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a h1:ILoU84rj4AQ github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= -github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/scram v1.1.0 h1:d70R37I0HrDLsafRrMBXyrD4lmQbCHE873t00Vr0gm0= +github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= -github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/scram v1.0.3 h1:nTadYh2Fs4BK2xdldEa2g5bbaZp0/+1nJMMPtPxS/to= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -1696,8 +1500,7 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/gopher-lua v0.0.0-20220413183635-c841877397d8 h1:YZGz13Wg1lXFpptej1c6fX22klQk4S9NaC6fiiu+kC0= -github.com/yuin/gopher-lua v0.0.0-20220413183635-c841877397d8/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= +github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -1706,23 +1509,12 @@ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= @@ -1736,25 +1528,27 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.0/go.mod h1:7QaqwfebCFzvH4q96IAaqqxj3VzB37VBn22uIpNKeG4= -go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= -go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= -go.opentelemetry.io/collector/model v0.48.0 h1:xmN4LdZ92q6PZnaKhMdIlC5KGtPJeOYaWCnA1PQ2oZw= -go.opentelemetry.io/collector/model v0.48.0/go.mod h1:1QVYv8TqsTMt9wVC5BUF9fqMVtk2C5EclWDnuVqdKoU= +go.opentelemetry.io/collector v0.53.0 h1:p4XwnAltBnw/gCRTk+DHTJVGYLzD5cPHp+0XK/KKE/s= +go.opentelemetry.io/collector v0.53.0/go.mod h1:MMSqz2ImXjLrZB26cC8vrtgnjsza3hpc760NNjsmjwE= +go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= +go.opentelemetry.io/collector/pdata v0.53.0 h1:jezCyHu/LXs4P/GzKObCabU2/OUTivNBlQHGPAo/dZo= +go.opentelemetry.io/collector/pdata v0.53.0/go.mod h1:25b+xH0uJwp8H3f0a1V+OQfxbhYVds6Rf1Ul+HFCGo4= +go.opentelemetry.io/collector/semconv v0.53.0 h1:J1lVnFp1VyNKU63rc7csY9/54Tjm9BlLylXLjPimf7s= +go.opentelemetry.io/collector/semconv v0.53.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= +go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0/go.mod h1:Ihno+mNBfZlT0Qot3XyRTdZ/9U/Cg2Pfgj75DTdIfq4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= -go.opentelemetry.io/contrib/zpages v0.28.0/go.mod h1:y5RYQQgfEQV6oASayfbUv5ye5bnnncor+Ln18jMrVKY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= +go.opentelemetry.io/contrib/zpages v0.32.0 h1:AVKTx5ppWDaem7A61HFsO1T3CK/t6kFRQoZQMj0/TW4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= +go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1765,39 +1559,36 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE= -go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= -go.opentelemetry.io/otel/internal/metric v0.26.0/go.mod h1:CbBP6AxKynRs3QCbhklyLUtpfzbqCLiafV9oY2Zj1Jk= -go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= +go.opentelemetry.io/otel/exporters/prometheus v0.30.0 h1:YXo5ZY5nofaEYMCMTTMaRH2cLDZB8+0UGuk5RwMfIo0= +go.opentelemetry.io/otel/exporters/prometheus v0.30.0/go.mod h1:qN5feW+0/d661KDtJuATEmHtw5bKBK7NSvNEP927zSs= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.26.0/go.mod h1:c6YL0fhRo4YVoNs6GoByzUgBp36hBL523rECoZA5UWg= -go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= +go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= +go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= +go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= +go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/export/metric v0.27.0/go.mod h1:d30U31er9jws2ZMsV1N36Zyr2v8QA5E3NtAQvj1WFQo= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= +go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME= +go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= +go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= -go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= @@ -1805,26 +1596,21 @@ go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= -go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= @@ -1834,14 +1620,12 @@ golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1887,11 +1671,9 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1900,7 +1682,6 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1912,7 +1693,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1927,7 +1707,6 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1949,7 +1728,6 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1957,7 +1735,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1978,7 +1755,6 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -2004,14 +1780,11 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2025,7 +1798,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2080,7 +1852,6 @@ golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2104,17 +1875,14 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2124,7 +1892,6 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2166,7 +1933,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -2181,7 +1947,6 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -2226,7 +1991,6 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2278,9 +2042,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= @@ -2296,7 +2058,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2360,11 +2121,7 @@ google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -2380,7 +2137,6 @@ google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 h1:myaecH64R0bIEDjNORIel4iXubqzaHU1K2z8ajBwWcM= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2416,8 +2172,9 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2455,9 +2212,7 @@ gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= @@ -2485,8 +2240,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= @@ -2561,137 +2317,16 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5f k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= -modernc.org/cc/v3 v3.35.25/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/cc/v3 v3.35.26 h1:S4B+fg6/9krLtfZ9lr7pfKiESopiv+Sm6lUUI3oc0fY= modernc.org/cc/v3 v3.35.26/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= -modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= -modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= -modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= -modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= -modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= -modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= -modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= -modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= -modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= -modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= -modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= -modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= -modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= -modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= -modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= -modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= -modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= -modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= -modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= -modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= -modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= -modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= -modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= -modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= -modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= -modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= -modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= -modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= -modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= -modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= -modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= -modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= -modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= -modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= -modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU= -modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko= -modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA= -modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4= -modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= -modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8= -modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I= -modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ= -modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE= -modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24= -modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0= -modernc.org/ccgo/v3 v3.15.19/go.mod h1:TDJj+DxR26pkDteH2E5WQDj/xlmtsX7JdzkJkaZhOVU= -modernc.org/ccgo/v3 v3.16.2 h1:FUklsEMps3Y2heuTOmn/l6mv83nQgCjW3nsU+1JXzuQ= -modernc.org/ccgo/v3 v3.16.2/go.mod h1:w55kPTAqvRMAYS3Lwij6qhqIuBEYS3Z8QtDkjD8cnik= -modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= -modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= -modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= -modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= -modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= -modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= -modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= -modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= -modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= -modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= -modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= -modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= -modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= -modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= -modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= -modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= -modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= -modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= -modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= -modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= -modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= -modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= -modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= -modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= -modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= -modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= -modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= -modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= -modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= -modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= -modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= -modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= -modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= -modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= -modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= -modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ= -modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c= -modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI= -modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ= -modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk= -modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34= -modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ= -modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak= -modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0= -modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo= -modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo= -modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ= -modernc.org/libc v1.15.0 h1:/CTHjQ1QO5mkLDeQICuA9Vh0YvhQTMqtCF2urQTaod8= -modernc.org/libc v1.15.0/go.mod h1:H1OKCu+NYa9+uQG8WsP7DndMBP61I4PWH8ivWhbdoWQ= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/ccgo/v3 v3.9.4 h1:mt2+HyTZKxva27O6T4C9//0xiNQ/MornL3i8itM5cCs= +modernc.org/libc v1.9.5 h1:zv111ldxmP7DJ5mOIqzRbza7ZDl3kh4ncKfASB2jIYY= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= -modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= -modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE= modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= -modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.10.8 h1:tZzV+/FwlSBddiJAHLR+qxsw2nx7jpLMKOCVu6NTjxI= modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= diff --git a/translator/cmdutil/translatorutil.go b/translator/cmdutil/translatorutil.go index fe09652f99..b464cd79d8 100644 --- a/translator/cmdutil/translatorutil.go +++ b/translator/cmdutil/translatorutil.go @@ -16,38 +16,23 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/toenvconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/registerrules" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toenvconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" translatorUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - "github.com/xeipuuv/gojsonschema" ) const ( - tomlFileMode = 0644 + fileMode = 0644 jsonTemplateName_Linux = "default_linux_config.json" jsonTemplateName_Windows = "default_windows_config.json" jsonTemplateName_Darwin = "default_darwin_config.json" defaultTomlConfigName = "CWAgent.conf" - exitSuccessMessage = "Configuration validation first phase succeeded" ) -func TranslateJsonMapToTomlFile(jsonConfigValue map[string]interface{}, tomlConfigFilePath string) { - res := totomlconfig.ToTomlConfig(jsonConfigValue) - if translator.IsTranslateSuccess() { - if err := ioutil.WriteFile(tomlConfigFilePath, []byte(res), tomlFileMode); err != nil { - log.Panicf("E! Failed to create the configuration validation file. Reason: %s", err.Error()) - } else { - for _, infoMessage := range translator.InfoMessages { - fmt.Println(infoMessage) - } - fmt.Println(exitSuccessMessage) - } - } else { - log.Panic("E! Failed to generate configuration validation content.") - } -} - // TranslateJsonMapToEnvConfigFile populates env-config.json based on the input json config. func TranslateJsonMapToEnvConfigFile(jsonConfigValue map[string]interface{}, envConfigPath string) { if envConfigPath == "" { @@ -215,3 +200,30 @@ func GenerateMergedJsonConfigMap(ctx *context.Context) (map[string]interface{}, checkSchema(mergedJsonConfigMap) return mergedJsonConfigMap, nil } + +func TranslateJsonMapToConfig(jsonConfigValue interface{}) interface{} { + r := new(translate.Translator) + _, val := r.ApplyRule(jsonConfigValue) + if !translator.IsTranslateSuccess() { + log.Printf("E! Errors %v", translator.ErrorMessages) + log.Panic("E! Failed to generate configuration validation content.") + } + // Translation is valid, log info messages and continue to convert/write to toml and yaml files + for _, infoMessage := range translator.InfoMessages { + fmt.Println(infoMessage) + } + return val +} + +func ConfigToTomlFile(config interface{}, tomlConfigFilePath string) { + res := totomlconfig.ToTomlConfig(config) + err := ioutil.WriteFile(tomlConfigFilePath, []byte(res), fileMode) + translatorUtil.PanicIfErr("E! Failed to create the configuration validation file. Reason:", err) + +} + +func ConfigToYamlFile(config interface{}, yamlConfigFilePath string) { + res, _ := toyamlconfig.ToYamlConfig(config) + err := ioutil.WriteFile(yamlConfigFilePath, []byte(res), fileMode) + translatorUtil.PanicIfErr("E! Failed to create the configuration validation file. Reason:", err) +} diff --git a/translator/jsonconfig/mergeJsonConfig.go b/translator/jsonconfig/mergeJsonConfig.go index 2593f431fd..c490291102 100644 --- a/translator/jsonconfig/mergeJsonConfig.go +++ b/translator/jsonconfig/mergeJsonConfig.go @@ -14,6 +14,7 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/registerrules" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) diff --git a/translator/jsonconfig/mergeJsonConfig_test.go b/translator/jsonconfig/mergeJsonConfig_test.go index 931fdaff7c..6064162ac5 100644 --- a/translator/jsonconfig/mergeJsonConfig_test.go +++ b/translator/jsonconfig/mergeJsonConfig_test.go @@ -12,7 +12,6 @@ import ( "testing" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "github.com/stretchr/testify/assert" diff --git a/translator/totomlconfig/toTomlConfig.go b/translator/registerrules/register_rules.go old mode 100755 new mode 100644 similarity index 89% rename from translator/totomlconfig/toTomlConfig.go rename to translator/registerrules/register_rules.go index 9925591475..332ba567cb --- a/translator/totomlconfig/toTomlConfig.go +++ b/translator/registerrules/register_rules.go @@ -1,13 +1,7 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -package totomlconfig - +package registerrules +// Rules register themselves during import with their parent rules in a hierarchy up until the root translator object. +// Because of this, when rules need to be registered and merged, this package should be imported as a whole import ( - "bytes" - "log" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/csm" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/globaltags" @@ -49,19 +43,4 @@ import ( _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/statsd" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/swap" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/rollup_dimensions" - - "github.com/BurntSushi/toml" ) - -func ToTomlConfig(c interface{}) string { - //Process by the translator. - r := new(translate.Translator) - _, val := r.ApplyRule(c) - buf := bytes.Buffer{} - enc := toml.NewEncoder(&buf) - err := enc.Encode(val) - if err != nil { - log.Panicf("Encode to a valid TOML config fails because of %v", err) - } - return buf.String() -} diff --git a/translator/totomlconfig/sampleConfig/advanced_config_linux.conf b/translator/tocwconfig/sampleConfig/advanced_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/advanced_config_linux.conf rename to translator/tocwconfig/sampleConfig/advanced_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/advanced_config_linux.json b/translator/tocwconfig/sampleConfig/advanced_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/advanced_config_linux.json rename to translator/tocwconfig/sampleConfig/advanced_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml new file mode 100644 index 0000000000..4bb3a38672 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -0,0 +1,26 @@ +exporters: + cloudwatch: {} +receivers: + cpu: {} + disk: {} + diskio: {} + ethtool: {} + mem: {} + netstat: {} + nvidia_smi: {} + swap: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - ethtool + - mem + - netstat + - nvidia_smi + - swap + - cpu + - disk + - diskio diff --git a/translator/totomlconfig/sampleConfig/advanced_config_windows.conf b/translator/tocwconfig/sampleConfig/advanced_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/advanced_config_windows.conf rename to translator/tocwconfig/sampleConfig/advanced_config_windows.conf diff --git a/translator/totomlconfig/sampleConfig/advanced_config_windows.json b/translator/tocwconfig/sampleConfig/advanced_config_windows.json similarity index 100% rename from translator/totomlconfig/sampleConfig/advanced_config_windows.json rename to translator/tocwconfig/sampleConfig/advanced_config_windows.json diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml new file mode 100644 index 0000000000..f38b263dda --- /dev/null +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + win_perf_counters: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - win_perf_counters diff --git a/translator/totomlconfig/sampleConfig/basic_config_linux.conf b/translator/tocwconfig/sampleConfig/basic_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/basic_config_linux.conf rename to translator/tocwconfig/sampleConfig/basic_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/basic_config_linux.json b/translator/tocwconfig/sampleConfig/basic_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/basic_config_linux.json rename to translator/tocwconfig/sampleConfig/basic_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml new file mode 100644 index 0000000000..524379a723 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -0,0 +1,14 @@ +exporters: + cloudwatch: {} +receivers: + disk: {} + mem: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - disk + - mem diff --git a/translator/totomlconfig/sampleConfig/basic_config_windows.conf b/translator/tocwconfig/sampleConfig/basic_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/basic_config_windows.conf rename to translator/tocwconfig/sampleConfig/basic_config_windows.conf diff --git a/translator/totomlconfig/sampleConfig/basic_config_windows.json b/translator/tocwconfig/sampleConfig/basic_config_windows.json similarity index 100% rename from translator/totomlconfig/sampleConfig/basic_config_windows.json rename to translator/tocwconfig/sampleConfig/basic_config_windows.json diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml new file mode 100644 index 0000000000..f38b263dda --- /dev/null +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + win_perf_counters: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - win_perf_counters diff --git a/translator/totomlconfig/sampleConfig/collectd_config_linux.conf b/translator/tocwconfig/sampleConfig/collectd_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/collectd_config_linux.conf rename to translator/tocwconfig/sampleConfig/collectd_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/collectd_config_linux.json b/translator/tocwconfig/sampleConfig/collectd_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/collectd_config_linux.json rename to translator/tocwconfig/sampleConfig/collectd_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml new file mode 100644 index 0000000000..2c739c1ed9 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + socket_listener: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - socket_listener diff --git a/translator/totomlconfig/sampleConfig/commonConfigTest.toml b/translator/tocwconfig/sampleConfig/commonConfigTest.toml similarity index 100% rename from translator/totomlconfig/sampleConfig/commonConfigTest.toml rename to translator/tocwconfig/sampleConfig/commonConfigTest.toml diff --git a/translator/totomlconfig/sampleConfig/complete_darwin_config.conf b/translator/tocwconfig/sampleConfig/complete_darwin_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/complete_darwin_config.conf rename to translator/tocwconfig/sampleConfig/complete_darwin_config.conf diff --git a/translator/totomlconfig/sampleConfig/complete_darwin_config.json b/translator/tocwconfig/sampleConfig/complete_darwin_config.json similarity index 99% rename from translator/totomlconfig/sampleConfig/complete_darwin_config.json rename to translator/tocwconfig/sampleConfig/complete_darwin_config.json index 8fd9250352..09751d8b68 100755 --- a/translator/totomlconfig/sampleConfig/complete_darwin_config.json +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.json @@ -114,8 +114,7 @@ "processes": { "measurement": [ "running", - "sleeping", - "dead" + "sleeping" ] }, "procstat": [ diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml new file mode 100644 index 0000000000..cc5e733d00 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -0,0 +1,36 @@ +exporters: + cloudwatch: {} + cloudwatchlogs: {} +receivers: + cpu: {} + disk: {} + diskio: {} + logfile: {} + mem: {} + net: {} + netstat: {} + processes: {} + procstat: {} + socket_listener: {} + statsd: {} + swap: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + - cloudwatch + processors: [] + receivers: + - cpu + - socket_listener + - disk + - statsd + - netstat + - logfile + - processes + - diskio + - mem + - swap + - net + - procstat diff --git a/translator/totomlconfig/sampleConfig/complete_linux_config.conf b/translator/tocwconfig/sampleConfig/complete_linux_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/complete_linux_config.conf rename to translator/tocwconfig/sampleConfig/complete_linux_config.conf diff --git a/translator/totomlconfig/sampleConfig/complete_linux_config.json b/translator/tocwconfig/sampleConfig/complete_linux_config.json similarity index 100% rename from translator/totomlconfig/sampleConfig/complete_linux_config.json rename to translator/tocwconfig/sampleConfig/complete_linux_config.json diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml new file mode 100644 index 0000000000..f7bf8cc94c --- /dev/null +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -0,0 +1,36 @@ +exporters: + cloudwatch: {} + cloudwatchlogs: {} +receivers: + cpu: {} + disk: {} + diskio: {} + logfile: {} + mem: {} + net: {} + netstat: {} + processes: {} + procstat: {} + socket_listener: {} + statsd: {} + swap: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + - cloudwatch + processors: [] + receivers: + - processes + - swap + - mem + - disk + - statsd + - socket_listener + - procstat + - cpu + - logfile + - net + - netstat + - diskio diff --git a/translator/totomlconfig/sampleConfig/complete_windows_config.conf b/translator/tocwconfig/sampleConfig/complete_windows_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/complete_windows_config.conf rename to translator/tocwconfig/sampleConfig/complete_windows_config.conf diff --git a/translator/totomlconfig/sampleConfig/complete_windows_config.json b/translator/tocwconfig/sampleConfig/complete_windows_config.json similarity index 100% rename from translator/totomlconfig/sampleConfig/complete_windows_config.json rename to translator/tocwconfig/sampleConfig/complete_windows_config.json diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml new file mode 100644 index 0000000000..7a1f298dac --- /dev/null +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -0,0 +1,26 @@ +exporters: + cloudwatch: {} + cloudwatchlogs: {} +receivers: + logfile: {} + nvidia_smi: {} + procstat: {} + socket_listener: {} + statsd: {} + win_perf_counters: {} + windows_event_log: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + - cloudwatch + processors: [] + receivers: + - win_perf_counters + - nvidia_smi + - procstat + - statsd + - socket_listener + - logfile + - windows_event_log diff --git a/translator/totomlconfig/sampleConfig/csm_only_config.json b/translator/tocwconfig/sampleConfig/csm_only_config.json similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_only_config.json rename to translator/tocwconfig/sampleConfig/csm_only_config.json diff --git a/translator/totomlconfig/sampleConfig/csm_only_config_linux.conf b/translator/tocwconfig/sampleConfig/csm_only_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_only_config_linux.conf rename to translator/tocwconfig/sampleConfig/csm_only_config_linux.conf diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml new file mode 100644 index 0000000000..04b67a829d --- /dev/null +++ b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml @@ -0,0 +1,12 @@ +exporters: + aws_csm: {} +receivers: + awscsm_listener: {} +service: + pipelines: + metrics: + exporters: + - aws_csm + processors: [] + receivers: + - awscsm_listener diff --git a/translator/totomlconfig/sampleConfig/csm_only_config_windows.conf b/translator/tocwconfig/sampleConfig/csm_only_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_only_config_windows.conf rename to translator/tocwconfig/sampleConfig/csm_only_config_windows.conf diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml new file mode 100644 index 0000000000..4a0f1453d5 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + aws_csm: {} +receivers: + awscsm_listener: {} +service: + pipelines: + metrics: + exporters: + - aws_csm + processors: [] + receivers: + - awscsm_listener diff --git a/translator/totomlconfig/sampleConfig/csm_service_addresses.json b/translator/tocwconfig/sampleConfig/csm_service_addresses.json similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_service_addresses.json rename to translator/tocwconfig/sampleConfig/csm_service_addresses.json diff --git a/translator/totomlconfig/sampleConfig/csm_service_addresses_linux.conf b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_service_addresses_linux.conf rename to translator/tocwconfig/sampleConfig/csm_service_addresses_linux.conf diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml new file mode 100644 index 0000000000..4a0f1453d5 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml @@ -0,0 +1,12 @@ +exporters: + aws_csm: {} +receivers: + awscsm_listener: {} +service: + pipelines: + metrics: + exporters: + - aws_csm + processors: [] + receivers: + - awscsm_listener diff --git a/translator/totomlconfig/sampleConfig/csm_service_addresses_windows.conf b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/csm_service_addresses_windows.conf rename to translator/tocwconfig/sampleConfig/csm_service_addresses_windows.conf diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml new file mode 100644 index 0000000000..4a0f1453d5 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml @@ -0,0 +1,12 @@ +exporters: + aws_csm: {} +receivers: + awscsm_listener: {} +service: + pipelines: + metrics: + exporters: + - aws_csm + processors: [] + receivers: + - awscsm_listener diff --git a/translator/totomlconfig/sampleConfig/delta_config_linux.conf b/translator/tocwconfig/sampleConfig/delta_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/delta_config_linux.conf rename to translator/tocwconfig/sampleConfig/delta_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/delta_config_linux.json b/translator/tocwconfig/sampleConfig/delta_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/delta_config_linux.json rename to translator/tocwconfig/sampleConfig/delta_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml new file mode 100644 index 0000000000..07eae4d2b0 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + diskio: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - diskio diff --git a/translator/totomlconfig/sampleConfig/drop_origin_linux.conf b/translator/tocwconfig/sampleConfig/drop_origin_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/drop_origin_linux.conf rename to translator/tocwconfig/sampleConfig/drop_origin_linux.conf diff --git a/translator/totomlconfig/sampleConfig/drop_origin_linux.json b/translator/tocwconfig/sampleConfig/drop_origin_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/drop_origin_linux.json rename to translator/tocwconfig/sampleConfig/drop_origin_linux.json diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml new file mode 100644 index 0000000000..d6c8091b15 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -0,0 +1,16 @@ +exporters: + cloudwatch: {} +receivers: + cpu: {} + disk: {} + nvidia_smi: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - cpu + - disk + - nvidia_smi diff --git a/translator/totomlconfig/sampleConfig/log_ecs_metric_only.conf b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/log_ecs_metric_only.conf rename to translator/tocwconfig/sampleConfig/log_ecs_metric_only.conf diff --git a/translator/totomlconfig/sampleConfig/log_ecs_metric_only.json b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.json similarity index 100% rename from translator/totomlconfig/sampleConfig/log_ecs_metric_only.json rename to translator/tocwconfig/sampleConfig/log_ecs_metric_only.json diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml new file mode 100644 index 0000000000..a903b815d5 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -0,0 +1,14 @@ +exporters: + cloudwatchlogs: {} +receivers: + cadvisor: {} + socket_listener: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - cadvisor + - socket_listener diff --git a/translator/totomlconfig/sampleConfig/log_filter.conf b/translator/tocwconfig/sampleConfig/log_filter.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/log_filter.conf rename to translator/tocwconfig/sampleConfig/log_filter.conf diff --git a/translator/totomlconfig/sampleConfig/log_filter.json b/translator/tocwconfig/sampleConfig/log_filter.json similarity index 100% rename from translator/totomlconfig/sampleConfig/log_filter.json rename to translator/tocwconfig/sampleConfig/log_filter.json diff --git a/translator/tocwconfig/sampleConfig/log_filter.yaml b/translator/tocwconfig/sampleConfig/log_filter.yaml new file mode 100644 index 0000000000..e0e96d478c --- /dev/null +++ b/translator/tocwconfig/sampleConfig/log_filter.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatchlogs: {} +receivers: + logfile: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - logfile diff --git a/translator/totomlconfig/sampleConfig/log_metric_and_log.conf b/translator/tocwconfig/sampleConfig/log_metric_and_log.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/log_metric_and_log.conf rename to translator/tocwconfig/sampleConfig/log_metric_and_log.conf diff --git a/translator/totomlconfig/sampleConfig/log_metric_and_log.json b/translator/tocwconfig/sampleConfig/log_metric_and_log.json similarity index 100% rename from translator/totomlconfig/sampleConfig/log_metric_and_log.json rename to translator/tocwconfig/sampleConfig/log_metric_and_log.json diff --git a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml new file mode 100644 index 0000000000..eb177218cf --- /dev/null +++ b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml @@ -0,0 +1,18 @@ +exporters: + cloudwatchlogs: {} +receivers: + cadvisor: {} + k8sapiserver: {} + logfile: {} + socket_listener: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - logfile + - socket_listener + - cadvisor + - k8sapiserver diff --git a/translator/totomlconfig/sampleConfig/log_metric_only.conf b/translator/tocwconfig/sampleConfig/log_metric_only.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/log_metric_only.conf rename to translator/tocwconfig/sampleConfig/log_metric_only.conf diff --git a/translator/totomlconfig/sampleConfig/log_metric_only.json b/translator/tocwconfig/sampleConfig/log_metric_only.json similarity index 100% rename from translator/totomlconfig/sampleConfig/log_metric_only.json rename to translator/tocwconfig/sampleConfig/log_metric_only.json diff --git a/translator/tocwconfig/sampleConfig/log_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_metric_only.yaml new file mode 100644 index 0000000000..7b1a1f0599 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/log_metric_only.yaml @@ -0,0 +1,16 @@ +exporters: + cloudwatchlogs: {} +receivers: + cadvisor: {} + k8sapiserver: {} + socket_listener: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - k8sapiserver + - cadvisor + - socket_listener diff --git a/translator/totomlconfig/sampleConfig/log_only_config_windows.conf b/translator/tocwconfig/sampleConfig/log_only_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/log_only_config_windows.conf rename to translator/tocwconfig/sampleConfig/log_only_config_windows.conf diff --git a/translator/totomlconfig/sampleConfig/log_only_config_windows.json b/translator/tocwconfig/sampleConfig/log_only_config_windows.json similarity index 100% rename from translator/totomlconfig/sampleConfig/log_only_config_windows.json rename to translator/tocwconfig/sampleConfig/log_only_config_windows.json diff --git a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml new file mode 100644 index 0000000000..92297cb189 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml @@ -0,0 +1,14 @@ +exporters: + cloudwatchlogs: {} +receivers: + logfile: {} + windows_event_log: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - logfile + - windows_event_log diff --git a/translator/totomlconfig/sampleConfig/prometheus_config_linux.conf b/translator/tocwconfig/sampleConfig/prometheus_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/prometheus_config_linux.conf rename to translator/tocwconfig/sampleConfig/prometheus_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/prometheus_config_linux.json b/translator/tocwconfig/sampleConfig/prometheus_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/prometheus_config_linux.json rename to translator/tocwconfig/sampleConfig/prometheus_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml new file mode 100644 index 0000000000..94edc38127 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatchlogs: {} +receivers: + prometheus_scraper: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - prometheus_scraper diff --git a/translator/totomlconfig/sampleConfig/prometheus_config_windows.conf b/translator/tocwconfig/sampleConfig/prometheus_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/prometheus_config_windows.conf rename to translator/tocwconfig/sampleConfig/prometheus_config_windows.conf diff --git a/translator/totomlconfig/sampleConfig/prometheus_config_windows.json b/translator/tocwconfig/sampleConfig/prometheus_config_windows.json similarity index 100% rename from translator/totomlconfig/sampleConfig/prometheus_config_windows.json rename to translator/tocwconfig/sampleConfig/prometheus_config_windows.json diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml new file mode 100644 index 0000000000..94edc38127 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatchlogs: {} +receivers: + prometheus_scraper: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - prometheus_scraper diff --git a/translator/totomlconfig/sampleConfig/standard_config_linux.conf b/translator/tocwconfig/sampleConfig/standard_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_linux.conf rename to translator/tocwconfig/sampleConfig/standard_config_linux.conf diff --git a/translator/totomlconfig/sampleConfig/standard_config_linux.json b/translator/tocwconfig/sampleConfig/standard_config_linux.json similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_linux.json rename to translator/tocwconfig/sampleConfig/standard_config_linux.json diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml new file mode 100644 index 0000000000..7ed0bc1c45 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -0,0 +1,20 @@ +exporters: + cloudwatch: {} +receivers: + cpu: {} + disk: {} + diskio: {} + mem: {} + swap: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - cpu + - disk + - diskio + - mem + - swap diff --git a/translator/totomlconfig/sampleConfig/standard_config_linux_with_common_config.conf b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_linux_with_common_config.conf rename to translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml new file mode 100644 index 0000000000..5c8a20a8b1 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -0,0 +1,20 @@ +exporters: + cloudwatch: {} +receivers: + cpu: {} + disk: {} + diskio: {} + mem: {} + swap: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - mem + - swap + - cpu + - disk + - diskio diff --git a/translator/totomlconfig/sampleConfig/standard_config_windows.conf b/translator/tocwconfig/sampleConfig/standard_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_windows.conf rename to translator/tocwconfig/sampleConfig/standard_config_windows.conf diff --git a/translator/totomlconfig/sampleConfig/standard_config_windows.json b/translator/tocwconfig/sampleConfig/standard_config_windows.json similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_windows.json rename to translator/tocwconfig/sampleConfig/standard_config_windows.json diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml new file mode 100644 index 0000000000..f38b263dda --- /dev/null +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + win_perf_counters: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - win_perf_counters diff --git a/translator/totomlconfig/sampleConfig/standard_config_windows_with_common_config.conf b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/standard_config_windows_with_common_config.conf rename to translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml new file mode 100644 index 0000000000..f38b263dda --- /dev/null +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + win_perf_counters: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - win_perf_counters diff --git a/translator/totomlconfig/sampleConfig/statsd_config.json b/translator/tocwconfig/sampleConfig/statsd_config.json similarity index 100% rename from translator/totomlconfig/sampleConfig/statsd_config.json rename to translator/tocwconfig/sampleConfig/statsd_config.json diff --git a/translator/totomlconfig/sampleConfig/statsd_config_linux.conf b/translator/tocwconfig/sampleConfig/statsd_config_linux.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/statsd_config_linux.conf rename to translator/tocwconfig/sampleConfig/statsd_config_linux.conf diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml new file mode 100644 index 0000000000..03dbdf7d18 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + statsd: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - statsd diff --git a/translator/totomlconfig/sampleConfig/statsd_config_windows.conf b/translator/tocwconfig/sampleConfig/statsd_config_windows.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/statsd_config_windows.conf rename to translator/tocwconfig/sampleConfig/statsd_config_windows.conf diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml new file mode 100644 index 0000000000..03dbdf7d18 --- /dev/null +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatch: {} +receivers: + statsd: {} +service: + pipelines: + metrics: + exporters: + - cloudwatch + processors: [] + receivers: + - statsd diff --git a/translator/totomlconfig/sampleConfig/windows_eventlog_only_config.conf b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.conf similarity index 100% rename from translator/totomlconfig/sampleConfig/windows_eventlog_only_config.conf rename to translator/tocwconfig/sampleConfig/windows_eventlog_only_config.conf diff --git a/translator/totomlconfig/sampleConfig/windows_eventlog_only_config.json b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.json similarity index 100% rename from translator/totomlconfig/sampleConfig/windows_eventlog_only_config.json rename to translator/tocwconfig/sampleConfig/windows_eventlog_only_config.json diff --git a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml new file mode 100644 index 0000000000..e56540928f --- /dev/null +++ b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml @@ -0,0 +1,12 @@ +exporters: + cloudwatchlogs: {} +receivers: + windows_event_log: {} +service: + pipelines: + metrics: + exporters: + - cloudwatchlogs + processors: [] + receivers: + - windows_event_log diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go new file mode 100644 index 0000000000..6443e95e98 --- /dev/null +++ b/translator/tocwconfig/tocwconfig_test.go @@ -0,0 +1,309 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package tocwconfig + +import ( + "bytes" + "encoding/json" + "fmt" + "io/ioutil" + "log" + "testing" + + "gopkg.in/yaml.v3" + + "github.com/BurntSushi/toml" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toenvconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig/tomlConfigTemplate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" + "github.com/google/go-cmp/cmp" + "github.com/google/go-cmp/cmp/cmpopts" + "github.com/kr/pretty" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + + "os" + + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/stretchr/testify/assert" +) + +func TestLogMetricOnly(t *testing.T) { + resetContext() + context.CurrentContext().SetRunInContainer(true) + os.Setenv(config.HOST_NAME, "host_name_from_env") + os.Setenv(config.HOST_IP, "127.0.0.1") + expectedEnvVars := map[string]string{} + checkTranslation(t, "log_metric_only", "linux", expectedEnvVars, "") + checkTranslation(t, "log_metric_only", "darwin", nil, "") + os.Unsetenv(config.HOST_NAME) + os.Unsetenv(config.HOST_IP) +} + +func TestLogMetricAndLog(t *testing.T) { + resetContext() + context.CurrentContext().SetRunInContainer(true) + os.Setenv(config.HOST_NAME, "host_name_from_env") + os.Setenv(config.HOST_IP, "127.0.0.1") + expectedEnvVars := map[string]string{} + checkTranslation(t, "log_metric_and_log", "linux", expectedEnvVars, "") + checkTranslation(t, "log_metric_and_log", "darwin", nil, "") + os.Unsetenv(config.HOST_NAME) + os.Unsetenv(config.HOST_IP) +} + +func TestCompleteConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{ + "CWAGENT_USER_AGENT": "CUSTOM USER AGENT VALUE", + "CWAGENT_LOG_LEVEL": "DEBUG", + "AWS_SDK_LOG_LEVEL": "LogDebug", + } + checkTranslation(t, "complete_linux_config", "linux", expectedEnvVars, "") + checkTranslation(t, "complete_darwin_config", "darwin", nil, "") + checkTranslation(t, "complete_windows_config", "windows", expectedEnvVars, "") +} + +func TestWindowsEventOnlyConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "windows_eventlog_only_config", "windows", expectedEnvVars, "") +} + +func TestStatsDConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "statsd_config", "linux", expectedEnvVars, "_linux") + checkTranslation(t, "statsd_config", "windows", expectedEnvVars, "_windows") + checkTranslation(t, "statsd_config", "darwin", nil, "_linux") +} + +//Linux only for CollectD +func TestCollectDConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "collectd_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "collectd_config_linux", "darwin", nil, "") +} + +//prometheus +func TestPrometheusConfig(t *testing.T) { + resetContext() + context.CurrentContext().SetRunInContainer(true) + os.Setenv(config.HOST_NAME, "host_name_from_env") + expectedEnvVars := map[string]string{} + checkTranslation(t, "prometheus_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "prometheus_config_windows", "windows", nil, "") + os.Unsetenv(config.HOST_NAME) +} + +func TestBasicConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "basic_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "basic_config_linux", "darwin", nil, "") + checkTranslation(t, "basic_config_windows", "windows", expectedEnvVars, "") +} + +func TestStandardConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "standard_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "standard_config_linux", "darwin", nil, "") + checkTranslation(t, "standard_config_windows", "windows", nil, "") +} + +func TestAdvancedConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "advanced_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "advanced_config_linux", "darwin", nil, "") + checkTranslation(t, "advanced_config_windows", "windows", expectedEnvVars, "") +} + +func TestDropOriginConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "drop_origin_linux", "linux", expectedEnvVars, "") +} + +func TestLogOnlyConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "log_only_config_windows", "windows", expectedEnvVars, "") +} + +func TestStandardConfigWithCommonConfig(t *testing.T) { + resetContext() + readCommonConfig() + expectedEnvVars := map[string]string{ + "AWS_CA_BUNDLE": "/etc/test/ca_bundle.pem", + "HTTPS_PROXY": "https://127.0.0.1:3280", + "HTTP_PROXY": "http://127.0.0.1:3280", + "NO_PROXY": "254.1.1.1", + } + checkTranslation(t, "standard_config_linux", "linux", expectedEnvVars, "_with_common_config") + checkTranslation(t, "standard_config_linux", "darwin", nil, "_with_common_config") + checkTranslation(t, "standard_config_windows", "windows", expectedEnvVars, "_with_common_config") +} + +func TestCsmOnlyConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{ + "AWS_CSM_ENABLED": "TRUE", + } + checkTranslation(t, "csm_only_config", "windows", expectedEnvVars, "_windows") + checkTranslation(t, "csm_only_config", "linux", expectedEnvVars, "_linux") + checkTranslation(t, "csm_only_config", "darwin", nil, "_linux") +} + +func TestDeltaConfigLinux(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{} + checkTranslation(t, "delta_config_linux", "linux", expectedEnvVars, "") + checkTranslation(t, "delta_config_linux", "darwin", nil, "") +} + +func TestCsmServiceAddressesConfig(t *testing.T) { + resetContext() + expectedEnvVars := map[string]string{ + "AWS_CSM_ENABLED": "TRUE", + } + checkTranslation(t, "csm_service_addresses", "windows", expectedEnvVars, "_windows") + checkTranslation(t, "csm_service_addresses", "linux", expectedEnvVars, "_linux") + checkTranslation(t, "csm_service_addresses", "darwin", nil, "_linux") +} + +func TestECSNodeMetricConfig(t *testing.T) { + resetContext() + os.Setenv("RUN_IN_CONTAINER", "True") + os.Setenv("HOST_NAME", "fake-host-name") + os.Setenv("HOST_IP", "127.0.0.1") + expectedEnvVars := map[string]string{} + checkTranslation(t, "log_ecs_metric_only", "linux", expectedEnvVars, "") + checkTranslation(t, "log_ecs_metric_only", "darwin", nil, "") + os.Unsetenv("RUN_IN_CONTAINER") + os.Unsetenv("HOST_NAME") + os.Unsetenv("HOST_IP") +} + +func TestLogFilterConfig(t *testing.T) { + resetContext() + checkTranslation(t, "log_filter", "linux", nil, "") + checkTranslation(t, "log_filter", "darwin", nil, "") +} + +func TestTomlToTomlComparison(t *testing.T) { + resetContext() + var jsonFilePath = "./totomlconfig/tomlConfigTemplate/agentToml.json" + var input interface{} + + translator.SetTargetPlatform("linux") + + err := json.Unmarshal([]byte(util.ReadFromFile(jsonFilePath)), &input) + assert.NoError(t, err) + config := cmdutil.TranslateJsonMapToConfig(input) + verifyToTomlTranslation(t, config, "./totomlconfig/tomlConfigTemplate/agentToml.conf") +} + +func checkTranslation(t *testing.T, fileName string, os string, expectedEnvVars map[string]string, appendString string) { + jsonFilePath := fmt.Sprintf("./sampleConfig/%v.json", fileName) + tomlFilePath := fmt.Sprintf("./sampleConfig/%v%v.conf", fileName, appendString) + yamlFilePath := fmt.Sprintf("./sampleConfig/%v%v.yaml", fileName, appendString) + checkTranslationForPaths(t, jsonFilePath, tomlFilePath, yamlFilePath, os) + if expectedEnvVars != nil { + checkIfEnvTranslateSucceed(t, util.ReadFromFile(jsonFilePath), os, expectedEnvVars) + } +} + +func checkTranslationForPaths(t *testing.T, jsonFilePath string, expectedTomlFilePath string, expectedYamlFilePath string, os string) { + agent.Global_Config = *new(agent.Agent) + translator.SetTargetPlatform(os) + var input interface{} + err := json.Unmarshal([]byte(util.ReadFromFile(jsonFilePath)), &input) + assert.NoError(t, err) + config := cmdutil.TranslateJsonMapToConfig(input) + verifyToYamlTranslation(t, config, expectedYamlFilePath) + verifyToTomlTranslation(t, config, expectedTomlFilePath) +} + +func readCommonConfig() { + ctx := context.CurrentContext() + config := commonconfig.New() + data, _ := ioutil.ReadFile("./sampleConfig/commonConfigTest.toml") + config.Parse(bytes.NewReader(data)) + ctx.SetCredentials(config.CredentialsMap()) + ctx.SetProxy(config.ProxyMap()) + ctx.SetSSL(config.SSLMap()) +} + +func resetContext() { + util.DetectRegion = func(string, map[string]string) string { + return "us-west-2" + } + util.DetectCredentialsPath = func() string { + return "fake-path" + } + context.ResetContext() + + os.Setenv("ProgramData", "c:\\ProgramData") +} + +// toml files in the given path will be parsed into the config toml struct and be compared as struct +func verifyToTomlTranslation(t *testing.T, config interface{}, desiredTomlPath string) { + tomlStr := totomlconfig.ToTomlConfig(config) + var expect tomlConfigTemplate.TomlConfig + _, decodeError := toml.DecodeFile(desiredTomlPath, &expect) + assert.NoError(t, decodeError) + + var actual tomlConfigTemplate.TomlConfig + _, decodeError2 := toml.Decode(tomlStr, &actual) + assert.NoError(t, decodeError2) + // This less function sort the content of string slice in a alphabetical order so the + // cmp.Equal method will compare the two struct with slices in them, regardless the elements within the slices + opt := cmpopts.SortSlices(func(x, y interface{}) bool { + return pretty.Sprint(x) < pretty.Sprint(y) + }) + diff := cmp.Diff(expect, actual) + log.Printf("D! Toml diff: %s", diff) + assert.True(t, cmp.Equal(expect, actual, opt)) +} + +func verifyToYamlTranslation(t *testing.T, config interface{}, expectedYamlFilePath string) { + _, actual := toyamlconfig.ToYamlConfig(config) + bs, err := ioutil.ReadFile(expectedYamlFilePath) + assert.NoError(t, err) + bf := bytes.NewReader(bs) + decoder := yaml.NewDecoder(bf) + var expect interface{} + err1 := decoder.Decode(&expect) + assert.NoError(t, err1) + opt := cmpopts.SortSlices(func(x, y interface{}) bool { + return pretty.Sprint(x) < pretty.Sprint(y) + }) + assert.True(t, cmp.Equal(expect, actual, opt)) +} + +func checkIfEnvTranslateSucceed(t *testing.T, jsonStr string, targetOs string, expectedEnvVars map[string]string) { + var input map[string]interface{} + translator.SetTargetPlatform(targetOs) + err := json.Unmarshal([]byte(jsonStr), &input) + if err == nil { + envVarsBytes := toenvconfig.ToEnvConfig(input) + t.Log(string(envVarsBytes)) + var actualEnvVars = make(map[string]string) + err := json.Unmarshal(envVarsBytes, &actualEnvVars) + assert.NoError(t, err) + assert.Equal(t, expectedEnvVars, actualEnvVars, "Expect to be equal") + } else { + t.Logf("Got error %v", err) + t.Fail() + } +} diff --git a/translator/toenvconfig/toEnvConfig.go b/translator/tocwconfig/toenvconfig/toEnvConfig.go similarity index 100% rename from translator/toenvconfig/toEnvConfig.go rename to translator/tocwconfig/toenvconfig/toEnvConfig.go diff --git a/translator/tocwconfig/totomlconfig/toTomlConfig.go b/translator/tocwconfig/totomlconfig/toTomlConfig.go new file mode 100755 index 0000000000..4d4b9e8f1e --- /dev/null +++ b/translator/tocwconfig/totomlconfig/toTomlConfig.go @@ -0,0 +1,20 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package totomlconfig + +import ( + "bytes" + "github.com/BurntSushi/toml" + "log" +) + +func ToTomlConfig(val interface{}) string { + buf := bytes.Buffer{} + enc := toml.NewEncoder(&buf) + err := enc.Encode(val) + if err != nil { + log.Panicf("Encode to a valid TOML config fails because of %v", err) + } + return buf.String() +} diff --git a/translator/totomlconfig/tomlConfigTemplate/agentToml.conf b/translator/tocwconfig/totomlconfig/tomlConfigTemplate/agentToml.conf similarity index 100% rename from translator/totomlconfig/tomlConfigTemplate/agentToml.conf rename to translator/tocwconfig/totomlconfig/tomlConfigTemplate/agentToml.conf diff --git a/translator/totomlconfig/tomlConfigTemplate/agentToml.json b/translator/tocwconfig/totomlconfig/tomlConfigTemplate/agentToml.json similarity index 100% rename from translator/totomlconfig/tomlConfigTemplate/agentToml.json rename to translator/tocwconfig/totomlconfig/tomlConfigTemplate/agentToml.json diff --git a/translator/totomlconfig/tomlConfigTemplate/tomlConfig.go b/translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go similarity index 100% rename from translator/totomlconfig/tomlConfigTemplate/tomlConfig.go rename to translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go diff --git a/translator/tocwconfig/toyamlconfig/encoder/encoder.go b/translator/tocwconfig/toyamlconfig/encoder/encoder.go new file mode 100644 index 0000000000..fe05185680 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/encoder/encoder.go @@ -0,0 +1,5 @@ +package encoder + +type Encoder interface { + Encode(in interface{}, out interface{}) error +} diff --git a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go new file mode 100644 index 0000000000..e70dbb8a46 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go @@ -0,0 +1,188 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package mapstructure + +import ( + "errors" + "fmt" + "reflect" + "strings" + + "github.com/mitchellh/mapstructure" + "go.opentelemetry.io/collector/config" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" +) + +const ( + tagNameMapStructure = "mapstructure" + optionSeparator = "," + optionOmitEmpty = "omitempty" + optionSquash = "squash" + fieldNameSkip = "-" +) + +var ( + componentIDType = reflect.TypeOf(config.NewComponentID("")) + errNonStringEncodedKey = errors.New("non string-encoded key") +) + +type mapStructureEncoder struct { +} + +var _ encoder.Encoder = (*mapStructureEncoder)(nil) + +func NewEncoder() encoder.Encoder { + return &mapStructureEncoder{} +} + +func (mse *mapStructureEncoder) Encode(in interface{}, out interface{}) error { + decoder, err := mapstructure.NewDecoder(mse.Config(out)) + if err != nil { + return err + } + if err = decoder.Decode(in); err != nil { + return err + } + return nil +} + +func (mse *mapStructureEncoder) Config(result interface{}) *mapstructure.DecoderConfig { + return &mapstructure.DecoderConfig{ + Result: result, + Metadata: nil, + TagName: tagNameMapStructure, + WeaklyTypedInput: true, + DecodeHook: mse.EncodeHook, + } +} + +func (mse *mapStructureEncoder) EncodeHook(from reflect.Value, _ reflect.Value) (interface{}, error) { + return mse.encode(from) +} + +func (mse *mapStructureEncoder) encode(value reflect.Value) (interface{}, error) { + if value.IsValid() { + switch value.Kind() { + case reflect.Interface, reflect.Ptr: + return mse.encodeInterfaceOrPtr(value) + case reflect.Map: + return mse.encodeMap(value) + case reflect.Slice: + return mse.encodeSlice(value) + case reflect.Struct: + return mse.encodeStruct(value) + default: + return value.Interface(), nil + } + } + return nil, nil +} + +func (mse *mapStructureEncoder) encodeInterfaceOrPtr(value reflect.Value) (interface{}, error) { + if value.Kind() != reflect.Ptr && value.Kind() != reflect.Interface { + return nil, &reflect.ValueError{ + Method: "encodeInterfaceOrPtr", + Kind: value.Kind(), + } + } + return mse.encode(value.Elem()) +} + +func (mse *mapStructureEncoder) encodeStruct(value reflect.Value) (interface{}, error) { + if value.Kind() != reflect.Struct { + return nil, &reflect.ValueError{ + Method: "encodeStruct", + Kind: value.Kind(), + } + } + // For structs that need to be handled differently. + switch value.Type() { + case componentIDType: + return value.Interface().(config.ComponentID).String(), nil + } + result := make(map[string]interface{}) + for i := 0; i < value.NumField(); i++ { + field := value.Field(i) + if field.CanInterface() { + name, omit, squash := mse.getFieldName(value.Type().Field(i)) + if (omit && field.IsZero()) || name == fieldNameSkip { + continue + } + if encoded, err := mse.encode(field); err != nil { + return nil, err + } else if squash { + if m, ok := encoded.(map[string]interface{}); ok { + for k, v := range m { + result[k] = v + } + } + } else { + result[name] = encoded + } + } + } + return result, nil +} + +// getFieldName looks up the mapstructure tag and uses that if available. +// Uses the lowercase field if not found. Checks for omitempty and squash. +func (mse *mapStructureEncoder) getFieldName(field reflect.StructField) (name string, omit bool, squash bool) { + if tag, ok := field.Tag.Lookup(tagNameMapStructure); ok { + opts := strings.Split(tag, optionSeparator) + if len(opts) > 1 { + for _, opt := range opts { + if opt == optionOmitEmpty { + omit = true + } else if opt == optionSquash { + squash = true + } + } + } + return opts[0], omit, squash + } + return strings.ToLower(field.Name), false, false +} + +func (mse *mapStructureEncoder) encodeSlice(value reflect.Value) (interface{}, error) { + if value.Kind() != reflect.Slice { + return nil, &reflect.ValueError{ + Method: "encodeSlice", + Kind: value.Kind(), + } + } + result := make([]interface{}, value.Len()) + for i := 0; i < value.Len(); i++ { + var err error + if result[i], err = mse.encode(value.Index(i)); err != nil { + return nil, err + } + } + return result, nil +} + +func (mse *mapStructureEncoder) encodeMap(value reflect.Value) (interface{}, error) { + if value.Kind() != reflect.Map { + return nil, &reflect.ValueError{ + Method: "encodeMap", + Kind: value.Kind(), + } + } + result := make(map[string]interface{}) + iterator := value.MapRange() + for iterator.Next() { + encoded, err := mse.encode(iterator.Key()) + if err != nil { + return nil, err + } + key, ok := encoded.(string) + if !ok { + return nil, fmt.Errorf("%w: %v", errNonStringEncodedKey, key) + } + if result[key], err = mse.encode(iterator.Value()); err != nil { + return nil, err + } + } + return result, nil +} diff --git a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go new file mode 100644 index 0000000000..2706791e02 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go @@ -0,0 +1,221 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package mapstructure + +import ( + "reflect" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" +) + +type inter interface { + run() +} + +type complexStruct struct { + Skipped emptyStruct `mapstructure:",squash"` + Nested simpleStruct `mapstructure:",squash"` + Slice []simpleStruct `mapstructure:"slice,omitempty"` + Pointer *simpleStruct `mapstructure:"ptr"` + Map map[string]simpleStruct `mapstructure:"map,omitempty"` + Interface inter +} + +type simpleStruct struct { + Value string `mapstructure:"value"` + skipped string +} + +func (*simpleStruct) run() { +} + +type emptyStruct struct { + Value string `mapstructure:"-"` +} + +func TestEncode(t *testing.T) { + encoder := &mapStructureEncoder{} + testCases := map[string]struct { + value func() reflect.Value + wantResult interface{} + }{ + "WithString": { + value: func() reflect.Value { + return reflect.ValueOf("test") + }, + wantResult: "test", + }, + "WithNil": { + value: func() reflect.Value { + return reflect.ValueOf(nil) + }, + wantResult: nil, + }, + "WithComponentID": { + value: func() reflect.Value { + return reflect.ValueOf(config.NewComponentIDWithName("type", "name")) + }, + wantResult: "type/name", + }, + "WithSlice": { + value: func() reflect.Value { + s := []config.ComponentID{ + config.NewComponentID("nop"), + config.NewComponentIDWithName("type", "name"), + } + return reflect.ValueOf(s) + }, + wantResult: []interface{}{"nop", "type/name"}, + }, + "WithSimpleStruct": { + value: func() reflect.Value { + return reflect.ValueOf(simpleStruct{Value: "test", skipped: "skipped"}) + }, + wantResult: map[string]interface{}{ + "value": "test", + }, + }, + "WithComplexStruct": { + value: func() reflect.Value { + c := complexStruct{ + Skipped: emptyStruct{ + Value: "omitted", + }, + Nested: simpleStruct{ + Value: "nested", + }, + Slice: []simpleStruct{ + {Value: "slice"}, + }, + Map: map[string]simpleStruct{ + "Key": {Value: "map"}, + }, + Pointer: &simpleStruct{ + Value: "pointer", + }, + Interface: &simpleStruct{Value: "interface"}, + } + return reflect.ValueOf(&c) + }, + wantResult: map[string]interface{}{ + "value": "nested", + "slice": []interface{}{map[string]interface{}{"value": "slice"}}, + "map": map[string]interface{}{ + "Key": map[string]interface{}{"value": "map"}, + }, + "ptr": map[string]interface{}{"value": "pointer"}, + "interface": map[string]interface{}{"value": "interface"}, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + got, err := encoder.encode(testCase.value()) + require.NoError(t, err) + require.Equal(t, testCase.wantResult, got) + }) + } +} + +func TestGetFieldName(t *testing.T) { + encoder := &mapStructureEncoder{} + testCases := map[string]struct { + field reflect.StructField + wantName string + wantOmit bool + wantSquash bool + }{ + "WithoutTags": { + field: reflect.StructField{ + Name: "Test", + }, + wantName: "test", + }, + "WithoutMapStructureTag": { + field: reflect.StructField{ + Tag: `yaml:"hello,inline"`, + Name: "YAML", + }, + wantName: "yaml", + }, + "WithRename": { + field: reflect.StructField{ + Tag: `mapstructure:"hello"`, + Name: "Test", + }, + wantName: "hello", + }, + "WithOmitEmpty": { + field: reflect.StructField{ + Tag: `mapstructure:"hello,omitempty"`, + Name: "Test", + }, + wantName: "hello", + wantOmit: true, + }, + "WithSquash": { + field: reflect.StructField{ + Tag: `mapstructure:",squash"`, + Name: "Test", + }, + wantSquash: true, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + gotName, gotOmit, gotSquash := encoder.getFieldName(testCase.field) + require.Equal(t, testCase.wantName, gotName) + require.Equal(t, testCase.wantOmit, gotOmit) + require.Equal(t, testCase.wantSquash, gotSquash) + }) + } +} + +func TestEncodeValueError(t *testing.T) { + encoder := &mapStructureEncoder{} + testValue := reflect.ValueOf("") + testEncodes := []func(value reflect.Value) (interface{}, error){ + encoder.encodeInterfaceOrPtr, + encoder.encodeMap, + encoder.encodeStruct, + encoder.encodeSlice, + } + for _, testEncode := range testEncodes { + got, err := testEncode(testValue) + require.Error(t, err) + require.Nil(t, got) + } +} + +func TestEncodeNonStringEncodedKey(t *testing.T) { + testCase := map[simpleStruct]simpleStruct{ + {Value: "key"}: {Value: "value"}, + } + encoder := &mapStructureEncoder{} + got, err := encoder.encodeMap(reflect.ValueOf(testCase)) + require.Error(t, err) + require.Nil(t, got) +} + +func TestEncoder(t *testing.T) { + encoder := NewEncoder() + t.Run("WithValid", func(t *testing.T) { + var got map[string]interface{} + err := encoder.Encode(simpleStruct{Value: "test"}, &got) + require.NoError(t, err) + require.Equal(t, map[string]interface{}{"value": "test"}, got) + }) + t.Run("WithInvalidResultType", func(t *testing.T) { + var got map[string]simpleStruct + err := encoder.Encode(simpleStruct{Value: "test"}, &got) + require.Error(t, err) + }) + t.Run("WithNonPointerResult", func(t *testing.T) { + var got interface{} + err := encoder.Encode(simpleStruct{Value: "test"}, got) + require.Error(t, err) + }) +} diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go new file mode 100644 index 0000000000..ab9b11b9cb --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -0,0 +1,120 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package toyamlconfig + +import ( + "bytes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + "go.opentelemetry.io/collector/config" + "gopkg.in/yaml.v3" + "log" +) + +import ( + "go.opentelemetry.io/collector/service" +) + +const ( + receiversKeyName = "receivers" + exportersKeyName = "exporters" + serviceKeyName = "service" + pipelinesKeyName = "pipelines" + metricsKeyName = "metrics" +) + +func ToYamlConfig(val interface{}) (string, interface{}) { + inputs, outputs := getInputsAndOutputs(val) + cfg := make(map[string]interface{}) + enc := mapstructure.NewEncoder() + receivers := encodeReceivers(inputs, &cfg, enc) + exporters := encodeExporters(outputs, &cfg, enc) + encodeService(receivers, exporters, &cfg, enc) + + var buffer bytes.Buffer + yamlEncoder := yaml.NewEncoder(&buffer) + + err := yamlEncoder.Encode(cfg) + util.PanicIfErr("Encode to a valid YAML config fails because of", err) + + return buffer.String(), cfg +} + +func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]config.Receiver { + receiversSection := make(map[string]interface{}) + + receivers := inputsToReceivers(inputs) + receiversSection[receiversKeyName] = receivers + err := encoder.Encode(receiversSection, &cfg) + util.PanicIfErr("Encode to a valid yaml config fails because of", err) + return receivers +} + +func inputsToReceivers(inputs map[string]interface{}) map[config.ComponentID]config.Receiver { + receiverMap := make(map[config.ComponentID]config.Receiver) + for input := range inputs { + t := config.Type(input) + hc := config.NewReceiverSettings(config.NewComponentID(t)) + receiverMap[config.NewComponentID(t)] = &hc + } + return receiverMap +} + +func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]config.Exporter { + exportersSection := make(map[string]interface{}) + exporters := outputsToExporters(outputs) + exportersSection[exportersKeyName] = exporters + err := encoder.Encode(exportersSection, &cfg) + util.PanicIfErr("Encode to a valid yaml config fails because of", err) + + return exporters +} + +func outputsToExporters(outputs map[string]interface{}) map[config.ComponentID]config.Exporter { + exporterMap := make(map[config.ComponentID]config.Exporter) + for output := range outputs { + t := config.Type(output) + exporterSettings := config.NewExporterSettings(config.NewComponentID(t)) + exporterMap[config.NewComponentID(t)] = &exporterSettings + } + return exporterMap +} + +func encodeService(receivers map[config.ComponentID]config.Receiver, exporters map[config.ComponentID]config.Exporter, cfg *map[string]interface{}, encoder encoder.Encoder) { + serviceSection := make(map[string]interface{}) + pipelinesSection := make(map[string]interface{}) + pipelinesSection[pipelinesKeyName] = buildPipelines(receivers, exporters) + serviceSection[serviceKeyName] = pipelinesSection + err := encoder.Encode(serviceSection, &cfg) + util.PanicIfErr("Encode to a valid yaml config fails because of", err) +} + +func buildPipelines(receivers map[config.ComponentID]config.Receiver, exporters map[config.ComponentID]config.Exporter) map[config.ComponentID]*service.ConfigServicePipeline { + var exArray []config.ComponentID + for ex := range exporters { + exArray = append(exArray, ex) + } + var recArray []config.ComponentID + for rec := range receivers { + recArray = append(recArray, rec) + } + pipeline := service.ConfigServicePipeline{Exporters: exArray, Receivers: recArray} + metricsPipeline := make(map[config.ComponentID]*service.ConfigServicePipeline) + metricsPipeline[config.NewComponentID(metricsKeyName)] = &pipeline + return metricsPipeline +} + +func getInputsAndOutputs(val interface{}) (map[string]interface{}, map[string]interface{}) { + config := val.(map[string]interface{}) + inputs, ok := config["inputs"].(map[string]interface{}) + if !ok { + log.Panicf("E! could not extract inputs during yaml translation") + } + outputs, ok := config["outputs"].(map[string]interface{}) + if !ok { + log.Panicf("E! could not extract outputs during yaml translation") + } + return inputs, outputs +} diff --git a/translator/toenvconfig/toEnvConfig_test.go b/translator/toenvconfig/toEnvConfig_test.go deleted file mode 100644 index e554733652..0000000000 --- a/translator/toenvconfig/toEnvConfig_test.go +++ /dev/null @@ -1,191 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -package toenvconfig - -import ( - "bytes" - "encoding/json" - "io/ioutil" - "testing" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "os" - - commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" - "github.com/stretchr/testify/assert" -) - -func ReadFromFile(filename string) string { - data, err := ioutil.ReadFile(filename) - if err != nil { - panic(err) - } - str := string(data) - return str -} - -func checkIfTranslateSucceed(t *testing.T, jsonStr string, targetOs string, expectedEnvVars map[string]string) { - var input map[string]interface{} - translator.SetTargetPlatform(targetOs) - err := json.Unmarshal([]byte(jsonStr), &input) - if err == nil { - envVarsBytes := ToEnvConfig(input) - t.Log(string(envVarsBytes)) - var actualEnvVars = make(map[string]string) - err := json.Unmarshal(envVarsBytes, &actualEnvVars) - assert.NoError(t, err) - assert.Equal(t, expectedEnvVars, actualEnvVars, "Expect to be equal") - } else { - t.Logf("Got error %v", err) - t.Fail() - } -} - -func TestLogMetricOnly(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/log_metric_only.json"), "linux", expectedEnvVars) - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricAndLog(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/log_metric_and_log.json"), "linux", expectedEnvVars) - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestCompleteConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{ - "CWAGENT_USER_AGENT": "CUSTOM USER AGENT VALUE", - "CWAGENT_LOG_LEVEL": "DEBUG", - "AWS_SDK_LOG_LEVEL": "LogDebug", - } - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/complete_linux_config.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/complete_windows_config.json"), "windows", expectedEnvVars) -} - -func TestWindowsEventOnlyConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/windows_eventlog_only_config.json"), "windows", expectedEnvVars) -} - -func TestStatsDConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/statsd_config.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/statsd_config.json"), "windows", expectedEnvVars) -} - -//Linux only for CollectD -func TestCollectDConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/collectd_config_linux.json"), "linux", expectedEnvVars) -} - -func TestBasicConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/basic_config_linux.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/basic_config_windows.json"), "windows", expectedEnvVars) -} - -func TestStandardConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/standard_config_linux.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/standard_config_windows.json"), "windows", expectedEnvVars) -} - -func TestAdvancedConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/advanced_config_linux.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/advanced_config_windows.json"), "windows", expectedEnvVars) -} - -func TestLogOnlyConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/log_only_config_windows.json"), "windows", expectedEnvVars) -} - -//test settings in commonconfig will override the ones in json config -func TestStandardConfigWithCommonConfig(t *testing.T) { - resetContext() - readCommonConifg() - expectedEnvVars := map[string]string{ - "AWS_CA_BUNDLE": "/etc/test/ca_bundle.pem", - "HTTPS_PROXY": "https://127.0.0.1:3280", - "HTTP_PROXY": "http://127.0.0.1:3280", - "NO_PROXY": "254.1.1.1", - } - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/standard_config_linux.json"), "linux", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/standard_config_windows.json"), "windows", expectedEnvVars) -} - -func TestCsmOnlyConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{ - "AWS_CSM_ENABLED": "TRUE", - } - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/csm_only_config.json"), "windows", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/csm_only_config.json"), "linux", expectedEnvVars) -} - -func TestCsmServiceAddressesConfig(t *testing.T) { - resetContext() - expectedEnvVars := map[string]string{ - "AWS_CSM_ENABLED": "TRUE", - } - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/csm_service_addresses.json"), "windows", expectedEnvVars) - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/csm_service_addresses.json"), "linux", expectedEnvVars) -} - -func TestECSNodeMetricConfig(t *testing.T) { - resetContext() - os.Setenv("RUN_IN_CONTAINER", "True") - os.Setenv("HOST_NAME", "fake-host-name") - os.Setenv("HOST_IP", "127.0.0.1") - expectedEnvVars := map[string]string{} - checkIfTranslateSucceed(t, ReadFromFile("../totomlconfig/sampleConfig/log_ecs_metric_only.json"), "linux", expectedEnvVars) -} - -func readCommonConifg() { - ctx := context.CurrentContext() - conf := commonconfig.New() - data, _ := ioutil.ReadFile("../totomlconfig/sampleConfig/commonConfigTest.toml") - conf.Parse(bytes.NewReader(data)) - ctx.SetCredentials(conf.CredentialsMap()) - ctx.SetProxy(conf.ProxyMap()) - ctx.SetSSL(conf.SSLMap()) -} - -func resetContext() { - util.DetectRegion = func(string, map[string]string) string { - return "us-west-2" - } - util.DetectCredentialsPath = func() string { - return "fake-path" - } - context.ResetContext() - - os.Setenv("ProgramData", "c:\\ProgramData") -} diff --git a/translator/totomlconfig/toTomlConfig_test.go b/translator/totomlconfig/toTomlConfig_test.go deleted file mode 100644 index ef0fc57daf..0000000000 --- a/translator/totomlconfig/toTomlConfig_test.go +++ /dev/null @@ -1,240 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -package totomlconfig - -import ( - "bytes" - "encoding/json" - "io/ioutil" - "log" - "strings" - "testing" - - "github.com/BurntSushi/toml" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig/tomlConfigTemplate" - "github.com/google/go-cmp/cmp" - "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kr/pretty" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "os" - - commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/stretchr/testify/assert" -) - -func ReadFromFile(filename string) string { - data, err := ioutil.ReadFile(filename) - if err != nil { - panic(err) - } - str := string(data) - return strings.ReplaceAll(str, "\r\n", "\n") -} - -func TestLogMetricOnly(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricAndLog(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestCompleteConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/complete_linux_config.json", "./sampleConfig/complete_linux_config.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/complete_darwin_config.json", "./sampleConfig/complete_darwin_config.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/complete_windows_config.json", "./sampleConfig/complete_windows_config.conf", "windows") -} - -func TestWindowsEventOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/windows_eventlog_only_config.json", "./sampleConfig/windows_eventlog_only_config.conf", "windows") -} - -func TestStatsDConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_windows.conf", "windows") -} - -//Linux only for CollectD -func TestCollectDConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "darwin") -} - -//prometheus -func TestPrometheusConfig(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - checkTomlTranslation(t, "./sampleConfig/prometheus_config_linux.json", "./sampleConfig/prometheus_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/prometheus_config_windows.json", "./sampleConfig/prometheus_config_windows.conf", "windows") - os.Unsetenv(config.HOST_NAME) -} - -func TestBasicConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/basic_config_linux.json", "./sampleConfig/basic_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/basic_config_linux.json", "./sampleConfig/basic_config_linux.conf", "darwin") - - checkTomlTranslation(t, "./sampleConfig/basic_config_windows.json", "./sampleConfig/basic_config_windows.conf", "windows") -} - -func TestStandardConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/standard_config_windows.json", "./sampleConfig/standard_config_windows.conf", "windows") -} - -func TestAdvancedConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/advanced_config_linux.json", "./sampleConfig/advanced_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/advanced_config_linux.json", "./sampleConfig/advanced_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/advanced_config_windows.json", "./sampleConfig/advanced_config_windows.conf", "windows") -} - -func TestDropOriginConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/drop_origin_linux.json", "./sampleConfig/drop_origin_linux.conf", "linux") -} - -func TestLogOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/log_only_config_windows.json", "./sampleConfig/log_only_config_windows.conf", "windows") -} - -func TestStandardConfigWithCommonConfig(t *testing.T) { - resetContext() - readCommonConfig() - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux_with_common_config.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux_with_common_config.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/standard_config_windows.json", "./sampleConfig/standard_config_windows_with_common_config.conf", "windows") -} - -func TestCsmOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_windows.conf", "windows") - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_linux.conf", "darwin") -} - -func TestDeltaConfigLinux(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/delta_config_linux.json", "./sampleConfig/delta_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/delta_config_linux.json", "./sampleConfig/delta_config_linux.conf", "darwin") -} - -func TestCsmServiceAddressesConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_windows.conf", "windows") - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_linux.conf", "darwin") -} - -func TestECSNodeMetricConfig(t *testing.T) { - resetContext() - os.Setenv("RUN_IN_CONTAINER", "True") - os.Setenv("HOST_NAME", "fake-host-name") - os.Setenv("HOST_IP", "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_ecs_metric_only.json", "./sampleConfig/log_ecs_metric_only.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_ecs_metric_only.json", "./sampleConfig/log_ecs_metric_only.conf", "darwin") - os.Unsetenv("RUN_IN_CONTAINER") - os.Unsetenv("HOST_NAME") - os.Unsetenv("HOST_IP") -} - -func TestLogFilterConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/log_filter.json", "./sampleConfig/log_filter.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_filter.json", "./sampleConfig/log_filter.conf", "darwin") -} - -func TestTomlToTomlComparison(t *testing.T) { - resetContext() - var jsonFilePath = "./tomlConfigTemplate/agentToml.json" - var input interface{} - - translator.SetTargetPlatform("linux") - - err := json.Unmarshal([]byte(ReadFromFile(jsonFilePath)), &input) - assert.NoError(t, err) - actualOutput := ToTomlConfig(input) - checkIfIdenticalToml(t, "./tomlConfigTemplate/agentToml.conf", actualOutput) -} - -func checkTomlTranslation(t *testing.T, jsonPath string, desiredTomlPath string, os string) { - agent.Global_Config = *new(agent.Agent) - translator.SetTargetPlatform(os) - var input interface{} - err := json.Unmarshal([]byte(ReadFromFile(jsonPath)), &input) - assert.NoError(t, err) - actualOutput := ToTomlConfig(input) - checkIfIdenticalToml(t, desiredTomlPath, actualOutput) -} - -func readCommonConfig() { - ctx := context.CurrentContext() - config := commonconfig.New() - data, _ := ioutil.ReadFile("./sampleConfig/commonConfigTest.toml") - config.Parse(bytes.NewReader(data)) - ctx.SetCredentials(config.CredentialsMap()) - ctx.SetProxy(config.ProxyMap()) - ctx.SetSSL(config.SSLMap()) -} - -func resetContext() { - util.DetectRegion = func(string, map[string]string) string { - return "us-west-2" - } - util.DetectCredentialsPath = func() string { - return "fake-path" - } - context.ResetContext() - - os.Setenv("ProgramData", "c:\\ProgramData") -} - -// toml files in the given path will be parsed into the config toml struct and be compared as struct -func checkIfIdenticalToml(t *testing.T, desiredTomlPath string, tomlStr string) { - var expect tomlConfigTemplate.TomlConfig - _, decodeError := toml.DecodeFile(desiredTomlPath, &expect) - assert.NoError(t, decodeError) - - var actual tomlConfigTemplate.TomlConfig - _, decodeError2 := toml.Decode(tomlStr, &actual) - assert.NoError(t, decodeError2) - // This less function sort the content of string slice in a alphabetical order so the - // cmp.Equal method will compare the two struct with slices in them, regardless the elements within the slices - opt := cmpopts.SortSlices(func(x, y interface{}) bool { - return pretty.Sprint(x) < pretty.Sprint(y) - }) - diff := cmp.Diff(expect, actual) - log.Printf("D! Toml diff: %s", diff) - assert.True(t, cmp.Equal(expect, actual, opt)) -} diff --git a/translator/translate/logs/metrics_collected/emf/emf.go b/translator/translate/logs/metrics_collected/emf/emf.go index a2311fd9ae..084993bd34 100644 --- a/translator/translate/logs/metrics_collected/emf/emf.go +++ b/translator/translate/logs/metrics_collected/emf/emf.go @@ -10,10 +10,10 @@ import ( ) // -// Need to import new rule package in src/translator/totomlconfig/toTomlConfig.go +// Need to import new rule package in src/translator/tocwconfig/totomlconfig/toTomlConfig.go // -// +// SectionKey // "emf" : { // "service_address": "udp://127.0.0.1:25888" // } diff --git a/translator/translate/logs/metrics_collected/emf/structuredlog.go b/translator/translate/logs/metrics_collected/emf/structuredlog.go index 3d092290ce..32cacd678e 100644 --- a/translator/translate/logs/metrics_collected/emf/structuredlog.go +++ b/translator/translate/logs/metrics_collected/emf/structuredlog.go @@ -10,10 +10,10 @@ import ( ) // -// Need to import new rule package in src/translator/totomlconfig/toTomlConfig.go +// Need to import new rule package in src/translator/tocwconfig/totomlconfig/toTomlConfig.go // -// +// SectionKeyStructuredLog // "structuredlog" : { // "service_address": "udp://127.0.0.1:25888" // } diff --git a/translator/translate/metrics/metrics_collect/collectd/collectd.go b/translator/translate/metrics/metrics_collect/collectd/collectd.go index ec0dda3094..66ed5385ca 100644 --- a/translator/translate/metrics/metrics_collect/collectd/collectd.go +++ b/translator/translate/metrics/metrics_collect/collectd/collectd.go @@ -9,7 +9,7 @@ import ( ) // -// Need to import new rule package in src/translator/totomlconfig/toTomlConfig.go +// Need to import new rule package in src/translator/tocwconfig/totomlconfig/toTomlConfig.go // // diff --git a/translator/translate/metrics/metrics_collect/statsd/statsd.go b/translator/translate/metrics/metrics_collect/statsd/statsd.go index 7998e9021a..9cc740391e 100644 --- a/translator/translate/metrics/metrics_collect/statsd/statsd.go +++ b/translator/translate/metrics/metrics_collect/statsd/statsd.go @@ -9,10 +9,10 @@ import ( ) // -// Need to import new rule package in src/translator/totomlconfig/toTomlConfig.go +// Need to import new rule package in src/translator/tocwconfig/totomlconfig/toTomlConfig.go // -// +// SectionKey // "statsd" : { // "service_address": ":8125", // "metrics_collection_interval": 10, diff --git a/translator/util/config_util.go b/translator/util/config_util.go new file mode 100644 index 0000000000..c4289b6c3d --- /dev/null +++ b/translator/util/config_util.go @@ -0,0 +1,22 @@ +package util + +import ( + "io/ioutil" + "log" + "strings" +) + +func ReadFromFile(filename string) string { + data, err := ioutil.ReadFile(filename) + if err != nil { + PanicIfErr("", err) + } + str := string(data) + return strings.ReplaceAll(str, "\r\n", "\n") +} + +func PanicIfErr(message string, err error) { + if err != nil { + log.Panicf("%v %v", message, err) + } +} From 2a84ade0ee03c4c2cce762eba623078625e5a8dc Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Mon, 22 Aug 2022 19:33:33 -0400 Subject: [PATCH 004/144] start testing CI --- .../amazon-cloudwatch-agent.go | 45 ++++++ go.mod | 101 +++++++++----- go.sum | 128 ++++++++++++++++++ 3 files changed, 238 insertions(+), 36 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 9f3b6ede28..b2a543a410 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -9,6 +9,11 @@ import ( "errors" "flag" "fmt" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/exporter/loggingexporter" + "go.opentelemetry.io/collector/processor/batchprocessor" "io/ioutil" "log" "net/http" @@ -41,6 +46,8 @@ import ( //_ "github.com/influxdata/telegraf/plugins/inputs/all" "github.com/influxdata/telegraf/plugins/outputs" + otelservice "go.opentelemetry.io/collector/service" + "github.com/kardianos/service" ) @@ -335,6 +342,20 @@ func runAgent(ctx context.Context, agentinfo.InputPlugins = c.InputNames() agentinfo.OutputPlugins = c.OutputNames() + // inject OTel + factories, err := NewFactories(c) + if err != nil { + return err + } + params := otelservice.CollectorSettings{ + Factories: factories, + } + col, err := otelservice.New(params) + if err != nil { + return err + } + go col.Run(ctx) + if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) if err != nil { @@ -357,6 +378,30 @@ func runAgent(ctx context.Context, return ag.Run(ctx) } +func NewFactories(c *config.Config) (component.Factories, error) { + factories := component.Factories{} + // TODO: for Container Insights testing. + receivers, err := component.MakeReceiverFactoryMap(awscontainerinsightreceiver.NewFactory()) + if err != nil { + return factories, err + } + factories.Receivers = receivers + + processors, err := component.MakeProcessorFactoryMap(batchprocessor.NewFactory()) + if err != nil { + return factories, err + } + factories.Processors = processors + + exporters, err := component.MakeExporterFactoryMap(awsemfexporter.NewFactory(), loggingexporter.NewFactory()) + if err != nil { + return factories, err + } + factories.Exporters = exporters + + return factories, nil +} + type program struct { inputFilters []string outputFilters []string diff --git a/go.mod b/go.mod index b0168537cd..337e542dae 100644 --- a/go.mod +++ b/go.mod @@ -53,7 +53,7 @@ require ( github.com/BurntSushi/toml v0.4.1 github.com/Jeffail/gabs v1.4.0 github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 - github.com/aws/aws-sdk-go v1.44.16 + github.com/aws/aws-sdk-go v1.44.72 github.com/aws/aws-sdk-go-v2 v1.16.3 github.com/aws/aws-sdk-go-v2/config v1.15.3 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 @@ -64,8 +64,8 @@ require ( github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 github.com/go-kit/kit v0.11.0 github.com/gobwas/glob v0.2.3 - github.com/google/cadvisor v0.44.0 - github.com/google/go-cmp v0.5.7 + github.com/google/cadvisor v0.45.0 + github.com/google/go-cmp v0.5.8 github.com/hashicorp/golang-lru v0.5.4 github.com/influxdata/telegraf v0.0.0-00010101000000-000000000000 github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 @@ -76,16 +76,16 @@ require ( github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.1 - github.com/prometheus/common v0.34.0 + github.com/prometheus/client_golang v1.12.2 + github.com/prometheus/common v0.37.0 github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 - github.com/shirou/gopsutil/v3 v3.22.5 - github.com/stretchr/testify v1.7.1 + github.com/shirou/gopsutil/v3 v3.22.7 + github.com/stretchr/testify v1.8.0 github.com/xeipuuv/gojsonschema v1.2.0 - go.opentelemetry.io/collector v0.53.0 + go.opentelemetry.io/collector v0.58.0 golang.org/x/net v0.0.0-20220412020605-290c469a71a5 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220412211240-33da011f77ad + golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a golang.org/x/text v0.3.7 gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 @@ -93,10 +93,10 @@ require ( gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.1.0 - k8s.io/api v0.23.6 - k8s.io/apimachinery v0.23.6 - k8s.io/client-go v0.23.5 - k8s.io/klog/v2 v2.40.1 + k8s.io/api v0.24.3 + k8s.io/apimachinery v0.24.3 + k8s.io/client-go v0.24.3 + k8s.io/klog/v2 v2.60.1 ) require ( @@ -113,6 +113,8 @@ require ( github.com/Azure/go-autorest/logger v0.2.1 // indirect github.com/Azure/go-autorest/tracing v0.6.0 // indirect github.com/Microsoft/go-winio v0.5.1 // indirect + github.com/PuerkitoBio/purell v1.1.1 // indirect + github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/StackExchange/wmi v1.2.1 // indirect github.com/alecthomas/participle v0.4.1 // indirect github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect @@ -132,6 +134,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cilium/ebpf v0.7.0 // indirect @@ -145,21 +148,26 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dennwc/varint v1.0.0 // indirect github.com/digitalocean/godo v1.78.0 // indirect - github.com/docker/distribution v2.8.0+incompatible // indirect - github.com/docker/docker v20.10.14+incompatible // indirect + github.com/docker/distribution v2.8.1+incompatible // indirect + github.com/docker/docker v20.10.17+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 // indirect + github.com/emicklei/go-restful v2.9.5+incompatible // indirect github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-kit/log v0.2.0 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.6 // indirect + github.com/go-openapi/swag v0.21.1 // indirect github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect github.com/go-zookeeper/zk v1.0.2 // indirect github.com/godbus/dbus/v5 v5.0.6 // indirect @@ -168,6 +176,7 @@ require ( github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/gnostic v0.5.7-v3refs // indirect github.com/google/go-querystring v1.0.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect @@ -188,15 +197,18 @@ require ( github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.16.1 // indirect - github.com/knadh/koanf v1.4.1 // indirect + github.com/klauspost/compress v1.15.9 // indirect + github.com/knadh/koanf v1.4.2 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect github.com/linode/linodego v1.4.1 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.6 // indirect + github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect @@ -210,13 +222,27 @@ require ( github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mrunalp/fileutils v0.5.0 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/naoina/go-stringutil v0.1.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.50.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect - github.com/opencontainers/runc v1.1.0 // indirect + github.com/opencontainers/runc v1.1.3 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/opencontainers/selinux v1.10.0 // indirect + github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect + github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect @@ -226,16 +252,17 @@ require ( github.com/prometheus/common/sigv4 v0.1.0 // indirect github.com/prometheus/procfs v0.7.3 // indirect github.com/prometheus/statsd_exporter v0.21.0 // indirect - github.com/rogpeppe/go-internal v1.6.2 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect + github.com/rs/cors v1.8.2 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect - github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 // indirect + github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect github.com/shirou/gopsutil v3.21.5+incompatible // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/sleepinggenius2/gosmi v0.4.4 // indirect - github.com/spf13/cobra v1.4.0 // indirect + github.com/spf13/cobra v1.5.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect github.com/tidwall/gjson v1.10.2 // indirect github.com/tidwall/match v1.1.1 // indirect @@ -251,18 +278,19 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.53.0 // indirect - go.opentelemetry.io/collector/semconv v0.53.0 // indirect - go.opentelemetry.io/otel v1.7.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.30.0 // indirect - go.opentelemetry.io/otel/metric v0.30.0 // indirect - go.opentelemetry.io/otel/sdk v1.7.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.30.0 // indirect - go.opentelemetry.io/otel/trace v1.7.0 // indirect + go.opentelemetry.io/collector/pdata v0.58.0 // indirect + go.opentelemetry.io/collector/semconv v0.58.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/exporters/prometheus v0.31.0 // indirect + go.opentelemetry.io/otel/metric v0.31.0 // indirect + go.opentelemetry.io/otel/sdk v1.9.0 // indirect + go.opentelemetry.io/otel/sdk/metric v0.31.0 // indirect + go.opentelemetry.io/otel/trace v1.9.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.21.0 // indirect + go.uber.org/zap v1.22.0 // indirect golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect @@ -273,15 +301,16 @@ require ( google.golang.org/api v0.77.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect - google.golang.org/grpc v1.47.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + google.golang.org/grpc v1.48.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect - k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect + k8s.io/klog v1.0.0 // indirect + k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect + k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect modernc.org/cc/v3 v3.35.26 // indirect modernc.org/mathutil v1.4.1 // indirect modernc.org/memory v1.0.7 // indirect - sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect + sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) diff --git a/go.sum b/go.sum index a3547e9083..f93c4dec15 100644 --- a/go.sum +++ b/go.sum @@ -80,6 +80,7 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg6 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= +github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.25 h1:yp+V8DGur2aIUE87ebP8twPLz6k68jtJTlg61mEoByA= github.com/Azure/go-autorest/autorest v0.11.25/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= @@ -143,8 +144,10 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 h1:6olZmdYuK84eO0PeCQX1iy2EFWlOl8G+JNBi4vFmcU8= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= @@ -193,6 +196,7 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= @@ -203,6 +207,8 @@ github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4 github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.16 h1:6voHuNZZNWo71MdNlym4eRlcogTeTSk9Ipo6qDJWzoU= github.com/aws/aws-sdk-go v1.44.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.72 h1:i7J5XT7pjBjtl1OrdIhiQHzsG89wkZCcM1HhyK++3DI= +github.com/aws/aws-sdk-go v1.44.72/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= @@ -297,6 +303,7 @@ github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= @@ -463,6 +470,7 @@ github.com/couchbase/goutils v0.1.0 h1:0WLlKJilu7IBm98T8nS9+J36lBFVLRUSIUtyD/uWp github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -495,6 +503,8 @@ github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.14+incompatible h1:+T9/PRYWNDo5SZl5qS1r9Mo/0Q8AwxKKPtu9S1yxM0w= github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= @@ -521,6 +531,7 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -550,6 +561,8 @@ github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= @@ -560,10 +573,12 @@ github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= +github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -610,16 +625,19 @@ github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpX github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= @@ -629,6 +647,7 @@ github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= +github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c h1:fWdhUpCuoeNIPiQ+pkAmmERYEjhVx5/cbVGK7T99OkI= @@ -685,6 +704,7 @@ github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZg github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -744,7 +764,11 @@ github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.44.0 h1:523mBK94XHKAsU1TIQl/tYoPyYpWQdalf2CQ8Gv2Xek= github.com/google/cadvisor v0.44.0/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= +github.com/google/cadvisor v0.45.0 h1:bXQze1sd8srZiQwiQ19Qaq/AoMIZS8YceBXrIaEvkX0= +github.com/google/cadvisor v0.45.0/go.mod h1:vsMT3Uv2XjQ8M7WUtKARV74mU/HN64C4XtM1bJhUKcU= github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI= +github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= +github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -759,6 +783,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= @@ -1004,8 +1030,12 @@ github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdY github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/knadh/koanf v1.4.1 h1:Z0VGW/uo8NJmjd+L1Dc3S5frq6c62w5xQ9Yf4Mg3wFQ= github.com/knadh/koanf v1.4.1/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= +github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= +github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1137,10 +1167,12 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mostynb/go-grpc-compression v1.1.16 h1:D9tGUINmcII049pxOj9dl32Fzhp26TrDVQXECoKJqQg= +github.com/mostynb/go-grpc-compression v1.1.17 h1:N9t6taOJN3mNTTi0wDf4e3lp/G/ON1TP67Pn0vTUA9I= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/multiplay/go-ts3 v1.0.1 h1:Ja8ho7UzUDNvNCwcDzPEPimLRub7MUqbD+sgMWkcR0A= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU= @@ -1202,6 +1234,29 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 h1:mFqdkyNdSeLHK7Xx0UZBPoecNmhyiX45bZFMK54yBjk= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0/go.mod h1:XfNw9cfGTgfMd3f5E8YC8KEool0pMGtL/sR1Vn+i2Kg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0 h1:UlytECv2FAXUemiHJ/VrpKvnVv4r8NOSArzXr14Ke88= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0/go.mod h1:EsjSZXhqN3tSQbp9hStLvE3BTtpejg21vhpIx49GxJM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0 h1:LisltbYPXIYStRAokSOh/AenP/HjqaEGq2fXfXnDdlg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0/go.mod h1:MK/+/GR11pNVEAJLACTRHKefdShyCskyjB+n+Ul5H2U= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0 h1:Y71b0gBrbC7ziRdQRZ3ZNQhpLYCqvd+ZGPuaKw7wpb0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0/go.mod h1:4rYZU2BziGrC0J/V8e80A3o1RQAu/OXg2wr8QPk4rPg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0 h1:Yi51h6WbNxKXplGEKGuYOERtyuddLY5L19eOIWkHWLw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0/go.mod h1:MSw33WyyvONv6q7UwOokgfGNDb4dXOA5zaa6XC32ZlQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0 h1:4nIksYrupHZ8yfaFDWGwjY70pfXQryAHyrLT9Fvkn8Q= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0/go.mod h1:r3pq8CdJh+ugZR08pNrnVTO89JJO0xBrv+HFJoeHmLQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0 h1:n/vVF8cJVkAY7hgvEbUSyFMMek/gZ/I6FeswFLaGXPs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0/go.mod h1:VM0VtAFsTqvWhzEZnmUajEOlrl/s91LgYPh099yrtYg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 h1:x7EiYmJya8zHqRdiPXHDXxkImHjaN4tzQN4scapWqL8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0/go.mod h1:+/GN3xD2CZpegXNvz8LAQZBh+fJw5Nshry2UAbvyMXw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 h1:Cd3rWFsteMbqXFEWH9yszGaLHY9aZqQyMQhxsjjnUYw= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0/go.mod h1:pmEdRFPtxUhAOPQEF0daPwO2j47kIHIpRTs/54XVdSo= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 h1:kzOTdxkYNeBe3QQTJfHmPfssh/cc6Cj2m0WnBLIowis= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0/go.mod h1:WMGw+9m3podwRjyjYNLjGlrXDUrftmu3kYkOUbMOvEI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.50.0/go.mod h1:SqejLi8vMhjM4MRfc05pow9D8ow/GVe4sKKlPq1i6E4= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0 h1:zavUPAdJbRk3SDaGHdLzzmwovBgmrCtFwdIPhiQLlwg= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0/go.mod h1:5RdCZu9BBQF4Wce3fmwx4xTePKoJ+WyQ6ePXnOgpt2A= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1227,6 +1282,11 @@ github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/openshift/api v0.0.0-20210521075222-e273a339932a h1:aBPwLqCg66SbQd+HrjB1GhgTfPtqSY4aeB022tEYmE0= +github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= +github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= +github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -1253,6 +1313,7 @@ github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1281,6 +1342,7 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -1299,6 +1361,8 @@ github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE= github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/assets v0.1.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= @@ -1335,6 +1399,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1355,6 +1421,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUt github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/showwin/speedtest-go v1.1.4 h1:pcY1W5LYZu44lH6Fuu80nu/Pj67n//VArlZudbAgR6E= @@ -1396,6 +1464,7 @@ github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHN github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -1416,6 +1485,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1425,6 +1495,7 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1530,26 +1601,39 @@ go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/collector v0.53.0 h1:p4XwnAltBnw/gCRTk+DHTJVGYLzD5cPHp+0XK/KKE/s= go.opentelemetry.io/collector v0.53.0/go.mod h1:MMSqz2ImXjLrZB26cC8vrtgnjsza3hpc760NNjsmjwE= +go.opentelemetry.io/collector v0.58.0 h1:ofl5qa+vTV69PC9NaZKQjE7MP/49iclDKRppl00WgZg= +go.opentelemetry.io/collector v0.58.0/go.mod h1:U3TE477WDi3CYhmE7JGinnpIg8qMH1KCBkRmk3BxKyw= go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= go.opentelemetry.io/collector/pdata v0.53.0 h1:jezCyHu/LXs4P/GzKObCabU2/OUTivNBlQHGPAo/dZo= go.opentelemetry.io/collector/pdata v0.53.0/go.mod h1:25b+xH0uJwp8H3f0a1V+OQfxbhYVds6Rf1Ul+HFCGo4= +go.opentelemetry.io/collector/pdata v0.58.0 h1:SKWw4vjd6ZjCuvsCvEzqwBaxvov4YbXnnXkc9C4xMqM= +go.opentelemetry.io/collector/pdata v0.58.0/go.mod h1:iMv7Pz+hRthi30rkYkwLVusxQ94GU4pPJgFq7gjGcBk= go.opentelemetry.io/collector/semconv v0.53.0 h1:J1lVnFp1VyNKU63rc7csY9/54Tjm9BlLylXLjPimf7s= go.opentelemetry.io/collector/semconv v0.53.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= +go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= +go.opentelemetry.io/collector/semconv v0.58.0 h1:wk9KXVnt8IRdNzD9mmdW3d1M/IJ3HyLp1Lz2ZY1fBCM= +go.opentelemetry.io/collector/semconv v0.58.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/zpages v0.32.0 h1:AVKTx5ppWDaem7A61HFsO1T3CK/t6kFRQoZQMj0/TW4= +go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= +go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= +go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40= @@ -1561,26 +1645,34 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE= go.opentelemetry.io/otel/exporters/prometheus v0.30.0 h1:YXo5ZY5nofaEYMCMTTMaRH2cLDZB8+0UGuk5RwMfIo0= go.opentelemetry.io/otel/exporters/prometheus v0.30.0/go.mod h1:qN5feW+0/d661KDtJuATEmHtw5bKBK7NSvNEP927zSs= +go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= +go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= +go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= +go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= +go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME= go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8= +go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= +go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= +go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= @@ -1602,6 +1694,8 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= +go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= +go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1664,6 +1758,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1719,6 +1814,7 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -1860,6 +1956,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1901,6 +1998,8 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1926,6 +2025,7 @@ golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs= golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -2175,6 +2275,8 @@ google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= +google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2192,6 +2294,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= @@ -2241,6 +2345,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= @@ -2258,18 +2363,24 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= +k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= k8s.io/api v0.23.6 h1:yOK34wbYECH4RsJbQ9sfkFK3O7f/DUHRlzFehkqZyVw= k8s.io/api v0.23.6/go.mod h1:1kFaYxGCFHYp3qd6a85DAj/yW8aVD6XLZMqJclkoi9g= +k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= +k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= +k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= k8s.io/apimachinery v0.23.6 h1:RH1UweWJkWNTlFx0D8uxOpaU1tjIOvVVWV/bu5b3/NQ= k8s.io/apimachinery v0.23.6/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= +k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= @@ -2277,10 +2388,14 @@ k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= +k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= k8s.io/client-go v0.23.5 h1:zUXHmEuqx0RY4+CsnkOn5l0GU+skkRXKGJrhmE2SLd8= k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= +k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= +k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= +k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= @@ -2293,21 +2408,29 @@ k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4= k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= +k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= @@ -2315,6 +2438,8 @@ k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/ k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= +k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.35.26 h1:S4B+fg6/9krLtfZ9lr7pfKiESopiv+Sm6lUUI3oc0fY= @@ -2340,9 +2465,12 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= +sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= From 4c811e9cf620b7e242feb4db7969c5d185915551 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Mon, 22 Aug 2022 19:41:20 -0400 Subject: [PATCH 005/144] start testing CI --- go.mod | 76 ++--- go.sum | 871 ++++++++------------------------------------------------- 2 files changed, 161 insertions(+), 786 deletions(-) diff --git a/go.mod b/go.mod index 337e542dae..fff13cab85 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ replace github.com/opencontainers/runc => github.com/opencontainers/runc v1.1.0 // Prometheis messed up their library naming convention. v0.35.1 matches 2.35.1 prometheus version // Go says this is a downgrade, but this is the latest release as of 05/25/2022 -replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731 +replace github.com/prometheus/prometheus => github.com/prometheus/prometheus v0.37.0 require ( github.com/BurntSushi/toml v0.4.1 @@ -75,17 +75,19 @@ require ( github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.2 github.com/prometheus/common v0.37.0 - github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 + github.com/prometheus/prometheus v1.99.0 github.com/shirou/gopsutil/v3 v3.22.7 github.com/stretchr/testify v1.8.0 github.com/xeipuuv/gojsonschema v1.2.0 go.opentelemetry.io/collector v0.58.0 - golang.org/x/net v0.0.0-20220412020605-290c469a71a5 - golang.org/x/sync v0.0.0-20210220032951-036812b2e83c - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a + golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e + golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f + golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b golang.org/x/text v0.3.7 gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 @@ -96,17 +98,17 @@ require ( k8s.io/api v0.24.3 k8s.io/apimachinery v0.24.3 k8s.io/client-go v0.24.3 - k8s.io/klog/v2 v2.60.1 + k8s.io/klog/v2 v2.70.0 ) require ( - cloud.google.com/go/compute v1.6.0 // indirect + cloud.google.com/go/compute v1.7.0 // indirect collectd.org v0.4.0 // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.1 // indirect - github.com/Azure/azure-sdk-for-go v63.0.0+incompatible // indirect + github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect - github.com/Azure/go-autorest/autorest v0.11.25 // indirect - github.com/Azure/go-autorest/autorest/adal v0.9.18 // indirect + github.com/Azure/go-autorest/autorest v0.11.27 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect @@ -138,29 +140,28 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cilium/ebpf v0.7.0 // indirect - github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 // indirect + github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc // indirect github.com/containerd/console v1.0.3 // indirect - github.com/containerd/containerd v1.6.1 // indirect github.com/containerd/ttrpc v1.1.0 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dennwc/varint v1.0.0 // indirect - github.com/digitalocean/godo v1.78.0 // indirect + github.com/digitalocean/godo v1.81.0 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect github.com/docker/docker v20.10.17+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 // indirect github.com/emicklei/go-restful v2.9.5+incompatible // indirect - github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect + github.com/envoyproxy/go-control-plane v0.10.3 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect github.com/felixge/httpsnoop v1.0.3 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect - github.com/go-kit/log v0.2.0 // indirect + github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect github.com/go-logr/logr v1.2.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -177,24 +178,30 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/gnostic v0.5.7-v3refs // indirect - github.com/google/go-querystring v1.0.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/googleapis/gax-go/v2 v2.3.0 // indirect - github.com/googleapis/gnostic v0.5.5 // indirect - github.com/gophercloud/gophercloud v0.24.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect + github.com/googleapis/gax-go/v2 v2.4.0 // indirect + github.com/gophercloud/gophercloud v0.25.0 // indirect + github.com/gorilla/websocket v1.4.2 // indirect github.com/gosnmp/gosnmp v1.34.0 // indirect github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2 // indirect - github.com/hashicorp/consul/api v1.12.0 // indirect + github.com/hashicorp/consul/api v1.13.0 // indirect + github.com/hashicorp/cronexpr v1.1.1 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.2.0 // indirect github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.1 // indirect github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/nomad/api v0.0.0-20220629141207-c2428e1673ec // indirect github.com/hashicorp/serf v0.9.6 // indirect - github.com/hetznercloud/hcloud-go v1.33.1 // indirect + github.com/hetznercloud/hcloud-go v1.35.0 // indirect github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect + github.com/ionos-cloud/sdk-go/v6 v6.1.0 // indirect github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -205,14 +212,14 @@ require ( github.com/knadh/koanf v1.4.2 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect - github.com/linode/linodego v1.4.1 // indirect + github.com/linode/linodego v1.8.0 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-colorable v0.1.12 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect - github.com/miekg/dns v1.1.48 // indirect + github.com/miekg/dns v1.1.50 // indirect github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 // indirect github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible // indirect github.com/mitchellh/copystructure v1.2.0 // indirect @@ -225,7 +232,7 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 // indirect + github.com/nxadm/tail v1.4.8 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0 // indirect @@ -235,7 +242,6 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.50.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.3 // indirect @@ -243,7 +249,6 @@ require ( github.com/opencontainers/selinux v1.10.0 // indirect github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -273,6 +278,7 @@ require ( github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 // indirect github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect github.com/vjeantet/grok v1.0.1 // indirect + github.com/vultr/govultr/v2 v2.17.2 // indirect github.com/wavefronthq/wavefront-sdk-go v0.9.10 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect @@ -291,19 +297,19 @@ require ( go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.22.0 // indirect - golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect - golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect - golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect + golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect + golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect + golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect - golang.org/x/tools v0.1.10 // indirect - golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect - google.golang.org/api v0.77.0 // indirect + golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect + golang.org/x/tools v0.1.11 // indirect + google.golang.org/api v0.86.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 // indirect + google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect google.golang.org/grpc v1.48.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.66.4 // indirect k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect @@ -312,5 +318,5 @@ require ( modernc.org/memory v1.0.7 // indirect sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect - sigs.k8s.io/yaml v1.2.0 // indirect + sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index f93c4dec15..eaf6ccd45f 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= -bazil.org/fuse v0.0.0-20200407214033-5883e5a4b512/go.mod h1:FbcW6z/2VytnFDhZfumh8Ss8zxHE6qpMP5sHTRe0EaM= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -28,8 +26,9 @@ cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+Y cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= -cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= +cloud.google.com/go v0.102.0 h1:DAq3r8y4mDgyB/ZPJ9v/5VJNqjgJAxTn6ZYLlUywOu8= +cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -40,12 +39,14 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/compute v0.1.0/go.mod h1:GAesmwr110a34z04OlxYkATPBEfVhkymfTBXtfbBFow= cloud.google.com/go/compute v1.3.0/go.mod h1:cCZiE1NHEtai4wiufUhW8I8S1JKkAnhnQJWM7YD99wM= cloud.google.com/go/compute v1.5.0/go.mod h1:9SMHyhJlzhlkJqrPAc839t2BZFTSk6Jdj6mkzQJeu0M= -cloud.google.com/go/compute v1.6.0 h1:XdQIN5mdPTSBVwSIVDuY5e8ZzVAccsHvD3qTEz4zIps= cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz/FMzPu0s= +cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= +cloud.google.com/go/compute v1.7.0 h1:v/k9Eueb8aAJ0vZuxKMrgm6kPhCLZU9HxFU+AFDs9Uk= +cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/iam v0.1.1 h1:4CapQyNFjiksks1/x7jsvsygFPhihslYk5GptIrlX68= +cloud.google.com/go/iam v0.3.0 h1:exkAomrVUuzx9kWFI1wm3KI0uoDeUFPB4kKGzx6x+Gc= +cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/monitoring v1.2.0 h1:fEvQITrhVcPM6vuDQcgPMbU5kZFeQFwZmE7v6+S8BPo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= @@ -57,43 +58,39 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= collectd.org v0.4.0 h1:nWNldfMqg7EVWAevG8oyOVsS9r/UHRG3LZRf6MdQho0= collectd.org v0.4.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= contrib.go.opencensus.io/exporter/prometheus v0.4.1 h1:oObVeKo2NxpdF/fIfrPsNj6K0Prg0R0mHM+uANlYMiM= contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= github.com/Azure/azure-event-hubs-go/v3 v3.3.17 h1:9k2yRMBJWgcIlSNBuKVja2af/oR3oMowqFPpHDV5Kl4= github.com/Azure/azure-kusto-go v0.5.2 h1:6kFVZp4iyz8YFTuxrIdivAXVcEs5wNKTVK5gai+E8pk= github.com/Azure/azure-pipeline-go v0.2.3 h1:7U9HBg1JFK3jHl5qmo4CTZKFTVgMwdFHMVtCdfBE21U= -github.com/Azure/azure-sdk-for-go v63.0.0+incompatible h1:whPsa+jCHQSo5wGMPNLw4bz8q9Co2+vnXHzXGctoTaQ= -github.com/Azure/azure-sdk-for-go v63.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible h1:HzKLt3kIwMm4KeJYTdx9EbjRYTySD/t8i1Ee/W5EGXw= +github.com/Azure/azure-sdk-for-go v65.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= github.com/Azure/go-amqp v0.17.0 h1:HHXa3149nKrI0IZwyM7DRcRy5810t9ZICDutn4BYzj4= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= -github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.1/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw= github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= -github.com/Azure/go-autorest/autorest v0.11.25 h1:yp+V8DGur2aIUE87ebP8twPLz6k68jtJTlg61mEoByA= -github.com/Azure/go-autorest/autorest v0.11.25/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg= +github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= +github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= -github.com/Azure/go-autorest/autorest/adal v0.9.18 h1:kLnPsRjzZZUF3K5REu/Kc+qMQrvuza2bwSnNdhmzLfQ= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= +github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= +github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/azure/auth v0.5.11 h1:P6bYXFoao05z5uhOQzbC3Qd8JqF3jUoocoTeIxkp2cA= github.com/Azure/go-autorest/autorest/azure/cli v0.4.5 h1:0W/yGmFdTIT77fvdlGZ0LMISoLHFJ7Tx4U0yeB+uFs4= github.com/Azure/go-autorest/autorest/date v0.3.0 h1:7gUk1U5M/CQbp9WoqinNzJar+8KY+LPI6wiWrP/myHw= github.com/Azure/go-autorest/autorest/date v0.3.0/go.mod h1:BI0uouVdmngYNUzGWeSYnokU+TrmwEsOqdt8Y6sso74= -github.com/Azure/go-autorest/autorest/mocks v0.4.0/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935gNZuuIPPVsHlr9DSOxSayd+k= github.com/Azure/go-autorest/autorest/mocks v0.4.2 h1:PGN4EDXnuQbojHbU0UWoNvmu9AGVwYHG9/fkDYhtAfw= github.com/Azure/go-autorest/autorest/mocks v0.4.2/go.mod h1:Vy7OitM9Kei0i1Oj+LvyAWMXJHeKH1MVlzFugfVrmyU= @@ -116,37 +113,13 @@ github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= github.com/Jeffail/gabs v1.4.0/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Mellanox/rdmamap v0.0.0-20191106181932-7c3c4763a6ee h1:atI/FFjXh6hIVlPE1Jup9m8N4B9q/OSbMUe2EBahs+w= -github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw= -github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0= -github.com/Microsoft/go-winio v0.4.17-0.20210211115548-6eac466e5fa3/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17-0.20210324224401-5516f17a5958/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.4.17/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY= github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7-0.20190325164909-8abdbb8205e4/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= -github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ= -github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8= -github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg= -github.com/Microsoft/hcsshim v0.8.15/go.mod h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00= -github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.20/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.21/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= -github.com/Microsoft/hcsshim v0.8.23/go.mod h1:4zegtUJth7lAvFyc6cH2gGQ5B3OFQim01nnU2M8jKDg= -github.com/Microsoft/hcsshim v0.9.2/go.mod h1:7pLA8lDk46WKDWlVsENo92gC0XFa8rbKfyFRBqxEbCc= -github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU= -github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 h1:6olZmdYuK84eO0PeCQX1iy2EFWlOl8G+JNBi4vFmcU8= @@ -172,8 +145,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0= -github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE= @@ -189,24 +160,16 @@ github.com/apache/thrift v0.15.0 h1:aGvdaR0v1t9XLgjtBYwxcBvBOTMqClzwE26CHOgjW1Y= github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3 h1:Bmjk+DjIi3tTAU0wxGaFbfjGUqlxxSXARq9A96Kgoos= github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 h1:FD4/ikKOFxwP8muWDypbmBWc634+YcAs3eBrYAmRdZY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.3/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.38.68/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.16 h1:6voHuNZZNWo71MdNlym4eRlcogTeTSk9Ipo6qDJWzoU= -github.com/aws/aws-sdk-go v1.44.16/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go v1.44.72 h1:i7J5XT7pjBjtl1OrdIhiQHzsG89wkZCcM1HhyK++3DI= github.com/aws/aws-sdk-go v1.44.72/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.7.0/go.mod h1:tb9wi5s61kTDA5qCkcDbt3KRVV74GGslQkl/DRdX/P4= @@ -276,8 +239,6 @@ github.com/aws/telegraf v0.10.2-0.20220502160831-c20ebe67c5ef/go.mod h1:6maU8S0L github.com/aws/telegraf/patches/gopsutil/v3 v3.0.0-20220502160831-c20ebe67c5ef h1:iiO0qNErnQgaU6mJY+PRlwnoHp+s9VTk2Ax1A8KRoG4= github.com/aws/telegraf/patches/gopsutil/v3 v3.0.0-20220502160831-c20ebe67c5ef/go.mod h1:1W1wnODUDv+FBSAtAa878Kxto5kj8eV+kI0AF4LIjq4= github.com/awslabs/kinesis-aggregation/go v0.0.0-20210630091500-54e17340d32f h1:Pf0BjJDga7C98f0vhw+Ip5EaiE07S3lTKpIYPNS0nMo= -github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -287,26 +248,19 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 h1:4UwtVL/bvcpWHPAUCtu8hKl7belqWxDEw94wkYFWem8= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579/go.mod h1:RI5D4DqbDX0Kb0SvKTuAKMYlkSBND3zLQZI/wiS5Ij0= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI= -github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= -github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8q9GjDajLC5T7ydxE3JHI= github.com/casbin/casbin/v2 v2.31.6/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= +github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -316,10 +270,6 @@ github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAc github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.0.0-20200110133405-4032b1d8aae3/go.mod h1:MA5e5Lr8slmEg9bt0VpxxWqJlO4iwu3FBdHUzV7wQVg= -github.com/cilium/ebpf v0.0.0-20200702112145-1c8d4c9ef775/go.mod h1:7cR51M8ViRLIdUjrmSXlK9pkrsDlLHbO8jiB8X8JnOc= -github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= -github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/cilium/ebpf v0.7.0 h1:1k/q3ATgxSXRdrmPfH8d7YK0GfqVsEKZAX9dQZvs56k= github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= @@ -337,149 +287,29 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490 h1:KwaoQzs/WeUxxJqiJsZ4euOly1Az/IgZXXSxlD/UBNk= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc h1:PYXxkRUBGUMa5xgMVMDl62vEklZvKpVaxQeN9ie7Hfk= +github.com/cncf/xds/go v0.0.0-20220314180256-7f1daf1720fc/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE= -github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU= -github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU= -github.com/containerd/btrfs v0.0.0-20201111183144-404b9149801e/go.mod h1:jg2QkJcsabfHugurUvvPhS3E08Oxiuh5W/g1ybB4e0E= -github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/btrfs v1.0.0/go.mod h1:zMcX3qkXTAi9GI50+0HOeuV8LU2ryCE/V2vG/ZBiTss= -github.com/containerd/cgroups v0.0.0-20190717030353-c4b9ac5c7601/go.mod h1:X9rLEHIqSf/wfK8NsPqxJmeZgW4pcfzdXITDrUSJ6uI= -github.com/containerd/cgroups v0.0.0-20190919134610-bf292b21730f/go.mod h1:OApqhQ4XNSNC13gXIwDjhOQxjWa/NxkwZXJ1EvqT0ko= -github.com/containerd/cgroups v0.0.0-20200531161412-0dbf7f05ba59/go.mod h1:pA0z1pT8KYB3TCXK/ocprsh7MAkoW8bZVzPdih9snmM= -github.com/containerd/cgroups v0.0.0-20200710171044-318312a37340/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo= -github.com/containerd/cgroups v0.0.0-20210114181951-8a68de567b68/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE= -github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f25ZfBiPYRkU= -github.com/containerd/cgroups v1.0.3/go.mod h1:/ofk34relqNjSGyqPrmEULrO4Sc8LJhvJmWbUCUKqj8= -github.com/containerd/console v0.0.0-20180822173158-c12b1e7919c1/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20181022165439-0650fd9eeb50/go.mod h1:Tj/on1eG8kiEhd0+fhSDzsPAFESxzBBvdyEgyryXffw= -github.com/containerd/console v0.0.0-20191206165004-02ecf6a7291e/go.mod h1:8Pf4gM6VEbTNRIT26AyyU7hxdQU3MvAvxVI0sc00XBE= -github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.2.10/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.0/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.1-0.20191213020239-082f7e3aed57/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.3.2/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.0-beta.2.0.20200729163537-40b22ef07410/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.1/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.3/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.9/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.4.12/go.mod h1:bC6axHOhabU15QhwfG7w5PipXdVtMXFTttgp+kVtyUA= -github.com/containerd/containerd v1.5.0-beta.1/go.mod h1:5HfvG1V2FsKesEGQ17k5/T7V960Tmcumvqn8Mc+pCYQ= -github.com/containerd/containerd v1.5.0-beta.3/go.mod h1:/wr9AVtEM7x9c+n0+stptlo/uBBoBORwEx6ardVcmKU= -github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09ZvgqEq8EfBp/m3lcVZIvPHhI= -github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= -github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= -github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.5.8/go.mod h1:YdFSv5bTFLpG2HIYmfqDpSYYTDX+mc5qtSuYx1YUb/s= -github.com/containerd/containerd v1.6.1 h1:oa2uY0/0G+JX4X7hpGCYvkp9FjUancz56kSNnb1sG3o= -github.com/containerd/containerd v1.6.1/go.mod h1:1nJz5xCZPusx6jJU8Frfct988y0NpumIq9ODB0kLtoE= -github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo= -github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y= -github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/containerd/continuity v0.2.2/go.mod h1:pWygW9u7LtS1o4N/Tn0FoCFDIXZ7rxcMX7HX1Dmibvk= -github.com/containerd/fifo v0.0.0-20180307165137-3d5202aec260/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI= -github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20201026212402-0724c46b320c/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0= -github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU= -github.com/containerd/go-cni v1.0.2/go.mod h1:nrNABBHzu0ZwCug9Ije8hL2xBCYh/pjfMb1aZGrrohk= -github.com/containerd/go-cni v1.1.0/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-cni v1.1.3/go.mod h1:Rflh2EJ/++BA2/vY5ao3K6WJRR/bZKsX123aPk+kUtA= -github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20190911050354-e029b79d8cda/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0= -github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g= -github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/go-runc v1.0.0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok= -github.com/containerd/imgcrypt v1.0.1/go.mod h1:mdd8cEPW7TPgNG4FpuP3sGBiQ7Yi/zak9TYCG3juvb0= -github.com/containerd/imgcrypt v1.0.4-0.20210301171431-0ae5c75f59ba/go.mod h1:6TNsg0ctmizkrOgXRNQjAPFWpMYRWuiB6dSF4Pfa5SA= -github.com/containerd/imgcrypt v1.1.1-0.20210312161619-7ed62a527887/go.mod h1:5AZJNI6sLHJljKuI9IHnw1pWqo/F0nGDOuR9zgTs7ow= -github.com/containerd/imgcrypt v1.1.1/go.mod h1:xpLnwiQmEUJPvQoAapeb2SNCxz7Xr6PJrXQb0Dpc4ms= -github.com/containerd/imgcrypt v1.1.3/go.mod h1:/TPA1GIDXMzbj01yd8pIbQiLdQxed5ue1wb8bP7PQu4= -github.com/containerd/nri v0.0.0-20201007170849-eb1350a75164/go.mod h1:+2wGSDGFYfE5+So4M5syatU0N0f0LbWpuqyMi4/BE8c= -github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/nri v0.1.0/go.mod h1:lmxnXF6oMkbqs39FiCt1s0R2HSMhcLel9vNL3m4AaeY= -github.com/containerd/stargz-snapshotter/estargz v0.4.1/go.mod h1:x7Q9dg9QYb4+ELgxmo4gBUeJB0tl5dqH1Sdz0nJU1QM= -github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20190828172938-92c8520ef9f8/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o= -github.com/containerd/ttrpc v0.0.0-20191028202541-4f1b8fe65a5c/go.mod h1:LPm1u0xBw8r8NOKoOdNMeVHSawSsltak+Ihv+etqsE8= -github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= github.com/containerd/ttrpc v1.0.2/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y= github.com/containerd/ttrpc v1.1.0 h1:GbtyLRxb0gOLR0TYQWt3O6B0NvT8tMdorEHqIQo/lWI= github.com/containerd/ttrpc v1.1.0/go.mod h1:XX4ZTnoOId4HklF4edwc4DcqskFZuvXB1Evzy5KFQpQ= -github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc= -github.com/containerd/typeurl v0.0.0-20190911142611-5eb25027c9fd/go.mod h1:GeKYzf2pQcqv7tJ0AoCuuhtnqhva5LNU3U+OyKxxJpk= -github.com/containerd/typeurl v1.0.1/go.mod h1:TB1hUtrpaiO88KEK56ijojHS1+NeF0izUACaJW2mdXg= github.com/containerd/typeurl v1.0.2 h1:Chlt8zIieDbzQFzXzAeBEF92KhExuE4p9p92/QmY7aY= github.com/containerd/typeurl v1.0.2/go.mod h1:9trJWW2sRlGub4wZJRTW83VtbOLS6hwcDZXTn6oPz9s= -github.com/containerd/zfs v0.0.0-20200918131355-0a33824f23a2/go.mod h1:8IgZOBdv8fAgXddBT4dBXJPtxyRsejFIpXoklgxgEjw= -github.com/containerd/zfs v0.0.0-20210301145711-11e8f1707f62/go.mod h1:A9zfAbMlQwE+/is6hi0Xw8ktpL+6glmqZYtevJgaB8Y= -github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v0.0.0-20210324211415-d5c4544f0433/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containerd/zfs v1.0.0/go.mod h1:m+m51S1DvAP6r3FcmYCp54bQ34pyOwTieQDNRIRHsFY= -github.com/containernetworking/cni v0.7.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v0.8.1/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY= -github.com/containernetworking/cni v1.0.1/go.mod h1:AKuhXbN5EzmD4yTNtfSsX3tPcmtrBI6QcRV0NiNt15Y= -github.com/containernetworking/plugins v0.8.6/go.mod h1:qnw5mN19D8fIwkqW7oHHYDHVlzhJpcY6TQxn/fUyDDM= -github.com/containernetworking/plugins v0.9.1/go.mod h1:xP/idU2ldlzN6m4p5LmGiwRDjeJr6FLK6vuiUwoH7P8= -github.com/containernetworking/plugins v1.0.1/go.mod h1:QHCfGpaTwYTbbH+nZXKVTxNBDZcxSOplJT5ico8/FLE= -github.com/containers/ocicrypt v1.0.1/go.mod h1:MeJDzk1RJHv89LjsH0Sp5KTY3ZYkjXO/C+bKAeWFIrc= -github.com/containers/ocicrypt v1.1.0/go.mod h1:b8AOe0YR67uU8OqfVNcznfFpAzu3rdgUV4GP9qXPfu4= -github.com/containers/ocicrypt v1.1.1/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B0oB3dj3jFxY= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= -github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= -github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/couchbase/go-couchbase v0.1.1 h1:ClFXELcKj/ojyoTYbsY34QUrrYCBi/1G749sXSCkdhk= github.com/couchbase/gomemcached v0.1.3 h1:HIc5qMYNbuhB7zNaiEtj61DCYkquAwrQlf64q7JzdEY= github.com/couchbase/goutils v0.1.0 h1:0WLlKJilu7IBm98T8nS9+J36lBFVLRUSIUtyD/uWpAE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= -github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= -github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= -github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= -github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -488,36 +318,22 @@ github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/digitalocean/godo v1.78.0 h1:hKMfHXChSMjZFMSev+m5R4/2rxZ3HPdhlpeA2pJI72M= -github.com/digitalocean/godo v1.78.0/go.mod h1:GBmu8MkjZmNARE7IXRPmkbbnocNN8+uBm0xbEVw2LCs= +github.com/digitalocean/godo v1.81.0 h1:sjb3fOfPfSlUQUK22E87BcI8Zx2qtnF7VUCCO4UK3C8= +github.com/digitalocean/godo v1.81.0/go.mod h1:BPCqvwbjbGqxuUnIKB4EvS/AX7IDnNmt5fwvIkWo+ew= github.com/dimchansky/utfbom v1.1.1 h1:vV6w1AhK4VMnhBno/TPVCoK9U/LP0PkLCS9tbxHdi/U= github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= -github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.12+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.14+incompatible h1:+T9/PRYWNDo5SZl5qS1r9Mo/0Q8AwxKKPtu9S1yxM0w= -github.com/docker/docker v20.10.14+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= -github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= -github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= -github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 h1:27379cxrsKlr7hAnW/xrusefspUPjqHVRW1K/bZgfGw= github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60/go.mod h1:8Ia4zp86glrUhC29AAdK9hwTYh8RB6v0WRCtpplYqEg= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dynatrace-oss/dynatrace-metric-utils-go v0.3.0 h1:q2Ayh9s6Cr75bS5URiOUAoyFXemgKQaBJphbhAaJHCY= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= @@ -528,7 +344,6 @@ github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqnNN1bdl41Y= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.1.0/go.mod h1:19H/e8pUPLicwkyNgOykDXkJ9F0MHE+Z52B8EIth78Q= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= @@ -541,26 +356,22 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/go-control-plane v0.10.3 h1:xdCVXxEe0Y3FQith+0cj2irwZudqGYvecuLB1HtdexY= +github.com/envoyproxy/go-control-plane v0.10.3/go.mod h1:fJJn/j26vwOu972OllsvAgJJM//w9BV6Fxbg2LuVd34= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4gg31M/xaciQlDml8= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= -github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= -github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -571,18 +382,13 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2 github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= -github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= -github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8= @@ -594,8 +400,9 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.11.0 h1:IGmIEl7aHTYh6E2HlT+ptILBotjo4xl8PMDl852etiI= github.com/go-kit/kit v0.11.0/go.mod h1:73/6Ixaufkvb5Osvkls8C79vuQ49Ba1rUEUYNSf+FUw= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap v3.0.2+incompatible h1:kD5HQcAzlQ7yrhfn+h+MSABeAy/jAJhvIJ/QDllP44g= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-ldap/ldap/v3 v3.4.1 h1:fU/0xli6HY02ocbMuozHAYsaHLcnkLjvho2r5a34BUU= @@ -608,107 +415,48 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.1/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= -github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= -github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= -github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= -github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= -github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c h1:fWdhUpCuoeNIPiQ+pkAmmERYEjhVx5/cbVGK7T99OkI= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= -github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-zookeeper/zk v1.0.2 h1:4mx0EYENAdX/B/rbunjlt5+4RTA/a9SMHBRuSKdGxPM= github.com/go-zookeeper/zk v1.0.2/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= -github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= -github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= -github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= -github.com/gobuffalo/envy v1.6.15/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= -github.com/gobuffalo/flect v0.1.0/go.mod h1:d2ehjJqGOH/Kjqcoz+F7jHTBbmDb38yXA598Hb50EGs= -github.com/gobuffalo/flect v0.1.1/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/flect v0.1.3/go.mod h1:8JCgGVbRjJhVgD6399mQr4fx5rRfGKVzFjbj6RE/9UI= -github.com/gobuffalo/genny v0.0.0-20190329151137-27723ad26ef9/go.mod h1:rWs4Z12d1Zbf19rlsn0nurr75KqhYp52EAGGxTbBhNk= -github.com/gobuffalo/genny v0.0.0-20190403191548-3ca520ef0d9e/go.mod h1:80lIj3kVJWwOrXWWMRzzdhW3DsrdjILVil/SFKBzF28= -github.com/gobuffalo/genny v0.1.0/go.mod h1:XidbUqzak3lHdS//TPu2OgiFB+51Ur5f7CSnXZ/JDvo= -github.com/gobuffalo/genny v0.1.1/go.mod h1:5TExbEyY48pfunL4QSXxlDOmdsD44RRq4mVZ0Ex28Xk= -github.com/gobuffalo/gitgen v0.0.0-20190315122116-cc086187d211/go.mod h1:vEHJk/E9DmhejeLeNt7UVvlSGv3ziL+djtTr3yyzcOw= -github.com/gobuffalo/gogen v0.0.0-20190315121717-8f38393713f5/go.mod h1:V9QVDIxsgKNZs6L2IYiGR8datgMhB577vzTDqypH360= -github.com/gobuffalo/gogen v0.1.0/go.mod h1:8NTelM5qd8RZ15VjQTFkAW6qOMx5wBbW4dSCS3BY8gg= -github.com/gobuffalo/gogen v0.1.1/go.mod h1:y8iBtmHmGc4qa3urIyo1shvOD8JftTtfcKi+71xfDNE= -github.com/gobuffalo/logger v0.0.0-20190315122211-86e12af44bc2/go.mod h1:QdxcLw541hSGtBnhUc4gaNIXRjiDppFGaDqzbrBd3v8= -github.com/gobuffalo/mapi v1.0.1/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/mapi v1.0.2/go.mod h1:4VAGh89y6rVOvm5A8fKFxYG+wIW6LO1FMTG9hnKStFc= -github.com/gobuffalo/packd v0.0.0-20190315124812-a385830c7fc0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWeG2RIxq4= -github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= -github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= -github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= -github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= -github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= -github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.6 h1:mkgN1ofwASrYnJ5W6U/BxG15eXXXjirgZc7CLqkcaro= github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= -github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= -github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= -github.com/gogo/protobuf v1.3.0/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -719,8 +467,6 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZ github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 h1:+eHOFJl1BaXrQxKX+T06f78590z4qA2ZzBTqahsKSE4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -762,8 +508,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cadvisor v0.44.0 h1:523mBK94XHKAsU1TIQl/tYoPyYpWQdalf2CQ8Gv2Xek= -github.com/google/cadvisor v0.44.0/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= github.com/google/cadvisor v0.45.0 h1:bXQze1sd8srZiQwiQ19Qaq/AoMIZS8YceBXrIaEvkX0= github.com/google/cadvisor v0.45.0/go.mod h1:vsMT3Uv2XjQ8M7WUtKARV74mU/HN64C4XtM1bJhUKcU= github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI= @@ -781,14 +525,12 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.5.1/go.mod h1:Ct15B4yir3PLOP5jsy0GNeYVaIZs/MK/Jz5any1wFW0= github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= -github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= -github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= +github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -811,37 +553,33 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20220318212150-b2ab0324ddda/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/enterprise-certificate-proxy v0.0.0-20220520183353-fd19c99a87aa/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= +github.com/googleapis/enterprise-certificate-proxy v0.1.0 h1:zO8WHNx/MYiAKJ3d5spxZXZE6KHmIQGQcAzwUzV7qQw= +github.com/googleapis/enterprise-certificate-proxy v0.1.0/go.mod h1:17drOmN3MwGY7t0e+Ei9b45FFGA3fBs3x36SsCg1hq8= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/OthfcblKl4IGNaM= -github.com/googleapis/gax-go/v2 v2.3.0 h1:nRJtk3y8Fm770D42QV6T90ZnvFZyk7agSo3Q+Z9p3WI= github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= +github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk= +github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= -github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= -github.com/googleapis/gnostic v0.5.5 h1:9fHAtK0uDfpveeqqo1hkEZJcFvYXAiCN3UutL8F9xHw= -github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gopcua/opcua v0.3.1 h1:BS1TRJUdsPSwU0mlfc8Dffchh0jTw9lWchmF4HFRo2w= -github.com/gophercloud/gophercloud v0.24.0 h1:jDsIMGJ1KZpAjYfQgGI2coNQj5Q83oPzuiGJRFWgMzw= -github.com/gophercloud/gophercloud v0.24.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= +github.com/gophercloud/gophercloud v0.25.0 h1:C3Oae7y0fUVQGSsBrb3zliAjdX+riCSEh4lNMejFNI4= +github.com/gophercloud/gophercloud v0.25.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41AdQMDwyo1myduD5c= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= -github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosnmp/gosnmp v1.34.0 h1:p96iiNTTdL4ZYspPC3leSKXiHfE1NiIYffMu9100p5E= @@ -851,26 +589,21 @@ github.com/grafana/regexp v0.0.0-20220304095617-2e8d9baf4ac2/go.mod h1:M5qHK+eWf github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grid-x/modbus v0.0.0-20211113184042-7f2251c342c9 h1:Q7e9kXS3sRbTjsNDKazbcbDSGAKjFdk096M3qYbwNpE= github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa h1:Rsn6ARgNkXrsXJIzhkE4vQr5Gbx2LvtEMv4BJOK4LyU= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/gwos/tcg/sdk v0.0.0-20211223101342-35fbd1ae683c h1:befb5xGUwNCoBuN/akLFCKekUzr0ixyws3aAX/7TaOk= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/harlow/kinesis-consumer v0.3.5 h1:xeiDp2frP8DdKDeOzVuS+vaBX03JjifQO/Apzu4IOMA= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.8.1/go.mod h1:sDjTOq0yUyv5G4h+BqSea7Fn6BU+XbolEz1952UB+mk= -github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/consul/api v1.13.0 h1:2hnLQ0GjQvw7f3O61jMO8gbasZviZTrt9R8WzgiirHc= +github.com/hashicorp/consul/api v1.13.0/go.mod h1:ZlVrynguJKcYr54zGaDbaL3fOvKC9m72FhPvA8T35KQ= github.com/hashicorp/consul/sdk v0.7.0/go.mod h1:fY08Y9z5SvJqevyZNy6WWPXiG3KwBPAvlcdx16zZ0fM= github.com/hashicorp/consul/sdk v0.8.0 h1:OJtKBtEjboEZvG6AOUdh4Z1Zbyu0WcxQ0qatRrZHTVU= github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= -github.com/hashicorp/errwrap v0.0.0-20141028054710-7554cd9344ce/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/cronexpr v1.1.1 h1:NJZDd87hGXjoZBdvyCF9mX4DCq5Wy7+A/w+A7q0wn6c= +github.com/hashicorp/cronexpr v1.1.1/go.mod h1:P4wA0KBl9C5q2hABiMO7cp6jcIg96CDh1Efb3g1PWA4= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -880,25 +613,23 @@ github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9n github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.2.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-multierror v0.0.0-20161216184304-ed905158d874/go.mod h1:JMRHfdO9jKNzS/+BTlxCjKNQHg/jZAft8U7LloJvN7I= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-retryablehttp v0.7.1 h1:sUiuQAnLlbvmExtFQs72iFW/HXeUn8Z1aJLQ4LJJbTQ= +github.com/hashicorp/go-retryablehttp v0.7.1/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.1/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= @@ -910,7 +641,6 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= @@ -918,15 +648,13 @@ github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uG github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= +github.com/hashicorp/memberlist v0.3.0 h1:8+567mCcFDnS5ADl7lrpxPMWiFCElyUEeW0gtj34fMA= github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.1 h1:MXgUXLqva1QvpVEDQW1IQLG0wivQAtmFlHRQ+1vWZfM= -github.com/hashicorp/memberlist v0.3.1/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/nomad/api v0.0.0-20220629141207-c2428e1673ec h1:jAF71e0KoaY2LJlRsRxxGz6MNQOG5gTBIc+rklxfNO0= +github.com/hashicorp/nomad/api v0.0.0-20220629141207-c2428e1673ec/go.mod h1:jP79oXjopTyH6E8LF0CEMq67STgrlmBRIyijA0tuR5o= github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= github.com/hashicorp/serf v0.9.6 h1:uuEX1kLR6aoda1TBttmJQKDLZE1Ob7KN0NPdE7EtCDc= github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= @@ -934,18 +662,14 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hetznercloud/hcloud-go v1.33.1 h1:W1HdO2bRLTKU4WsyqAasDSpt54fYO4WNckWYfH5AuCQ= -github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME= +github.com/hetznercloud/hcloud-go v1.35.0 h1:sduXOrWM0/sJXwBty7EQd7+RXEJh5+CsAGQmHshChFg= +github.com/hetznercloud/hcloud-go v1.35.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= @@ -967,10 +691,9 @@ github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 h1:vvyMtD5LTJc1W9s github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65/go.mod h1:zApaNFpP/bTpQItGZNNUMISDMDAnTXu9UqJ4yT3ocz8= github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8 h1:W2IgzRCb0L9VzMujq/QuTaZUKcH8096jWwP519mHN6Q= github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8/go.mod h1:/2NMgWB1DHM1ti/gqhOlg+LJeBVk6FqR5aVGYY0hlwI= -github.com/intel/goresctrl v0.2.0/go.mod h1:+CZdzouYFn5EsxgqAQTEzMfwKwuc0fVdMrT9FCCAVRQ= github.com/intel/iaevents v1.0.0 h1:J8lETV13FMImV0VbOrKhkA790z7+cAHQ/28gbiefu7E= -github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/j-keck/arping v1.0.2/go.mod h1:aJbELhR92bSk7tp79AWM/ftfc90EfEi2bQJrbBFOsPw= +github.com/ionos-cloud/sdk-go/v6 v6.1.0 h1:0EZz5H+t6W23zHt6dgHYkKavr72/30O9nA97E3FZaS4= +github.com/ionos-cloud/sdk-go/v6 v6.1.0/go.mod h1:Ox3W0iiEz0GHnfY9e5LmAxwklsxguuNFEUSu0gVRTME= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ= github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE= @@ -986,24 +709,19 @@ github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8 github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= -github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca h1:a0GZUdb+qnutF8shJxr2qs2qT3fnF+ptxTxPB8+oIvk= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -1016,24 +734,15 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kardianos/service v1.2.1 h1:AYndMsehS+ywIS6RB9KOlcXzteWUzxgMgBymJD7+BYk= github.com/kardianos/service v1.2.1/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= -github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= -github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/karrick/godirwalk v1.12.0 h1:nkS4xxsjiZMvVlazd0mFyiwD4BR9f3m6LXGhM2TUx3Y= github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.12/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/knadh/koanf v1.4.1 h1:Z0VGW/uo8NJmjd+L1Dc3S5frq6c62w5xQ9Yf4Mg3wFQ= -github.com/knadh/koanf v1.4.1/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= @@ -1054,53 +763,38 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= -github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= -github.com/linode/linodego v1.4.1 h1:cgpY1jCZ47wfJvWH5V8in7Tphj8T0sR1URiH9e6G2bA= -github.com/linode/linodego v1.4.1/go.mod h1:PVsRxSlOiJyvG4/scTszpmZDTdgS+to3X6eS8pRrWI8= -github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= +github.com/linode/linodego v1.8.0 h1:7B2UaWu6C48tZZZrtINWRElAcwzk4TLnL9USjKf3xm0= +github.com/linode/linodego v1.8.0/go.mod h1:heqhl91D8QTPVm2k9qZHP78zzbOdTFLXE9NJc3bcc50= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= -github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-ieproxy v0.0.1 h1:qiyop7gCflfhwCzGyeT0gro3sF9AIg9HU98JORTkqfI= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= -github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= github.com/mdlayher/apcupsd v0.0.0-20200608131503-2bf01da7bf1b h1:Kcr+kPbkWZHFHXwl87quXUAmavS4/IMgu2zck3aiE7k= github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 h1:YIHidb4LpHLt+cW1ezhU9T8ed6/K8sWbban61KMgeWI= github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= @@ -1108,9 +802,8 @@ github.com/microsoft/ApplicationInsights-Go v0.4.4 h1:G4+H9WNs6ygSCe6sUyxRc2U81T github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= -github.com/miekg/dns v1.1.48 h1:Ucfr7IIVyMBz4lRE8qmGUuZ4Wt3/ZGu9hmcMT3Uu4tQ= -github.com/miekg/dns v1.1.48/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= -github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= +github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= +github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989 h1:PS1dLCGtD8bb9RPKJrc8bS7qHL6JnW1CZvwzH9dPoUs= github.com/mindprince/gonvml v0.0.0-20190828220739-9ebdce4bb989/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY= github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= @@ -1122,37 +815,24 @@ github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXx github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.0.0 h1:fzU/JVNcaqHQEcVFAKeR41fkiLdIPrefOvVG1VZ96U0= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/ipvs v1.0.1 h1:aoZ7fhLTXgDbzVrAnvV+XbKOU8kOET7B3+xULDF/1o0= -github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= -github.com/moby/sys/mountinfo v0.4.0/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= -github.com/moby/sys/signal v0.6.0/go.mod h1:GQ6ObYZfqacOwTtlXvcmh9A26dVRul/hbOZn88Kg8Tg= -github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= -github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6BMgR/gFs= -github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= -github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -1162,12 +842,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= -github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mostynb/go-grpc-compression v1.1.16 h1:D9tGUINmcII049pxOj9dl32Fzhp26TrDVQXECoKJqQg= -github.com/mostynb/go-grpc-compression v1.1.17 h1:N9t6taOJN3mNTTi0wDf4e3lp/G/ON1TP67Pn0vTUA9I= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/multiplay/go-ts3 v1.0.1 h1:Ja8ho7UzUDNvNCwcDzPEPimLRub7MUqbD+sgMWkcR0A= @@ -1205,34 +881,20 @@ github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= -github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U= -github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc= github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= -github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 h1:mFqdkyNdSeLHK7Xx0UZBPoecNmhyiX45bZFMK54yBjk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0/go.mod h1:XfNw9cfGTgfMd3f5E8YC8KEool0pMGtL/sR1Vn+i2Kg= @@ -1248,38 +910,25 @@ github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0/go.mod h1:r3pq8CdJh+ugZR08pNrnVTO89JJO0xBrv+HFJoeHmLQ= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0 h1:n/vVF8cJVkAY7hgvEbUSyFMMek/gZ/I6FeswFLaGXPs= github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0/go.mod h1:VM0VtAFsTqvWhzEZnmUajEOlrl/s91LgYPh099yrtYg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.58.0 h1:/MUjXRmZp29tfAznIRnUswyBnSIcxF2F7Lhibi/3Ew8= github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 h1:x7EiYmJya8zHqRdiPXHDXxkImHjaN4tzQN4scapWqL8= github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0/go.mod h1:+/GN3xD2CZpegXNvz8LAQZBh+fJw5Nshry2UAbvyMXw= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 h1:Cd3rWFsteMbqXFEWH9yszGaLHY9aZqQyMQhxsjjnUYw= github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0/go.mod h1:pmEdRFPtxUhAOPQEF0daPwO2j47kIHIpRTs/54XVdSo= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 h1:kzOTdxkYNeBe3QQTJfHmPfssh/cc6Cj2m0WnBLIowis= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0/go.mod h1:WMGw+9m3podwRjyjYNLjGlrXDUrftmu3kYkOUbMOvEI= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.50.0/go.mod h1:SqejLi8vMhjM4MRfc05pow9D8ow/GVe4sKKlPq1i6E4= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.58.0 h1:kLJ5Wyy28bq3ekYAH4V4V3fIAqV5cxAEfRi699fCYxM= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0 h1:zavUPAdJbRk3SDaGHdLzzmwovBgmrCtFwdIPhiQLlwg= github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0/go.mod h1:5RdCZu9BBQF4Wce3fmwx4xTePKoJ+WyQ6ePXnOgpt2A= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= -github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= -github.com/opencontainers/go-digest v1.0.0-rc1.0.20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2-0.20211117181255-693428a734f5/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/runc v1.1.0 h1:O9+X96OcDjkmmZyfaG996kV7yq8HsoU2h1XRRQcefG8= github.com/opencontainers/runc v1.1.0/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc= -github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs= -github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE= -github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/openshift/api v0.0.0-20210521075222-e273a339932a h1:aBPwLqCg66SbQd+HrjB1GhgTfPtqSY4aeB022tEYmE0= @@ -1287,19 +936,14 @@ github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3 github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= @@ -1315,7 +959,6 @@ github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1-0.20171018195549-f15c970de5b7/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -1327,78 +970,54 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 h1:xoIK0ctDddBMnc74udxJYBqlo9Ylnsp1waqjLsnef20= github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M= -github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/alertmanager v0.24.0/go.mod h1:r6fy/D7FRuZh5YbnX6J3MBY0eI4Pb5yPYS7/bPSXXqI= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE= -github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common/assets v0.1.0/go.mod h1:D17UVUE12bHbim7HzwUvtqm6gwBEaDQ0F+hIGbFbccI= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= -github.com/prometheus/exporter-toolkit v0.7.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g= -github.com/prometheus/procfs v0.0.0-20180125133057-cb4147076ac7/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.0-20190522114515-bc1a522cf7b1/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.0.5/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731 h1:THs/itDqjnXLTblN7kE0QhcJ79IbokGJ5e06/WrwxCY= -github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731/go.mod h1:X/u6JAiaI9Fsu9t7cGXMZCERQHLJjiB01Pue8BXz14s= +github.com/prometheus/prometheus v0.37.0 h1:LgnE+97wnUK/qcmk5oHIqieJEKwhZtaSidyKpUyeats= +github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGOON44WyAp4Xqbbk= github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/riemann/riemann-go-client v0.5.0 h1:yPP7tz1vSYJkSZvZFCsMiDsHHXX57x8/fEX3qyEXuAA= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= -github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= @@ -1408,35 +1027,25 @@ github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= -github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 h1:ZFfeKAhIQiiOrQaI3/znw0gOmYpO28Tcu1YaqMa/jtQ= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e h1:CGjiMQ0wMH4wtNWrlj6kiTbkPt2F3rbYnhGX6TWLfco= -github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921 h1:58EBmR2dMNL2n/FnbQewK3D14nXr0V9CObDSvMJLq+Y= github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/showwin/speedtest-go v1.1.4 h1:pcY1W5LYZu44lH6Fuu80nu/Pj67n//VArlZudbAgR6E= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 h1:X886QgwZH5qr9HIQkk3mWcNEhUxx6D8rUZumzLV4Wiw= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= github.com/signalfx/golib/v3 v3.3.43 h1:GvzjE2WaYU3oPhoek52/5zYZ5tPnt05EXUmszSZct+E= github.com/signalfx/sapm-proto v0.7.2 h1:iM/y3gezQm1/j7JBS0gXhEJ8ROeneb6DY7n0OcnvLks= -github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= -github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= @@ -1448,65 +1057,42 @@ github.com/sleepinggenius2/gosmi v0.4.4/go.mod h1:l8OniPmd3bJzw0MXP2/qh7AhP/e+bT github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/snowflakedb/gosnowflake v1.6.2 h1:drZkX7Ve3qr3lLD/f0vxwesgJZfNerivknAvPRAMy88= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= -github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= +github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v1.0.0 h1:kuuDrUJFZL1QYL9hUNuCxNObNzB0bV/ZG5jV3RWAQgo= github.com/streadway/amqp v1.0.0/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= -github.com/stretchr/objx v0.0.0-20180129172003-8a3f7159479f/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo= github.com/tidwall/gjson v1.10.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= @@ -1515,23 +1101,12 @@ github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03O github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= -github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vapourismo/knx-go v0.0.0-20211128234507-8198fa17db36 h1:JBj2CqnFwBhI3XsdMNn9MjKvehog+p5QZihotqq0Zuo= -github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= -github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5 h1:+UB2BJA852UkGH42H+Oee69djmxS3ANzl2b/JtT1YiA= github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= -github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f h1:p4VB7kIXpOQvVn1ZaTIVp+3vuYAXFe3OJEvjbUYJLaA= @@ -1539,58 +1114,37 @@ github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f/go.mod h1:DD4vA1 github.com/vjeantet/grok v1.0.1 h1:2rhIR7J4gThTgcZ1m2JY4TrJZNgjn985U28kT2wQrJ4= github.com/vjeantet/grok v1.0.1/go.mod h1:ax1aAchzC6/QMXMcyzHQGZWaW1l195+uMYIkCWPCNIo= github.com/vmware/govmomi v0.27.3 h1:gwHHxKbMTNJON/3WPK3EsqZyQznTdHJAyRYPRSLm6R8= +github.com/vultr/govultr/v2 v2.17.2 h1:gej/rwr91Puc/tgh+j33p/BLR16UrIPnSr+AIwYWZQs= +github.com/vultr/govultr/v2 v2.17.2/go.mod h1:ZFOKGWmgjytfyjeyAdhQlSWwTjh2ig+X49cAp50dzXI= github.com/wavefronthq/wavefront-sdk-go v0.9.10 h1:L4eiEdHpudHTGwrJaPYaCXSjCYDex8FEKVqaprU2sY0= github.com/wavefronthq/wavefront-sdk-go v0.9.10/go.mod h1:ACJVXk0ksPHFkkTkXckqKEJGU3YDoAWjxTESkZlp+IE= -github.com/willf/bitset v1.1.11-0.20200630133818-d5bec3311243/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/wvanbergen/kafka v0.0.0-20171203153745-e2edea948ddf h1:TOV5PC6fIWwFOFra9xJfRXZcL2pLhMI8oNuDugNxg9Q= github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a h1:ILoU84rj4AQ3q6cjQvtb9jBjx4xzR/Riq/zYhmDQiOk= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= -github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/scram v1.1.0 h1:d70R37I0HrDLsafRrMBXyrD4lmQbCHE873t00Vr0gm0= github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= -github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= github.com/xdg/scram v1.0.3 h1:nTadYh2Fs4BK2xdldEa2g5bbaZp0/+1nJMMPtPxS/to= github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= -github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= -github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a h1:fZHgsYlfvtyqToslyjUt3VOPF4J7aK/3MPcK7xp3PDk= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= -go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= -go.mongodb.org/mongo-driver v1.8.3/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY= -go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1599,132 +1153,61 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.53.0 h1:p4XwnAltBnw/gCRTk+DHTJVGYLzD5cPHp+0XK/KKE/s= -go.opentelemetry.io/collector v0.53.0/go.mod h1:MMSqz2ImXjLrZB26cC8vrtgnjsza3hpc760NNjsmjwE= go.opentelemetry.io/collector v0.58.0 h1:ofl5qa+vTV69PC9NaZKQjE7MP/49iclDKRppl00WgZg= go.opentelemetry.io/collector v0.58.0/go.mod h1:U3TE477WDi3CYhmE7JGinnpIg8qMH1KCBkRmk3BxKyw= go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= -go.opentelemetry.io/collector/pdata v0.53.0 h1:jezCyHu/LXs4P/GzKObCabU2/OUTivNBlQHGPAo/dZo= -go.opentelemetry.io/collector/pdata v0.53.0/go.mod h1:25b+xH0uJwp8H3f0a1V+OQfxbhYVds6Rf1Ul+HFCGo4= go.opentelemetry.io/collector/pdata v0.58.0 h1:SKWw4vjd6ZjCuvsCvEzqwBaxvov4YbXnnXkc9C4xMqM= go.opentelemetry.io/collector/pdata v0.58.0/go.mod h1:iMv7Pz+hRthi30rkYkwLVusxQ94GU4pPJgFq7gjGcBk= -go.opentelemetry.io/collector/semconv v0.53.0 h1:J1lVnFp1VyNKU63rc7csY9/54Tjm9BlLylXLjPimf7s= -go.opentelemetry.io/collector/semconv v0.53.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= -go.opentelemetry.io/collector/semconv v0.56.0/go.mod h1:EH1wbDvTyqKpKBBpoMIe0KQk2plCcFS66Mo17WtR7CQ= go.opentelemetry.io/collector/semconv v0.58.0 h1:wk9KXVnt8IRdNzD9mmdW3d1M/IJ3HyLp1Lz2ZY1fBCM= go.opentelemetry.io/collector/semconv v0.58.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= -go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.34.0 h1:PNEMW4EvpNQ7SuoPFNkvbZqi1STkTPKq+8vfoMl/6AE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= -go.opentelemetry.io/contrib/zpages v0.32.0 h1:AVKTx5ppWDaem7A61HFsO1T3CK/t6kFRQoZQMj0/TW4= go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= -go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= -go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= -go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= -go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= -go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= -go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.6.1/go.mod h1:NEu79Xo32iVb+0gVNV8PMd7GoWqnyDXRlj04yFjqz40= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.3.0/go.mod h1:hO1KLR7jcKaDDKDkvI9dP/FIhpmna5lkqPUQdEjFAM8= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.6.1/go.mod h1:YJ/JbY5ag/tSQFXzH3mtDmHqzF3aFn3DI/aB1n7pt4w= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1:keUU7UfnwWTWpJ+FWnyqmogPa82nuU5VUANFq49hlMY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE= -go.opentelemetry.io/otel/exporters/prometheus v0.30.0 h1:YXo5ZY5nofaEYMCMTTMaRH2cLDZB8+0UGuk5RwMfIo0= -go.opentelemetry.io/otel/exporters/prometheus v0.30.0/go.mod h1:qN5feW+0/d661KDtJuATEmHtw5bKBK7NSvNEP927zSs= +go.opentelemetry.io/otel/exporters/prometheus v0.31.0 h1:jwtnOGBM8dIty5AVZ+9ZCzZexCea3aVKmUfZAQcHqxs= go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= -go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= -go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= -go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= -go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= -go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= -go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= -go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= -go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME= -go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8= +go.opentelemetry.io/otel/sdk/metric v0.31.0 h1:2sZx4R43ZMhJdteKAlKoHvRgrMp53V1aRxvEf5lCq8Q= go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= -go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= -go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= -go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= -go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= -go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= -go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= -go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= -go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= -golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 h1:Tgea0cVUD0ivh5ADBX4WwuI12DUd2to3nCYe2eayMIw= +golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1763,33 +1246,26 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1806,11 +1282,9 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -1820,22 +1294,19 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4= golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= +golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1854,27 +1325,29 @@ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= +golang.org/x/oauth2 v0.0.0-20220608161450-d0670ef3b1eb/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= +golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 h1:uBgVQYJLi/m8M0wzp+aGwBWt90gMRoOVf+aWTW10QHI= +golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26/go.mod h1:jaDAt6Dkxork7LmZnYtzbRWj0W47D86a3TGe0YHBvmE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= +golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1883,22 +1356,14 @@ golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190514135907-3a4b5fb9f71f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190522044717-8097e1b27ff5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190531175056-4c3a928424d2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190812073006-9eafafc0a87e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1906,12 +1371,10 @@ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191210023423-ac6580df4449/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1932,27 +1395,16 @@ golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200728102440-3e129f6d46b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200817155316-9781c653f443/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200916030750-2334cc1a136f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200922070232-aee5d888a860/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1961,13 +1413,10 @@ golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1976,16 +1425,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1996,14 +1440,17 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220328115105-d36c6a25d886/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220412211240-33da011f77ad h1:ntjMns5wyP/fN65tdBD4g8J5w8n015+iIIs9rtjXkY0= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= +golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= +golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -2017,20 +1464,15 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 h1:M73Iuj3xbbb9Uk1DYhzydthsj6oOd6l9bpuFcNoUvTs= -golang.org/x/time v0.0.0-20220224211638-0e9765cccd65/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -2038,25 +1480,18 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190706070813-72ffa07ba3db/go.mod h1:jcCCGcm9btYwXyDqrUWc6MKQKKGJCWEQ3AfLSRIbEuI= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -2080,7 +1515,6 @@ golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200616133436-c1934b75d054/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= @@ -2088,12 +1522,10 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= @@ -2103,15 +1535,16 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= +golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= +golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f h1:GGU+dLjvlC3qDwqYgL6UgRmHXhOOgns0bZu2Ty5mm6U= golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0= +golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8= gonum.org/v1/gonum v0.9.3 h1:DnoIG+QAMaF5NvxnGe/oKsgKcAc6PcUyl8q0VetfQ8s= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -2148,8 +1581,12 @@ google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQ google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= google.golang.org/api v0.71.0/go.mod h1:4PyU6e6JogV1f9eA4voyrTY2batOLdgZ5qZ5HOCc4j8= google.golang.org/api v0.74.0/go.mod h1:ZpfMZOVRMywNyvJFeqL9HRWBgAuRfSjJFpe9QtRRyDs= -google.golang.org/api v0.77.0 h1:msijLTxwkJ7Jub5tv9KBVCKtHOQwnvnvkX7ErFFCVxY= -google.golang.org/api v0.77.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.75.0/go.mod h1:pU9QmyHLnzlpar1Mjt4IbapUCy8J+6HD6GeELN69ljA= +google.golang.org/api v0.78.0/go.mod h1:1Sg78yoMLOhlQTeF+ARBoytAcH1NNyyl390YMy6rKmw= +google.golang.org/api v0.80.0/go.mod h1:xY3nI94gbvBrE0J6NHXhxOmW97HG7Khjkku6AFB3Hyg= +google.golang.org/api v0.84.0/go.mod h1:NTsGnUFJMYROtiquksZHBWtHfeMC7iYthki7Eq3pa8o= +google.golang.org/api v0.86.0 h1:ZAnyOHQFIuWso1BodVfSaRyffD74T9ERGFa3k1fNk/U= +google.golang.org/api v0.86.0/go.mod h1:+Sem1dnrKlrXMR/X0bPnMWyluQe4RsNoYfmNLhOIkzw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -2164,7 +1601,6 @@ google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69/go.mod h1:z3L6/3dTEVtUr6QSP8miRzeRqwQOioJ9I66odjN4I7s= google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= @@ -2182,13 +1618,11 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2196,7 +1630,6 @@ google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -2204,6 +1637,7 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210329143202-679c6ae281ee/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= @@ -2233,19 +1667,26 @@ google.golang.org/genproto v0.0.0-20220222213610-43724f9ea8cf/go.mod h1:kGP+zUP2 google.golang.org/genproto v0.0.0-20220304144024-325a89244dc8/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220310185008-1973136f34c6/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= google.golang.org/genproto v0.0.0-20220324131243-acbaeb5b85eb/go.mod h1:hAL49I2IFola2sVEjAn7MEwsja0xp51I0tlGAf9hz4E= +google.golang.org/genproto v0.0.0-20220329172620-7be39ac1afc7/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 h1:myaecH64R0bIEDjNORIel4iXubqzaHU1K2z8ajBwWcM= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220429170224-98d788798c3e/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= +google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220518221133-4f43b3371335/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 h1:W70HjnmXFJm+8RNjOpIDYW2nKsSi/af0VvIZUtYkwuU= +google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -2269,11 +1710,10 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= @@ -2292,11 +1732,9 @@ google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX7 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -2304,34 +1742,26 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fatih/pool.v2 v2.0.0 h1:xIFeWtxifuQJGk/IEPKsTduEKcKvPmhoiVDGpC40nKg= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo= gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y2O4MU= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= +gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= +gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/olivere/elastic.v5 v5.0.86 h1:xFy6qRCGAmo5Wjx96srho9BitLhZl2fcnpuidPwduXM= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/square/go-jose.v2 v2.3.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= -gopkg.in/telebot.v3 v3.0.0/go.mod h1:7rExV8/0mDDNu9epSrDm/8j22KLaActH1Tbee6YjzWg= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 h1:yiW+nvdHb9LVqSHQBXfZCieqV4fzYhNBql77zY0ykqs= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -2342,15 +1772,12 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= gotest.tools/v3 v3.1.0 h1:rVV8Tcg/8jHUkPUorwjaMTtemIMVXfIPKiOqnhEhakk= gotest.tools/v3 v3.1.0/go.mod h1:fHy7eyTmJFO5bQbUsEGQ1v4m2J3Jz9eWL54TP2/ZuYQ= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -2360,54 +1787,17 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= -k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= -k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= -k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= -k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8= -k8s.io/api v0.23.6 h1:yOK34wbYECH4RsJbQ9sfkFK3O7f/DUHRlzFehkqZyVw= -k8s.io/api v0.23.6/go.mod h1:1kFaYxGCFHYp3qd6a85DAj/yW8aVD6XLZMqJclkoi9g= k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= -k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= -k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0= -k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= -k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= -k8s.io/apimachinery v0.23.6 h1:RH1UweWJkWNTlFx0D8uxOpaU1tjIOvVVWV/bu5b3/NQ= -k8s.io/apimachinery v0.23.6/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= -k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= -k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= -k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= -k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= -k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= -k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= -k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= -k8s.io/client-go v0.23.5 h1:zUXHmEuqx0RY4+CsnkOn5l0GU+skkRXKGJrhmE2SLd8= -k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4= k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= -k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= -k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= -k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= -k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= -k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= -k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= -k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= -k8s.io/cri-api v0.23.1/go.mod h1:REJE3PSU0h/LOV1APBrupxrEJqnoxZC8KWzkBUHwrK4= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= @@ -2416,27 +1806,14 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= -k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.40.1 h1:P4RRucWk/lFOlDdkAr3mc7iWFkgKrZY9qZMAgek06S4= -k8s.io/klog/v2 v2.40.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= -k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= +k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= -k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= -k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5fZ/shhbrgPUxDAE= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= @@ -2460,20 +1837,12 @@ modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 h1:fD1pz4yfdADVNfFmcP2aBEtudwUQ1AlLnRBALr33v3s= -sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= -sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= +sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= From c78a6f763a91e08ff599cea06f5e82169c55f749 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Mon, 22 Aug 2022 20:09:55 -0400 Subject: [PATCH 006/144] fix build errors --- internal/k8sCommon/k8sclient/endpoint_test.go | 7 ------- internal/k8sCommon/k8sclient/node_test.go | 3 --- plugins/inputs/k8sapiserver/k8sapiserver.go | 2 +- translator/tocwconfig/toyamlconfig/toyamlconfig.go | 5 +---- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/internal/k8sCommon/k8sclient/endpoint_test.go b/internal/k8sCommon/k8sclient/endpoint_test.go index 2b41d6d45b..5704745163 100644 --- a/internal/k8sCommon/k8sclient/endpoint_test.go +++ b/internal/k8sCommon/k8sclient/endpoint_test.go @@ -32,7 +32,6 @@ var endpointsArray = []interface{}{ Labels: map[string]string{ "app": "guestbook", }, - ClusterName: "", }, Subsets: []v1.EndpointSubset{ { @@ -102,7 +101,6 @@ var endpointsArray = []interface{}{ CreationTimestamp: metav1.Time{ Time: time.Now(), }, - ClusterName: "", }, Subsets: []v1.EndpointSubset{ { @@ -142,7 +140,6 @@ var endpointsArray = []interface{}{ "app": "redis", "role": "master", }, - ClusterName: "", }, Subsets: []v1.EndpointSubset{ { @@ -188,7 +185,6 @@ var endpointsArray = []interface{}{ "app": "redis", "role": "slave", }, - ClusterName: "", }, Subsets: []v1.EndpointSubset{ { @@ -247,7 +243,6 @@ var endpointsArray = []interface{}{ Annotations: map[string]string{ "control-plane.alpha.kubernetes.io/leader": "{\"holderIdentity\":\"ip-10-0-189-120.eu-west-1.compute.internal_89407f85-57e1-11e9-b6ea-02eb484bead6\",\"leaseDurationSeconds\":15,\"acquireTime\":\"2019-04-05T20:34:54Z\",\"renewTime\":\"2019-05-06T20:04:02Z\",\"leaderTransitions\":1}", }, - ClusterName: "", }, }, &v1.Endpoints{ @@ -268,7 +263,6 @@ var endpointsArray = []interface{}{ "kubernetes.io/cluster-service": "true", "kubernetes.io/name": "CoreDNS", }, - ClusterName: "", }, Subsets: []v1.EndpointSubset{ { @@ -332,7 +326,6 @@ var endpointsArray = []interface{}{ Annotations: map[string]string{ "control-plane.alpha.kubernetes.io/leader": "{\"holderIdentity\":\"ip-10-0-189-120.eu-west-1.compute.internal_949a4400-57e1-11e9-a7bb-02eb484bead6\",\"leaseDurationSeconds\":15,\"acquireTime\":\"2019-04-05T20:34:57Z\",\"renewTime\":\"2019-05-06T20:04:02Z\",\"leaderTransitions\":1}", }, - ClusterName: "", }, }, } diff --git a/internal/k8sCommon/k8sclient/node_test.go b/internal/k8sCommon/k8sclient/node_test.go index b2e6eb527f..324c590e3d 100644 --- a/internal/k8sCommon/k8sclient/node_test.go +++ b/internal/k8sCommon/k8sclient/node_test.go @@ -39,7 +39,6 @@ var nodeArray = []interface{}{ "node.alpha.kubernetes.io/ttl": "0", "volumes.kubernetes.io/controller-managed-attach-detach": "true", }, - ClusterName: "", }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -130,7 +129,6 @@ var nodeArray = []interface{}{ "node.alpha.kubernetes.io/ttl": "0", "volumes.kubernetes.io/controller-managed-attach-detach": "true", }, - ClusterName: "", }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ @@ -221,7 +219,6 @@ var nodeArray = []interface{}{ "node.alpha.kubernetes.io/ttl": "0", "volumes.kubernetes.io/controller-managed-attach-detach": "true", }, - ClusterName: "", }, Status: v1.NodeStatus{ Conditions: []v1.NodeCondition{ diff --git a/plugins/inputs/k8sapiserver/k8sapiserver.go b/plugins/inputs/k8sapiserver/k8sapiserver.go index 3b77764910..a196bbc78d 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver.go @@ -122,7 +122,7 @@ func (k *K8sAPIServer) Start(acc telegraf.Accumulator) error { } lock, err := resourcelock.New( - resourcelock.ConfigMapsResourceLock, + resourcelock.ConfigMapsLeasesResourceLock, lockNamespace, lockName, k8sclient.Get().ClientSet.CoreV1(), k8sclient.Get().ClientSet.CoordinationV1(), diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index ab9b11b9cb..2096e4f51e 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -9,14 +9,11 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/service" "gopkg.in/yaml.v3" "log" ) -import ( - "go.opentelemetry.io/collector/service" -) - const ( receiversKeyName = "receivers" exportersKeyName = "exporters" From fbfd288807e4ff58c0be8427ecd2a9564f7524a7 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 15:16:26 -0400 Subject: [PATCH 007/144] use diff context for otel --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index b2a543a410..96b181cb27 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -354,7 +354,7 @@ func runAgent(ctx context.Context, if err != nil { return err } - go col.Run(ctx) + go col.Run(context.Background()) if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) From 3ab3ed0972cd7ba4f2cde682ba1b9eb17113b716 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 15:32:28 -0400 Subject: [PATCH 008/144] add logging --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 96b181cb27..4477a9946e 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -343,6 +343,7 @@ func runAgent(ctx context.Context, agentinfo.OutputPlugins = c.OutputNames() // inject OTel + log.Println("creating otel sidecar") factories, err := NewFactories(c) if err != nil { return err @@ -352,6 +353,7 @@ func runAgent(ctx context.Context, } col, err := otelservice.New(params) if err != nil { + log.Println("failed to create new otel agent", err) return err } go col.Run(context.Background()) @@ -373,8 +375,10 @@ func runAgent(ctx context.Context, }() } } + log.Println("creating new logs agent") logAgent := logs.NewLogAgent(c) go logAgent.Run(ctx) + log.Println("running telegraf agent") return ag.Run(ctx) } From bb3d5d2748068ba699f126ff022d437f63f55570 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 15:52:29 -0400 Subject: [PATCH 009/144] add config provider --- .../amazon-cloudwatch-agent.go | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 4477a9946e..b2c8a2dea2 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -12,6 +12,10 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/provider/envprovider" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/processor/batchprocessor" "io/ioutil" @@ -346,17 +350,35 @@ func runAgent(ctx context.Context, log.Println("creating otel sidecar") factories, err := NewFactories(c) if err != nil { + log.Println("failed to create OTel factories") + return err + } + providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New()} + + mapProviders := make(map[string]confmap.Provider, len(providers)) + for _, provider := range providers { + mapProviders[provider.Scheme()] = provider + } + configParams := otelservice.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + Providers: mapProviders, + }, + } + otelProvider, err := otelservice.NewConfigProvider(configParams) + if err != nil { + log.Println("failed to create OTel config provider") return err } params := otelservice.CollectorSettings{ - Factories: factories, + Factories: factories, + ConfigProvider: otelProvider, } col, err := otelservice.New(params) if err != nil { log.Println("failed to create new otel agent", err) return err } - go col.Run(context.Background()) + go col.Run(ctx) if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) From 7a62ef86b809f91ecd2d670429b2f3f0ca6bba68 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 15:57:52 -0400 Subject: [PATCH 010/144] add file path URI --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index b2c8a2dea2..30cbeff2e9 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -361,6 +361,7 @@ func runAgent(ctx context.Context, } configParams := otelservice.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ + URIs: []string{"/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-config.yaml"}, Providers: mapProviders, }, } From fc1e03d3d0ff027fddcd7b46660b856fd96bde5c Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Thu, 25 Aug 2022 16:16:02 -0400 Subject: [PATCH 011/144] point to arbitrary agent YAML so it doesn't rely on the translator --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 30cbeff2e9..07d8409d5e 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -361,7 +361,7 @@ func runAgent(ctx context.Context, } configParams := otelservice.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{"/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-config.yaml"}, + URIs: []string{"/tmp/consolidated-agent-container-insights.yml"}, Providers: mapProviders, }, } From 5a5bc267f7a1cc945df9fcd0c8041129ef6a82b8 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 26 Aug 2022 09:15:29 -0400 Subject: [PATCH 012/144] add waitgroup --- .../source/Dockerfile | 7 ++++ .../amazon-cloudwatch-agent.go | 41 +++++++++++++++---- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile index 6615450b45..8fa24a5d1b 100644 --- a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile +++ b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile @@ -17,11 +17,18 @@ COPY go.mod /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ COPY go.sum /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ RUN go mod download -x COPY . /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ +# TODO: this is only for container insights testing +COPY consolidated-agent.yml /tmp +# end TODO + RUN make build-for-docker-${TARGETARCH} # Install cert and binaries FROM $CERT_IMAGE as cert +# TODO: this is only for container insights testing +COPY --from=builder /tmp /tmp + # Need to repeat the ARG after each FROM ARG TARGETARCH RUN mkdir -p /opt/aws/amazon-cloudwatch-agent/etc diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 07d8409d5e..eb34c6daad 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -18,6 +18,7 @@ import ( "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/processor/batchprocessor" + "go.uber.org/multierr" "io/ioutil" "log" "net/http" @@ -28,6 +29,7 @@ import ( "runtime" "sort" "strings" + "sync" "syscall" "time" @@ -234,6 +236,8 @@ func runAgent(ctx context.Context, inputFilters []string, outputFilters []string, ) error { + wg := sync.WaitGroup{} // for running both telegraf and otel agents at the same time + envConfigPath, err := getEnvConfigPath(*fConfig, *fEnvConfig) if err != nil { return err @@ -348,6 +352,12 @@ func runAgent(ctx context.Context, // inject OTel log.Println("creating otel sidecar") + otelInfo := component.BuildInfo{ + Command: "ccwa-otel", + Description: "OTel component of CCWA", + Version: agentinfo.FullVersion(), + } + factories, err := NewFactories(c) if err != nil { log.Println("failed to create OTel factories") @@ -372,14 +382,19 @@ func runAgent(ctx context.Context, } params := otelservice.CollectorSettings{ Factories: factories, + BuildInfo: otelInfo, ConfigProvider: otelProvider, } - col, err := otelservice.New(params) - if err != nil { - log.Println("failed to create new otel agent", err) - return err - } - go col.Run(ctx) + otelCommand := otelservice.NewCommand(params) + wg.Add(1) + var otelRunErr error + go func() { + otelRunErr = otelCommand.Execute() + if otelRunErr != nil { + log.Println("otel agent exited", otelRunErr) + } + wg.Done() + }() if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) @@ -402,7 +417,19 @@ func runAgent(ctx context.Context, logAgent := logs.NewLogAgent(c) go logAgent.Run(ctx) log.Println("running telegraf agent") - return ag.Run(ctx) + var telegrafRunErr error + wg.Add(1) + go func() { + telegrafRunErr = ag.Run(ctx) + if telegrafRunErr != nil { + log.Println("telegraf agent exited", telegrafRunErr) + } + wg.Done() + }() + + wg.Wait() + err = multierr.Append(otelRunErr, telegrafRunErr) + return err } func NewFactories(c *config.Config) (component.Factories, error) { From 83497dd699e7fe724c28d3d34a1d876667d52acc Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 26 Aug 2022 12:34:20 -0400 Subject: [PATCH 013/144] remove telegraf agent run --- .../amazon-cloudwatch-agent.go | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index eb34c6daad..ee6a75eadf 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -18,7 +18,6 @@ import ( "go.opentelemetry.io/collector/confmap/provider/yamlprovider" "go.opentelemetry.io/collector/exporter/loggingexporter" "go.opentelemetry.io/collector/processor/batchprocessor" - "go.uber.org/multierr" "io/ioutil" "log" "net/http" @@ -29,7 +28,6 @@ import ( "runtime" "sort" "strings" - "sync" "syscall" "time" @@ -236,7 +234,7 @@ func runAgent(ctx context.Context, inputFilters []string, outputFilters []string, ) error { - wg := sync.WaitGroup{} // for running both telegraf and otel agents at the same time + //wg := sync.WaitGroup{} // for running both telegraf and otel agents at the same time envConfigPath, err := getEnvConfigPath(*fConfig, *fEnvConfig) if err != nil { @@ -369,6 +367,7 @@ func runAgent(ctx context.Context, for _, provider := range providers { mapProviders[provider.Scheme()] = provider } + // TODO: this uses a hard coded path to some other expected OTEL pipeline config. configParams := otelservice.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ URIs: []string{"/tmp/consolidated-agent-container-insights.yml"}, @@ -386,15 +385,15 @@ func runAgent(ctx context.Context, ConfigProvider: otelProvider, } otelCommand := otelservice.NewCommand(params) - wg.Add(1) - var otelRunErr error - go func() { - otelRunErr = otelCommand.Execute() - if otelRunErr != nil { - log.Println("otel agent exited", otelRunErr) - } - wg.Done() - }() + //wg.Add(1) + //var otelRunErr error + //go func() { + // otelRunErr = otelCommand.Execute() + // if otelRunErr != nil { + // log.Println("otel agent exited", otelRunErr) + // } + // wg.Done() + //}() if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) @@ -416,20 +415,23 @@ func runAgent(ctx context.Context, log.Println("creating new logs agent") logAgent := logs.NewLogAgent(c) go logAgent.Run(ctx) - log.Println("running telegraf agent") - var telegrafRunErr error - wg.Add(1) - go func() { - telegrafRunErr = ag.Run(ctx) - if telegrafRunErr != nil { - log.Println("telegraf agent exited", telegrafRunErr) - } - wg.Done() - }() - - wg.Wait() - err = multierr.Append(otelRunErr, telegrafRunErr) - return err + //log.Println("running telegraf agent") + //var telegrafRunErr error + //wg.Add(1) + //go func() { + // telegrafRunErr = ag.Run(ctx) + // if telegrafRunErr != nil { + // log.Println("telegraf agent exited", telegrafRunErr) + // } + // wg.Done() + //}() + // + //wg.Wait() + //err = multierr.Append(otelRunErr, telegrafRunErr) + //return err + + // TODO: for testing + return otelCommand.Execute() } func NewFactories(c *config.Config) (component.Factories, error) { From 35c3ce5df12978035902f0c511ad3a5a8518c56c Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 26 Aug 2022 12:47:48 -0400 Subject: [PATCH 014/144] change from command to collector run --- .../amazon-cloudwatch-agent.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index ee6a75eadf..1649b313ed 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -358,7 +358,7 @@ func runAgent(ctx context.Context, factories, err := NewFactories(c) if err != nil { - log.Println("failed to create OTel factories") + log.Println("failed to create OTel factories", err) return err } providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New()} @@ -376,7 +376,7 @@ func runAgent(ctx context.Context, } otelProvider, err := otelservice.NewConfigProvider(configParams) if err != nil { - log.Println("failed to create OTel config provider") + log.Println("failed to create OTel config provider", err) return err } params := otelservice.CollectorSettings{ @@ -384,7 +384,12 @@ func runAgent(ctx context.Context, BuildInfo: otelInfo, ConfigProvider: otelProvider, } - otelCommand := otelservice.NewCommand(params) + log.Println("creating otel service") + col, err := otelservice.New(params) + if err != nil { + log.Println("failed to create otel service", err) + return err + } //wg.Add(1) //var otelRunErr error //go func() { @@ -431,7 +436,7 @@ func runAgent(ctx context.Context, //return err // TODO: for testing - return otelCommand.Execute() + return col.Run(ctx) } func NewFactories(c *config.Config) (component.Factories, error) { From abe8e67105ab4847e36f8c38ce480955fca4e512 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Mon, 29 Aug 2022 09:00:39 -0400 Subject: [PATCH 015/144] proved working --- .../cloudwatch-agent-dockerfile/source/Dockerfile | 3 ++- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile index 8fa24a5d1b..b8f465eca5 100644 --- a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile +++ b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile @@ -18,7 +18,8 @@ COPY go.sum /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ RUN go mod download -x COPY . /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ # TODO: this is only for container insights testing -COPY consolidated-agent.yml /tmp +RUN mkdir -p /tmp +COPY consolidated-agent.yml /tmp/consolidated-agent-container-insights.yml # end TODO RUN make build-for-docker-${TARGETARCH} diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 1649b313ed..71b5467610 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -374,6 +374,7 @@ func runAgent(ctx context.Context, Providers: mapProviders, }, } + log.Println("creating otel config provider") otelProvider, err := otelservice.NewConfigProvider(configParams) if err != nil { log.Println("failed to create OTel config provider", err) From 5c81bdcf16ab8db4d1b408c1747a36c12d1b6eac Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 30 Aug 2022 15:23:36 -0400 Subject: [PATCH 016/144] got ecs config translation test working --- consolidated-agent.yml | 51 +++++ .../sampleConfig/log_ecs_metric_only.yaml | 70 ++++++- translator/tocwconfig/tocwconfig_test.go | 15 +- .../toyamlconfig/ecs/convert_to_otel.go | 57 ++++++ .../toyamlconfig/ecs/convert_to_otel_test.go | 7 + .../toyamlconfig/otelnative/otel.go | 32 +++ .../translate/awscontainerinsightreceiver.go | 139 +++++++++++++ .../awscontainerinsightreceiver_test.go | 191 ++++++++++++++++++ .../otelnative/translate/emf_config.yml | 32 +++ .../tocwconfig/toyamlconfig/toyamlconfig.go | 127 ++++++++---- 10 files changed, 668 insertions(+), 53 deletions(-) create mode 100644 consolidated-agent.yml create mode 100644 translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go create mode 100644 translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go create mode 100644 translator/tocwconfig/toyamlconfig/otelnative/otel.go create mode 100644 translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go create mode 100644 translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go create mode 100644 translator/tocwconfig/toyamlconfig/otelnative/translate/emf_config.yml diff --git a/consolidated-agent.yml b/consolidated-agent.yml new file mode 100644 index 0000000000..67748ec65e --- /dev/null +++ b/consolidated-agent.yml @@ -0,0 +1,51 @@ +receivers: + awscontainerinsightreceiver: + collection_interval: 60s + container_orchestrator: ecs + +processors: + batch/metrics: + timeout: 60s + +exporters: + awsemf: + namespace: ECS/ContainerInsights + log_group_name: '/aws/ecs/containerinsights/{ClusterName}/performance' + log_stream_name: 'instanceTelemetry/{ContainerInstanceId}' + resource_to_telemetry_conversion: + enabled: true + dimension_rollup_option: NoDimensionRollup + parse_json_encoded_attr_values: [Sources] + metric_declarations: + # instance metrics + - dimensions: [ [ ContainerInstanceId, InstanceId, ClusterName] ] + metric_name_selectors: + - instance_cpu_reserved_capacity + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_network_total_bytes + - instance_number_of_running_tasks + - dimensions: [ [ClusterName] ] + metric_name_selectors: + - instance_cpu_limit + - instance_cpu_reserved_capacity + - instance_cpu_usage_total + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_limit + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_memory_working_set + - instance_network_total_bytes + - instance_number_of_running_tasks + logging: + loglevel: debug + +service: + pipelines: + metrics: + receivers: [ awscontainerinsightreceiver] + processors: [ batch/metrics ] + exporters: [ awsemf, logging ] \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index a903b815d5..e164959e6f 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -1,14 +1,62 @@ exporters: - cloudwatchlogs: {} + awsemf/containerinsights: + dimension_rollup_option: NoDimensionRollup + log_group_name: '/aws/ecs/containerinsights/{ClusterName}/performance' + log_stream_name: 'instanceTelemetry/{ContainerInstanceId}' + metric_declarations: + # instance metrics + - dimensions: [ [ ContainerInstanceId, InstanceId, ClusterName ] ] + metric_name_selectors: + - instance_cpu_reserved_capacity + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_network_total_bytes + - instance_number_of_running_tasks + - dimensions: [ [ ClusterName ] ] + metric_name_selectors: + - instance_cpu_limit + - instance_cpu_reserved_capacity + - instance_cpu_usage_total + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_limit + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_memory_working_set + - instance_network_total_bytes + - instance_number_of_running_tasks + namespace: ECS/ContainerInsights + parse_json_encoded_attr_values: [ Sources ] + resource_to_telemetry_conversion: + enabled: true + cloudwatchlogs: + - endpoint_override: https://fake_endpoint + force_flush_interval: 5s + log_stream_name: fake-host-name + region: us-west-2 + tagexclude: + - metricPath + tagpass: + metricPath: + - logs + - logs_socket_listener + +processors: + batch/containerinsights: + timeout: 30s receivers: - cadvisor: {} - socket_listener: {} + awscontainerinsightreceiver/containerinsights: + collection_interval: 30s + container_orchestrator: ecs service: - pipelines: - metrics: - exporters: - - cloudwatchlogs - processors: [] - receivers: - - cadvisor - - socket_listener + pipelines: + metrics: + exporters: + - cloudwatchlogs + - awsemf/containerinsights + processors: + - batch/containerinsights + receivers: + - awscontainerinsightreceiver/containerinsights diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index 6443e95e98..583a619eeb 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -277,14 +277,25 @@ func verifyToTomlTranslation(t *testing.T, config interface{}, desiredTomlPath s } func verifyToYamlTranslation(t *testing.T, config interface{}, expectedYamlFilePath string) { + t.Helper() _, actual := toyamlconfig.ToYamlConfig(config) bs, err := ioutil.ReadFile(expectedYamlFilePath) assert.NoError(t, err) bf := bytes.NewReader(bs) decoder := yaml.NewDecoder(bf) var expect interface{} - err1 := decoder.Decode(&expect) - assert.NoError(t, err1) + err = decoder.Decode(&expect) + assert.NoError(t, err) + + // TODO: output for testing verification + expectB, err := yaml.Marshal(expect) + assert.NoError(t, err) + t.Log("Expected:\n", string(expectB)) + + actualB, err := yaml.Marshal(actual) + assert.NoError(t, err) + t.Log("Actual:\n", string(actualB)) + opt := cmpopts.SortSlices(func(x, y interface{}) bool { return pretty.Sprint(x) < pretty.Sprint(y) }) diff --git a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go new file mode 100644 index 0000000000..2029b81f14 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go @@ -0,0 +1,57 @@ +package ecs + +import ( + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative/translate" +) + +var ( + // look for the components to determine if the agent config uses ECS, and requires + // Container Insights configuration in the OTel YAML file + ecsPluginIndicators = []string{"ecsdecorator"} + + // plugins by name, grouped by component (input, processor, output) that need to be operated on, + // in order to convert the Telegraf plugins to use OTel natively + translator = translate.AwsContainerInsightReceiver{} +) + +func UsesECSConfig(plugins ...map[string]interface{}) bool { + for _, component := range plugins { + for key := range component { + for _, translatable := range ecsPluginIndicators { + if key == translatable { + return true + } + } + } + } + return false +} + +func TranslateReceivers(inputs, processors, outputs map[string]interface{}) map[string]interface{} { + return translator.Receivers(inputs, processors, outputs) +} + +func TranslateProcessors(inputs, processors, outputs map[string]interface{}) map[string]interface{} { + return translator.Processors(inputs, processors, outputs) +} + +func TranslateExporters(inputs, processors, outputs map[string]interface{}) map[string]interface{} { + return translator.Exporters(inputs, processors, outputs) +} + +//func PluginsToComponents(plugins ...map[string]interface{}) ( +// map[config.ComponentID]config.Receiver, +// map[config.ComponentID]config.Processor, +// map[config.ComponentID]config.Exporter) { +// procMap := make(map[config.ComponentID]config.Processor) +// for _, inputs := range plugins { +// for input := range inputs { +// fmt.Printf("Found plugin %s\n", input) +// // TODO: how do input configs get propagated here? +// id := config.NewComponentID(config.Type(input)) +// hc := config.NewProcessorSettings(id) +// procMap[id] = &hc +// } +// } +// return procMap +//} diff --git a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go new file mode 100644 index 0000000000..33701d4dd9 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go @@ -0,0 +1,7 @@ +package ecs + +import "testing" + +func TestUsesECS(t *testing.T) { + t.FailNow() +} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/otel.go b/translator/tocwconfig/toyamlconfig/otelnative/otel.go new file mode 100644 index 0000000000..3bc2d38093 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/otelnative/otel.go @@ -0,0 +1,32 @@ +package otelnative + +const ( + InputsKey = "inputs" + ProcessorsKey = "processors" + OutputsKey = "outputs" +) + +// NativeOTel defines a way to translate a set of Telegraf plugins into its equivalent +// set of OpenTelemetry receivers, processors, and exporters. +type NativeOTel interface { + // Name is the identifier for plugins that are output from this converter + Name() string + // Introduces supplies a map of plugin names that are expected to be added during the + // different translation functions + Introduces() map[string][]string + // Replaces supplies a map of plugin names that are expected to be removed during the + // different translation functions + Replaces() map[string][]string + // Receivers translates the telegraf plugins and returns the expected "receivers" as + // a mutated version of the in map. This should only modify the plugins listed out in + // the Introduces() and Replaces() functions + Receivers(in, proc, out map[string]interface{}) map[string]interface{} + // Processors translates the telegraf plugins and returns the expected "processors" as + // a mutated version of the proc map. This should only modify the plugins listed out in + // the Introduces() and Replaces() functions + Processors(in, proc, out map[string]interface{}) map[string]interface{} + // Exporters translates the telegraf plugins and returns the expected "exporters" as + // a mutated version of the out map. This should only modify the plugins listed out in + // the Introduces() and Replaces() functions + Exporters(in, proc, out map[string]interface{}) map[string]interface{} +} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go new file mode 100644 index 0000000000..6a50bc300b --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go @@ -0,0 +1,139 @@ +package translate + +import ( + _ "embed" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" + "gopkg.in/yaml.v3" +) +import "fmt" + +//go:embed emf_config.yml +var awsemfConfig string + +// AwsContainerInsightReceiver Translating ECS to telegraf plugins converts the logs.metrics_collected.ecs +// configuration into a combination of inputs and processors: +// inputs = [cadvisor, socket_listener], processors = [ec2tagger, ecsdecorator] +// We only care about taking configuration from the cadvisor input plugin and porting them to the +// awscontainerinsightreceiver plugin +type AwsContainerInsightReceiver struct{} + +func (rec AwsContainerInsightReceiver) Name() string { + return "containerinsights" +} + +func (rec AwsContainerInsightReceiver) Introduces() map[string][]string { + return map[string][]string{ + otelnative.InputsKey: {"awscontainerinsightreceiver"}, + otelnative.ProcessorsKey: {"batch"}, + otelnative.OutputsKey: {"awsemf"}, + } +} + +func (rec AwsContainerInsightReceiver) Replaces() map[string][]string { + return map[string][]string{ + otelnative.InputsKey: {"cadvisor", "socket_listener"}, + otelnative.ProcessorsKey: {"ec2tagger", "ecsdecorator"}, + otelnative.OutputsKey: {}, // TODO: should this remove cloudwatchlogs? + } +} + +func (rec AwsContainerInsightReceiver) Receivers(in, proc, out map[string]interface{}) map[string]interface{} { + m := make(map[string]interface{}) + cadvisorPlugin, ok := in["cadvisor"] + if !ok { + return m + } + plugin, ok := cadvisorPlugin.([]interface{}) + if !ok { + return m + } + if len(plugin) < 1 { + return m + } + pluginMap, ok := plugin[0].(map[string]interface{}) + if !ok { + return m + } + m["collection_interval"] = pluginMap["interval"] + m["container_orchestrator"] = pluginMap["container_orchestrator"] + + // replace input plugins + for _, p := range rec.Replaces()[otelnative.InputsKey] { + delete(in, p) + } + in[fmt.Sprintf("awscontainerinsightreceiver/%s", rec.Name())] = m + return in +} + +func (rec AwsContainerInsightReceiver) Processors(in, proc, out map[string]interface{}) map[string]interface{} { + m := make(map[string]interface{}) + interval := extractCollectionInterval(in) + if interval != "" { + m["timeout"] = interval + } + // replace processor plugins + for _, p := range rec.Replaces()[otelnative.ProcessorsKey] { + delete(proc, p) + } + proc[fmt.Sprintf("batch/%s", rec.Name())] = m + return proc +} + +func (rec AwsContainerInsightReceiver) Exporters(in, proc, out map[string]interface{}) map[string]interface{} { + // replace processor plugins + for _, p := range rec.Replaces()[otelnative.OutputsKey] { + delete(out, p) + } + + m, err := getDefaultEmfExporterConfig() + if err != nil { + return map[string]interface{}{} + } + out[fmt.Sprintf("awsemf/%s", rec.Name())] = m + return out +} + +func getDefaultEmfExporterConfig() (map[string]interface{}, error) { + m := make(map[string]interface{}) + err := yaml.Unmarshal([]byte(awsemfConfig), m) + if err != nil { + return nil, err + } + + emf, ok := m["awsemf"] + if !ok { + return nil, err + } + emfPlugin, ok := emf.(map[string]interface{}) + if !ok { + return nil, err + } + return emfPlugin, nil +} + +func extractCollectionInterval(inputs map[string]interface{}) string { + cadvisorPlugin, ok := inputs["cadvisor"] + if !ok { + return "" + } + plugin, ok := cadvisorPlugin.([]interface{}) + if !ok { + return "" + } + if len(plugin) < 1 { + return "" + } + pluginMap, ok := plugin[0].(map[string]interface{}) + if !ok { + return "" + } + interval, ok := pluginMap["interval"] + if !ok { + return "" + } + intervalStr, ok := interval.(string) + if !ok { + return "" + } + return intervalStr +} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go new file mode 100644 index 0000000000..ccff86e936 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go @@ -0,0 +1,191 @@ +package translate + +import ( + "fmt" + "github.com/stretchr/testify/assert" + "testing" +) + +func TestAwsContainerInsightReceiverTranslateReceivers(t *testing.T) { + translator := AwsContainerInsightReceiver{} + inputs := setUpInputs(t) + processors := setUpProcessors(t) + outputs := setUpOutputs(t) + + result := translator.Receivers(inputs, processors, outputs) + assert.NotEmpty(t, result) + + validateExpectedPlugins(t, result, translator, "inputs") + + receiver, ok := result[fmt.Sprintf("awscontainerinsightreceiver/%s", translator.Name())] + assert.True(t, ok) + receiverMap, ok := receiver.(map[string]interface{}) + assert.True(t, ok) + collectionInterval, ok := receiverMap["collection_interval"] + assert.True(t, ok) + collectionIntervalStr, ok := collectionInterval.(string) + assert.True(t, ok) + assert.Equal(t, collectionIntervalStr, "60s") +} + +func TestAwsContainerInsightReceiverTranslateProcessors(t *testing.T) { + translator := AwsContainerInsightReceiver{} + inputs := setUpInputs(t) + processors := setUpProcessors(t) + outputs := setUpOutputs(t) + + result := translator.Processors(inputs, processors, outputs) + assert.NotEmpty(t, result) + + validateExpectedPlugins(t, result, translator, "processors") + + batch, ok := result[fmt.Sprintf("batch/%s", translator.Name())] + assert.True(t, ok) + batchMap, ok := batch.(map[string]interface{}) + assert.True(t, ok) + timeout, ok := batchMap["timeout"] + assert.True(t, ok) + timeoutStr, ok := timeout.(string) + assert.True(t, ok) + assert.Equal(t, "60s", timeoutStr) +} + +func TestAwsContainerInsightReceiverTranslateExporters(t *testing.T) { + translator := AwsContainerInsightReceiver{} + inputs := setUpInputs(t) + processors := setUpProcessors(t) + outputs := setUpOutputs(t) + + result := translator.Exporters(inputs, processors, outputs) + assert.NotEmpty(t, result) + + validateExpectedPlugins(t, result, translator, "outputs") + + emf, ok := result[fmt.Sprintf("awsemf/%s", translator.Name())] + assert.True(t, ok) + emfPlugin, ok := emf.(map[string]interface{}) + assert.True(t, ok) + validateEmfExporterPlugin(t, emfPlugin) +} + +func TestExtractCadvisorCollectionInterval(t *testing.T) { + m := setUpInputs(t) + assert.Equal(t, "60s", extractCollectionInterval(m)) +} + +func TestExtractCadvisorCollectionIntervalMissingPlugin(t *testing.T) { + assert.Empty(t, extractCollectionInterval(make(map[string]interface{}))) +} + +func TestExtractCadvisorCollectionIntervalInvalidPlugin(t *testing.T) { + m := make(map[string]interface{}) + m["cadvisor"] = 7 + assert.Empty(t, extractCollectionInterval(m)) +} + +func TestExtractCadvisorCollectionIntervalInvalidInterval(t *testing.T) { + m := make(map[string]interface{}) + cadvisor := []interface{}{ + map[string]interface{}{ + "interval": 5, + "container_orchestrator": "ecs", + }, + } + m["cadvisor"] = cadvisor + assert.Empty(t, extractCollectionInterval(m)) +} + +func TestPopulateDefaultEmfExporter(t *testing.T) { + plugin, err := getDefaultEmfExporterConfig() + assert.NoError(t, err) + validateEmfExporterPlugin(t, plugin) +} + +func setUpInputs(t *testing.T) map[string]interface{} { + t.Helper() + m := make(map[string]interface{}) + m["cadvisor"] = []interface{}{ + map[string]interface{}{ + "interval": "60s", + "container_orchestrator": "ecs", + }, + } + m["socket_listener"] = []interface{}{ + map[string]string{ + "foo": "bar", + }, + } + + return m +} + +func setUpProcessors(t *testing.T) map[string]interface{} { + t.Helper() + m := make(map[string]interface{}) + m["ec2tagger"] = []interface{}{ + map[string]string{ + "foo": "bar", + }, + } + m["ecsdecorator"] = []interface{}{ + map[string]string{ + "foo": "bar", + }, + } + + return m +} + +func setUpOutputs(t *testing.T) map[string]interface{} { + t.Helper() + m := make(map[string]interface{}) + m["cloudwatchlogs"] = map[string]string{ + "foo": "bar", + } + + return m +} + +func validateExpectedPlugins( + t *testing.T, + pluginMap map[string]interface{}, + translator AwsContainerInsightReceiver, + section string, +) { + t.Helper() + introduced, ok := translator.Introduces()[section] + assert.True(t, ok) + removed, ok := translator.Replaces()[section] + assert.True(t, ok) + + cnt := 0 + for key := range pluginMap { + for _, e := range introduced { + if key == e+"/"+translator.Name() { + cnt++ + } + } + for _, e := range removed { + if key == e { + t.Errorf("Expected %s to be removed, but it still exists", e) + } + } + } + assert.Equal(t, len(introduced), cnt) +} + +func validateEmfExporterPlugin(t *testing.T, emfPlugin map[string]interface{}) { + t.Helper() + + assert.NotNil(t, emfPlugin) + assert.NotEmpty(t, emfPlugin) + assert.Equal(t, "ECS/ContainerInsights", emfPlugin["namespace"]) + assert.Equal(t, "/aws/ecs/containerinsights/{ClusterName}/performance", emfPlugin["log_group_name"]) + assert.Equal(t, "instanceTelemetry/{ContainerInstanceId}", emfPlugin["log_stream_name"]) + + metricDeclarations, ok := emfPlugin["metric_declarations"] + assert.True(t, ok) + metricDecList, ok := metricDeclarations.([]interface{}) + assert.True(t, ok) + assert.Len(t, metricDecList, 2) +} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/emf_config.yml b/translator/tocwconfig/toyamlconfig/otelnative/translate/emf_config.yml new file mode 100644 index 0000000000..1189e35863 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/emf_config.yml @@ -0,0 +1,32 @@ +awsemf: + namespace: ECS/ContainerInsights + log_group_name: '/aws/ecs/containerinsights/{ClusterName}/performance' + log_stream_name: 'instanceTelemetry/{ContainerInstanceId}' + resource_to_telemetry_conversion: + enabled: true + dimension_rollup_option: NoDimensionRollup + parse_json_encoded_attr_values: [ Sources ] + metric_declarations: + # instance metrics + - dimensions: [ [ ContainerInstanceId, InstanceId, ClusterName ] ] + metric_name_selectors: + - instance_cpu_reserved_capacity + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_network_total_bytes + - instance_number_of_running_tasks + - dimensions: [ [ ClusterName ] ] + metric_name_selectors: + - instance_cpu_limit + - instance_cpu_reserved_capacity + - instance_cpu_usage_total + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_limit + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_memory_working_set + - instance_network_total_bytes + - instance_number_of_running_tasks \ No newline at end of file diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index 2096e4f51e..cc5e9021c8 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -5,6 +5,7 @@ package toyamlconfig import ( "bytes" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/ecs" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" @@ -15,20 +16,38 @@ import ( ) const ( - receiversKeyName = "receivers" - exportersKeyName = "exporters" - serviceKeyName = "service" - pipelinesKeyName = "pipelines" - metricsKeyName = "metrics" + receiversKeyName = "receivers" + processorsKeyName = "processors" + exportersKeyName = "exporters" + serviceKeyName = "service" + pipelinesKeyName = "pipelines" + metricsKeyName = "metrics" + inputsKeyName = "inputs" + outputsKeyName = "outputs" ) func ToYamlConfig(val interface{}) (string, interface{}) { - inputs, outputs := getInputsAndOutputs(val) + inputs := extractFromConfig(val, inputsKeyName) + procs := extractFromConfig(val, processorsKeyName) + outputs := extractFromConfig(val, outputsKeyName) + + if ecs.UsesECSConfig(inputs, procs, outputs) { + log.Println("Config uses ECS. Include container insights configurations") + newInputs := ecs.TranslateReceivers(copyMap(inputs), copyMap(procs), copyMap(outputs)) + newProcs := ecs.TranslateProcessors(copyMap(inputs), copyMap(procs), copyMap(outputs)) + newOutputs := ecs.TranslateExporters(copyMap(inputs), copyMap(procs), copyMap(outputs)) + + inputs = newInputs + procs = newProcs + outputs = newOutputs + } + cfg := make(map[string]interface{}) enc := mapstructure.NewEncoder() - receivers := encodeReceivers(inputs, &cfg, enc) - exporters := encodeExporters(outputs, &cfg, enc) - encodeService(receivers, exporters, &cfg, enc) + rec := encodeReceivers(inputs, &cfg, enc) + proc := encodeProcessors(procs, &cfg, enc) + ex := encodeExporters(outputs, &cfg, enc) + encodeService(rec, proc, ex, &cfg, enc) var buffer bytes.Buffer yamlEncoder := yaml.NewEncoder(&buffer) @@ -39,7 +58,7 @@ func ToYamlConfig(val interface{}) (string, interface{}) { return buffer.String(), cfg } -func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]config.Receiver { +func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { receiversSection := make(map[string]interface{}) receivers := inputsToReceivers(inputs) @@ -49,17 +68,34 @@ func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, return receivers } -func inputsToReceivers(inputs map[string]interface{}) map[config.ComponentID]config.Receiver { - receiverMap := make(map[config.ComponentID]config.Receiver) - for input := range inputs { - t := config.Type(input) - hc := config.NewReceiverSettings(config.NewComponentID(t)) - receiverMap[config.NewComponentID(t)] = &hc +func inputsToReceivers(inputs map[string]interface{}) map[config.ComponentID]interface{} { + receiverMap := make(map[config.ComponentID]interface{}) + for key, val := range inputs { + t := config.Type(key) + receiverMap[config.NewComponentID(t)] = val } return receiverMap } -func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]config.Exporter { +func encodeProcessors(processors map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { + processorsSection := make(map[string]interface{}) + p := procToProcessors(processors) + processorsSection[processorsKeyName] = p + err := encoder.Encode(processorsSection, &cfg) + util.PanicIfErr("Encode to a valid yaml config fails because of", err) + return p +} + +func procToProcessors(processors map[string]interface{}) map[config.ComponentID]interface{} { + processorMap := make(map[config.ComponentID]interface{}) + for key, val := range processors { + t := config.Type(key) + processorMap[config.NewComponentID(t)] = val + } + return processorMap +} + +func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { exportersSection := make(map[string]interface{}) exporters := outputsToExporters(outputs) exportersSection[exportersKeyName] = exporters @@ -69,49 +105,60 @@ func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{} return exporters } -func outputsToExporters(outputs map[string]interface{}) map[config.ComponentID]config.Exporter { - exporterMap := make(map[config.ComponentID]config.Exporter) - for output := range outputs { - t := config.Type(output) - exporterSettings := config.NewExporterSettings(config.NewComponentID(t)) - exporterMap[config.NewComponentID(t)] = &exporterSettings +func outputsToExporters(outputs map[string]interface{}) map[config.ComponentID]interface{} { + exporterMap := make(map[config.ComponentID]interface{}) + for key, val := range outputs { + t := config.Type(key) + exporterMap[config.NewComponentID(t)] = val } return exporterMap } -func encodeService(receivers map[config.ComponentID]config.Receiver, exporters map[config.ComponentID]config.Exporter, cfg *map[string]interface{}, encoder encoder.Encoder) { +func encodeService(receivers map[config.ComponentID]interface{}, processors map[config.ComponentID]interface{}, exporters map[config.ComponentID]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) { serviceSection := make(map[string]interface{}) pipelinesSection := make(map[string]interface{}) - pipelinesSection[pipelinesKeyName] = buildPipelines(receivers, exporters) + pipelinesSection[pipelinesKeyName] = buildPipelines(receivers, processors, exporters) serviceSection[serviceKeyName] = pipelinesSection err := encoder.Encode(serviceSection, &cfg) util.PanicIfErr("Encode to a valid yaml config fails because of", err) } -func buildPipelines(receivers map[config.ComponentID]config.Receiver, exporters map[config.ComponentID]config.Exporter) map[config.ComponentID]*service.ConfigServicePipeline { - var exArray []config.ComponentID - for ex := range exporters { - exArray = append(exArray, ex) +func buildPipelines(receiverMap map[config.ComponentID]interface{}, processorMap map[config.ComponentID]interface{}, exporterMap map[config.ComponentID]interface{}) map[config.ComponentID]*service.ConfigServicePipeline { + var exporters []config.ComponentID + for ex := range exporterMap { + exporters = append(exporters, ex) + } + var procs []config.ComponentID + for proc := range processorMap { + procs = append(procs, proc) } - var recArray []config.ComponentID - for rec := range receivers { - recArray = append(recArray, rec) + var receivers []config.ComponentID + for rec := range receiverMap { + receivers = append(receivers, rec) } - pipeline := service.ConfigServicePipeline{Exporters: exArray, Receivers: recArray} + pipeline := service.ConfigServicePipeline{Receivers: receivers, Processors: procs, Exporters: exporters} metricsPipeline := make(map[config.ComponentID]*service.ConfigServicePipeline) metricsPipeline[config.NewComponentID(metricsKeyName)] = &pipeline return metricsPipeline } -func getInputsAndOutputs(val interface{}) (map[string]interface{}, map[string]interface{}) { - config := val.(map[string]interface{}) - inputs, ok := config["inputs"].(map[string]interface{}) +func extractFromConfig(cfg interface{}, key string) map[string]interface{} { + c, ok := cfg.(map[string]interface{}) if !ok { - log.Panicf("E! could not extract inputs during yaml translation") + log.Panic("E! could not extract from invalid configuration") } - outputs, ok := config["outputs"].(map[string]interface{}) + + section, ok := c[key].(map[string]interface{}) if !ok { - log.Panicf("E! could not extract outputs during yaml translation") + log.Panicf("E! failed to extract %s from config during yaml translation", key) + } + return section +} + +func copyMap(m map[string]interface{}) map[string]interface{} { + dupe := make(map[string]interface{}) + for k, v := range m { + dupe[k] = v } - return inputs, outputs + return dupe } From c2d3132a54953502f65d787fd63a542d47df6bae Mon Sep 17 00:00:00 2001 From: Kaushik Surya Date: Wed, 31 Aug 2022 14:30:41 -0400 Subject: [PATCH 017/144] Add telegraf_ prefix to plugin names in translated yaml --- .../sampleConfig/advanced_config_linux.yaml | 36 ++++++------ .../sampleConfig/advanced_config_windows.yaml | 8 +-- .../sampleConfig/basic_config_linux.yaml | 12 ++-- .../sampleConfig/basic_config_windows.yaml | 8 +-- .../sampleConfig/collectd_config_linux.yaml | 8 +-- .../sampleConfig/complete_darwin_config.yaml | 56 +++++++++---------- .../sampleConfig/complete_linux_config.yaml | 56 +++++++++---------- .../sampleConfig/complete_windows_config.yaml | 36 ++++++------ .../sampleConfig/csm_only_config_linux.yaml | 8 +-- .../sampleConfig/csm_only_config_windows.yaml | 8 +-- .../csm_service_addresses_linux.yaml | 8 +-- .../csm_service_addresses_windows.yaml | 8 +-- .../sampleConfig/delta_config_linux.yaml | 8 +-- .../sampleConfig/drop_origin_linux.yaml | 16 +++--- .../sampleConfig/log_ecs_metric_only.yaml | 12 ++-- .../tocwconfig/sampleConfig/log_filter.yaml | 8 +-- .../sampleConfig/log_metric_and_log.yaml | 20 +++---- .../sampleConfig/log_metric_only.yaml | 16 +++--- .../sampleConfig/log_only_config_windows.yaml | 12 ++-- .../sampleConfig/prometheus_config_linux.yaml | 8 +-- .../prometheus_config_windows.yaml | 8 +-- .../sampleConfig/standard_config_linux.yaml | 24 ++++---- ...ndard_config_linux_with_common_config.yaml | 24 ++++---- .../sampleConfig/standard_config_windows.yaml | 8 +-- ...ard_config_windows_with_common_config.yaml | 8 +-- .../sampleConfig/statsd_config_linux.yaml | 8 +-- .../sampleConfig/statsd_config_windows.yaml | 8 +-- .../windows_eventlog_only_config.yaml | 8 +-- .../tocwconfig/toyamlconfig/toyamlconfig.go | 11 ++-- 29 files changed, 230 insertions(+), 229 deletions(-) diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index 4bb3a38672..60d9551f44 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -1,26 +1,26 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - cpu: {} - disk: {} - diskio: {} - ethtool: {} - mem: {} - netstat: {} - nvidia_smi: {} - swap: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_diskio: {} + telegraf_ethtool: {} + telegraf_mem: {} + telegraf_netstat: {} + telegraf_nvidia_smi: {} + telegraf_swap: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - ethtool - - mem - - netstat - - nvidia_smi - - swap - - cpu - - disk - - diskio + - telegraf_ethtool + - telegraf_mem + - telegraf_netstat + - telegraf_nvidia_smi + - telegraf_swap + - telegraf_cpu + - telegraf_disk + - telegraf_diskio diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index f38b263dda..4ddcdd6bed 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - win_perf_counters: {} + telegraf_win_perf_counters: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - win_perf_counters + - telegraf_win_perf_counters diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index 524379a723..65546dd97f 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -1,14 +1,14 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - disk: {} - mem: {} + telegraf_disk: {} + telegraf_mem: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - disk - - mem + - telegraf_disk + - telegraf_mem diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index f38b263dda..4ddcdd6bed 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - win_perf_counters: {} + telegraf_win_perf_counters: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - win_perf_counters + - telegraf_win_perf_counters diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml index 2c739c1ed9..fb33806240 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - socket_listener: {} + telegraf_socket_listener: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - socket_listener + - telegraf_socket_listener diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index cc5e733d00..adce6c1137 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -1,36 +1,36 @@ exporters: - cloudwatch: {} - cloudwatchlogs: {} + telegraf_cloudwatch: {} + telegraf_cloudwatchlogs: {} receivers: - cpu: {} - disk: {} - diskio: {} - logfile: {} - mem: {} - net: {} - netstat: {} - processes: {} - procstat: {} - socket_listener: {} - statsd: {} - swap: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_diskio: {} + telegraf_logfile: {} + telegraf_mem: {} + telegraf_net: {} + telegraf_netstat: {} + telegraf_processes: {} + telegraf_procstat: {} + telegraf_socket_listener: {} + telegraf_statsd: {} + telegraf_swap: {} service: pipelines: metrics: exporters: - - cloudwatchlogs - - cloudwatch + - telegraf_cloudwatchlogs + - telegraf_cloudwatch processors: [] receivers: - - cpu - - socket_listener - - disk - - statsd - - netstat - - logfile - - processes - - diskio - - mem - - swap - - net - - procstat + - telegraf_cpu + - telegraf_socket_listener + - telegraf_disk + - telegraf_statsd + - telegraf_netstat + - telegraf_logfile + - telegraf_processes + - telegraf_diskio + - telegraf_mem + - telegraf_swap + - telegraf_net + - telegraf_procstat diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index f7bf8cc94c..a70f305221 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -1,36 +1,36 @@ exporters: - cloudwatch: {} - cloudwatchlogs: {} + telegraf_cloudwatch: {} + telegraf_cloudwatchlogs: {} receivers: - cpu: {} - disk: {} - diskio: {} - logfile: {} - mem: {} - net: {} - netstat: {} - processes: {} - procstat: {} - socket_listener: {} - statsd: {} - swap: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_diskio: {} + telegraf_logfile: {} + telegraf_mem: {} + telegraf_net: {} + telegraf_netstat: {} + telegraf_processes: {} + telegraf_procstat: {} + telegraf_socket_listener: {} + telegraf_statsd: {} + telegraf_swap: {} service: pipelines: metrics: exporters: - - cloudwatchlogs - - cloudwatch + - telegraf_cloudwatchlogs + - telegraf_cloudwatch processors: [] receivers: - - processes - - swap - - mem - - disk - - statsd - - socket_listener - - procstat - - cpu - - logfile - - net - - netstat - - diskio + - telegraf_processes + - telegraf_swap + - telegraf_mem + - telegraf_disk + - telegraf_statsd + - telegraf_socket_listener + - telegraf_procstat + - telegraf_cpu + - telegraf_logfile + - telegraf_net + - telegraf_netstat + - telegraf_diskio diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index 7a1f298dac..80e8b18041 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -1,26 +1,26 @@ exporters: - cloudwatch: {} - cloudwatchlogs: {} + telegraf_cloudwatch: {} + telegraf_cloudwatchlogs: {} receivers: - logfile: {} - nvidia_smi: {} - procstat: {} - socket_listener: {} - statsd: {} - win_perf_counters: {} - windows_event_log: {} + telegraf_logfile: {} + telegraf_nvidia_smi: {} + telegraf_procstat: {} + telegraf_socket_listener: {} + telegraf_statsd: {} + telegraf_win_perf_counters: {} + telegraf_windows_event_log: {} service: pipelines: metrics: exporters: - - cloudwatchlogs - - cloudwatch + - telegraf_cloudwatchlogs + - telegraf_cloudwatch processors: [] receivers: - - win_perf_counters - - nvidia_smi - - procstat - - statsd - - socket_listener - - logfile - - windows_event_log + - telegraf_win_perf_counters + - telegraf_nvidia_smi + - telegraf_procstat + - telegraf_statsd + - telegraf_socket_listener + - telegraf_logfile + - telegraf_windows_event_log diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml index 04b67a829d..5f55da3bab 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml @@ -1,12 +1,12 @@ exporters: - aws_csm: {} + telegraf_aws_csm: {} receivers: - awscsm_listener: {} + telegraf_awscsm_listener: {} service: pipelines: metrics: exporters: - - aws_csm + - telegraf_aws_csm processors: [] receivers: - - awscsm_listener + - telegraf_awscsm_listener diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml index 4a0f1453d5..88e0460244 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - aws_csm: {} + telegraf_aws_csm: {} receivers: - awscsm_listener: {} + telegraf_awscsm_listener: {} service: pipelines: metrics: exporters: - - aws_csm + - telegraf_aws_csm processors: [] receivers: - - awscsm_listener + - telegraf_awscsm_listener diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml index 4a0f1453d5..88e0460244 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml @@ -1,12 +1,12 @@ exporters: - aws_csm: {} + telegraf_aws_csm: {} receivers: - awscsm_listener: {} + telegraf_awscsm_listener: {} service: pipelines: metrics: exporters: - - aws_csm + - telegraf_aws_csm processors: [] receivers: - - awscsm_listener + - telegraf_awscsm_listener diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml index 4a0f1453d5..88e0460244 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml @@ -1,12 +1,12 @@ exporters: - aws_csm: {} + telegraf_aws_csm: {} receivers: - awscsm_listener: {} + telegraf_awscsm_listener: {} service: pipelines: metrics: exporters: - - aws_csm + - telegraf_aws_csm processors: [] receivers: - - awscsm_listener + - telegraf_awscsm_listener diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml index 07eae4d2b0..ad91b8921a 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - diskio: {} + telegraf_diskio: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - diskio + - telegraf_diskio diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml index d6c8091b15..11393638e4 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -1,16 +1,16 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - cpu: {} - disk: {} - nvidia_smi: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_nvidia_smi: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - cpu - - disk - - nvidia_smi + - telegraf_cpu + - telegraf_disk + - telegraf_nvidia_smi diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index a903b815d5..be5b6fa95b 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -1,14 +1,14 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - cadvisor: {} - socket_listener: {} + telegraf_cadvisor: {} + telegraf_socket_listener: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - cadvisor - - socket_listener + - telegraf_cadvisor + - telegraf_socket_listener diff --git a/translator/tocwconfig/sampleConfig/log_filter.yaml b/translator/tocwconfig/sampleConfig/log_filter.yaml index e0e96d478c..f0256137b6 100644 --- a/translator/tocwconfig/sampleConfig/log_filter.yaml +++ b/translator/tocwconfig/sampleConfig/log_filter.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - logfile: {} + telegraf_logfile: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - logfile + - telegraf_logfile diff --git a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml index eb177218cf..c168be10bf 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml @@ -1,18 +1,18 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - cadvisor: {} - k8sapiserver: {} - logfile: {} - socket_listener: {} + telegraf_cadvisor: {} + telegraf_k8sapiserver: {} + telegraf_logfile: {} + telegraf_socket_listener: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - logfile - - socket_listener - - cadvisor - - k8sapiserver + - telegraf_logfile + - telegraf_socket_listener + - telegraf_cadvisor + - telegraf_k8sapiserver diff --git a/translator/tocwconfig/sampleConfig/log_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_metric_only.yaml index 7b1a1f0599..a5d97826e3 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_only.yaml @@ -1,16 +1,16 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - cadvisor: {} - k8sapiserver: {} - socket_listener: {} + telegraf_cadvisor: {} + telegraf_k8sapiserver: {} + telegraf_socket_listener: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - k8sapiserver - - cadvisor - - socket_listener + - telegraf_k8sapiserver + - telegraf_cadvisor + - telegraf_socket_listener diff --git a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml index 92297cb189..5b68395ad4 100644 --- a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml @@ -1,14 +1,14 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - logfile: {} - windows_event_log: {} + telegraf_logfile: {} + telegraf_windows_event_log: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - logfile - - windows_event_log + - telegraf_logfile + - telegraf_windows_event_log diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml index 94edc38127..10c44eadce 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - prometheus_scraper: {} + telegraf_prometheus_scraper: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - prometheus_scraper + - telegraf_prometheus_scraper diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml index 94edc38127..10c44eadce 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - prometheus_scraper: {} + telegraf_prometheus_scraper: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - prometheus_scraper + - telegraf_prometheus_scraper diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index 7ed0bc1c45..9a05a0b447 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -1,20 +1,20 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - cpu: {} - disk: {} - diskio: {} - mem: {} - swap: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_diskio: {} + telegraf_mem: {} + telegraf_swap: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - cpu - - disk - - diskio - - mem - - swap + - telegraf_cpu + - telegraf_disk + - telegraf_diskio + - telegraf_mem + - telegraf_swap diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml index 5c8a20a8b1..73924d1cfa 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -1,20 +1,20 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - cpu: {} - disk: {} - diskio: {} - mem: {} - swap: {} + telegraf_cpu: {} + telegraf_disk: {} + telegraf_diskio: {} + telegraf_mem: {} + telegraf_swap: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - mem - - swap - - cpu - - disk - - diskio + - telegraf_mem + - telegraf_swap + - telegraf_cpu + - telegraf_disk + - telegraf_diskio diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index f38b263dda..4ddcdd6bed 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - win_perf_counters: {} + telegraf_win_perf_counters: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - win_perf_counters + - telegraf_win_perf_counters diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index f38b263dda..4ddcdd6bed 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - win_perf_counters: {} + telegraf_win_perf_counters: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - win_perf_counters + - telegraf_win_perf_counters diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml index 03dbdf7d18..c6c7ac3dca 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - statsd: {} + telegraf_statsd: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - statsd + - telegraf_statsd diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml index 03dbdf7d18..c6c7ac3dca 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatch: {} + telegraf_cloudwatch: {} receivers: - statsd: {} + telegraf_statsd: {} service: pipelines: metrics: exporters: - - cloudwatch + - telegraf_cloudwatch processors: [] receivers: - - statsd + - telegraf_statsd diff --git a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml index e56540928f..b65d46703c 100644 --- a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml +++ b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml @@ -1,12 +1,12 @@ exporters: - cloudwatchlogs: {} + telegraf_cloudwatchlogs: {} receivers: - windows_event_log: {} + telegraf_windows_event_log: {} service: pipelines: metrics: exporters: - - cloudwatchlogs + - telegraf_cloudwatchlogs processors: [] receivers: - - windows_event_log + - telegraf_windows_event_log diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index ab9b11b9cb..c42eb01aad 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -23,6 +23,7 @@ const ( serviceKeyName = "service" pipelinesKeyName = "pipelines" metricsKeyName = "metrics" + telegrafPrefix = "telegraf_" ) func ToYamlConfig(val interface{}) (string, interface{}) { @@ -55,7 +56,7 @@ func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, func inputsToReceivers(inputs map[string]interface{}) map[config.ComponentID]config.Receiver { receiverMap := make(map[config.ComponentID]config.Receiver) for input := range inputs { - t := config.Type(input) + t := config.Type(telegrafPrefix + input) hc := config.NewReceiverSettings(config.NewComponentID(t)) receiverMap[config.NewComponentID(t)] = &hc } @@ -75,7 +76,7 @@ func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{} func outputsToExporters(outputs map[string]interface{}) map[config.ComponentID]config.Exporter { exporterMap := make(map[config.ComponentID]config.Exporter) for output := range outputs { - t := config.Type(output) + t := config.Type(telegrafPrefix + output) exporterSettings := config.NewExporterSettings(config.NewComponentID(t)) exporterMap[config.NewComponentID(t)] = &exporterSettings } @@ -107,12 +108,12 @@ func buildPipelines(receivers map[config.ComponentID]config.Receiver, exporters } func getInputsAndOutputs(val interface{}) (map[string]interface{}, map[string]interface{}) { - config := val.(map[string]interface{}) - inputs, ok := config["inputs"].(map[string]interface{}) + cfg := val.(map[string]interface{}) + inputs, ok := cfg["inputs"].(map[string]interface{}) if !ok { log.Panicf("E! could not extract inputs during yaml translation") } - outputs, ok := config["outputs"].(map[string]interface{}) + outputs, ok := cfg["outputs"].(map[string]interface{}) if !ok { log.Panicf("E! could not extract outputs during yaml translation") } From 4bd7585ace5f0c2ace4e849fbe4afc3b74581eec Mon Sep 17 00:00:00 2001 From: Kaushik Surya Date: Thu, 1 Sep 2022 16:24:07 -0400 Subject: [PATCH 018/144] Merge updates to 6c122fcbce525c1a0e8c72b0ba2ee5006f56af96 --- Makefile | 3 - go.mod | 4 +- go.sum | 506 +++--------------- .../test/performancetest/performance_test.go | 71 ++- integration/test/sanity/sanity_unix.go | 2 +- integration/test/sanity/sanity_windows.go | 4 +- logs/logs.go | 2 +- .../kubernetes/kubernetes.go | 2 +- 8 files changed, 114 insertions(+), 480 deletions(-) diff --git a/Makefile b/Makefile index 1cf28cf456..b766d87dfb 100644 --- a/Makefile +++ b/Makefile @@ -138,9 +138,6 @@ package-prepare-rpm: cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.conf $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/packaging/linux/amazon-cloudwatch-agent.spec $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ cp $(BASE_SPACE)/translator/config/schema.json $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/amazon-cloudwatch-agent-schema.json - cp $(BASE_SPACE)/packaging/dependencies/cwagent-otel-collector.service $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(BASE_SPACE)/packaging/linux/cwagent-otel-collector.conf $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/ - cp $(AOC_BASE_SPACE)/config.yaml $(BUILD_SPACE)/private/linux/amd64/rpm/amazon-cloudwatch-agent-pre-pkg/predefined-config-data # arm64 rpm mkdir -p $(BUILD_SPACE)/private/linux/arm64/rpm/amazon-cloudwatch-agent-pre-pkg diff --git a/go.mod b/go.mod index 0287856972..addefa284d 100644 --- a/go.mod +++ b/go.mod @@ -57,7 +57,7 @@ require ( github.com/Jeffail/gabs v1.4.0 github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 github.com/aws/aws-sdk-go v1.44.16 - github.com/aws/aws-sdk-go-v2 v1.16.5 + github.com/aws/aws-sdk-go-v2 v1.16.13 github.com/aws/aws-sdk-go-v2/config v1.15.3 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.9.4 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 @@ -65,7 +65,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.4 github.com/aws/aws-sdk-go-v2/service/dynamodb v1.15.7 github.com/aws/aws-sdk-go-v2/service/ec2 v1.29.0 - github.com/aws/smithy-go v1.11.3 + github.com/aws/smithy-go v1.13.1 github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 github.com/go-kit/kit v0.11.0 github.com/gobwas/glob v0.2.3 diff --git a/go.sum b/go.sum index 424972d531..30318fd62d 100644 --- a/go.sum +++ b/go.sum @@ -27,7 +27,6 @@ cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aD cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go v0.100.2 h1:t9Iw5QH5v4XtlEQaCtUY7x6sCABps8sW0acw7e2WQ6Y= cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w99A= @@ -46,7 +45,6 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/iam v0.1.1 h1:4CapQyNFjiksks1/x7jsvsygFPhihslYk5GptIrlX68= cloud.google.com/go/monitoring v1.2.0 h1:fEvQITrhVcPM6vuDQcgPMbU5kZFeQFwZmE7v6+S8BPo= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= @@ -59,11 +57,11 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc= code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= collectd.org v0.4.0 h1:nWNldfMqg7EVWAevG8oyOVsS9r/UHRG3LZRf6MdQho0= collectd.org v0.4.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0QmaQNhGnptITnPQB+z1+qeFB0= +contrib.go.opencensus.io/exporter/prometheus v0.4.1 h1:oObVeKo2NxpdF/fIfrPsNj6K0Prg0R0mHM+uANlYMiM= +contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= @@ -74,8 +72,7 @@ github.com/Azure/azure-sdk-for-go v63.0.0+incompatible h1:whPsa+jCHQSo5wGMPNLw4b github.com/Azure/azure-sdk-for-go v63.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/azure-storage-blob-go v0.14.0 h1:1BCg74AmVdYwO3dlKwtFU1V0wU2PZdREkXvAmZJRUlM= github.com/Azure/azure-storage-queue-go v0.0.0-20191125232315-636801874cdd h1:b3wyxBl3vvr15tUAziPBPK354y+LSdfPCpex5oBttHo= -github.com/Azure/go-amqp v0.17.4 h1:6t9wEiwA4uXMRoUj3Cd3K2gmH8cW8ylizmBnSeF0bzM= -github.com/Azure/go-amqp v0.17.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg= +github.com/Azure/go-amqp v0.17.0 h1:HHXa3149nKrI0IZwyM7DRcRy5810t9ZICDutn4BYzj4= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= @@ -108,15 +105,12 @@ github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+Z github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= -github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e h1:ZU22z/2YRFLyf/P4ZwUYSdNCWsMEI0VeyrFoI2rAhJQ= -github.com/Azure/go-ntlmssp v0.0.0-20211209120228-48547f28849e/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU= +github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= -github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/HdrHistogram/hdrhistogram-go v1.0.1/go.mod h1:BWJ+nMSHY3L41Zj7CA3uXnloDp7xxV0YvstAE7nKTaM= github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo= github.com/Jeffail/gabs v1.4.0 h1://5fYRRTq1edjfIrQGvdkcd22pkYUrHZ5YC/H2GJVAo= @@ -151,23 +145,19 @@ github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb0 github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 h1:6olZmdYuK84eO0PeCQX1iy2EFWlOl8G+JNBi4vFmcU8= github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5/go.mod h1:FgOROf8P5bebcC1DS0PdOQiqGUridaZvikzUmkFW6gg= github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= -github.com/Shopify/sarama v1.31.0/go.mod h1:BeW3gXRc/CxgAsrSly2RE9nIXUfC9ezb7QHBPVhvzjI= github.com/Shopify/sarama v1.32.0 h1:P+RUjEaRU0GMMbYexGMDyrMkLhbbBVUVISDywi+IlFU= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= -github.com/Shopify/toxiproxy/v2 v2.3.0/go.mod h1:KvQTtB6RjCJY4zqNJn7C7JDFgsG5uoHYDirfUfpIm0c= github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA= github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= github.com/aerospike/aerospike-client-go/v5 v5.7.0 h1:Olgq011scnhKlGxo4AcGSXI8JRLF0aSEdl1PhjmKTUo= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= -github.com/agnivade/levenshtein v1.0.1/go.mod h1:CURSv5d9Uaml+FovSIICkLbAUZ9S4RqaHDIsdSBg7lM= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/alecthomas/go-thrift v0.0.0-20170109061633-7914173639b2/go.mod h1:CxCgO+NdpMdi9SsTlGbc0W+/UNxO3I0AabOEJZ3w61w= github.com/alecthomas/kong v0.2.1/go.mod h1:+inYUSluD+p4L8KdviBSgzcqEjUQOfC5fQDRFuc36lI= @@ -186,7 +176,6 @@ github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:C github.com/alexflint/go-filemutex v1.1.0/go.mod h1:7P4iRhttt/nUvUOrYIhcpMzv2G6CY9UnI16Z+UJqRyk= github.com/aliyun/alibaba-cloud-sdk-go v1.61.1483 h1:J8HaD+Zpfi1gcel3HCKpoHHEsrcuRrZlSnx7R9SCf5I= github.com/amir/raidman v0.0.0-20170415203553-1ccc43bfb9c9 h1:FXrPTd8Rdlc94dKccl7KPmdmIbVh/OjelJ8/vgMRzcQ= -github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antchfx/jsonquery v1.1.5 h1:1YWrNFYCcIuJPIjFeOP5b6TXbLSUYY8qqxWbuZOB1qE= github.com/antchfx/jsonquery v1.1.5/go.mod h1:RtMzTHohKaAerkfslTNjr3Y9MdxjKlSgIgaVjVKNiug= github.com/antchfx/xmlquery v1.3.9 h1:Y+zyMdiUZ4fasTQTkDb3DflOXP7+obcYEh80SISBmnQ= @@ -195,11 +184,8 @@ github.com/antchfx/xpath v1.1.7/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNY github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8= github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmHhwGEk8= github.com/apache/arrow/go/arrow v0.0.0-20211006091945-a69884db78f4 h1:nPUln5QTzhftSpmld3xcXw/GOJ3z1E8fR8tUrrc0YWk= -github.com/apache/thrift v0.15.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= -github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= -github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= +github.com/apache/thrift v0.15.0 h1:aGvdaR0v1t9XLgjtBYwxcBvBOTMqClzwE26CHOgjW1Y= github.com/aristanetworks/glog v0.0.0-20191112221043-67e8567f59f3 h1:Bmjk+DjIi3tTAU0wxGaFbfjGUqlxxSXARq9A96Kgoos= github.com/aristanetworks/goarista v0.0.0-20190325233358-a123909ec740 h1:FD4/ikKOFxwP8muWDypbmBWc634+YcAs3eBrYAmRdZY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -211,13 +197,9 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= -github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= -github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= @@ -229,10 +211,10 @@ github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVj github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.13.0/go.mod h1:L6+ZpqHaLbAaxsqV0L4cvxZY7QupWJB4fhkf8LXvC7w= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2 v1.16.5 h1:Ah9h1TZD9E2S1LzHpViBO3Jz9FPL5+rmflmb8hXirtI= github.com/aws/aws-sdk-go-v2 v1.16.5/go.mod h1:Wh7MEsmEApyL5hrWzpDkba4gwAPc5/piwLVLFnCxp48= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1 h1:SdK4Ppk5IzLs64ZMvr6MrSficMtjY2oS0WOORXTlxwU= -github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.1/go.mod h1:n8Bs1ElDD2wJ9kCRTczA83gYbBmjSwZp3umc6zF4EeM= +github.com/aws/aws-sdk-go-v2 v1.16.13 h1:HgF7OX2q0gSZtcXoo9DMEA8A2Qk/GCxmWyM0RI7Yz2Y= +github.com/aws/aws-sdk-go-v2 v1.16.13/go.mod h1:xSyvSnzh0KLs5H4HJGeIEsNYemUWdNIl0b/rP6SIsLU= +github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.2.0 h1:scBthy70MB3m4LCMFaBcmYCyR2XWOz6MxSfdSu/+fQo= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.15.3 h1:5AlQD0jhVXlGzwo+VORKiUuogkG7pQcLJNzIzK7eodw= github.com/aws/aws-sdk-go-v2/config v1.15.3/go.mod h1:9YL3v07Xc/ohTsxFXzan9ZpFpdTOFl4X65BAKYaz8jg= @@ -256,8 +238,6 @@ github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.6/go.mod h1:FwpAKI+FBPIE github.com/aws/aws-sdk-go-v2/internal/ini v1.2.4/go.mod h1:ZcBrrI3zBKlhGFNYWvju0I3TR93I7YIgAfy82Fh4lcQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10 h1:by9P+oy3P/CwggN4ClnW2D4oL91QV7pBzBICi1chZvQ= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.10/go.mod h1:8DcYQcz0+ZJaSxANlHIsbbi6S+zMwjwdDqwW3r9AzaE= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.0 h1:cq+47u1zpHyH+PSkbBx1N9whx4TiM9m9ibimOPaNlBg= -github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.0/go.mod h1:Nf3QiqrNy2sj3Rku+9z4nN/bThI97gQmR7YxG3s+ez8= github.com/aws/aws-sdk-go-v2/service/appconfig v1.4.2/go.mod h1:FZ3HkCe+b10uFZZkFdvf98LHW21k49W8o8J366lqVKY= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.8.1/go.mod h1:CM+19rL1+4dFWnOQKwDc7H1KwXTz+h61oUSHyhV0b3o= github.com/aws/aws-sdk-go-v2/service/cloudwatch v1.18.1 h1:8PHGmLw1QbTdXfgEpXclOk3kob72vkc/cEoyBxkmR0M= @@ -270,11 +250,8 @@ github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.13.7 h1:o2HKntJx3vr3y11N github.com/aws/aws-sdk-go-v2/service/dynamodbstreams v1.13.7/go.mod h1:FAVtDKEl/8WxRDQ33e2fz16RO1t4zeEwWIU5kR29xXs= github.com/aws/aws-sdk-go-v2/service/ec2 v1.29.0 h1:7jk4NfzDnnSbaR9E4mOBWRZXQThq5rsqjlDC+uu9dsI= github.com/aws/aws-sdk-go-v2/service/ec2 v1.29.0/go.mod h1:HoTu0hnXGafTpKIZQ60jw0ybhhCH1QYf20oL7GEJFdg= -github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.1/go.mod h1:GeUru+8VzrTXV/83XyMJ80KpH8xO89VPoUileyNQ+tc= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.2 h1:T/ywkX1ed+TsZVQccu/8rRJGxKZF/t0Ivgrb4MHTSeo= github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.2/go.mod h1:RnloUnyZ4KN9JStGY1LuQ7Wzqh7V0f8FinmRdHYtuaA= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3 h1:I0dcwWitE752hVSMrsLCxqNQ+UdEp3nACx2bYNMQq+k= -github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.3/go.mod h1:Seb8KNmD6kVTjwRjVEgOT5hPin6sq+v4C2ycJQDwuH8= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.6 h1:JGrc3+kkyr848/wpG2+kWuzHK3H4Fyxj2jnXj8ijQ/Y= github.com/aws/aws-sdk-go-v2/service/internal/endpoint-discovery v1.7.6/go.mod h1:zwvTysbXES8GDwFcwCPB8NkC+bCdio1abH+E+BRe/xg= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.2/go.mod h1:72HRZDLMtmVQiLG2tLfQcaWLCssELvGl+Zf2WVxMmR8= @@ -284,8 +261,7 @@ github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.3/go.mod h1:wlY github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3 h1:BKjwCJPnANbkwQ8vzSbaZDKawwagDubrH/z/c0X+kbQ= github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.3/go.mod h1:Bm/v2IaN6rZ+Op7zX+bOUMdL4fsrYZiD0dsjLhNKwZc= github.com/aws/aws-sdk-go-v2/service/kinesis v1.13.0 h1:wqLvwC4qdrrGikudu8Z9X2sb79BYUYWAgMF5BGFQJY8= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.5 h1:A3PuAUlh1u47WHcM68CDaG9ZWjK7ewePjDp+0dY9yv4= -github.com/aws/aws-sdk-go-v2/service/s3 v1.26.5/go.mod h1:qFKU5d+PAv+23bi9ZhtWeA+TmLUz7B/R59ZGXQ1Mmu4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.16.0 h1:dt1JQFj/135ozwGIWeCM3aQ8N/kB3Xu3Uu4r9zuOIyc= github.com/aws/aws-sdk-go-v2/service/sso v1.4.2/go.mod h1:NBvT9R1MEF+Ud6ApJKM0G+IkPchKS7p7c2YPKwHmBOk= github.com/aws/aws-sdk-go-v2/service/sso v1.11.3 h1:frW4ikGcxfAEDfmQqWgMLp+F1n4nRo9sF39OcIb5BkQ= github.com/aws/aws-sdk-go-v2/service/sso v1.11.3/go.mod h1:7UQ/e69kU7LDPtY40OyoHYgRmgfGM4mgsLYtcObdveU= @@ -296,8 +272,9 @@ github.com/aws/aws-sdk-go-v2/service/timestreamwrite v1.3.2 h1:1s/RRA5Owuz4/G/eW github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.10.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/aws/smithy-go v1.11.2/go.mod h1:3xHYmszWVx2c0kIwQeEVf9uSm4fYZt67FBJnwub1bgM= -github.com/aws/smithy-go v1.11.3 h1:DQixirEFM9IaKxX1olZ3ke3nvxRS2xMDteKIDWxozW8= github.com/aws/smithy-go v1.11.3/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= +github.com/aws/smithy-go v1.13.1 h1:q09BdpUiaqpothcv393ACfWJJHzlzjB5HaNL1XHKmoQ= +github.com/aws/smithy-go v1.13.1/go.mod h1:Tg+OJXh4MB2R/uN61Ko2f6hTZwB/ZYGOtib8J3gBHzA= github.com/aws/telegraf v0.10.2-0.20220502160831-c20ebe67c5ef h1:O53nKbZm2XpdudUywNdqbohwUxje9k4vE0xRXWeIVbE= github.com/aws/telegraf v0.10.2-0.20220502160831-c20ebe67c5ef/go.mod h1:6maU8S0L0iMSa0ZvH5b2W7dBX1xjK0D5ONAqe7WTqXc= github.com/aws/telegraf/patches/gopsutil/v3 v3.0.0-20220502160831-c20ebe67c5ef h1:iiO0qNErnQgaU6mJY+PRlwnoHp+s9VTk2Ax1A8KRoG4= @@ -314,15 +291,12 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579 h1:4UwtVL/bvcpWHPAUCtu8hKl7belqWxDEw94wkYFWem8= github.com/bigkevmcd/go-configparser v0.0.0-20200217161103-d137835d2579/go.mod h1:RI5D4DqbDX0Kb0SvKTuAKMYlkSBND3zLQZI/wiS5Ij0= -github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932/go.mod h1:NOuUCSz6Q9T7+igc/hlvDOUdtWKryOrtFyIVABv/p7k= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.1.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI= -github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4= -github.com/bsm/sarama-cluster v2.1.13+incompatible/go.mod h1:r7ao+4tTNXvWm+VRpRJchr2kQhqxgmAp2iEX5W96gMM= github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= github.com/caio/go-tdigest v3.1.0+incompatible h1:uoVMJ3Q5lXmVLCCqaMGHLBWnbGoN6Lpu7OAUPR60cds= @@ -331,8 +305,8 @@ github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRt github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -475,7 +449,6 @@ github.com/containers/ocicrypt v1.1.2/go.mod h1:Dm55fwWm1YZAjYRaJ94z2mfZikIyIN4B github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-iptables v0.4.5/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.5.0/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU= github.com/coreos/go-iptables v0.6.0/go.mod h1:Qe8Bv2Xik5FyTXwgIbLAnv2sWSBmvWdFETJConOQ//Q= @@ -495,21 +468,18 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/couchbase/go-couchbase v0.1.1 h1:ClFXELcKj/ojyoTYbsY34QUrrYCBi/1G749sXSCkdhk= github.com/couchbase/gomemcached v0.1.3 h1:HIc5qMYNbuhB7zNaiEtj61DCYkquAwrQlf64q7JzdEY= github.com/couchbase/goutils v0.1.0 h1:0WLlKJilu7IBm98T8nS9+J36lBFVLRUSIUtyD/uWpAE= -github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/crossdock/crossdock-go v0.0.0-20160816171116-049aabb0122b/go.mod h1:v9FBN7gdVTpiD/+LZ7Po0UKvROyT87uLVxTHVky/dlQ= github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ= github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s= github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8= github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I= -github.com/davecgh/go-spew v0.0.0-20161028175848-04cdfd42973b/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -517,10 +487,7 @@ github.com/denisenkom/go-mssqldb v0.12.0 h1:VtrkII767ttSPNRfFekePK3sctr+joXgO58s github.com/dennwc/varint v1.0.0 h1:kGNFFSSw8ToIy3obO/kKr8U9GZYUAxQEVuix4zfDWzE= github.com/dennwc/varint v1.0.0/go.mod h1:hnItb35rvZvJrbTALZtY/iQfDs48JKRG1RPpgziApxA= github.com/devigned/tab v0.1.1 h1:3mD6Kb1mUOYeLpJvTVSDwSg5ZsfSxfvxGRTxRsJsITA= -github.com/dgraph-io/badger/v3 v3.2103.2/go.mod h1:RHo4/GmYcKKh5Lxu63wLEMHJ70Pac2JqZRYGhlyAo2M= -github.com/dgraph-io/ristretto v0.1.0/go.mod h1:fux0lOrBhrVCJd3lcTHsIJhq1T2rokOu6v9Vcb3Q9ug= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/digitalocean/godo v1.78.0 h1:hKMfHXChSMjZFMSev+m5R4/2rxZ3HPdhlpeA2pJI72M= @@ -542,7 +509,6 @@ github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5Xh github.com/docker/go-events v0.0.0-20170721190031-9461782956ad/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= @@ -554,7 +520,6 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/dynatrace-oss/dynatrace-metric-utils-go v0.3.0 h1:q2Ayh9s6Cr75bS5URiOUAoyFXemgKQaBJphbhAaJHCY= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q= -github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0 h1:YOEu7KNc61ntiQlcEeUIoDTJ2o8mQznoNvUhiigpIqc= @@ -573,11 +538,9 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 h1:xvqufLtNVwAhN8NMyWklVgxnWohi+wtMGQMhtxexlm0= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4gg31M/xaciQlDml8= github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= @@ -594,38 +557,30 @@ github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/frankban/quicktest v1.4.0/go.mod h1:36zfPVQyHxymz4cH7wlDmVwDrJuljRB60qkgn7rorfQ= github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.13.0 h1:yNZif1OkDfNoDfb9zZa9aXIpejNR4F23Wely0c+Qdqk= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= -github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= -github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= -github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa/go.mod h1:KnogPXtdwXqoenmZCw6S+25EAm2MkxbG0deNDu4cbSA= -github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= -github.com/gdamore/tcell v1.3.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= -github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-asn1-ber/asn1-ber v1.5.4 h1:vXT6d/FNDiELJnLb6hGNa309LMsrCoYFvpwHDF0+Y1A= -github.com/go-asn1-ber/asn1-ber v1.5.4/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0= +github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -651,109 +606,38 @@ github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbV github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.0/go.mod h1:YkVgnZu1ZjjL7xTxrfm/LLZBfkhTqSR1ydtm6jTKKwI= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= -github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= -github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.4/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= -github.com/go-openapi/analysis v0.19.10/go.mod h1:qmhS3VNFxBlquFJ0RGoDtylO9y4pgTAUNE9AEEMdlJQ= -github.com/go-openapi/analysis v0.19.16/go.mod h1:GLInF007N83Ad3m8a/CbQ5TPzdnGT7workfHwuVjNVk= -github.com/go-openapi/analysis v0.20.0/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= -github.com/go-openapi/analysis v0.20.1/go.mod h1:BMchjvaHDykmRMsK40iPtvyOfFdMMxlOmQr9FBZk+Og= github.com/go-openapi/analysis v0.21.2/go.mod h1:HZwRk4RRisyG8vx2Oe6aqeSQcoxRp47Xkp3+K6q+LdY= -github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.3/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= -github.com/go-openapi/errors v0.19.6/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.19.7/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.8/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.19.9/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= -github.com/go-openapi/errors v0.20.1/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/errors v0.20.2/go.mod h1:cM//ZKUKyO06HSwqAelJ5NsEMMcpa6VpXe8DOa1Mi1M= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= -github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= -github.com/go-openapi/jsonpointer v0.18.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= -github.com/go-openapi/jsonreference v0.17.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= -github.com/go-openapi/jsonreference v0.18.0/go.mod h1:g4xxGn04lDIRh0GJb5QlpE3HfopLOL6uZrK/VgnsK9I= github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= -github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.3/go.mod h1:YVfqhUCdahYwR3f3iiwQLhicVRvLlU/WO5WPaZvcvSI= -github.com/go-openapi/loads v0.19.5/go.mod h1:dswLCAdonkRufe/gSUC3gN8nTSaB9uaS2es0x5/IbjY= -github.com/go-openapi/loads v0.19.6/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= -github.com/go-openapi/loads v0.19.7/go.mod h1:brCsvE6j8mnbmGBh103PT/QLHfbyDxA4hsKvYBNEGVc= -github.com/go-openapi/loads v0.20.0/go.mod h1:2LhKquiE513rN5xC6Aan6lYOSddlL8Mp20AW9kpviM4= -github.com/go-openapi/loads v0.20.2/go.mod h1:hTVUotJ+UonAMMZsvakEgmWKgtulweO9vYP2bQYKA/o= -github.com/go-openapi/loads v0.21.0/go.mod h1:rHYve9nZrQ4CJhyeIIFJINGCg1tQpx2yJrrNo8sf1ws= github.com/go-openapi/loads v0.21.1/go.mod h1:/DtAMXXneXFjbQMGEtbamCZb+4x7eGwkvZCvBmwUG+g= -github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= -github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= -github.com/go-openapi/runtime v0.19.15/go.mod h1:dhGWCTKRXlAfGnQG0ONViOZpjfg0m2gUt9nTQPQZuoo= -github.com/go-openapi/runtime v0.19.16/go.mod h1:5P9104EJgYcizotuXhEuUrzVc+j1RiSjahULvYmlv98= -github.com/go-openapi/runtime v0.19.24/go.mod h1:Lm9YGCeecBnUUkFTxPC4s1+lwrkJ0pthx8YvyjCfkgk= -github.com/go-openapi/runtime v0.22.0/go.mod h1:aQg+kaIQEn+A2CRSY1TxbM8+sT9g2V3aLc1FbIAnbbs= github.com/go-openapi/runtime v0.23.1/go.mod h1:AKurw9fNre+h3ELZfk6ILsfvPN+bvvlaU/M9q/r9hpk= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= -github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.18.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= -github.com/go-openapi/spec v0.19.2/go.mod h1:sCxk3jxKgioEJikev4fgkNmwS+3kuYdJtcsZsD5zxMY= github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.6/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.8/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/spec v0.19.15/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= -github.com/go-openapi/spec v0.20.0/go.mod h1:+81FIL1JwC5P3/Iuuozq3pPE9dXdIEGxFutcFKaVbmU= -github.com/go-openapi/spec v0.20.1/go.mod h1:93x7oh+d+FQsmsieroS4cmR3u0p/ywH649a3qwC9OsQ= -github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg= github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I= -github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= -github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.2/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= -github.com/go-openapi/strfmt v0.19.4/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.5/go.mod h1:eftuHTlB/dI8Uq8JJOyRlieZf+WkkxUuk0dgdHXr2Qk= -github.com/go-openapi/strfmt v0.19.11/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= -github.com/go-openapi/strfmt v0.20.0/go.mod h1:UukAYgTaQfqJuAFlNxxMWNvMYiwiXtLsF2VwmoFtbtc= -github.com/go-openapi/strfmt v0.20.2/go.mod h1:43urheQI9dNtE5lTZQfuFJvjYJKPrxicATpEfZwHUNk= github.com/go-openapi/strfmt v0.21.0/go.mod h1:ZRQ409bWMj+SOgXofQAGTIo2Ebu72Gs+WaRADcS5iNg= github.com/go-openapi/strfmt v0.21.1/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/strfmt v0.21.2/go.mod h1:I/XVKeLc5+MM5oPNN7P6urMOpuLXEcNrCX/rPGuWb0k= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= -github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= -github.com/go-openapi/swag v0.18.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.7/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.9/go.mod h1:ao+8BpOPyKdpQz3AOJfbeEVpLmWAvlT1IfTe5McPyhY= -github.com/go-openapi/swag v0.19.12/go.mod h1:eFdyEBkTdoAf/9RXBvj4cr1nH7GD8Kzo5HTt47gr72M= -github.com/go-openapi/swag v0.19.13/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= -github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.3/go.mod h1:90Vh6jjkTn+OT1Eefm0ZixWNFjhtOH7vS9k0lo6zwJo= -github.com/go-openapi/validate v0.19.10/go.mod h1:RKEZTUWDkxKQxN2jDT7ZnZi2bhZlbNMAuKvKB+IaGx8= -github.com/go-openapi/validate v0.19.12/go.mod h1:Rzou8hA/CBw8donlS6WNEUQupNvUZ0waH08tGe6kAQ4= -github.com/go-openapi/validate v0.19.15/go.mod h1:tbn/fdOwYHgrhPBzidZfJC2MIVvs9GA7monOmWBbeCI= -github.com/go-openapi/validate v0.20.1/go.mod h1:b60iJT+xNNLfaQJUqLI7946tYiFEOuE9E4k54HpKcJ0= -github.com/go-openapi/validate v0.20.3/go.mod h1:goDdqVGiigM3jChcrYJxD2joalke3ZXeftD16byIjA4= github.com/go-openapi/validate v0.21.0/go.mod h1:rjnrwK57VJ7A8xqfpAOEKRH8yQSGUriMu5/zuPSQ1hg= github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c h1:fWdhUpCuoeNIPiQ+pkAmmERYEjhVx5/cbVGK7T99OkI= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= @@ -763,7 +647,6 @@ github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn github.com/go-redis/redis v6.15.9+incompatible h1:K0pv1D7EQUjfyoMql+r/jZqCLizCGKFlFgcHWWmHQjg= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 h1:JVrqSeQfdhYRFk24TvhTZWU0q8lfCojxZQFi3Ou7+uY= github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48/go.mod h1:dZGr0i9PLlaaTD4H/hoZIDjQ+r6xq8mgbRzHZf7f2J8= -github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw= @@ -799,7 +682,6 @@ github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY9 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-yaml v1.9.5/go.mod h1:U/jl18uSupI5rdI2jmuCswEA2htH9eXfferR3KfscvA= -github.com/gocql/gocql v0.0.0-20211222173705-d73e6b1002a7/go.mod h1:3gM2c4D3AnkISwBxGnMMsS8Oy4y2lhbPRsH4xnJrHG8= github.com/godbus/dbus v0.0.0-20151105175453-c7fdd8b5cd55/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= @@ -811,7 +693,6 @@ github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZg github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/googleapis v1.2.0/go.mod h1:Njal3psf3qN6dwBtQfUmBZh2ybovJ0tlu3o/AC7HYjU= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= -github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= @@ -822,8 +703,7 @@ github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69 github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.2.0 h1:besgBTC8w8HjP6NzQdxwKH9Z5oQMZ24ThTrHp3cZ8eU= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= -github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= -github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= +github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 h1:+eHOFJl1BaXrQxKX+T06f78590z4qA2ZzBTqahsKSE4= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -873,7 +753,6 @@ github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.44.0 h1:523mBK94XHKAsU1TIQl/tYoPyYpWQdalf2CQ8Gv2Xek= github.com/google/cadvisor v0.44.0/go.mod h1:GQ9KQfz0iNHQk3D6ftzJWK4TXabfIgM10Oy3FkR+Gzg= -github.com/google/flatbuffers v1.12.1/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -941,13 +820,10 @@ github.com/gophercloud/gophercloud v0.24.0/go.mod h1:Q8fZtyi5zZxPS/j9aj3sSxtvj41 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= -github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= -github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= @@ -967,14 +843,11 @@ github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= -github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/gwos/tcg/sdk v0.0.0-20211223101342-35fbd1ae683c h1:befb5xGUwNCoBuN/akLFCKekUzr0ixyws3aAX/7TaOk= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= -github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/harlow/kinesis-consumer v0.3.5 h1:xeiDp2frP8DdKDeOzVuS+vaBX03JjifQO/Apzu4IOMA= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= github.com/hashicorp/consul/api v1.12.0 h1:k3y1FYv6nuKyNTqj6w9gXOx5r5CfLj/k/euUeBXj1OY= github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -992,10 +865,7 @@ github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9 github.com/hashicorp/go-hclog v0.8.0/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.12.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.1.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-hclog v1.2.0 h1:La19f8d7WIlm4ogzNHB0JGqs5AUDAZ2UfCY4sJXcJdM= github.com/hashicorp/go-hclog v1.2.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= @@ -1010,7 +880,6 @@ github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY= -github.com/hashicorp/go-plugin v1.4.3/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-retryablehttp v0.5.4/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= @@ -1024,13 +893,13 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= -github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= @@ -1049,7 +918,6 @@ github.com/hashicorp/vault/api v1.0.4/go.mod h1:gDcqh3WGcR1cpF5AJz/B1UFheUEneMoI github.com/hashicorp/vault/sdk v0.1.13/go.mod h1:B+hVj7TpuQY1Y/GPbCpffmgd+tSEwvhkWnjtSYCaS2M= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= -github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hetznercloud/hcloud-go v1.33.1 h1:W1HdO2bRLTKU4WsyqAasDSpt54fYO4WNckWYfH5AuCQ= github.com/hetznercloud/hcloud-go v1.33.1/go.mod h1:XX/TQub3ge0yWR2yHWmnDVIrB+MQbda1pHxkUmDlUME= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -1064,6 +932,7 @@ github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/influxdata/go-syslog/v3 v3.0.0 h1:jichmjSZlYK0VMmlz+k4WeOQd7z745YLsvGMqwtYt4I= github.com/influxdata/influxdb-observability/common v0.2.10 h1:5sQwU7KQYWSB7ZuPZXO39yQJ2nw2FPoxWeLoNK2jKRE= @@ -1094,23 +963,14 @@ github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg= github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38= github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w= -github.com/jaegertracing/jaeger v1.31.0/go.mod h1:KukZMhuamI3NVbzWmngcmXbcnxiB3WyaNf0nxio+sUw= -github.com/jaegertracing/jaeger v1.33.0 h1:dQlFIzMjcKrLCPeqMrHYIzzooQndjgxQIMTbfv0URRM= -github.com/jaegertracing/jaeger v1.33.0/go.mod h1:e+VRpxSeRWWwlVN1ORhlG4Kv7IVmXkp6z80jtYsjtDU= +github.com/jaegertracing/jaeger v1.26.0 h1:4LbUdb9l/Mx83zYvjLbkrayheX+Aga26NEI+feo3xzA= github.com/james4k/rcon v0.0.0-20120923215419-8fbb8268b60a h1:JxcWget6X/VfBMKxPIc28Jel37LGREut2fpV+ObkwJ0= github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8= -github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo= -github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.0.0 h1:J7uCkflzTEhUZ64xqKnkDxq3kzc96ajM1Gli5ktUem8= -github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o= -github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg= github.com/jcmturner/gokrb5/v8 v8.4.2 h1:6ZIM6b/JJN0X8UM43ZOM6Z4SJzla+a/u7scXFJzodkA= -github.com/jcmturner/gokrb5/v8 v8.4.2/go.mod h1:sb+Xq/fTY5yktf/VxLsE3wlfPqQjp0aWNYyvBVK62bc= github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY= -github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= -github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca h1:a0GZUdb+qnutF8shJxr2qs2qT3fnF+ptxTxPB8+oIvk= github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1118,6 +978,7 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= @@ -1145,21 +1006,17 @@ github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0Lh github.com/karrick/godirwalk v1.12.0 h1:nkS4xxsjiZMvVlazd0mFyiwD4BR9f3m6LXGhM2TUx3Y= github.com/karrick/godirwalk v1.12.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.11.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= github.com/klauspost/compress v1.11.13/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8eO+e+Dq5Gzg= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.1/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.2/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/knadh/koanf v1.4.0/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= +github.com/klauspost/compress v1.15.6 h1:6D9PcO8QWu0JyaQ2zUMmu16T1T+zjjEpP91guRsvDfY= +github.com/knadh/koanf v1.4.1 h1:Z0VGW/uo8NJmjd+L1Dc3S5frq6c62w5xQ9Yf4Mg3wFQ= +github.com/knadh/koanf v1.4.1/go.mod h1:1cfH5223ZeZUOs8FU2UdTmaNfHpqgtjV0+NHjRO43gs= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -1181,27 +1038,21 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leesper/go_rng v0.0.0-20190531154944-a612b043e353 h1:X/79QL0b4YJVO5+OsPH9rF2u428CIrGL/jLmPsoOQQ4= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b h1:11UHH39z1RhZ5dc4y4r/4koJo6IYFgTRMe/LlwRTEw0= -github.com/leodido/ragel-machinery v0.0.0-20190525184631-5f46317e436b/go.mod h1:WZxr2/6a/Ar9bMDc2rN/LJrE/hF6bXE4LPyDSIxwAfg= +github.com/leodido/ragel-machinery v0.0.0-20181214104525-299bdde78165 h1:bCiVCRCs1Heq84lurVinUPy19keqGEe4jh5vtK37jcg= github.com/linode/linodego v1.4.1 h1:cgpY1jCZ47wfJvWH5V8in7Tphj8T0sR1URiH9e6G2bA= github.com/linode/linodego v1.4.1/go.mod h1:PVsRxSlOiJyvG4/scTszpmZDTdgS+to3X6eS8pRrWI8= github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo= -github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s= -github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= -github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -1224,8 +1075,6 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= @@ -1252,8 +1101,8 @@ github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible h1 github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= -github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw= github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -1266,14 +1115,14 @@ github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS4 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/ipvs v1.0.1 h1:aoZ7fhLTXgDbzVrAnvV+XbKOU8kOET7B3+xULDF/1o0= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= @@ -1300,7 +1149,7 @@ github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3P github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= -github.com/mostynb/go-grpc-compression v1.1.16/go.mod h1:xxa6UoYynYS2h+5HB/Hglu81iYAp87ARaNmhhwi0s1s= +github.com/mostynb/go-grpc-compression v1.1.16 h1:D9tGUINmcII049pxOj9dl32Fzhp26TrDVQXECoKJqQg= github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/multiplay/go-ts3 v1.0.1 h1:Ja8ho7UzUDNvNCwcDzPEPimLRub7MUqbD+sgMWkcR0A= @@ -1337,7 +1186,6 @@ github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U= -github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -1366,8 +1214,6 @@ github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je4 github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.45.1/go.mod h1:TpHOGTSMvUW2JRbpviXoD1s0X0+aThqN2MLROq4+33I= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.45.1/go.mod h1:Jfr+P4ovAzqT6cqUJ2H3gzPF591Pk0yj+r9sXONuDHc= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v0.0.0-20180430190053-c9281466c8b2/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= @@ -1393,8 +1239,6 @@ github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3 github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/opentracing-contrib/go-grpc v0.0.0-20191001143057-db30781987df/go.mod h1:DYR5Eij8rJl8h7gblRrOZ8g0kW1umSpKqYIBTgeDtLo= -github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -1402,25 +1246,20 @@ github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= -github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pierrec/lz4/v3 v3.3.4/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q= -github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE= -github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.8 h1:ieHkV+i2BRzngO4Wd/3HGowuZStgq6QkPsD1eolNAO4= github.com/pion/dtls/v2 v2.0.13 h1:toLgXzq42/MEmfgkXDfzdnwLHMi4tfycaQPGkv9tzRE= github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY= github.com/pion/transport v0.13.0 h1:KWTA5ZrQogizzYwPEciGtHPLwpAjE91FgXnyu+Hv2uY= @@ -1433,7 +1272,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= @@ -1492,18 +1330,16 @@ github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731 h1:THs/itDqjnXLTblN7kE0QhcJ79IbokGJ5e06/WrwxCY= github.com/prometheus/prometheus v0.35.1-0.20220503184552-2381d7be5731/go.mod h1:X/u6JAiaI9Fsu9t7cGXMZCERQHLJjiB01Pue8BXz14s= +github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rabbitmq/amqp091-go v1.2.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= -github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/rhnvrm/simples3 v0.6.1/go.mod h1:Y+3vYm2V7Y4VijFoJHHTrja6OgPrJ2cBti8dPGkC3sA= github.com/riemann/riemann-go-client v0.5.0 h1:yPP7tz1vSYJkSZvZFCsMiDsHHXX57x8/fEX3qyEXuAA= -github.com/rivo/tview v0.0.0-20200219210816-cd38d7432498/go.mod h1:6lkG1x+13OShEf0EaOCaTQYyB7d5nSbb181KtjlS+84= -github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1512,8 +1348,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.2 h1:aIihoIOHCiLZHxyoNQ+ABL4NKhFTgKLBdMLyEAh98m0= github.com/rogpeppe/go-internal v1.6.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1522,33 +1358,26 @@ github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIH github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 h1:ZFfeKAhIQiiOrQaI3/znw0gOmYpO28Tcu1YaqMa/jtQ= github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20200724154423-2164a8ac840e h1:CGjiMQ0wMH4wtNWrlj6kiTbkPt2F3rbYnhGX6TWLfco= -github.com/sanity-io/litter v1.2.0/go.mod h1:JF6pZUFgu2Q0sBZ+HSV35P8TVPI1TTzEwyu9FXAw2W4= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 h1:0roa6gXKgyta64uqh52AQG3wzZXH21unn+ltzQSXML0= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9/go.mod h1:fCa7OJZ/9DRTnOKmxvT6pn+LPWUptQAmHF/SBJUGEcg= -github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 h1:RpforrEYXWkmGwJHIGnLZ3tTWStkjVVstwzNGqxX2Ds= github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/showwin/speedtest-go v1.1.4 h1:pcY1W5LYZu44lH6Fuu80nu/Pj67n//VArlZudbAgR6E= github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3 h1:32k2QLgsKhcEs55q4REPKyIadvid5FPy2+VMgvbmKJ0= -github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3/go.mod h1:gJrXWi7wSGXfiC7+VheQaz+ypdCt5SmZNL+BRxUe7y4= +github.com/signalfx/com_signalfx_metrics_protobuf v0.0.2 h1:X886QgwZH5qr9HIQkk3mWcNEhUxx6D8rUZumzLV4Wiw= github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 h1:WsShHmu12ZztYPfh9b+I+VjYD1o8iOHhB67WZCMEEE8= github.com/signalfx/golib/v3 v3.3.43 h1:GvzjE2WaYU3oPhoek52/5zYZ5tPnt05EXUmszSZct+E= -github.com/signalfx/sapm-proto v0.9.0 h1:x4EfhzOZtBGyt2x8gc/C23Id9B+3lf1zE59VUWLKbpQ= -github.com/signalfx/sapm-proto v0.9.0/go.mod h1:OmhyyGyhBzoKQn6G2wM1vpEsGKGo0lym/kj0G41KqZk= +github.com/signalfx/sapm-proto v0.7.2 h1:iM/y3gezQm1/j7JBS0gXhEJ8ROeneb6DY7n0OcnvLks= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1568,33 +1397,27 @@ github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4k github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.2-0.20171109065643-2da4a54c5cee/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= +github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= +github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -1605,7 +1428,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v0.0.0-20180303142811-b89eecf5ca5d/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1630,10 +1452,8 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1641,19 +1461,12 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= -github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= -github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= -github.com/uber/jaeger-lib v2.4.1+incompatible h1:td4jdvLcExb4cBISKIpHuGoVXh+dVKhn2Um6rjCsSsg= -github.com/uber/jaeger-lib v2.4.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/urfave/cli v0.0.0-20171014202726-7bc6a0acffa5/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= -github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/vapourismo/knx-go v0.0.0-20211128234507-8198fa17db36 h1:JBj2CqnFwBhI3XsdMNn9MjKvehog+p5QZihotqq0Zuo= -github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw= github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= @@ -1676,15 +1489,10 @@ github.com/wvanbergen/kazoo-go v0.0.0-20180202103751-f72d8611297a h1:ILoU84rj4AQ github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/scram v1.1.0/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= -github.com/xdg-go/scram v1.1.1 h1:VOMT+81stJgXW3CpHyqHN3AXDYIMsx56mEFrB37Mb/E= -github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g= +github.com/xdg-go/scram v1.1.0 h1:d70R37I0HrDLsafRrMBXyrD4lmQbCHE873t00Vr0gm0= +github.com/xdg-go/stringprep v1.0.2 h1:6iq84/ryjjeRmMJwxutI51F2GIPlP5BfTvXHeYjyhBc= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= -github.com/xdg-go/stringprep v1.0.3 h1:kdwGpVNwPFtjs98xCGkHjQtGKh86rDcRZN17QEMCOIs= -github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8= -github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I= github.com/xdg/scram v1.0.3 h1:nTadYh2Fs4BK2xdldEa2g5bbaZp0/+1nJMMPtPxS/to= -github.com/xdg/stringprep v0.0.0-20180714160509-73f8eece6fdc/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y= github.com/xdg/stringprep v1.0.3 h1:cmL5Enob4W83ti/ZHuZLuKD/xqJfus4fVPwE+/BDm+4= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -1704,8 +1512,7 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/gopher-lua v0.0.0-20220413183635-c841877397d8 h1:YZGz13Wg1lXFpptej1c6fX22klQk4S9NaC6fiiu+kC0= -github.com/yuin/gopher-lua v0.0.0-20220413183635-c841877397d8/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= +github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -1714,23 +1521,12 @@ go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489/go.mod h1:yVHk9ub3CSBatqGNg7GRmsnfLWtoW60w4eDYfh7vHDg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= -go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.3.0/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.3.4/go.mod h1:MSWZXKOynuguX+JSvwP8i+58jYCXxbia8HS3gZBapIE= -go.mongodb.org/mongo-driver v1.4.3/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.4.4/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.4.6/go.mod h1:WcMNYLx/IlOxLe6JRJiv2uXuCz6zBLndR4SoGjYphSc= -go.mongodb.org/mongo-driver v1.5.1/go.mod h1:gRXCHX4Jo7J0IJ1oDQyUxF7jfy19UfxniMS4xxMmUqw= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= @@ -1744,25 +1540,27 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.45.0/go.mod h1:7QaqwfebCFzvH4q96IAaqqxj3VzB37VBn22uIpNKeG4= -go.opentelemetry.io/collector/model v0.44.0/go.mod h1:4jo1R8uBDspLCxUGhQ0k3v/EFXFbW7s0AIy3LuGLbcU= -go.opentelemetry.io/collector/model v0.45.0/go.mod h1:uyiyyq8lV45zrJ94MnLip26sorfNLP6J9XmOvaEmy7w= -go.opentelemetry.io/collector/model v0.48.0 h1:xmN4LdZ92q6PZnaKhMdIlC5KGtPJeOYaWCnA1PQ2oZw= -go.opentelemetry.io/collector/model v0.48.0/go.mod h1:1QVYv8TqsTMt9wVC5BUF9fqMVtk2C5EclWDnuVqdKoU= +go.opentelemetry.io/collector v0.53.0 h1:p4XwnAltBnw/gCRTk+DHTJVGYLzD5cPHp+0XK/KKE/s= +go.opentelemetry.io/collector v0.53.0/go.mod h1:MMSqz2ImXjLrZB26cC8vrtgnjsza3hpc760NNjsmjwE= +go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= +go.opentelemetry.io/collector/pdata v0.53.0 h1:jezCyHu/LXs4P/GzKObCabU2/OUTivNBlQHGPAo/dZo= +go.opentelemetry.io/collector/pdata v0.53.0/go.mod h1:25b+xH0uJwp8H3f0a1V+OQfxbhYVds6Rf1Ul+HFCGo4= +go.opentelemetry.io/collector/semconv v0.53.0 h1:J1lVnFp1VyNKU63rc7csY9/54Tjm9BlLylXLjPimf7s= +go.opentelemetry.io/collector/semconv v0.53.0/go.mod h1:SxK0rUnUP7YeDakexzbE/vhimTOHwE6m/4aKKd9e27Q= +go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.28.0/go.mod h1:vEhqr0m4eTc+DWxfsXoXue2GBgV2uUwVznkGIHW/e5w= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.32.0 h1:WenoaOMNP71oq3KkMZ/jnxI9xU/JSCLw8yZILSI2lfU= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.28.0/go.mod h1:Ihno+mNBfZlT0Qot3XyRTdZ/9U/Cg2Pfgj75DTdIfq4= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.29.0/go.mod h1:tLYsuf2v8fZreBVwp9gVMhefZlLFZaUiNVSq8QxXRII= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.31.0/go.mod h1:PFmBsWbldL1kiWZk9+0LBZz2brhByaGsvp6pRICMlPE= -go.opentelemetry.io/contrib/zpages v0.28.0/go.mod h1:y5RYQQgfEQV6oASayfbUv5ye5bnnncor+Ln18jMrVKY= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.32.0 h1:mac9BKRqwaX6zxHPDe3pvmWpwuuIM0vuXv2juCnQevE= +go.opentelemetry.io/contrib/zpages v0.32.0 h1:AVKTx5ppWDaem7A61HFsO1T3CK/t6kFRQoZQMj0/TW4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel v1.3.0/go.mod h1:PWIKzi6JCp7sM0k9yZ43VX+T345uNbAkDKwHVjb2PTs= -go.opentelemetry.io/otel v1.4.0/go.mod h1:jeAqMFKy2uLIxCtKxoFj0FAL5zAPKQagc3+GtBWakzk= -go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4= go.opentelemetry.io/otel v1.6.0/go.mod h1:bfJD2DZVw0LBxghOTlgnlI0CV3hLDu9XF/QKOUXMTQQ= go.opentelemetry.io/otel v1.6.1/go.mod h1:blzUabWHkX6LJewxvadmzafgh/wnvBSDBdOuwkAtrWQ= +go.opentelemetry.io/otel v1.7.0 h1:Z2lA3Tdch0iDcrhJXDIlC94XE+bxok1F9B+4Lz/lGsM= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.3.0/go.mod h1:VpP4/RMn8bv8gNo9uK7/IMY4mtWLELsS+JIP0inH0h4= @@ -1773,39 +1571,36 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.3.0/go.mod h1 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.6.1/go.mod h1:UJJXJj0rltNIemDMwkOJyggsvyMG9QHfJeFH0HS5JjM= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0/go.mod h1:QNX1aly8ehqqX1LEa6YniTU7VY9I6R3X/oPxhGdTceE= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.6.1/go.mod h1:DAKwdo06hFLc0U88O10x4xnb5sc7dDRDqRuiN+io8JE= -go.opentelemetry.io/otel/exporters/prometheus v0.27.0/go.mod h1:u0vTzijx2B6gGDa8FuIVoESW6z0HdKkXZWZMSTsoJKs= -go.opentelemetry.io/otel/internal/metric v0.26.0/go.mod h1:CbBP6AxKynRs3QCbhklyLUtpfzbqCLiafV9oY2Zj1Jk= -go.opentelemetry.io/otel/internal/metric v0.27.0/go.mod h1:n1CVxRqKqYZtqyTh9U/onvKapPGv7y/rpyOTI+LFNzw= +go.opentelemetry.io/otel/exporters/prometheus v0.30.0 h1:YXo5ZY5nofaEYMCMTTMaRH2cLDZB8+0UGuk5RwMfIo0= +go.opentelemetry.io/otel/exporters/prometheus v0.30.0/go.mod h1:qN5feW+0/d661KDtJuATEmHtw5bKBK7NSvNEP927zSs= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v0.26.0/go.mod h1:c6YL0fhRo4YVoNs6GoByzUgBp36hBL523rECoZA5UWg= -go.opentelemetry.io/otel/metric v0.27.0/go.mod h1:raXDJ7uP2/Jc0nVZWQjJtzoyssOYWu/+pjZqRzfvZ7g= go.opentelemetry.io/otel/metric v0.28.0/go.mod h1:TrzsfQAmQaB1PDcdhBauLMk7nyyg9hm+GoQq/ekE9Iw= +go.opentelemetry.io/otel/metric v0.30.0 h1:Hs8eQZ8aQgs0U49diZoaS6Uaxw3+bBE3lcMUKBFIk3c= +go.opentelemetry.io/otel/metric v0.30.0/go.mod h1:/ShZ7+TS4dHzDFmfi1kSXMhMVubNoP0oIaBp70J6UXU= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= go.opentelemetry.io/otel/sdk v1.3.0/go.mod h1:rIo4suHNhQwBIPg9axF8V9CA72Wz2mKF1teNrup8yzs= -go.opentelemetry.io/otel/sdk v1.4.0/go.mod h1:71GJPNJh4Qju6zJuYl1CrYtXbrgfau/M9UAggqiy1UE= go.opentelemetry.io/otel/sdk v1.6.1/go.mod h1:IVYrddmFZ+eJqu2k38qD3WezFR2pymCzm8tdxyh3R4E= +go.opentelemetry.io/otel/sdk v1.7.0 h1:4OmStpcKVOfvDOgCt7UriAPtKolwIhxpnSNI/yK+1B0= +go.opentelemetry.io/otel/sdk v1.7.0/go.mod h1:uTEOTwaqIVuTGiJN7ii13Ibp75wJmYUDe374q6cZwUU= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= -go.opentelemetry.io/otel/sdk/export/metric v0.27.0/go.mod h1:d30U31er9jws2ZMsV1N36Zyr2v8QA5E3NtAQvj1WFQo= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v0.27.0/go.mod h1:lOgrT5C3ORdbqp2LsDrx+pBj6gbZtQ5Omk27vH3EaW0= +go.opentelemetry.io/otel/sdk/metric v0.30.0 h1:XTqQ4y3erR2Oj8xSAOL5ovO5011ch2ELg51z4fVkpME= +go.opentelemetry.io/otel/sdk/metric v0.30.0/go.mod h1:8AKFRi5HyvTR0RRty3paN1aMC9HMT+NzcEhw/BLkLX8= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= go.opentelemetry.io/otel/trace v1.3.0/go.mod h1:c/VDhno8888bvQYmbYLqe41/Ldmr/KKunbvWM4/fEjk= -go.opentelemetry.io/otel/trace v1.4.0/go.mod h1:uc3eRsqDfWs9R7b92xbQbU42/eTNz4N+gLP8qJCi4aE= -go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc= go.opentelemetry.io/otel/trace v1.6.0/go.mod h1:qs7BrU5cZ8dXQHBGxHMOxwME/27YH2qEp4/+tZLLwJE= go.opentelemetry.io/otel/trace v1.6.1/go.mod h1:RkFRM1m0puWIq10oxImnGEduNBzxiN7TXluRBtE+5j0= +go.opentelemetry.io/otel/trace v1.7.0 h1:O37Iogk1lEkMRXewVtZ1BBTVn5JEp8GrJvP92bJqC6o= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.11.0/go.mod h1:QpEjXPrNQzrFDZgoTo49dgHR9RYRSrg3NAKnUGl9YpQ= -go.opentelemetry.io/proto/otlp v0.12.0/go.mod h1:TsIjwGWIx5VFYv9KGVlOpxoBl5Dy+63SUguV7GGvlSQ= go.opentelemetry.io/proto/otlp v0.12.1/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= go.uber.org/automaxprocs v1.5.1/go.mod h1:BF4eumQw0P9GtnuxxovUd06vwm1o18oMzFtK66vU6XU= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= @@ -1814,27 +1609,23 @@ go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= +go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= +go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8= go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190320223903-b7391e95e576/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= @@ -1843,14 +1634,12 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201112155050-0c6587e931a9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1900,11 +1689,9 @@ golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1913,7 +1700,6 @@ golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -1925,7 +1711,6 @@ golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1940,7 +1725,6 @@ golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -1962,7 +1746,6 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1971,7 +1754,6 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220105145211-5b0dc2dfae98/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1992,7 +1774,6 @@ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -2018,14 +1799,11 @@ golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190321052220-f7bb7a8bee54/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2039,7 +1817,6 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2094,7 +1871,6 @@ golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201117170446-d9b008d0a637/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201202213521-69691e467435/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -2118,17 +1894,14 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210611083646-a4fc73990273/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2138,7 +1911,6 @@ golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2183,7 +1955,6 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -2199,7 +1970,6 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190617190820-da514acc4774/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -2244,7 +2014,6 @@ golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82u golang.org/x/tools v0.0.0-20200916195026-c9a70fc28ce3/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= @@ -2300,9 +2069,7 @@ google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6 google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/api v0.67.0/go.mod h1:ShHKP8E60yPsKNw/w8w+VYaj9H6buA5UqDp8dhbQZ6g= google.golang.org/api v0.70.0/go.mod h1:Bs4ZM2HGifEvXwd50TtW70ovgJffJYw2oRCOFU/SkfA= @@ -2318,7 +2085,6 @@ google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCID google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -2383,11 +2149,7 @@ google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEc google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211221195035-429b39de9b1c/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= @@ -2402,7 +2164,6 @@ google.golang.org/genproto v0.0.0-20220407144326-9054f6ed7bac/go.mod h1:8w6bsBMX google.golang.org/genproto v0.0.0-20220413183235-5e96e2839df9/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4 h1:myaecH64R0bIEDjNORIel4iXubqzaHU1K2z8ajBwWcM= google.golang.org/genproto v0.0.0-20220414192740-2d67ff6cf2b4/go.mod h1:8w6bsBMX6yCPbAVTeqQHvzxW0EIFigd5lZyahWgyfDo= -google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -2438,8 +2199,9 @@ google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ5 google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.46.0 h1:oCjezcn6g6A75TGoKYBPgKmVBLexhYLM6MebdrPApP8= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= +google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2477,9 +2239,7 @@ gopkg.in/gorethink/gorethink.v3 v3.0.5 h1:e2Uc/Xe+hpcVQFsj6MuHlYog3r0JYpnTzwDj/y gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/olivere/elastic.v5 v5.0.86 h1:xFy6qRCGAmo5Wjx96srho9BitLhZl2fcnpuidPwduXM= @@ -2505,8 +2265,9 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= @@ -2581,137 +2342,16 @@ k8s.io/utils v0.0.0-20211116205334-6203023598ed h1:ck1fRPWPJWsMd8ZRFsWc6mh/zHp5f k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= -modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= -modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= -modernc.org/cc/v3 v3.35.25/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= modernc.org/cc/v3 v3.35.26 h1:S4B+fg6/9krLtfZ9lr7pfKiESopiv+Sm6lUUI3oc0fY= modernc.org/cc/v3 v3.35.26/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI= -modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60= -modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw= -modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI= -modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag= -modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw= -modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ= -modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c= -modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo= -modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg= -modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I= -modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs= -modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8= -modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE= -modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk= -modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w= -modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE= -modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8= -modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc= -modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU= -modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE= -modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk= -modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI= -modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE= -modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg= -modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74= -modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU= -modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU= -modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc= -modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM= -modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ= -modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84= -modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ= -modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY= -modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w= -modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU= -modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko= -modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA= -modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4= -modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0= -modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8= -modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I= -modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ= -modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE= -modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24= -modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0= -modernc.org/ccgo/v3 v3.15.19/go.mod h1:TDJj+DxR26pkDteH2E5WQDj/xlmtsX7JdzkJkaZhOVU= -modernc.org/ccgo/v3 v3.16.2 h1:FUklsEMps3Y2heuTOmn/l6mv83nQgCjW3nsU+1JXzuQ= -modernc.org/ccgo/v3 v3.16.2/go.mod h1:w55kPTAqvRMAYS3Lwij6qhqIuBEYS3Z8QtDkjD8cnik= -modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= -modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w= -modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q= -modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg= -modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M= -modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU= -modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE= -modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso= -modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8= -modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8= -modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I= -modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk= -modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY= -modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE= -modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg= -modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM= -modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg= -modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo= -modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8= -modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ= -modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA= -modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM= -modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg= -modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE= -modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM= -modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU= -modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw= -modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M= -modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18= -modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8= -modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw= -modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0= -modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI= -modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE= -modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= -modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ= -modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c= -modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI= -modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ= -modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk= -modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34= -modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ= -modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak= -modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0= -modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo= -modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo= -modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ= -modernc.org/libc v1.15.0 h1:/CTHjQ1QO5mkLDeQICuA9Vh0YvhQTMqtCF2urQTaod8= -modernc.org/libc v1.15.0/go.mod h1:H1OKCu+NYa9+uQG8WsP7DndMBP61I4PWH8ivWhbdoWQ= -modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= +modernc.org/ccgo/v3 v3.9.4 h1:mt2+HyTZKxva27O6T4C9//0xiNQ/MornL3i8itM5cCs= +modernc.org/libc v1.9.5 h1:zv111ldxmP7DJ5mOIqzRbza7ZDl3kh4ncKfASB2jIYY= modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8= modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= -modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc= -modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM= -modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE= modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A= -modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/sqlite v1.10.8 h1:tZzV+/FwlSBddiJAHLR+qxsw2nx7jpLMKOCVu6NTjxI= modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs= modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw= diff --git a/integration/test/performancetest/performance_test.go b/integration/test/performancetest/performance_test.go index 7ae09e47e6..a786c1aefe 100644 --- a/integration/test/performancetest/performance_test.go +++ b/integration/test/performancetest/performance_test.go @@ -14,28 +14,28 @@ import ( "testing" "time" - "github.com/aws/amazon-cloudwatch-agent/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) const ( - configOutputPath = "/opt/aws/amazon-cloudwatch-agent/bin/config.json" + configOutputPath = "/opt/aws/amazon-cloudwatch-agent/bin/config.json" agentRuntimeMinutes = 5 //20 mins desired but 5 mins for testing purposes - DynamoDBDataBase = "CWAPerformanceMetrics" - testLogNum = "PERFORMANCE_NUMBER_OF_LOGS" + DynamoDBDataBase = "CWAPerformanceMetrics" + testLogNum = "PERFORMANCE_NUMBER_OF_LOGS" ) //this struct is derived from plugins/inputs/logfile FileConfig struct type LogInfo struct { - FilePath string `json:"file_path"` - LogGroupName string `json:"log_group_name"` - LogStreamName string `json:"log_stream_name"` - Timezone string `json:"timezone"` + FilePath string `json:"file_path"` + LogGroupName string `json:"log_group_name"` + LogStreamName string `json:"log_stream_name"` + Timezone string `json:"timezone"` } func TestPerformance(t *testing.T) { //get number of logs for test from github action //@TODO - logNum, err := strconv.Atoi(os.Getenv(testLogNum)) + logNum, err := strconv.Atoi(os.Getenv(testLogNum)) if err != nil { t.Fatalf("Error: cannot convert test log number to integer, %v", err) } @@ -53,22 +53,19 @@ func TestPerformance(t *testing.T) { //defer deleting log group first because golang handles defers in LIFO order //and we want to delete the log group after deleting the log streams defer test.DeleteLogGroup(instanceId) - + for _, logStream := range logStreams { defer test.DeleteLogStream(instanceId, logStream) } - - log.Printf("config generated at %s\n", configFilePath) defer os.Remove(configFilePath) - tpsVals := []int { + tpsVals := []int{ 10, 100, 1000, } - //data base dynamoDB := InitializeTransmitterAPI(DynamoDBDataBase) //add cwa version here @@ -95,7 +92,7 @@ func TestPerformance(t *testing.T) { //collect data data, err := GetPerformanceMetrics(instanceId, agentRuntimeMinutes, logNum, tps, agentContext, configFilePath) - + //@TODO check if metrics are zero remove them and make sure there are non-zero metrics existing if err != nil { t.Fatalf("Error: %v", err) @@ -105,9 +102,9 @@ func TestPerformance(t *testing.T) { t.Fatalf("No data") } // this print shows the sendItem packet,it can be used to debug attribute issues - fmt.Printf("%v \n",data) - - _, err = dynamoDB.SendItem(data,tps) + fmt.Printf("%v \n", data) + + _, err = dynamoDB.SendItem(data, tps) if err != nil { t.Fatalf("Error: couldn't upload metric data to table, %v", err) } @@ -118,10 +115,10 @@ func TestPerformance(t *testing.T) { /* GenerateConfig takes the number of logs to be monitored and applies it to a default config (at ./resources/config.json) * it writes logs to be monitored of the form /tmp/testNUM.log where NUM is from 1 to number of logs requested to * ./resources/configNUM.json where NUM is number of logs -* DEFAULT CONFIG MUST BE SUPPLIED WITH AT LEAST ONE LOG BEING MONITORED +* DEFAULT CONFIG MUST BE SUPPLIED WITH AT LEAST ONE LOG BEING MONITORED * (log being monitored will be overwritten - it is needed for json structure) * returns the path of the config generated and a list of log stream names -*/ + */ func GenerateConfig(logNum int) (string, []string, error) { var cfgFileData map[string]interface{} @@ -140,13 +137,13 @@ func GenerateConfig(logNum int) (string, []string, error) { var logStreams []string for i := 0; i < logNum; i++ { - logStream := fmt.Sprintf("{instance_id}/tmp%d", i + 1) + logStream := fmt.Sprintf("{instance_id}/tmp%d", i+1) - logFiles = append(logFiles, LogInfo { - FilePath: fmt.Sprintf("/tmp/test%d.log", i + 1), - LogGroupName: "{instance_id}", + logFiles = append(logFiles, LogInfo{ + FilePath: fmt.Sprintf("/tmp/test%d.log", i+1), + LogGroupName: "{instance_id}", LogStreamName: logStream, - Timezone: "UTC", + Timezone: "UTC", }) logStreams = append(logStreams, logStream) @@ -176,7 +173,7 @@ func GenerateConfig(logNum int) (string, []string, error) { //StartLogWrite starts go routines to write logs to each of the logs that are monitored by CW Agent according to //the config provided -func StartLogWrite(agentRunDuration time.Duration, configFilePath string, tps int) (error) { +func StartLogWrite(agentRunDuration time.Duration, configFilePath string, tps int) error { //create wait group so main test thread waits for log writing to finish before stopping agent and collecting data var logWaitGroup sync.WaitGroup @@ -201,7 +198,7 @@ func StartLogWrite(agentRunDuration time.Duration, configFilePath string, tps in //WriteToLogs opens a file at the specified file path and writes the specified number of lines per second (tps) //for the specified duration -func WriteToLogs(filePath string, durationMinutes time.Duration, tps int) (error) { +func WriteToLogs(filePath string, durationMinutes time.Duration, tps int) error { f, err := os.Create(filePath) if err != nil { return err @@ -223,14 +220,14 @@ func WriteToLogs(filePath string, durationMinutes time.Duration, tps int) (error return err } } - + case <-endTimeout: return nil } } } -//GetLogFilePaths parses the cloudwatch agent config at the specified path and returns a list of the log files that the +//GetLogFilePaths parses the cloudwatch agent config at the specified path and returns a list of the log files that the //agent will monitor when using that config file func GetLogFilePaths(configPath string) ([]string, error) { file, err := os.ReadFile(configPath) @@ -253,21 +250,21 @@ func GetLogFilePaths(configPath string) ([]string, error) { return filePaths, nil } -func TestUpdateCommit(t*testing.T){ - if(os.Getenv("IS_RELEASE") !="true"){ +func TestUpdateCommit(t *testing.T) { + if os.Getenv("IS_RELEASE") != "true" { t.SkipNow() } - t.Log("Updating Release Commit",os.Getenv(SHA_ENV)) + t.Log("Updating Release Commit", os.Getenv(SHA_ENV)) dynamoDB := InitializeTransmitterAPI("CWAPerformanceMetrics") //add cwa version here releaseHash := os.Getenv(SHA_ENV) releaseName := os.Getenv(RELEASE_NAME_ENV) - if dynamoDB == nil{ + if dynamoDB == nil { t.Fatalf("Error: generating dynamo table") - return + return } - err := dynamoDB.UpdateReleaseTag(releaseHash,releaseName) - if err!=nil{ - t.Fatalf("Error: %s",err) + err := dynamoDB.UpdateReleaseTag(releaseHash, releaseName) + if err != nil { + t.Fatalf("Error: %s", err) } } diff --git a/integration/test/sanity/sanity_unix.go b/integration/test/sanity/sanity_unix.go index 9b4b2a9f26..006648a7f6 100644 --- a/integration/test/sanity/sanity_unix.go +++ b/integration/test/sanity/sanity_unix.go @@ -7,8 +7,8 @@ package sanity import ( + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" "testing" - "github.com/aws/amazon-cloudwatch-agent/integration/test" ) func SanityCheck(t *testing.T) { diff --git a/integration/test/sanity/sanity_windows.go b/integration/test/sanity/sanity_windows.go index e7b61380b3..a99fdd85bd 100644 --- a/integration/test/sanity/sanity_windows.go +++ b/integration/test/sanity/sanity_windows.go @@ -7,8 +7,8 @@ package sanity import ( + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" "testing" - "github.com/aws/amazon-cloudwatch-agent/integration/test" ) func SanityCheck(t *testing.T) { @@ -16,4 +16,4 @@ func SanityCheck(t *testing.T) { if err != nil { t.Fatalf("Running sanity check failed") } -} \ No newline at end of file +} diff --git a/logs/logs.go b/logs/logs.go index 950fe88f0b..d0984af4cf 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -9,7 +9,7 @@ import ( "log" "time" - "github.com/aws/amazon-cloudwatch-agent/plugins/inputs/logfile/tail" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" "github.com/influxdata/telegraf/config" ) diff --git a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go index 14dba38705..058b57b865 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go +++ b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go @@ -5,7 +5,7 @@ package kubernetes import ( "fmt" - "github.com/aws/amazon-cloudwatch-agent/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" From 3ceb0685d763fc4300cf3e4b75817b05e301c644 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 2 Sep 2022 09:18:28 -0400 Subject: [PATCH 019/144] fix unit tests, allow for adapter and native otel components in yaml --- .../sampleConfig/advanced_config_linux.yaml | 13 ++- .../sampleConfig/advanced_config_windows.yaml | 7 +- .../sampleConfig/basic_config_linux.yaml | 7 +- .../sampleConfig/basic_config_windows.yaml | 7 +- .../sampleConfig/collectd_config_linux.yaml | 1 + .../sampleConfig/complete_darwin_config.yaml | 9 +- .../sampleConfig/complete_linux_config.yaml | 7 +- .../sampleConfig/complete_windows_config.yaml | 5 +- .../sampleConfig/csm_only_config_linux.yaml | 3 +- .../sampleConfig/csm_only_config_windows.yaml | 3 +- .../csm_service_addresses_linux.yaml | 3 +- .../csm_service_addresses_windows.yaml | 3 +- .../sampleConfig/delta_config_linux.yaml | 9 +- .../sampleConfig/drop_origin_linux.yaml | 9 +- .../sampleConfig/log_ecs_metric_only.yaml | 20 ++--- .../tocwconfig/sampleConfig/log_filter.yaml | 3 +- .../sampleConfig/log_metric_and_log.yaml | 7 +- .../sampleConfig/log_metric_only.yaml | 7 +- .../sampleConfig/log_only_config_windows.yaml | 3 +- .../sampleConfig/prometheus_config_linux.yaml | 5 +- .../prometheus_config_windows.yaml | 5 +- .../sampleConfig/standard_config_linux.yaml | 11 ++- ...ndard_config_linux_with_common_config.yaml | 11 ++- .../sampleConfig/standard_config_windows.yaml | 7 +- ...ard_config_windows_with_common_config.yaml | 7 +- .../sampleConfig/statsd_config_linux.yaml | 1 + .../sampleConfig/statsd_config_windows.yaml | 1 + .../windows_eventlog_only_config.yaml | 1 + .../toyamlconfig/ecs/convert_to_otel.go | 57 ------------- .../toyamlconfig/ecs/convert_to_otel_test.go | 7 -- .../toyamlconfig/otelnative/otel.go | 20 +++-- .../translate/awscontainerinsightreceiver.go | 62 ++++++++------ .../awscontainerinsightreceiver_test.go | 8 +- .../tocwconfig/toyamlconfig/toyamlconfig.go | 84 +++++++++++-------- translator/util/collections.go | 21 +++++ translator/util/collections_test.go | 77 +++++++++++++++++ 36 files changed, 322 insertions(+), 189 deletions(-) delete mode 100644 translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go delete mode 100644 translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go create mode 100644 translator/util/collections.go create mode 100644 translator/util/collections_test.go diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index 4bb3a38672..f98e8d0792 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -1,5 +1,8 @@ exporters: cloudwatch: {} +processors: + delta: {} + ec2tagger: {} receivers: cpu: {} disk: {} @@ -14,13 +17,15 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - delta + - ec2tagger receivers: + - disk + - diskio - ethtool - mem - netstat - nvidia_smi - swap - - cpu - - disk - - diskio + - cpu \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index f38b263dda..3691b52134 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: win_perf_counters: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - - win_perf_counters + - win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index 524379a723..f3d472d135 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: disk: {} mem: {} @@ -8,7 +10,8 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - disk - - mem + - mem \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index f38b263dda..3691b52134 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: win_perf_counters: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - - win_perf_counters + - win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml index 2c739c1ed9..807d2aae01 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -1,5 +1,6 @@ exporters: cloudwatch: {} +processors: {} receivers: socket_listener: {} service: diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index cc5e733d00..5425e01146 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -1,6 +1,9 @@ exporters: cloudwatch: {} cloudwatchlogs: {} +processors: + delta: {} + ec2tagger: {} receivers: cpu: {} disk: {} @@ -18,9 +21,11 @@ service: pipelines: metrics: exporters: - - cloudwatchlogs - cloudwatch - processors: [] + - cloudwatchlogs + processors: + - ec2tagger + - delta receivers: - cpu - socket_listener diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index f7bf8cc94c..ee34550acb 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -1,6 +1,9 @@ exporters: cloudwatch: {} cloudwatchlogs: {} +processors: + delta: {} + ec2tagger: {} receivers: cpu: {} disk: {} @@ -20,7 +23,9 @@ service: exporters: - cloudwatchlogs - cloudwatch - processors: [] + processors: + - ec2tagger + - delta receivers: - processes - swap diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index 7a1f298dac..084e1e30cf 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -1,6 +1,8 @@ exporters: cloudwatch: {} cloudwatchlogs: {} +processors: + ec2tagger: {} receivers: logfile: {} nvidia_smi: {} @@ -15,7 +17,8 @@ service: exporters: - cloudwatchlogs - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - win_perf_counters - nvidia_smi diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml index 04b67a829d..5575b61351 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml @@ -1,5 +1,6 @@ exporters: aws_csm: {} +processors: {} receivers: awscsm_listener: {} service: @@ -9,4 +10,4 @@ service: - aws_csm processors: [] receivers: - - awscsm_listener + - awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml index 4a0f1453d5..a2fddb43ac 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml @@ -1,5 +1,6 @@ exporters: aws_csm: {} +processors: {} receivers: awscsm_listener: {} service: @@ -9,4 +10,4 @@ service: - aws_csm processors: [] receivers: - - awscsm_listener + - awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml index 4a0f1453d5..a2fddb43ac 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml @@ -1,5 +1,6 @@ exporters: aws_csm: {} +processors: {} receivers: awscsm_listener: {} service: @@ -9,4 +10,4 @@ service: - aws_csm processors: [] receivers: - - awscsm_listener + - awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml index 4a0f1453d5..a2fddb43ac 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml @@ -1,5 +1,6 @@ exporters: aws_csm: {} +processors: {} receivers: awscsm_listener: {} service: @@ -9,4 +10,4 @@ service: - aws_csm processors: [] receivers: - - awscsm_listener + - awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml index 07eae4d2b0..7abecac601 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -1,5 +1,8 @@ exporters: cloudwatch: {} +processors: + delta: {} + ec2tagger: {} receivers: diskio: {} service: @@ -7,6 +10,8 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger + - delta receivers: - - diskio + - diskio \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml index d6c8091b15..0d444a6397 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: cpu: {} disk: {} @@ -9,8 +11,9 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - - cpu - - disk - nvidia_smi + - cpu + - disk \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index e164959e6f..b9fcfd9c7c 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -31,25 +31,19 @@ exporters: parse_json_encoded_attr_values: [ Sources ] resource_to_telemetry_conversion: enabled: true - cloudwatchlogs: - - endpoint_override: https://fake_endpoint - force_flush_interval: 5s - log_stream_name: fake-host-name - region: us-west-2 - tagexclude: - - metricPath - tagpass: - metricPath: - - logs - - logs_socket_listener + cloudwatchlogs: {} processors: batch/containerinsights: timeout: 30s + ec2tagger: {} + ecsdecorator: {} receivers: awscontainerinsightreceiver/containerinsights: collection_interval: 30s container_orchestrator: ecs + cadvisor: {} + socket_listener: {} service: pipelines: metrics: @@ -58,5 +52,9 @@ service: - awsemf/containerinsights processors: - batch/containerinsights + - ecsdecorator + - ec2tagger receivers: - awscontainerinsightreceiver/containerinsights + - cadvisor + - socket_listener diff --git a/translator/tocwconfig/sampleConfig/log_filter.yaml b/translator/tocwconfig/sampleConfig/log_filter.yaml index e0e96d478c..e3dafbfb1f 100644 --- a/translator/tocwconfig/sampleConfig/log_filter.yaml +++ b/translator/tocwconfig/sampleConfig/log_filter.yaml @@ -1,5 +1,6 @@ exporters: cloudwatchlogs: {} +processors: {} receivers: logfile: {} service: @@ -9,4 +10,4 @@ service: - cloudwatchlogs processors: [] receivers: - - logfile + - logfile \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml index eb177218cf..6ef7e670d2 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml @@ -1,5 +1,8 @@ exporters: cloudwatchlogs: {} +processors: + ec2tagger: {} + k8sdecorator: {} receivers: cadvisor: {} k8sapiserver: {} @@ -10,7 +13,9 @@ service: metrics: exporters: - cloudwatchlogs - processors: [] + processors: + - ec2tagger + - k8sdecorator receivers: - logfile - socket_listener diff --git a/translator/tocwconfig/sampleConfig/log_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_metric_only.yaml index 7b1a1f0599..bb90f04ac9 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_only.yaml @@ -1,5 +1,8 @@ exporters: cloudwatchlogs: {} +processors: + ec2tagger: {} + k8sdecorator: {} receivers: cadvisor: {} k8sapiserver: {} @@ -9,7 +12,9 @@ service: metrics: exporters: - cloudwatchlogs - processors: [] + processors: + - k8sdecorator + - ec2tagger receivers: - k8sapiserver - cadvisor diff --git a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml index 92297cb189..eceabe3862 100644 --- a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml @@ -1,5 +1,6 @@ exporters: cloudwatchlogs: {} +processors: {} receivers: logfile: {} windows_event_log: {} @@ -11,4 +12,4 @@ service: processors: [] receivers: - logfile - - windows_event_log + - windows_event_log \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml index 94edc38127..bc288f4abf 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml @@ -1,5 +1,7 @@ exporters: cloudwatchlogs: {} +processors: + emfProcessor: {} receivers: prometheus_scraper: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatchlogs - processors: [] + processors: + - emfProcessor receivers: - prometheus_scraper diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml index 94edc38127..bc288f4abf 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml @@ -1,5 +1,7 @@ exporters: cloudwatchlogs: {} +processors: + emfProcessor: {} receivers: prometheus_scraper: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatchlogs - processors: [] + processors: + - emfProcessor receivers: - prometheus_scraper diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index 7ed0bc1c45..b6aa446a12 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -1,5 +1,8 @@ exporters: cloudwatch: {} +processors: + delta: {} + ec2tagger: {} receivers: cpu: {} disk: {} @@ -11,10 +14,12 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger + - delta receivers: + - swap - cpu - disk - diskio - - mem - - swap + - mem \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml index 5c8a20a8b1..11c345cadb 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -1,5 +1,8 @@ exporters: cloudwatch: {} +processors: + delta: {} + ec2tagger: {} receivers: cpu: {} disk: {} @@ -11,10 +14,12 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger + - delta receivers: + - diskio - mem - swap - cpu - - disk - - diskio + - disk \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index f38b263dda..3691b52134 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: win_perf_counters: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - - win_perf_counters + - win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index f38b263dda..3691b52134 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -1,5 +1,7 @@ exporters: cloudwatch: {} +processors: + ec2tagger: {} receivers: win_perf_counters: {} service: @@ -7,6 +9,7 @@ service: metrics: exporters: - cloudwatch - processors: [] + processors: + - ec2tagger receivers: - - win_perf_counters + - win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml index 03dbdf7d18..d3771bf77d 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -1,5 +1,6 @@ exporters: cloudwatch: {} +processors: {} receivers: statsd: {} service: diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml index 03dbdf7d18..d3771bf77d 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -1,5 +1,6 @@ exporters: cloudwatch: {} +processors: {} receivers: statsd: {} service: diff --git a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml index e56540928f..098afe3cfd 100644 --- a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml +++ b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml @@ -1,5 +1,6 @@ exporters: cloudwatchlogs: {} +processors: {} receivers: windows_event_log: {} service: diff --git a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go deleted file mode 100644 index 2029b81f14..0000000000 --- a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel.go +++ /dev/null @@ -1,57 +0,0 @@ -package ecs - -import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative/translate" -) - -var ( - // look for the components to determine if the agent config uses ECS, and requires - // Container Insights configuration in the OTel YAML file - ecsPluginIndicators = []string{"ecsdecorator"} - - // plugins by name, grouped by component (input, processor, output) that need to be operated on, - // in order to convert the Telegraf plugins to use OTel natively - translator = translate.AwsContainerInsightReceiver{} -) - -func UsesECSConfig(plugins ...map[string]interface{}) bool { - for _, component := range plugins { - for key := range component { - for _, translatable := range ecsPluginIndicators { - if key == translatable { - return true - } - } - } - } - return false -} - -func TranslateReceivers(inputs, processors, outputs map[string]interface{}) map[string]interface{} { - return translator.Receivers(inputs, processors, outputs) -} - -func TranslateProcessors(inputs, processors, outputs map[string]interface{}) map[string]interface{} { - return translator.Processors(inputs, processors, outputs) -} - -func TranslateExporters(inputs, processors, outputs map[string]interface{}) map[string]interface{} { - return translator.Exporters(inputs, processors, outputs) -} - -//func PluginsToComponents(plugins ...map[string]interface{}) ( -// map[config.ComponentID]config.Receiver, -// map[config.ComponentID]config.Processor, -// map[config.ComponentID]config.Exporter) { -// procMap := make(map[config.ComponentID]config.Processor) -// for _, inputs := range plugins { -// for input := range inputs { -// fmt.Printf("Found plugin %s\n", input) -// // TODO: how do input configs get propagated here? -// id := config.NewComponentID(config.Type(input)) -// hc := config.NewProcessorSettings(id) -// procMap[id] = &hc -// } -// } -// return procMap -//} diff --git a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go b/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go deleted file mode 100644 index 33701d4dd9..0000000000 --- a/translator/tocwconfig/toyamlconfig/ecs/convert_to_otel_test.go +++ /dev/null @@ -1,7 +0,0 @@ -package ecs - -import "testing" - -func TestUsesECS(t *testing.T) { - t.FailNow() -} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/otel.go b/translator/tocwconfig/toyamlconfig/otelnative/otel.go index 3bc2d38093..bd1518e2cd 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/otel.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/otel.go @@ -6,9 +6,9 @@ const ( OutputsKey = "outputs" ) -// NativeOTel defines a way to translate a set of Telegraf plugins into its equivalent +// Translator defines a way to translate a set of Telegraf plugins into its equivalent // set of OpenTelemetry receivers, processors, and exporters. -type NativeOTel interface { +type Translator interface { // Name is the identifier for plugins that are output from this converter Name() string // Introduces supplies a map of plugin names that are expected to be added during the @@ -17,16 +17,20 @@ type NativeOTel interface { // Replaces supplies a map of plugin names that are expected to be removed during the // different translation functions Replaces() map[string][]string + // RequiresTranslation takes in inputs, processors, and outputs, and does whatever + // custom logic is necessary to determine if the translated configuration indicates + // that something must be translated to OTel natively + RequiresTranslation(in, proc, out map[string]interface{}) bool // Receivers translates the telegraf plugins and returns the expected "receivers" as - // a mutated version of the in map. This should only modify the plugins listed out in - // the Introduces() and Replaces() functions + // a mutated version of the in map. This should return a map that only contains the + // relevant plugins defined in Introduces() Receivers(in, proc, out map[string]interface{}) map[string]interface{} // Processors translates the telegraf plugins and returns the expected "processors" as - // a mutated version of the proc map. This should only modify the plugins listed out in - // the Introduces() and Replaces() functions + // a mutated version of the proc map. This should return a map that only contains the + // // relevant plugins defined in Introduces() Processors(in, proc, out map[string]interface{}) map[string]interface{} // Exporters translates the telegraf plugins and returns the expected "exporters" as - // a mutated version of the out map. This should only modify the plugins listed out in - // the Introduces() and Replaces() functions + // a mutated version of the out map. This should return a map that only contains the + // // relevant plugins defined in Introduces() Exporters(in, proc, out map[string]interface{}) map[string]interface{} } diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go index 6a50bc300b..87368883fb 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go @@ -10,6 +10,8 @@ import "fmt" //go:embed emf_config.yml var awsemfConfig string +var ecsPluginIndicators = []string{"ecsdecorator"} + // AwsContainerInsightReceiver Translating ECS to telegraf plugins converts the logs.metrics_collected.ecs // configuration into a combination of inputs and processors: // inputs = [cadvisor, socket_listener], processors = [ec2tagger, ecsdecorator] @@ -37,60 +39,55 @@ func (rec AwsContainerInsightReceiver) Replaces() map[string][]string { } } +func (rec AwsContainerInsightReceiver) RequiresTranslation(in, proc, out map[string]interface{}) bool { + return usesECSConfig(in, proc, out) +} + func (rec AwsContainerInsightReceiver) Receivers(in, proc, out map[string]interface{}) map[string]interface{} { - m := make(map[string]interface{}) + result := make(map[string]interface{}) + receiverMap := make(map[string]interface{}) cadvisorPlugin, ok := in["cadvisor"] if !ok { - return m + return receiverMap } plugin, ok := cadvisorPlugin.([]interface{}) if !ok { - return m + return receiverMap } if len(plugin) < 1 { - return m + return receiverMap } pluginMap, ok := plugin[0].(map[string]interface{}) if !ok { - return m + return receiverMap } - m["collection_interval"] = pluginMap["interval"] - m["container_orchestrator"] = pluginMap["container_orchestrator"] + receiverMap["collection_interval"] = pluginMap["interval"] + receiverMap["container_orchestrator"] = pluginMap["container_orchestrator"] - // replace input plugins - for _, p := range rec.Replaces()[otelnative.InputsKey] { - delete(in, p) - } - in[fmt.Sprintf("awscontainerinsightreceiver/%s", rec.Name())] = m - return in + result[fmt.Sprintf("awscontainerinsightreceiver/%s", rec.Name())] = receiverMap + return result } func (rec AwsContainerInsightReceiver) Processors(in, proc, out map[string]interface{}) map[string]interface{} { + result := make(map[string]interface{}) m := make(map[string]interface{}) interval := extractCollectionInterval(in) if interval != "" { m["timeout"] = interval } - // replace processor plugins - for _, p := range rec.Replaces()[otelnative.ProcessorsKey] { - delete(proc, p) - } - proc[fmt.Sprintf("batch/%s", rec.Name())] = m - return proc + + result[fmt.Sprintf("batch/%s", rec.Name())] = m + return result } func (rec AwsContainerInsightReceiver) Exporters(in, proc, out map[string]interface{}) map[string]interface{} { - // replace processor plugins - for _, p := range rec.Replaces()[otelnative.OutputsKey] { - delete(out, p) - } - + result := make(map[string]interface{}) m, err := getDefaultEmfExporterConfig() if err != nil { return map[string]interface{}{} } - out[fmt.Sprintf("awsemf/%s", rec.Name())] = m - return out + result[fmt.Sprintf("awsemf/%s", rec.Name())] = m + return result } func getDefaultEmfExporterConfig() (map[string]interface{}, error) { @@ -137,3 +134,16 @@ func extractCollectionInterval(inputs map[string]interface{}) string { } return intervalStr } + +func usesECSConfig(plugins ...map[string]interface{}) bool { + for _, component := range plugins { + for key := range component { + for _, translatable := range ecsPluginIndicators { + if key == translatable { + return true + } + } + } + } + return false +} diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go index ccff86e936..f930f92947 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go @@ -158,20 +158,14 @@ func validateExpectedPlugins( removed, ok := translator.Replaces()[section] assert.True(t, ok) - cnt := 0 for key := range pluginMap { - for _, e := range introduced { - if key == e+"/"+translator.Name() { - cnt++ - } - } for _, e := range removed { if key == e { t.Errorf("Expected %s to be removed, but it still exists", e) } } } - assert.Equal(t, len(introduced), cnt) + assert.Equal(t, len(introduced), len(pluginMap)) } func validateEmfExporterPlugin(t *testing.T, emfPlugin map[string]interface{}) { diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index cc5e9021c8..20bdea5018 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -5,9 +5,10 @@ package toyamlconfig import ( "bytes" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/ecs" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative/translate" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/service" @@ -26,27 +27,37 @@ const ( outputsKeyName = "outputs" ) +var ( + otelNativeTranslators = []otelnative.Translator{ + translate.AwsContainerInsightReceiver{}, + } +) + func ToYamlConfig(val interface{}) (string, interface{}) { inputs := extractFromConfig(val, inputsKeyName) procs := extractFromConfig(val, processorsKeyName) outputs := extractFromConfig(val, outputsKeyName) - if ecs.UsesECSConfig(inputs, procs, outputs) { - log.Println("Config uses ECS. Include container insights configurations") - newInputs := ecs.TranslateReceivers(copyMap(inputs), copyMap(procs), copyMap(outputs)) - newProcs := ecs.TranslateProcessors(copyMap(inputs), copyMap(procs), copyMap(outputs)) - newOutputs := ecs.TranslateExporters(copyMap(inputs), copyMap(procs), copyMap(outputs)) - - inputs = newInputs - procs = newProcs - outputs = newOutputs + nativeReceivers := make(map[string]interface{}) + nativeProcessors := make(map[string]interface{}) + nativeExporters := make(map[string]interface{}) + for _, t := range otelNativeTranslators { + if t.RequiresTranslation(inputs, procs, outputs) { + receivers := t.Receivers(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) + processors := t.Processors(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) + exporters := t.Exporters(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) + + nativeReceivers = util.MergeMaps(nativeReceivers, receivers) + nativeProcessors = util.MergeMaps(nativeProcessors, processors) + nativeExporters = util.MergeMaps(nativeExporters, exporters) + } } cfg := make(map[string]interface{}) enc := mapstructure.NewEncoder() - rec := encodeReceivers(inputs, &cfg, enc) - proc := encodeProcessors(procs, &cfg, enc) - ex := encodeExporters(outputs, &cfg, enc) + rec := encodeReceivers(inputs, nativeReceivers, &cfg, enc) + proc := encodeProcessors(procs, nativeProcessors, &cfg, enc) + ex := encodeExporters(outputs, nativeExporters, &cfg, enc) encodeService(rec, proc, ex, &cfg, enc) var buffer bytes.Buffer @@ -58,46 +69,54 @@ func ToYamlConfig(val interface{}) (string, interface{}) { return buffer.String(), cfg } -func encodeReceivers(inputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { +func encodeReceivers(inputs, nativeInputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { receiversSection := make(map[string]interface{}) - receivers := inputsToReceivers(inputs) + receivers := inputsToReceivers(inputs, nativeInputs) receiversSection[receiversKeyName] = receivers err := encoder.Encode(receiversSection, &cfg) util.PanicIfErr("Encode to a valid yaml config fails because of", err) return receivers } -func inputsToReceivers(inputs map[string]interface{}) map[config.ComponentID]interface{} { +func inputsToReceivers(inputs, nativeInputs map[string]interface{}) map[config.ComponentID]interface{} { receiverMap := make(map[config.ComponentID]interface{}) - for key, val := range inputs { + for key := range inputs { + t := config.Type(key) + receiverMap[config.NewComponentID(t)] = struct{}{} + } + for key, val := range nativeInputs { t := config.Type(key) receiverMap[config.NewComponentID(t)] = val } return receiverMap } -func encodeProcessors(processors map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { +func encodeProcessors(processors, nativeProcessors map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { processorsSection := make(map[string]interface{}) - p := procToProcessors(processors) + p := procToProcessors(processors, nativeProcessors) processorsSection[processorsKeyName] = p err := encoder.Encode(processorsSection, &cfg) util.PanicIfErr("Encode to a valid yaml config fails because of", err) return p } -func procToProcessors(processors map[string]interface{}) map[config.ComponentID]interface{} { +func procToProcessors(processors, nativeProcessors map[string]interface{}) map[config.ComponentID]interface{} { processorMap := make(map[config.ComponentID]interface{}) - for key, val := range processors { + for key := range processors { + t := config.Type(key) + processorMap[config.NewComponentID(t)] = struct{}{} + } + for key, val := range nativeProcessors { t := config.Type(key) processorMap[config.NewComponentID(t)] = val } return processorMap } -func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { +func encodeExporters(outputs, nativeOutputs map[string]interface{}, cfg *map[string]interface{}, encoder encoder.Encoder) map[config.ComponentID]interface{} { exportersSection := make(map[string]interface{}) - exporters := outputsToExporters(outputs) + exporters := outputsToExporters(outputs, nativeOutputs) exportersSection[exportersKeyName] = exporters err := encoder.Encode(exportersSection, &cfg) util.PanicIfErr("Encode to a valid yaml config fails because of", err) @@ -105,9 +124,13 @@ func encodeExporters(outputs map[string]interface{}, cfg *map[string]interface{} return exporters } -func outputsToExporters(outputs map[string]interface{}) map[config.ComponentID]interface{} { +func outputsToExporters(outputs, nativeOutputs map[string]interface{}) map[config.ComponentID]interface{} { exporterMap := make(map[config.ComponentID]interface{}) - for key, val := range outputs { + for key := range outputs { + t := config.Type(key) + exporterMap[config.NewComponentID(t)] = struct{}{} + } + for key, val := range nativeOutputs { t := config.Type(key) exporterMap[config.NewComponentID(t)] = val } @@ -150,15 +173,8 @@ func extractFromConfig(cfg interface{}, key string) map[string]interface{} { section, ok := c[key].(map[string]interface{}) if !ok { - log.Panicf("E! failed to extract %s from config during yaml translation", key) + log.Printf("E! failed to extract %s from config during yaml translation", key) + return map[string]interface{}{} } return section } - -func copyMap(m map[string]interface{}) map[string]interface{} { - dupe := make(map[string]interface{}) - for k, v := range m { - dupe[k] = v - } - return dupe -} diff --git a/translator/util/collections.go b/translator/util/collections.go new file mode 100644 index 0000000000..f953d42baa --- /dev/null +++ b/translator/util/collections.go @@ -0,0 +1,21 @@ +package util + +// CopyMap returns a new map that makes a shallow copy of all the +// references in the input map. +func CopyMap(m map[string]interface{}) map[string]interface{} { + dupe := make(map[string]interface{}) + for k, v := range m { + dupe[k] = v + } + return dupe +} + +func MergeMaps(maps ...map[string]interface{}) map[string]interface{} { + merged := make(map[string]interface{}) + for _, m := range maps { + for k, v := range m { + merged[k] = v + } + } + return merged +} diff --git a/translator/util/collections_test.go b/translator/util/collections_test.go new file mode 100644 index 0000000000..80150063f1 --- /dev/null +++ b/translator/util/collections_test.go @@ -0,0 +1,77 @@ +package util + +import ( + "github.com/stretchr/testify/assert" + "testing" +) + +func TestCopyMapHasSameValues(t *testing.T) { + m := map[string]interface{}{ + "foo": 1, + "bar": 2, + "baz": 3, + } + copied := CopyMap(m) + assertMapsEqual(t, m, copied) +} + +func TestCopyMapDoesNotShareReferenceToOriginalMap(t *testing.T) { + m := map[string]interface{}{ + "foo": 1, + "bar": 2, + "baz": 3, + } + copied := CopyMap(m) + assertMapsEqual(t, m, copied) + delete(m, "foo") + _, ok := m["foo"] + assert.False(t, ok) + + val, ok := copied["foo"] + assert.True(t, ok) + assert.Equal(t, 1, val) +} + +// TODO: could change the implementation to recurse and do a deep copy of everything in the +// input map, but not necessary at the moment. Documenting current behavior here. +func TestCopyMapKeepsShallowReferenceToValuesInMap(t *testing.T) { + m := map[string]interface{}{ + "foo": 1, + "bar": 2, + "baz": map[string]int{"baz": 3, "foo": 1}, + } + copied := CopyMap(m) + assertMapsEqual(t, m, copied) + + baz, ok := m["baz"] + assert.True(t, ok) + bazMap, ok := baz.(map[string]int) + assert.True(t, ok) + + copiedBaz, ok := copied["baz"] + assert.True(t, ok) + copiedBazMap, ok := copiedBaz.(map[string]int) + assert.True(t, ok) + _, ok = copiedBazMap["baz"] + assert.True(t, ok) + + // delete from original map + delete(bazMap, "baz") + _, ok = bazMap["baz"] + assert.False(t, ok) + // deleting from the original map reference also removes it from the copy + _, ok = copiedBazMap["baz"] + assert.False(t, ok) +} + +func assertMapsEqual(t *testing.T, m1, m2 map[string]interface{}) { + t.Helper() + + assert.Equal(t, len(m1), len(m2)) + + for k, expected := range m1 { + actual, ok := m2[k] + assert.True(t, ok) + assert.Equal(t, expected, actual) + } +} From ef210ca8fb5732dedd1e7bb08556ac40424ccc9d Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 2 Sep 2022 10:29:55 -0400 Subject: [PATCH 020/144] point to translated YAML config --- .../amazon-cloudwatch-agent.go | 6 +++++- cmd/start-amazon-cloudwatch-agent/path.go | 14 +++++++++++--- cmd/start-amazon-cloudwatch-agent/path_windows.go | 8 +++++++- .../start-amazon-cloudwatch-agent.go | 6 +++++- packaging/darwin/amazon-cloudwatch-agent-ctl | 3 +++ packaging/dependencies/amazon-cloudwatch-agent-ctl | 3 +++ packaging/windows/amazon-cloudwatch-agent-ctl.ps1 | 2 ++ 7 files changed, 36 insertions(+), 6 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 71b5467610..78cd800882 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -70,6 +70,7 @@ var fTest = flag.Bool("test", false, "enable test mode: gather metrics, print th var fTestWait = flag.Int("test-wait", 0, "wait up to this many seconds for service inputs to complete in test mode") var fSchemaTest = flag.Bool("schematest", false, "validate the toml file schema") var fConfig = flag.String("config", "", "configuration file to load") +var fOtelConfig = flag.String("otelconfig", "", "YAML configuration file to run OTel pipeline") var fEnvConfig = flag.String("envconfig", "", "env configuration file to load") var fConfigDirectory = flag.String("config-directory", "", "directory containing additional *.conf files") @@ -349,6 +350,9 @@ func runAgent(ctx context.Context, agentinfo.OutputPlugins = c.OutputNames() // inject OTel + if *fOtelConfig != "" { + log.Println("no YAML config provided for agent") + } log.Println("creating otel sidecar") otelInfo := component.BuildInfo{ Command: "ccwa-otel", @@ -370,7 +374,7 @@ func runAgent(ctx context.Context, // TODO: this uses a hard coded path to some other expected OTEL pipeline config. configParams := otelservice.ConfigProviderSettings{ ResolverSettings: confmap.ResolverSettings{ - URIs: []string{"/tmp/consolidated-agent-container-insights.yml"}, + URIs: []string{*fOtelConfig}, Providers: mapProviders, }, } diff --git a/cmd/start-amazon-cloudwatch-agent/path.go b/cmd/start-amazon-cloudwatch-agent/path.go index e589c033ce..44d5419377 100644 --- a/cmd/start-amazon-cloudwatch-agent/path.go +++ b/cmd/start-amazon-cloudwatch-agent/path.go @@ -33,7 +33,9 @@ func startAgent(writer io.WriteCloser) error { // Use exec so PID 1 changes to agent from start-agent. execArgs := []string{ agentBinaryPath, // when using syscall.Exec, must pass binary name as args[0] - "-config", tomlConfigPath, "-envconfig", envConfigPath, + "-config", tomlConfigPath, + "-envconfig", envConfigPath, + "-otelconfig", yamlConfigPath, "-pidfile", AGENT_DIR_LINUX + "/var/amazon-cloudwatch-agent.pid", } if err := syscall.Exec(agentBinaryPath, execArgs, os.Environ()); err != nil { @@ -67,8 +69,13 @@ func startAgent(writer io.WriteCloser) error { } // linux command has pid passed while windows does not - agentCmd := []string{agentBinaryPath, "-config", tomlConfigPath, "-envconfig", envConfigPath, - "-pidfile", AGENT_DIR_LINUX + "/var/amazon-cloudwatch-agent.pid"} + agentCmd := []string{ + agentBinaryPath, + "-config", tomlConfigPath, + "-envconfig", envConfigPath, + "-otelconfig", yamlConfigPath, + "-pidfile", AGENT_DIR_LINUX + "/var/amazon-cloudwatch-agent.pid", + } if err = syscall.Exec(name, agentCmd, os.Environ()); err != nil { // log file is closed, so use fmt here fmt.Printf("E! Exec failed: %v \n", err) @@ -93,6 +100,7 @@ func init() { envConfigPath = AGENT_DIR_LINUX + "/etc/" + ENV tomlConfigPath = AGENT_DIR_LINUX + "/etc/" + TOML commonConfigPath = AGENT_DIR_LINUX + "/etc/" + COMMON_CONFIG + yamlConfigPath = AGENT_DIR_LINUX + "/etc/" + YAML agentLogFilePath = AGENT_DIR_LINUX + "/logs/" + AGENT_LOG_FILE diff --git a/cmd/start-amazon-cloudwatch-agent/path_windows.go b/cmd/start-amazon-cloudwatch-agent/path_windows.go index 18fa2c33f2..94922f13dc 100644 --- a/cmd/start-amazon-cloudwatch-agent/path_windows.go +++ b/cmd/start-amazon-cloudwatch-agent/path_windows.go @@ -29,7 +29,12 @@ func startAgent(writer io.WriteCloser) error { return err } - cmd := exec.Command(agentBinaryPath, "-config", tomlConfigPath, "-envconfig", envConfigPath) + cmd := exec.Command( + agentBinaryPath, + "-config", tomlConfigPath, + "-envconfig", envConfigPath, + "-otelconfig", yamlConfigPath, + ) stdoutStderr, err := cmd.CombinedOutput() // log file is closed, so use fmt here fmt.Printf("%s \n", stdoutStderr) @@ -53,6 +58,7 @@ func init() { jsonDirPath = agentConfigDir + JSON_DIR_WINDOWS envConfigPath = agentConfigDir + "\\" + ENV tomlConfigPath = agentConfigDir + "\\" + TOML + yamlConfigPath = agentConfigDir + "\\" + YAML commonConfigPath = agentConfigDir + "\\" + COMMON_CONFIG diff --git a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go index c05d1a1767..7d923423dc 100644 --- a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go +++ b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go @@ -19,6 +19,7 @@ const ( COMMON_CONFIG = "common-config.toml" JSON = "amazon-cloudwatch-agent.json" TOML = "amazon-cloudwatch-agent.toml" + YAML = "amazon-cloudwatch-config.yaml" ENV = "env-config.json" AGENT_LOG_FILE = "amazon-cloudwatch-agent.log" @@ -33,6 +34,7 @@ var ( envConfigPath string tomlConfigPath string commonConfigPath string + yamlConfigPath string agentLogFilePath string @@ -94,6 +96,8 @@ func main() { } log.Printf("I! Config has been translated into TOML %s \n", tomlConfigPath) printFileContents(tomlConfigPath) + log.Printf("I! Config has been translated into YAML %s \n", yamlConfigPath) + printFileContents(yamlConfigPath) if err := startAgent(writer); err != nil { log.Printf("E! Error when starting Agent, Error is %v \n", err) @@ -117,5 +121,5 @@ func printFileContents(path string) { if err != nil { log.Printf("E! Error when reading file(%s), Error is %v \n", path, err) } - log.Printf("D! toml config %v", string(b)) + log.Printf("D! config %v", string(b)) } diff --git a/packaging/darwin/amazon-cloudwatch-agent-ctl b/packaging/darwin/amazon-cloudwatch-agent-ctl index 20baf62f85..cda113b36d 100755 --- a/packaging/darwin/amazon-cloudwatch-agent-ctl +++ b/packaging/darwin/amazon-cloudwatch-agent-ctl @@ -26,6 +26,7 @@ readonly AGENT_LAUNCHD_NAME="com.amazon.cloudwatch.agent" readonly AGENT_LAUNCHD_CONFIG="/Library/LaunchDaemons/${AGENT_LAUNCHD_NAME}.plist" readonly TOML="${CONFDIR}/amazon-cloudwatch-agent.toml" +readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-config.yaml" readonly JSON="${CONFDIR}/amazon-cloudwatch-agent.json" readonly JSON_DIR="${CONFDIR}/amazon-cloudwatch-agent.d" readonly CV_LOG_FILE="${AGENTDIR}/logs/configuration-validation.log" @@ -182,6 +183,7 @@ cwa_config() { if [ ! "$(ls ${JSON_DIR})" ]; then echo "all amazon-cloudwatch-agent configurations have been removed" rm -f "${TOML}" + rm -f "${OTEL_YAML}" else runTranslatorCommand=`"${CMDDIR}/config-translator" --input "${JSON}" --input-dir "${JSON_DIR}" --output "${TOML}" --mode ${mode} --config "${COMMON_CONIG}" --multi-config ${multi_config}` echo "${runTranslatorCommand}" @@ -199,6 +201,7 @@ cwa_config() { echo "Configuration validation succeeded" chmod ug+rw "${TOML}" + chmod ug+rw "${OTEL_YAML}" # for translator: # default: only process .tmp files diff --git a/packaging/dependencies/amazon-cloudwatch-agent-ctl b/packaging/dependencies/amazon-cloudwatch-agent-ctl index 5c5fbcf9f8..1ebec764ad 100755 --- a/packaging/dependencies/amazon-cloudwatch-agent-ctl +++ b/packaging/dependencies/amazon-cloudwatch-agent-ctl @@ -17,6 +17,7 @@ readonly VERSION_FILE="${CMDDIR}/CWAGENT_VERSION" # The systemd and upstart scripts assume exactly this .toml file name readonly TOML="${CONFDIR}/amazon-cloudwatch-agent.toml" readonly YAML="${CWOC_CONFDIR}/cwagent-otel-collector.yaml" +readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-config.yaml" readonly JSON="${CONFDIR}/amazon-cloudwatch-agent.json" readonly JSON_DIR="${CONFDIR}/amazon-cloudwatch-agent.d" readonly YAML_DIR="${CWOC_CONFDIR}/cwagent-otel-collector.d" @@ -341,6 +342,7 @@ cwa_config() { if [ ! "$(ls ${JSON_DIR})" ]; then echo "all amazon-cloudwatch-agent configurations have been removed" rm -f "${TOML}" + rm -f "${OTEL_YAML}" else echo "Start configuration validation..." runTranslatorCommand=`"${CMDDIR}/config-translator" --input "${JSON}" --input-dir "${JSON_DIR}" --output "${TOML}" --mode ${param_mode} --config "${COMMON_CONIG}" --multi-config ${multi_config}` @@ -359,6 +361,7 @@ cwa_config() { echo "Configuration validation succeeded" chmod ug+rw "${TOML}" + chmod ug+rw "${OTEL_YAML}" # for translator: # default: only process .tmp files diff --git a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 index 18ca0e6db9..6fde21dafb 100644 --- a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 +++ b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 @@ -100,6 +100,7 @@ $CVLogFile="${CWALogDirectory}\configuration-validation.log" # The windows service registration assumes exactly this .toml file path and name $TOML="${CWAProgramData}\amazon-cloudwatch-agent.toml" +$OTEL_YAML="${CWAProgramData}\amazon-cloudwatch-config.yaml" $JSON="${CWAProgramData}\amazon-cloudwatch-agent.json" $JSON_DIR = "${CWAProgramData}\Configs" $YAML="${CWAProgramData}\${CWOCServiceName}\cwagent-otel-collector.yaml" @@ -372,6 +373,7 @@ Function CWAConfig() { if ($jsonDirContent.count -eq 0) { Write-Output "All amazon-cloudwatch-agent configurations have been removed" Remove-Item "${TOML}" -Force -ErrorAction SilentlyContinue + Remove-Item "${OTEL_YAML}" -Force -ErrorAction SilentlyContinue } else { Write-Output "Start configuration validation..." & cmd /c "`"$CWAProgramFiles\config-translator.exe`" --input ${JSON} --input-dir ${JSON_DIR} --output ${TOML} --mode ${param_mode} --config ${COMMON_CONIG} --multi-config ${multi_config} 2>&1" From 3b854e04284970dab494cdecd6aa57f00aefed81 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 2 Sep 2022 10:46:08 -0400 Subject: [PATCH 021/144] support longnames for GitHub actions --- .github/workflows/build-test-linux.yml | 3 +++ .github/workflows/build-test-macos.yml | 3 +++ .github/workflows/build-test-windows.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/build-test-linux.yml b/.github/workflows/build-test-linux.yml index 73cfe3d05d..cae09bd388 100644 --- a/.github/workflows/build-test-linux.yml +++ b/.github/workflows/build-test-linux.yml @@ -29,6 +29,9 @@ jobs: with: go-version: ~1.18.3 + - name: Support longpaths + run: git config --system core.longpaths true + - name: Check out code uses: actions/checkout@v2 with: diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml index 7c03007635..26b8da8ce9 100644 --- a/.github/workflows/build-test-macos.yml +++ b/.github/workflows/build-test-macos.yml @@ -29,6 +29,9 @@ jobs: with: go-version: ~1.18.3 + - name: Support longpaths + run: git config --system core.longpaths true + - name: Check out code uses: actions/checkout@v2 with: diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index ff209a1ff9..e923776e4d 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -25,6 +25,9 @@ jobs: matrix: os: [ windows-2019, windows-latest ] steps: + - name: Support longpaths + run: git config --system core.longpaths true + - name: Checkout Repo uses: actions/checkout@v2 From 41b9e21eba653a4179f382f23d2e18b478335ec2 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Fri, 2 Sep 2022 12:22:03 -0400 Subject: [PATCH 022/144] fix cwoc --- packaging/dependencies/amazon-cloudwatch-agent-ctl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/dependencies/amazon-cloudwatch-agent-ctl b/packaging/dependencies/amazon-cloudwatch-agent-ctl index 1ebec764ad..4e502c3f85 100755 --- a/packaging/dependencies/amazon-cloudwatch-agent-ctl +++ b/packaging/dependencies/amazon-cloudwatch-agent-ctl @@ -528,9 +528,9 @@ main() { case "${action}" in stop) stop_all ;; start) start_all "${mode}" ;; - fetch-config) config_all "${cwa_config_location}" "${cwoc_config_location}" "${restart}" "${mode}" 'default' ;; - append-config) config_all "${cwa_config_location}" "${cwoc_config_location}" "${restart}" "${mode}" 'append' ;; - remove-config) config_all "${cwa_config_location}" "${cwoc_config_location}" "${restart}" "${mode}" 'remove' ;; + fetch-config) config_all "${cwa_config_location}" "${restart}" "${mode}" 'default' ;; + append-config) config_all "${cwa_config_location}" "${restart}" "${mode}" 'append' ;; + remove-config) config_all "${cwa_config_location}" "${restart}" "${mode}" 'remove' ;; status) status_all ;; # helpers for ssm package scripts to workaround fact that it can't determine if invocation is due to # upgrade or install From 928f6d545c76a3fa850117f90e86e20588d069b5 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 6 Sep 2022 12:21:49 -0400 Subject: [PATCH 023/144] clean up code --- .github/workflows/build-test-linux.yml | 3 - .github/workflows/build-test-macos.yml | 3 - .github/workflows/build-test-windows.yml | 3 - .../source/Dockerfile | 7 -- .../amazon-cloudwatch-agent.go | 109 +----------------- .../translate/awscontainerinsightreceiver.go | 6 +- .../awscontainerinsightreceiver_test.go | 18 +++ 7 files changed, 22 insertions(+), 127 deletions(-) diff --git a/.github/workflows/build-test-linux.yml b/.github/workflows/build-test-linux.yml index cae09bd388..73cfe3d05d 100644 --- a/.github/workflows/build-test-linux.yml +++ b/.github/workflows/build-test-linux.yml @@ -29,9 +29,6 @@ jobs: with: go-version: ~1.18.3 - - name: Support longpaths - run: git config --system core.longpaths true - - name: Check out code uses: actions/checkout@v2 with: diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml index 26b8da8ce9..7c03007635 100644 --- a/.github/workflows/build-test-macos.yml +++ b/.github/workflows/build-test-macos.yml @@ -29,9 +29,6 @@ jobs: with: go-version: ~1.18.3 - - name: Support longpaths - run: git config --system core.longpaths true - - name: Check out code uses: actions/checkout@v2 with: diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index e923776e4d..ff209a1ff9 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -25,9 +25,6 @@ jobs: matrix: os: [ windows-2019, windows-latest ] steps: - - name: Support longpaths - run: git config --system core.longpaths true - - name: Checkout Repo uses: actions/checkout@v2 diff --git a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile index 2c198521ca..b61d4443da 100644 --- a/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile +++ b/amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile @@ -18,19 +18,12 @@ COPY go.sum /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ RUN go mod download -x COPY . /go/src/github.com/aws/private-amazon-cloudwatch-agent-staging/ -# TODO: this is only for container insights testing -RUN mkdir -p /tmp -COPY consolidated-agent.yml /tmp/consolidated-agent-container-insights.yml -# end TODO RUN make build-for-docker-${TARGETARCH} # Install cert and binaries FROM $CERT_IMAGE as cert -# TODO: this is only for container insights testing -COPY --from=builder /tmp /tmp - # Need to repeat the ARG after each FROM ARG TARGETARCH RUN mkdir -p /opt/aws/amazon-cloudwatch-agent/etc diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 78cd800882..38185c32b6 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -9,15 +9,6 @@ import ( "errors" "flag" "fmt" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" - "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/envprovider" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" - "go.opentelemetry.io/collector/confmap/provider/yamlprovider" - "go.opentelemetry.io/collector/exporter/loggingexporter" - "go.opentelemetry.io/collector/processor/batchprocessor" "io/ioutil" "log" "net/http" @@ -50,8 +41,6 @@ import ( //_ "github.com/influxdata/telegraf/plugins/inputs/all" "github.com/influxdata/telegraf/plugins/outputs" - otelservice "go.opentelemetry.io/collector/service" - "github.com/kardianos/service" ) @@ -349,62 +338,6 @@ func runAgent(ctx context.Context, agentinfo.InputPlugins = c.InputNames() agentinfo.OutputPlugins = c.OutputNames() - // inject OTel - if *fOtelConfig != "" { - log.Println("no YAML config provided for agent") - } - log.Println("creating otel sidecar") - otelInfo := component.BuildInfo{ - Command: "ccwa-otel", - Description: "OTel component of CCWA", - Version: agentinfo.FullVersion(), - } - - factories, err := NewFactories(c) - if err != nil { - log.Println("failed to create OTel factories", err) - return err - } - providers := []confmap.Provider{fileprovider.New(), envprovider.New(), yamlprovider.New()} - - mapProviders := make(map[string]confmap.Provider, len(providers)) - for _, provider := range providers { - mapProviders[provider.Scheme()] = provider - } - // TODO: this uses a hard coded path to some other expected OTEL pipeline config. - configParams := otelservice.ConfigProviderSettings{ - ResolverSettings: confmap.ResolverSettings{ - URIs: []string{*fOtelConfig}, - Providers: mapProviders, - }, - } - log.Println("creating otel config provider") - otelProvider, err := otelservice.NewConfigProvider(configParams) - if err != nil { - log.Println("failed to create OTel config provider", err) - return err - } - params := otelservice.CollectorSettings{ - Factories: factories, - BuildInfo: otelInfo, - ConfigProvider: otelProvider, - } - log.Println("creating otel service") - col, err := otelservice.New(params) - if err != nil { - log.Println("failed to create otel service", err) - return err - } - //wg.Add(1) - //var otelRunErr error - //go func() { - // otelRunErr = otelCommand.Execute() - // if otelRunErr != nil { - // log.Println("otel agent exited", otelRunErr) - // } - // wg.Done() - //}() - if *fPidfile != "" { f, err := os.OpenFile(*fPidfile, os.O_CREATE|os.O_WRONLY, 0644) if err != nil { @@ -425,47 +358,7 @@ func runAgent(ctx context.Context, log.Println("creating new logs agent") logAgent := logs.NewLogAgent(c) go logAgent.Run(ctx) - //log.Println("running telegraf agent") - //var telegrafRunErr error - //wg.Add(1) - //go func() { - // telegrafRunErr = ag.Run(ctx) - // if telegrafRunErr != nil { - // log.Println("telegraf agent exited", telegrafRunErr) - // } - // wg.Done() - //}() - // - //wg.Wait() - //err = multierr.Append(otelRunErr, telegrafRunErr) - //return err - - // TODO: for testing - return col.Run(ctx) -} - -func NewFactories(c *config.Config) (component.Factories, error) { - factories := component.Factories{} - // TODO: for Container Insights testing. - receivers, err := component.MakeReceiverFactoryMap(awscontainerinsightreceiver.NewFactory()) - if err != nil { - return factories, err - } - factories.Receivers = receivers - - processors, err := component.MakeProcessorFactoryMap(batchprocessor.NewFactory()) - if err != nil { - return factories, err - } - factories.Processors = processors - - exporters, err := component.MakeExporterFactoryMap(awsemfexporter.NewFactory(), loggingexporter.NewFactory()) - if err != nil { - return factories, err - } - factories.Exporters = exporters - - return factories, nil + return ag.Run(ctx) } type program struct { diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go index 87368883fb..2e28a34d15 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go @@ -43,7 +43,7 @@ func (rec AwsContainerInsightReceiver) RequiresTranslation(in, proc, out map[str return usesECSConfig(in, proc, out) } -func (rec AwsContainerInsightReceiver) Receivers(in, proc, out map[string]interface{}) map[string]interface{} { +func (rec AwsContainerInsightReceiver) Receivers(in, _, _ map[string]interface{}) map[string]interface{} { result := make(map[string]interface{}) receiverMap := make(map[string]interface{}) cadvisorPlugin, ok := in["cadvisor"] @@ -68,7 +68,7 @@ func (rec AwsContainerInsightReceiver) Receivers(in, proc, out map[string]interf return result } -func (rec AwsContainerInsightReceiver) Processors(in, proc, out map[string]interface{}) map[string]interface{} { +func (rec AwsContainerInsightReceiver) Processors(in, _, _ map[string]interface{}) map[string]interface{} { result := make(map[string]interface{}) m := make(map[string]interface{}) interval := extractCollectionInterval(in) @@ -80,7 +80,7 @@ func (rec AwsContainerInsightReceiver) Processors(in, proc, out map[string]inter return result } -func (rec AwsContainerInsightReceiver) Exporters(in, proc, out map[string]interface{}) map[string]interface{} { +func (rec AwsContainerInsightReceiver) Exporters(_, _, _ map[string]interface{}) map[string]interface{} { result := make(map[string]interface{}) m, err := getDefaultEmfExporterConfig() if err != nil { diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go index f930f92947..5bc6033f9f 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go @@ -101,6 +101,24 @@ func TestPopulateDefaultEmfExporter(t *testing.T) { validateEmfExporterPlugin(t, plugin) } +func TestUsesECSConfigDetectsUsage(t *testing.T) { + translator := AwsContainerInsightReceiver{} + inputs := setUpInputs(t) + processors := setUpProcessors(t) + outputs := setUpOutputs(t) + + assert.True(t, translator.RequiresTranslation(inputs, processors, outputs)) +} + +func TestUsesECSConfigDoesNotDetectUsage(t *testing.T) { + m := setUpOutputs(t) // does not include the expected telegraf plugin name + for _, plugin := range ecsPluginIndicators { + _, ok := m[plugin] + assert.False(t, ok) + } + assert.False(t, usesECSConfig(m)) +} + func setUpInputs(t *testing.T) map[string]interface{} { t.Helper() m := make(map[string]interface{}) From 2ff24e27cedc700d68a7566d3386546a188acfa8 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 6 Sep 2022 12:32:23 -0400 Subject: [PATCH 024/144] remove otel dependencies --- go.mod | 21 ++------------- go.sum | 82 ++-------------------------------------------------------- 2 files changed, 4 insertions(+), 99 deletions(-) diff --git a/go.mod b/go.mod index ffe9f4134f..2425e62409 100644 --- a/go.mod +++ b/go.mod @@ -81,8 +81,6 @@ require ( github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.2 github.com/prometheus/common v0.37.0 @@ -145,7 +143,6 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect - github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cilium/ebpf v0.7.0 // indirect @@ -168,7 +165,7 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect - github.com/felixge/httpsnoop v1.0.3 // indirect + github.com/frankban/quicktest v1.14.0 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect @@ -216,7 +213,6 @@ require ( github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.16.1 // indirect - github.com/klauspost/compress v1.15.9 // indirect github.com/knadh/koanf v1.4.2 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect @@ -240,22 +236,12 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/naoina/go-stringutil v0.1.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 // indirect - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.2 // indirect github.com/opencontainers/runc v1.1.3 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/opencontainers/selinux v1.10.0 // indirect - github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect - github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect + github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -265,7 +251,6 @@ require ( github.com/prometheus/procfs v0.7.3 // indirect github.com/prometheus/statsd_exporter v0.21.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - github.com/rs/cors v1.8.2 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect @@ -293,7 +278,6 @@ require ( go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/collector/pdata v0.58.0 // indirect go.opentelemetry.io/collector/semconv v0.58.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/exporters/prometheus v0.31.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect @@ -317,7 +301,6 @@ require ( google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect - k8s.io/klog v1.0.0 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect modernc.org/cc/v3 v3.35.26 // indirect diff --git a/go.sum b/go.sum index a889b95555..6412cbf44b 100644 --- a/go.sum +++ b/go.sum @@ -78,11 +78,9 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= @@ -98,7 +96,6 @@ github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+X github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= -github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= @@ -266,10 +263,7 @@ github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8 github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= -github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0 h1:t/LhUZLVitR1Ow2YOnduCsavhwFUklBMoGVYUCqmCqk= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -372,7 +366,6 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4g github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= -github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -381,8 +374,6 @@ github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGE github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= @@ -394,6 +385,7 @@ github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= +github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= @@ -421,7 +413,6 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= @@ -431,18 +422,13 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= -github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= -github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= -github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= @@ -564,7 +550,6 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -579,7 +564,6 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= -github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gopcua/opcua v0.3.1 h1:BS1TRJUdsPSwU0mlfc8Dffchh0jTw9lWchmF4HFRo2w= github.com/gophercloud/gophercloud v0.25.0 h1:C3Oae7y0fUVQGSsBrb3zliAjdX+riCSEh4lNMejFNI4= @@ -600,7 +584,6 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb github.com/grid-x/modbus v0.0.0-20211113184042-7f2251c342c9 h1:Q7e9kXS3sRbTjsNDKazbcbDSGAKjFdk096M3qYbwNpE= github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa h1:Rsn6ARgNkXrsXJIzhkE4vQr5Gbx2LvtEMv4BJOK4LyU= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/gwos/tcg/sdk v0.0.0-20211223101342-35fbd1ae683c h1:befb5xGUwNCoBuN/akLFCKekUzr0ixyws3aAX/7TaOk= @@ -753,7 +736,6 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= @@ -769,7 +751,6 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= @@ -785,7 +766,6 @@ github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamh github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -896,43 +876,17 @@ github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0 h1:mFqdkyNdSeLHK7Xx0UZBPoecNmhyiX45bZFMK54yBjk= -github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.58.0/go.mod h1:XfNw9cfGTgfMd3f5E8YC8KEool0pMGtL/sR1Vn+i2Kg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0 h1:UlytECv2FAXUemiHJ/VrpKvnVv4r8NOSArzXr14Ke88= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.58.0/go.mod h1:EsjSZXhqN3tSQbp9hStLvE3BTtpejg21vhpIx49GxJM= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0 h1:LisltbYPXIYStRAokSOh/AenP/HjqaEGq2fXfXnDdlg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.58.0/go.mod h1:MK/+/GR11pNVEAJLACTRHKefdShyCskyjB+n+Ul5H2U= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0 h1:Y71b0gBrbC7ziRdQRZ3ZNQhpLYCqvd+ZGPuaKw7wpb0= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.58.0/go.mod h1:4rYZU2BziGrC0J/V8e80A3o1RQAu/OXg2wr8QPk4rPg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0 h1:Yi51h6WbNxKXplGEKGuYOERtyuddLY5L19eOIWkHWLw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.58.0/go.mod h1:MSw33WyyvONv6q7UwOokgfGNDb4dXOA5zaa6XC32ZlQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0 h1:4nIksYrupHZ8yfaFDWGwjY70pfXQryAHyrLT9Fvkn8Q= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.58.0/go.mod h1:r3pq8CdJh+ugZR08pNrnVTO89JJO0xBrv+HFJoeHmLQ= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0 h1:n/vVF8cJVkAY7hgvEbUSyFMMek/gZ/I6FeswFLaGXPs= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.58.0/go.mod h1:VM0VtAFsTqvWhzEZnmUajEOlrl/s91LgYPh099yrtYg= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.58.0 h1:/MUjXRmZp29tfAznIRnUswyBnSIcxF2F7Lhibi/3Ew8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0 h1:x7EiYmJya8zHqRdiPXHDXxkImHjaN4tzQN4scapWqL8= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.58.0/go.mod h1:+/GN3xD2CZpegXNvz8LAQZBh+fJw5Nshry2UAbvyMXw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0 h1:Cd3rWFsteMbqXFEWH9yszGaLHY9aZqQyMQhxsjjnUYw= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.58.0/go.mod h1:pmEdRFPtxUhAOPQEF0daPwO2j47kIHIpRTs/54XVdSo= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0 h1:kzOTdxkYNeBe3QQTJfHmPfssh/cc6Cj2m0WnBLIowis= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.58.0/go.mod h1:WMGw+9m3podwRjyjYNLjGlrXDUrftmu3kYkOUbMOvEI= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.58.0 h1:kLJ5Wyy28bq3ekYAH4V4V3fIAqV5cxAEfRi699fCYxM= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0 h1:zavUPAdJbRk3SDaGHdLzzmwovBgmrCtFwdIPhiQLlwg= -github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.58.0/go.mod h1:5RdCZu9BBQF4Wce3fmwx4xTePKoJ+WyQ6ePXnOgpt2A= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -944,11 +898,6 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.10.0 h1:rAiKF8hTcgLI3w0DHm6i0ylVVcOrlgR1kK99DRLDhyU= github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= -github.com/openshift/api v0.0.0-20210521075222-e273a339932a h1:aBPwLqCg66SbQd+HrjB1GhgTfPtqSY4aeB022tEYmE0= -github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= -github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= -github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= -github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= @@ -957,6 +906,7 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= +github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= @@ -1035,8 +985,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= -github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= -github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1078,7 +1026,6 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= -github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -1088,7 +1035,6 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 h1:WhxRHzgeVGETMlmV github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -1173,8 +1119,6 @@ go.opentelemetry.io/collector/pdata v0.58.0 h1:SKWw4vjd6ZjCuvsCvEzqwBaxvov4YbXnn go.opentelemetry.io/collector/pdata v0.58.0/go.mod h1:iMv7Pz+hRthi30rkYkwLVusxQ94GU4pPJgFq7gjGcBk= go.opentelemetry.io/collector/semconv v0.58.0 h1:wk9KXVnt8IRdNzD9mmdW3d1M/IJ3HyLp1Lz2ZY1fBCM= go.opentelemetry.io/collector/semconv v0.58.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0 h1:9NkMW03wwEzPtP/KciZ4Ozu/Uz5ZA7kfqXJIObnrjGU= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.34.0/go.mod h1:548ZsYzmT4PL4zWKRd8q/N4z0Wxzn/ZxUE+lkEpwWQA= go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= @@ -1209,13 +1153,11 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1261,7 +1203,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1308,7 +1249,6 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -1383,7 +1323,6 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1431,7 +1370,6 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1472,9 +1410,7 @@ golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1491,7 +1427,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= @@ -1510,7 +1445,6 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1816,32 +1750,21 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= -k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= -k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= @@ -1870,7 +1793,6 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= From dba8194cbf3373fd61303f28378f7846b98f6579 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 6 Sep 2022 12:35:20 -0400 Subject: [PATCH 025/144] code cleanup --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 38185c32b6..d45714476d 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -224,8 +224,6 @@ func runAgent(ctx context.Context, inputFilters []string, outputFilters []string, ) error { - //wg := sync.WaitGroup{} // for running both telegraf and otel agents at the same time - envConfigPath, err := getEnvConfigPath(*fConfig, *fEnvConfig) if err != nil { return err From ad3f4b3484cafb64f4f77c26f08b294243fc2a61 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 6 Sep 2022 13:15:29 -0400 Subject: [PATCH 026/144] clean up --- translator/tocwconfig/tocwconfig_test.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index 583a619eeb..06b44ca9c8 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -287,15 +287,6 @@ func verifyToYamlTranslation(t *testing.T, config interface{}, expectedYamlFileP err = decoder.Decode(&expect) assert.NoError(t, err) - // TODO: output for testing verification - expectB, err := yaml.Marshal(expect) - assert.NoError(t, err) - t.Log("Expected:\n", string(expectB)) - - actualB, err := yaml.Marshal(actual) - assert.NoError(t, err) - t.Log("Actual:\n", string(actualB)) - opt := cmpopts.SortSlices(func(x, y interface{}) bool { return pretty.Sprint(x) < pretty.Sprint(y) }) From 64306f53d7802fd36d64fb149cca68f06d1401a7 Mon Sep 17 00:00:00 2001 From: Andrew Huynh Date: Tue, 6 Sep 2022 14:20:26 -0400 Subject: [PATCH 027/144] remove testing yaml --- consolidated-agent.yml | 51 ------------------------------------------ 1 file changed, 51 deletions(-) delete mode 100644 consolidated-agent.yml diff --git a/consolidated-agent.yml b/consolidated-agent.yml deleted file mode 100644 index 67748ec65e..0000000000 --- a/consolidated-agent.yml +++ /dev/null @@ -1,51 +0,0 @@ -receivers: - awscontainerinsightreceiver: - collection_interval: 60s - container_orchestrator: ecs - -processors: - batch/metrics: - timeout: 60s - -exporters: - awsemf: - namespace: ECS/ContainerInsights - log_group_name: '/aws/ecs/containerinsights/{ClusterName}/performance' - log_stream_name: 'instanceTelemetry/{ContainerInstanceId}' - resource_to_telemetry_conversion: - enabled: true - dimension_rollup_option: NoDimensionRollup - parse_json_encoded_attr_values: [Sources] - metric_declarations: - # instance metrics - - dimensions: [ [ ContainerInstanceId, InstanceId, ClusterName] ] - metric_name_selectors: - - instance_cpu_reserved_capacity - - instance_cpu_utilization - - instance_filesystem_utilization - - instance_memory_reserved_capacity - - instance_memory_utilization - - instance_network_total_bytes - - instance_number_of_running_tasks - - dimensions: [ [ClusterName] ] - metric_name_selectors: - - instance_cpu_limit - - instance_cpu_reserved_capacity - - instance_cpu_usage_total - - instance_cpu_utilization - - instance_filesystem_utilization - - instance_memory_limit - - instance_memory_reserved_capacity - - instance_memory_utilization - - instance_memory_working_set - - instance_network_total_bytes - - instance_number_of_running_tasks - logging: - loglevel: debug - -service: - pipelines: - metrics: - receivers: [ awscontainerinsightreceiver] - processors: [ batch/metrics ] - exporters: [ awsemf, logging ] \ No newline at end of file From d5740ddac6429a9e2203967b8bfff68cb9c1a97f Mon Sep 17 00:00:00 2001 From: Adam <90734270+adam-mateen@users.noreply.github.com> Date: Mon, 26 Sep 2022 16:29:21 -0500 Subject: [PATCH 028/144] Fix failing GHA on windows. --- .github/workflows/build-test-windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index ff209a1ff9..e923776e4d 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -25,6 +25,9 @@ jobs: matrix: os: [ windows-2019, windows-latest ] steps: + - name: Support longpaths + run: git config --system core.longpaths true + - name: Checkout Repo uses: actions/checkout@v2 From 8f86c894be4656d5a09abcb8c9243a8abd1b7aea Mon Sep 17 00:00:00 2001 From: Adam <90734270+adam-mateen@users.noreply.github.com> Date: Tue, 27 Sep 2022 08:28:46 -0500 Subject: [PATCH 029/144] Add awscloudwatchexporter. (#10) * Change package cloudwatch to implement the OTEL metric exporter interface. * The exporter name is awscloudwatch. *Stub out methods to implement Telegraf output plugin interface just so the Telegraf framework does not die because TOML config does not list a valid exporter. This can be removed when the Telegraf framework is no longer needed. * Add OTEL metric to AWS SDK metric datum conversion functionality. Only supports Gauge and Sum. Only supports some unit conversions. * Updated JSON->TOML translation to remove everything inside [[outputs.cloudwatch]] since it is now just a stub. * Updated JSON->YAML translation to configure the new exporter. --- cmd/config-translator/translator.go | 4 +- go.mod | 35 +- go.sum | 69 +-- plugins/outputs/cloudwatch/README.md | 13 +- plugins/outputs/cloudwatch/cloudwatch.go | 401 +++++----------- plugins/outputs/cloudwatch/cloudwatch_test.go | 442 ++++++------------ plugins/outputs/cloudwatch/config.go | 58 +++ plugins/outputs/cloudwatch/config_test.go | 61 +++ plugins/outputs/cloudwatch/convert_otel.go | 138 ++++++ .../outputs/cloudwatch/convert_otel_test.go | 137 ++++++ plugins/outputs/cloudwatch/convert_unit.go | 61 +++ .../outputs/cloudwatch/convert_unit_test.go | 29 ++ plugins/outputs/cloudwatch/factory.go | 65 +++ plugins/outputs/cloudwatch/factory_test.go | 39 ++ .../outputs/cloudwatch/metric_decoration.go | 50 +- plugins/outputs/cloudwatch/testdata/full.yaml | 23 + .../outputs/cloudwatch/testdata/minimal.yaml | 13 + .../testdata/missing_namespace.yaml | 12 + .../cloudwatch/testdata/missing_region.yaml | 12 + .../sampleConfig/advanced_config_linux.conf | 6 - .../sampleConfig/advanced_config_linux.yaml | 13 +- .../sampleConfig/advanced_config_windows.conf | 6 - .../sampleConfig/advanced_config_windows.yaml | 7 + .../sampleConfig/basic_config_linux.conf | 6 - .../sampleConfig/basic_config_linux.yaml | 10 +- .../sampleConfig/basic_config_windows.conf | 6 - .../sampleConfig/basic_config_windows.yaml | 7 + .../sampleConfig/collectd_config_linux.conf | 6 - .../sampleConfig/collectd_config_linux.yaml | 13 +- .../sampleConfig/complete_darwin_config.conf | 28 -- .../sampleConfig/complete_darwin_config.yaml | 43 +- .../sampleConfig/complete_linux_config.conf | 30 -- .../sampleConfig/complete_linux_config.yaml | 47 +- .../sampleConfig/complete_windows_config.conf | 27 -- .../sampleConfig/complete_windows_config.yaml | 36 +- .../sampleConfig/delta_config_linux.conf | 24 - .../sampleConfig/delta_config_linux.yaml | 20 + .../sampleConfig/drop_origin_linux.conf | 20 - .../sampleConfig/drop_origin_linux.yaml | 22 + .../sampleConfig/standard_config_linux.conf | 6 - .../sampleConfig/standard_config_linux.yaml | 11 +- ...ndard_config_linux_with_common_config.conf | 8 - ...ndard_config_linux_with_common_config.yaml | 15 +- .../sampleConfig/standard_config_windows.conf | 6 - .../sampleConfig/standard_config_windows.yaml | 7 + ...ard_config_windows_with_common_config.conf | 8 - ...ard_config_windows_with_common_config.yaml | 9 + .../sampleConfig/statsd_config_linux.conf | 7 +- .../sampleConfig/statsd_config_linux.yaml | 13 +- .../sampleConfig/statsd_config_windows.conf | 6 - .../sampleConfig/statsd_config_windows.yaml | 13 +- translator/tocwconfig/tocwconfig_test.go | 3 +- .../tocwconfig/totomlconfig/toTomlConfig.go | 3 +- .../translate/awscloudwatchexporter.go | 84 ++++ .../tocwconfig/toyamlconfig/toyamlconfig.go | 12 +- 55 files changed, 1354 insertions(+), 896 deletions(-) create mode 100644 plugins/outputs/cloudwatch/config.go create mode 100644 plugins/outputs/cloudwatch/config_test.go create mode 100644 plugins/outputs/cloudwatch/convert_otel.go create mode 100644 plugins/outputs/cloudwatch/convert_otel_test.go create mode 100644 plugins/outputs/cloudwatch/convert_unit.go create mode 100644 plugins/outputs/cloudwatch/convert_unit_test.go create mode 100644 plugins/outputs/cloudwatch/factory.go create mode 100644 plugins/outputs/cloudwatch/factory_test.go create mode 100644 plugins/outputs/cloudwatch/testdata/full.yaml create mode 100644 plugins/outputs/cloudwatch/testdata/minimal.yaml create mode 100644 plugins/outputs/cloudwatch/testdata/missing_namespace.yaml create mode 100644 plugins/outputs/cloudwatch/testdata/missing_region.yaml create mode 100644 translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go diff --git a/cmd/config-translator/translator.go b/cmd/config-translator/translator.go index 76c2de54d1..6598c499be 100644 --- a/cmd/config-translator/translator.go +++ b/cmd/config-translator/translator.go @@ -110,8 +110,10 @@ func main() { tomlConfigPath := cmdutil.GetTomlConfigPath(ctx.OutputTomlFilePath()) yamlConfigPath := filepath.Join(filepath.Dir(tomlConfigPath), yamlConfigFileName) config := cmdutil.TranslateJsonMapToConfig(mergedJsonConfigMap) - cmdutil.ConfigToTomlFile(config, tomlConfigPath) + // Call ConfigToYamlFile() first so exporters can be removed before writing TOML. + // Config translation will be improved later. cmdutil.ConfigToYamlFile(config, yamlConfigPath) + cmdutil.ConfigToTomlFile(config, tomlConfigPath) fmt.Println(exitSuccessMessage) // Put env config into the same folder as the toml config envConfigPath := filepath.Join(filepath.Dir(tomlConfigPath), envConfigFileName) diff --git a/go.mod b/go.mod index 2425e62409..2988b5cd9d 100644 --- a/go.mod +++ b/go.mod @@ -56,8 +56,8 @@ require ( github.com/BurntSushi/toml v0.4.1 github.com/Jeffail/gabs v1.4.0 github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 - github.com/aws/aws-sdk-go v1.44.72 - github.com/aws/aws-sdk-go-v2 v1.16.5 + github.com/aws/aws-sdk-go v1.44.87 + github.com/aws/aws-sdk-go-v2 v1.16.13 github.com/aws/aws-sdk-go-v2/config v1.15.3 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.9.4 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.3 @@ -74,24 +74,25 @@ require ( github.com/google/uuid v1.3.0 github.com/hashicorp/golang-lru v0.5.4 github.com/influxdata/telegraf v0.0.0-00010101000000-000000000000 - github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 github.com/influxdata/wlog v0.0.0-20160411224016-7c63b0a71ef8 github.com/kardianos/service v1.2.1 github.com/kr/pretty v0.3.0 github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.12.2 + github.com/prometheus/client_golang v1.13.0 github.com/prometheus/common v0.37.0 - github.com/prometheus/prometheus v1.99.0 + github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2 github.com/shirou/gopsutil/v3 v3.22.7 github.com/stretchr/testify v1.8.0 github.com/xeipuuv/gojsonschema v1.2.0 - go.opentelemetry.io/collector v0.58.0 + go.opentelemetry.io/collector v0.59.0 + go.opentelemetry.io/collector/pdata v0.59.0 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f - golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b + golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 golang.org/x/text v0.3.7 gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/natefinch/lumberjack.v2 v2.0.0 @@ -108,7 +109,7 @@ require ( require ( cloud.google.com/go/compute v1.7.0 // indirect collectd.org v0.4.0 // indirect - contrib.go.opencensus.io/exporter/prometheus v0.4.1 // indirect + contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect github.com/Azure/azure-sdk-for-go v65.0.0+incompatible // indirect github.com/Azure/go-autorest v14.2.0+incompatible // indirect github.com/Azure/go-autorest/autorest v0.11.27 // indirect @@ -143,6 +144,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver v3.5.1+incompatible // indirect github.com/caio/go-tdigest v3.1.0+incompatible // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/checkpoint-restore/go-criu/v5 v5.3.0 // indirect github.com/cilium/ebpf v0.7.0 // indirect @@ -206,6 +208,7 @@ require ( github.com/imdario/mergo v0.3.12 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/influxdata/line-protocol/v2 v2.2.1 // indirect + github.com/influxdata/toml v0.0.0-20190415235208-270119a8ce65 // indirect github.com/ionos-cloud/sdk-go/v6 v6.1.0 // indirect github.com/jhump/protoreflect v1.8.3-0.20210616212123-6cc1efa697ca // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect @@ -213,7 +216,7 @@ require ( github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.16.1 // indirect - github.com/knadh/koanf v1.4.2 // indirect + github.com/knadh/koanf v1.4.3 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect github.com/linode/linodego v1.8.0 // indirect @@ -248,8 +251,8 @@ require ( github.com/pquerna/ffjson v0.0.0-20190930134022-aa0246cd15f7 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common/sigv4 v0.1.0 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/prometheus/statsd_exporter v0.21.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect @@ -276,18 +279,18 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/pdata v0.58.0 // indirect - go.opentelemetry.io/collector/semconv v0.58.0 // indirect + go.opentelemetry.io/collector/semconv v0.59.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect go.opentelemetry.io/otel v1.9.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.31.0 // indirect go.opentelemetry.io/otel/metric v0.31.0 // indirect go.opentelemetry.io/otel/sdk v1.9.0 // indirect go.opentelemetry.io/otel/sdk/metric v0.31.0 // indirect go.opentelemetry.io/otel/trace v1.9.0 // indirect - go.uber.org/atomic v1.9.0 // indirect + go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.22.0 // indirect + go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect @@ -297,7 +300,7 @@ require ( google.golang.org/api v0.86.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect - google.golang.org/grpc v1.48.0 // indirect + google.golang.org/grpc v1.49.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect diff --git a/go.sum b/go.sum index 6412cbf44b..bdba6928dc 100644 --- a/go.sum +++ b/go.sum @@ -62,8 +62,8 @@ cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq code.cloudfoundry.org/clock v1.0.0 h1:kFXWQM4bxYvdBw2X8BbBeXwQNgfoWv1vqAk2ZZyBN2o= collectd.org v0.4.0 h1:nWNldfMqg7EVWAevG8oyOVsS9r/UHRG3LZRf6MdQho0= collectd.org v0.4.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= -contrib.go.opencensus.io/exporter/prometheus v0.4.1 h1:oObVeKo2NxpdF/fIfrPsNj6K0Prg0R0mHM+uANlYMiM= -contrib.go.opencensus.io/exporter/prometheus v0.4.1/go.mod h1:t9wvfitlUjGXG2IXAZsuFq26mDGid/JwCEXp+gTG/9U= +contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= +contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk= github.com/Azure/azure-event-hubs-go/v3 v3.3.17 h1:9k2yRMBJWgcIlSNBuKVja2af/oR3oMowqFPpHDV5Kl4= @@ -171,14 +171,15 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.44.72 h1:i7J5XT7pjBjtl1OrdIhiQHzsG89wkZCcM1HhyK++3DI= -github.com/aws/aws-sdk-go v1.44.72/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.87 h1:u/1sm8MNUSQHt8MGLEQHAj4r3lns3w0B1IXelPKbpn4= +github.com/aws/aws-sdk-go v1.44.87/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.13.0/go.mod h1:L6+ZpqHaLbAaxsqV0L4cvxZY7QupWJB4fhkf8LXvC7w= github.com/aws/aws-sdk-go-v2 v1.16.2/go.mod h1:ytwTPBG6fXTZLxxeeCCWj2/EMYp/xDUgX+OET6TLNNU= -github.com/aws/aws-sdk-go-v2 v1.16.5 h1:Ah9h1TZD9E2S1LzHpViBO3Jz9FPL5+rmflmb8hXirtI= github.com/aws/aws-sdk-go-v2 v1.16.5/go.mod h1:Wh7MEsmEApyL5hrWzpDkba4gwAPc5/piwLVLFnCxp48= +github.com/aws/aws-sdk-go-v2 v1.16.13 h1:HgF7OX2q0gSZtcXoo9DMEA8A2Qk/GCxmWyM0RI7Yz2Y= +github.com/aws/aws-sdk-go-v2 v1.16.13/go.mod h1:xSyvSnzh0KLs5H4HJGeIEsNYemUWdNIl0b/rP6SIsLU= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.2.0 h1:scBthy70MB3m4LCMFaBcmYCyR2XWOz6MxSfdSu/+fQo= github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw= github.com/aws/aws-sdk-go-v2/config v1.15.3 h1:5AlQD0jhVXlGzwo+VORKiUuogkG7pQcLJNzIzK7eodw= @@ -263,6 +264,8 @@ github.com/caio/go-tdigest v3.1.0+incompatible/go.mod h1:sHQM/ubZStBUmF1WbB8FAm8 github.com/casbin/casbin/v2 v2.37.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -657,6 +660,8 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hetznercloud/hcloud-go v1.35.0 h1:sduXOrWM0/sJXwBty7EQd7+RXEJh5+CsAGQmHshChFg= github.com/hetznercloud/hcloud-go v1.35.0/go.mod h1:mepQwR6va27S3UQthaEPGS86jtzSY9xWL1e9dyxXpgA= +github.com/hjson/hjson-go/v4 v4.0.0 h1:wlm6IYYqHjOdXH1gHev4VoXCaW20HdQAGCxdOEEg2cs= +github.com/hjson/hjson-go/v4 v4.0.0/go.mod h1:KaYt3bTw3zhBjYqnXkYywcYctk0A2nxeEFTse3rH13E= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.4.0/go.mod h1:9Ai6uvFy5fQNq6VPKtg+Ceq1+eTY4nKUlR2JElEOcDo= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= @@ -736,8 +741,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= -github.com/knadh/koanf v1.4.2 h1:2itp+cdC6miId4pO4Jw7c/3eiYD26Z/Sz3ATJMwHxIs= -github.com/knadh/koanf v1.4.2/go.mod h1:4NCo0q4pmU398vF9vq2jStF9MWQZ8JEDcDMHlDCr4h0= +github.com/knadh/koanf v1.4.3 h1:rSJcSH5LSFhvzBRsAYfT3k7eLP0I4UxeZqjtAatk+wc= +github.com/knadh/koanf v1.4.3/go.mod h1:5FAkuykKXZvLqhAbP4peWgM5CTcZmn7L1d27k/a+kfg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b/go.mod h1:pcaDhQK0/NJZEvtCO0qQPPropqV0sJOJ6YW7X+9kRwM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -816,7 +821,6 @@ github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJ github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -887,6 +891,9 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 h1:lOTqHGCcUkWqQfVlH4rqy5aTtpPkeiQS/32gIgKLpHY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 h1:D9JetxR98ZSGYvJzpA0lIsGFYAuZOIpZ00Tq7Gnty8o= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0/go.mod h1:OBHCK29nLn16OUrnIf+7F3sA+LnIPZ2dUYr6CtLJxEU= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -942,8 +949,9 @@ github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.13.0 h1:b71QUfeo5M8gq2+evJdTPfZhYMAU0uKPkyPJ7TPsloU= +github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -953,10 +961,10 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.30.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= @@ -967,12 +975,13 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/prometheus v0.37.0 h1:LgnE+97wnUK/qcmk5oHIqieJEKwhZtaSidyKpUyeats= github.com/prometheus/prometheus v0.37.0/go.mod h1:egARUgz+K93zwqsVIAneFlLZefyGOON44WyAp4Xqbbk= -github.com/prometheus/statsd_exporter v0.21.0 h1:hA05Q5RFeIjgwKIYEdFd59xu5Wwaznf33yKI+pyX6T8= -github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= +github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= +github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= github.com/rabbitmq/amqp091-go v1.2.0/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= @@ -1046,6 +1055,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 h1:kdXcSzyDtseVEc4yCz2qF8ZrQvIDBJLl4S1c3GCXmoI= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tidwall/gjson v1.10.2 h1:APbLGOM0rrEkd8WBw9C24nllro4ajFuJu0Sc9hRz8Bo= @@ -1100,9 +1110,12 @@ github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5u github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.4/go.mod h1:5GB2vv4A4AOn3yk7MftYGHkUfGtDHnEraIjym4dYz5A= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.4/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= +go.etcd.io/etcd/client/v3 v3.5.4/go.mod h1:ZaRkVgBZC+L+dLCjTcF1hRXpgZXQPOvnA/Ak/gq3kiY= go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -1112,13 +1125,15 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.58.0 h1:ofl5qa+vTV69PC9NaZKQjE7MP/49iclDKRppl00WgZg= -go.opentelemetry.io/collector v0.58.0/go.mod h1:U3TE477WDi3CYhmE7JGinnpIg8qMH1KCBkRmk3BxKyw= +go.opentelemetry.io/collector v0.59.0 h1:O7sYgWovx6G+fnhBIb9wd4mgt48i9y0FdOIvAUoRBD8= +go.opentelemetry.io/collector v0.59.0/go.mod h1:y2N6u1lrOT+mIjagrtTQYvJscRyaOhjnptiWhT0brKc= go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= -go.opentelemetry.io/collector/pdata v0.58.0 h1:SKWw4vjd6ZjCuvsCvEzqwBaxvov4YbXnnXkc9C4xMqM= -go.opentelemetry.io/collector/pdata v0.58.0/go.mod h1:iMv7Pz+hRthi30rkYkwLVusxQ94GU4pPJgFq7gjGcBk= -go.opentelemetry.io/collector/semconv v0.58.0 h1:wk9KXVnt8IRdNzD9mmdW3d1M/IJ3HyLp1Lz2ZY1fBCM= -go.opentelemetry.io/collector/semconv v0.58.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/collector/pdata v0.59.0 h1:9bZpm7oS271wT8Txesi5hhrxxw3FYg5m+fxswfQeJd4= +go.opentelemetry.io/collector/pdata v0.59.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.59.0 h1:j+o4dTYlH6sj0g2NxAuhDZjDy5m5ao+ovjzNV9GBY6I= +go.opentelemetry.io/collector/semconv v0.59.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= +go.opentelemetry.io/contrib/propagators/b3 v1.9.0/go.mod h1:fyx3gFXn+4w5uWTTiqaI8oBNBW/6w9Ow5zxXf7NGixU= go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= @@ -1135,8 +1150,9 @@ go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTN go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= @@ -1146,8 +1162,8 @@ go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= -go.uber.org/zap v1.22.0 h1:Zcye5DUgBloQ9BaT4qc9BnjOFog5TvBSAGkJ3Nf70c0= -go.uber.org/zap v1.22.0/go.mod h1:H4siCOZOrAolnUPJEkfaSjDqyP+BDS0DdDWzwcgt3+U= +go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= +go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1408,8 +1424,9 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= -golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= +golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1680,8 +1697,8 @@ google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11 google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.48.0 h1:rQOsyJ/8+ufEDJd/Gdsz7HG220Mh9HAhFHRGnIjda0w= -google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= +google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/plugins/outputs/cloudwatch/README.md b/plugins/outputs/cloudwatch/README.md index d7886e43a4..0345cb5598 100644 --- a/plugins/outputs/cloudwatch/README.md +++ b/plugins/outputs/cloudwatch/README.md @@ -1,11 +1,11 @@ -## Amazon CloudWatch Output for Telegraf +## Amazon CloudWatch Exporter for Open Telemetry -This plugin will send metrics to Amazon CloudWatch. +This Exporter will send metrics to Amazon CloudWatch. ## Amazon Authentication -This plugin uses a credential chain for Authentication with the CloudWatch -API endpoint. In the following order the plugin will attempt to authenticate. +This exporter uses a credential chain for Authentication with the CloudWatch +API endpoint. In the following order the exporter will attempt to authenticate. 1. Assumed credentials via STS if `role_arn` attribute is specified (source credentials are evaluated from subsequent rules) 2. Explicit credentials from `access_key`, `secret_key`, and `token` attributes 3. Shared profile from `profile` attribute @@ -13,10 +13,7 @@ API endpoint. In the following order the plugin will attempt to authenticate. 5. [Shared Credentials](https://github.com/aws/aws-sdk-go/wiki/configuring-sdk#shared-credentials-file) 6. [EC2 Instance Profile](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html) -## Config - -For this output plugin to function correctly the following variables -must be configured. +## Required Config * region * endpoint_override diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index abff5ad4fc..67cb10957d 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -4,16 +4,19 @@ package cloudwatch import ( + "context" "log" "reflect" "runtime" "sort" "strings" - "sync" "time" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/models" + "go.opentelemetry.io/collector/pdata/pmetric" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" @@ -22,10 +25,10 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" handlers "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" - "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/outputs" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/consumer" ) const ( @@ -35,7 +38,7 @@ const ( metricChanBufferSize = 10000 datumBatchChanBufferSize = 50 // the number of requests we buffer maxConcurrentPublisher = 10 // the number of CloudWatch clients send request concurrently - pushIntervalInSec = 60 // 60 sec + defaultForceFlushInterval = 60 * time.Second highResolutionTagKey = "aws:StorageResolution" defaultRetryCount = 5 // this is the retry count, the total attempts would be retry count + 1 at most. backoffRetryBase = 200 * time.Millisecond @@ -49,112 +52,66 @@ const ( ) type CloudWatch struct { - Region string `toml:"region"` - EndpointOverride string `toml:"endpoint_override"` - AccessKey string `toml:"access_key"` - SecretKey string `toml:"secret_key"` - RoleARN string `toml:"role_arn"` - Profile string `toml:"profile"` - Filename string `toml:"shared_credential_file"` - Token string `toml:"token"` - ForceFlushInterval internal.Duration `toml:"force_flush_interval"` // unit is second - MaxDatumsPerCall int `toml:"max_datums_per_call"` - MaxValuesPerDatum int `toml:"max_values_per_datum"` - MetricConfigs []MetricDecorationConfig `toml:"metric_decoration"` - RollupDimensions [][]string `toml:"rollup_dimensions"` - DropOriginConfigs map[string][]string `toml:"drop_original_metrics"` - Namespace string `toml:"namespace"` // CloudWatch Metrics Namespace - - Log telegraf.Logger `toml:"-"` - - svc cloudwatchiface.CloudWatchAPI - aggregator Aggregator - aggregatorShutdownChan chan struct{} - aggregatorWaitGroup sync.WaitGroup - metricChan chan telegraf.Metric - datumBatchChan chan []*cloudwatch.MetricDatum - metricDatumBatch *MetricDatumBatch - shutdownChan chan struct{} - pushTicker *time.Ticker - metricDecorations *MetricDecorations - retries int - publisher *publisher.Publisher - retryer *retryer.LogThrottleRetryer - droppingOriginMetrics map[string]map[string]struct{} -} - -var sampleConfig = ` - ## Amazon REGION - region = "us-east-1" - - ## Amazon Credentials - ## Credentials are loaded in the following order - ## 1) Assumed credentials via STS if role_arn is specified - ## 2) explicit credentials from 'access_key' and 'secret_key' - ## 3) shared profile from 'profile' - ## 4) environment variables - ## 5) shared credentials file - ## 6) EC2 Instance Profile - #access_key = "" - #secret_key = "" - #token = "" - #role_arn = "" - #profile = "" - #shared_credential_file = "" - - ## Namespace for the CloudWatch MetricDatums - namespace = "InfluxData/Telegraf" - - ## RollupDimensions - # RollupDimensions = [["host"],["host", "ImageId"],[]] -` - -func (c *CloudWatch) SampleConfig() string { - return sampleConfig + config *Config + svc cloudwatchiface.CloudWatchAPI + // todo: may want to increase the size of the chan since the type changed. + // 1 telegraf Metric could have many Fields. + // Each field corresponds to a MetricDatum. + metricChan chan *cloudwatch.MetricDatum + datumBatchChan chan []*cloudwatch.MetricDatum + metricDatumBatch *MetricDatumBatch + shutdownChan chan struct{} + metricDecorations *MetricDecorations + retries int + publisher *publisher.Publisher + retryer *retryer.LogThrottleRetryer + droppingOriginMetrics map[string]map[string]struct{} } -func (c *CloudWatch) Description() string { - return "Configuration for AWS CloudWatch output." +// Compile time interface check. +var _ component.MetricsExporter = (*CloudWatch)(nil) + +func (c *CloudWatch) Capabilities() consumer.Capabilities { + return consumer.Capabilities{MutatesData: false} } -func (c *CloudWatch) Connect() error { +func (c *CloudWatch) Start(_ context.Context, host component.Host) error { var err error - c.publisher, _ = publisher.NewPublisher(publisher.NewNonBlockingFifoQueue(metricChanBufferSize), maxConcurrentPublisher, 2*time.Second, c.WriteToCloudWatch) - - if c.metricDecorations, err = NewMetricDecorations(c.MetricConfigs); err != nil { + c.publisher, _ = publisher.NewPublisher( + publisher.NewNonBlockingFifoQueue(metricChanBufferSize), + maxConcurrentPublisher, + 2*time.Second, + c.WriteToCloudWatch) + c.metricDecorations, err = NewMetricDecorations(c.config.MetricDecorations) + if err != nil { return err } - credentialConfig := &configaws.CredentialConfig{ - Region: c.Region, - AccessKey: c.AccessKey, - SecretKey: c.SecretKey, - RoleARN: c.RoleARN, - Profile: c.Profile, - Filename: c.Filename, - Token: c.Token, + Region: c.config.Region, + AccessKey: c.config.AccessKey, + SecretKey: c.config.SecretKey, + RoleARN: c.config.RoleARN, + Profile: c.config.Profile, + Filename: c.config.SharedCredentialFilename, + Token: c.config.Token, } configProvider := credentialConfig.Credentials() - - logThrottleRetryer := retryer.NewLogThrottleRetryer(c.Log) + logger := models.NewLogger("outputs", "cloudwatch", "") + logThrottleRetryer := retryer.NewLogThrottleRetryer(logger) svc := cloudwatch.New( configProvider, &aws.Config{ - Endpoint: aws.String(c.EndpointOverride), + Endpoint: aws.String(c.config.EndpointOverride), Retryer: logThrottleRetryer, LogLevel: configaws.SDKLogLevel(), Logger: configaws.SDKLogger{}, }) - svc.Handlers.Build.PushBackNamed(handlers.NewRequestCompressionHandler([]string{opPutLogEvents, opPutMetricData})) svc.Handlers.Build.PushBackNamed(handlers.NewCustomHeaderHandler("User-Agent", agentinfo.UserAgent(""))) - //Format unique roll up list - c.RollupDimensions = GetUniqueRollupList(c.RollupDimensions) - + c.config.RollupDimensions = GetUniqueRollupList(c.config.RollupDimensions) //Construct map for metrics that dropping origin - c.droppingOriginMetrics = GetDroppingDimensionMap(c.DropOriginConfigs) - + c.droppingOriginMetrics = GetDroppingDimensionMap(c.config.DropOriginConfigs) c.svc = svc c.retryer = logThrottleRetryer c.startRoutines() @@ -162,31 +119,18 @@ func (c *CloudWatch) Connect() error { } func (c *CloudWatch) startRoutines() { - c.metricChan = make(chan telegraf.Metric, metricChanBufferSize) + c.metricChan = make(chan *cloudwatch.MetricDatum, metricChanBufferSize) c.datumBatchChan = make(chan []*cloudwatch.MetricDatum, datumBatchChanBufferSize) c.shutdownChan = make(chan struct{}) - c.aggregatorShutdownChan = make(chan struct{}) - c.aggregator = NewAggregator(c.metricChan, c.aggregatorShutdownChan, &c.aggregatorWaitGroup) - if c.ForceFlushInterval.Duration == 0 { - c.ForceFlushInterval.Duration = pushIntervalInSec * time.Second - } - if c.MaxDatumsPerCall == 0 { - c.MaxDatumsPerCall = defaultMaxDatumsPerCall - } - if c.MaxValuesPerDatum == 0 { - c.MaxValuesPerDatum = defaultMaxValuesPerDatum - } - setNewDistributionFunc(c.MaxValuesPerDatum) - perRequestConstSize := overallConstPerRequestSize + len(c.Namespace) + namespaceOverheads - c.metricDatumBatch = newMetricDatumBatch(c.MaxDatumsPerCall, perRequestConstSize) + setNewDistributionFunc(c.config.MaxValuesPerDatum) + perRequestConstSize := overallConstPerRequestSize + len(c.config.Namespace) + namespaceOverheads + c.metricDatumBatch = newMetricDatumBatch(c.config.MaxDatumsPerCall, perRequestConstSize) go c.pushMetricDatum() go c.publish() } -func (c *CloudWatch) Close() error { +func (c *CloudWatch) Shutdown(ctx context.Context) error { log.Println("D! Stopping the CloudWatch output plugin") - close(c.aggregatorShutdownChan) - c.aggregatorWaitGroup.Wait() for i := 0; i < 5; i++ { if len(c.metricChan) == 0 && len(c.datumBatchChan) == 0 { break @@ -205,32 +149,32 @@ func (c *CloudWatch) Close() error { return nil } -func (c *CloudWatch) Write(metrics []telegraf.Metric) error { - for _, m := range metrics { - c.aggregator.AddMetric(m) +// ConsumeMetrics queues metrics to be published to CW. +// The actual publishing will occur in a long running goroutine. +// This method can block when publishing is backed up. +func (c *CloudWatch) ConsumeMetrics(ctx context.Context, metrics pmetric.Metrics) error { + datums := c.ConvertOtelMetrics(metrics) + for _, d := range datums { + c.metricChan <- d } return nil } -// Write data for a single point. A point can have many fields and one field -// is equal to one MetricDatum. There is a limit on how many MetricDatums a -// request can have so we process one Point at a time. +// pushMetricDatum groups datums into batches for efficient API calls. +// When a batch is full it is queued up for sending. +// Even if the batch is not full it will still get sent after the flush interval. func (c *CloudWatch) pushMetricDatum() { ticker := time.NewTicker(time.Second) defer ticker.Stop() for { select { - case point := <-c.metricChan: - datums := c.BuildMetricDatum(point) - numberOfPartitions := len(datums) - for i := 0; i < numberOfPartitions; i++ { - c.metricDatumBatch.Partition = append(c.metricDatumBatch.Partition, datums[i]) - c.metricDatumBatch.Size += payload(datums[i]) - if c.metricDatumBatch.isFull() { - // if batch is full - c.datumBatchChan <- c.metricDatumBatch.Partition - c.metricDatumBatch.clear() - } + case datum := <-c.metricChan: + c.metricDatumBatch.Partition = append(c.metricDatumBatch.Partition, + datum) + c.metricDatumBatch.Size += payload(datum) + if c.metricDatumBatch.isFull() { + c.datumBatchChan <- c.metricDatumBatch.Partition + c.metricDatumBatch.clear() } case <-ticker.C: if c.timeToPublish(c.metricDatumBatch) { @@ -273,7 +217,7 @@ func (b *MetricDatumBatch) isFull() bool { } func (c *CloudWatch) timeToPublish(b *MetricDatumBatch) bool { - return len(b.Partition) > 0 && time.Now().Sub(b.BeginTime) >= c.ForceFlushInterval.Duration + return len(b.Partition) > 0 && time.Now().Sub(b.BeginTime) >= c.config.ForceFlushInterval } // getFirstPushMs returns the time at which the first upload should occur. @@ -297,7 +241,7 @@ func getFirstPushMs(interval time.Duration) int64 { // If thet batch buffer fills up the interval will be gradually reduced to avoid // many agents bursting the backend. func (c *CloudWatch) publish() { - currentInterval := c.ForceFlushInterval.Duration + currentInterval := c.config.ForceFlushInterval nextMs := getFirstPushMs(currentInterval) bufferFullOccurred := false @@ -307,8 +251,6 @@ func (c *CloudWatch) publish() { case <-c.shutdownChan: log.Printf("D! cloudwatch: publish routine receives the shutdown signal, exiting.") return - case <-c.aggregatorShutdownChan: - shouldPublish = true default: } @@ -334,7 +276,7 @@ func (c *CloudWatch) publish() { shouldPublish = true // Restore interval if buffer did not fill up during this interval. if !bufferFullOccurred { - currentInterval = c.ForceFlushInterval.Duration + currentInterval = c.config.ForceFlushInterval } nextMs += currentInterval.Milliseconds() } @@ -357,6 +299,8 @@ func (c *CloudWatch) metricDatumBatchFull() bool { return len(c.datumBatchChan) >= datumBatchChanBufferSize } +// pushMetricDatumBatch will try receiving on the channel, and if successful, +// then it publishes the received batch. func (c *CloudWatch) pushMetricDatumBatch() { for { select { @@ -386,12 +330,11 @@ func (c *CloudWatch) WriteToCloudWatch(req interface{}) { datums := req.([]*cloudwatch.MetricDatum) params := &cloudwatch.PutMetricDataInput{ MetricData: datums, - Namespace: aws.String(c.Namespace), + Namespace: aws.String(c.config.Namespace), } var err error for i := 0; i < defaultRetryCount; i++ { _, err = c.svc.PutMetricData(params) - if err != nil { awsErr, ok := err.(awserr.Error) if !ok { @@ -446,180 +389,64 @@ func (c *CloudWatch) decorateMetricUnit(category string, name string) (decorated return } -// Create MetricDatums according to metric roll up requirement for each field in a Point. Only fields with values that can be -// converted to float64 are supported. Non-supported fields are skipped. -func (c *CloudWatch) BuildMetricDatum(point telegraf.Metric) []*cloudwatch.MetricDatum { - //high resolution logic - isHighResolution := false - highResolutionValue, ok := point.Tags()[highResolutionTagKey] - if ok && strings.EqualFold(highResolutionValue, "true") { - isHighResolution = true - point.RemoveTag(highResolutionTagKey) +// sortedTagKeys returns a sorted list of keys in the map. +// Necessary for comparing a metric-name and its dimensions to determine +// if 2 metrics are actually the same. +func sortedTagKeys(tagMap map[string]string) []string { + // Allocate slice with proper size and avoid append. + keys := make([]string, 0, len(tagMap)) + for k := range tagMap { + keys = append(keys, k) } - - rawDimensions := BuildDimensions(point.Tags()) - dimensionsList := c.ProcessRollup(rawDimensions) - //https://pratheekadidela.in/2016/02/11/is-append-in-go-efficient/ - //https://www.ardanlabs.com/blog/2013/08/understanding-slices-in-go-programming.html - var datums []*cloudwatch.MetricDatum - for k, v := range point.Fields() { - var unit string - var value float64 - var distList []distribution.Distribution - - switch t := v.(type) { - case uint: - value = float64(t) - case uint8: - value = float64(t) - case uint16: - value = float64(t) - case uint32: - value = float64(t) - case uint64: - value = float64(t) - case int: - value = float64(t) - case int8: - value = float64(t) - case int16: - value = float64(t) - case int32: - value = float64(t) - case int64: - value = float64(t) - case float32: - value = float64(t) - case float64: - value = t - case bool: - if t { - value = 1 - } else { - value = 0 - } - case time.Time: - value = float64(t.Unix()) - case distribution.Distribution: - if t.Size() == 0 { - // the distribution does not have a value - continue - } - distList = resize(t, c.MaxValuesPerDatum) - unit = t.Unit() - default: - // Skip unsupported type. - continue - } - - metricName := aws.String(c.decorateMetricName(point.Name(), k)) - if unit == "" { - unit = c.decorateMetricUnit(point.Name(), k) - } - - for index, dimensions := range dimensionsList { - //index == 0 means it's the original metrics, and if the metric name and dimension matches, skip creating - //metric datum - if index == 0 && c.IsDropping(point.Name(), k) { - continue - } - if len(distList) == 0 { - datum := &cloudwatch.MetricDatum{ - MetricName: metricName, - Dimensions: dimensions, - Timestamp: aws.Time(point.Time()), - Value: aws.Float64(value), - } - if unit != "" { - datum.SetUnit(unit) - } - if isHighResolution { - datum.SetStorageResolution(1) - } - datums = append(datums, datum) - } else { - for _, dist := range distList { - datum := &cloudwatch.MetricDatum{ - MetricName: metricName, - Dimensions: dimensions, - Timestamp: aws.Time(point.Time()), - } - values, counts := dist.ValuesAndCounts() - datum.SetValues(aws.Float64Slice(values)) - datum.SetCounts(aws.Float64Slice(counts)) - datum.SetStatisticValues(&cloudwatch.StatisticSet{ - Maximum: aws.Float64(dist.Maximum()), - Minimum: aws.Float64(dist.Minimum()), - SampleCount: aws.Float64(dist.SampleCount()), - Sum: aws.Float64(dist.Sum()), - }) - if unit != "" { - datum.SetUnit(unit) - } - if isHighResolution { - datum.SetStorageResolution(1) - } - datums = append(datums, datum) - } - } - } - } - return datums + sort.Strings(keys) + return keys } -// Make a list of Dimensions by using a Point's tags. CloudWatch supports up to -// 30 dimensions per metric so we only keep up to the first 30 alphabetically. +// BuildDimensions converts the given map of strings to a list of dimensions. +// CloudWatch supports up to 30 dimensions per metric. +// So keep up to the first 30 alphabetically. // This always includes the "host" tag if it exists. // See https://github.com/aws/amazon-cloudwatch-agent/issues/398 -func BuildDimensions(mTags map[string]string) []*cloudwatch.Dimension { +func BuildDimensions(tagMap map[string]string) []*cloudwatch.Dimension { + if len(tagMap) > MaxDimensions { + log.Printf("D! cloudwatch: dropping dimensions, max %v, count %v", + MaxDimensions, len(tagMap)) + } dimensions := make([]*cloudwatch.Dimension, 0, MaxDimensions) - // This is pretty ugly but we always want to include the "host" tag if it exists. - if host, ok := mTags["host"]; ok && host != "" { + if host, ok := tagMap["host"]; ok && host != "" { dimensions = append(dimensions, &cloudwatch.Dimension{ Name: aws.String("host"), Value: aws.String(host), }) } - - var keys []string - for k := range mTags { - if k != "host" { - keys = append(keys, k) - } - } - sort.Strings(keys) - - for _, k := range keys { + sortedKeys := sortedTagKeys(tagMap) + for _, k := range sortedKeys { if len(dimensions) >= MaxDimensions { - log.Printf("D! max MaxDimensions %v is less than than number of dimensions %v thus only taking the max number", MaxDimensions, len(dimensions)) break } - - value := mTags[k] + if k == "host" { + continue + } + value := tagMap[k] if value == "" { continue } - dimensions = append(dimensions, &cloudwatch.Dimension{ Name: aws.String(k), - Value: aws.String(mTags[k]), + Value: aws.String(tagMap[k]), }) } - return dimensions } func (c *CloudWatch) ProcessRollup(rawDimension []*cloudwatch.Dimension) [][]*cloudwatch.Dimension { rawDimensionMap := map[string]string{} for _, v := range rawDimension { - log.Printf("D! rawDimension: name: %s, values: %s\n", *v.Name, *v.Value) rawDimensionMap[*v.Name] = *v.Value } - - targetDimensionsList := c.RollupDimensions + targetDimensionsList := c.config.RollupDimensions fullDimensionsList := [][]*cloudwatch.Dimension{rawDimension} - for _, targetDimensions := range targetDimensionsList { i := 0 extraDimensions := make([]*cloudwatch.Dimension, len(targetDimensions)) @@ -637,10 +464,6 @@ func (c *CloudWatch) ProcessRollup(rawDimension []*cloudwatch.Dimension) [][]*cl if i == len(targetDimensions) && !reflect.DeepEqual(rawDimension, extraDimensions) { fullDimensionsList = append(fullDimensionsList, extraDimensions) } - - } - if len(fullDimensionsList) > 0 && len(fullDimensionsList[0]) > 0 { - log.Printf("D! cloudwatch: Get Full dimensionList %v", fullDimensionsList) } return fullDimensionsList } @@ -688,6 +511,26 @@ func GetDroppingDimensionMap(input map[string][]string) map[string]map[string]st return result } +func (c *CloudWatch) SampleConfig() string { + return "" +} + +func (c *CloudWatch) Description() string { + return "Configuration for AWS CloudWatch output." +} + +func (c *CloudWatch) Connect() error { + return nil +} + +func (c *CloudWatch) Close() error { + return nil +} + +func (c *CloudWatch) Write(metrics []telegraf.Metric) error { + return nil +} + func init() { outputs.Add("cloudwatch", func() telegraf.Output { return &CloudWatch{} diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go index cd9e110b27..9f4e133fa7 100644 --- a/plugins/outputs/cloudwatch/cloudwatch_test.go +++ b/plugins/outputs/cloudwatch/cloudwatch_test.go @@ -4,116 +4,88 @@ package cloudwatch import ( - "fmt" - "sort" + "context" + "log" + "strconv" + "strings" "testing" "time" - "github.com/stretchr/testify/require" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/metric" - "github.com/influxdata/telegraf/testutil" - "github.com/influxdata/toml" - "github.com/influxdata/toml/ast" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) -// Test that each tag becomes one dimension -func TestBuildDimensions(t *testing.T) { - assert := assert.New(t) - - testPoint := testutil.TestMetric(1) - dimensions := BuildDimensions(testPoint.Tags()) - - tagKeys := make([]string, len(testPoint.Tags())) - i := 0 - for k, _ := range testPoint.Tags() { - tagKeys[i] = k - i += 1 - } - - sort.Strings(tagKeys) - - if len(testPoint.Tags()) >= MaxDimensions { - assert.Equal(MaxDimensions, len(dimensions), "Number of dimensions should be less than MaxDimensions") - } else { - assert.Equal(len(testPoint.Tags()), len(dimensions), "Number of dimensions should be equal to number of tags") - } - - for i, key := range tagKeys { - if i >= 10 { - break +// Return true if found. +func contains(dimensions []*cloudwatch.Dimension, key string, val string) bool { + for _, d := range dimensions { + if *d.Name == key && *d.Value == val { + return true } - assert.Equal(key, *dimensions[i].Name, "Key should be equal") - assert.Equal(testPoint.Tags()[key], *dimensions[i].Value, "Value should be equal") } + return false } -// Test that metrics with valid values have a MetricDatum created where as non valid do not. -// Skips "time.Time" type as something is converting the value to string. -func TestBuildMetricDatums(t *testing.T) { +// Test that each tag becomes one dimension. +// Test that no more than 30 dimensions will get returned. +// Test that if "host" dimension exists, it is always included. +func TestBuildDimensions(t *testing.T) { assert := assert.New(t) + // nil + dims := BuildDimensions(nil) + assert.Equal(0, len(dims)) + // empty + dims = BuildDimensions(make(map[string]string)) + assert.Equal(0, len(dims)) + + // Always expect "host". Expect no more than 30. + for i := 1; i < 40; i++ { + tags := make(map[string]string, i) + for j := 0; j < i; j++ { + key := "key" + strconv.Itoa(j) + val := "val" + strconv.Itoa(j) + tags[key] = val + } + tags["host"] = "valhost" + dims = BuildDimensions(tags) + expectedLen := i + 1 + if expectedLen > 30 { + expectedLen = 30 + } - c := &CloudWatch{MaxValuesPerDatum: 3} - - highResolutionMetric := testutil.TestMetric(0) - highResolutionMetric.RemoveTag("tag1") - highResolutionMetric.AddTag(highResolutionTagKey, "true") - - hdatums := c.BuildMetricDatum(highResolutionMetric) - assert.Equal(1, len(hdatums), "Should be able to create one high resolution Datum") - assert.Equal(0, len(hdatums[0].Dimensions), "The high resolution tags shouldn't be build into metric") - - distribution.NewDistribution = regular.NewRegularDistribution - - validDistribution := distribution.NewDistribution() - validDistribution.AddEntry(1, 1) - validMetrics := []telegraf.Metric{ - testutil.TestMetric(1), - testutil.TestMetric(int32(1)), - testutil.TestMetric(int64(1)), - testutil.TestMetric(float64(1)), - testutil.TestMetric(true), - testutil.TestMetric(validDistribution), - } - - for _, point := range validMetrics { - datums := c.BuildMetricDatum(point) - assert.Equal(1, len(datums), "Valid type should create a Datum") - } - - invalidDistribution := distribution.NewDistribution() - err := invalidDistribution.AddEntry(-1, 1) - expectedErrMsg := "negative value" - assert.EqualError(err, expectedErrMsg) - invalidMetrics := []telegraf.Metric{ - testutil.TestMetric("Foo"), - testutil.TestMetric(invalidDistribution), - } - - for _, point := range invalidMetrics { - datums := c.BuildMetricDatum(point) - assert.Equal(0, len(datums), "Invalid type/value should not create a Datum") + hostCount := 0 + keyCount := 0 + valCount := 0 + for _, d := range dims { + if strings.HasPrefix(*d.Name, "host") { + hostCount++ + } + if strings.HasPrefix(*d.Name, "key") { + keyCount++ + } + if strings.HasPrefix(*d.Value, "val") { + valCount++ + } + } + assert.Equal(1, hostCount) + assert.Equal(expectedLen-1, keyCount) + assert.Equal(expectedLen, valCount) } } func TestProcessRollup(t *testing.T) { svc := new(mockCloudWatchClient) - cloudWatchOutput := newCloudWatchClient(svc, time.Second) - cloudWatchOutput.publisher, _ = publisher.NewPublisher( - publisher.NewNonBlockingFifoQueue(10), 10, 2*time.Second, - cloudWatchOutput.WriteToCloudWatch) - cloudWatchOutput.RollupDimensions = [][]string{{"d1", "d2"}, {"d1"}, {}, {"d4"}} + cw := newCloudWatch(svc, time.Second) + cw.publisher, _ = publisher.NewPublisher( + publisher.NewNonBlockingFifoQueue(10), + 10, + 2*time.Second, + cw.WriteToCloudWatch) + cw.config.RollupDimensions = [][]string{{"d1", "d2"}, {"d1"}, {}, {"d4"}} rawDimension := []*cloudwatch.Dimension{ { @@ -130,7 +102,7 @@ func TestProcessRollup(t *testing.T) { }, } - actualDimensionList := cloudWatchOutput.ProcessRollup(rawDimension) + actualDimensionList := cw.ProcessRollup(rawDimension) expectedDimensionList := [][]*cloudwatch.Dimension{ { { @@ -166,7 +138,7 @@ func TestProcessRollup(t *testing.T) { } assert.EqualValues(t, expectedDimensionList, actualDimensionList, "Unexpected dimension roll up list") - cloudWatchOutput.RollupDimensions = [][]string{} + cw.config.RollupDimensions = [][]string{} rawDimension = []*cloudwatch.Dimension{ { Name: aws.String("d1"), @@ -182,7 +154,7 @@ func TestProcessRollup(t *testing.T) { }, } - actualDimensionList = cloudWatchOutput.ProcessRollup(rawDimension) + actualDimensionList = cw.ProcessRollup(rawDimension) expectedDimensionList = [][]*cloudwatch.Dimension{ { { @@ -201,16 +173,16 @@ func TestProcessRollup(t *testing.T) { } assert.EqualValues(t, expectedDimensionList, actualDimensionList, "Unexpected dimension roll up list without rollup setting") - cloudWatchOutput.RollupDimensions = [][]string{{"d1", "d2"}, {"d1"}, {}} + cw.config.RollupDimensions = [][]string{{"d1", "d2"}, {"d1"}, {}} rawDimension = []*cloudwatch.Dimension{} - actualDimensionList = cloudWatchOutput.ProcessRollup(rawDimension) + actualDimensionList = cw.ProcessRollup(rawDimension) expectedDimensionList = [][]*cloudwatch.Dimension{ {}, } assert.EqualValues(t, expectedDimensionList, actualDimensionList, "Unexpected dimension roll up list with no raw dimensions") - cloudWatchOutput.RollupDimensions = [][]string{{"d1", "d2", "d3"}} + cw.config.RollupDimensions = [][]string{{"d1", "d2", "d3"}} rawDimension = []*cloudwatch.Dimension{ { Name: aws.String("d1"), @@ -226,7 +198,7 @@ func TestProcessRollup(t *testing.T) { }, } - actualDimensionList = cloudWatchOutput.ProcessRollup(rawDimension) + actualDimensionList = cw.ProcessRollup(rawDimension) expectedDimensionList = [][]*cloudwatch.Dimension{ { { @@ -245,7 +217,7 @@ func TestProcessRollup(t *testing.T) { } assert.EqualValues(t, expectedDimensionList, actualDimensionList, "Unexpected dimension roll up list with duplicate roll up") - cloudWatchOutput.Close() + cw.Shutdown(context.Background()) } func TestGetUniqueRollupList(t *testing.T) { @@ -276,10 +248,12 @@ func TestIsFlushable(t *testing.T) { svc.On("PutMetricData", mock.Anything).Return( &res, nil) - cloudWatchOutput := newCloudWatchClient(svc, time.Second) - cloudWatchOutput.publisher, _ = publisher.NewPublisher( - publisher.NewNonBlockingFifoQueue(10), 10, 2*time.Second, - cloudWatchOutput.WriteToCloudWatch) + cw := newCloudWatch(svc, time.Second) + cw.publisher, _ = publisher.NewPublisher( + publisher.NewNonBlockingFifoQueue(10), + 10, + 2*time.Second, + cw.WriteToCloudWatch) assert := assert.New(t) perRequestConstSize := overallConstPerRequestSize + len("CWAgent") + namespaceOverheads batch := newMetricDatumBatch(defaultMaxDatumsPerCall, perRequestConstSize) @@ -291,10 +265,10 @@ func TestIsFlushable(t *testing.T) { Timestamp: aws.Time(time.Now()), } batch.Partition = append(batch.Partition, &datum) - assert.False(cloudWatchOutput.timeToPublish(batch)) - time.Sleep(time.Second + cloudWatchOutput.ForceFlushInterval.Duration) - assert.True(cloudWatchOutput.timeToPublish(batch)) - cloudWatchOutput.Close() + assert.False(cw.timeToPublish(batch)) + time.Sleep(time.Second + cw.config.ForceFlushInterval) + assert.True(cw.timeToPublish(batch)) + cw.Shutdown(context.Background()) } func TestIsFull(t *testing.T) { @@ -325,52 +299,48 @@ type mockCloudWatchClient struct { mock.Mock } -func (svc *mockCloudWatchClient) PutMetricData(input *cloudwatch.PutMetricDataInput) (*cloudwatch.PutMetricDataOutput, error) { +func (svc *mockCloudWatchClient) PutMetricData( + input *cloudwatch.PutMetricDataInput, +) (*cloudwatch.PutMetricDataOutput, error) { args := svc.Called(input) return args.Get(0).(*cloudwatch.PutMetricDataOutput), args.Error(1) } -func newCloudWatchClient(svc cloudwatchiface.CloudWatchAPI, forceFlushInterval time.Duration) *CloudWatch { +func newCloudWatch( + svc cloudwatchiface.CloudWatchAPI, + forceFlushInterval time.Duration, +) *CloudWatch { cloudwatch := &CloudWatch{ - svc: svc, - ForceFlushInterval: internal.Duration{Duration: forceFlushInterval}, + svc: svc, + config: &Config{ + ForceFlushInterval: forceFlushInterval, + MaxDatumsPerCall: defaultMaxDatumsPerCall, + MaxValuesPerDatum: defaultMaxValuesPerDatum, + }, } cloudwatch.startRoutines() return cloudwatch } -// -func makeMetrics(count int) []telegraf.Metric { - metrics := make([]telegraf.Metric, 0, count) - measurement := "Test_namespace" - fields := map[string]interface{}{ - "usage_user": 100, - } - - tags := map[string]string{} - ti := time.Now() - m := metric.New(measurement, tags, fields, ti) - for i := 0; i < count; i++ { - metrics = append(metrics, m.Copy()) - } - return metrics -} - -func TestWrite(t *testing.T) { +func TestConsumeMetrics(t *testing.T) { svc := new(mockCloudWatchClient) res := cloudwatch.PutMetricDataOutput{} svc.On("PutMetricData", mock.Anything).Return( &res, nil) - cloudWatchOutput := newCloudWatchClient(svc, time.Second) - cloudWatchOutput.publisher, _ = publisher.NewPublisher( - publisher.NewNonBlockingFifoQueue(10), 10, 2*time.Second, - cloudWatchOutput.WriteToCloudWatch) - metrics := makeMetrics(1500) - cloudWatchOutput.Write(metrics) - time.Sleep(time.Second + 2*cloudWatchOutput.ForceFlushInterval.Duration) + cw := newCloudWatch(svc, time.Second) + cw.publisher, _ = publisher.NewPublisher( + publisher.NewNonBlockingFifoQueue(10), + 10, + 2*time.Second, + cw.WriteToCloudWatch) + // Expect 1500 metrics batched in 2 API calls. + metrics := createTestMetrics(1500, 1, 1, "B/s") + ctx := context.Background() + cw.ConsumeMetrics(ctx, metrics) + time.Sleep(time.Second + 2*cw.config.ForceFlushInterval) assert.True(t, svc.AssertNumberOfCalls(t, "PutMetricData", 2)) - cloudWatchOutput.Close() + cw.Shutdown(ctx) } func TestWriteError(t *testing.T) { @@ -380,12 +350,15 @@ func TestWriteError(t *testing.T) { svc.On("PutMetricData", mock.Anything).Return( &res, serverInternalErr) - cloudWatchOutput := newCloudWatchClient(svc, time.Second) - cloudWatchOutput.publisher, _ = publisher.NewPublisher( - publisher.NewNonBlockingFifoQueue(10), 10, 2*time.Second, - cloudWatchOutput.WriteToCloudWatch) - metrics := makeMetrics(20) - cloudWatchOutput.Write(metrics) + cw := newCloudWatch(svc, time.Second) + cw.publisher, _ = publisher.NewPublisher( + publisher.NewNonBlockingFifoQueue(10), + 10, + 2*time.Second, + cw.WriteToCloudWatch) + metrics := createTestMetrics(20, 1, 10, "") + ctx := context.Background() + cw.ConsumeMetrics(ctx, metrics) // Sum time for all retries. var sum int @@ -394,7 +367,7 @@ func TestWriteError(t *testing.T) { } time.Sleep(backoffRetryBase * time.Duration(sum)) assert.True(t, svc.AssertNumberOfCalls(t, "PutMetricData", 5)) - cloudWatchOutput.Close() + cw.Shutdown(ctx) } // TestPublish verifies metric batches do not get pushed immediately when @@ -409,15 +382,18 @@ func TestPublish(t *testing.T) { // The buffer holds 50 batches of 1,000 metrics. So choose 5x. numMetrics := 5 * datumBatchChanBufferSize * defaultMaxDatumsPerCall expectedCalls := numMetrics / defaultMaxDatumsPerCall - cloudWatchOutput := newCloudWatchClient(svc, interval) - cloudWatchOutput.publisher, _ = publisher.NewPublisher( + log.Printf("I! interval %v, numMetrics %v, expectedCalls %v", + interval, numMetrics, expectedCalls) + cw := newCloudWatch(svc, interval) + cw.publisher, _ = publisher.NewPublisher( publisher.NewNonBlockingFifoQueue(metricChanBufferSize), maxConcurrentPublisher, 2*time.Second, - cloudWatchOutput.WriteToCloudWatch) - metrics := makeMetrics(numMetrics) - // Use goroutine since Write() could block if len(metrics) >metricChanBufferSize. - go cloudWatchOutput.Write(metrics) + cw.WriteToCloudWatch) + metrics := createTestMetrics(numMetrics, 1, 1, "") + ctx := context.Background() + // Use goroutine since it could block if len(metrics) >metricChanBufferSize. + go cw.ConsumeMetrics(ctx, metrics) // Expect some, but not all API calls after half the original interval. time.Sleep(interval/2 + 2*time.Second) assert.Less(t, 0, len(svc.Calls)) @@ -426,126 +402,18 @@ func TestPublish(t *testing.T) { // 10K metrics in batches of 20... time.Sleep(interval) assert.Equal(t, expectedCalls, len(svc.Calls)) - cloudWatchOutput.Close() -} - -func TestMetricConfigsRead(t *testing.T) { - contents := `[[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "cpu" - rename = "CPU" - unit = "Percent" - [[outputs.cloudwatch.metric_decoration]] - category = "mem" - name = "mem" - unit = "Megabytes" - [[outputs.cloudwatch.metric_decoration]] - category = "disk" - name = "disk" - rename = "DISK" - ` - - c, err := buildCloudWatchFromToml(contents) - - assert.True(t, err == nil) - - expected := make([]MetricDecorationConfig, 0) - - mdc := MetricDecorationConfig{ - Category: "cpu", - Metric: "cpu", - Rename: "CPU", - Unit: "Percent", - } - expected = append(expected, mdc) - - mdc = MetricDecorationConfig{ - Category: "mem", - Metric: "mem", - Unit: "Megabytes", - } - expected = append(expected, mdc) - - mdc = MetricDecorationConfig{ - Category: "disk", - Metric: "disk", - Rename: "DISK", - } - expected = append(expected, mdc) - - assert.Equal(t, expected, c.MetricConfigs) -} - -func TestDroppingOriginMetrics(t *testing.T) { - contents := `[outputs.cloudwatch.drop_original_metrics] - cpu = ["cpu_usage_idle", "time_active"] - nvidia_smi = ["temperature_gpu", "utilization_gpu"] - ` - c, err := buildCloudWatchFromToml(contents) - - assert.NoError(t, err) - - expected := make(map[string][]string) - expected["cpu"] = []string{"cpu_usage_idle", "time_active"} - expected["nvidia_smi"] = []string{"temperature_gpu", "utilization_gpu"} - - assert.Equal(t, expected, c.DropOriginConfigs) - - expectedMap := make(map[string]map[string]struct{}) - expectedMap["cpu"] = map[string]struct{}{"cpu_usage_idle": {}, "time_active": {}} - expectedMap["nvidia_smi"] = map[string]struct{}{"temperature_gpu": {}, "utilization_gpu": {}} - - actual := GetDroppingDimensionMap(c.DropOriginConfigs) - assert.Equal(t, expectedMap, actual) -} - -func TestMissMetricConfig(t *testing.T) { - contents := `[outputs.cloudwatch] - access_key = "metric_access_key" - force_flush_interval = "30s" - ` - c, err := buildCloudWatchFromToml(contents) - - assert.True(t, err == nil) - - assert.True(t, c.MetricConfigs == nil) -} - -func buildCloudWatchFromToml(contents string) (*CloudWatch, error) { - c := &CloudWatch{} - - tbl, err := toml.Parse([]byte(contents)) - - if err != nil { - return c, err - } - - if outputsVal, ok := tbl.Fields["outputs"]; ok { - outputsTbl, ok := outputsVal.(*ast.Table) - if !ok { - return c, fmt.Errorf("unexpected outputs field") - } - cloudWatchVal, ok := outputsTbl.Fields["cloudwatch"] - if !ok { - return c, fmt.Errorf("miss cloudwatch field") - } - cloudWatchTbl, ok := cloudWatchVal.(*ast.Table) - if !ok { - return c, fmt.Errorf("unexpected cloudwatch field") - } - - if err := toml.UnmarshalTable(cloudWatchTbl, c); err != nil { - return c, err - } - } - - return c, nil + cw.Shutdown(ctx) } func TestBackoffRetries(t *testing.T) { c := &CloudWatch{} - sleeps := []time.Duration{time.Millisecond * 200, time.Millisecond * 400, time.Millisecond * 800, - time.Millisecond * 1600, time.Millisecond * 3200, time.Millisecond * 6400} + sleeps := []time.Duration{ + time.Millisecond * 200, + time.Millisecond * 400, + time.Millisecond * 800, + time.Millisecond * 1600, + time.Millisecond * 3200, + time.Millisecond * 6400} assert := assert.New(t) leniency := 200 * time.Millisecond for i := 0; i <= defaultRetryCount; i++ { @@ -581,53 +449,3 @@ func TestCloudWatch_metricDatumBatchFull(t *testing.T) { <-c.datumBatchChan assert.False(t, c.metricDatumBatchFull()) } - -func TestBuildMetricDatums_SkipEmptyTags(t *testing.T) { - c := &CloudWatch{ - datumBatchChan: make(chan []*cloudwatch.MetricDatum, 0), - } - input := testutil.MustMetric( - "cpu", - map[string]string{ - "host": "example.org", - "foo": "", - }, - map[string]interface{}{ - "value": int64(42), - }, - time.Unix(0, 0), - ) - - datums := c.BuildMetricDatum(input) - require.Len(t, datums[0].Dimensions, 1) -} - -func TestIsDropping(t *testing.T) { - contents := `[outputs.cloudwatch.drop_original_metrics] - cpu = ["cpu_usage_idle", "time_active"] - ` - c, err := buildCloudWatchFromToml(contents) - - assert.NoError(t, err) - - c.droppingOriginMetrics = GetDroppingDimensionMap(c.DropOriginConfigs) - - assert.True(t, c.IsDropping("cpu", "cpu_usage_idle")) - assert.True(t, c.IsDropping("cpu", "time_active")) - assert.False(t, c.IsDropping("cpu", "usage_guest")) - -} - -func TestIsDroppingWildCard(t *testing.T) { - contents := `[outputs.cloudwatch.drop_original_metrics] - nvidia_smi = ["*"] - ` - c, err := buildCloudWatchFromToml(contents) - - assert.NoError(t, err) - - c.droppingOriginMetrics = GetDroppingDimensionMap(c.DropOriginConfigs) - - assert.True(t, c.IsDropping("nvidia_smi", "any_metric_name")) - assert.True(t, c.IsDropping("nvidia_smi", "utilization_gpu")) -} diff --git a/plugins/outputs/cloudwatch/config.go b/plugins/outputs/cloudwatch/config.go new file mode 100644 index 0000000000..1ecb224868 --- /dev/null +++ b/plugins/outputs/cloudwatch/config.go @@ -0,0 +1,58 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package cloudwatch + +import ( + "errors" + "time" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry" + "go.opentelemetry.io/collector/config" +) + +// Config represent a configuration for the CloudWatch logs exporter. +type Config struct { + // Squash ensures fields are correctly decoded in embedded struct. + config.ExporterSettings `mapstructure:",squash"` + Region string `mapstructure:"region"` + EndpointOverride string `mapstructure:"endpoint_override"` + AccessKey string `mapstructure:"access_key"` + SecretKey string `mapstructure:"secret_key"` + RoleARN string `mapstructure:"role_arn"` + Profile string `mapstructure:"profile"` + SharedCredentialFilename string `mapstructure:"shared_credential_file"` + Token string `mapstructure:"token"` + ForceFlushInterval time.Duration `mapstructure:"force_flush_interval"` + MaxDatumsPerCall int `mapstructure:"max_datums_per_call"` + MaxValuesPerDatum int `mapstructure:"max_values_per_datum"` + MetricDecorations []MetricDecorationConfig `mapstructure:"metric_decoration"` + RollupDimensions [][]string `mapstructure:"rollup_dimensions"` + DropOriginConfigs map[string][]string `mapstructure:"drop_original_metrics"` + Namespace string `mapstructure:"namespace"` + + // ResourceToTelemetrySettings is the option for converting resource + // attributes to telemetry attributes. + // "Enabled" - A boolean field to enable/disable this option. Default is `false`. + // If enabled, all the resource attributes will be converted to metric labels by default. + ResourceToTelemetrySettings resourcetotelemetry.Settings `mapstructure:"resource_to_telemetry_conversion"` +} + +// Verify Config implements Exporter interface. +var _ config.Exporter = (*Config)(nil) + +// Validate checks if the exporter configuration is valid. +func (c *Config) Validate() error { + if c.Region == "" { + return errors.New("'region' must be set") + } + if c.Namespace == "" { + return errors.New("'namespace' must be set") + } + if c.ForceFlushInterval < time.Millisecond { + // YAML with 60, 60s, "60s" will all result in 60 seconds. + // YAML with "60" will cause a panic. + c.ForceFlushInterval *= time.Second + } + return nil +} diff --git a/plugins/outputs/cloudwatch/config_test.go b/plugins/outputs/cloudwatch/config_test.go new file mode 100644 index 0000000000..b389c08916 --- /dev/null +++ b/plugins/outputs/cloudwatch/config_test.go @@ -0,0 +1,61 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT +package cloudwatch + +import ( + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/service/servicetest" +) + +// TestConfig will verify various config files can be loaded. +// Verifies Config.Validate() implicitly. +func TestConfig(t *testing.T) { + factories, err := componenttest.NopFactories() + assert.NoError(t, err) + factory := NewFactory() + factories.Exporters[typeStr] = factory + + // Test missing region. (valid) + fp := filepath.Join("testdata", "missing_region.yaml") + _, err = servicetest.LoadConfigAndValidate(fp, factories) + assert.Error(t, err) + + // Test missing namespace. (valid) + fp = filepath.Join("testdata", "missing_namespace.yaml") + _, err = servicetest.LoadConfigAndValidate(fp, factories) + assert.NoError(t, err) + + // Test minimal valid. + fp = filepath.Join("testdata", "minimal.yaml") + c, err := servicetest.LoadConfigAndValidate(fp, factories) + assert.NoError(t, err) + assert.NotNil(t, c) + assert.Equal(t, 1, len(c.Exporters)) + + // Test full valid. + fp = filepath.Join("testdata", "full.yaml") + c, err = servicetest.LoadConfigAndValidate(fp, factories) + assert.NoError(t, err) + assert.NotNil(t, c) + assert.Equal(t, 1, len(c.Exporters)) + c2 := c.Exporters[config.NewComponentID(typeStr)].(*Config) + assert.Equal(t, "val1", c2.Namespace) + assert.Equal(t, "val2", c2.Region) + assert.Equal(t, "val3", c2.EndpointOverride) + assert.Equal(t, "val4", c2.AccessKey) + assert.Equal(t, "val5", c2.SecretKey) + assert.Equal(t, "val6", c2.RoleARN) + assert.Equal(t, "val7", c2.Profile) + assert.Equal(t, "val8", c2.SharedCredentialFilename) + assert.Equal(t, "val9", c2.Token) + assert.Equal(t, 7, c2.MaxDatumsPerCall) + assert.Equal(t, 9, c2.MaxValuesPerDatum) + assert.Equal(t, 60*time.Second, c2.ForceFlushInterval) + // todo: verify MetricDecorations, RollupDimensions, DropOriginConfigs +} diff --git a/plugins/outputs/cloudwatch/convert_otel.go b/plugins/outputs/cloudwatch/convert_otel.go new file mode 100644 index 0000000000..8d135dd543 --- /dev/null +++ b/plugins/outputs/cloudwatch/convert_otel.go @@ -0,0 +1,138 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package cloudwatch + +import ( + "log" + "strings" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/cloudwatch" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" +) + +// ConvertOtelDimensions will return a list of lists. Without dimension +// rollup there will be just 1 list containing 1 list of all the dimensions. +// With dimension rollup there will be 1 list containing many lists. +func (c *CloudWatch) ConvertOtelDimensions( + attributes pcommon.Map, +) [][]*cloudwatch.Dimension { + // Loop through map, similar to EMF exporter createLabels(). + mTags := make(map[string]string, attributes.Len()) + attributes.Range(func(k string, v pcommon.Value) bool { + mTags[k] = v.AsString() + return true + }) + dimensions := BuildDimensions(mTags) + return c.ProcessRollup(dimensions) +} + +// NumberDataPointValue converts to float64 since that is what AWS SDK will use. +func NumberDataPointValue(dp pmetric.NumberDataPoint) float64 { + switch dp.ValueType() { + case pmetric.NumberDataPointValueTypeDouble: + return dp.DoubleVal() + case pmetric.NumberDataPointValueTypeInt: + return float64(dp.IntVal()) + } + return 0 +} + +// checkHighResolution removes the special dimension/tag/attribute. +// Return true if it was present and set to "true". +// This may change depending on how receivers are implemented. +// Is there a better way to pass the CollectionInterval of each metric +// to ths exporter? For now, do it like it was done for Telegraf metrics. +func checkHighResolution(attributes pcommon.Map) bool { + r := false + v, ok := attributes.Get(highResolutionTagKey) + if ok { + if strings.EqualFold(v.AsString(), "true") { + r = true + } + attributes.Remove(highResolutionTagKey) + } + return r +} + +// ConvertOtelNumberDataPoints converts each datapoint in the given slice to +// 1 or more MetricDatums and returns them. +func (c *CloudWatch) ConvertOtelNumberDataPoints( + dps pmetric.NumberDataPointSlice, + name string, + unit string, +) []*cloudwatch.MetricDatum { + if unit == "" || isUnitInvalid(unit) { + log.Printf("W! cloudwatch: metricname %v, has invalid unit %s", + name, unit) + unit = "None" + } + // Could make() with attrs.Len() * len(c.RollupDimensions). + datums := make([]*cloudwatch.MetricDatum, 0, dps.Len()) + for i := 0; i < dps.Len(); i++ { + dp := dps.At(i) + attrs := dp.Attributes() + isHighResolution := checkHighResolution(attrs) + rolledDims := c.ConvertOtelDimensions(attrs) + value := NumberDataPointValue(dp) + // Each datapoint may become many datums due to dimension roll up. + for _, dims := range rolledDims { + // todo: IsDropping() + md := cloudwatch.MetricDatum{ + Dimensions: dims, + MetricName: aws.String(name), + Unit: aws.String(unit), + Timestamp: aws.Time(dp.Timestamp().AsTime()), + Value: aws.Float64(value), + } + if isHighResolution { + md.SetStorageResolution(1) + } + datums = append(datums, &md) + } + } + return datums +} + +// ConvertOtelMetric creates a list of datums from the datapoints in the given +// metric and returns it. Only supports the metric DataTypes that we plan to use. +// Intentionally not caching previous values and converting cumulative to delta. +// Instead use cumulativetodeltaprocessor which supports monotonic cumulative sums. +func (c *CloudWatch) ConvertOtelMetric(m pmetric.Metric) []*cloudwatch.MetricDatum { + n := m.Name() + u := ConvertUnit(m.Unit()) + switch m.DataType() { + case pmetric.MetricDataTypeGauge: + return c.ConvertOtelNumberDataPoints(m.Gauge().DataPoints(), n, u) + case pmetric.MetricDataTypeSum: + return c.ConvertOtelNumberDataPoints(m.Sum().DataPoints(), n, u) + default: + log.Printf("E! cloudwatch: Unsupported type, %s", m.DataType()) + } + return []*cloudwatch.MetricDatum{} +} + +// ConvertOtelMetrics only uses dimensions/attributes on each "datapoint", +// not each "Resource". +// This is acceptable because ResourceToTelemetrySettings defaults to true. +func (c *CloudWatch) ConvertOtelMetrics(m pmetric.Metrics) []*cloudwatch.MetricDatum { + datums := make([]*cloudwatch.MetricDatum, 0, m.DataPointCount()) + // Metrics -> ResourceMetrics -> ScopeMetrics -> Metrics -> DataPoints + // ^^ "Metric" is in there twice... confusing... + resourceMetrics := m.ResourceMetrics() + for i := 0; i < resourceMetrics.Len(); i++ { + scopeMetrics := resourceMetrics.At(i).ScopeMetrics() + for j := 0; j < scopeMetrics.Len(); j++ { + metrics := scopeMetrics.At(j).Metrics() + for k := 0; k < metrics.Len(); k++ { + metric := metrics.At(k) + newDatums := c.ConvertOtelMetric(metric) + datums = append(datums, newDatums...) + } + } + } + + return datums +} diff --git a/plugins/outputs/cloudwatch/convert_otel_test.go b/plugins/outputs/cloudwatch/convert_otel_test.go new file mode 100644 index 0000000000..655b0afc71 --- /dev/null +++ b/plugins/outputs/cloudwatch/convert_otel_test.go @@ -0,0 +1,137 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package cloudwatch + +import ( + "strconv" + "strings" + "testing" + "time" + + "github.com/aws/aws-sdk-go/service/cloudwatch" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" +) + +const ( + keyPrefix = "key" + valPrefix = "val" + namePrefix = "metric_name_" + otelUnit = "s" + cwUnit = "Seconds" + val float64 = 24 +) + +func addDimensions(dp pmetric.NumberDataPoint, count int) { + for i := 0; i < count; i++ { + key := keyPrefix + strconv.Itoa(i) + val := valPrefix + strconv.Itoa(i) + dp.Attributes().InsertString(key, val) + } +} + +// createTestMetrics will create the numMetrics metrics. +// Each metric will have numDatapoint datapoints. +// Each dp will have numDimensions dimensions. +// Each metric will have the same unit, and value. +// But the value type will alternate between float and int. +// The metric data type will also alternative between gauge and sum. +// The timestamp on each datapoint will be the current time. +func createTestMetrics( + numMetrics int, + numDatapoints int, + numDimensions int, + unit string, +) pmetric.Metrics { + metrics := pmetric.NewMetrics() + rm := metrics.ResourceMetrics().AppendEmpty() + sm := rm.ScopeMetrics().AppendEmpty() + + for i := 0; i < numMetrics; i++ { + m := sm.Metrics().AppendEmpty() + m.SetDescription("my description") + m.SetName(namePrefix + strconv.Itoa(i)) + m.SetUnit(unit) + + if i%2 == 0 { + m.SetDataType(pmetric.MetricDataTypeGauge) + } else { + m.SetDataType(pmetric.MetricDataTypeSum) + } + + for j := 0; j < numDatapoints; j++ { + var dp pmetric.NumberDataPoint + if i%2 == 0 { + dp = m.Gauge().DataPoints().AppendEmpty() + dp.SetIntVal(int64(val)) + } else { + dp = m.Sum().DataPoints().AppendEmpty() + dp.SetDoubleVal(val) + } + dp.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) + dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) + addDimensions(dp, numDimensions) + } + } + + return metrics +} + +// checkDatum verified the given datum has the given unit as well as a +// hardcoded name, value, and dimension prefix. +func checkDatum(t *testing.T, d *cloudwatch.MetricDatum, unit string) { + assert.True(t, strings.HasPrefix(*d.MetricName, namePrefix)) + assert.Equal(t, unit, *d.Unit) + assert.Equal(t, val, *d.Value) + // Assuming unit test does not take more than 1 s. + assert.Less(t, time.Since(*d.Timestamp), time.Second) + for _, dim := range d.Dimensions { + assert.True(t, strings.HasPrefix(*dim.Name, keyPrefix)) + assert.True(t, strings.HasPrefix(*dim.Value, valPrefix)) + } +} + +func TestConvertOtelMetrics_NoDimensions(t *testing.T) { + c := CloudWatch{ + config: &Config{}, + } + + for i := 0; i < 100; i++ { + metrics := createTestMetrics(i, i, 0, "") + datums := c.ConvertOtelMetrics(metrics) + // Expect nummetrics * numDatapointsPerMetric + assert.Equal(t, i*i, len(datums)) + + // Verify dimensions per metric. + for _, d := range datums { + assert.Equal(t, 0, len(d.Dimensions)) + checkDatum(t, d, "None") + } + } +} + +func TestConvertOtelMetrics_Dimensions(t *testing.T) { + c := CloudWatch{ + config: &Config{}, + } + + for i := 0; i < 100; i++ { + // 1 data point per metric, but vary the number dimensions. + metrics := createTestMetrics(i, 1, i, "s") + datums := c.ConvertOtelMetrics(metrics) + // Expect nummetrics * numDatapointsPerMetric + assert.Equal(t, i, len(datums)) + + // Verify dimensions per metric. + for _, d := range datums { + expected := i + if expected > 30 { + expected = 30 + } + assert.Equal(t, expected, len(d.Dimensions)) + checkDatum(t, d, "Seconds") + } + } +} diff --git a/plugins/outputs/cloudwatch/convert_unit.go b/plugins/outputs/cloudwatch/convert_unit.go new file mode 100644 index 0000000000..ef436a013d --- /dev/null +++ b/plugins/outputs/cloudwatch/convert_unit.go @@ -0,0 +1,61 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package cloudwatch + +// CloudWatch supports: +// https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html +var units = map[string]string{ + "": "None", + "1": "None", + "s": "Seconds", + "us": "Microseconds", + "ms": "Milliseconds", + // days, hours, minutes, nanoseconds will require a value conversion. + "B": "Bytes", + "By": "Bytes", + "KB": "Kilobytes", + "KBy": "Kilobytes", + "MB": "Megabytes", + "MBy": "Megabytes", + "GB": "Gigabytes", + "GBy": "Gigabytes", + "TB": "Terabytes", + "TBy": "Terabytes", + // kibibytes, mebibytes, etc. will require a value conversion. + "Bi": "Bits", + "KBi": "Kilobits", + "MBi": "Megabits", + "TBi": "Terabits", + // rates + "B/s": "Bytes/Second", + "By/s": "Bytes/Second", + "KB/s": "Kilobytes/Second", + "KBy/s": "Kilobytes/Second", + "MB/s": "Megabytes/Second", + "MBy/s": "Megabytes/Second", + "GB/s": "Gigabytes/Second", + "GBy/s": "Gigabytes/Second", + "TB/s": "Terabytes/Second", + "TBy/s": "Terabytes/Second", + + "Bi/s": "Bits/Second", + "KBi/s": "Kilobits/Second", + "MBi/s": "Megabits/Second", + "GBi/s": "Gigabits/Second", + "TBi/s": "Terabits/Second", +} + +// ConvertUnit converts from the OTEL unit names to the corresponding names +// supported by AWS CloudWatch. Some OTEL unit types are unsupported. +// Some could be supported if we converted the metric value as well. +// For example OTEL could have "KiBy" (kibibytes) with a value of 1. +// We would need to report 1024/1000 to AWS with unit of kilobytes. +// Or leave the value as-is and use "kilobytes" to mean 1000 Bytes and 1024. +func ConvertUnit(unit string) string { + u, ok := units[unit] + if ok { + return u + } + return unit +} diff --git a/plugins/outputs/cloudwatch/convert_unit_test.go b/plugins/outputs/cloudwatch/convert_unit_test.go new file mode 100644 index 0000000000..c77fed91ec --- /dev/null +++ b/plugins/outputs/cloudwatch/convert_unit_test.go @@ -0,0 +1,29 @@ +package cloudwatch + +import ( + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestConvertUnit(t *testing.T) { + // Each element in the slice has the input and expectedOutput. + cases := [][2]string{ + {"", "None"}, + {"1", "None"}, + {"B", "Bytes"}, + {"B/s", "Bytes/Second"}, + {"By/s", "Bytes/Second"}, + {"Bi/s", "Bits/Second"}, + } + + for _, c := range cases { + a := ConvertUnit(c[0]) + assert.Equal(t, c[1], a) + } +} + +// If the unit cannot be converted then just use the current value. +func TestConvertUnitNoMatch(t *testing.T) { + assert.Equal(t, "Bytes", ConvertUnit("Bytes")) +} diff --git a/plugins/outputs/cloudwatch/factory.go b/plugins/outputs/cloudwatch/factory.go new file mode 100644 index 0000000000..000f808dce --- /dev/null +++ b/plugins/outputs/cloudwatch/factory.go @@ -0,0 +1,65 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +// Package cloudwatch provides a metric exporter for the OpenTelemetry collector. +// todo: Once the private and public repositories are merged it would be good +// to move this package to .../exporter/awscloudwatchexporter and rename it. +package cloudwatch + +import ( + "context" + + "github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/exporter/exporterhelper" +) + +const ( + typeStr config.Type = "awscloudwatch" + stability = component.StabilityLevelAlpha +) + +func NewFactory() component.ExporterFactory { + return component.NewExporterFactory( + typeStr, + createDefaultConfig, + component.WithMetricsExporter(createMetricsExporter, stability), + ) +} + +func createDefaultConfig() config.Exporter { + return &Config{ + ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + Namespace: "CWAgent", + MaxDatumsPerCall: defaultMaxDatumsPerCall, + MaxValuesPerDatum: defaultMaxValuesPerDatum, + ForceFlushInterval: defaultForceFlushInterval, + ResourceToTelemetrySettings: resourcetotelemetry.Settings{ + Enabled: true, + }, + } +} + +func createMetricsExporter( + ctx context.Context, + settings component.ExporterCreateSettings, + config config.Exporter, +) (component.MetricsExporter, error) { + exp := &CloudWatch{ + config: config.(*Config), + } + exporter, err := exporterhelper.NewMetricsExporter( + ctx, + settings, + config, + exp.ConsumeMetrics, + exporterhelper.WithStart(exp.Start), + exporterhelper.WithShutdown(exp.Shutdown), + ) + if err != nil { + return nil, err + } + return resourcetotelemetry.WrapMetricsExporter( + config.(*Config).ResourceToTelemetrySettings, exporter), nil +} diff --git a/plugins/outputs/cloudwatch/factory_test.go b/plugins/outputs/cloudwatch/factory_test.go new file mode 100644 index 0000000000..ad367cad6e --- /dev/null +++ b/plugins/outputs/cloudwatch/factory_test.go @@ -0,0 +1,39 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package cloudwatch + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config/configtest" +) + +func TestCreateDefaultConfig(t *testing.T) { + factory := NewFactory() + cfg := factory.CreateDefaultConfig() + assert.NotNil(t, cfg, "failed to create default config") + assert.NoError(t, configtest.CheckConfigStruct(cfg)) +} + +func TestCreateExporter(t *testing.T) { + factory := NewFactory() + + cfg := factory.CreateDefaultConfig() + creationSet := componenttest.NewNopExporterCreateSettings() + tExporter, err := factory.CreateTracesExporter(context.Background(), creationSet, cfg) + assert.Equal(t, err, component.ErrDataTypeIsNotSupported) + assert.Nil(t, tExporter) + + mExporter, err := factory.CreateMetricsExporter(context.Background(), creationSet, cfg) + assert.NoError(t, err) + assert.NotNil(t, mExporter) + + tLogs, err := factory.CreateLogsExporter(context.Background(), creationSet, cfg) + assert.Equal(t, err, component.ErrDataTypeIsNotSupported) + assert.Nil(t, tLogs) +} diff --git a/plugins/outputs/cloudwatch/metric_decoration.go b/plugins/outputs/cloudwatch/metric_decoration.go index d07093d9b2..7c22d2f38d 100644 --- a/plugins/outputs/cloudwatch/metric_decoration.go +++ b/plugins/outputs/cloudwatch/metric_decoration.go @@ -10,17 +10,41 @@ import ( ) type MetricDecorationConfig struct { - Category string `toml:"category"` - Metric string `toml:"name"` - Rename string `toml:"rename"` - Unit string `toml:"unit"` + Category string `mapstructure:"category"` + Metric string `mapstructure:"name"` + Rename string `mapstructure:"rename"` + Unit string `mapstructure:"unit"` } -var supportedUnits = []string{"Seconds", "Microseconds", "Milliseconds", "Bytes", "Kilobytes", "Megabytes", - "Gigabytes", "Terabytes", "Bits", "Kilobits", "Megabits", "Gigabits", "Terabits", - "Percent", "Count", "Bytes/Second", "Kilobytes/Second", "Megabytes/Second", - "Gigabytes/Second", "Terabytes/Second", "Bits/Second", "Kilobits/Second", - "Megabits/Second", "Gigabits/Second", "Terabits/Second", "Count/Second", "None"} +var supportedUnits = map[string]struct{}{ + "Seconds": {}, + "Microseconds": {}, + "Milliseconds": {}, + "Bytes": {}, + "Kilobytes": {}, + "Megabytes": {}, + "Gigabytes": {}, + "Terabytes": {}, + "Bits": {}, + "Kilobits": {}, + "Megabits": {}, + "Gigabits": {}, + "Terabits": {}, + "Percent": {}, + "Count": {}, + "Bytes/Second": {}, + "Kilobytes/Second": {}, + "Megabytes/Second": {}, + "Gigabytes/Second": {}, + "Terabytes/Second": {}, + "Bits/Second": {}, + "Kilobits/Second": {}, + "Megabits/Second": {}, + "Gigabits/Second": {}, + "Terabits/Second": {}, + "Count/Second": {}, + "None": {}, +} func NewMetricDecorations(metricConfigs []MetricDecorationConfig) (*MetricDecorations, error) { result := &MetricDecorations{ @@ -72,12 +96,8 @@ func isUnitInvalid(unit string) bool { if unit == "" { return false } - for _, v := range supportedUnits { - if v == unit { - return false - } - } - return true + _, ok := supportedUnits[unit] + return !ok } func (m *MetricDecorations) addDecorations(category string, name string, rename string, unit string) error { diff --git a/plugins/outputs/cloudwatch/testdata/full.yaml b/plugins/outputs/cloudwatch/testdata/full.yaml new file mode 100644 index 0000000000..f558478c31 --- /dev/null +++ b/plugins/outputs/cloudwatch/testdata/full.yaml @@ -0,0 +1,23 @@ +receivers: + nop: {} + +exporters: + awscloudwatch: + namespace: val1 + region: val2 + endpoint_override: val3 + access_key: val4 + secret_key: val5 + role_arn: val6 + profile: val7 + shared_credential_file: val8 + token: val9 + force_flush_interval: 60 + max_datums_per_call: 7 + max_values_per_datum: 9 + +service: + pipelines: + metrics: + receivers: [nop] + exporters: [awscloudwatch] \ No newline at end of file diff --git a/plugins/outputs/cloudwatch/testdata/minimal.yaml b/plugins/outputs/cloudwatch/testdata/minimal.yaml new file mode 100644 index 0000000000..b3fa93cd3a --- /dev/null +++ b/plugins/outputs/cloudwatch/testdata/minimal.yaml @@ -0,0 +1,13 @@ +receivers: + nop: {} + +exporters: + awscloudwatch: + namespace: mytestnamespace + region: us-yeast-99 + +service: + pipelines: + metrics: + receivers: [nop] + exporters: [awscloudwatch] diff --git a/plugins/outputs/cloudwatch/testdata/missing_namespace.yaml b/plugins/outputs/cloudwatch/testdata/missing_namespace.yaml new file mode 100644 index 0000000000..50a605aa81 --- /dev/null +++ b/plugins/outputs/cloudwatch/testdata/missing_namespace.yaml @@ -0,0 +1,12 @@ +receivers: + nop: {} + +exporters: + awscloudwatch: + region: us-east-99 + +service: + pipelines: + metrics: + receivers: [nop] + exporters: [awscloudwatch] diff --git a/plugins/outputs/cloudwatch/testdata/missing_region.yaml b/plugins/outputs/cloudwatch/testdata/missing_region.yaml new file mode 100644 index 0000000000..d1e382d2c4 --- /dev/null +++ b/plugins/outputs/cloudwatch/testdata/missing_region.yaml @@ -0,0 +1,12 @@ +receivers: + nop: {} + +exporters: + awscloudwatch: + namespace: mytestnamespace + +service: + pipelines: + metrics: + receivers: [nop] + exporters: [awscloudwatch] diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.conf b/translator/tocwconfig/sampleConfig/advanced_config_linux.conf index c4e2272afd..492e30a686 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.conf @@ -66,12 +66,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index 8fee2fd483..b5271ccb06 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -17,15 +22,17 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - - telegraf_delta - telegraf_ec2tagger + - telegraf_delta + - cumulativetodeltaprocessor/ace receivers: - - telegraf_disk - telegraf_diskio - telegraf_ethtool - telegraf_mem - telegraf_netstat - telegraf_nvidia_smi - telegraf_swap - - telegraf_cpu \ No newline at end of file + - telegraf_cpu + - telegraf_disk \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.conf b/translator/tocwconfig/sampleConfig/advanced_config_windows.conf index ecb2bcbb2d..470852bd49 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.conf +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.conf @@ -75,12 +75,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index 217568d3d3..410f265f57 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -9,7 +14,9 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.conf b/translator/tocwconfig/sampleConfig/basic_config_linux.conf index 228f31bfef..5b070c3b29 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.conf @@ -30,12 +30,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-east-1" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index a17d4d57e7..81c5133064 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-east-1 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_disk: {} @@ -9,9 +14,12 @@ service: pipelines: metrics: exporters: + - awscloudwatchexporter/ace - telegraf_cloudwatch processors: + - cumulativetodeltaprocessor/ace - telegraf_ec2tagger receivers: + - telegraf_mem - telegraf_disk - - telegraf_mem \ No newline at end of file + diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.conf b/translator/tocwconfig/sampleConfig/basic_config_windows.conf index 6766ed18df..edd755dedd 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.conf +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.conf @@ -39,12 +39,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index 217568d3d3..fab2d169d3 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -8,8 +13,10 @@ service: pipelines: metrics: exporters: + - awscloudwatchexporter/ace - telegraf_cloudwatch processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.conf b/translator/tocwconfig/sampleConfig/collectd_config_linux.conf index 98f491db88..51c6561648 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.conf @@ -30,9 +30,3 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml index 6adf61f703..614b3a02fe 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} -processors: {} +processors: + cumulativetodeltaprocessor/ace: {} receivers: telegraf_socket_listener: {} service: @@ -8,6 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - processors: [] + - awscloudwatchexporter/ace + processors: + - cumulativetodeltaprocessor/ace receivers: - - telegraf_socket_listener + - telegraf_socket_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.conf b/translator/tocwconfig/sampleConfig/complete_darwin_config.conf index 656a70089a..e4981303f2 100755 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.conf +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.conf @@ -144,34 +144,6 @@ [outputs] [[outputs.cloudwatch]] - endpoint_override = "https://monitoring-fips.us-west-2.amazonaws.com" - force_flush_interval = "60s" - max_datums_per_call = 1000 - max_values_per_datum = 5000 - namespace = "CWAgent" - region = "us-west-2" - role_arn = "metrics_role_arn_value_test" - rollup_dimensions = [["ImageId"], ["InstanceId", "InstanceType"], ["d1"], []] - tagexclude = ["host", "metricPath"] - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_idle" - rename = "CPU_USAGE_IDLE" - unit = "unit" - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_nice" - unit = "unit" - - [[outputs.cloudwatch.metric_decoration]] - category = "disk" - name = "free" - rename = "DISK_FREE" - unit = "unit" - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [[outputs.cloudwatchlogs]] endpoint_override = "https://logs-fips.us-west-2.amazonaws.com" diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index f0d5dc9ece..0bd9867c48 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -1,7 +1,34 @@ exporters: + awscloudwatchexporter/ace: + endpoint_override: https://monitoring-fips.us-west-2.amazonaws.com + force_flush_interval: 60s + max_datums_per_call: 1000 + max_values_per_datum: 5000 + metric_decoration: + - category: cpu + name: usage_idle + rename: CPU_USAGE_IDLE + unit: unit + - category: cpu + name: usage_nice + unit: unit + - category: disk + name: free + rename: DISK_FREE + unit: unit + namespace: CWAgent + region: us-west-2 + role_arn: metrics_role_arn_value_test + rollup_dimensions: + - - ImageId + - - InstanceId + - InstanceType + - - d1 + - [] telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -21,21 +48,23 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - telegraf_cloudwatchlogs + - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - telegraf_ec2tagger - telegraf_delta + - cumulativetodeltaprocessor/ace receivers: - telegraf_cpu + - telegraf_mem + - telegraf_netstat + - telegraf_processes - telegraf_socket_listener - telegraf_disk + - telegraf_swap - telegraf_statsd - - telegraf_netstat - telegraf_logfile - - telegraf_processes - - telegraf_diskio - - telegraf_mem - - telegraf_swap - - telegraf_net - telegraf_procstat + - telegraf_diskio + - telegraf_net \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.conf b/translator/tocwconfig/sampleConfig/complete_linux_config.conf index 068147c10f..1c24a7020b 100755 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.conf +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.conf @@ -144,36 +144,6 @@ [outputs] [[outputs.cloudwatch]] - endpoint_override = "https://monitoring-fips.us-west-2.amazonaws.com" - force_flush_interval = "60s" - max_datums_per_call = 1000 - max_values_per_datum = 5000 - namespace = "CWAgent" - region = "us-west-2" - role_arn = "metrics_role_arn_value_test" - rollup_dimensions = [["ImageId"], ["InstanceId", "InstanceType"], ["d1"], []] - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.drop_original_metrics] - cpu = ["cpu_usage_idle", "time_active"] - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_idle" - rename = "CPU_USAGE_IDLE" - unit = "unit" - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_nice" - unit = "unit" - - [[outputs.cloudwatch.metric_decoration]] - category = "disk" - name = "free" - rename = "DISK_FREE" - unit = "unit" - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [[outputs.cloudwatchlogs]] endpoint_override = "https://logs-fips.us-west-2.amazonaws.com" diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index 7a27d99065..61af395302 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -1,7 +1,38 @@ exporters: + awscloudwatchexporter/ace: + drop_original_metrics: + cpu: + - cpu_usage_idle + - time_active + endpoint_override: https://monitoring-fips.us-west-2.amazonaws.com + force_flush_interval: 60s + max_datums_per_call: 1000 + max_values_per_datum: 5000 + metric_decoration: + - category: cpu + name: usage_idle + rename: CPU_USAGE_IDLE + unit: unit + - category: cpu + name: usage_nice + unit: unit + - category: disk + name: free + rename: DISK_FREE + unit: unit + namespace: CWAgent + region: us-west-2 + role_arn: metrics_role_arn_value_test + rollup_dimensions: + - - ImageId + - - InstanceId + - InstanceType + - - d1 + - [] telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -21,21 +52,23 @@ service: pipelines: metrics: exporters: + - awscloudwatchexporter/ace - telegraf_cloudwatchlogs - telegraf_cloudwatch processors: - telegraf_ec2tagger - telegraf_delta + - cumulativetodeltaprocessor/ace receivers: - - telegraf_processes - - telegraf_swap - - telegraf_mem - - telegraf_disk - - telegraf_statsd + - telegraf_logfile - telegraf_socket_listener + - telegraf_processes - telegraf_procstat - - telegraf_cpu - - telegraf_logfile + - telegraf_disk - telegraf_net - telegraf_netstat + - telegraf_mem + - telegraf_statsd - telegraf_diskio + - telegraf_swap + - telegraf_cpu \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.conf b/translator/tocwconfig/sampleConfig/complete_windows_config.conf index 90861d7dbb..6411e5113f 100755 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.conf +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.conf @@ -166,33 +166,6 @@ [outputs] [[outputs.cloudwatch]] - endpoint_override = "https://monitoring-fips.us-west-2.amazonaws.com" - force_flush_interval = "60s" - max_datums_per_call = 1000 - max_values_per_datum = 5000 - namespace = "CWAgent" - region = "us-west-2" - role_arn = "metrics_role_arn_value_test" - rollup_dimensions = [["ImageId"], ["InstanceId", "InstanceType"], ["d1"], []] - tagexclude = ["host", "metricPath"] - - [[outputs.cloudwatch.metric_decoration]] - category = "LogicalDisk" - name = "% Idle Time" - unit = "PERCENT" - - [[outputs.cloudwatch.metric_decoration]] - category = "LogicalDisk" - name = "% Disk Read Time" - rename = "DISK_READ" - - [[outputs.cloudwatch.metric_decoration]] - category = "Processor" - name = "% Idle Time" - rename = "CPU_IDLE" - unit = "PERCENT" - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [[outputs.cloudwatchlogs]] endpoint_override = "https://logs-fips.us-west-2.amazonaws.com" diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index cf19a0331d..d90293cb1a 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -1,7 +1,33 @@ exporters: + awscloudwatchexporter/ace: + endpoint_override: https://monitoring-fips.us-west-2.amazonaws.com + force_flush_interval: 60s + max_datums_per_call: 1000 + max_values_per_datum: 5000 + metric_decoration: + - category: LogicalDisk + name: '% Idle Time' + unit: PERCENT + - category: LogicalDisk + name: '% Disk Read Time' + rename: DISK_READ + - category: Processor + name: '% Idle Time' + rename: CPU_IDLE + unit: PERCENT + namespace: CWAgent + region: us-west-2 + role_arn: metrics_role_arn_value_test + rollup_dimensions: + - - ImageId + - - InstanceId + - InstanceType + - - d1 + - [] telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_logfile: {} @@ -15,15 +41,17 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatchlogs - telegraf_cloudwatch + - awscloudwatchexporter/ace + - telegraf_cloudwatchlogs processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: + - telegraf_logfile + - telegraf_socket_listener - telegraf_win_perf_counters - telegraf_nvidia_smi - telegraf_procstat - telegraf_statsd - - telegraf_socket_listener - - telegraf_logfile - - telegraf_windows_event_log + - telegraf_windows_event_log \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.conf b/translator/tocwconfig/sampleConfig/delta_config_linux.conf index 40698f3aa5..c468b77dea 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.conf @@ -26,30 +26,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-east-1" - tagexclude = ["host", "metricPath"] - - [[outputs.cloudwatch.metric_decoration]] - category = "diskio" - name = "iops_in_progress" - rename = "DRIVER_DISKIO_IOPS_IN_PROGRESS" - unit = "Count" - - [[outputs.cloudwatch.metric_decoration]] - category = "diskio" - name = "read_time" - rename = "DRIVER_DISKIO_READ_TIME" - unit = "Milliseconds" - - [[outputs.cloudwatch.metric_decoration]] - category = "diskio" - name = "write_time" - rename = "DRIVER_DISKIO_WRITE_TIME" - unit = "Milliseconds" - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml index ed694f1f83..303cd0a95e 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -1,6 +1,24 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + metric_decoration: + - category: diskio + name: iops_in_progress + rename: DRIVER_DISKIO_IOPS_IN_PROGRESS + unit: Count + - category: diskio + name: read_time + rename: DRIVER_DISKIO_READ_TIME + unit: Milliseconds + - category: diskio + name: write_time + rename: DRIVER_DISKIO_WRITE_TIME + unit: Milliseconds + namespace: CWAgent + region: us-east-1 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -10,8 +28,10 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - telegraf_ec2tagger - telegraf_delta + - cumulativetodeltaprocessor/ace receivers: - telegraf_diskio \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.conf b/translator/tocwconfig/sampleConfig/drop_origin_linux.conf index e3cf12305d..e399c29d9d 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.conf +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.conf @@ -50,26 +50,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.drop_original_metrics] - cpu = ["cpu_usage_idle", "time_active"] - nvidia_smi = ["temperature_gpu", "utilization_gpu"] - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_idle" - rename = "CPU_USAGE_IDLE" - unit = "unit" - - [[outputs.cloudwatch.metric_decoration]] - category = "cpu" - name = "usage_nice" - unit = "unit" - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml index 46cd1f98e7..042f7f2809 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -1,6 +1,26 @@ exporters: + awscloudwatchexporter/ace: + drop_original_metrics: + cpu: + - cpu_usage_idle + - time_active + nvidia_smi: + - temperature_gpu + - utilization_gpu + force_flush_interval: 60s + metric_decoration: + - category: cpu + name: usage_idle + rename: CPU_USAGE_IDLE + unit: unit + - category: cpu + name: usage_nice + unit: unit + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_cpu: {} @@ -11,8 +31,10 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: - telegraf_nvidia_smi - telegraf_cpu diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.conf b/translator/tocwconfig/sampleConfig/standard_config_linux.conf index b32c725deb..d78dfcc179 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.conf @@ -48,12 +48,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index a6dbc26b02..45be546b8e 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -14,12 +19,14 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: + - cumulativetodeltaprocessor/ace - telegraf_ec2tagger - telegraf_delta receivers: - - telegraf_swap - telegraf_cpu - telegraf_disk - telegraf_diskio - - telegraf_mem \ No newline at end of file + - telegraf_mem + - telegraf_swap \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf index 2724eae10c..946dd46937 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.conf @@ -48,14 +48,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - profile = "AmazonCloudWatchAgent" - region = "us-west-2" - shared_credential_file = "fake-path" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml index e4ccff2602..eb5d39d8e9 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -1,6 +1,13 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + profile: AmazonCloudWatchAgent + region: us-west-2 + shared_credential_file: fake-path telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -14,12 +21,14 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - - telegraf_ec2tagger - telegraf_delta + - cumulativetodeltaprocessor/ace + - telegraf_ec2tagger receivers: + - telegraf_disk - telegraf_diskio - telegraf_mem - telegraf_swap - - telegraf_cpu - - telegraf_disk \ No newline at end of file + - telegraf_cpu \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.conf b/translator/tocwconfig/sampleConfig/standard_config_windows.conf index f0062617b7..18f2cf3f2c 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.conf +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.conf @@ -60,12 +60,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index 217568d3d3..fab2d169d3 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -8,8 +13,10 @@ service: pipelines: metrics: exporters: + - awscloudwatchexporter/ace - telegraf_cloudwatch processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf index ebf667fe07..6cb46aa590 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.conf @@ -60,14 +60,6 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - profile = "AmazonCloudWatchAgent" - region = "us-west-2" - shared_credential_file = "fake-path" - tagexclude = ["host", "metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] [processors] diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index 217568d3d3..6e13bc9023 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -1,6 +1,13 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + profile: AmazonCloudWatchAgent + region: us-west-2 + shared_credential_file: fake-path telegraf_cloudwatch: {} processors: + cumulativetodeltaprocessor/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -9,7 +16,9 @@ service: metrics: exporters: - telegraf_cloudwatch + - awscloudwatchexporter/ace processors: - telegraf_ec2tagger + - cumulativetodeltaprocessor/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.conf b/translator/tocwconfig/sampleConfig/statsd_config_linux.conf index 7ac7e9b887..c88edfa12d 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.conf +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.conf @@ -28,9 +28,4 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] + diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml index 83ec012025..51af0da400 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} -processors: {} +processors: + cumulativetodeltaprocessor/ace: {} receivers: telegraf_statsd: {} service: @@ -8,6 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - processors: [] + - awscloudwatchexporter/ace + processors: + - cumulativetodeltaprocessor/ace receivers: - - telegraf_statsd + - telegraf_statsd \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.conf b/translator/tocwconfig/sampleConfig/statsd_config_windows.conf index c29b2287c6..d0a130de7c 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.conf +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.conf @@ -28,9 +28,3 @@ [outputs] [[outputs.cloudwatch]] - force_flush_interval = "60s" - namespace = "CWAgent" - region = "us-west-2" - tagexclude = ["metricPath"] - [outputs.cloudwatch.tagpass] - metricPath = ["metrics"] diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml index 83ec012025..51af0da400 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -1,6 +1,11 @@ exporters: + awscloudwatchexporter/ace: + force_flush_interval: 60s + namespace: CWAgent + region: us-west-2 telegraf_cloudwatch: {} -processors: {} +processors: + cumulativetodeltaprocessor/ace: {} receivers: telegraf_statsd: {} service: @@ -8,6 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - processors: [] + - awscloudwatchexporter/ace + processors: + - cumulativetodeltaprocessor/ace receivers: - - telegraf_statsd + - telegraf_statsd \ No newline at end of file diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index 06b44ca9c8..c26aa1f04a 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -290,7 +290,8 @@ func verifyToYamlTranslation(t *testing.T, config interface{}, expectedYamlFileP opt := cmpopts.SortSlices(func(x, y interface{}) bool { return pretty.Sprint(x) < pretty.Sprint(y) }) - assert.True(t, cmp.Equal(expect, actual, opt)) + assert.True(t, cmp.Equal(expect, actual, opt), + fmt.Sprintf("\nexpected:\n%v\n\nactual:\n%v\n", expect, actual)) } func checkIfEnvTranslateSucceed(t *testing.T, jsonStr string, targetOs string, expectedEnvVars map[string]string) { diff --git a/translator/tocwconfig/totomlconfig/toTomlConfig.go b/translator/tocwconfig/totomlconfig/toTomlConfig.go index 4d4b9e8f1e..041b7568ac 100755 --- a/translator/tocwconfig/totomlconfig/toTomlConfig.go +++ b/translator/tocwconfig/totomlconfig/toTomlConfig.go @@ -5,8 +5,9 @@ package totomlconfig import ( "bytes" - "github.com/BurntSushi/toml" "log" + + "github.com/BurntSushi/toml" ) func ToTomlConfig(val interface{}) string { diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go new file mode 100644 index 0000000000..2e171a5172 --- /dev/null +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go @@ -0,0 +1,84 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package translate + +import ( + _ "embed" + "fmt" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" +) + +var ( + pluginName = "cloudwatch" + exporterName = "awscloudwatchexporter" + processorName = "cumulativetodeltaprocessor" +) + +// Verify interface implemented +var _ otelnative.Translator = (*AwsCloudWatchExporterTranslator)(nil) + +// AwsCloudWatchExporterTranslator provides the necessary YAML config contents. +type AwsCloudWatchExporterTranslator struct{} + +func (et AwsCloudWatchExporterTranslator) Name() string { + return "ace" +} + +func (et AwsCloudWatchExporterTranslator) Introduces() map[string][]string { + return map[string][]string{ + otelnative.ProcessorsKey: {processorName}, + otelnative.OutputsKey: {exporterName}, + } +} + +func (et AwsCloudWatchExporterTranslator) Replaces() map[string][]string { + return map[string][]string{ + otelnative.OutputsKey: {pluginName}, + } +} + +// RequiresTranslation checks for [[outputs.cloudwatch]]. +func (et AwsCloudWatchExporterTranslator) RequiresTranslation(_, _, out map[string]interface{}) bool { + _, ok := out[pluginName] + return ok +} + +func (et AwsCloudWatchExporterTranslator) Receivers(in, _, _ map[string]interface{}) map[string]interface{} { + return make(map[string]interface{}) + +} + +func (et AwsCloudWatchExporterTranslator) Processors(in, _, _ map[string]interface{}) map[string]interface{} { + result := make(map[string]interface{}) + m := make(map[string]interface{}) + result[fmt.Sprintf("%s/%s", processorName, et.Name())] = m + return result +} + +// Exporters takes [[outputs.cloudwatch]] out of config puts it in yaml. +func (et AwsCloudWatchExporterTranslator) Exporters(_, _, out map[string]interface{}) map[string]interface{} { + result := make(map[string]interface{}) + + cwPlugin, ok := out[pluginName] + if !ok { + return result + } + plugin, ok := cwPlugin.([]interface{}) + if !ok { + return result + } + if len(plugin) < 1 { + return result + } + pluginMap, ok := plugin[0].(map[string]interface{}) + if !ok { + return result + } + // Remove unecessary keys + delete(pluginMap, "tagexclude") + delete(pluginMap, "tagpass") + result[fmt.Sprintf("%s/%s", exporterName, et.Name())] = pluginMap + return result +} diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index 259c88cbbf..623fae5552 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -5,6 +5,8 @@ package toyamlconfig import ( "bytes" + "log" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" @@ -13,7 +15,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/service" "gopkg.in/yaml.v3" - "log" ) const ( @@ -31,6 +32,7 @@ const ( var ( otelNativeTranslators = []otelnative.Translator{ translate.AwsContainerInsightReceiver{}, + translate.AwsCloudWatchExporterTranslator{}, } ) @@ -66,7 +68,13 @@ func ToYamlConfig(val interface{}) (string, interface{}) { err := yamlEncoder.Encode(cfg) util.PanicIfErr("Encode to a valid YAML config fails because of", err) - + // Delete cloudwatch output plugin section from config. + log.Printf("I! delete cloudwatch from config") + //delete(outputs, "cloudwatch") + _, ok := outputs["cloudwatch"] + if ok { + outputs["cloudwatch"] = []struct{}{{}} + } return buffer.String(), cfg } From cc2eab4161a5d738043af3de8c6647ead065ec4d Mon Sep 17 00:00:00 2001 From: Adam <90734270+adam-mateen@users.noreply.github.com> Date: Tue, 27 Sep 2022 10:57:42 -0500 Subject: [PATCH 030/144] awscloudwatch exporter additional changes (#14) * Use AWS SDK enums for units. * Improve TestBuildDimensions to test with and without 'host' tag. --- plugins/outputs/cloudwatch/cloudwatch_test.go | 23 ++++-- plugins/outputs/cloudwatch/convert_unit.go | 79 ++++++++++--------- .../outputs/cloudwatch/convert_unit_test.go | 2 + 3 files changed, 60 insertions(+), 44 deletions(-) diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go index 9f4e133fa7..23be1a1177 100644 --- a/plugins/outputs/cloudwatch/cloudwatch_test.go +++ b/plugins/outputs/cloudwatch/cloudwatch_test.go @@ -41,7 +41,6 @@ func TestBuildDimensions(t *testing.T) { // empty dims = BuildDimensions(make(map[string]string)) assert.Equal(0, len(dims)) - // Always expect "host". Expect no more than 30. for i := 1; i < 40; i++ { tags := make(map[string]string, i) @@ -50,13 +49,16 @@ func TestBuildDimensions(t *testing.T) { val := "val" + strconv.Itoa(j) tags[key] = val } - tags["host"] = "valhost" - dims = BuildDimensions(tags) - expectedLen := i + 1 + expectedLen := i + // Test with and without host + if i%2 == 0 { + tags["host"] = "valhost" + expectedLen++ + } if expectedLen > 30 { expectedLen = 30 } - + dims = BuildDimensions(tags) hostCount := 0 keyCount := 0 valCount := 0 @@ -71,9 +73,16 @@ func TestBuildDimensions(t *testing.T) { valCount++ } } - assert.Equal(1, hostCount) - assert.Equal(expectedLen-1, keyCount) + assert.Equal(expectedLen, valCount) + if i%2 == 0 { + assert.Equal(1, hostCount) + assert.Equal(expectedLen-1, keyCount) + } else { + assert.Equal(0, hostCount) + assert.Equal(expectedLen, keyCount) + } + } } diff --git a/plugins/outputs/cloudwatch/convert_unit.go b/plugins/outputs/cloudwatch/convert_unit.go index ef436a013d..e2c9c80ba5 100644 --- a/plugins/outputs/cloudwatch/convert_unit.go +++ b/plugins/outputs/cloudwatch/convert_unit.go @@ -3,47 +3,52 @@ package cloudwatch +import ( + "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" +) + +// OTEL supports: https://unitsofmeasure.org/ucum // CloudWatch supports: // https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_MetricDatum.html -var units = map[string]string{ - "": "None", - "1": "None", - "s": "Seconds", - "us": "Microseconds", - "ms": "Milliseconds", +var unitMap = map[string]types.StandardUnit{ + "": types.StandardUnitNone, + "1": types.StandardUnitNone, + "s": types.StandardUnitSeconds, + "us": types.StandardUnitMicroseconds, + "ms": types.StandardUnitMilliseconds, // days, hours, minutes, nanoseconds will require a value conversion. - "B": "Bytes", - "By": "Bytes", - "KB": "Kilobytes", - "KBy": "Kilobytes", - "MB": "Megabytes", - "MBy": "Megabytes", - "GB": "Gigabytes", - "GBy": "Gigabytes", - "TB": "Terabytes", - "TBy": "Terabytes", + "B": types.StandardUnitBytes, + "By": types.StandardUnitBytes, + "KB": types.StandardUnitKilobytes, + "KBy": types.StandardUnitKilobytes, + "MB": types.StandardUnitMegabytes, + "MBy": types.StandardUnitMegabytes, + "GB": types.StandardUnitGigabytes, + "GBy": types.StandardUnitGigabytes, + "TB": types.StandardUnitTerabytes, + "TBy": types.StandardUnitTerabytes, // kibibytes, mebibytes, etc. will require a value conversion. - "Bi": "Bits", - "KBi": "Kilobits", - "MBi": "Megabits", - "TBi": "Terabits", + "Bi": types.StandardUnitBits, + "KBi": types.StandardUnitKilobits, + "MBi": types.StandardUnitMegabits, + "TBi": types.StandardUnitTerabits, // rates - "B/s": "Bytes/Second", - "By/s": "Bytes/Second", - "KB/s": "Kilobytes/Second", - "KBy/s": "Kilobytes/Second", - "MB/s": "Megabytes/Second", - "MBy/s": "Megabytes/Second", - "GB/s": "Gigabytes/Second", - "GBy/s": "Gigabytes/Second", - "TB/s": "Terabytes/Second", - "TBy/s": "Terabytes/Second", + "B/s": types.StandardUnitBytesSecond, + "By/s": types.StandardUnitBytesSecond, + "KB/s": types.StandardUnitKilobytesSecond, + "KBy/s": types.StandardUnitKilobytesSecond, + "MB/s": types.StandardUnitMegabytesSecond, + "MBy/s": types.StandardUnitMegabytesSecond, + "GB/s": types.StandardUnitGigabytesSecond, + "GBy/s": types.StandardUnitGigabytesSecond, + "TB/s": types.StandardUnitTerabytesSecond, + "TBy/s": types.StandardUnitTerabytesSecond, - "Bi/s": "Bits/Second", - "KBi/s": "Kilobits/Second", - "MBi/s": "Megabits/Second", - "GBi/s": "Gigabits/Second", - "TBi/s": "Terabits/Second", + "Bi/s": types.StandardUnitBitsSecond, + "KBi/s": types.StandardUnitKilobitsSecond, + "MBi/s": types.StandardUnitMegabitsSecond, + "GBi/s": types.StandardUnitGigabitsSecond, + "TBi/s": types.StandardUnitTerabitsSecond, } // ConvertUnit converts from the OTEL unit names to the corresponding names @@ -53,9 +58,9 @@ var units = map[string]string{ // We would need to report 1024/1000 to AWS with unit of kilobytes. // Or leave the value as-is and use "kilobytes" to mean 1000 Bytes and 1024. func ConvertUnit(unit string) string { - u, ok := units[unit] + newUnit, ok := unitMap[unit] if ok { - return u + return string(newUnit) } return unit } diff --git a/plugins/outputs/cloudwatch/convert_unit_test.go b/plugins/outputs/cloudwatch/convert_unit_test.go index c77fed91ec..082ab5e90b 100644 --- a/plugins/outputs/cloudwatch/convert_unit_test.go +++ b/plugins/outputs/cloudwatch/convert_unit_test.go @@ -15,6 +15,8 @@ func TestConvertUnit(t *testing.T) { {"B/s", "Bytes/Second"}, {"By/s", "Bytes/Second"}, {"Bi/s", "Bits/Second"}, + {"banana", "banana"}, + {"KBi", "Kilobits"}, } for _, c := range cases { From 3c2f91c9b3cb4afe165b0c1364640cdc1a963025 Mon Sep 17 00:00:00 2001 From: Adam <90734270+adam-mateen@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:37:46 -0500 Subject: [PATCH 031/144] Use consistent naming of awscloudwatch instead of awscloudwatchexporter. Similar for cumulativetodelta vs cumulativetodeltaprocessor. (#15) --- plugins/outputs/cloudwatch/config_test.go | 4 ++-- plugins/outputs/cloudwatch/factory.go | 8 ++++---- .../tocwconfig/sampleConfig/advanced_config_linux.yaml | 8 ++++---- .../tocwconfig/sampleConfig/advanced_config_windows.yaml | 8 ++++---- .../tocwconfig/sampleConfig/basic_config_linux.yaml | 8 ++++---- .../tocwconfig/sampleConfig/basic_config_windows.yaml | 8 ++++---- .../tocwconfig/sampleConfig/collectd_config_linux.yaml | 8 ++++---- .../tocwconfig/sampleConfig/complete_darwin_config.yaml | 8 ++++---- .../tocwconfig/sampleConfig/complete_linux_config.yaml | 8 ++++---- .../tocwconfig/sampleConfig/complete_windows_config.yaml | 8 ++++---- .../tocwconfig/sampleConfig/delta_config_linux.yaml | 8 ++++---- translator/tocwconfig/sampleConfig/drop_origin_linux.yaml | 8 ++++---- .../tocwconfig/sampleConfig/standard_config_linux.yaml | 8 ++++---- .../standard_config_linux_with_common_config.yaml | 8 ++++---- .../tocwconfig/sampleConfig/standard_config_windows.yaml | 8 ++++---- .../standard_config_windows_with_common_config.yaml | 8 ++++---- .../tocwconfig/sampleConfig/statsd_config_linux.yaml | 8 ++++---- .../tocwconfig/sampleConfig/statsd_config_windows.yaml | 8 ++++---- .../otelnative/translate/awscloudwatchexporter.go | 7 ++++--- 19 files changed, 74 insertions(+), 73 deletions(-) diff --git a/plugins/outputs/cloudwatch/config_test.go b/plugins/outputs/cloudwatch/config_test.go index b389c08916..0f34c13f3f 100644 --- a/plugins/outputs/cloudwatch/config_test.go +++ b/plugins/outputs/cloudwatch/config_test.go @@ -19,7 +19,7 @@ func TestConfig(t *testing.T) { factories, err := componenttest.NopFactories() assert.NoError(t, err) factory := NewFactory() - factories.Exporters[typeStr] = factory + factories.Exporters[TypeStr] = factory // Test missing region. (valid) fp := filepath.Join("testdata", "missing_region.yaml") @@ -44,7 +44,7 @@ func TestConfig(t *testing.T) { assert.NoError(t, err) assert.NotNil(t, c) assert.Equal(t, 1, len(c.Exporters)) - c2 := c.Exporters[config.NewComponentID(typeStr)].(*Config) + c2 := c.Exporters[config.NewComponentID(TypeStr)].(*Config) assert.Equal(t, "val1", c2.Namespace) assert.Equal(t, "val2", c2.Region) assert.Equal(t, "val3", c2.EndpointOverride) diff --git a/plugins/outputs/cloudwatch/factory.go b/plugins/outputs/cloudwatch/factory.go index 000f808dce..d740758645 100644 --- a/plugins/outputs/cloudwatch/factory.go +++ b/plugins/outputs/cloudwatch/factory.go @@ -3,7 +3,7 @@ // Package cloudwatch provides a metric exporter for the OpenTelemetry collector. // todo: Once the private and public repositories are merged it would be good -// to move this package to .../exporter/awscloudwatchexporter and rename it. +// to move this package to .../exporter/awscloudwatch and rename it. package cloudwatch import ( @@ -16,13 +16,13 @@ import ( ) const ( - typeStr config.Type = "awscloudwatch" + TypeStr config.Type = "awscloudwatch" stability = component.StabilityLevelAlpha ) func NewFactory() component.ExporterFactory { return component.NewExporterFactory( - typeStr, + TypeStr, createDefaultConfig, component.WithMetricsExporter(createMetricsExporter, stability), ) @@ -30,7 +30,7 @@ func NewFactory() component.ExporterFactory { func createDefaultConfig() config.Exporter { return &Config{ - ExporterSettings: config.NewExporterSettings(config.NewComponentID(typeStr)), + ExporterSettings: config.NewExporterSettings(config.NewComponentID(TypeStr)), Namespace: "CWAgent", MaxDatumsPerCall: defaultMaxDatumsPerCall, MaxValuesPerDatum: defaultMaxValuesPerDatum, diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index b5271ccb06..09c18fe6b6 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -22,11 +22,11 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - telegraf_delta - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_diskio - telegraf_ethtool diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index 410f265f57..123a7ab95d 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -14,9 +14,9 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index 81c5133064..c5514e1212 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-east-1 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_disk: {} @@ -14,10 +14,10 @@ service: pipelines: metrics: exporters: - - awscloudwatchexporter/ace + - awscloudwatch/ace - telegraf_cloudwatch processors: - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace - telegraf_ec2tagger receivers: - telegraf_mem diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index fab2d169d3..0075860d67 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -13,10 +13,10 @@ service: pipelines: metrics: exporters: - - awscloudwatchexporter/ace + - awscloudwatch/ace - telegraf_cloudwatch processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml index 614b3a02fe..fa42a6f81a 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} receivers: telegraf_socket_listener: {} service: @@ -13,8 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_socket_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index 0bd9867c48..1d694e0aaa 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: endpoint_override: https://monitoring-fips.us-west-2.amazonaws.com force_flush_interval: 60s max_datums_per_call: 1000 @@ -28,7 +28,7 @@ exporters: telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -50,11 +50,11 @@ service: exporters: - telegraf_cloudwatchlogs - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - telegraf_delta - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_cpu - telegraf_mem diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index 61af395302..4170ca641b 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: drop_original_metrics: cpu: - cpu_usage_idle @@ -32,7 +32,7 @@ exporters: telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -52,13 +52,13 @@ service: pipelines: metrics: exporters: - - awscloudwatchexporter/ace + - awscloudwatch/ace - telegraf_cloudwatchlogs - telegraf_cloudwatch processors: - telegraf_ec2tagger - telegraf_delta - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_logfile - telegraf_socket_listener diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index d90293cb1a..da0a7719bd 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: endpoint_override: https://monitoring-fips.us-west-2.amazonaws.com force_flush_interval: 60s max_datums_per_call: 1000 @@ -27,7 +27,7 @@ exporters: telegraf_cloudwatch: {} telegraf_cloudwatchlogs: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_logfile: {} @@ -42,11 +42,11 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace - telegraf_cloudwatchlogs processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_logfile - telegraf_socket_listener diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml index 303cd0a95e..ee39d33c82 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s metric_decoration: - category: diskio @@ -18,7 +18,7 @@ exporters: region: us-east-1 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -28,10 +28,10 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - telegraf_delta - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_diskio \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml index 042f7f2809..6382f603fb 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: drop_original_metrics: cpu: - cpu_usage_idle @@ -20,7 +20,7 @@ exporters: region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_cpu: {} @@ -31,10 +31,10 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_nvidia_smi - telegraf_cpu diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index 45be546b8e..4e3b0486c9 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -19,9 +19,9 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace - telegraf_ec2tagger - telegraf_delta receivers: diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml index eb5d39d8e9..ce4c8e603b 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent profile: AmazonCloudWatchAgent @@ -7,7 +7,7 @@ exporters: shared_credential_file: fake-path telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_delta: {} telegraf_ec2tagger: {} receivers: @@ -21,10 +21,10 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_delta - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace - telegraf_ec2tagger receivers: - telegraf_disk diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index fab2d169d3..0075860d67 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -13,10 +13,10 @@ service: pipelines: metrics: exporters: - - awscloudwatchexporter/ace + - awscloudwatch/ace - telegraf_cloudwatch processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index 6e13bc9023..1573264679 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -1,5 +1,5 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent profile: AmazonCloudWatchAgent @@ -7,7 +7,7 @@ exporters: shared_credential_file: fake-path telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} telegraf_ec2tagger: {} receivers: telegraf_win_perf_counters: {} @@ -16,9 +16,9 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - telegraf_ec2tagger - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_win_perf_counters \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml index 51af0da400..f56199a1ab 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} receivers: telegraf_statsd: {} service: @@ -13,8 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_statsd \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml index 51af0da400..f56199a1ab 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -1,11 +1,11 @@ exporters: - awscloudwatchexporter/ace: + awscloudwatch/ace: force_flush_interval: 60s namespace: CWAgent region: us-west-2 telegraf_cloudwatch: {} processors: - cumulativetodeltaprocessor/ace: {} + cumulativetodelta/ace: {} receivers: telegraf_statsd: {} service: @@ -13,8 +13,8 @@ service: metrics: exporters: - telegraf_cloudwatch - - awscloudwatchexporter/ace + - awscloudwatch/ace processors: - - cumulativetodeltaprocessor/ace + - cumulativetodelta/ace receivers: - telegraf_statsd \ No newline at end of file diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go index 2e171a5172..ae7b5b6d35 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscloudwatchexporter.go @@ -7,13 +7,14 @@ import ( _ "embed" "fmt" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" ) -var ( +const ( pluginName = "cloudwatch" - exporterName = "awscloudwatchexporter" - processorName = "cumulativetodeltaprocessor" + exporterName = string(cloudwatch.TypeStr) + processorName = "cumulativetodelta" ) // Verify interface implemented From a7e03e4bd3153d4826217c64c279111dbd551af7 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen Date: Thu, 29 Sep 2022 15:30:12 -0400 Subject: [PATCH 032/144] Change totoml --- translator/totomlconfig/toTomlConfig_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translator/totomlconfig/toTomlConfig_test.go b/translator/totomlconfig/toTomlConfig_test.go index ac85d4726d..ec6c084459 100644 --- a/translator/totomlconfig/toTomlConfig_test.go +++ b/translator/totomlconfig/toTomlConfig_test.go @@ -128,14 +128,14 @@ func TestStatsDConfig(t *testing.T) { checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_windows.conf", "windows") } -//Linux only for CollectD +// Linux only for CollectD func TestCollectDConfig(t *testing.T) { resetContext() checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "linux") checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "darwin") } -//prometheus +// prometheus func TestPrometheusConfig(t *testing.T) { resetContext() context.CurrentContext().SetRunInContainer(true) From 13cb51914bcf247a1ef1be11acb54efbd7de4f83 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen <91758108+khanhntd@users.noreply.github.com> Date: Wed, 5 Oct 2022 11:54:56 -0400 Subject: [PATCH 033/144] Add Adapter Receiver for all plugins and add plugins unit test (#21) Co-authored-by: Thomas Yang Co-authored-by: Kaushik Surya Co-authored-by: Thomas Yang --- .../amazon-cloudwatch-agent.go | 116 +++++++- cmd/config-translator/translator.go | 2 +- .../start-amazon-cloudwatch-agent.go | 2 +- go.mod | 39 +-- go.sum | 81 +++--- .../metrics_number_dimension_test.go | 4 +- internal/util/type_conversion.go | 41 +++ packaging/darwin/amazon-cloudwatch-agent-ctl | 2 +- .../dependencies/amazon-cloudwatch-agent-ctl | 3 +- .../windows/amazon-cloudwatch-agent-ctl.ps1 | 2 +- plugins/inputs/k8sapiserver/k8sapiserver.go | 6 +- .../metrics_type_handler.go | 3 +- plugins/inputs/statsd/graphite/parser.go | 18 +- plugins/processors/ec2tagger/ec2tagger.go | 6 +- receiver/adapter/README.md | 9 + receiver/adapter/accumulator/accumulator.go | 190 +++++++++++++ .../adapter/accumulator/accumulator_test.go | 247 +++++++++++++++++ receiver/adapter/accumulator/metrics.go | 126 +++++++++ receiver/adapter/accumulator/metrics_test.go | 252 ++++++++++++++++++ receiver/adapter/accumulator/testutil.go | 45 ++++ receiver/adapter/accumulator/util.go | 27 ++ receiver/adapter/config.go | 15 ++ receiver/adapter/doc.go | 4 + receiver/adapter/factory.go | 95 +++++++ receiver/adapter/factory_test.go | 99 +++++++ receiver/adapter/plugins_test.go | 234 ++++++++++++++++ receiver/adapter/receiver.go | 54 ++++ receiver/adapter/receiver_test.go | 32 +++ receiver/adapter/testdata/all_plugins.toml | 35 +++ receiver/adapter/testdata/cpu_plugin.toml | 6 + .../test_1/expected_output.json | 92 ------- .../tocwconfig/toyamlconfig/toyamlconfig.go | 14 +- .../metric_decoration_test.go | 4 +- 33 files changed, 1723 insertions(+), 182 deletions(-) create mode 100644 internal/util/type_conversion.go create mode 100644 receiver/adapter/README.md create mode 100644 receiver/adapter/accumulator/accumulator.go create mode 100644 receiver/adapter/accumulator/accumulator_test.go create mode 100644 receiver/adapter/accumulator/metrics.go create mode 100644 receiver/adapter/accumulator/metrics_test.go create mode 100644 receiver/adapter/accumulator/testutil.go create mode 100644 receiver/adapter/accumulator/util.go create mode 100644 receiver/adapter/config.go create mode 100644 receiver/adapter/doc.go create mode 100644 receiver/adapter/factory.go create mode 100644 receiver/adapter/factory_test.go create mode 100644 receiver/adapter/plugins_test.go create mode 100644 receiver/adapter/receiver.go create mode 100644 receiver/adapter/receiver_test.go create mode 100644 receiver/adapter/testdata/all_plugins.toml create mode 100644 receiver/adapter/testdata/cpu_plugin.toml diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index b0ddc76114..73aa863fe9 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -9,6 +9,14 @@ import ( "errors" "flag" "fmt" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/exporter/loggingexporter" "io/ioutil" "log" "net/http" @@ -28,22 +36,26 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/migrate" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent/internal" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" - _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins" "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - "github.com/influxdata/telegraf/agent" + + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins" "github.com/influxdata/telegraf/config" + + "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/logger" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/outputs" - "github.com/kardianos/service" + + "go.opentelemetry.io/collector/component" + otelService "go.opentelemetry.io/collector/service" ) const ( defaultEnvCfgFileName = "env-config.json" LogTargetEventLog = "eventlog" + yamlConfigFileName = "amazon-cloudwatch-agent.yaml" ) var fDebug = flag.Bool("debug", false, @@ -264,6 +276,7 @@ func runAgent(ctx context.Context, } logger.SetupLogging(logConfig) + log.Printf("I! Starting AmazonCloudWatchAgent %s", agentinfo.Version()) // Need to set SDK log level before plugins get loaded. // Some aws.Config objects get created early and live forever which means @@ -311,7 +324,97 @@ func runAgent(ctx context.Context, log.Println("creating new logs agent") logAgent := logs.NewLogAgent(c) go logAgent.Run(ctx) - return ag.Run(ctx) + + // TODO: Update BuildInfo with agentinfo + // info := component.BuildInfo{ + // Command: "telegraf-otel-poc", + // Description: "My POC", + // Version: "0.0", + // } + + yamlConfigPath := filepath.Join("file:", filepath.Dir(*fConfig), yamlConfigFileName) + if err != nil { + log.Printf("E! Failed to load yaml config due to %v", err) + return err + } + + fprovider := fileprovider.New() + settings := otelService.ConfigProviderSettings{ + ResolverSettings: confmap.ResolverSettings{ + URIs: []string{yamlConfigPath}, + Providers: map[string]confmap.Provider{fprovider.Scheme(): fprovider}, + }, + } + + factories, err := components(c) + if err != nil { + log.Printf("E! Error while adapting telegraf input plugins: %v", err) + return err + } + + provider, err := otelService.NewConfigProvider(settings) + if err != nil { + log.Printf("E! Error while initializing config provider: %v", err) + return err + } + + params := otelService.CollectorSettings{ + Factories: factories, + // TODO: Update BuildInfo with agentinfo + // BuildInfo: info, + ConfigProvider: provider, + } + + cmd := otelService.NewCommand(params) + + // Noticed that args of parent process get passed here to otel collector which causes failures complaining about + // unrecognized args. So below change overwrites the args. Need to investigate this further as I dont think the config + // path below here is actually used and it still respects what was set in the settings above. + e := []string{"--config=" + yamlConfigPath} + cmd.SetArgs(e) + + return cmd.Execute() +} + +func components(telegrafConfig *config.Config) (component.Factories, error) { + telegrafAdapter := adapter.NewAdapter(telegrafConfig) + + factories := component.Factories{} + + receiverFactories := make([]component.ReceiverFactory, len(telegrafConfig.InputNames())) + for i, inputFilter := range telegrafConfig.InputNames() { + receiverFactories[i] = telegrafAdapter.NewReceiverFactory(inputFilter) + } + + receivers, err := component.MakeReceiverFactoryMap(receiverFactories...) + if err != nil { + return factories, err + } + + processors, err := component.MakeProcessorFactoryMap( + cumulativetodeltaprocessor.NewFactory(), + ) + if err != nil { + return factories, err + } + + exporters, err := component.MakeExporterFactoryMap( + awsemfexporter.NewFactory(), + loggingexporter.NewFactory(), + cloudwatch.NewFactory(), + ) + + if err != nil { + return factories, err + } + + factories = component.Factories{ + Receivers: receivers, + Processors: processors, + Exporters: exporters, + } + + return factories, nil } type program struct { @@ -578,9 +681,6 @@ func loadTomlConfigIntoAgent(c *config.Config) error { } func validateAgentFinalConfigAndPlugins(c *config.Config) error { - if !*fTest && len(c.Outputs) == 0 { - return errors.New("Error: no outputs found, did you provide a valid config file?") - } if len(c.Inputs) == 0 { return errors.New("Error: no inputs found, did you provide a valid config file?") } diff --git a/cmd/config-translator/translator.go b/cmd/config-translator/translator.go index 6598c499be..09220bea43 100644 --- a/cmd/config-translator/translator.go +++ b/cmd/config-translator/translator.go @@ -23,7 +23,7 @@ const ( exitSuccessMessage = "Configuration validation first phase succeeded" version = "1.0" envConfigFileName = "env-config.json" - yamlConfigFileName = "amazon-cloudwatch-config.yaml" + yamlConfigFileName = "amazon-cloudwatch-agent.yaml" ) func initFlags() { diff --git a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go index 7d923423dc..1cabc1afdb 100644 --- a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go +++ b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go @@ -19,7 +19,7 @@ const ( COMMON_CONFIG = "common-config.toml" JSON = "amazon-cloudwatch-agent.json" TOML = "amazon-cloudwatch-agent.toml" - YAML = "amazon-cloudwatch-config.yaml" + YAML = "amazon-cloudwatch-agent.yaml" ENV = "env-config.json" AGENT_LOG_FILE = "amazon-cloudwatch-agent.log" diff --git a/go.mod b/go.mod index 6acf2f25a8..b104fd0203 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/BurntSushi/toml v0.4.1 github.com/Jeffail/gabs v1.4.0 github.com/Rican7/retry v0.1.1-0.20160712041035-272ad122d6e5 - github.com/aws/aws-sdk-go v1.44.87 + github.com/aws/aws-sdk-go v1.44.106 github.com/aws/aws-sdk-go-v2 v1.16.13 github.com/aws/aws-sdk-go-v2/config v1.15.3 github.com/aws/aws-sdk-go-v2/feature/dynamodb/attributevalue v1.9.4 @@ -68,7 +68,7 @@ require ( github.com/go-kit/kit v0.11.0 github.com/gobwas/glob v0.2.3 github.com/google/cadvisor v0.45.0 - github.com/google/go-cmp v0.5.8 + github.com/google/go-cmp v0.5.9 github.com/google/uuid v1.3.0 github.com/hashicorp/golang-lru v0.5.4 github.com/influxdata/telegraf v0.0.0-00010101000000-000000000000 @@ -78,7 +78,9 @@ require ( github.com/mesos/mesos-go v0.0.7-0.20180413204204-29de6ff97b48 github.com/mitchellh/mapstructure v1.5.0 github.com/oklog/run v1.1.0 - github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 + github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0 + github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 + github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.13.0 github.com/prometheus/common v0.37.0 @@ -86,8 +88,9 @@ require ( github.com/shirou/gopsutil/v3 v3.22.8 github.com/stretchr/testify v1.8.0 github.com/xeipuuv/gojsonschema v1.2.0 - go.opentelemetry.io/collector v0.60.0 - go.opentelemetry.io/collector/pdata v0.60.0 + go.opentelemetry.io/collector v0.61.0 + go.opentelemetry.io/collector/pdata v0.61.0 + go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 @@ -165,7 +168,7 @@ require ( github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect - github.com/frankban/quicktest v1.14.0 // indirect + github.com/frankban/quicktest v1.14.3 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect @@ -237,12 +240,15 @@ require ( github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/naoina/go-stringutil v0.1.0 // 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/coreinternal v0.61.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.4 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/opencontainers/selinux v1.10.1 // indirect - github.com/pelletier/go-toml v1.9.4 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -277,18 +283,17 @@ require ( github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect - go.opentelemetry.io/collector/semconv v0.60.0 // indirect - go.opentelemetry.io/contrib/propagators/b3 v1.9.0 // indirect - go.opentelemetry.io/otel v1.9.0 // indirect - go.opentelemetry.io/otel/exporters/prometheus v0.31.0 // indirect - go.opentelemetry.io/otel/metric v0.31.0 // indirect - go.opentelemetry.io/otel/sdk v1.9.0 // indirect - go.opentelemetry.io/otel/sdk/metric v0.31.0 // indirect - go.opentelemetry.io/otel/trace v1.9.0 // indirect + go.opentelemetry.io/collector/semconv v0.61.0 // indirect + go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect + go.opentelemetry.io/otel v1.10.0 // indirect + go.opentelemetry.io/otel/exporters/prometheus v0.32.1 // indirect + go.opentelemetry.io/otel/metric v0.32.1 // indirect + go.opentelemetry.io/otel/sdk v1.10.0 // indirect + go.opentelemetry.io/otel/sdk/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/goleak v1.1.12 // indirect go.uber.org/multierr v1.8.0 // indirect - go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect @@ -297,7 +302,7 @@ require ( golang.org/x/tools v0.1.11 // indirect google.golang.org/api v0.86.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect + google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc // indirect google.golang.org/grpc v1.49.0 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 8ee9de5ca6..81c7b51cb9 100644 --- a/go.sum +++ b/go.sum @@ -171,8 +171,8 @@ github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:l github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/aws/aws-sdk-go v1.40.45/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q= -github.com/aws/aws-sdk-go v1.44.87 h1:u/1sm8MNUSQHt8MGLEQHAj4r3lns3w0B1IXelPKbpn4= -github.com/aws/aws-sdk-go v1.44.87/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.106 h1:FzINxRGt0gAzz01ixtKfkjiDOnnpd/uNbstW/qPW2QE= +github.com/aws/aws-sdk-go v1.44.106/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/aws/aws-sdk-go-v2 v1.9.1/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.13.0/go.mod h1:L6+ZpqHaLbAaxsqV0L4cvxZY7QupWJB4fhkf8LXvC7w= @@ -268,6 +268,7 @@ github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8 github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -387,8 +388,8 @@ github.com/frankban/quicktest v1.11.0/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= -github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= -github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= @@ -525,8 +526,9 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= @@ -587,8 +589,10 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb github.com/grid-x/modbus v0.0.0-20211113184042-7f2251c342c9 h1:Q7e9kXS3sRbTjsNDKazbcbDSGAKjFdk096M3qYbwNpE= github.com/grid-x/serial v0.0.0-20211107191517-583c7356b3aa h1:Rsn6ARgNkXrsXJIzhkE4vQr5Gbx2LvtEMv4BJOK4LyU= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.10.2 h1:ERKrevVTnCw3Wu4I3mtR15QU3gtWy86cBo6De0jEohg= github.com/gwos/tcg/sdk v0.0.0-20211223101342-35fbd1ae683c h1:befb5xGUwNCoBuN/akLFCKekUzr0ixyws3aAX/7TaOk= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/harlow/kinesis-consumer v0.3.5 h1:xeiDp2frP8DdKDeOzVuS+vaBX03JjifQO/Apzu4IOMA= @@ -740,7 +744,7 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.10 h1:Ai8UzuomSCDw90e1qNMtb15msBXsNpH6gzkkENQNcJo= github.com/knadh/koanf v1.4.3 h1:rSJcSH5LSFhvzBRsAYfT3k7eLP0I4UxeZqjtAatk+wc= github.com/knadh/koanf v1.4.3/go.mod h1:5FAkuykKXZvLqhAbP4peWgM5CTcZmn7L1d27k/a+kfg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= @@ -891,9 +895,21 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.59.0 h1:lOTqHGCcUkWqQfVlH4rqy5aTtpPkeiQS/32gIgKLpHY= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0 h1:D9JetxR98ZSGYvJzpA0lIsGFYAuZOIpZ00Tq7Gnty8o= -github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.59.0/go.mod h1:OBHCK29nLn16OUrnIf+7F3sA+LnIPZ2dUYr6CtLJxEU= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0 h1:9IxB8su6e57lcThvNNmtDbWEvMK3LoRJR6QxKgh21zc= +github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0/go.mod h1:xCb0Xoe+y1tYIBUz/HdIjHRh3fHG/ariLygEMPIV91s= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0 h1:rMq3zGRgxor/Cy44sD18UeegO9NmWu+x0BzhQA7nYic= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0/go.mod h1:N/9xv3LYpkrdRGxIBm8Os+7UFma2CK7czByBs0NyujE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0 h1:RqkHiBXIIwzJ02JocvuvDSBeo+bjzNpBJjV5mROP2ps= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0/go.mod h1:l3j1pKh+nTUdvmVIERds/JPJVcYhR3K9itnrWXTKYvc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.60.0 h1:4dhPVAvSeJIbbY5wEgCISOgA5VlZNxlvxdPAKgP7ckM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.60.0/go.mod h1:r3pq8CdJh+ugZR08pNrnVTO89JJO0xBrv+HFJoeHmLQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0 h1:BRyqjFUrLwxHgccEbi0sgT+koQXsm+RAOqeebRmfSTM= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0/go.mod h1:gGprfSuPLNWQlYQTinPY4joqsjXAYO5RCEwkOeSCMrk= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 h1:B7xhbyyT1zvdYf5ne0H9fozF6fx2LoKoT5K71hyqReY= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0/go.mod h1:s01aZZ3YqrNbe78Ff/3OLY2s08VjrlHCZOIxceLLzQc= +github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 h1:HCHE2kMo7K9eLVVYfR59I3CtDaqp0WYiHlyWRDQvG+M= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0 h1:jLlCQZ9MbB6xIHItsLaglCKt++uaXwBeN/28Yhmq/6U= +github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0/go.mod h1:Vp7RD7ye02O4eRX+bSXaWFMRL/8u228Z+bAtCqikohI= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -916,7 +932,6 @@ github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0Mw github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/performancecopilot/speed/v4 v4.0.0/go.mod h1:qxrSyuDGrTOWfV+uKRFhfxw6h/4HXRGUiZiufxo49BM= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= @@ -1128,28 +1143,28 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/collector v0.60.0 h1:rHndW/xILGjNoFaYIvwYpngZnRWw1oQT6GLtzxIs7pw= -go.opentelemetry.io/collector v0.60.0/go.mod h1:n2KBSgs7AakuedVxLR/Tayl3EEztmngrrjZBsYS+qBI= +go.opentelemetry.io/collector v0.61.0 h1:lvuhmlskup6Z3AfQKZwuRk43jRClB+1FkwjGXRoxhfs= +go.opentelemetry.io/collector v0.61.0/go.mod h1:515eomlUIwLEXTBwLAEEtl2HPreJy5xtv//LYMk/SZE= go.opentelemetry.io/collector/model v0.44.0 h1:I+M6X2NANYChOGYrpbxCoEYJah3eHdMvumKjothIAtA= -go.opentelemetry.io/collector/pdata v0.60.0 h1:jCNR5jtUom2FcUu30h4tw7enZytwGnXX6fs/K2FM/A0= -go.opentelemetry.io/collector/pdata v0.60.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= -go.opentelemetry.io/collector/semconv v0.60.0 h1:xy6HSukzA5CC8SR4DvFyLd28EFEOnQgxtpU1bSCM0qY= -go.opentelemetry.io/collector/semconv v0.60.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= -go.opentelemetry.io/contrib/propagators/b3 v1.9.0 h1:Lzb9zU98jCE2kyfCjWfSSsiQoGtvBL+COxvUBf7FNhU= -go.opentelemetry.io/contrib/propagators/b3 v1.9.0/go.mod h1:fyx3gFXn+4w5uWTTiqaI8oBNBW/6w9Ow5zxXf7NGixU= -go.opentelemetry.io/contrib/zpages v0.34.0 h1:8ZXfrPkhegp/5GQYrO0pWMv2k3DQ7f+VBjaS6fMaBLM= -go.opentelemetry.io/otel v1.9.0 h1:8WZNQFIB2a71LnANS9JeyidJKKGOOremcUtb/OtHISw= -go.opentelemetry.io/otel v1.9.0/go.mod h1:np4EoPGzoPs3O67xUVNoPPcmSvsfOxNlNA4F4AC+0Eo= -go.opentelemetry.io/otel/exporters/prometheus v0.31.0 h1:jwtnOGBM8dIty5AVZ+9ZCzZexCea3aVKmUfZAQcHqxs= -go.opentelemetry.io/otel/exporters/prometheus v0.31.0/go.mod h1:QarXIB8L79IwIPoNgG3A6zNvBgVmcppeFogV1d8612s= -go.opentelemetry.io/otel/metric v0.31.0 h1:6SiklT+gfWAwWUR0meEMxQBtihpiEs4c+vL9spDTqUs= -go.opentelemetry.io/otel/metric v0.31.0/go.mod h1:ohmwj9KTSIeBnDBm/ZwH2PSZxZzoOaG2xZeekTRzL5A= -go.opentelemetry.io/otel/sdk v1.9.0 h1:LNXp1vrr83fNXTHgU8eO89mhzxb/bbWAsHG6fNf3qWo= -go.opentelemetry.io/otel/sdk v1.9.0/go.mod h1:AEZc8nt5bd2F7BC24J5R0mrjYnpEgYHyTcM/vrSple4= -go.opentelemetry.io/otel/sdk/metric v0.31.0 h1:2sZx4R43ZMhJdteKAlKoHvRgrMp53V1aRxvEf5lCq8Q= -go.opentelemetry.io/otel/sdk/metric v0.31.0/go.mod h1:fl0SmNnX9mN9xgU6OLYLMBMrNAsaZQi7qBwprwO3abk= -go.opentelemetry.io/otel/trace v1.9.0 h1:oZaCNJUjWcg60VXWee8lJKlqhPbXAPB51URuR47pQYc= -go.opentelemetry.io/otel/trace v1.9.0/go.mod h1:2737Q0MuG8q1uILYm2YYVkAyLtOofiTNGg6VODnOiPo= +go.opentelemetry.io/collector/pdata v0.61.0 h1:jPUReUpR/D1xsigfRxyXA7cYMnXfnK+D7z61W6F9moo= +go.opentelemetry.io/collector/pdata v0.61.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= +go.opentelemetry.io/collector/semconv v0.61.0 h1:RMrzDugNuFsUjppvvNZWiWcNneogZ3Zo4idWyIUWR9k= +go.opentelemetry.io/collector/semconv v0.61.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= +go.opentelemetry.io/contrib/propagators/b3 v1.10.0/go.mod h1:oxvamQ/mTDFQVugml/uFS59+aEUnFLhmd1wsG+n5MOE= +go.opentelemetry.io/contrib/zpages v0.36.0 h1:/BSq75P5b39Qv3T1COsbrc3CnzzWvWiD2Rtz4xgeZc4= +go.opentelemetry.io/otel v1.10.0 h1:Y7DTJMR6zs1xkS/upamJYk0SxxN4C9AqRd77jmZnyY4= +go.opentelemetry.io/otel v1.10.0/go.mod h1:NbvWjCthWHKBEUMpf0/v8ZRZlni86PpGFEMA9pnQSnQ= +go.opentelemetry.io/otel/exporters/prometheus v0.32.1 h1:1+iSNGGCYoDAMuFDN2M+sYTwa5/wApb7yO/GpW5Vtzg= +go.opentelemetry.io/otel/exporters/prometheus v0.32.1/go.mod h1:t1ZclNSxaC2ztzbHxGU71mg3pkkaHyHcMUIK2Yvft0E= +go.opentelemetry.io/otel/metric v0.32.1 h1:ftff5LSBCIDwL0UkhBuDg8j9NNxx2IusvJ18q9h6RC4= +go.opentelemetry.io/otel/metric v0.32.1/go.mod h1:iLPP7FaKMAD5BIxJ2VX7f2KTuz//0QK2hEUyti5psqQ= +go.opentelemetry.io/otel/sdk v1.10.0 h1:jZ6K7sVn04kk/3DNUdJ4mqRlGDiXAVuIG+MMENpTNdY= +go.opentelemetry.io/otel/sdk v1.10.0/go.mod h1:vO06iKzD5baltJz1zarxMCNHFpUlUiOy4s65ECtn6kE= +go.opentelemetry.io/otel/sdk/metric v0.32.1 h1:S6AqzulzGQl+sTpYeAoVLw1SJbc2LYuKCMUmfEKG+zM= +go.opentelemetry.io/otel/sdk/metric v0.32.1/go.mod h1:Nn+Nt/7cKzm5ISmvLzNO5RLf0Xuv8/Qo8fkpr0JDOzs= +go.opentelemetry.io/otel/trace v1.10.0 h1:npQMbR8o7mum8uF95yFbOEJffhs1sbCOfDh8zAJiH5E= +go.opentelemetry.io/otel/trace v1.10.0/go.mod h1:Sij3YYczqAdz+EhmGhE6TpTxUO5/F/AzrK+kxfGqySM= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.opentelemetry.io/proto/otlp v0.15.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -1664,8 +1679,8 @@ google.golang.org/genproto v0.0.0-20220523171625-347a074981d8/go.mod h1:RAyBrSAP google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 h1:W70HjnmXFJm+8RNjOpIDYW2nKsSi/af0VvIZUtYkwuU= -google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc h1:Nf+EdcTLHR8qDNN/KfkQL0u0ssxt9OhbaWCl5C0ucEI= +google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= diff --git a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go index 4c3de953d2..6522f1717a 100644 --- a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go +++ b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go @@ -25,7 +25,7 @@ const instanceId = "InstanceId" const loremIpsum = "Lorem ipsum dolor sit amet consectetur adipiscing elit Vivamus non mauris malesuada mattis ex eget porttitor purus Suspendisse potenti Praesent vel sollicitudin ipsum Quisque luctus pretium lorem non faucibus Ut vel quam dui Nunc fermentum condimentum consectetur Morbi tellus mauris tristique tincidunt elit consectetur hendrerit placerat dui In nulla erat finibus eget erat a hendrerit sodales urna In sapien purus auctor sit amet congue ut congue eget nisi Vivamus sed neque ut ligula lobortis accumsan quis id metus In feugiat velit et leo mattis non fringilla dui elementum Proin a nisi ac sapien vulputate consequat Vestibulum eu tellus mi Integer consectetur efficitur" const appendMetric = "append" -//Let the agent run for 2 minutes. This will give agent enough time to call server +// Let the agent run for 2 minutes. This will give agent enough time to call server const agentRuntime = 2 * time.Minute type input struct { @@ -40,7 +40,7 @@ type metric struct { value string } -//Must run this test with parallel 1 since this will fail if more than one test is running at the same time +// Must run this test with parallel 1 since this will fail if more than one test is running at the same time func TestNumberMetricDimension(t *testing.T) { parameters := []input{ diff --git a/internal/util/type_conversion.go b/internal/util/type_conversion.go new file mode 100644 index 0000000000..8ad7372621 --- /dev/null +++ b/internal/util/type_conversion.go @@ -0,0 +1,41 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package util + +func ToOtelValue(value interface{}) interface{} { + switch v := value.(type) { + case int: + return int64(v) + case int8: + return int64(v) + case int16: + return int64(v) + case int32: + return int64(v) + case int64: + return v + case uint: + return int64(v) + case uint8: + return int64(v) + case uint16: + return int64(v) + case uint32: + return int64(v) + case uint64: + return int64(v) + case float32: + return float64(v) + case float64: + return v + case bool: + if v { + return int64(1) + } else { + return int64(0) + } + default: + return nil + } +} diff --git a/packaging/darwin/amazon-cloudwatch-agent-ctl b/packaging/darwin/amazon-cloudwatch-agent-ctl index aade1a9935..2f2d3dbd01 100755 --- a/packaging/darwin/amazon-cloudwatch-agent-ctl +++ b/packaging/darwin/amazon-cloudwatch-agent-ctl @@ -26,7 +26,7 @@ readonly AGENT_LAUNCHD_NAME="com.amazon.cloudwatch.agent" readonly AGENT_LAUNCHD_CONFIG="/Library/LaunchDaemons/${AGENT_LAUNCHD_NAME}.plist" readonly TOML="${CONFDIR}/amazon-cloudwatch-agent.toml" -readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-config.yaml" +readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-agent.yaml" readonly JSON="${CONFDIR}/amazon-cloudwatch-agent.json" readonly JSON_DIR="${CONFDIR}/amazon-cloudwatch-agent.d" readonly CV_LOG_FILE="${AGENTDIR}/logs/configuration-validation.log" diff --git a/packaging/dependencies/amazon-cloudwatch-agent-ctl b/packaging/dependencies/amazon-cloudwatch-agent-ctl index 61f3df8b84..b14bdeca78 100755 --- a/packaging/dependencies/amazon-cloudwatch-agent-ctl +++ b/packaging/dependencies/amazon-cloudwatch-agent-ctl @@ -14,8 +14,7 @@ readonly VERSION_FILE="${CMDDIR}/CWAGENT_VERSION" # The systemd and upstart scripts assume exactly this .toml file name readonly TOML="${CONFDIR}/amazon-cloudwatch-agent.toml" -readonly YAML="${CWOC_CONFDIR}/cwagent-otel-collector.yaml" -readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-config.yaml" +readonly OTEL_YAML="${CONFDIR}/amazon-cloudwatch-agent.yaml" readonly JSON="${CONFDIR}/amazon-cloudwatch-agent.json" readonly JSON_DIR="${CONFDIR}/amazon-cloudwatch-agent.d" readonly CV_LOG_FILE="${AGENTDIR}/logs/configuration-validation.log" diff --git a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 index df8b06f4bd..a63c14bb36 100644 --- a/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 +++ b/packaging/windows/amazon-cloudwatch-agent-ctl.ps1 @@ -88,7 +88,7 @@ $CVLogFile="${CWALogDirectory}\configuration-validation.log" # The windows service registration assumes exactly this .toml file path and name $TOML="${CWAProgramData}\amazon-cloudwatch-agent.toml" -$OTEL_YAML="${CWAProgramData}\amazon-cloudwatch-config.yaml" +$OTEL_YAML="${CWAProgramData}\amazon-cloudwatch-agent.yaml" $JSON="${CWAProgramData}\amazon-cloudwatch-agent.json" $JSON_DIR = "${CWAProgramData}\Configs" $COMMON_CONIG="${CWAProgramData}\common-config.toml" diff --git a/plugins/inputs/k8sapiserver/k8sapiserver.go b/plugins/inputs/k8sapiserver/k8sapiserver.go index a196bbc78d..099ee2e71d 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver.go @@ -23,7 +23,7 @@ import ( "k8s.io/client-go/tools/leaderelection" "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" - "k8s.io/klog/v2" + klog "k8s.io/klog/v2" ) const ( @@ -46,12 +46,12 @@ func init() { }) } -//SampleConfig returns a sample config +// SampleConfig returns a sample config func (k *K8sAPIServer) SampleConfig() string { return sampleConfig } -//Description returns the description of this plugin +// Description returns the description of this plugin func (k *K8sAPIServer) Description() string { return "Calculate cluster level metrics from the k8s api server" } diff --git a/plugins/inputs/prometheus_scraper/metrics_type_handler.go b/plugins/inputs/prometheus_scraper/metrics_type_handler.go index 5559911217..e7299b76cc 100644 --- a/plugins/inputs/prometheus_scraper/metrics_type_handler.go +++ b/plugins/inputs/prometheus_scraper/metrics_type_handler.go @@ -30,7 +30,8 @@ var ( // Get the metric name in the TYPE comments for Summary and Histogram // e.g # TYPE nginx_ingress_controller_request_duration_seconds histogram -// # TYPE nginx_ingress_controller_ingress_upstream_latency_seconds summary +// +// # TYPE nginx_ingress_controller_ingress_upstream_latency_seconds summary func normalizeMetricName(name string, suffixes []string) string { for _, s := range suffixes { if strings.HasSuffix(name, s) && name != s { diff --git a/plugins/inputs/statsd/graphite/parser.go b/plugins/inputs/statsd/graphite/parser.go index 5cf749186e..3b61bf83f1 100644 --- a/plugins/inputs/statsd/graphite/parser.go +++ b/plugins/inputs/statsd/graphite/parser.go @@ -466,16 +466,18 @@ type nodes []*node // less than a non-wildcard value. // // For example, the filters: -// "*.*" -// "servers.*" -// "servers.localhost" -// "*.localhost" +// +// "*.*" +// "servers.*" +// "servers.localhost" +// "*.localhost" // // Would be sorted as: -// "servers.localhost" -// "servers.*" -// "*.localhost" -// "*.*" +// +// "servers.localhost" +// "servers.*" +// "*.localhost" +// "*.*" func (n *nodes) Less(j, k int) bool { if (*n)[j].value == "*" && (*n)[k].value != "*" { return false diff --git a/plugins/processors/ec2tagger/ec2tagger.go b/plugins/processors/ec2tagger/ec2tagger.go index 66cdca2f37..50bbe0adcc 100644 --- a/plugins/processors/ec2tagger/ec2tagger.go +++ b/plugins/processors/ec2tagger/ec2tagger.go @@ -217,7 +217,7 @@ func (t *Tagger) ec2TagsRetrieved() bool { return allTagsRetrieved } -//ebsVolumesRetrieved checks if all volumes are successfully retrieved +// ebsVolumesRetrieved checks if all volumes are successfully retrieved func (t *Tagger) ebsVolumesRetrieved() bool { allVolumesRetrieved := true @@ -233,8 +233,8 @@ func (t *Tagger) ebsVolumesRetrieved() bool { return allVolumesRetrieved } -//Init() acts as input validation and serves the purpose of updating ec2 tags and ebs volumes if necessary. -//It will be called when Telegraf is enabling each processor plugin +// Init() acts as input validation and serves the purpose of updating ec2 tags and ebs volumes if necessary. +// It will be called when Telegraf is enabling each processor plugin func (t *Tagger) Init() error { t.shutdownC = make(chan bool) t.ec2TagCache = map[string]string{} diff --git a/receiver/adapter/README.md b/receiver/adapter/README.md new file mode 100644 index 0000000000..bdfe18418d --- /dev/null +++ b/receiver/adapter/README.md @@ -0,0 +1,9 @@ +# Adapter Receiver + +The Adapter Receiver receives Telegraf metrics, filters unsupported value +and converts them to corresponding OTEL metrics before passing down to +OTEL processors and exporters. This is intended to be used when Telegraf +input plugins are still intact. + +Supported pipeline types: metrics + diff --git a/receiver/adapter/accumulator/accumulator.go b/receiver/adapter/accumulator/accumulator.go new file mode 100644 index 0000000000..6557ac191e --- /dev/null +++ b/receiver/adapter/accumulator/accumulator.go @@ -0,0 +1,190 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "errors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/metric" + "github.com/influxdata/telegraf/models" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.uber.org/zap" + "time" +) + +// OtelAccumulator implements the telegraf.Accumulator interface, but works as an OTel plugin by passing the metrics +// onward to the next consumer +type OtelAccumulator interface { + // Accumulator Interface https://github.com/influxdata/telegraf/blob/381dc2272390cd9de1ce2b047a953f8337b55647/accumulator.go + telegraf.Accumulator + + // GetOtelMetrics return the final OTEL metric that were gathered by scrape controller for each plugin + GetOtelMetrics() pmetric.Metrics +} + +/* +otelAccumulator struct +@input Telegraf input plugins +@logger Zap Logger +@precision Round the timestamp during collection +@metrics Otel Metrics which stacks multiple metrics through AddCounter, AddGauge, etc before resetting +*/ +type otelAccumulator struct { + input *models.RunningInput + logger *zap.Logger + precision time.Duration + metrics pmetric.Metrics +} + +func NewAccumulator(input *models.RunningInput, logger *zap.Logger) OtelAccumulator { + return &otelAccumulator{ + input: input, + logger: logger, + precision: time.Nanosecond, + metrics: pmetric.NewMetrics(), + } +} + +func (o *otelAccumulator) AddGauge(measurement string, fields map[string]interface{}, tags map[string]string, t ...time.Time) { + o.addMetric(measurement, tags, fields, telegraf.Gauge, t...) +} + +func (o *otelAccumulator) AddCounter(measurement string, fields map[string]interface{}, tags map[string]string, t ...time.Time) { + o.addMetric(measurement, tags, fields, telegraf.Counter, t...) +} + +// AddSummary is only being used by OpenTelemetry and Prometheus. https://github.com/influxdata/telegraf/search?q=AddSummary +// However, we already have a Prometheus Receiver which uses AddFields so there is actually no use case for AddSummary. +func (o *otelAccumulator) AddSummary(measurement string, fields map[string]interface{}, tags map[string]string, t ...time.Time) { + o.logger.Error("CloudWatchAgent's adapter does not support Telegraf Summary.") +} + +// AddHistogram is only being used by OpenTelemetry and Prometheus. https://github.com/influxdata/telegraf/search?q=AddHistogram +// Therefore, same no use case as AddSummary +func (o *otelAccumulator) AddHistogram(measurement string, fields map[string]interface{}, tags map[string]string, t ...time.Time) { + o.logger.Error("CloudWatchAgent's adapter does not support Telegraf Histogram.") +} + +func (o *otelAccumulator) AddFields(measurement string, fields map[string]interface{}, tags map[string]string, t ...time.Time) { + o.addMetric(measurement, tags, fields, telegraf.Untyped, t...) +} + +func (o otelAccumulator) AddMetric(m telegraf.Metric) { + m.SetTime(m.Time().Round(o.precision)) + o.convertToOtelMetricsAndAddMetric(m) +} + +func (o *otelAccumulator) SetPrecision(precision time.Duration) { + o.precision = precision +} + +func (o *otelAccumulator) AddError(err error) { + if err == nil { + return + } + + o.logger.Error("Error with adapter", zap.Error(err)) +} + +func (o *otelAccumulator) WithTracking(maxTracked int) telegraf.TrackingAccumulator { + panic("implement me") +} + +// addMetric implements from addFields https://github.com/influxdata/telegraf/blob/381dc2272390cd9de1ce2b047a953f8337b55647/agent/accumulator.go#L86-L97 +// which will filter the subset metrics and modify metadata on the metrics (e.g name) +func (o *otelAccumulator) addMetric( + measurement string, + tags map[string]string, + fields map[string]interface{}, + metricType telegraf.ValueType, + t ...time.Time, +) { + m := metric.New(measurement, tags, fields, o.getTime(t), metricType) + o.convertToOtelMetricsAndAddMetric(m) +} + +// convertToOtelMetricsAndAddMetric converts Telegraf's Metric model to OTEL Stream Model +// and add the OTEl Metric to channel +func (o *otelAccumulator) convertToOtelMetricsAndAddMetric(m telegraf.Metric) { + + mMetric, err := o.modifyMetricandConvertToOtelValue(m) + if err != nil { + o.logger.Warn("Filter and convert failed", + zap.String("name", m.Name()), + zap.Any("tags", m.Tags()), + zap.Any("fields", m.Fields()), + zap.Any("type", m.Type()), zap.Error(err)) + return + } + + oMetric, err := ConvertTelegrafToOtelMetrics(mMetric.Name(), mMetric.Fields(), mMetric.Tags(), mMetric.Type(), mMetric.Time()) + if err != nil { + o.logger.Warn("Convert to Otel Metric failed", + zap.Any("name", oMetric), + zap.Any("tags", mMetric.Tags()), + zap.Any("fields", mMetric.Fields()), + zap.Any("type", mMetric.Type()), + zap.Error(err)) + return + } + oMetric.ResourceMetrics().MoveAndAppendTo(o.metrics.ResourceMetrics()) +} + +// GetOtelMetrics return the final OTEL metric that were gathered by scrape controller for each plugin +func (o *otelAccumulator) GetOtelMetrics() pmetric.Metrics { + // MoveTo copy all relates properties and reset the current instance to its zero value. However, + // the next time adding resources metrics, the Otel Metric will have nil value. + // https://pkg.go.dev/go.opentelemetry.io/collector/pdata/pmetric#Metric.MoveTo + finalMetrics := pmetric.NewMetrics() + o.metrics.MoveTo(finalMetrics) + return finalMetrics +} + +// modifyMetricandConvertToOtelValue modifies metric by filtering metrics, add prefix for each field in metrics, etc +// and convert to value supported by OTEL (int64 and float64) +func (o *otelAccumulator) modifyMetricandConvertToOtelValue(m telegraf.Metric) (telegraf.Metric, error) { + if len(m.Fields()) == 0 { + return nil, errors.New("empty metrics before filterting metrics") + } + + // MakeMetric modifies metrics (e.g filter metrics, add prefix for measurement) by customer config + // https://github.com/influxdata/telegraf/blob/5479df2eb5e8401773d604a83590d789a158c735/models/running_input.go#L91-L114 + mMetric := o.input.MakeMetric(m) + if mMetric == nil { + return nil, errors.New("empty metrics after filterting metrics") + } + + // Otel only supports numeric data. Therefore, filter unsupported data type and convert metrics value to corresponding value before + // converting the data model + // https://github.com/open-telemetry/opentelemetry-collector/blob/bdc3e22d28006b6c9496568bd8d8bcf0aa1e4950/pdata/pmetric/metrics.go#L106-L113 + for field, value := range mMetric.Fields() { + // Convert all int,uint to int64 and float to float64 and bool to int + // All other types are ignored + otelValue := util.ToOtelValue(value) + + if otelValue == nil { + mMetric.RemoveField(field) + } else if value != otelValue { + mMetric.AddField(field, otelValue) + } + } + + if len(mMetric.Fields()) == 0 { + return nil, errors.New("empty metrics after final conversion") + } + + return mMetric, nil +} + +// Adapted from https://github.com/influxdata/telegraf/blob/b526945c64a56450b836656a6a2002b8bf748b78/agent/accumulator.go#L112 +func (o *otelAccumulator) getTime(t []time.Time) time.Time { + var timestamp time.Time + if len(t) > 0 { + timestamp = t[0] + } else { + timestamp = time.Now() + } + return timestamp.Round(o.precision) +} diff --git a/receiver/adapter/accumulator/accumulator_test.go b/receiver/adapter/accumulator/accumulator_test.go new file mode 100644 index 0000000000..f982aade49 --- /dev/null +++ b/receiver/adapter/accumulator/accumulator_test.go @@ -0,0 +1,247 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "fmt" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/testutil" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "testing" + "time" +) + +func Test_Accumulator_AddCounterGaugeFields(t *testing.T) { + t.Helper() + + as := assert.New(t) + + test_cases := []struct { + name string + telegrafMetricName string + telegrafMetricTags map[string]string + telegrafMetricType telegraf.ValueType + expectedOtelMetricType pmetric.MetricDataType + expectedDPAttributes pcommon.Map + }{ + { + name: "OtelAccumulator with AddGauge", + telegrafMetricName: "acc_gauge_test", + telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, + telegrafMetricType: telegraf.Gauge, + expectedOtelMetricType: pmetric.MetricDataTypeGauge, + expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_gauge_test"), + }, + { + name: "OtelAccumulator with AddCounter", + telegrafMetricName: "acc_counter_test", + telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, + telegrafMetricType: telegraf.Counter, + expectedOtelMetricType: pmetric.MetricDataTypeSum, + expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_counter_test"), + }, + { + name: "OtelAccumulator with AddFields", + telegrafMetricName: "acc_field_test", + telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, + telegrafMetricType: telegraf.Untyped, + expectedOtelMetricType: pmetric.MetricDataTypeGauge, + expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_field_test"), + }, + } + for _, tc := range test_cases { + t.Run(tc.name, func(t *testing.T) { + + acc := newOtelAccumulatorWithTestRunningInputs(as) + + now := time.Now() + telegrafMetricFields := map[string]interface{}{"time": float64(3.5), "error": false} + + switch tc.telegrafMetricType { + case telegraf.Counter: + acc.AddCounter(tc.telegrafMetricName, telegrafMetricFields, tc.telegrafMetricTags) + case telegraf.Untyped: + acc.AddFields(tc.telegrafMetricName, telegrafMetricFields, tc.telegrafMetricTags, now) + case telegraf.Gauge: + acc.AddGauge(tc.telegrafMetricName, telegrafMetricFields, tc.telegrafMetricTags, now) + } + otelMetrics := acc.GetOtelMetrics() + + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(2, metrics.Len()) + + for i := 0; i < metrics.Len(); i++ { + metric := metrics.At(i) + as.Equal(tc.expectedOtelMetricType, metric.DataType()) + var datapoint pmetric.NumberDataPoint + switch tc.telegrafMetricType { + case telegraf.Counter: + datapoint = metric.Sum().DataPoints().At(0) + case telegraf.Gauge, telegraf.Untyped: + datapoint = metric.Gauge().DataPoints().At(0) + } + + as.Equal(tc.expectedDPAttributes, datapoint.Attributes()) + } + + }) + } +} + +func Test_Accumulator_WithUnsupportedValueAndEmptyFields(t *testing.T) { + t.Helper() + + as := assert.New(t) + + acc := newOtelAccumulatorWithTestRunningInputs(as) + + //Unsupported fields - string value field + acc.AddFields("foo", map[string]interface{}{"client": "redis", "client2": "redis2"}, map[string]string{defaultInstanceId: defaultInstanceIdValue}, time.Now()) + + otelMetrics := acc.GetOtelMetrics() + // Ensure no metrics are built when value from fields are unsupported + as.Equal(pmetric.NewMetrics(), otelMetrics) + as.Equal(0, otelMetrics.ResourceMetrics().Len()) + + // Empty fields + acc.AddFields("foo", map[string]interface{}{}, map[string]string{}, time.Now()) + + otelMetrics = acc.GetOtelMetrics() + // Ensure no metrics are built when value from fields are unsupported + as.Equal(pmetric.NewMetrics(), otelMetrics) + as.Equal(0, otelMetrics.ResourceMetrics().Len()) +} + +func Test_ModifyMetricandConvertMetricValue(t *testing.T) { + t.Helper() + + as := assert.New(t) + + acc := newOtelAccumulatorWithTestRunningInputs(as) + + metric := testutil.MustMetric( + "cpu", + map[string]string{ + "instance_id": "mock", + }, + map[string]interface{}{ + "tx": float64(4.5), + "rx": int32(3), + "error": false, + "client": "redis", + }, + time.Now(), + telegraf.Gauge, + ) + + modifiedMetric, err := acc.modifyMetricandConvertToOtelValue(metric) + as.NoError(err) + + txMetricValue, txMetricExist := modifiedMetric.GetField("tx") + as.True(txMetricExist) + as.Equal(float64(4.5), txMetricValue) + + rxMetricValue, rxMetricExist := modifiedMetric.GetField("rx") + as.True(rxMetricExist) + as.Equal(int64(3), rxMetricValue) + + errorMetricValue, errorMetricExist := modifiedMetric.GetField("error") + as.True(errorMetricExist) + as.Equal(int64(0), errorMetricValue) + + _, clientMetricExist := modifiedMetric.GetField("client") + as.False(clientMetricExist) + +} + +func Test_Accumulator_AddMetric(t *testing.T) { + t.Helper() + + as := assert.New(t) + + acc := newOtelAccumulatorWithTestRunningInputs(as) + + telegrafMetric := testutil.MustMetric( + "acc_metric_test", + map[string]string{defaultInstanceId: defaultInstanceIdValue}, + map[string]interface{}{"sin": int32(4)}, time.Now().UTC(), + telegraf.Untyped) + + acc.SetPrecision(time.Microsecond) + acc.AddMetric(telegrafMetric) + acc.AddMetric(telegrafMetric) + + otelMetrics := acc.GetOtelMetrics() + + as.Equal(2, otelMetrics.ResourceMetrics().Len()) + + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(1, metrics.Len()) + + for i := 0; i < metrics.Len(); i++ { + metric := metrics.At(i) + as.Equal(pmetric.MetricDataTypeGauge, metric.DataType()) + } + + acc.AddMetric(telegrafMetric) + as.Equal(2, otelMetrics.ResourceMetrics().Len()) + +} + +func Test_Accumulator_AddHistogramSum(t *testing.T) { + t.Helper() + + as := assert.New(t) + + test_cases := []struct { + name string + telegrafMetricType telegraf.ValueType + }{ + { + name: "OtelAccumulator with AddHistogram", + telegrafMetricType: telegraf.Histogram, + }, + { + name: "OtelAccumulator with AddSummary", + telegrafMetricType: telegraf.Summary, + }, + } + for _, tc := range test_cases { + t.Run(tc.name, func(t *testing.T) { + acc := newOtelAccumulatorWithTestRunningInputs(as) + now := time.Now() + telegrafMetricTags := map[string]string{defaultInstanceId: defaultInstanceIdValue} + telegrafMetricFields := map[string]interface{}{"usage": uint32(20)} + + switch tc.telegrafMetricType { + case telegraf.Histogram: + acc.AddHistogram("acc_histogram_test", telegrafMetricFields, telegrafMetricTags, now) + case telegraf.Summary: + acc.AddSummary("acc_summary_test", telegrafMetricFields, telegrafMetricTags, now) + } + + otelMetrics := acc.GetOtelMetrics() + as.Equal(0, otelMetrics.ResourceMetrics().Len()) + as.Equal(pmetric.NewMetrics(), otelMetrics) + }) + } +} + +func Test_Accumulator_AddError(t *testing.T) { + t.Helper() + as := assert.New(t) + + acc := newOtelAccumulatorWithTestRunningInputs(as) + acc.AddError(nil) + acc.AddError(fmt.Errorf("foo")) + acc.AddError(fmt.Errorf("bar")) + acc.AddError(fmt.Errorf("baz")) + + // Output: + // {"level":"error","msg":"Error with adapter","error":"foo"} + // {"level":"error","msg":"Error with adapter","error":"bar"} + // {"level":"error","msg":"Error with adapter","error":"baz"} +} diff --git a/receiver/adapter/accumulator/metrics.go b/receiver/adapter/accumulator/metrics.go new file mode 100644 index 0000000000..310fa6d368 --- /dev/null +++ b/receiver/adapter/accumulator/metrics.go @@ -0,0 +1,126 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "fmt" + "github.com/influxdata/telegraf" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "log" + "time" +) + +const ( + measurementAttribute = "measurement" +) + +func ConvertTelegrafToOtelMetrics(measurement string, fields map[string]interface{}, tags map[string]string, tp telegraf.ValueType, t time.Time) (pmetric.Metrics, error) { + // Instead of converting as tags as resource attributes, CWAgent will convert it to datapoint's attributes. + // It would reduce memory consumption and hostmetricscraper does not add attributes to resource attributes. + // https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/99d2204f44d42db5eb7db2f7168a68304c9531c2/receiver/hostmetricsreceiver/internal/scraper/cpuscraper/internal/metadata/generated_metrics_v2.go#L225-L249 + + otelMetrics := pmetric.NewMetrics() + switch tp { + case telegraf.Counter: + AddScopeMetricsIntoOtelMetrics(populateDataPointsForSum, otelMetrics, measurement, fields, tags, t) + case telegraf.Gauge, telegraf.Untyped: + AddScopeMetricsIntoOtelMetrics(populateDataPointsForGauge, otelMetrics, measurement, fields, tags, t) + default: + return pmetric.Metrics{}, fmt.Errorf("Unsupported Telegraf Metric type %v", tp) + } + + return otelMetrics, nil +} + +func NewOtelMetrics(measurement string) pmetric.Metrics { + otelMetrics := pmetric.NewMetrics() + resourceMetrics := otelMetrics.ResourceMetrics().AppendEmpty() + + addMeasurementNameAsAttribute(resourceMetrics.Resource().Attributes(), measurement) + + return otelMetrics +} + +type dataPointPopulator func(measurement string, metrics pmetric.MetricSlice, fields map[string]interface{}, tags map[string]string, timestamp pcommon.Timestamp) + +// AddDataPointsIntoMetrics will use Telegraf's field (which holds subset metrics from the main metrics) +// and convert to OTEL's datapoint +// Example: +// +// Metric { --> Metrics { +// Name: cpu --> ResourceMetrics: [{ +// TagList: [{key: mytag, value: myvalue}] --> Resource: { +// FieldList: [ --> Attributes: [{key: mytag, value: myvalue}] +// {key: cpu_usage_user, value: 0.005}, --> } +// ] --> ScopeMetrics: [{ +// Time: 1646946605 --> Metrics: [ +// Type: Gauge --> {Name: cpu_usage_user +// --> DataType: Gauge +// } --> DataPoints: [{ +// --> Attributes: [{key: mytag, value: myvalue}] +// --> Timestamp: 1646946605 +// --> Type: Double +// --> Val: 0.005 +// --> }] +// --> }] +// --> }] +// --> }] +// --> } +func AddScopeMetricsIntoOtelMetrics(populateDataPoints dataPointPopulator, otelMetrics pmetric.Metrics, measurement string, fields map[string]interface{}, tags map[string]string, t time.Time) { + rs := otelMetrics.ResourceMetrics().AppendEmpty() + timestamp := pcommon.NewTimestampFromTime(t) + metrics := rs.ScopeMetrics().AppendEmpty().Metrics() + populateDataPoints(measurement, metrics, fields, tags, timestamp) +} + +// Conversion from Influx Gauge to OTEL Gauge +// https://github.com/influxdata/influxdb-observability/blob/main/docs/metrics.md#gauge-metric +func populateDataPointsForGauge(measurement string, metrics pmetric.MetricSlice, fields map[string]interface{}, tags map[string]string, timestamp pcommon.Timestamp) { + + for field, value := range fields { + metric := metrics.AppendEmpty() + + metric.SetName(getMetricName(measurement, field)) + + populateNumberDataPoint(measurement, metric.SetEmptyGauge().DataPoints().AppendEmpty(), value, tags, timestamp) + } +} + +// Conversion from Influx Counter to OTEL Sum +// https://github.com/influxdata/influxdb-observability/blob/main/docs/metrics.md#sum-metric +func populateDataPointsForSum(measurement string, metrics pmetric.MetricSlice, fields map[string]interface{}, tags map[string]string, timestamp pcommon.Timestamp) { + + for field, value := range fields { + metric := metrics.AppendEmpty() + + metric.SetName(getMetricName(measurement, field)) + + // Sum is an OTEL Stream Model which consists of: + // * An Aggregation Temporality of delta or cumulative. + // * Monotonic, to signal the time series data is increasing + // For more information on OTEL Stream Model Sum, please following this document + // https://opentelemetry.io/docs/reference/specification/metrics/datamodel/#sums + sumMetric := metric.SetEmptySum() + sumMetric.SetIsMonotonic(true) + sumMetric.SetAggregationTemporality(pmetric.MetricAggregationTemporalityCumulative) + populateNumberDataPoint(measurement, sumMetric.DataPoints().AppendEmpty(), value, tags, timestamp) + } +} + +func populateNumberDataPoint(measurement string, datapoint pmetric.NumberDataPoint, value interface{}, tags map[string]string, timestamp pcommon.Timestamp) { + datapoint.SetTimestamp(timestamp) + + switch v := value.(type) { + case int64: + datapoint.SetIntVal(v) + case float64: + datapoint.SetDoubleVal(v) + default: + log.Fatalf("Invalid data type %v for NumberDataPoint ", v) + } + + addTagsToAttributes(datapoint.Attributes(), tags) + addMeasurementNameAsAttribute(datapoint.Attributes(), measurement) +} diff --git a/receiver/adapter/accumulator/metrics_test.go b/receiver/adapter/accumulator/metrics_test.go new file mode 100644 index 0000000000..0cb6679139 --- /dev/null +++ b/receiver/adapter/accumulator/metrics_test.go @@ -0,0 +1,252 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" + "testing" + "time" + + "github.com/stretchr/testify/assert" + + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/testutil" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" +) + +func Test_ConvertToOtelMetrics_WithDifferentTypes(t *testing.T) { + t.Helper() + + as := assert.New(t) + now := time.Now() + + test_cases := []struct { + name string + telegrafMetric telegraf.Metric + expectedOtelRMAttributes pcommon.Map + expectedMetrics []map[string]interface{} + }{ + { + name: "Convert Telegraf Gauge with Empty Tags and Empty Fields", + telegrafMetric: testutil.MustMetric( + "cpu", + map[string]string{}, + map[string]interface{}{}, + now, + telegraf.Gauge, + ), + expectedMetrics: []map[string]interface{}{}, + }, + { + name: "Convert Telegraf Gauge to Otel Gauge", + telegrafMetric: testutil.MustMetric( + "cpu", + map[string]string{ + defaultInstanceId: defaultInstanceIdValue, + }, + map[string]interface{}{ + "time_user": float64(42), + }, + now, + telegraf.Gauge, + ), + expectedMetrics: []map[string]interface{}{ + { + "name": "cpu_time_user", + "value": float64(42), + "attributes": generateExpectedAttributesWithMeasurement("cpu"), + "timestamp": pcommon.NewTimestampFromTime(now), + "type": pmetric.MetricDataTypeGauge, + }, + }, + }, + { + name: "Convert Telegraf Counter to Otel Sum", + telegrafMetric: testutil.MustMetric( + "swap", + map[string]string{ + defaultInstanceId: defaultInstanceIdValue, + }, + map[string]interface{}{ + "Sin": float64(3), + }, + now.UTC(), + telegraf.Counter, + ), + expectedMetrics: []map[string]interface{}{ + { + "name": "swap_Sin", + "value": float64(3), + "attributes": generateExpectedAttributesWithMeasurement("swap"), + "timestamp": pcommon.NewTimestampFromTime(now), + "type": pmetric.MetricDataTypeSum, + }, + }, + }, + { + + name: "Convert Telegraf Untype to Otel Gauge", + telegrafMetric: testutil.MustMetric( + "prometheus", + map[string]string{ + "instance_id": "mock", + }, + map[string]interface{}{ + "redis_tx": int32(4), + "redis_rx": float64(2.3), + }, + now.UTC(), + telegraf.Untyped, + ), + expectedMetrics: []map[string]interface{}{ + { + "name": "prometheus_redis_tx", + "value": int64(4), + "attributes": generateExpectedAttributesWithMeasurement("prometheus"), + "timestamp": pcommon.NewTimestampFromTime(now), + "type": pmetric.MetricDataTypeGauge, + }, + { + "name": "prometheus_redis_rx", + "value": float64(2.3), + "attributes": generateExpectedAttributesWithMeasurement("prometheus"), + "timestamp": pcommon.NewTimestampFromTime(now), + "type": pmetric.MetricDataTypeGauge, + }, + }, + }, + } + for _, tc := range test_cases { + t.Run(tc.name, func(t *testing.T) { + + convertedOtelMetrics, err := ConvertTelegrafToOtelMetrics(tc.telegrafMetric.Name(), tc.telegrafMetric.Fields(), tc.telegrafMetric.Tags(), tc.telegrafMetric.Type(), tc.telegrafMetric.Time()) + as.NoError(err) + as.Equal(len(tc.expectedMetrics), convertedOtelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics().Len()) + + // Since Map is unordered; therefore, to avoid flakiness we have to loop through every metric + matchMetrics := len(tc.expectedMetrics) + for index, expectedDp := range tc.expectedMetrics { + metrics := convertedOtelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + for metricIndex := 0; metricIndex < metrics.Len(); metricIndex++ { + metric := metrics.At(metricIndex) + // Check name to decrease the match metrics since metric name is the only unique attribute + // And ignore the rest checking + if tc.expectedMetrics[index]["name"] != metric.Name() { + continue + } + + matchMetrics-- + + as.Equal(tc.expectedMetrics[index]["name"], metric.Name()) + as.Equal(tc.expectedMetrics[index]["type"], metric.DataType()) + var datapoint pmetric.NumberDataPoint + switch tc.telegrafMetric.Type() { + case telegraf.Counter: + datapoint = metric.Sum().DataPoints().At(0) + case telegraf.Gauge, telegraf.Untyped: + datapoint = metric.Gauge().DataPoints().At(0) + } + + value := expectedDp["value"] + switch value.(type) { + case int64: + as.Equal(value, datapoint.IntVal()) + case float64: + as.Equal(value, datapoint.DoubleVal()) + } + as.Equal(tc.expectedMetrics[index]["attributes"], datapoint.Attributes()) + as.Equal(tc.expectedMetrics[index]["timestamp"], datapoint.Timestamp()) + } + } + as.Equal(0, matchMetrics) + + }) + } +} + +func Test_ConvertTelegrafToOtelMetrics_WithUnsupportTyped(t *testing.T) { + t.Helper() + + as := assert.New(t) + tMetric := testutil.MustMetric( + "prometheus", + map[string]string{ + "instance_id": "mock", + }, + map[string]interface{}{ + "redis_tx": int32(4), + "redis_rx": int64(2), + }, + time.Now().UTC(), + telegraf.Histogram, + ) + + convertedOtelMetrics, err := ConvertTelegrafToOtelMetrics(tMetric.Name(), tMetric.Fields(), tMetric.Tags(), tMetric.Type(), tMetric.Time()) + as.Error(err) + as.Equal(pmetric.Metrics{}, convertedOtelMetrics) +} + +func Test_PopulateNumberDataPoint_WithDifferentValueType(t *testing.T) { + t.Helper() + + as := assert.New(t) + + test_cases := []struct { + name string + telegrafDataPointValue interface{} + expectedOtelDataPointValue interface{} + }{ + { + name: "Convert Telegraf Int to Otel Int64", + telegrafDataPointValue: int(42), + expectedOtelDataPointValue: int64(42), + }, + + { + name: "Convert Telegraf Int64 to Otel Int64", + telegrafDataPointValue: int64(5968846374), + expectedOtelDataPointValue: int64(5968846374), + }, + { + name: "Convert Telegraf Uint to Otel Int64", + telegrafDataPointValue: uint(0), + expectedOtelDataPointValue: int64(0), + }, + + { + name: "Convert Telegraf Uint64 to Otel Int64", + telegrafDataPointValue: uint64(5968846374), + expectedOtelDataPointValue: int64(5968846374), + }, + { + name: "Convert Telegraf Float32 to Otel Float64", + telegrafDataPointValue: float32(11234.500253), + expectedOtelDataPointValue: float64(11234.5), + }, + + { + name: "Convert Telegraf Float64 to Otel Float64", + telegrafDataPointValue: float64(2944405.500253), + expectedOtelDataPointValue: float64(2944405.500253), + }, + } + + for _, tc := range test_cases { + t.Run(tc.name, func(t *testing.T) { + + otelValue := util.ToOtelValue(tc.telegrafDataPointValue) + as.NotNil(otelValue) + + switch v := tc.expectedOtelDataPointValue.(type) { + case int64: + as.Equal(v, otelValue) + case float64: + as.Equal(v, otelValue) + default: + t.Fatalf("Invalid data type for datapoint %v", v) + } + }) + } +} diff --git a/receiver/adapter/accumulator/testutil.go b/receiver/adapter/accumulator/testutil.go new file mode 100644 index 0000000000..3ff37aa6b2 --- /dev/null +++ b/receiver/adapter/accumulator/testutil.go @@ -0,0 +1,45 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/models" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pcommon" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.uber.org/zap" + "time" +) + +const ( + defaultInstanceId = "instance_id" + defaultInstanceIdValue = "mock" +) + +type TestRunningInput struct{} + +func (t *TestRunningInput) Description() string { return "" } +func (t *TestRunningInput) SampleConfig() string { return "" } +func (t *TestRunningInput) Gather(_ telegraf.Accumulator) error { return nil } + +func generateExpectedAttributesWithMeasurement(measurement string) pcommon.Map { + sampleAttributes := pcommon.NewMap() + sampleAttributes.PutString(defaultInstanceId, defaultInstanceIdValue) + sampleAttributes.PutString(measurementAttribute, measurement) + return sampleAttributes +} + +func newOtelAccumulatorWithTestRunningInputs(as *assert.Assertions) *otelAccumulator { + + ri := models.NewRunningInput(&TestRunningInput{}, &models.InputConfig{}) + as.NoError(ri.Config.Filter.Compile()) + + return &otelAccumulator{ + input: ri, + logger: zap.NewNop(), + precision: time.Nanosecond, + metrics: pmetric.NewMetrics(), + } +} diff --git a/receiver/adapter/accumulator/util.go b/receiver/adapter/accumulator/util.go new file mode 100644 index 0000000000..ef6eabbff9 --- /dev/null +++ b/receiver/adapter/accumulator/util.go @@ -0,0 +1,27 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package accumulator + +import ( + "go.opentelemetry.io/collector/pdata/pcommon" + "strings" +) + +// Otel Attributes = Telegraf Tags = CloudWatch Dimensions +func addTagsToAttributes(attributes pcommon.Map, tags map[string]string) { + for tag, value := range tags { + attributes.PutString(tag, value) + } +} + +// Add measurement as a global attribute +func addMeasurementNameAsAttribute(attributes pcommon.Map, measurement string) { + attributes.PutString(measurementAttribute, measurement) +} + +// Adapted from http://github.com/aws/amazon-cloudwatch-agent/blob/40bb174c0e2309da6bd2c6e1a36c501324b2d6b0/plugins/outputs/cloudwatch/cloudwatch.go#L385-L385 +func getMetricName(measurement string, fieldKey string) string { + separator := "_" + return strings.Join([]string{measurement, fieldKey}, separator) +} diff --git a/receiver/adapter/config.go b/receiver/adapter/config.go new file mode 100644 index 0000000000..bb44e5c068 --- /dev/null +++ b/receiver/adapter/config.go @@ -0,0 +1,15 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/receiver/scraperhelper" +) + +type Config struct { + scraperhelper.ScraperControllerSettings `mapstructure:",squash"` +} + +var _ config.Receiver = (*Config)(nil) diff --git a/receiver/adapter/doc.go b/receiver/adapter/doc.go new file mode 100644 index 0000000000..0829b2f5e3 --- /dev/null +++ b/receiver/adapter/doc.go @@ -0,0 +1,4 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter // import "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" diff --git a/receiver/adapter/factory.go b/receiver/adapter/factory.go new file mode 100644 index 0000000000..2afb47c1a0 --- /dev/null +++ b/receiver/adapter/factory.go @@ -0,0 +1,95 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "context" + "fmt" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" + telegrafconfig "github.com/influxdata/telegraf/config" + "github.com/influxdata/telegraf/models" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/receiver/scraperhelper" + "time" +) + +type Adapter struct { + telegrafConfig *telegrafconfig.Config +} + +func NewAdapter(telegrafConfig *telegrafconfig.Config) Adapter { + return Adapter{ + telegrafConfig: telegrafConfig, + } +} + +func createDefaultConfig(cfgType config.Type) func() config.Receiver { + return func() config.Receiver { + return &Config{ + ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + ReceiverSettings: config.NewReceiverSettings(config.NewComponentID(cfgType)), + CollectionInterval: time.Minute, + }, + } + } +} + +func (a Adapter) NewReceiverFactory(telegrafInputName string) component.ReceiverFactory { + typeStr := config.Type(toyamlconfig.TelegrafPrefix + telegrafInputName) + return component.NewReceiverFactory(typeStr, createDefaultConfig(typeStr), + component.WithMetricsReceiver(a.createMetricsReceiver(telegrafInputName), component.StabilityLevelStable)) +} + +func (a Adapter) createMetricsReceiver(telegrafInputName string) func(ctx context.Context, settings component.ReceiverCreateSettings, config config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { + input, err := a.initializeInput(telegrafInputName) + return func(ctx context.Context, settings component.ReceiverCreateSettings, rConf config.Receiver, consumer consumer.Metrics) (component.MetricsReceiver, error) { + cfg := rConf.(*Config) + + if err != nil { + return nil, err + } + + receiver := newAdaptedReceiver(input, settings.Logger) + + scraper, err := scraperhelper.NewScraper( + telegrafInputName, + receiver.scrape, + scraperhelper.WithStart(receiver.start), + scraperhelper.WithShutdown(receiver.shutdown), + ) + + if err != nil { + return nil, err + } + + return scraperhelper.NewScraperControllerReceiver( + &cfg.ScraperControllerSettings, settings, consumer, + scraperhelper.AddScraper(scraper), + ) + } +} + +func (a Adapter) initializeInput(telegrafInputName string) (*models.RunningInput, error) { + for _, ri := range a.telegrafConfig.Inputs { + if ri.Config.Name == telegrafInputName { + // Initialize the telegraf plugins to set value https://github.com/influxdata/telegraf/blob/3b3584b40b7c9ea10ae9cb02137fc072da202704/agent/agent.go#L197-L202 + // E.g Mem scrape their metrics based on OS https://github.com/influxdata/telegraf/blob/3b3584b40b7c9ea10ae9cb02137fc072da202704/plugins/inputs/mem/mem.go#L26-L29 + // and Init to set the Runtime OS + err := ri.Init() + if err != nil { + return nil, fmt.Errorf("could not initialize input %s: %v", ri.LogName(), err) + } + + // To Do: Add Service Input Start when collecting statsd, collectd metrics,.. moreover, signaling to set + // different settings (e.g precision) which is different from regular inputs + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/agent/agent.go#L252-L274 + return ri, nil + } + + } + + return nil, fmt.Errorf("unable to find telegraf input with name %s", telegrafInputName) +} diff --git a/receiver/adapter/factory_test.go b/receiver/adapter/factory_test.go new file mode 100644 index 0000000000..b011aa433b --- /dev/null +++ b/receiver/adapter/factory_test.go @@ -0,0 +1,99 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "context" + telegrafconfig "github.com/influxdata/telegraf/config" + _ "github.com/influxdata/telegraf/plugins/inputs/cpu" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/consumer/consumertest" + "go.opentelemetry.io/collector/receiver/scraperhelper" + "testing" + "time" +) + +func Test_Type(t *testing.T) { + t.Helper() + + as := assert.New(t) + + c := telegrafconfig.NewConfig() + err := c.LoadConfig("./testdata/cpu_plugin.toml") + as.NoError(err) + + adapter := NewAdapter(c) + factory := adapter.NewReceiverFactory("cpu") + ft := factory.Type() + as.Equal(config.Type("telegraf_cpu"), ft) +} + +func Test_ValidConfig(t *testing.T) { + t.Helper() + + as := assert.New(t) + + c := telegrafconfig.NewConfig() + err := c.LoadConfig("./testdata/cpu_plugin.toml") + as.NoError(err) + + adapter := NewAdapter(c) + factory := adapter.NewReceiverFactory("cpu") + err = factory.CreateDefaultConfig().Validate() + as.NoError(err) +} + +func Test_CreateMetricsReceiver(t *testing.T) { + t.Helper() + + as := assert.New(t) + + c := telegrafconfig.NewConfig() + err := c.LoadConfig("./testdata/cpu_plugin.toml") + as.NoError(err) + + adapter := NewAdapter(c) + + factory := adapter.NewReceiverFactory("cpu") + metricsReceiver, err := factory.CreateMetricsReceiver( + context.Background(), + componenttest.NewNopReceiverCreateSettings(), + &Config{ + ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + CollectionInterval: time.Minute, + }, + }, + consumertest.NewNop(), + ) + as.NoError(err) + as.NotNil(metricsReceiver) +} + +func Test_CreateInvalidMetricsReceiver(t *testing.T) { + t.Helper() + + as := assert.New(t) + + c := telegrafconfig.NewConfig() + err := c.LoadConfig("./testdata/cpu_plugin.toml") + as.NoError(err) + + adapter := NewAdapter(c) + + factory := adapter.NewReceiverFactory("mem") + metricsReceiver, err := factory.CreateMetricsReceiver( + context.Background(), + componenttest.NewNopReceiverCreateSettings(), + &Config{ + ScraperControllerSettings: scraperhelper.ScraperControllerSettings{ + CollectionInterval: time.Minute, + }, + }, + consumertest.NewNop(), + ) + as.Error(err) + as.Nil(metricsReceiver) +} diff --git a/receiver/adapter/plugins_test.go b/receiver/adapter/plugins_test.go new file mode 100644 index 0000000000..59135f1f83 --- /dev/null +++ b/receiver/adapter/plugins_test.go @@ -0,0 +1,234 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +//go:build !windows +// +build !windows + +package adapter + +import ( + "fmt" + "github.com/influxdata/telegraf/agent" + "github.com/influxdata/telegraf/config" + "github.com/influxdata/telegraf/plugins/inputs/disk" + "github.com/influxdata/telegraf/plugins/inputs/mem" + "github.com/influxdata/telegraf/plugins/inputs/net" + _ "github.com/influxdata/telegraf/plugins/inputs/swap" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.uber.org/zap/zaptest" + "testing" + "time" +) + +var testCfg = "./testdata/all_plugins.toml" + +func Test_CPUPlugin(t *testing.T) { + t.Helper() + as := assert.New(t) + cpu := "cpu" + + c := config.NewConfig() + c.InputFilters = []string{cpu} + err := c.LoadConfig(testCfg) + as.NoError(err) + + a, _ := agent.NewAgent(c) + as.Len(a.Config.Inputs, 1) + + receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) + err = receiver.start(nil, nil) + as.NoError(err) + + // Scrape twice but with a slight delay so that delta is detected and usage metrics are captured + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L109-L111 + otelMetrics, err := receiver.scrape(nil) + as.NoError(err) + time.Sleep(1 * time.Second) + otelMetrics, err = receiver.scrape(nil) + as.NoError(err) + + err = receiver.shutdown(nil) + as.NoError(err) + + as.Equal(2, otelMetrics.ResourceMetrics().Len()) + + // Validate CPU Time metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L72-L86 + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(11, metrics.Len()) + expectedCPUTimeMetrics := []string{"time_active", "time_user", "time_system", "time_idle", "time_nice", "time_iowait", "time_irq", "time_softirq", "time_steal", "time_guest", "time_guest_nice"} + validateMetricName(as, cpu, expectedCPUTimeMetrics, metrics) + + // Validate CPU Usage metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L113-L123 + metrics = otelMetrics.ResourceMetrics().At(1).ScopeMetrics().At(0).Metrics() + as.Equal(11, metrics.Len()) + expectedCPUUsageMetrics := []string{"usage_active", "usage_user", "usage_system", "usage_idle", "usage_nice", "usage_iowait", "usage_irq", "usage_softirq", "usage_steal", "usage_guest", "usage_guest_nice"} + validateMetricName(as, cpu, expectedCPUUsageMetrics, metrics) +} + +func Test_MemPlugin(t *testing.T) { + t.Helper() + as := assert.New(t) + memory := "mem" + + memStats := mem.MemStats{} + err := memStats.Init() + as.NoError(err) + + c := config.NewConfig() + c.InputFilters = []string{memory} + + err = c.LoadConfig(testCfg) + as.NoError(err) + + a, _ := agent.NewAgent(c) + as.Len(a.Config.Inputs, 1) + + receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) + err = receiver.start(nil, nil) + as.NoError(err) + + otelMetrics, err := receiver.scrape(nil) + as.NoError(err) + + err = receiver.shutdown(nil) + as.NoError(err) + + // Validate Mem metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/mem/mem.go#L40-L44 + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(5, metrics.Len()) + expectedMemoryUsageMetrics := []string{"total", "available", "used", "used_percent", "available_percent"} + validateMetricName(as, memory, expectedMemoryUsageMetrics, metrics) +} + +func Test_SwapPlugin(t *testing.T) { + t.Helper() + as := assert.New(t) + swaps := "swap" + + memStats := mem.MemStats{} + err := memStats.Init() + as.NoError(err) + + c := config.NewConfig() + c.InputFilters = []string{swaps} + + err = c.LoadConfig(testCfg) + as.NoError(err) + + a, _ := agent.NewAgent(c) + as.Len(a.Config.Inputs, 1) + + receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) + err = receiver.start(nil, nil) + as.NoError(err) + + otelMetrics, err := receiver.scrape(nil) + as.NoError(err) + + err = receiver.shutdown(nil) + as.NoError(err) + + // Validate Swap metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/swap/swap.go#L32-L37 + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(4, metrics.Len()) + expectedSwapMetrics := []string{"total", "free", "used", "used_percent"} + validateMetricName(as, swaps, expectedSwapMetrics, metrics) +} + +func Test_NetPlugin(t *testing.T) { + t.Helper() + as := assert.New(t) + network := "net" + + netStats := net.NetIOStats{} + netStats.IgnoreProtocolStats = true + + c := config.NewConfig() + c.InputFilters = []string{network} + + err := c.LoadConfig(testCfg) + as.NoError(err) + + a, _ := agent.NewAgent(c) + as.Len(a.Config.Inputs, 1) + + receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) + err = receiver.start(nil, nil) + as.NoError(err) + + otelMetrics, err := receiver.scrape(nil) + as.NoError(err) + + err = receiver.shutdown(nil) + as.NoError(err) + + // Validate Net metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/net/net.go#L86-L93 + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(8, metrics.Len()) + expectedNetMetrics := []string{"bytes_sent", "bytes_recv", "packets_sent", "packets_recv", "err_in", "err_out", "drop_in", "drop_out"} + validateMetricName(as, network, expectedNetMetrics, metrics) +} + +func Test_DiskPlugin(t *testing.T) { + t.Helper() + as := assert.New(t) + diskP := "disk" + + diskStats := disk.DiskStats{} + err := diskStats.Init() + as.NoError(err) + + c := config.NewConfig() + c.InputFilters = []string{diskP} + + err = c.LoadConfig(testCfg) + as.NoError(err) + + a, _ := agent.NewAgent(c) + as.Len(a.Config.Inputs, 1) + + err = a.Config.Inputs[0].Init() + as.NoError(err) + + receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) + err = receiver.start(nil, nil) + as.NoError(err) + + otelMetrics, err := receiver.scrape(nil) + as.NoError(err) + + err = receiver.shutdown(nil) + as.NoError(err) + + // Validate Disk metrics + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/disk/disk.go#L72-L78 + metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() + as.Equal(7, metrics.Len()) + expectedDiskMetrics := []string{"total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"} + validateMetricName(as, diskP, expectedDiskMetrics, metrics) +} + +func validateMetricName(as *assert.Assertions, plugin string, expectedResourceMetricsName []string, actualOtelSlMetrics pmetric.MetricSlice) { + as.Equal(len(expectedResourceMetricsName), actualOtelSlMetrics.Len(), "Number of metrics did not match!") + + matchMetrics := actualOtelSlMetrics.Len() + for _, expectedMetric := range expectedResourceMetricsName { + for metricIndex := 0; metricIndex < actualOtelSlMetrics.Len(); metricIndex++ { + metric := actualOtelSlMetrics.At(metricIndex) + // Check name to decrease the match metrics since metric name is the only unique attribute + // And ignore the rest checking + if fmt.Sprintf("%s_%s", plugin, expectedMetric) != metric.Name() { + continue + } + matchMetrics-- + } + } + + as.Equal(0, matchMetrics, "Metrics did not match!") +} diff --git a/receiver/adapter/receiver.go b/receiver/adapter/receiver.go new file mode 100644 index 0000000000..446fd634c6 --- /dev/null +++ b/receiver/adapter/receiver.go @@ -0,0 +1,54 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" + "github.com/influxdata/telegraf/models" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/pdata/pmetric" + "go.uber.org/zap" +) + +type AdaptedReceiver struct { + logger *zap.Logger + input *models.RunningInput + accumulator accumulator.OtelAccumulator +} + +func newAdaptedReceiver(input *models.RunningInput, logger *zap.Logger) *AdaptedReceiver { + return &AdaptedReceiver{ + input: input, + logger: logger, + } +} + +// Adapter Receiver uses Scrape Controller to scrape metric and has three phases: +// Start: Start the accumulator to initialize the logger and resources metric +// Scrape: Gather metrics using accumulator +// (e.g CPU https://github.com/influxdata/telegraf/blob/6e924fcd5cc2ce79a024b7275d865d7a19c455ed/plugins/inputs/cpu/cpu.go) +// Shutdown Stop the scarpper and flush the remaining metrics before shutting down the scraper. +func (r *AdaptedReceiver) start(_ context.Context, _ component.Host) error { + // TODO: Add Set Precision based on agent precision and agent interval + // https://github.com/influxdata/telegraf/blob/3b3584b40b7c9ea10ae9cb02137fc072da202704/agent/agent.go#L316-L317 + r.accumulator = accumulator.NewAccumulator(r.input, r.logger) + return nil +} + +func (r *AdaptedReceiver) scrape(_ context.Context) (pmetric.Metrics, error) { + r.logger.Debug("Begining scraping metrics with adapter", zap.String("receiver", r.input.Config.Name)) + + if err := r.input.Input.Gather(r.accumulator); err != nil { + r.accumulator.AddError(err) + return pmetric.Metrics{}, err + } + + return r.accumulator.GetOtelMetrics(), nil +} + +func (r *AdaptedReceiver) shutdown(_ context.Context) error { + r.logger.Debug("Shutdown adapter", zap.String("receiver", r.input.Config.Name)) + return nil +} diff --git a/receiver/adapter/receiver_test.go b/receiver/adapter/receiver_test.go new file mode 100644 index 0000000000..b1a494a271 --- /dev/null +++ b/receiver/adapter/receiver_test.go @@ -0,0 +1,32 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" + "github.com/influxdata/telegraf/models" + "github.com/stretchr/testify/assert" + "go.opentelemetry.io/collector/component/componenttest" + "go.uber.org/zap" + "testing" +) + +func Test_AdaptedReceiver_WithEmptyMetrics(t *testing.T) { + t.Helper() + + as := assert.New(t) + + ri := models.NewRunningInput(&accumulator.TestRunningInput{}, &models.InputConfig{}) + adaptedReceiver := newAdaptedReceiver(ri, zap.NewNop()) + + ctx := context.Background() + err := adaptedReceiver.start(ctx, componenttest.NewNopHost()) + as.NoError(err) + _, err = adaptedReceiver.scrape(ctx) + as.NoError(err) + err = adaptedReceiver.shutdown(ctx) + as.NoError(err) + +} diff --git a/receiver/adapter/testdata/all_plugins.toml b/receiver/adapter/testdata/all_plugins.toml new file mode 100644 index 0000000000..bc3e8dfa41 --- /dev/null +++ b/receiver/adapter/testdata/all_plugins.toml @@ -0,0 +1,35 @@ +[[inputs.cpu]] + collect_cpu_time = true + report_active = true + percpu = false + totalcpu = true + interval = "1s" + fieldpass = ["time_active", "time_user", "time_system", "time_idle", "time_nice", "time_iowait", "time_irq", "time_softirq", "time_steal", "time_guest", "time_guest_nice", "usage_active", "usage_user", "usage_system", "usage_idle", "usage_nice", "usage_iowait", "usage_irq", "usage_softirq", "usage_steal", "usage_guest", "usage_guest_nice"] + [inputs.cpu.tags] + metricPath = "metrics" + +[[inputs.swap]] + interval = "1s" + fieldpass = ["total","used", "free", "used_percent"] + [inputs.swap.tags] + metricPath = "metrics" + + +[[inputs.mem]] + interval = "1s" + fieldpass = ["total", "available", "used", "used_percent", "available_percent"] + [inputs.mem.tags] + metricPath = "metrics" + +[[inputs.net]] + fieldpass = ["bytes_sent", "bytes_recv", "packets_sent", "packets_recv", "err_in", "err_out", "drop_in", "drop_out"] + [inputs.net.tags] + metricPath = "metrics" + +[[inputs.disk]] + mount_points = ["/"] + ignore_fs = [] + fieldpass = ["total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"] + tagexclude = ["mode"] + [inputs.disk.tags] + metricPath = "metrics" \ No newline at end of file diff --git a/receiver/adapter/testdata/cpu_plugin.toml b/receiver/adapter/testdata/cpu_plugin.toml new file mode 100644 index 0000000000..7ff4d9ad57 --- /dev/null +++ b/receiver/adapter/testdata/cpu_plugin.toml @@ -0,0 +1,6 @@ +[[inputs.cpu]] + fieldpass = ["usage_idle", "usage_iowait", "usage_user", "usage_system"] + percpu = false + totalcpu = false + [inputs.cpu.tags] + metricPath = "metrics" \ No newline at end of file diff --git a/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json b/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json index e98b232c12..8fa3185254 100644 --- a/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json +++ b/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json @@ -1,16 +1,9 @@ { "agent": { - "credentials": { - "role_arn": "global_role_arn_value" - }, "internal": true, "logfile": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log", "metrics_collection_interval": 10 }, - "csm": { - "memory_limit_in_mb": 50, - "port": 4000 - }, "logs": { "credentials": { "role_arn": "log_role_arn_value_test" @@ -97,91 +90,6 @@ "*" ], "totalcpu": false - }, - "disk": { - "append_dimensions": { - "d3": "foo3", - "d4": "bar4" - }, - "ignore_file_system_types": [ - "sysfs", - "devtmpfs" - ], - "measurement": [ - { - "name": "free", - "rename": "DISK_FREE", - "unit": "unit" - }, - "total", - "used" - ], - "metrics_collection_interval": 60, - "resources": [ - "/", - "/dev", - "/sys" - ] - }, - "diskio": { - "measurement": [ - "reads", - "writes", - "read_time", - "write_time", - "io_time" - ], - "metrics_collection_interval": 60, - "resources": [ - "*" - ] - }, - "mem": { - "measurement": [ - "mem_used", - "mem_cached", - "mem_total" - ], - "metrics_collection_interval": 1 - }, - "net": { - "measurement": [ - "bytes_sent", - "bytes_recv", - "drop_in", - "drop_out" - ], - "resources": [ - "eth0" - ] - }, - "netstat": { - "measurement": [ - "tcp_established", - "tcp_syn_sent", - "tcp_close" - ], - "metrics_collection_interval": 60 - }, - "processes": { - "measurement": [ - "running", - "sleeping", - "dead" - ] - }, - "statsd": { - "metric_separator": "_", - "metrics_aggregation_interval": 60, - "metrics_collection_interval": 10, - "service_address": ":8125" - }, - "swap": { - "measurement": [ - "swap_used", - "swap_free", - "swap_used_percent" - ] } } } diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index 623fae5552..dec0ed86e8 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -26,7 +26,7 @@ const ( metricsKeyName = "metrics" inputsKeyName = "inputs" outputsKeyName = "outputs" - telegrafPrefix = "telegraf_" + TelegrafPrefix = "telegraf_" ) var ( @@ -91,7 +91,7 @@ func encodeReceivers(inputs, nativeInputs map[string]interface{}, cfg *map[strin func inputsToReceivers(inputs, nativeInputs map[string]interface{}) map[config.ComponentID]interface{} { receiverMap := make(map[config.ComponentID]interface{}) for key := range inputs { - t := config.Type(telegrafPrefix + key) + t := config.Type(TelegrafPrefix + key) receiverMap[config.NewComponentID(t)] = struct{}{} } for key, val := range nativeInputs { @@ -113,7 +113,7 @@ func encodeProcessors(processors, nativeProcessors map[string]interface{}, cfg * func procToProcessors(processors, nativeProcessors map[string]interface{}) map[config.ComponentID]interface{} { processorMap := make(map[config.ComponentID]interface{}) for key := range processors { - t := config.Type(telegrafPrefix + key) + t := config.Type(TelegrafPrefix + key) processorMap[config.NewComponentID(t)] = struct{}{} } for key, val := range nativeProcessors { @@ -135,10 +135,10 @@ func encodeExporters(outputs, nativeOutputs map[string]interface{}, cfg *map[str func outputsToExporters(outputs, nativeOutputs map[string]interface{}) map[config.ComponentID]interface{} { exporterMap := make(map[config.ComponentID]interface{}) - for key := range outputs { - t := config.Type(telegrafPrefix + key) - exporterMap[config.NewComponentID(t)] = struct{}{} - } + ///for key := range outputs { + // t := config.Type(TelegrafPrefix + key) + // exporterMap[config.NewComponentID(t)] = struct{}{} + //} for key, val := range nativeOutputs { t := config.Type(key) exporterMap[config.NewComponentID(t)] = val diff --git a/translator/translate/metrics/metric_decoration/metric_decoration_test.go b/translator/translate/metrics/metric_decoration/metric_decoration_test.go index 2c0c45e9d2..1350981358 100644 --- a/translator/translate/metrics/metric_decoration/metric_decoration_test.go +++ b/translator/translate/metrics/metric_decoration/metric_decoration_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" ) -//Check the case when the input is in "cpu":{//specific configuration} +// Check the case when the input is in "cpu":{//specific configuration} func TestMetricDecoration_ApplyRule(t *testing.T) { c := new(MetricDecoration) //Check whether override default config @@ -48,7 +48,7 @@ func TestMetricDecoration_ApplyRule(t *testing.T) { assert.Equal(t, expected, val) } -//Check the case when the input is in "nvidia_gpu":{//specific configuration} +// Check the case when the input is in "nvidia_gpu":{//specific configuration} func TestMetricDecoration_plugin_with_alias_ApplyRule(t *testing.T) { c := new(MetricDecoration) //Check whether override default config From 60ca11244badf0cb3ae9dd9984c29f41d7a69302 Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Wed, 5 Oct 2022 16:19:05 -0400 Subject: [PATCH 034/144] Fix formatting. (#22) --- Makefile | 8 +- awscsm/csm/csmiface/interface.go | 1 + awscsm/csm/customizations_test.go | 1 + .../customizations_test.go | 1 + .../sdkmetricsdataplaneiface/interface.go | 1 + cfg/agentinfo/info.go | 3 +- cfg/agentinfo/info_test.go | 6 +- ...shable_shared_credentials_provider_test.go | 13 ++- cfg/migrate/confmigrate.go | 8 +- cfg/migrate/confmigrate_test.go | 11 +-- .../wizard_test.go | 6 +- .../amazon-cloudwatch-agent.go | 46 +++++---- .../register_event_logger_windows.go | 3 +- cmd/config-downloader/downloader.go | 24 ++--- cmd/config-translator/translator_test.go | 9 +- .../start-amazon-cloudwatch-agent.go | 6 +- handlers/compress.go | 3 +- integration/generator/test_case_generator.go | 8 +- integration/test/agent_util_linux.go | 4 +- integration/test/agent_util_windows.go | 30 +++--- .../test/cloudwatchlogs/publish_logs_test.go | 5 +- integration/test/cwm_util.go | 5 +- .../metrics_number_dimension_test.go | 1 + .../metrics_nvidia_gpu_linux_test.go | 5 +- .../metrics_nvidia_gpu_window_test.go | 5 +- .../performance_query_utils.go | 94 +++++++++---------- .../test/performancetest/transmitter.go | 1 - integration/test/sanity/sanity_test.go | 2 - integration/test/sanity/sanity_unix.go | 3 +- integration/test/sanity/sanity_windows.go | 3 +- integration/test/util.go | 1 + internal/atomiccounter/atomiccounter.go | 2 +- .../ecsservicediscovery/servicediscovery.go | 1 + .../targetsexportprocessor.go | 3 +- internal/httpclient/httpclient.go | 3 +- internal/k8sCommon/k8sclient/endpoint.go | 10 +- internal/k8sCommon/k8sclient/endpoint_test.go | 3 +- internal/k8sCommon/k8sclient/node_test.go | 1 - internal/k8sCommon/k8sclient/pod_test.go | 3 +- internal/k8sCommon/k8sclient/replicaset.go | 3 +- .../k8sCommon/k8sclient/replicaset_test.go | 1 - .../k8sCommon/kubeletutil/kubeletclient.go | 11 ++- .../kubeletutil/kubeletclient_test.go | 5 +- internal/models/awscsm_pipeline.go | 3 +- internal/structuredlogscommon/common_test.go | 3 +- internal/tls/config.go | 4 +- internal/util/security/unix_permission.go | 12 +-- internal/util/security/windows_permission.go | 4 +- internal/util/security/windows_sec.go | 1 + logger/lumberjack_const_test.go | 23 +++-- logs/logs.go | 3 +- logs/logs_test.go | 3 +- .../inputs/awscsm/aggregation_record_test.go | 1 - plugins/inputs/awscsm/awscsm_listener.go | 7 +- plugins/inputs/awscsm/samples_test.go | 3 +- plugins/inputs/cadvisor/cadvisor.go | 5 +- .../cadvisor/container_info_processor.go | 4 +- .../cadvisor/extractors/cpu_extractor.go | 3 +- .../cadvisor/extractors/cpu_extractor_test.go | 3 +- .../cadvisor/extractors/diskio_extractor.go | 3 +- .../extractors/diskio_extractor_test.go | 3 +- .../inputs/cadvisor/extractors/extractor.go | 3 +- .../cadvisor/extractors/extractor_test.go | 3 +- .../cadvisor/extractors/fs_extractor.go | 3 +- .../cadvisor/extractors/fs_extractor_test.go | 3 +- .../cadvisor/extractors/mem_extractor.go | 3 +- .../cadvisor/extractors/mem_extractor_test.go | 3 +- .../cadvisor/extractors/net_extractor.go | 3 +- .../cadvisor/extractors/net_extractor_test.go | 3 +- plugins/inputs/cadvisor/mesos/factory.go | 3 +- plugins/inputs/cadvisor/mesos/handler_test.go | 5 +- plugins/inputs/k8sapiserver/k8sapiserver.go | 5 +- .../inputs/k8sapiserver/k8sapiserver_test.go | 5 +- plugins/inputs/logfile/fileconfig.go | 6 +- plugins/inputs/logfile/globpath/globpath.go | 5 +- plugins/inputs/logfile/logfile.go | 10 +- plugins/inputs/logfile/logfile_test.go | 18 ++-- plugins/inputs/logfile/tail/tail.go | 5 +- plugins/inputs/logfile/tail/tail_test.go | 5 +- plugins/inputs/logfile/tailersrc.go | 6 +- plugins/inputs/logfile/tailersrc_test.go | 15 ++- plugins/inputs/logfile/tmpfile.go | 3 +- plugins/inputs/logfile/tmpfile_windows.go | 3 +- .../metric_type_handler_test.go | 3 +- .../prometheus_scraper/metrics_handler.go | 3 +- .../prometheus_scraper/metrics_receiver.go | 3 +- .../metrics_receiver_test.go | 1 - .../metrics_type_handler.go | 1 - .../prometheus_scraper/prometheus_scraper.go | 3 +- plugins/inputs/prometheus_scraper/start.go | 3 +- plugins/inputs/statsd/graphite/parser_test.go | 4 +- plugins/inputs/statsd/statsd.go | 7 +- plugins/inputs/statsd/statsd_test.go | 6 +- .../windows_event_log/windows_event_log.go | 5 +- .../windows_event_log/wineventlog/utils.go | 4 +- .../wineventlog/wineventlog.go | 9 +- plugins/outputs/awscsm/adapters.go | 2 +- plugins/outputs/awscsm/adapters_test.go | 1 + plugins/outputs/awscsm/awscsm.go | 8 +- plugins/outputs/awscsm/awscsm_test.go | 2 +- plugins/outputs/awscsm/csm_writer.go | 2 +- .../awscsm/providers/config_provider.go | 1 + .../awscsm/providers/config_provider_test.go | 2 +- .../awscsm/providers/dynamic_schema_test.go | 1 + .../awscsm/providers/event_key_type_test.go | 2 +- .../awscsm/providers/metric_type_test.go | 2 +- plugins/outputs/awscsm/record_ring.go | 4 +- plugins/outputs/awscsm/retry_rules.go | 1 + plugins/outputs/awscsm/retry_rules_test.go | 1 + plugins/outputs/cloudwatch/aggregator.go | 3 +- plugins/outputs/cloudwatch/aggregator_test.go | 5 +- plugins/outputs/cloudwatch/cloudwatch.go | 19 ++-- plugins/outputs/cloudwatch/cloudwatch_test.go | 3 +- plugins/outputs/cloudwatch/convert_otel.go | 12 +-- .../outputs/cloudwatch/convert_otel_test.go | 10 +- plugins/outputs/cloudwatch/util.go | 1 + plugins/outputs/cloudwatch/util_test.go | 3 +- .../outputs/cloudwatchlogs/cloudwatchlogs.go | 5 +- plugins/outputs/cloudwatchlogs/pusher.go | 3 +- plugins/parsers/emf/parser.go | 3 +- plugins/parsers/registry.go | 5 +- plugins/processors/ec2tagger/ec2tagger.go | 7 +- .../processors/ec2tagger/ec2tagger_test.go | 5 +- plugins/processors/ecsdecorator/cgroup.go | 3 +- .../processors/ecsdecorator/ecsdecorator.go | 5 +- .../ecsdecorator/ecsdecorator_test.go | 5 +- .../ecsdecorator/metricRule_test.go | 5 +- .../processors/emfProcessor/emfProcessor.go | 3 +- .../emfProcessor/emfProcessor_test.go | 3 +- .../emfProcessor/metricDefinition_test.go | 3 +- .../processors/k8sdecorator/k8sdecorator.go | 5 +- .../k8sdecorator/stores/nodeinfo_test.go | 3 +- .../k8sdecorator/stores/podstore.go | 5 +- .../k8sdecorator/stores/podstore_test.go | 8 +- .../k8sdecorator/stores/servicestore.go | 3 +- .../processors/k8sdecorator/stores/utils.go | 3 +- .../structuredlogsadapter/metricruletagger.go | 3 +- .../metricruletagger_test.go | 5 +- .../structuredlogsadapter/utils.go | 3 +- .../structuredlogsadapter/utils_test.go | 3 +- receiver/adapter/accumulator/accumulator.go | 6 +- .../adapter/accumulator/accumulator_test.go | 5 +- receiver/adapter/accumulator/metrics.go | 5 +- receiver/adapter/accumulator/metrics_test.go | 6 +- receiver/adapter/accumulator/testutil.go | 3 +- receiver/adapter/accumulator/util.go | 3 +- receiver/adapter/factory.go | 6 +- receiver/adapter/factory_test.go | 5 +- receiver/adapter/plugins_test.go | 5 +- receiver/adapter/receiver.go | 4 +- receiver/adapter/receiver_test.go | 6 +- tool/data/config/agent_test.go | 5 +- tool/data/config/logs/config_test.go | 4 +- tool/data/config/logs/eventConfig_test.go | 3 +- tool/data/config/logs/events_test.go | 4 +- tool/data/config/logs/files_test.go | 3 +- tool/data/config/logs_test.go | 4 +- .../metric/aggregationDimensions_test.go | 4 +- .../config/metric/appendDimensions_test.go | 4 +- .../config/metric/collectd/collectd_test.go | 4 +- tool/data/config/metric/collection_test.go | 5 +- tool/data/config/metric/linux/cpu_test.go | 4 +- tool/data/config/metric/linux/disk_test.go | 4 +- tool/data/config/metric/linux/diskio_test.go | 4 +- tool/data/config/metric/linux/memory_test.go | 4 +- tool/data/config/metric/linux/net_test.go | 4 +- tool/data/config/metric/linux/netstat_test.go | 4 +- tool/data/config/metric/linux/swap_test.go | 4 +- tool/data/config/metric/statsd/statsd_test.go | 4 +- .../config/metric/windows/logicalDisk_test.go | 4 +- .../data/config/metric/windows/memory_test.go | 4 +- .../metric/windows/networkInterface_test.go | 4 +- .../config/metric/windows/pagingFile_test.go | 4 +- .../metric/windows/physicalDisk_test.go | 4 +- .../config/metric/windows/processor_test.go | 4 +- tool/data/config/metric/windows/tcpv4_test.go | 4 +- tool/data/config/metric/windows/tcpv6_test.go | 4 +- tool/data/config/metrics_test.go | 5 +- tool/data/config_test.go | 4 +- .../agentconfig/agentConfig_test.go | 4 +- tool/processors/basicInfo/basicInfo.go | 3 +- tool/processors/basicInfo/basicInfo_test.go | 7 +- tool/processors/collectd/collectd_test.go | 10 +- .../processors/defaultConfig/defaultConfig.go | 1 - .../defaultConfig/defaultConfig_test.go | 11 +-- .../migration/linux/knownConfigKeys.go | 5 +- .../migration/linux/linuxMigration.go | 4 +- .../migration/linux/linuxMigration_test.go | 21 ++--- tool/processors/migration/migration_test.go | 7 +- .../migration/windows/windows_migration.go | 4 +- .../windows/windows_migration_core.go | 5 +- .../windows/windows_migration_test.go | 3 +- .../migration/windows/windows_util.go | 8 +- .../processors/question/events/events_test.go | 6 +- tool/processors/question/logs/logs.go | 1 - tool/processors/question/logs/logs_test.go | 6 +- .../question/metrics/metrics_test.go | 11 +-- tool/processors/question/question_test.go | 4 +- .../serialization/serialization_test.go | 4 +- tool/processors/ssm/ssm.go | 15 ++- tool/processors/ssm/ssm_test.go | 5 +- tool/processors/statsd/statsd_test.go | 4 +- tool/util/util.go | 20 ++-- tool/util/util_test.go | 12 +-- translator/cmdutil/translatorutil.go | 10 +- translator/cmdutil/userutil.go | 2 +- translator/cmdutil/userutil_linux_test.go | 3 +- translator/cmdutil/userutil_test.go | 3 +- translator/config/mode.go | 2 +- translator/config/schema_test.go | 4 +- translator/jsonconfig/mergeJsonConfig.go | 3 +- translator/jsonconfig/mergeJsonConfig_test.go | 8 +- translator/registerrules/register_rules.go | 1 + translator/tocwconfig/tocwconfig_test.go | 26 +++-- .../translate/awscontainerinsightreceiver.go | 6 +- .../awscontainerinsightreceiver_test.go | 3 +- .../tocwconfig/toyamlconfig/toyamlconfig.go | 7 +- translator/totomlconfig/toTomlConfig_test.go | 18 ++-- translator/translate/agent/agent_test.go | 9 +- .../translate/agent/ruleCommonCreds_test.go | 3 +- .../agent/ruleGlobalCredentials_test.go | 3 +- translator/translate/csm/csm_test.go | 5 +- .../translate/csm/ruleEndpointOverride.go | 3 +- .../files/collect_list/collect_list.go | 4 +- .../files/collect_list/collect_list_test.go | 9 +- .../files/collect_list/ruleEncoding.go | 4 +- .../files/collect_list/ruleLogFilters_test.go | 3 +- .../collect_list/collectlist_test.go | 4 +- .../windows_events/windows_event_test.go | 4 +- translator/translate/logs/logs_test.go | 5 +- .../k8sdecorator/ruleClusterName.go | 1 + .../kubernetes/kubernetes.go | 2 +- .../dockerlabel/dockerlabel.go | 1 - .../ecsServiceDiscovery.go | 1 - .../serviceendpoint/serviceendpoint.go | 1 - .../taskdefinition/taskdefinition.go | 1 - .../prometheus/ruleConfigPath.go | 3 +- .../translate/logs/ruleLogCredentials_test.go | 3 +- .../logs/util/get_eks_cluster_name.go | 1 + .../append_dimensions/ruleCreds_test.go | 3 +- .../metric_decoration_test.go | 3 +- translator/translate/metrics/metrics_test.go | 3 +- .../rollupDimensions_test.go | 4 +- .../metrics/ruleMetricCredentials_test.go | 3 +- translator/translate/util/credsutil_test.go | 3 +- translator/util/collections_test.go | 3 +- translator/util/config_util.go | 4 +- translator/util/ec2util/ec2util.go | 3 +- translator/util/httpclient/httpclient.go | 4 +- translator/util/ioutil.go | 4 +- translator/util/sdkutil.go | 1 + 251 files changed, 679 insertions(+), 675 deletions(-) diff --git a/Makefile b/Makefile index 27ba5a42f1..f25cb243e5 100644 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ DARWIN_BUILD = GO111MODULE=on GOOS=darwin GOARCH=amd64 go build -ldflags="${LDFL IMAGE = amazon/cloudwatch-agent:$(VERSION) DOCKER_BUILD_FROM_SOURCE = docker build -t $(IMAGE) -f ./amazon-cloudwatch-container-insights/cloudwatch-agent-dockerfile/source/Dockerfile -CW_AGENT_IMPORT_PATH=https://github.com/aws/private-amazon-cloudwatch-agent-staging.git +CW_AGENT_IMPORT_PATH=github.com/aws/private-amazon-cloudwatch-agent-staging ALL_SRC := $(shell find . -name '*.go' -type f | sort) TOOLS_BIN_DIR := $(abspath ./build/tools) @@ -35,6 +35,7 @@ GOIMPORTS_OPT?= -w -local $(CW_AGENT_IMPORT_PATH) GOIMPORTS = $(TOOLS_BIN_DIR)/goimports SHFMT = $(TOOLS_BIN_DIR)/shfmt LINTER = $(TOOLS_BIN_DIR)/golangci-lint +IMPI = $(TOOLS_BIN_DIR)/impi release: clean test build package-rpm package-deb package-win package-darwin nightly-release: release @@ -106,6 +107,7 @@ build-for-docker-arm64: install-tools: GOBIN=$(TOOLS_BIN_DIR) go install golang.org/x/tools/cmd/goimports GOBIN=$(TOOLS_BIN_DIR) go install mvdan.cc/sh/v3/cmd/shfmt@latest + GOBIN=$(TOOLS_BIN_DIR) go install github.com/pavius/impi/cmd/impi@v0.0.3 curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) v1.45.2 fmt: install-tools @@ -115,6 +117,10 @@ fmt: install-tools fmt-sh: install-tools ${SHFMT} -w -d -i 5 . +impi: install-tools + # Skip plugins/plugins.go + echo $(ALL_SRC) | xargs -n 10 ${IMPI} --local $(CW_AGENT_IMPORT_PATH) --scheme stdThirdPartyLocal --skip plugins/plugins.go + lint: install-tools ${LINTER} run ./... diff --git a/awscsm/csm/csmiface/interface.go b/awscsm/csm/csmiface/interface.go index 0461460803..554bd5a407 100644 --- a/awscsm/csm/csmiface/interface.go +++ b/awscsm/csm/csmiface/interface.go @@ -14,6 +14,7 @@ package csmiface import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) diff --git a/awscsm/csm/customizations_test.go b/awscsm/csm/customizations_test.go index 9be0930b23..ca3f83fa02 100644 --- a/awscsm/csm/customizations_test.go +++ b/awscsm/csm/customizations_test.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/awstesting/unit" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) diff --git a/awscsm/sdkmetricsdataplane/customizations_test.go b/awscsm/sdkmetricsdataplane/customizations_test.go index 5cc00148f5..2b96faeb1a 100644 --- a/awscsm/sdkmetricsdataplane/customizations_test.go +++ b/awscsm/sdkmetricsdataplane/customizations_test.go @@ -15,6 +15,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/awstesting/unit" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) diff --git a/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go b/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go index 54130d1ace..ab003b5e00 100644 --- a/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go +++ b/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface/interface.go @@ -14,6 +14,7 @@ package sdkmetricsdataplaneiface import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) diff --git a/cfg/agentinfo/info.go b/cfg/agentinfo/info.go index 8b1b138fb1..b5e85dfc18 100644 --- a/cfg/agentinfo/info.go +++ b/cfg/agentinfo/info.go @@ -5,7 +5,6 @@ package agentinfo import ( "fmt" - "io/ioutil" "os" "path/filepath" "regexp" @@ -95,7 +94,7 @@ func readVersionFile() (string, error) { return "", fmt.Errorf("the agent version file %s does not exist: %v", versionFilePath, err) } - byteArray, err := ioutil.ReadFile(versionFilePath) + byteArray, err := os.ReadFile(versionFilePath) if err != nil { return "", fmt.Errorf("issue encountered when reading content from file %s: %v", versionFilePath, err) } diff --git a/cfg/agentinfo/info_test.go b/cfg/agentinfo/info_test.go index 95c25ee401..10e40dca5a 100644 --- a/cfg/agentinfo/info_test.go +++ b/cfg/agentinfo/info_test.go @@ -5,15 +5,15 @@ package agentinfo import ( "fmt" - "io/ioutil" "os" "path/filepath" "runtime" "strings" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" ) func TestVersionUseInjectedIfAvailable(t *testing.T) { @@ -44,7 +44,7 @@ func TestReadVersionFile(t *testing.T) { vfp := filepath.Join(filepath.Dir(ex), versionFilename) expectedVersion := "TEST_VERSION" - if err = ioutil.WriteFile(vfp, []byte(expectedVersion), 0644); err != nil { + if err = os.WriteFile(vfp, []byte(expectedVersion), 0644); err != nil { t.Fatalf("failed to write version file at %v: %v", vfp, err) } defer os.Remove(vfp) diff --git a/cfg/aws/refreshable_shared_credentials_provider_test.go b/cfg/aws/refreshable_shared_credentials_provider_test.go index e63f12e4b0..1580a1f48d 100644 --- a/cfg/aws/refreshable_shared_credentials_provider_test.go +++ b/cfg/aws/refreshable_shared_credentials_provider_test.go @@ -4,7 +4,6 @@ package aws import ( - "io/ioutil" "os" "testing" "time" @@ -13,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" ) -func TestSharedCrednetialsProviderExpiryWindowIsExpired(t *testing.T) { - tmpFile, _ := ioutil.TempFile(os.TempDir(), "credential") +func TestSharedCredentialsProviderExpiryWindowIsExpired(t *testing.T) { + tmpFile, _ := os.CreateTemp(os.TempDir(), "credential") defer os.Remove(tmpFile.Name()) - bytes, _ := ioutil.ReadFile("./testdata/credential_original") - ioutil.WriteFile(tmpFile.Name(), bytes, 0644) + bytes, _ := os.ReadFile("./testdata/credential_original") + os.WriteFile(tmpFile.Name(), bytes, 0644) p := credentials.NewCredentials(&Refreshable_shared_credentials_provider{ sharedCredentialsProvider: &credentials.SharedCredentialsProvider{ Filename: tmpFile.Name(), @@ -31,8 +30,8 @@ func TestSharedCrednetialsProviderExpiryWindowIsExpired(t *testing.T) { assert.False(t, p.IsExpired(), "Expect creds not to be expired.") - bytes_rotate, _ := ioutil.ReadFile("./testdata/credential_rotate") - ioutil.WriteFile(tmpFile.Name(), bytes_rotate, 0644) + bytes_rotate, _ := os.ReadFile("./testdata/credential_rotate") + os.WriteFile(tmpFile.Name(), bytes_rotate, 0644) time.Sleep(2 * time.Second) diff --git a/cfg/migrate/confmigrate.go b/cfg/migrate/confmigrate.go index 2031d2a7f9..153be21659 100644 --- a/cfg/migrate/confmigrate.go +++ b/cfg/migrate/confmigrate.go @@ -2,7 +2,7 @@ package migrate import ( "fmt" - "io/ioutil" + "os" "path/filepath" "github.com/BurntSushi/toml" @@ -17,7 +17,7 @@ func AddRule(rule Rule) { } func IsOldConfig(path string) (bool, error) { - cf, err := ioutil.ReadFile(path) + cf, err := os.ReadFile(path) if err != nil { return false, err } @@ -40,7 +40,7 @@ func IsOldConfig(path string) (bool, error) { } func MigrateFile(path string) (string, error) { - cf, err := ioutil.ReadFile(path) + cf, err := os.ReadFile(path) if err != nil { return "", err } @@ -51,7 +51,7 @@ func MigrateFile(path string) (string, error) { } dir, _ := filepath.Split(path) - of, err := ioutil.TempFile(dir, "migrated-*.conf") + of, err := os.CreateTemp(dir, "migrated-*.conf") if err != nil { return "", fmt.Errorf("failed to create temporary migrated config file: %v", err) } diff --git a/cfg/migrate/confmigrate_test.go b/cfg/migrate/confmigrate_test.go index ca5054ef1f..7b348b9d25 100644 --- a/cfg/migrate/confmigrate_test.go +++ b/cfg/migrate/confmigrate_test.go @@ -3,7 +3,6 @@ package migrate import ( "bytes" "fmt" - "io/ioutil" "os" "path/filepath" "reflect" @@ -13,7 +12,7 @@ import ( ) func getTests() ([]string, error) { - files, err := ioutil.ReadDir("new/") + files, err := os.ReadDir("new/") if err != nil { return nil, fmt.Errorf("unable to list test case dir: %v", err) } @@ -72,7 +71,7 @@ func TestMigrateFile(t *testing.T) { continue } - mcb, err := ioutil.ReadFile(mf) + mcb, err := os.ReadFile(mf) if err != nil { t.Errorf("Failed to read test file '%v' from old folder: %v", test, err) continue @@ -84,7 +83,7 @@ func TestMigrateFile(t *testing.T) { continue } - ncb, err := ioutil.ReadFile(fmt.Sprintf("new/%v", test)) + ncb, err := os.ReadFile(fmt.Sprintf("new/%v", test)) if err != nil { t.Errorf("Failed to read test file '%v' from new folder: %v", test, err) continue @@ -115,7 +114,7 @@ func TestMigrateConfigs(t *testing.T) { } for _, test := range tests { - ocb, err := ioutil.ReadFile(fmt.Sprintf("old/%v", test)) + ocb, err := os.ReadFile(fmt.Sprintf("old/%v", test)) if err != nil { t.Fatalf("Failed to read test file '%v' from old folder: %v", test, err) } @@ -125,7 +124,7 @@ func TestMigrateConfigs(t *testing.T) { t.Fatalf("Failed to unmarshal old test file '%v': %v", test, err) } - ncb, err := ioutil.ReadFile(fmt.Sprintf("new/%v", test)) + ncb, err := os.ReadFile(fmt.Sprintf("new/%v", test)) if err != nil { t.Fatalf("Failed to read test file '%v' from new folder: %v", test, err) } diff --git a/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go b/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go index b45b2b167a..01df1e89d3 100644 --- a/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go +++ b/cmd/amazon-cloudwatch-agent-config-wizard/wizard_test.go @@ -7,6 +7,9 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/basicInfo" @@ -17,9 +20,6 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/statsd" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/template" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" ) type MainProcessorMock struct { diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 73aa863fe9..628c0f05b6 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -9,15 +9,6 @@ import ( "errors" "flag" "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent/internal" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" - "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" - "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" - "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" - "go.opentelemetry.io/collector/confmap" - "go.opentelemetry.io/collector/confmap/provider/fileprovider" - "go.opentelemetry.io/collector/exporter/loggingexporter" - "io/ioutil" "log" "net/http" _ "net/http/pprof" // Comment this line to disable pprof endpoint. @@ -30,26 +21,31 @@ import ( "syscall" "time" - configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" - "github.com/influxdata/wlog" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/migrate" - "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" - "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - - _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins" - "github.com/influxdata/telegraf/config" - "github.com/influxdata/telegraf/agent" + "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/logger" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/wlog" "github.com/kardianos/service" - + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/confmap/provider/fileprovider" + "go.opentelemetry.io/collector/exporter/loggingexporter" otelService "go.opentelemetry.io/collector/service" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/envconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/migrate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cmd/amazon-cloudwatch-agent/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + _ "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" ) const ( @@ -200,7 +196,7 @@ func loadEnvironmentVariables(path string) error { return fmt.Errorf("No env config file specified") } - bytes, err := ioutil.ReadFile(path) + bytes, err := os.ReadFile(path) if err != nil { return fmt.Errorf("Can't read env config file %s due to: %s", path, err.Error()) } @@ -549,7 +545,7 @@ func main() { if *fEnvConfig != "" { parts := strings.SplitN(*fSetEnv, "=", 2) if len(parts) == 2 { - bytes, err := ioutil.ReadFile(*fEnvConfig) + bytes, err := os.ReadFile(*fEnvConfig) if err != nil { log.Fatalf("E! Failed to read env config: %v", err) } @@ -560,7 +556,7 @@ func main() { } envVars[parts[0]] = parts[1] bytes, err = json.MarshalIndent(envVars, "", "\t") - if err = ioutil.WriteFile(*fEnvConfig, bytes, 0644); err != nil { + if err = os.WriteFile(*fEnvConfig, bytes, 0644); err != nil { log.Fatalf("E! Failed to update env config: %v", err) } } diff --git a/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go b/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go index 8565b80c51..17b5a49f07 100644 --- a/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go +++ b/cmd/amazon-cloudwatch-agent/register_event_logger_windows.go @@ -7,8 +7,9 @@ package main import ( - lumberjack "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" "github.com/influxdata/telegraf/logger" + + lumberjack "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" ) // RegisterEventLogger is for supporting Windows Event diff --git a/cmd/config-downloader/downloader.go b/cmd/config-downloader/downloader.go index 8309c68b02..7ba3d874db 100644 --- a/cmd/config-downloader/downloader.go +++ b/cmd/config-downloader/downloader.go @@ -5,27 +5,23 @@ package main import ( "flag" - "io/ioutil" + "fmt" "log" "os" + "path/filepath" "strings" + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/aws/credentials" + "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/aws-sdk-go/service/ssm" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" sdkutil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "fmt" - - "path/filepath" - - commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/ssm" ) const ( @@ -82,7 +78,7 @@ func downloadFromSSM(region, parameterStoreName, mode string, credsConfig map[st } func readFromFile(filePath string) (string, error) { - bytes, err := ioutil.ReadFile(filePath) + bytes, err := os.ReadFile(filePath) return string(bytes), err } @@ -216,7 +212,7 @@ func main() { if multiConfig != "remove" { outputFilePath = filepath.Join(outputDir, outputFilePath+context.TmpFileSuffix) - err = ioutil.WriteFile(outputFilePath, []byte(config), 0644) + err = os.WriteFile(outputFilePath, []byte(config), 0644) if err != nil { log.Panicf("E! Failed to write the json file %v: %v", outputFilePath, err) } else { diff --git a/cmd/config-translator/translator_test.go b/cmd/config-translator/translator_test.go index 36d997a429..adc81a1151 100644 --- a/cmd/config-translator/translator_test.go +++ b/cmd/config-translator/translator_test.go @@ -4,15 +4,14 @@ package main import ( - "io/ioutil" + "os" "regexp" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "github.com/stretchr/testify/assert" ) func checkIfSchemaValidateAsExpected(t *testing.T, jsonInputPath string, shouldSuccess bool, expectedErrorMap map[string]int) { @@ -180,7 +179,7 @@ func TestInvalidLogFilterConfig(t *testing.T) { // Validate all sampleConfig files schema func TestSampleConfigSchema(t *testing.T) { - if files, err := ioutil.ReadDir("../../translator/tocwconfig/sampleConfig/"); err == nil { + if files, err := os.ReadDir("../../translator/tocwconfig/sampleConfig/"); err == nil { re := regexp.MustCompile(".json") for _, file := range files { if re.MatchString(file.Name()) { diff --git a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go index 1cabc1afdb..6210b3ea37 100644 --- a/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go +++ b/cmd/start-amazon-cloudwatch-agent/start-amazon-cloudwatch-agent.go @@ -5,14 +5,14 @@ package main import ( "io" - "io/ioutil" "log" "os" "os/exec" "syscall" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "gopkg.in/natefinch/lumberjack.v2" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) const ( @@ -117,7 +117,7 @@ func printFileContents(path string) { } }() - b, err := ioutil.ReadAll(file) + b, err := io.ReadAll(file) if err != nil { log.Printf("E! Error when reading file(%s), Error is %v \n", path, err) } diff --git a/handlers/compress.go b/handlers/compress.go index 9de40a747e..8fa737c50b 100644 --- a/handlers/compress.go +++ b/handlers/compress.go @@ -8,7 +8,6 @@ import ( "compress/gzip" "fmt" "io" - "io/ioutil" "log" "sync" @@ -17,7 +16,7 @@ import ( var gzipPool = sync.Pool{ New: func() interface{} { - return gzip.NewWriter(ioutil.Discard) + return gzip.NewWriter(io.Discard) }, } diff --git a/integration/generator/test_case_generator.go b/integration/generator/test_case_generator.go index 404d5daa39..0fd48c83c3 100644 --- a/integration/generator/test_case_generator.go +++ b/integration/generator/test_case_generator.go @@ -6,7 +6,7 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" + "io" "log" "os" ) @@ -28,7 +28,7 @@ var osToTestDirMap = map[string][]string{ "./integration/test/cloudwatchlogs", "./integration/test/metrics_number_dimension", }, - "ec2_performance":{ + "ec2_performance": { "./integration/test/performancetest", }, // @TODO add real tests @@ -53,7 +53,7 @@ func genMatrix(targetOS string, testDirList []string) []map[string]string { log.Panicf("can't read file %v_test_matrix.json err %v", targetOS, err) } - byteValueTestMatrix, _ := ioutil.ReadAll(openTestMatrix) + byteValueTestMatrix, _ := io.ReadAll(openTestMatrix) _ = openTestMatrix.Close() var testMatrix []map[string]string @@ -78,7 +78,7 @@ func writeTestMatrixFile(targetOS string, testMatrix []map[string]string) { if err != nil { log.Panicf("Can't marshal json for target os %v, err %v", targetOS, err) } - err = ioutil.WriteFile(fmt.Sprintf("integration/generator/resources/%v_complete_test_matrix.json", targetOS), bytes, os.ModePerm) + err = os.WriteFile(fmt.Sprintf("integration/generator/resources/%v_complete_test_matrix.json", targetOS), bytes, os.ModePerm) if err != nil { log.Panicf("Can't write json to file for target os %v, err %v", targetOS, err) } diff --git a/integration/test/agent_util_linux.go b/integration/test/agent_util_linux.go index 51bfe6ec69..1755eb5b2b 100644 --- a/integration/test/agent_util_linux.go +++ b/integration/test/agent_util_linux.go @@ -72,7 +72,7 @@ func ReadAgentOutput(d time.Duration) string { return string(out) } -func RunShellScript(path string, args ...string) error{ +func RunShellScript(path string, args ...string) error { out, err := exec.Command("bash", "-c", "chmod +x "+path).Output() if err != nil { @@ -90,7 +90,7 @@ func RunShellScript(path string, args ...string) error{ log.Printf("Error occurred when executing %s: %s | %s", path, err.Error(), string(out)) return err } - + return nil } diff --git a/integration/test/agent_util_windows.go b/integration/test/agent_util_windows.go index 4cc5053559..328b20c3c1 100644 --- a/integration/test/agent_util_windows.go +++ b/integration/test/agent_util_windows.go @@ -7,19 +7,19 @@ package test import ( - "os/exec" - "log" "fmt" + "log" + "os/exec" "path/filepath" ) -func CopyFile(pathIn string, pathOut string) error{ +func CopyFile(pathIn string, pathOut string) error { ps, err := exec.LookPath("powershell.exe") - + if err != nil { return err } - + log.Printf("Copy File %s to %s", pathIn, pathOut) pathInAbs, err := filepath.Abs(pathIn) @@ -28,17 +28,17 @@ func CopyFile(pathIn string, pathOut string) error{ } log.Printf("File %s abs path %s", pathIn, pathInAbs) - bashArgs := append([]string{"-NoProfile", "-NonInteractive", "-NoExit", "cp "+pathInAbs+" "+pathOut}) - out, err := exec.Command(ps, bashArgs...).Output() + bashArgs := append([]string{"-NoProfile", "-NonInteractive", "-NoExit", "cp " + pathInAbs + " " + pathOut}) + out, err := exec.Command(ps, bashArgs...).Output() if err != nil { - log.Printf("Copy file failed: %v; the output is: %s",err, string(out)) + log.Printf("Copy file failed: %v; the output is: %s", err, string(out)) return err } log.Printf("File : %s copied to : %s", pathIn, pathOut) return nil - + } func StartAgent(configOutputPath string, fatalOnFailure bool) error { @@ -48,11 +48,11 @@ func StartAgent(configOutputPath string, fatalOnFailure bool) error { return err } - bashArgs := append([]string{"-NoProfile", "-NonInteractive", "-NoExit", "& \"C:\\Program Files\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent-ctl.ps1\" -a fetch-config -m ec2 -s -c file:"+configOutputPath}) + bashArgs := append([]string{"-NoProfile", "-NonInteractive", "-NoExit", "& \"C:\\Program Files\\Amazon\\AmazonCloudWatchAgent\\amazon-cloudwatch-agent-ctl.ps1\" -a fetch-config -m ec2 -s -c file:" + configOutputPath}) out, err := exec.Command(ps, bashArgs...).Output() if err != nil && fatalOnFailure { - log.Printf("Start agent failed: %v; the output is: %s",err, string(out)) + log.Printf("Start agent failed: %v; the output is: %s", err, string(out)) return err } else if err != nil { log.Printf(fmt.Sprint(err) + string(out)) @@ -63,7 +63,7 @@ func StartAgent(configOutputPath string, fatalOnFailure bool) error { return err } -func StopAgent() error{ +func StopAgent() error { ps, err := exec.LookPath("powershell.exe") if err != nil { @@ -74,7 +74,7 @@ func StopAgent() error{ out, err := exec.Command(ps, bashArgs...).Output() if err != nil { - log.Printf("Stop agent failed: %v; the output is: %s",err, string(out)) + log.Printf("Stop agent failed: %v; the output is: %s", err, string(out)) return err } @@ -82,7 +82,7 @@ func StopAgent() error{ return nil } -func RunShellScript(path string, args ...string) error{ +func RunShellScript(path string, args ...string) error { ps, err := exec.LookPath("powershell.exe") if err != nil { @@ -98,4 +98,4 @@ func RunShellScript(path string, args ...string) error{ } return nil -} \ No newline at end of file +} diff --git a/integration/test/cloudwatchlogs/publish_logs_test.go b/integration/test/cloudwatchlogs/publish_logs_test.go index e03393c09f..20ca116206 100644 --- a/integration/test/cloudwatchlogs/publish_logs_test.go +++ b/integration/test/cloudwatchlogs/publish_logs_test.go @@ -11,11 +11,10 @@ import ( "log" "os" "strings" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" - "testing" "time" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) const ( diff --git a/integration/test/cwm_util.go b/integration/test/cwm_util.go index 4d977a9a2a..f364812ed0 100644 --- a/integration/test/cwm_util.go +++ b/integration/test/cwm_util.go @@ -9,11 +9,12 @@ package test import ( "context" "fmt" + "testing" + "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" "github.com/aws/aws-sdk-go/aws" - "testing" ) var ( @@ -97,4 +98,4 @@ func BuildDimensionFilterList(appendDimension int) []types.DimensionFilter { Value: aws.String(ec2InstanceId), } return dimensionFilter -} \ No newline at end of file +} diff --git a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go index 6522f1717a..63bf3ff1f0 100644 --- a/integration/test/metrics_number_dimension/metrics_number_dimension_test.go +++ b/integration/test/metrics_number_dimension/metrics_number_dimension_test.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" cwPlugin "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" ) diff --git a/integration/test/nvidia_gpu/metrics_nvidia_gpu_linux_test.go b/integration/test/nvidia_gpu/metrics_nvidia_gpu_linux_test.go index 448c1f9438..4d754b156f 100644 --- a/integration/test/nvidia_gpu/metrics_nvidia_gpu_linux_test.go +++ b/integration/test/nvidia_gpu/metrics_nvidia_gpu_linux_test.go @@ -7,10 +7,11 @@ package metrics_nvidia_gpu import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/security" "testing" "time" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/security" ) const ( diff --git a/integration/test/nvidia_gpu/metrics_nvidia_gpu_window_test.go b/integration/test/nvidia_gpu/metrics_nvidia_gpu_window_test.go index a5ff3998fe..876a0332c1 100644 --- a/integration/test/nvidia_gpu/metrics_nvidia_gpu_window_test.go +++ b/integration/test/nvidia_gpu/metrics_nvidia_gpu_window_test.go @@ -7,10 +7,11 @@ package metrics_nvidia_gpu import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/security" "testing" "time" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/security" ) const ( diff --git a/integration/test/performancetest/performance_query_utils.go b/integration/test/performancetest/performance_query_utils.go index 05a5475c7c..6adf1ac87b 100644 --- a/integration/test/performancetest/performance_query_utils.go +++ b/integration/test/performancetest/performance_query_utils.go @@ -5,43 +5,42 @@ import ( "encoding/json" "errors" "fmt" + "log" + "math" "os" + "sort" "strconv" "time" - "sort" - "math" - "log" "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/service/cloudwatch" "github.com/aws/aws-sdk-go-v2/service/cloudwatch/types" - "github.com/google/uuid" ) const ( - Namespace = "CWAgent" - DimensionName = "InstanceId" - Stat = "Average" - Period = 10 - METRIC_PERIOD = 5 * 60 // this const is in seconds , 5 mins - PARTITION_KEY ="Year" - HASH = "Hash" - COMMIT_DATE= "CommitDate" - SHA_ENV = "SHA" - RELEASE_NAME_ENV = "RELEASE_NAME" - SHA_DATE_ENV = "SHA_DATE" - IS_RELEASE = "isRelease" - TEST_ID ="TestID" - TPS = "TPS" + Namespace = "CWAgent" + DimensionName = "InstanceId" + Stat = "Average" + Period = 10 + METRIC_PERIOD = 5 * 60 // this const is in seconds , 5 mins + PARTITION_KEY = "Year" + HASH = "Hash" + COMMIT_DATE = "CommitDate" + SHA_ENV = "SHA" + RELEASE_NAME_ENV = "RELEASE_NAME" + SHA_DATE_ENV = "SHA_DATE" + IS_RELEASE = "isRelease" + TEST_ID = "TestID" + TPS = "TPS" PERFORMANCE_NUMBER_OF_LOGS = "PERFORMANCE_NUMBER_OF_LOGS" - RESULTS = "Results" + RESULTS = "Results" /* - TEST_ID is used for version control, in order to make sure the - item has not changed between item being editted and updated. - TEST_ID is checked atomicaly. - TEST_ID uses UIUD to give unique id to each packet. + TEST_ID is used for version control, in order to make sure the + item has not changed between item being editted and updated. + TEST_ID is checked atomicaly. + TEST_ID uses UIUD to give unique id to each packet. */ ) @@ -52,14 +51,14 @@ type Stats struct { Max float64 Min float64 Period int //in seconds - Std float64 + Std float64 Data []float64 } /* - * GetConfigMetrics parses the cloudwatch agent config and returns the associated + * GetConfigMetrics parses the cloudwatch agent config and returns the associated * metrics that the cloudwatch agent is measuring on itself -*/ + */ func GetConfigMetrics(configPath string) ([]string, []string, error) { //get metric measurements from config file file, err := os.ReadFile(configPath) @@ -75,7 +74,7 @@ func GetConfigMetrics(configPath string) ([]string, []string, error) { //go through the config json to get to the procstat metrics procstatList := cfgFileData["metrics"].(map[string]interface{})["metrics_collected"].(map[string]interface{})["procstat"].([]interface{}) - + //within procstat metrics, find cloudwatch-agent process cloudwatchIndex := -1 for i, process := range procstatList { @@ -85,7 +84,7 @@ func GetConfigMetrics(configPath string) ([]string, []string, error) { } //check to see if the process was not found - if cloudwatchIndex == -1 { + if cloudwatchIndex == -1 { return nil, nil, errors.New("cloudwatch-agent process not found in cloudwatch agent config") } @@ -97,7 +96,7 @@ func GetConfigMetrics(configPath string) ([]string, []string, error) { ids := make([]string, len(metricList)) for i, metricName := range metricList { metricNames[i] = "procstat_" + metricName.(string) - ids[i] = fmt.Sprint("m", i + 1) + ids[i] = fmt.Sprint("m", i+1) } return metricNames, ids, nil @@ -108,23 +107,23 @@ func GenerateGetMetricInputStruct(ids, metricNames []string, instanceId string, if len(ids) != len(metricNames) { return nil, errors.New("Mismatching lengths of metric ids and metricNames") } - + if len(ids) == 0 || len(metricNames) == 0 || instanceId == "" || timeDiff == 0 { return nil, errors.New("Must supply metric ids, metric names, instance id, and time to collect metrics") } dimensionValue := instanceId metricDataQueries := []types.MetricDataQuery{} - + //generate list of individual metric requests for i, id := range ids { metricDataQueries = append(metricDataQueries, ConstructMetricDataQuery(id, Namespace, DimensionName, dimensionValue, metricNames[i], timeDiff)) } - + timeNow := time.Now() input := &cloudwatch.GetMetricDataInput{ - EndTime: aws.Time(time.Unix(timeNow.Unix(), 0)), - StartTime: aws.Time(time.Unix(timeNow.Add(time.Duration(-timeDiff)*time.Minute).Unix(), 0)), + EndTime: aws.Time(time.Unix(timeNow.Unix(), 0)), + StartTime: aws.Time(time.Unix(timeNow.Add(time.Duration(-timeDiff)*time.Minute).Unix(), 0)), MetricDataQueries: metricDataQueries, } @@ -132,7 +131,7 @@ func GenerateGetMetricInputStruct(ids, metricNames []string, instanceId string, } // ConstructMetricDataQuery is a helper function for GenerateGetMetricInputStruct and constructs individual metric requests -func ConstructMetricDataQuery(id, namespace, dimensionName, dimensionValue, metricName string, timeDiff int) (types.MetricDataQuery) { +func ConstructMetricDataQuery(id, namespace, dimensionName, dimensionValue, metricName string, timeDiff int) types.MetricDataQuery { query := types.MetricDataQuery{ Id: aws.String(id), MetricStat: &types.MetricStat{ @@ -181,7 +180,7 @@ func GetPerformanceMetrics(instanceId string, agentRuntime, logNum, tps int, age if err != nil { return nil, err } - + log.Println("Data successfully received from CloudWatch API") //craft packet to be sent to database @@ -189,46 +188,45 @@ func GetPerformanceMetrics(instanceId string, agentRuntime, logNum, tps int, age //add information about current release/commit packet[PARTITION_KEY] = time.Now().Year() packet[HASH] = os.Getenv(SHA_ENV) //fmt.Sprintf("%d", time.Now().UnixNano()) - packet[COMMIT_DATE],_ = strconv.Atoi(os.Getenv(SHA_DATE_ENV)) + packet[COMMIT_DATE], _ = strconv.Atoi(os.Getenv(SHA_DATE_ENV)) packet[IS_RELEASE] = false //add test metadata packet[TEST_ID] = uuid.New().String() - testSettings := fmt.Sprintf("%d-%d",logNum,tps) + testSettings := fmt.Sprintf("%d-%d", logNum, tps) testMetricResults := make(map[string]Stats) - //add actual test data with statistics for _, result := range metrics.MetricDataResults { //convert memory bytes to MB - if (*result.Label == "procstat_memory_rss") { - for i, val := range(result.Values) { + if *result.Label == "procstat_memory_rss" { + for i, val := range result.Values { result.Values[i] = val / (1000000) } } - stats:= CalcStats(result.Values) + stats := CalcStats(result.Values) testMetricResults[*result.Label] = stats } - packet[RESULTS] = map[string]map[string]Stats{ testSettings: testMetricResults} + packet[RESULTS] = map[string]map[string]Stats{testSettings: testMetricResults} return packet, nil } /* CalcStats takes in an array of data and returns the average, min, max, p99, and stdev of the data in a Stats struct * statistics are calculated this way instead of using GetMetricStatistics API because GetMetricStatistics would require multiple * API calls as only one metric can be requested/processed at a time whereas all metrics can be requested in one GetMetricData request. -*/ + */ func CalcStats(data []float64) Stats { length := len(data) if length == 0 { return Stats{} } - //make a copy so we aren't modifying original - keeps original data in order of the time + //make a copy so we aren't modifying original - keeps original data in order of the time dataCopy := make([]float64, length) copy(dataCopy, data) sort.Float64s(dataCopy) min := dataCopy[0] - max := dataCopy[length - 1] + max := dataCopy[length-1] sum := 0.0 for _, value := range dataCopy { @@ -240,12 +238,12 @@ func CalcStats(data []float64) Stats { if length < 99 { log.Println("Note: less than 99 values given, p99 value will be equal the max value") } - p99Index := int(float64(length) * .99) - 1 + p99Index := int(float64(length)*.99) - 1 p99Val := dataCopy[p99Index] stdDevSum := 0.0 for _, value := range dataCopy { - stdDevSum += math.Pow(avg - value, 2) + stdDevSum += math.Pow(avg-value, 2) } stdDev := math.Sqrt(stdDevSum / float64(length)) diff --git a/integration/test/performancetest/transmitter.go b/integration/test/performancetest/transmitter.go index aeb3745a96..83b2200c6b 100644 --- a/integration/test/performancetest/transmitter.go +++ b/integration/test/performancetest/transmitter.go @@ -1,4 +1,3 @@ - package performancetest import ( diff --git a/integration/test/sanity/sanity_test.go b/integration/test/sanity/sanity_test.go index d31a2713c1..3adb050d6f 100644 --- a/integration/test/sanity/sanity_test.go +++ b/integration/test/sanity/sanity_test.go @@ -8,8 +8,6 @@ package sanity import ( "testing" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) func TestAgentStatus(t *testing.T) { diff --git a/integration/test/sanity/sanity_unix.go b/integration/test/sanity/sanity_unix.go index 006648a7f6..b260e9deb7 100644 --- a/integration/test/sanity/sanity_unix.go +++ b/integration/test/sanity/sanity_unix.go @@ -7,8 +7,9 @@ package sanity import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" "testing" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) func SanityCheck(t *testing.T) { diff --git a/integration/test/sanity/sanity_windows.go b/integration/test/sanity/sanity_windows.go index 4d7db1fff4..fcda35b4c5 100644 --- a/integration/test/sanity/sanity_windows.go +++ b/integration/test/sanity/sanity_windows.go @@ -7,8 +7,9 @@ package sanity import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" "testing" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) func SanityCheck(t *testing.T) { diff --git a/integration/test/util.go b/integration/test/util.go index b363870efb..e06c32826a 100644 --- a/integration/test/util.go +++ b/integration/test/util.go @@ -9,6 +9,7 @@ package test import ( "context" "log" + "github.com/aws/aws-sdk-go-v2/config" "github.com/aws/aws-sdk-go-v2/feature/ec2/imds" ) diff --git a/internal/atomiccounter/atomiccounter.go b/internal/atomiccounter/atomiccounter.go index 5939a0e530..a5ad4c875f 100644 --- a/internal/atomiccounter/atomiccounter.go +++ b/internal/atomiccounter/atomiccounter.go @@ -25,4 +25,4 @@ func (ac *AtomicCounter) Decrement() { // It is just for logging the current value. func (ac *AtomicCounter) Get() int64 { return ac.val -} \ No newline at end of file +} diff --git a/internal/ecsservicediscovery/servicediscovery.go b/internal/ecsservicediscovery/servicediscovery.go index c3492edd45..727cb8d3cc 100644 --- a/internal/ecsservicediscovery/servicediscovery.go +++ b/internal/ecsservicediscovery/servicediscovery.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ecs" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" ) diff --git a/internal/ecsservicediscovery/targetsexportprocessor.go b/internal/ecsservicediscovery/targetsexportprocessor.go index 78e1e37cef..7fc37b3496 100644 --- a/internal/ecsservicediscovery/targetsexportprocessor.go +++ b/internal/ecsservicediscovery/targetsexportprocessor.go @@ -5,7 +5,6 @@ package ecsservicediscovery import ( "fmt" - "io/ioutil" "os" "regexp" @@ -60,7 +59,7 @@ func (p *TargetsExportProcessor) Process(cluster string, taskList []*DecoratedTa } p.stats.AddStatsCount(ExporterDiscoveredTargetCount, len(targetsArr)) - err = ioutil.WriteFile(p.tmpResultFilePath, m, 0644) + err = os.WriteFile(p.tmpResultFilePath, m, 0644) if err != nil { return nil, newServiceDiscoveryError(fmt.Sprintf("Fail to write Prometheus targets into file: %v", p.tmpResultFilePath), &err) } diff --git a/internal/httpclient/httpclient.go b/internal/httpclient/httpclient.go index 5e06421b2a..0fc32170e3 100644 --- a/internal/httpclient/httpclient.go +++ b/internal/httpclient/httpclient.go @@ -6,7 +6,6 @@ package httpclient import ( "fmt" "io" - "io/ioutil" "log" "math" "net/http" @@ -79,7 +78,7 @@ func (h *HttpClient) request(endpoint string) ([]byte, error) { reader = resp.Body } - body, err := ioutil.ReadAll(reader) + body, err := io.ReadAll(reader) if err != nil { return nil, fmt.Errorf("unable to read response body from %s, error: %v", endpoint, err) } diff --git a/internal/k8sCommon/k8sclient/endpoint.go b/internal/k8sCommon/k8sclient/endpoint.go index 938308a147..f695f33114 100644 --- a/internal/k8sCommon/k8sclient/endpoint.go +++ b/internal/k8sCommon/k8sclient/endpoint.go @@ -11,11 +11,6 @@ import ( "sync" "time" - "k8s.io/klog/v2" - "k8s.io/klog/v2/klogr" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sutil" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -23,6 +18,11 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + "k8s.io/klog/v2" + "k8s.io/klog/v2/klogr" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sutil" ) type Service struct { diff --git a/internal/k8sCommon/k8sclient/endpoint_test.go b/internal/k8sCommon/k8sclient/endpoint_test.go index 5704745163..4d5e567748 100644 --- a/internal/k8sCommon/k8sclient/endpoint_test.go +++ b/internal/k8sCommon/k8sclient/endpoint_test.go @@ -8,10 +8,9 @@ import ( "testing" "time" - "gotest.tools/v3/assert" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awsutil" + "gotest.tools/v3/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/k8sclient/node_test.go b/internal/k8sCommon/k8sclient/node_test.go index 324c590e3d..e90a4b2d79 100644 --- a/internal/k8sCommon/k8sclient/node_test.go +++ b/internal/k8sCommon/k8sclient/node_test.go @@ -9,7 +9,6 @@ import ( "time" "github.com/stretchr/testify/assert" - v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/k8sclient/pod_test.go b/internal/k8sCommon/k8sclient/pod_test.go index e4de02b4cd..45a13b3ddb 100644 --- a/internal/k8sCommon/k8sclient/pod_test.go +++ b/internal/k8sCommon/k8sclient/pod_test.go @@ -7,9 +7,8 @@ import ( "log" "testing" - "gotest.tools/v3/assert" - "github.com/aws/aws-sdk-go/aws/awsutil" + "gotest.tools/v3/assert" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/k8sclient/replicaset.go b/internal/k8sCommon/k8sclient/replicaset.go index 7eada403c3..8d77b549c8 100644 --- a/internal/k8sCommon/k8sclient/replicaset.go +++ b/internal/k8sCommon/k8sclient/replicaset.go @@ -11,7 +11,6 @@ import ( "sync" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" @@ -19,6 +18,8 @@ import ( "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) type ReplicaSetClient interface { diff --git a/internal/k8sCommon/k8sclient/replicaset_test.go b/internal/k8sCommon/k8sclient/replicaset_test.go index 55dd87e4ee..80bc7f1edb 100644 --- a/internal/k8sCommon/k8sclient/replicaset_test.go +++ b/internal/k8sCommon/k8sclient/replicaset_test.go @@ -7,7 +7,6 @@ import ( "testing" "gotest.tools/v3/assert" - appsv1 "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/internal/k8sCommon/kubeletutil/kubeletclient.go b/internal/k8sCommon/kubeletutil/kubeletclient.go index 57cfdd2925..8d824abea5 100644 --- a/internal/k8sCommon/kubeletutil/kubeletclient.go +++ b/internal/k8sCommon/kubeletutil/kubeletclient.go @@ -5,17 +5,18 @@ package kubeletutil import ( "encoding/json" + "errors" "fmt" - "io/ioutil" + "io" "log" "net/http" + "os" "strings" "time" - "errors" + corev1 "k8s.io/api/core/v1" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/tls" - corev1 "k8s.io/api/core/v1" ) type KubeClient struct { @@ -55,7 +56,7 @@ func (k *KubeClient) ListPods() ([]corev1.Pod, error) { } if k.BearerToken != "" { - token, err := ioutil.ReadFile(k.BearerToken) + token, err := os.ReadFile(k.BearerToken) if err != nil { return result, err } @@ -75,7 +76,7 @@ func (k *KubeClient) ListPods() ([]corev1.Pod, error) { return result, ErrKubeClientAccessFailure } - b, err := ioutil.ReadAll(resp.Body) + b, err := io.ReadAll(resp.Body) if err != nil { log.Printf("E! Fail to read request %s body: %s", url, err) return result, err diff --git a/internal/k8sCommon/kubeletutil/kubeletclient_test.go b/internal/k8sCommon/kubeletutil/kubeletclient_test.go index e799cec326..f080cb424d 100644 --- a/internal/k8sCommon/kubeletutil/kubeletclient_test.go +++ b/internal/k8sCommon/kubeletutil/kubeletclient_test.go @@ -4,13 +4,12 @@ package kubeletutil import ( - "io/ioutil" + "io" "net/http" "strings" "testing" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" ) @@ -188,7 +187,7 @@ func (m *MockHttpRoundTripper) RoundTrip(req *http.Request) (*http.Response, err // Test func TestKubeClient_ListPods(t *testing.T) { mockRoundTripper := new(MockHttpRoundTripper) - mockRoundTripper.On("RoundTrip", mock.Anything).Return(&http.Response{StatusCode: http.StatusOK, Body: ioutil.NopCloser(strings.NewReader(podJson))}) + mockRoundTripper.On("RoundTrip", mock.Anything).Return(&http.Response{StatusCode: http.StatusOK, Body: io.NopCloser(strings.NewReader(podJson))}) client := KubeClient{roundTripper: mockRoundTripper} pods, err := client.ListPods() assert.Equal(t, nil, err) diff --git a/internal/models/awscsm_pipeline.go b/internal/models/awscsm_pipeline.go index 1e86f9813e..51ca330834 100644 --- a/internal/models/awscsm_pipeline.go +++ b/internal/models/awscsm_pipeline.go @@ -7,9 +7,10 @@ import ( "log" "math" - awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/selfstat" + + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" ) var GlobalMetricsGathered = selfstat.Register("agent", "metrics_gathered", map[string]string{}) diff --git a/internal/structuredlogscommon/common_test.go b/internal/structuredlogscommon/common_test.go index a8510cd6e7..6b8c6ee9ad 100644 --- a/internal/structuredlogscommon/common_test.go +++ b/internal/structuredlogscommon/common_test.go @@ -2,11 +2,10 @@ package structuredlogscommon import ( "fmt" + "reflect" "testing" "time" - "reflect" - "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" ) diff --git a/internal/tls/config.go b/internal/tls/config.go index 60770d676f..8d4247c0a4 100644 --- a/internal/tls/config.go +++ b/internal/tls/config.go @@ -7,7 +7,7 @@ import ( "crypto/tls" "crypto/x509" "fmt" - "io/ioutil" + "os" ) // ClientConfig represents the standard client TLS config. @@ -106,7 +106,7 @@ func (c *ServerConfig) TLSConfig() (*tls.Config, error) { func makeCertPool(certFiles []string) (*x509.CertPool, error) { pool := x509.NewCertPool() for _, certFile := range certFiles { - pem, err := ioutil.ReadFile(certFile) + pem, err := os.ReadFile(certFile) if err != nil { return nil, fmt.Errorf( "could not read certificate %q: %v", certFile, err) diff --git a/internal/util/security/unix_permission.go b/internal/util/security/unix_permission.go index 1ac689af0a..f6c56a1628 100644 --- a/internal/util/security/unix_permission.go +++ b/internal/util/security/unix_permission.go @@ -2,14 +2,15 @@ // SPDX-License-Identifier: MIT // go:build !windows +//go:build !windows // +build !windows package security import ( "fmt" - "syscall" "os/user" + "syscall" ) // CheckFileRights check that the given file path has been protected by the owner. @@ -20,20 +21,19 @@ func CheckFileRights(filePath string) error { return fmt.Errorf("Cannot get file's stat %s: %v", filePath, err) } - // Check the owner of binary has read, write, exec. + // Check the owner of binary has read, write, exec. if !(stat.Mode&(syscall.S_IXUSR) == 0 || stat.Mode&(syscall.S_IRUSR) == 0 || stat.Mode&(syscall.S_IWUSR) == 0) { return nil } - + // Check the owner of file has read, write if !(stat.Mode&(syscall.S_IRUSR) == 0 || stat.Mode&(syscall.S_IWUSR) == 0) { return nil } - + return fmt.Errorf("File's owner does not have enough permission at path %s", filePath) } - // CheckFileOwnerRights check that the given owner is the same owner of the given filepath func CheckFileOwnerRights(filePath, requiredOwner string) error { var stat syscall.Stat_t @@ -48,4 +48,4 @@ func CheckFileOwnerRights(filePath, requiredOwner string) error { } return nil -} \ No newline at end of file +} diff --git a/internal/util/security/windows_permission.go b/internal/util/security/windows_permission.go index 6eda9eaa56..429eb4fa99 100644 --- a/internal/util/security/windows_permission.go +++ b/internal/util/security/windows_permission.go @@ -2,15 +2,17 @@ // SPDX-License-Identifier: MIT // go:build windows +//go:build windows // +build windows package security import ( "fmt" - "golang.org/x/sys/windows" "os" "unsafe" + + "golang.org/x/sys/windows" ) // CheckFileRights check that the given filename has access controls and system permission for Administrator, Local System diff --git a/internal/util/security/windows_sec.go b/internal/util/security/windows_sec.go index 4d97a20094..f7145406cc 100644 --- a/internal/util/security/windows_sec.go +++ b/internal/util/security/windows_sec.go @@ -2,6 +2,7 @@ // SPDX-License-Identifier: MIT // go:build windows +//go:build windows // +build windows package security diff --git a/logger/lumberjack_const_test.go b/logger/lumberjack_const_test.go index bf03942276..1a3f97429c 100644 --- a/logger/lumberjack_const_test.go +++ b/logger/lumberjack_const_test.go @@ -4,7 +4,6 @@ package logger import ( - "io/ioutil" "log" "os" "testing" @@ -14,7 +13,7 @@ import ( ) func TestWriteLogToFile(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "") + tmpfile, err := os.CreateTemp("", "") assert.NoError(t, err) defer func() { os.Remove(tmpfile.Name()) }() @@ -23,14 +22,14 @@ func TestWriteLogToFile(t *testing.T) { log.Printf("I! TEST") log.Printf("D! TEST") // <- should be ignored - f, err := ioutil.ReadFile(tmpfile.Name()) + f, err := os.ReadFile(tmpfile.Name()) log.Printf("log: %v\n", string(f)) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z I! TEST\n")) } func TestDebugWriteLogToFile(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "") + tmpfile, err := os.CreateTemp("", "") assert.NoError(t, err) defer func() { os.Remove(tmpfile.Name()) }() config := createBasicLogConfig(tmpfile.Name()) @@ -38,13 +37,13 @@ func TestDebugWriteLogToFile(t *testing.T) { logger.SetupLogging(config) log.Printf("D! TEST") - f, err := ioutil.ReadFile(tmpfile.Name()) + f, err := os.ReadFile(tmpfile.Name()) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z D! TEST\n")) } func TestErrorWriteLogToFile(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "") + tmpfile, err := os.CreateTemp("", "") assert.NoError(t, err) defer func() { os.Remove(tmpfile.Name()) }() config := createBasicLogConfig(tmpfile.Name()) @@ -53,13 +52,13 @@ func TestErrorWriteLogToFile(t *testing.T) { log.Printf("E! TEST") log.Printf("I! TEST") // <- should be ignored - f, err := ioutil.ReadFile(tmpfile.Name()) + f, err := os.ReadFile(tmpfile.Name()) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z E! TEST\n")) } func TestAddDefaultLogLevel(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "") + tmpfile, err := os.CreateTemp("", "") assert.NoError(t, err) defer func() { os.Remove(tmpfile.Name()) }() config := createBasicLogConfig(tmpfile.Name()) @@ -67,13 +66,13 @@ func TestAddDefaultLogLevel(t *testing.T) { logger.SetupLogging(config) log.Printf("TEST") - f, err := ioutil.ReadFile(tmpfile.Name()) + f, err := os.ReadFile(tmpfile.Name()) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z I! TEST\n")) } func TestWriteToTruncatedFile(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "") + tmpfile, err := os.CreateTemp("", "") assert.NoError(t, err) defer func() { os.Remove(tmpfile.Name()) }() config := createBasicLogConfig(tmpfile.Name()) @@ -81,7 +80,7 @@ func TestWriteToTruncatedFile(t *testing.T) { logger.SetupLogging(config) log.Printf("TEST") - f, err := ioutil.ReadFile(tmpfile.Name()) + f, err := os.ReadFile(tmpfile.Name()) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z I! TEST\n")) @@ -91,7 +90,7 @@ func TestWriteToTruncatedFile(t *testing.T) { log.Printf("SHOULD BE FIRST") - f, err = ioutil.ReadFile(tmpfile.Name()) + f, err = os.ReadFile(tmpfile.Name()) assert.NoError(t, err) assert.Equal(t, f[19:], []byte("Z I! SHOULD BE FIRST\n")) } diff --git a/logs/logs.go b/logs/logs.go index d0984af4cf..072f2b897b 100644 --- a/logs/logs.go +++ b/logs/logs.go @@ -9,8 +9,9 @@ import ( "log" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" "github.com/influxdata/telegraf/config" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" ) var ErrOutputStopped = errors.New("Output plugin stopped") diff --git a/logs/logs_test.go b/logs/logs_test.go index 1ee3ec24cb..d11275da1d 100644 --- a/logs/logs_test.go +++ b/logs/logs_test.go @@ -1,9 +1,10 @@ package logs import ( + "testing" + "github.com/influxdata/telegraf/config" "github.com/stretchr/testify/assert" - "testing" ) func TestRetentionAlreadySet(t *testing.T) { diff --git a/plugins/inputs/awscsm/aggregation_record_test.go b/plugins/inputs/awscsm/aggregation_record_test.go index f40e03b433..0d77a4d119 100644 --- a/plugins/inputs/awscsm/aggregation_record_test.go +++ b/plugins/inputs/awscsm/aggregation_record_test.go @@ -12,7 +12,6 @@ import ( awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) diff --git a/plugins/inputs/awscsm/awscsm_listener.go b/plugins/inputs/awscsm/awscsm_listener.go index 694d109d62..63335991cd 100644 --- a/plugins/inputs/awscsm/awscsm_listener.go +++ b/plugins/inputs/awscsm/awscsm_listener.go @@ -7,14 +7,15 @@ import ( "fmt" "time" - awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/models" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs/socket_listener" "github.com/influxdata/telegraf/plugins/parsers" + + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/models" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) type AwsCsmListener struct { diff --git a/plugins/inputs/awscsm/samples_test.go b/plugins/inputs/awscsm/samples_test.go index c57ec5d416..f26524bfe9 100644 --- a/plugins/inputs/awscsm/samples_test.go +++ b/plugins/inputs/awscsm/samples_test.go @@ -4,10 +4,9 @@ package awscsm import ( + "math/rand" "reflect" "testing" - - "math/rand" ) func TestSamples(t *testing.T) { diff --git a/plugins/inputs/cadvisor/cadvisor.go b/plugins/inputs/cadvisor/cadvisor.go index 6731381726..6989ceb783 100644 --- a/plugins/inputs/cadvisor/cadvisor.go +++ b/plugins/inputs/cadvisor/cadvisor.go @@ -12,8 +12,6 @@ import ( "net/http" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/mesos" "github.com/google/cadvisor/cache/memory" cadvisormetrics "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/containerd" @@ -25,6 +23,9 @@ import ( "github.com/google/cadvisor/utils/sysfs" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/mesos" ) // The amount of time for which to keep stats in memory. diff --git a/plugins/inputs/cadvisor/container_info_processor.go b/plugins/inputs/cadvisor/container_info_processor.go index d2ee65c1b7..d06ac10717 100644 --- a/plugins/inputs/cadvisor/container_info_processor.go +++ b/plugins/inputs/cadvisor/container_info_processor.go @@ -10,10 +10,10 @@ import ( "strings" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + cinfo "github.com/google/cadvisor/info/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/cadvisor/extractors" - cinfo "github.com/google/cadvisor/info/v1" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/cpu_extractor.go b/plugins/inputs/cadvisor/extractors/cpu_extractor.go index fbdf5adfcd..f38f0ac433 100644 --- a/plugins/inputs/cadvisor/extractors/cpu_extractor.go +++ b/plugins/inputs/cadvisor/extractors/cpu_extractor.go @@ -6,9 +6,10 @@ package extractors import ( "time" + cInfo "github.com/google/cadvisor/info/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - cInfo "github.com/google/cadvisor/info/v1" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go b/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go index 68858e7f8f..3b82d4f8ae 100644 --- a/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/cpu_extractor_test.go @@ -9,8 +9,9 @@ import ( "log" "testing" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestCPUStats(t *testing.T) { diff --git a/plugins/inputs/cadvisor/extractors/diskio_extractor.go b/plugins/inputs/cadvisor/extractors/diskio_extractor.go index 846d9af062..ac232d7a86 100644 --- a/plugins/inputs/cadvisor/extractors/diskio_extractor.go +++ b/plugins/inputs/cadvisor/extractors/diskio_extractor.go @@ -9,9 +9,10 @@ import ( "strings" "time" + cinfo "github.com/google/cadvisor/info/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - cinfo "github.com/google/cadvisor/info/v1" ) type DiskIOMetricExtractor struct { diff --git a/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go b/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go index bddd48fc59..ed223b1377 100644 --- a/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/diskio_extractor_test.go @@ -9,8 +9,9 @@ import ( "log" "testing" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestDiskIOStats(t *testing.T) { diff --git a/plugins/inputs/cadvisor/extractors/extractor.go b/plugins/inputs/cadvisor/extractors/extractor.go index 39c9c42167..cee2a3938c 100644 --- a/plugins/inputs/cadvisor/extractors/extractor.go +++ b/plugins/inputs/cadvisor/extractors/extractor.go @@ -7,8 +7,9 @@ import ( "log" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/extractor_test.go b/plugins/inputs/cadvisor/extractors/extractor_test.go index c6ac4d9633..a2c3e8f8a2 100644 --- a/plugins/inputs/cadvisor/extractors/extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/extractor_test.go @@ -6,8 +6,9 @@ package extractors import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestCAdvisorMetric_Merge(t *testing.T) { diff --git a/plugins/inputs/cadvisor/extractors/fs_extractor.go b/plugins/inputs/cadvisor/extractors/fs_extractor.go index 4605962541..65ef6d06f2 100644 --- a/plugins/inputs/cadvisor/extractors/fs_extractor.go +++ b/plugins/inputs/cadvisor/extractors/fs_extractor.go @@ -8,8 +8,9 @@ import ( "regexp" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/fs_extractor_test.go b/plugins/inputs/cadvisor/extractors/fs_extractor_test.go index 73b9345d10..dde3ec9750 100644 --- a/plugins/inputs/cadvisor/extractors/fs_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/fs_extractor_test.go @@ -9,9 +9,10 @@ import ( "log" "testing" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" "github.com/stretchr/testify/assert" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/mem_extractor.go b/plugins/inputs/cadvisor/extractors/mem_extractor.go index ee2454e117..9f01b11cc0 100644 --- a/plugins/inputs/cadvisor/extractors/mem_extractor.go +++ b/plugins/inputs/cadvisor/extractors/mem_extractor.go @@ -6,9 +6,10 @@ package extractors import ( "time" + cinfo "github.com/google/cadvisor/info/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - cinfo "github.com/google/cadvisor/info/v1" ) type MemMetricExtractor struct { diff --git a/plugins/inputs/cadvisor/extractors/mem_extractor_test.go b/plugins/inputs/cadvisor/extractors/mem_extractor_test.go index b4a77f1503..cbe7435050 100644 --- a/plugins/inputs/cadvisor/extractors/mem_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/mem_extractor_test.go @@ -9,8 +9,9 @@ import ( "log" "testing" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestMemStats(t *testing.T) { diff --git a/plugins/inputs/cadvisor/extractors/net_extractor.go b/plugins/inputs/cadvisor/extractors/net_extractor.go index cade9126d0..64b4dc693b 100644 --- a/plugins/inputs/cadvisor/extractors/net_extractor.go +++ b/plugins/inputs/cadvisor/extractors/net_extractor.go @@ -7,9 +7,10 @@ import ( "log" "time" + cinfo "github.com/google/cadvisor/info/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - cinfo "github.com/google/cadvisor/info/v1" ) const ( diff --git a/plugins/inputs/cadvisor/extractors/net_extractor_test.go b/plugins/inputs/cadvisor/extractors/net_extractor_test.go index a41c41fc8b..e6f1d2812d 100644 --- a/plugins/inputs/cadvisor/extractors/net_extractor_test.go +++ b/plugins/inputs/cadvisor/extractors/net_extractor_test.go @@ -9,8 +9,9 @@ import ( "log" "testing" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" cinfo "github.com/google/cadvisor/info/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestNetStats(t *testing.T) { diff --git a/plugins/inputs/cadvisor/mesos/factory.go b/plugins/inputs/cadvisor/mesos/factory.go index 3e3236b2a2..a4f12c62f4 100644 --- a/plugins/inputs/cadvisor/mesos/factory.go +++ b/plugins/inputs/cadvisor/mesos/factory.go @@ -25,13 +25,12 @@ import ( "strings" "time" - "k8s.io/klog/v2" - "github.com/google/cadvisor/container" "github.com/google/cadvisor/container/libcontainer" "github.com/google/cadvisor/fs" info "github.com/google/cadvisor/info/v1" "github.com/google/cadvisor/watcher" + "k8s.io/klog/v2" ) var MesosAgentAddress = flag.String("mesos_agent", "127.0.0.1:5051", "Mesos agent address") diff --git a/plugins/inputs/cadvisor/mesos/handler_test.go b/plugins/inputs/cadvisor/mesos/handler_test.go index 68d5c6ac5e..e84f1c321b 100644 --- a/plugins/inputs/cadvisor/mesos/handler_test.go +++ b/plugins/inputs/cadvisor/mesos/handler_test.go @@ -21,12 +21,11 @@ import ( "fmt" "testing" - mesos "github.com/mesos/mesos-go/api/v1/lib" - "github.com/stretchr/testify/assert" - "github.com/google/cadvisor/container" "github.com/google/cadvisor/fs" info "github.com/google/cadvisor/info/v1" + mesos "github.com/mesos/mesos-go/api/v1/lib" + "github.com/stretchr/testify/assert" ) func PopulateContainer() *mContainer { diff --git a/plugins/inputs/k8sapiserver/k8sapiserver.go b/plugins/inputs/k8sapiserver/k8sapiserver.go index 099ee2e71d..7f6c6993da 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver.go @@ -11,8 +11,6 @@ import ( "strconv" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" v1 "k8s.io/api/core/v1" @@ -24,6 +22,9 @@ import ( "k8s.io/client-go/tools/leaderelection/resourcelock" "k8s.io/client-go/tools/record" klog "k8s.io/klog/v2" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" ) const ( diff --git a/plugins/inputs/k8sapiserver/k8sapiserver_test.go b/plugins/inputs/k8sapiserver/k8sapiserver_test.go index a10bae18d0..21a8b59f46 100644 --- a/plugins/inputs/k8sapiserver/k8sapiserver_test.go +++ b/plugins/inputs/k8sapiserver/k8sapiserver_test.go @@ -8,11 +8,12 @@ import ( "os" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" ) var mockClient = new(MockClient) diff --git a/plugins/inputs/logfile/fileconfig.go b/plugins/inputs/logfile/fileconfig.go index 8b446c4074..6869e87b16 100644 --- a/plugins/inputs/logfile/fileconfig.go +++ b/plugins/inputs/logfile/fileconfig.go @@ -12,12 +12,12 @@ import ( "strings" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" - "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - "golang.org/x/net/html/charset" "golang.org/x/text/encoding" "golang.org/x/text/encoding/ianaindex" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" ) const ( diff --git a/plugins/inputs/logfile/globpath/globpath.go b/plugins/inputs/logfile/globpath/globpath.go index 07ec664821..71846f7759 100644 --- a/plugins/inputs/logfile/globpath/globpath.go +++ b/plugins/inputs/logfile/globpath/globpath.go @@ -2,12 +2,11 @@ package globpath import ( "fmt" + "log" "os" "path/filepath" - "strings" - - "log" "runtime" + "strings" "github.com/gobwas/glob" ) diff --git a/plugins/inputs/logfile/logfile.go b/plugins/inputs/logfile/logfile.go index 57217ba726..dfbb6760a6 100644 --- a/plugins/inputs/logfile/logfile.go +++ b/plugins/inputs/logfile/logfile.go @@ -6,7 +6,6 @@ package logfile import ( "fmt" "io" - "io/ioutil" "os" "path/filepath" "regexp" @@ -14,12 +13,13 @@ import ( "strings" "time" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/inputs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/globpath" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" ) type LogFile struct { @@ -322,7 +322,7 @@ func (t *LogFile) restoreState(filename string) (int64, error) { return 0, err } - byteArray, err := ioutil.ReadFile(filePath) + byteArray, err := os.ReadFile(filePath) if err != nil { t.Log.Warnf("Issue encountered when reading offset from file %s: %v", filename, err) return 0, err @@ -362,7 +362,7 @@ func (t *LogFile) cleanupStateFolder() { continue } - byteArray, err := ioutil.ReadFile(file) + byteArray, err := os.ReadFile(file) if err != nil { t.Log.Errorf("Error happens when reading the content from file %s in clean up state fodler step: %v", file, err) continue diff --git a/plugins/inputs/logfile/logfile_test.go b/plugins/inputs/logfile/logfile_test.go index 4e9f15021f..2310732a3e 100644 --- a/plugins/inputs/logfile/logfile_test.go +++ b/plugins/inputs/logfile/logfile_test.go @@ -5,7 +5,6 @@ package logfile import ( "fmt" - "io/ioutil" "log" "os" "path/filepath" @@ -14,11 +13,12 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "golang.org/x/text/encoding/simplifiedchinese" "golang.org/x/text/transform" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" ) const ( @@ -191,7 +191,7 @@ func TestCompressedFile(t *testing.T) { func TestRestoreState(t *testing.T) { multilineWaitPeriod = 10 * time.Millisecond - tmpfolder, err := ioutil.TempDir("", "") + tmpfolder, err := os.MkdirTemp("", "") require.NoError(t, err) defer os.RemoveAll(tmpfolder) @@ -199,7 +199,7 @@ func TestRestoreState(t *testing.T) { logFileStateFileName := "_tmp_logfile.log" offset := int64(9323) - err = ioutil.WriteFile( + err = os.WriteFile( tmpfolder+string(filepath.Separator)+logFileStateFileName, []byte(strconv.FormatInt(offset, 10)+"\n"+logFilePath), os.ModePerm) @@ -642,7 +642,7 @@ func TestLogsFileWithOffset(t *testing.T) { defer os.Remove(tmpfile.Name()) require.NoError(t, err) - stateDir, err := ioutil.TempDir("", "state") + stateDir, err := os.MkdirTemp("", "state") require.NoError(t, err) defer os.Remove(stateDir) @@ -692,7 +692,7 @@ func TestLogsFileWithInvalidOffset(t *testing.T) { defer os.Remove(tmpfile.Name()) require.NoError(t, err) - stateDir, err := ioutil.TempDir("", "state") + stateDir, err := os.MkdirTemp("", "state") require.NoError(t, err) defer os.Remove(stateDir) @@ -748,7 +748,7 @@ func TestLogsFileRecreate(t *testing.T) { _, err = tmpfile.WriteString(logEntryString + "\n") require.NoError(t, err) - stateDir, err := ioutil.TempDir("", "state") + stateDir, err := os.MkdirTemp("", "state") require.NoError(t, err) defer os.Remove(stateDir) @@ -883,7 +883,7 @@ func TestLogsPartialLineReading(t *testing.T) { func TestLogFileMultiLogsReading(t *testing.T) { multilineWaitPeriod = 10 * time.Millisecond logEntryString := "This is from Agent log" - dir, e := ioutil.TempDir("", "test") + dir, e := os.MkdirTemp("", "test") require.NoError(t, e) defer os.Remove(dir) agentLog, err := createTempFile(dir, "test_agent.log") @@ -946,7 +946,7 @@ func TestLogFileMultiLogsReading(t *testing.T) { func TestLogFileMultiLogsReadingAddingFile(t *testing.T) { multilineWaitPeriod = 10 * time.Millisecond logEntryString := "This is from Agent log" - dir, e := ioutil.TempDir("", "test") + dir, e := os.MkdirTemp("", "test") require.NoError(t, e) defer os.Remove(dir) diff --git a/plugins/inputs/logfile/tail/tail.go b/plugins/inputs/logfile/tail/tail.go index cf6d2f7646..b083232edc 100644 --- a/plugins/inputs/logfile/tail/tail.go +++ b/plugins/inputs/logfile/tail/tail.go @@ -12,11 +12,12 @@ import ( "sync" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/atomiccounter" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/watch" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/models" "gopkg.in/tomb.v1" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/atomiccounter" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/watch" ) var ( diff --git a/plugins/inputs/logfile/tail/tail_test.go b/plugins/inputs/logfile/tail/tail_test.go index 0f1c6e773a..4ac2422ec4 100644 --- a/plugins/inputs/logfile/tail/tail_test.go +++ b/plugins/inputs/logfile/tail/tail_test.go @@ -2,7 +2,6 @@ package tail import ( "fmt" - "io/ioutil" "log" "os" "strings" @@ -119,7 +118,7 @@ func TestStopAtEOF(t *testing.T) { } func setup(t *testing.T) (*os.File, *Tail, *testLogger) { - tmpfile, err := ioutil.TempFile("", "example") + tmpfile, err := os.CreateTemp("", "example") if err != nil { t.Fatalf("failed to create temp file: %v", err) } @@ -182,7 +181,7 @@ func verifyTailerLogging(t *testing.T, tlog *testLogger, expectedErrorMsg string func verifyTailerExited(t *testing.T, tail *Tail) { select { case <-tail.Dead(): - assert.Equal(t, int64(0), OpenFileCount.Get()) + assert.Equal(t, int64(0), OpenFileCount.Get()) return default: t.Errorf("Tailer is still alive after file removed and wait period") diff --git a/plugins/inputs/logfile/tailersrc.go b/plugins/inputs/logfile/tailersrc.go index 669a523c64..c9e9602adb 100644 --- a/plugins/inputs/logfile/tailersrc.go +++ b/plugins/inputs/logfile/tailersrc.go @@ -5,16 +5,16 @@ package logfile import ( "bytes" - "io/ioutil" "log" "os" "strconv" "sync" "time" + "golang.org/x/text/encoding" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" - "golang.org/x/text/encoding" ) const ( @@ -333,5 +333,5 @@ func (ts *tailerSrc) saveState(offset int64) error { } content := []byte(strconv.FormatInt(offset, 10) + "\n" + ts.tailer.Filename) - return ioutil.WriteFile(ts.stateFilePath, content, stateFileMode) + return os.WriteFile(ts.stateFilePath, content, stateFileMode) } diff --git a/plugins/inputs/logfile/tailersrc_test.go b/plugins/inputs/logfile/tailersrc_test.go index 26a2cda8fd..0dcbe642ac 100644 --- a/plugins/inputs/logfile/tailersrc_test.go +++ b/plugins/inputs/logfile/tailersrc_test.go @@ -7,7 +7,6 @@ import ( "bytes" "fmt" "io" - "io/ioutil" "log" "os" "regexp" @@ -17,11 +16,11 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" "github.com/stretchr/testify/assert" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail" + "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" ) type tailerTestResources struct { @@ -41,7 +40,7 @@ func TestTailerSrc(t *testing.T) { t.Errorf("Failed to create temp file: %v", err) } - statefile, err := ioutil.TempFile("", "tailsrctest-state-*.log") + statefile, err := os.CreateTemp("", "tailsrctest-state-*.log") defer os.Remove(statefile.Name()) if err != nil { t.Errorf("Failed to create temp file: %v", err) @@ -63,7 +62,7 @@ func TestTailerSrc(t *testing.T) { t.Errorf("Failed to create tailer src for file %v with error: %v", file, err) return } - assert.Equal(t, beforeCount + 1, tail.OpenFileCount.Get()) + assert.Equal(t, beforeCount+1, tail.OpenFileCount.Get()) ts := NewTailerSrc( "groupName", "streamName", "destination", @@ -165,7 +164,7 @@ func TestOffsetDoneCallBack(t *testing.T) { t.Errorf("Failed to create temp file: %v", err) } - statefile, err := ioutil.TempFile("", "tailsrctest-state-*.log") + statefile, err := os.CreateTemp("", "tailsrctest-state-*.log") defer os.Remove(statefile.Name()) if err != nil { t.Errorf("Failed to create temp file: %v", err) @@ -216,7 +215,7 @@ func TestOffsetDoneCallBack(t *testing.T) { log.Println(i) if i == 10 { // Test before first truncate time.Sleep(1 * time.Second) - b, err := ioutil.ReadFile(statefile.Name()) + b, err := os.ReadFile(statefile.Name()) if err != nil { t.Errorf("Failed to read state file: %v", err) } @@ -233,7 +232,7 @@ func TestOffsetDoneCallBack(t *testing.T) { if i == 15 { // Test after first truncate, saved offset should decrease time.Sleep(1 * time.Second) log.Println(statefile.Name()) - b, err := ioutil.ReadFile(statefile.Name()) + b, err := os.ReadFile(statefile.Name()) log.Println(b) if err != nil { t.Errorf("Failed to read state file: %v", err) @@ -256,7 +255,7 @@ func TestOffsetDoneCallBack(t *testing.T) { if i == 35 { // Test after 2nd truncate, the offset should be larger time.Sleep(1 * time.Second) - b, err := ioutil.ReadFile(statefile.Name()) + b, err := os.ReadFile(statefile.Name()) if err != nil { t.Errorf("Failed to read state file: %v", err) } diff --git a/plugins/inputs/logfile/tmpfile.go b/plugins/inputs/logfile/tmpfile.go index b75902b81a..653f9cdfd0 100644 --- a/plugins/inputs/logfile/tmpfile.go +++ b/plugins/inputs/logfile/tmpfile.go @@ -4,10 +4,9 @@ package logfile import ( - "io/ioutil" "os" ) func createTempFile(dir, prefix string) (*os.File, error) { - return ioutil.TempFile(dir, prefix) + return os.CreateTemp(dir, prefix) } diff --git a/plugins/inputs/logfile/tmpfile_windows.go b/plugins/inputs/logfile/tmpfile_windows.go index 337be38fe0..fad30a7d3e 100644 --- a/plugins/inputs/logfile/tmpfile_windows.go +++ b/plugins/inputs/logfile/tmpfile_windows.go @@ -2,14 +2,13 @@ package logfile import ( "fmt" - "io/ioutil" "os" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/logfile/tail/winfile" ) func createTempFile(dir, prefix string) (*os.File, error) { - file, err := ioutil.TempFile(dir, prefix) + file, err := os.CreateTemp(dir, prefix) if err := file.Close(); err != nil { return nil, fmt.Errorf("Failed to close created temp file %v: %w", file.Name(), err) } diff --git a/plugins/inputs/prometheus_scraper/metric_type_handler_test.go b/plugins/inputs/prometheus_scraper/metric_type_handler_test.go index da4db6cafb..48e3e59043 100644 --- a/plugins/inputs/prometheus_scraper/metric_type_handler_test.go +++ b/plugins/inputs/prometheus_scraper/metric_type_handler_test.go @@ -7,10 +7,9 @@ import ( "net/url" "testing" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/textparse" - - "github.com/prometheus/common/model" "github.com/prometheus/prometheus/scrape" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/plugins/inputs/prometheus_scraper/metrics_handler.go b/plugins/inputs/prometheus_scraper/metrics_handler.go index 0fdbd29094..fb63d6eb93 100644 --- a/plugins/inputs/prometheus_scraper/metrics_handler.go +++ b/plugins/inputs/prometheus_scraper/metrics_handler.go @@ -8,9 +8,10 @@ import ( "strconv" "sync" + "github.com/influxdata/telegraf" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" - "github.com/influxdata/telegraf" ) // Use metricMaterial instead of mbMetric to avoid unnecessary tags&fields copy diff --git a/plugins/inputs/prometheus_scraper/metrics_receiver.go b/plugins/inputs/prometheus_scraper/metrics_receiver.go index 3c46c5ae94..b4c41964e9 100644 --- a/plugins/inputs/prometheus_scraper/metrics_receiver.go +++ b/plugins/inputs/prometheus_scraper/metrics_receiver.go @@ -9,11 +9,10 @@ import ( "log" "math" + "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/exemplar" "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/value" - - "github.com/prometheus/common/model" "github.com/prometheus/prometheus/storage" ) diff --git a/plugins/inputs/prometheus_scraper/metrics_receiver_test.go b/plugins/inputs/prometheus_scraper/metrics_receiver_test.go index ef43c1af25..51b81ef40e 100644 --- a/plugins/inputs/prometheus_scraper/metrics_receiver_test.go +++ b/plugins/inputs/prometheus_scraper/metrics_receiver_test.go @@ -8,7 +8,6 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - "github.com/stretchr/testify/assert" ) diff --git a/plugins/inputs/prometheus_scraper/metrics_type_handler.go b/plugins/inputs/prometheus_scraper/metrics_type_handler.go index e7299b76cc..f64ae8f2d1 100644 --- a/plugins/inputs/prometheus_scraper/metrics_type_handler.go +++ b/plugins/inputs/prometheus_scraper/metrics_type_handler.go @@ -10,7 +10,6 @@ import ( "strings" "github.com/prometheus/prometheus/model/textparse" - "github.com/prometheus/prometheus/scrape" ) diff --git a/plugins/inputs/prometheus_scraper/prometheus_scraper.go b/plugins/inputs/prometheus_scraper/prometheus_scraper.go index 57d9f27e0d..ac4aee7697 100644 --- a/plugins/inputs/prometheus_scraper/prometheus_scraper.go +++ b/plugins/inputs/prometheus_scraper/prometheus_scraper.go @@ -6,9 +6,10 @@ package prometheus_scraper import ( "sync" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/ecsservicediscovery" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/ecsservicediscovery" ) type PrometheusScraper struct { diff --git a/plugins/inputs/prometheus_scraper/start.go b/plugins/inputs/prometheus_scraper/start.go index ced0bf4580..17ebaaca92 100644 --- a/plugins/inputs/prometheus_scraper/start.go +++ b/plugins/inputs/prometheus_scraper/start.go @@ -21,7 +21,6 @@ package prometheus_scraper import ( "context" - "io/ioutil" "os" "os/signal" "runtime" @@ -271,7 +270,7 @@ const ( func reloadConfig(filename string, logger log.Logger, rls ...func(*config.Config) error) (err error) { level.Info(logger).Log("msg", "Loading configuration file", "filename", filename) - content, _ := ioutil.ReadFile(filename) + content, _ := os.ReadFile(filename) text := string(content) level.Debug(logger).Log("msg", "Prometheus configuration file", "value", text) diff --git a/plugins/inputs/statsd/graphite/parser_test.go b/plugins/inputs/statsd/graphite/parser_test.go index 68ba52cc70..8b266a1a5a 100644 --- a/plugins/inputs/statsd/graphite/parser_test.go +++ b/plugins/inputs/statsd/graphite/parser_test.go @@ -9,11 +9,9 @@ import ( "testing" "time" - "github.com/stretchr/testify/require" - "github.com/influxdata/telegraf/metric" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func BenchmarkParse(b *testing.B) { diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go index 8969e7097d..15306a4c38 100644 --- a/plugins/inputs/statsd/statsd.go +++ b/plugins/inputs/statsd/statsd.go @@ -14,13 +14,12 @@ import ( "sync" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/statsd/graphite" - //"github.com/influxdata/telegraf/plugins/parsers/graphite" - "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/statsd/graphite" ) const ( diff --git a/plugins/inputs/statsd/statsd_test.go b/plugins/inputs/statsd/statsd_test.go index f0fad60fa4..d23d351bf7 100644 --- a/plugins/inputs/statsd/statsd_test.go +++ b/plugins/inputs/statsd/statsd_test.go @@ -9,11 +9,11 @@ import ( "math" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" - "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" ) func NewTestStatsd() *Statsd { diff --git a/plugins/inputs/windows_event_log/windows_event_log.go b/plugins/inputs/windows_event_log/windows_event_log.go index 8f99c74811..40791c5b20 100644 --- a/plugins/inputs/windows_event_log/windows_event_log.go +++ b/plugins/inputs/windows_event_log/windows_event_log.go @@ -13,11 +13,12 @@ import ( "strings" "time" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/inputs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/inputs/windows_event_log/wineventlog" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" ) const ( diff --git a/plugins/inputs/windows_event_log/wineventlog/utils.go b/plugins/inputs/windows_event_log/wineventlog/utils.go index ca57856007..0de3b86745 100644 --- a/plugins/inputs/windows_event_log/wineventlog/utils.go +++ b/plugins/inputs/windows_event_log/wineventlog/utils.go @@ -9,7 +9,7 @@ package wineventlog import ( "bytes" "fmt" - "io/ioutil" + "io" "log" "syscall" "time" @@ -103,7 +103,7 @@ func utf16ToUTF8Bytes(in []byte, length uint32) ([]byte, error) { win16be := unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM) utf16bom := unicode.BOMOverride(win16be.NewDecoder()) unicodeReader := transform.NewReader(bytes.NewReader(in[:i]), utf16bom) - decoded, err := ioutil.ReadAll(unicodeReader) + decoded, err := io.ReadAll(unicodeReader) return decoded, err } diff --git a/plugins/inputs/windows_event_log/wineventlog/wineventlog.go b/plugins/inputs/windows_event_log/wineventlog/wineventlog.go index f8bfd33e56..17730a4591 100644 --- a/plugins/inputs/windows_event_log/wineventlog/wineventlog.go +++ b/plugins/inputs/windows_event_log/wineventlog/wineventlog.go @@ -7,8 +7,8 @@ package wineventlog import ( + "encoding/xml" "fmt" - "io/ioutil" "log" "os" "strconv" @@ -17,10 +17,9 @@ import ( "syscall" "time" - "encoding/xml" + "golang.org/x/sys/windows" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" - "golang.org/x/sys/windows" ) // https://msdn.microsoft.com/en-us/library/windows/desktop/aa385588(v=vs.85).aspx @@ -226,7 +225,7 @@ func (w *windowsEventLog) saveState(offset uint64) error { } content := []byte(strconv.FormatUint(offset, 10) + "\n" + w.logGroupName) - return ioutil.WriteFile(w.stateFilePath, content, 0644) + return os.WriteFile(w.stateFilePath, content, 0644) } func (w *windowsEventLog) read() []*windowsEventLogRecord { @@ -351,7 +350,7 @@ func (w *windowsEventLog) loadState() { log.Printf("I! [wineventlog] The state file for %s does not exist: %v", w.stateFilePath, err) return } - byteArray, err := ioutil.ReadFile(w.stateFilePath) + byteArray, err := os.ReadFile(w.stateFilePath) if err != nil { log.Printf("W! [wineventlog] Issue encountered when reading offset from file %s: %v", w.stateFilePath, err) return diff --git a/plugins/outputs/awscsm/adapters.go b/plugins/outputs/awscsm/adapters.go index 957c2940f1..8a5701c669 100644 --- a/plugins/outputs/awscsm/adapters.go +++ b/plugins/outputs/awscsm/adapters.go @@ -5,9 +5,9 @@ package awscsm import ( "github.com/aws/aws-sdk-go/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) func adaptToCSMFrequencyMetrics(m []awscsmmetrics.FrequencyMetric) []*sdkmetricsdataplane.FrequencyMetric { diff --git a/plugins/outputs/awscsm/adapters_test.go b/plugins/outputs/awscsm/adapters_test.go index 6d206b3c4c..c5c15f2f06 100644 --- a/plugins/outputs/awscsm/adapters_test.go +++ b/plugins/outputs/awscsm/adapters_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) diff --git a/plugins/outputs/awscsm/awscsm.go b/plugins/outputs/awscsm/awscsm.go index 45805b3185..1f3cb5349d 100644 --- a/plugins/outputs/awscsm/awscsm.go +++ b/plugins/outputs/awscsm/awscsm.go @@ -14,18 +14,18 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/outputs" + + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane/sdkmetricsdataplaneiface" configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - "github.com/influxdata/telegraf" - - awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/models" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" - "github.com/influxdata/telegraf/plugins/outputs" ) const ( diff --git a/plugins/outputs/awscsm/awscsm_test.go b/plugins/outputs/awscsm/awscsm_test.go index 69d8b03655..530c339eed 100644 --- a/plugins/outputs/awscsm/awscsm_test.go +++ b/plugins/outputs/awscsm/awscsm_test.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) diff --git a/plugins/outputs/awscsm/csm_writer.go b/plugins/outputs/awscsm/csm_writer.go index 18b2162064..cd60babcb2 100644 --- a/plugins/outputs/awscsm/csm_writer.go +++ b/plugins/outputs/awscsm/csm_writer.go @@ -8,9 +8,9 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm/csmiface" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) diff --git a/plugins/outputs/awscsm/providers/config_provider.go b/plugins/outputs/awscsm/providers/config_provider.go index ccf4e46e48..379c549fcc 100644 --- a/plugins/outputs/awscsm/providers/config_provider.go +++ b/plugins/outputs/awscsm/providers/config_provider.go @@ -11,6 +11,7 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm/csmiface" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" diff --git a/plugins/outputs/awscsm/providers/config_provider_test.go b/plugins/outputs/awscsm/providers/config_provider_test.go index 341523148a..d710d21997 100644 --- a/plugins/outputs/awscsm/providers/config_provider_test.go +++ b/plugins/outputs/awscsm/providers/config_provider_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/metametrics" ) diff --git a/plugins/outputs/awscsm/providers/dynamic_schema_test.go b/plugins/outputs/awscsm/providers/dynamic_schema_test.go index eb570dd8a3..07c4c34be2 100644 --- a/plugins/outputs/awscsm/providers/dynamic_schema_test.go +++ b/plugins/outputs/awscsm/providers/dynamic_schema_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" ) diff --git a/plugins/outputs/awscsm/providers/event_key_type_test.go b/plugins/outputs/awscsm/providers/event_key_type_test.go index 47763a31b9..360eaaf692 100644 --- a/plugins/outputs/awscsm/providers/event_key_type_test.go +++ b/plugins/outputs/awscsm/providers/event_key_type_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) diff --git a/plugins/outputs/awscsm/providers/metric_type_test.go b/plugins/outputs/awscsm/providers/metric_type_test.go index 3276023d26..a0619c59cf 100644 --- a/plugins/outputs/awscsm/providers/metric_type_test.go +++ b/plugins/outputs/awscsm/providers/metric_type_test.go @@ -7,8 +7,8 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/awscsm/providers" ) diff --git a/plugins/outputs/awscsm/record_ring.go b/plugins/outputs/awscsm/record_ring.go index 6832334cea..b2c77bed1d 100644 --- a/plugins/outputs/awscsm/record_ring.go +++ b/plugins/outputs/awscsm/record_ring.go @@ -6,10 +6,10 @@ package awscsm import ( "container/list" + "github.com/influxdata/telegraf" + awscsmmetrics "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm" "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" - - "github.com/influxdata/telegraf" ) type recordRing struct { diff --git a/plugins/outputs/awscsm/retry_rules.go b/plugins/outputs/awscsm/retry_rules.go index 0dddfad90b..d2f8087e96 100644 --- a/plugins/outputs/awscsm/retry_rules.go +++ b/plugins/outputs/awscsm/retry_rules.go @@ -5,6 +5,7 @@ package awscsm import ( "github.com/aws/aws-sdk-go/aws/awserr" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) diff --git a/plugins/outputs/awscsm/retry_rules_test.go b/plugins/outputs/awscsm/retry_rules_test.go index 6aad27f00e..20da6a266c 100644 --- a/plugins/outputs/awscsm/retry_rules_test.go +++ b/plugins/outputs/awscsm/retry_rules_test.go @@ -8,6 +8,7 @@ import ( "testing" "github.com/aws/aws-sdk-go/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/awscsm/sdkmetricsdataplane" ) diff --git a/plugins/outputs/cloudwatch/aggregator.go b/plugins/outputs/cloudwatch/aggregator.go index d82c9a5b87..276929d52f 100644 --- a/plugins/outputs/cloudwatch/aggregator.go +++ b/plugins/outputs/cloudwatch/aggregator.go @@ -11,9 +11,10 @@ import ( "sync" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" ) const ( diff --git a/plugins/outputs/cloudwatch/aggregator_test.go b/plugins/outputs/cloudwatch/aggregator_test.go index 21c298e181..e61ed6f2fc 100644 --- a/plugins/outputs/cloudwatch/aggregator_test.go +++ b/plugins/outputs/cloudwatch/aggregator_test.go @@ -10,11 +10,12 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" - "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" ) var metricName = "metric1" diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index 67cb10957d..3ee56cb88c 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -12,23 +12,22 @@ import ( "strings" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/models" - "go.opentelemetry.io/collector/pdata/pmetric" - "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" - configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - handlers "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" - + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/models" "github.com/influxdata/telegraf/plugins/outputs" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/consumer" + "go.opentelemetry.io/collector/pdata/pmetric" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" ) const ( diff --git a/plugins/outputs/cloudwatch/cloudwatch_test.go b/plugins/outputs/cloudwatch/cloudwatch_test.go index 23be1a1177..8fe3029324 100644 --- a/plugins/outputs/cloudwatch/cloudwatch_test.go +++ b/plugins/outputs/cloudwatch/cloudwatch_test.go @@ -15,9 +15,10 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatch" "github.com/aws/aws-sdk-go/service/cloudwatch/cloudwatchiface" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/publisher" ) // Return true if found. diff --git a/plugins/outputs/cloudwatch/convert_otel.go b/plugins/outputs/cloudwatch/convert_otel.go index 8d135dd543..7d14a9e3aa 100644 --- a/plugins/outputs/cloudwatch/convert_otel.go +++ b/plugins/outputs/cloudwatch/convert_otel.go @@ -33,9 +33,9 @@ func (c *CloudWatch) ConvertOtelDimensions( func NumberDataPointValue(dp pmetric.NumberDataPoint) float64 { switch dp.ValueType() { case pmetric.NumberDataPointValueTypeDouble: - return dp.DoubleVal() + return dp.DoubleValue() case pmetric.NumberDataPointValueTypeInt: - return float64(dp.IntVal()) + return float64(dp.IntValue()) } return 0 } @@ -103,13 +103,13 @@ func (c *CloudWatch) ConvertOtelNumberDataPoints( func (c *CloudWatch) ConvertOtelMetric(m pmetric.Metric) []*cloudwatch.MetricDatum { n := m.Name() u := ConvertUnit(m.Unit()) - switch m.DataType() { - case pmetric.MetricDataTypeGauge: + switch m.Type() { + case pmetric.MetricTypeGauge: return c.ConvertOtelNumberDataPoints(m.Gauge().DataPoints(), n, u) - case pmetric.MetricDataTypeSum: + case pmetric.MetricTypeSum: return c.ConvertOtelNumberDataPoints(m.Sum().DataPoints(), n, u) default: - log.Printf("E! cloudwatch: Unsupported type, %s", m.DataType()) + log.Printf("E! cloudwatch: Unsupported type, %s", m.Type()) } return []*cloudwatch.MetricDatum{} } diff --git a/plugins/outputs/cloudwatch/convert_otel_test.go b/plugins/outputs/cloudwatch/convert_otel_test.go index 655b0afc71..24749cc502 100644 --- a/plugins/outputs/cloudwatch/convert_otel_test.go +++ b/plugins/outputs/cloudwatch/convert_otel_test.go @@ -28,7 +28,7 @@ func addDimensions(dp pmetric.NumberDataPoint, count int) { for i := 0; i < count; i++ { key := keyPrefix + strconv.Itoa(i) val := valPrefix + strconv.Itoa(i) - dp.Attributes().InsertString(key, val) + dp.Attributes().PutString(key, val) } } @@ -56,19 +56,19 @@ func createTestMetrics( m.SetUnit(unit) if i%2 == 0 { - m.SetDataType(pmetric.MetricDataTypeGauge) + m.SetEmptyGauge() } else { - m.SetDataType(pmetric.MetricDataTypeSum) + m.SetEmptySum() } for j := 0; j < numDatapoints; j++ { var dp pmetric.NumberDataPoint if i%2 == 0 { dp = m.Gauge().DataPoints().AppendEmpty() - dp.SetIntVal(int64(val)) + dp.SetIntValue(int64(val)) } else { dp = m.Sum().DataPoints().AppendEmpty() - dp.SetDoubleVal(val) + dp.SetDoubleValue(val) } dp.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) diff --git a/plugins/outputs/cloudwatch/util.go b/plugins/outputs/cloudwatch/util.go index ee6d1b0abb..60524d4b35 100644 --- a/plugins/outputs/cloudwatch/util.go +++ b/plugins/outputs/cloudwatch/util.go @@ -10,6 +10,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" diff --git a/plugins/outputs/cloudwatch/util_test.go b/plugins/outputs/cloudwatch/util_test.go index 811bf1083d..de6c400dc7 100644 --- a/plugins/outputs/cloudwatch/util_test.go +++ b/plugins/outputs/cloudwatch/util_test.go @@ -11,10 +11,11 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/cloudwatch" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution" "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/regular" "github.com/aws/private-amazon-cloudwatch-agent-staging/metric/distribution/seh1" - "github.com/stretchr/testify/assert" ) func TestPublishJitter(t *testing.T) { diff --git a/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go b/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go index 56407a2926..1672e2c9f8 100644 --- a/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go +++ b/plugins/outputs/cloudwatchlogs/cloudwatchlogs.go @@ -13,14 +13,15 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/outputs" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/agentinfo" configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" "github.com/aws/private-amazon-cloudwatch-agent-staging/handlers" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/retryer" "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" ) const ( diff --git a/plugins/outputs/cloudwatchlogs/pusher.go b/plugins/outputs/cloudwatchlogs/pusher.go index 41d7a21a44..cd8872f762 100644 --- a/plugins/outputs/cloudwatchlogs/pusher.go +++ b/plugins/outputs/cloudwatchlogs/pusher.go @@ -12,9 +12,10 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/influxdata/telegraf" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - "github.com/influxdata/telegraf" ) const ( diff --git a/plugins/parsers/emf/parser.go b/plugins/parsers/emf/parser.go index dac3e0c56c..cefa52f142 100644 --- a/plugins/parsers/emf/parser.go +++ b/plugins/parsers/emf/parser.go @@ -11,9 +11,10 @@ import ( "strings" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" ) type EMFParser struct { diff --git a/plugins/parsers/registry.go b/plugins/parsers/registry.go index e9ece48681..4274d99c46 100644 --- a/plugins/parsers/registry.go +++ b/plugins/parsers/registry.go @@ -4,10 +4,11 @@ package parsers import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/awscsm" - "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/emf" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/parsers" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/awscsm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/parsers/emf" ) func EMFParserCreator(metricName string) telegraf.Parser { diff --git a/plugins/processors/ec2tagger/ec2tagger.go b/plugins/processors/ec2tagger/ec2tagger.go index 50bbe0adcc..3a1de62973 100644 --- a/plugins/processors/ec2tagger/ec2tagger.go +++ b/plugins/processors/ec2tagger/ec2tagger.go @@ -10,9 +10,6 @@ import ( "sync" "time" - configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/ec2metadata" @@ -20,6 +17,10 @@ import ( "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" + + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) type EC2MetadataAPI interface { diff --git a/plugins/processors/ec2tagger/ec2tagger_test.go b/plugins/processors/ec2tagger/ec2tagger_test.go index d85162bdf1..e326c22900 100644 --- a/plugins/processors/ec2tagger/ec2tagger_test.go +++ b/plugins/processors/ec2tagger/ec2tagger_test.go @@ -8,14 +8,15 @@ import ( "testing" "time" - configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2/ec2iface" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" + + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal" ) type mockEC2Client struct { diff --git a/plugins/processors/ecsdecorator/cgroup.go b/plugins/processors/ecsdecorator/cgroup.go index f7f694d0e1..90ca090c0c 100644 --- a/plugins/processors/ecsdecorator/cgroup.go +++ b/plugins/processors/ecsdecorator/cgroup.go @@ -6,7 +6,6 @@ package ecsdecorator import ( "bufio" "fmt" - "io/ioutil" "log" "math" "os" @@ -97,7 +96,7 @@ func readString(dirpath string, file string) (string, error) { cgroupFile := path.Join(dirpath, file) // Read - out, err := ioutil.ReadFile(cgroupFile) + out, err := os.ReadFile(cgroupFile) if err != nil { // Ignore non-existent files log.Printf("W! readString: Failed to read %q: %s", cgroupFile, err) diff --git a/plugins/processors/ecsdecorator/ecsdecorator.go b/plugins/processors/ecsdecorator/ecsdecorator.go index f877898771..d8b7506232 100644 --- a/plugins/processors/ecsdecorator/ecsdecorator.go +++ b/plugins/processors/ecsdecorator/ecsdecorator.go @@ -6,11 +6,12 @@ package ecsdecorator import ( "fmt" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/processors" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/processors" ) const ( diff --git a/plugins/processors/ecsdecorator/ecsdecorator_test.go b/plugins/processors/ecsdecorator/ecsdecorator_test.go index 45d7f98fb0..7af1a37869 100644 --- a/plugins/processors/ecsdecorator/ecsdecorator_test.go +++ b/plugins/processors/ecsdecorator/ecsdecorator_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" ) func TestTagMetricSourceForTypeInstance(t *testing.T) { diff --git a/plugins/processors/ecsdecorator/metricRule_test.go b/plugins/processors/ecsdecorator/metricRule_test.go index 02130e1e66..a6895650fe 100644 --- a/plugins/processors/ecsdecorator/metricRule_test.go +++ b/plugins/processors/ecsdecorator/metricRule_test.go @@ -9,10 +9,11 @@ import ( "testing" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) func TestNodeFull(t *testing.T) { diff --git a/plugins/processors/emfProcessor/emfProcessor.go b/plugins/processors/emfProcessor/emfProcessor.go index 07007f9349..9e5040b785 100644 --- a/plugins/processors/emfProcessor/emfProcessor.go +++ b/plugins/processors/emfProcessor/emfProcessor.go @@ -6,9 +6,10 @@ package emfProcessor import ( "log" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/processors" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) type EmfProcessor struct { diff --git a/plugins/processors/emfProcessor/emfProcessor_test.go b/plugins/processors/emfProcessor/emfProcessor_test.go index ca50b9c04e..ed2a56ccf0 100644 --- a/plugins/processors/emfProcessor/emfProcessor_test.go +++ b/plugins/processors/emfProcessor/emfProcessor_test.go @@ -7,10 +7,11 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/testutil" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) func buildTestMetricDeclarations() (mds []*metricDeclaration) { diff --git a/plugins/processors/emfProcessor/metricDefinition_test.go b/plugins/processors/emfProcessor/metricDefinition_test.go index 56834b639a..80e295c9a7 100644 --- a/plugins/processors/emfProcessor/metricDefinition_test.go +++ b/plugins/processors/emfProcessor/metricDefinition_test.go @@ -8,8 +8,9 @@ import ( "sort" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) func buildTestMetricDeclaration() *metricDeclaration { diff --git a/plugins/processors/k8sdecorator/k8sdecorator.go b/plugins/processors/k8sdecorator/k8sdecorator.go index e2fe74d4be..43af639771 100644 --- a/plugins/processors/k8sdecorator/k8sdecorator.go +++ b/plugins/processors/k8sdecorator/k8sdecorator.go @@ -6,12 +6,13 @@ package k8sdecorator import ( "time" + "github.com/influxdata/telegraf" + "github.com/influxdata/telegraf/plugins/processors" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/k8sdecorator/stores" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/processors/k8sdecorator/structuredlogsadapter" - "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/processors" ) type K8sDecorator struct { diff --git a/plugins/processors/k8sdecorator/stores/nodeinfo_test.go b/plugins/processors/k8sdecorator/stores/nodeinfo_test.go index e514be5ade..de704d577f 100644 --- a/plugins/processors/k8sdecorator/stores/nodeinfo_test.go +++ b/plugins/processors/k8sdecorator/stores/nodeinfo_test.go @@ -9,8 +9,9 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" ) func TestNodeInfo_extractEbsId(t *testing.T) { diff --git a/plugins/processors/k8sdecorator/stores/podstore.go b/plugins/processors/k8sdecorator/stores/podstore.go index c664cac49c..4059289e76 100644 --- a/plugins/processors/k8sdecorator/stores/podstore.go +++ b/plugins/processors/k8sdecorator/stores/podstore.go @@ -10,13 +10,14 @@ import ( "sync" "time" + "github.com/influxdata/telegraf" + corev1 "k8s.io/api/core/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/kubeletutil" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" "github.com/aws/private-amazon-cloudwatch-agent-staging/profiler" - "github.com/influxdata/telegraf" - corev1 "k8s.io/api/core/v1" ) const ( diff --git a/plugins/processors/k8sdecorator/stores/podstore_test.go b/plugins/processors/k8sdecorator/stores/podstore_test.go index f870e0d375..1b57a6dc9f 100644 --- a/plugins/processors/k8sdecorator/stores/podstore_test.go +++ b/plugins/processors/k8sdecorator/stores/podstore_test.go @@ -9,14 +9,14 @@ import ( "testing" "time" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" - - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" corev1 "k8s.io/api/core/v1" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/mapWithExpiry" ) func getBaseTestPodInfo() *corev1.Pod { diff --git a/plugins/processors/k8sdecorator/stores/servicestore.go b/plugins/processors/k8sdecorator/stores/servicestore.go index c4467eac67..1c5cc452bb 100644 --- a/plugins/processors/k8sdecorator/stores/servicestore.go +++ b/plugins/processors/k8sdecorator/stores/servicestore.go @@ -8,9 +8,10 @@ import ( "sync" "time" + "github.com/influxdata/telegraf" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sclient" - "github.com/influxdata/telegraf" ) const ( diff --git a/plugins/processors/k8sdecorator/stores/utils.go b/plugins/processors/k8sdecorator/stores/utils.go index 430609272e..892874eb97 100644 --- a/plugins/processors/k8sdecorator/stores/utils.go +++ b/plugins/processors/k8sdecorator/stores/utils.go @@ -8,9 +8,10 @@ import ( "strconv" "strings" + corev1 "k8s.io/api/core/v1" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/k8sCommon/k8sutil" - corev1 "k8s.io/api/core/v1" ) func createPodKeyFromMetaData(pod *corev1.Pod) string { diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go index 802491cb71..c2509ac15b 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger.go @@ -4,9 +4,10 @@ package structuredlogsadapter import ( + "github.com/influxdata/telegraf" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" - "github.com/influxdata/telegraf" ) const ( diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go index b384010156..a7220dc68d 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/metricruletagger_test.go @@ -9,10 +9,11 @@ import ( "testing" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" ) func TestNodeFull(t *testing.T) { diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go b/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go index 8ce0765391..453caa615f 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/utils.go @@ -6,10 +6,11 @@ package structuredlogsadapter import ( "fmt" + "github.com/influxdata/telegraf" + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/logscommon" "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/structuredlogscommon" - "github.com/influxdata/telegraf" ) func TagMetricSource(metric telegraf.Metric) { diff --git a/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go b/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go index fab04208b0..5614e88aef 100644 --- a/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go +++ b/plugins/processors/k8sdecorator/structuredlogsadapter/utils_test.go @@ -7,9 +7,10 @@ import ( "testing" "time" - . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" "github.com/influxdata/telegraf/metric" "github.com/stretchr/testify/assert" + + . "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/containerinsightscommon" ) func TestUtils_addKubernetesInfo(t *testing.T) { diff --git a/receiver/adapter/accumulator/accumulator.go b/receiver/adapter/accumulator/accumulator.go index 6557ac191e..0766613cc4 100644 --- a/receiver/adapter/accumulator/accumulator.go +++ b/receiver/adapter/accumulator/accumulator.go @@ -5,13 +5,15 @@ package accumulator import ( "errors" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" + "time" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/metric" "github.com/influxdata/telegraf/models" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "time" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" ) // OtelAccumulator implements the telegraf.Accumulator interface, but works as an OTel plugin by passing the metrics diff --git a/receiver/adapter/accumulator/accumulator_test.go b/receiver/adapter/accumulator/accumulator_test.go index f982aade49..53fa2abb37 100644 --- a/receiver/adapter/accumulator/accumulator_test.go +++ b/receiver/adapter/accumulator/accumulator_test.go @@ -5,13 +5,14 @@ package accumulator import ( "fmt" + "testing" + "time" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "testing" - "time" ) func Test_Accumulator_AddCounterGaugeFields(t *testing.T) { diff --git a/receiver/adapter/accumulator/metrics.go b/receiver/adapter/accumulator/metrics.go index 310fa6d368..58c24c806b 100644 --- a/receiver/adapter/accumulator/metrics.go +++ b/receiver/adapter/accumulator/metrics.go @@ -5,11 +5,12 @@ package accumulator import ( "fmt" + "log" + "time" + "github.com/influxdata/telegraf" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" - "log" - "time" ) const ( diff --git a/receiver/adapter/accumulator/metrics_test.go b/receiver/adapter/accumulator/metrics_test.go index 0cb6679139..8fbfab6da6 100644 --- a/receiver/adapter/accumulator/metrics_test.go +++ b/receiver/adapter/accumulator/metrics_test.go @@ -4,16 +4,16 @@ package accumulator import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/testutil" + "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util" ) func Test_ConvertToOtelMetrics_WithDifferentTypes(t *testing.T) { diff --git a/receiver/adapter/accumulator/testutil.go b/receiver/adapter/accumulator/testutil.go index 3ff37aa6b2..edede5fa6a 100644 --- a/receiver/adapter/accumulator/testutil.go +++ b/receiver/adapter/accumulator/testutil.go @@ -4,13 +4,14 @@ package accumulator import ( + "time" + "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/models" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" - "time" ) const ( diff --git a/receiver/adapter/accumulator/util.go b/receiver/adapter/accumulator/util.go index ef6eabbff9..5f7b0f650f 100644 --- a/receiver/adapter/accumulator/util.go +++ b/receiver/adapter/accumulator/util.go @@ -4,8 +4,9 @@ package accumulator import ( - "go.opentelemetry.io/collector/pdata/pcommon" "strings" + + "go.opentelemetry.io/collector/pdata/pcommon" ) // Otel Attributes = Telegraf Tags = CloudWatch Dimensions diff --git a/receiver/adapter/factory.go b/receiver/adapter/factory.go index 2afb47c1a0..c9f22b9932 100644 --- a/receiver/adapter/factory.go +++ b/receiver/adapter/factory.go @@ -6,14 +6,16 @@ package adapter import ( "context" "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" + "time" + telegrafconfig "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/models" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" - "time" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" ) type Adapter struct { diff --git a/receiver/adapter/factory_test.go b/receiver/adapter/factory_test.go index b011aa433b..a588c80c3e 100644 --- a/receiver/adapter/factory_test.go +++ b/receiver/adapter/factory_test.go @@ -5,6 +5,9 @@ package adapter import ( "context" + "testing" + "time" + telegrafconfig "github.com/influxdata/telegraf/config" _ "github.com/influxdata/telegraf/plugins/inputs/cpu" "github.com/stretchr/testify/assert" @@ -12,8 +15,6 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer/consumertest" "go.opentelemetry.io/collector/receiver/scraperhelper" - "testing" - "time" ) func Test_Type(t *testing.T) { diff --git a/receiver/adapter/plugins_test.go b/receiver/adapter/plugins_test.go index 59135f1f83..c7f91ed03f 100644 --- a/receiver/adapter/plugins_test.go +++ b/receiver/adapter/plugins_test.go @@ -8,6 +8,9 @@ package adapter import ( "fmt" + "testing" + "time" + "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/config" "github.com/influxdata/telegraf/plugins/inputs/disk" @@ -17,8 +20,6 @@ import ( "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap/zaptest" - "testing" - "time" ) var testCfg = "./testdata/all_plugins.toml" diff --git a/receiver/adapter/receiver.go b/receiver/adapter/receiver.go index 446fd634c6..e1c8506a67 100644 --- a/receiver/adapter/receiver.go +++ b/receiver/adapter/receiver.go @@ -5,11 +5,13 @@ package adapter import ( "context" - "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" + "github.com/influxdata/telegraf/models" "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/pdata/pmetric" "go.uber.org/zap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" ) type AdaptedReceiver struct { diff --git a/receiver/adapter/receiver_test.go b/receiver/adapter/receiver_test.go index b1a494a271..8ea36782c5 100644 --- a/receiver/adapter/receiver_test.go +++ b/receiver/adapter/receiver_test.go @@ -5,12 +5,14 @@ package adapter import ( "context" - "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" + "testing" + "github.com/influxdata/telegraf/models" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/component/componenttest" "go.uber.org/zap" - "testing" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter/accumulator" ) func Test_AdaptedReceiver_WithEmptyMetrics(t *testing.T) { diff --git a/tool/data/config/agent_test.go b/tool/data/config/agent_test.go index 839729cd43..f0ab8d8062 100644 --- a/tool/data/config/agent_test.go +++ b/tool/data/config/agent_test.go @@ -6,11 +6,10 @@ package config import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestAgent_ToMap(t *testing.T) { diff --git a/tool/data/config/logs/config_test.go b/tool/data/config/logs/config_test.go index c60bd64990..bdf542c226 100644 --- a/tool/data/config/logs/config_test.go +++ b/tool/data/config/logs/config_test.go @@ -6,9 +6,9 @@ package logs import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestConfig_ToMap(t *testing.T) { diff --git a/tool/data/config/logs/eventConfig_test.go b/tool/data/config/logs/eventConfig_test.go index 86afc1bcf8..b97c86df9d 100644 --- a/tool/data/config/logs/eventConfig_test.go +++ b/tool/data/config/logs/eventConfig_test.go @@ -6,8 +6,9 @@ package logs import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestEventConfig_ToMap(t *testing.T) { diff --git a/tool/data/config/logs/events_test.go b/tool/data/config/logs/events_test.go index fa6adc87da..63269c7e77 100644 --- a/tool/data/config/logs/events_test.go +++ b/tool/data/config/logs/events_test.go @@ -6,9 +6,9 @@ package logs import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestEvents_ToMap(t *testing.T) { diff --git a/tool/data/config/logs/files_test.go b/tool/data/config/logs/files_test.go index 92c130ab36..da1c095718 100644 --- a/tool/data/config/logs/files_test.go +++ b/tool/data/config/logs/files_test.go @@ -6,8 +6,9 @@ package logs import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestFiles_ToMap(t *testing.T) { diff --git a/tool/data/config/logs_test.go b/tool/data/config/logs_test.go index a3ada1094c..948b64df75 100644 --- a/tool/data/config/logs_test.go +++ b/tool/data/config/logs_test.go @@ -6,9 +6,9 @@ package config import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestLogs_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/aggregationDimensions_test.go b/tool/data/config/metric/aggregationDimensions_test.go index 625dcf40cd..0d689a2e0d 100644 --- a/tool/data/config/metric/aggregationDimensions_test.go +++ b/tool/data/config/metric/aggregationDimensions_test.go @@ -6,9 +6,9 @@ package metric import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestAggregationDimension_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/appendDimensions_test.go b/tool/data/config/metric/appendDimensions_test.go index 71a5ebc697..adc65b3a49 100644 --- a/tool/data/config/metric/appendDimensions_test.go +++ b/tool/data/config/metric/appendDimensions_test.go @@ -6,9 +6,9 @@ package metric import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestGlobalDimension_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/collectd/collectd_test.go b/tool/data/config/metric/collectd/collectd_test.go index 81172b1b86..4a49f40949 100644 --- a/tool/data/config/metric/collectd/collectd_test.go +++ b/tool/data/config/metric/collectd/collectd_test.go @@ -6,9 +6,9 @@ package collectd import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestCollectD_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/collection_test.go b/tool/data/config/metric/collection_test.go index 64c93816b9..6276d5d9a0 100644 --- a/tool/data/config/metric/collection_test.go +++ b/tool/data/config/metric/collection_test.go @@ -6,11 +6,10 @@ package metric import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestCollection_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/cpu_test.go b/tool/data/config/metric/linux/cpu_test.go index 713c34215f..97f2230fe1 100644 --- a/tool/data/config/metric/linux/cpu_test.go +++ b/tool/data/config/metric/linux/cpu_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestCPU_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/disk_test.go b/tool/data/config/metric/linux/disk_test.go index f535e79d43..106ee66519 100644 --- a/tool/data/config/metric/linux/disk_test.go +++ b/tool/data/config/metric/linux/disk_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestDisk_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/diskio_test.go b/tool/data/config/metric/linux/diskio_test.go index ffff690369..33c1dd75a1 100644 --- a/tool/data/config/metric/linux/diskio_test.go +++ b/tool/data/config/metric/linux/diskio_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestDiskIO_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/memory_test.go b/tool/data/config/metric/linux/memory_test.go index e4bc1def2c..b9c12848d1 100644 --- a/tool/data/config/metric/linux/memory_test.go +++ b/tool/data/config/metric/linux/memory_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestMemory_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/net_test.go b/tool/data/config/metric/linux/net_test.go index 8b464f1f3b..45c099ea93 100644 --- a/tool/data/config/metric/linux/net_test.go +++ b/tool/data/config/metric/linux/net_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestNet_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/netstat_test.go b/tool/data/config/metric/linux/netstat_test.go index 875b07f787..684a8180e5 100644 --- a/tool/data/config/metric/linux/netstat_test.go +++ b/tool/data/config/metric/linux/netstat_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestNetStat_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/linux/swap_test.go b/tool/data/config/metric/linux/swap_test.go index 8b893e4a26..ee612e6023 100644 --- a/tool/data/config/metric/linux/swap_test.go +++ b/tool/data/config/metric/linux/swap_test.go @@ -6,9 +6,9 @@ package linux import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestSwap_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/statsd/statsd_test.go b/tool/data/config/metric/statsd/statsd_test.go index 52793e9a43..4612661587 100644 --- a/tool/data/config/metric/statsd/statsd_test.go +++ b/tool/data/config/metric/statsd/statsd_test.go @@ -6,9 +6,9 @@ package statsd import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestStatsD_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/logicalDisk_test.go b/tool/data/config/metric/windows/logicalDisk_test.go index 2c07b075e4..67a87590a9 100644 --- a/tool/data/config/metric/windows/logicalDisk_test.go +++ b/tool/data/config/metric/windows/logicalDisk_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestLogicalDisk_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/memory_test.go b/tool/data/config/metric/windows/memory_test.go index a6ad7a36f7..0e3e843454 100644 --- a/tool/data/config/metric/windows/memory_test.go +++ b/tool/data/config/metric/windows/memory_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestMemory_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/networkInterface_test.go b/tool/data/config/metric/windows/networkInterface_test.go index a517b0ab54..8325e53839 100644 --- a/tool/data/config/metric/windows/networkInterface_test.go +++ b/tool/data/config/metric/windows/networkInterface_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestNetworkInterface_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/pagingFile_test.go b/tool/data/config/metric/windows/pagingFile_test.go index 1a94cae838..7120a0a42a 100644 --- a/tool/data/config/metric/windows/pagingFile_test.go +++ b/tool/data/config/metric/windows/pagingFile_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestPagingFile_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/physicalDisk_test.go b/tool/data/config/metric/windows/physicalDisk_test.go index 58c1e39453..c9b7271320 100644 --- a/tool/data/config/metric/windows/physicalDisk_test.go +++ b/tool/data/config/metric/windows/physicalDisk_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestPhysicalDisk_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/processor_test.go b/tool/data/config/metric/windows/processor_test.go index e7e9e5ebb8..44479c03cf 100644 --- a/tool/data/config/metric/windows/processor_test.go +++ b/tool/data/config/metric/windows/processor_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestProcessor_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/tcpv4_test.go b/tool/data/config/metric/windows/tcpv4_test.go index bf524a32e3..b622072d08 100644 --- a/tool/data/config/metric/windows/tcpv4_test.go +++ b/tool/data/config/metric/windows/tcpv4_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestTCPv4_ToMap(t *testing.T) { diff --git a/tool/data/config/metric/windows/tcpv6_test.go b/tool/data/config/metric/windows/tcpv6_test.go index d3626a39e5..902d9c8ac7 100644 --- a/tool/data/config/metric/windows/tcpv6_test.go +++ b/tool/data/config/metric/windows/tcpv6_test.go @@ -6,9 +6,9 @@ package windows import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" ) func TestTCPv6_ToMap(t *testing.T) { diff --git a/tool/data/config/metrics_test.go b/tool/data/config/metrics_test.go index fb5770a971..b4f1aa5201 100644 --- a/tool/data/config/metrics_test.go +++ b/tool/data/config/metrics_test.go @@ -6,11 +6,10 @@ package config import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestMetrics_ToMap(t *testing.T) { diff --git a/tool/data/config_test.go b/tool/data/config_test.go index 3ace632732..35eb94c7fa 100644 --- a/tool/data/config_test.go +++ b/tool/data/config_test.go @@ -6,10 +6,10 @@ package data import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) //more detailed internal content should be already tested in the individual struct unit tests diff --git a/tool/processors/agentconfig/agentConfig_test.go b/tool/processors/agentconfig/agentConfig_test.go index 69e7c57f05..3bb9f547e4 100644 --- a/tool/processors/agentconfig/agentConfig_test.go +++ b/tool/processors/agentconfig/agentConfig_test.go @@ -6,11 +6,11 @@ package agentconfig import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/basicInfo/basicInfo.go b/tool/processors/basicInfo/basicInfo.go index ba8a7d4e4e..31694e6d13 100644 --- a/tool/processors/basicInfo/basicInfo.go +++ b/tool/processors/basicInfo/basicInfo.go @@ -6,10 +6,9 @@ package basicInfo import ( "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) diff --git a/tool/processors/basicInfo/basicInfo_test.go b/tool/processors/basicInfo/basicInfo_test.go index c93a85ef36..f18d3fd748 100644 --- a/tool/processors/basicInfo/basicInfo_test.go +++ b/tool/processors/basicInfo/basicInfo_test.go @@ -6,14 +6,13 @@ package basicInfo import ( "testing" + "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/agentconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/collectd/collectd_test.go b/tool/processors/collectd/collectd_test.go index acb114566a..096f8d446b 100644 --- a/tool/processors/collectd/collectd_test.go +++ b/tool/processors/collectd/collectd_test.go @@ -6,16 +6,14 @@ package collectd import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" + "github.com/stretchr/testify/assert" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration" - - "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/defaultConfig/defaultConfig.go b/tool/processors/defaultConfig/defaultConfig.go index dfcd6da413..00c50d6051 100644 --- a/tool/processors/defaultConfig/defaultConfig.go +++ b/tool/processors/defaultConfig/defaultConfig.go @@ -6,7 +6,6 @@ package defaultConfig import ( "encoding/json" "fmt" - "log" "strconv" diff --git a/tool/processors/defaultConfig/defaultConfig_test.go b/tool/processors/defaultConfig/defaultConfig_test.go index 7b21db3e1f..0a55d36990 100644 --- a/tool/processors/defaultConfig/defaultConfig_test.go +++ b/tool/processors/defaultConfig/defaultConfig_test.go @@ -6,16 +6,13 @@ package defaultConfig import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question" - - "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/migration/linux/knownConfigKeys.go b/tool/processors/migration/linux/knownConfigKeys.go index e7db352700..5e70d906ea 100644 --- a/tool/processors/migration/linux/knownConfigKeys.go +++ b/tool/processors/migration/linux/knownConfigKeys.go @@ -7,12 +7,11 @@ import ( "fmt" "log" "strconv" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" - "strings" "github.com/bigkevmcd/go-configparser" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" ) var knownConfigKeys = []string{ diff --git a/tool/processors/migration/linux/linuxMigration.go b/tool/processors/migration/linux/linuxMigration.go index f6fe0ca393..c4037d824d 100644 --- a/tool/processors/migration/linux/linuxMigration.go +++ b/tool/processors/migration/linux/linuxMigration.go @@ -6,14 +6,14 @@ package linux import ( "log" + "github.com/bigkevmcd/go-configparser" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/bigkevmcd/go-configparser" ) const ( diff --git a/tool/processors/migration/linux/linuxMigration_test.go b/tool/processors/migration/linux/linuxMigration_test.go index 84f69c9dad..ac3b4b25e7 100644 --- a/tool/processors/migration/linux/linuxMigration_test.go +++ b/tool/processors/migration/linux/linuxMigration_test.go @@ -4,22 +4,17 @@ package linux import ( - "io/ioutil" "os" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" + "github.com/stretchr/testify/assert" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { @@ -39,10 +34,10 @@ func TestProcessor_Process(t *testing.T) { initial_position = start_of_file log_group_name = /var/log/messages ` - tmpFile, _ := ioutil.TempFile("", "") + tmpFile, _ := os.CreateTemp("", "") defer os.Remove(tmpFile.Name()) - err := ioutil.WriteFile(tmpFile.Name(), []byte(tomlString), os.ModePerm) + err := os.WriteFile(tmpFile.Name(), []byte(tomlString), os.ModePerm) assert.NoError(t, err) expectedMap := map[string]interface{}{ @@ -139,10 +134,10 @@ func TestProcessConfigFromPythonConfigParserFile(t *testing.T) { }, } - tmpFile, _ := ioutil.TempFile("", "") + tmpFile, _ := os.CreateTemp("", "") defer os.Remove(tmpFile.Name()) - err := ioutil.WriteFile(tmpFile.Name(), []byte(tomlString), os.ModePerm) + err := os.WriteFile(tmpFile.Name(), []byte(tomlString), os.ModePerm) assert.NoError(t, err) ctx := new(runtime.Context) diff --git a/tool/processors/migration/migration_test.go b/tool/processors/migration/migration_test.go index e12cb27384..0dbe5b83ac 100644 --- a/tool/processors/migration/migration_test.go +++ b/tool/processors/migration/migration_test.go @@ -6,14 +6,13 @@ package migration import ( "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/windows" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/migration/windows/windows_migration.go b/tool/processors/migration/windows/windows_migration.go index 463e45422a..524ad41b70 100644 --- a/tool/processors/migration/windows/windows_migration.go +++ b/tool/processors/migration/windows/windows_migration.go @@ -5,8 +5,6 @@ package windows import ( "encoding/json" - "io/ioutil" - "fmt" "os" @@ -43,7 +41,7 @@ func migrateOldAgentConfig() { // 1 - parse the old config var oldConfig OldSsmCwConfig absPath := util.AskWithDefault(filePathWindowsConfigQuestion, DefaultFilePathWindowsConfiguration) - if file, err := ioutil.ReadFile(absPath); err == nil { + if file, err := os.ReadFile(absPath); err == nil { if err := json.Unmarshal(file, &oldConfig); err != nil { fmt.Fprintf(os.Stderr, "Failed to parse the provided configuration file. Error details: %v", err) os.Exit(1) diff --git a/tool/processors/migration/windows/windows_migration_core.go b/tool/processors/migration/windows/windows_migration_core.go index 59eba24849..83a8b6ca8c 100644 --- a/tool/processors/migration/windows/windows_migration_core.go +++ b/tool/processors/migration/windows/windows_migration_core.go @@ -4,11 +4,10 @@ package windows import ( - "log" - "strings" - "fmt" + "log" "os" + "strings" "github.com/Jeffail/gabs" ) diff --git a/tool/processors/migration/windows/windows_migration_test.go b/tool/processors/migration/windows/windows_migration_test.go index cac3b57bb9..d3340fd92e 100644 --- a/tool/processors/migration/windows/windows_migration_test.go +++ b/tool/processors/migration/windows/windows_migration_test.go @@ -9,9 +9,10 @@ import ( "path/filepath" "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/defaultConfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/stretchr/testify/assert" ) func TestNextProcessor(t *testing.T) { diff --git a/tool/processors/migration/windows/windows_util.go b/tool/processors/migration/windows/windows_util.go index 798c672a29..15056c1a18 100644 --- a/tool/processors/migration/windows/windows_util.go +++ b/tool/processors/migration/windows/windows_util.go @@ -7,7 +7,7 @@ import ( "encoding/json" "errors" "fmt" - "io/ioutil" + "os" "reflect" ) @@ -23,7 +23,7 @@ func AreTwoConfigurationsEqual(config1 NewCwConfig, config2 NewCwConfig) bool { func ReadNewConfigFromPath(path string) (config NewCwConfig, err error) { var file []byte - if file, err = ioutil.ReadFile(path); err == nil { + if file, err = os.ReadFile(path); err == nil { if err = json.Unmarshal(file, &config); err == nil { return config, nil } @@ -34,7 +34,7 @@ func ReadNewConfigFromPath(path string) (config NewCwConfig, err error) { func ReadOldConfigFromPath(path string) (config OldSsmCwConfig, err error) { var file []byte - if file, err = ioutil.ReadFile(path); err == nil { + if file, err = os.ReadFile(path); err == nil { if err = json.Unmarshal(file, &config); err == nil { return config, nil } @@ -45,7 +45,7 @@ func ReadOldConfigFromPath(path string) (config OldSsmCwConfig, err error) { func ReadConfigFromPathAsString(path string) (str string, err error) { var file []byte - if file, err = ioutil.ReadFile(path); err == nil { + if file, err = os.ReadFile(path); err == nil { return string(file), nil } fmt.Println(err) diff --git a/tool/processors/question/events/events_test.go b/tool/processors/question/events/events_test.go index 344ad3983c..e2841ad07c 100644 --- a/tool/processors/question/events/events_test.go +++ b/tool/processors/question/events/events_test.go @@ -6,15 +6,13 @@ package events import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/question/logs/logs.go b/tool/processors/question/logs/logs.go index 4fa87bd89b..2cfd8f7067 100644 --- a/tool/processors/question/logs/logs.go +++ b/tool/processors/question/logs/logs.go @@ -14,7 +14,6 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) diff --git a/tool/processors/question/logs/logs_test.go b/tool/processors/question/logs/logs_test.go index 791a223a19..50b3c0e84c 100644 --- a/tool/processors/question/logs/logs_test.go +++ b/tool/processors/question/logs/logs_test.go @@ -6,16 +6,14 @@ package logs import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/events" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/serialization" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/question/metrics/metrics_test.go b/tool/processors/question/metrics/metrics_test.go index a2f7a09443..be4cf6bae3 100644 --- a/tool/processors/question/metrics/metrics_test.go +++ b/tool/processors/question/metrics/metrics_test.go @@ -6,17 +6,14 @@ package metrics import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/logs" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/migration/linux" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/question/question_test.go b/tool/processors/question/question_test.go index a0e8216bbd..924e773389 100644 --- a/tool/processors/question/question_test.go +++ b/tool/processors/question/question_test.go @@ -6,11 +6,11 @@ package question import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/question/metrics" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/serialization/serialization_test.go b/tool/processors/serialization/serialization_test.go index c0e2243301..27004a5ad2 100644 --- a/tool/processors/serialization/serialization_test.go +++ b/tool/processors/serialization/serialization_test.go @@ -6,11 +6,11 @@ package serialization import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/ssm" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/processors/ssm/ssm.go b/tool/processors/ssm/ssm.go index 3eae459d74..518b7ef212 100644 --- a/tool/processors/ssm/ssm.go +++ b/tool/processors/ssm/ssm.go @@ -4,23 +4,20 @@ package ssm import ( - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - - "time" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - "fmt" - "os" + "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ssm" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" ) const ( diff --git a/tool/processors/ssm/ssm_test.go b/tool/processors/ssm/ssm_test.go index 3d0f685a6b..4ff009d77d 100644 --- a/tool/processors/ssm/ssm_test.go +++ b/tool/processors/ssm/ssm_test.go @@ -6,12 +6,11 @@ package ssm import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/util" - - "github.com/stretchr/testify/assert" ) func TestProcessor_NextProcessor(t *testing.T) { diff --git a/tool/processors/statsd/statsd_test.go b/tool/processors/statsd/statsd_test.go index f9c543ca76..9cd04202a2 100644 --- a/tool/processors/statsd/statsd_test.go +++ b/tool/processors/statsd/statsd_test.go @@ -6,13 +6,13 @@ package statsd import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/config/metric/statsd" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/processors/collectd" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - - "github.com/stretchr/testify/assert" ) func TestProcessor_Process(t *testing.T) { diff --git a/tool/util/util.go b/tool/util/util.go index 0e962536a8..09338ed57d 100644 --- a/tool/util/util.go +++ b/tool/util/util.go @@ -6,25 +6,23 @@ package util import ( "encoding/json" "fmt" - "io/ioutil" + "net/http" "os" "path" "path/filepath" sysruntime "runtime" "strconv" - - configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/interfaze" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin" - - "net/http" "time" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" + + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/data/interfaze" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/runtime" + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/stdin" ) const ( @@ -57,7 +55,7 @@ func ConfigFilePath() string { func PermissionCheck() { filePath := ConfigFilePath() - err := ioutil.WriteFile(filePath, []byte(""), 0755) + err := os.WriteFile(filePath, []byte(""), 0755) if err != nil { fmt.Printf("Make sure that you have write permission to %s\n", filePath) os.Exit(1) @@ -66,7 +64,7 @@ func PermissionCheck() { func ReadConfigFromJsonFile() string { filePath := ConfigFilePath() - byteArray, err := ioutil.ReadFile(filePath) + byteArray, err := os.ReadFile(filePath) if err != nil { fmt.Printf("Error in reading config from file %s: %v\n", filePath, err) os.Exit(1) @@ -85,7 +83,7 @@ func SerializeResultMapToJsonByteArray(resultMap map[string]interface{}) []byte func SaveResultByteArrayToJsonFile(resultByteArray []byte) string { filePath := ConfigFilePath() - err := ioutil.WriteFile(filePath, resultByteArray, 0755) + err := os.WriteFile(filePath, resultByteArray, 0755) if err != nil { fmt.Printf("Error in writing file to %s: %v\nMake sure that you have write permission to %s.", filePath, err, filePath) os.Exit(1) diff --git a/tool/util/util_test.go b/tool/util/util_test.go index f5f133e03f..516087f919 100644 --- a/tool/util/util_test.go +++ b/tool/util/util_test.go @@ -4,15 +4,13 @@ package util import ( - "io/ioutil" + "os" "runtime" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" - - "os" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/tool/testutil" ) var expectResult = `{ @@ -31,7 +29,7 @@ func TestCurOS(t *testing.T) { } func TestReadConfigFromJsonFile(t *testing.T) { - err := ioutil.WriteFile(ConfigFilePath(), []byte(expectResult), os.ModePerm) + err := os.WriteFile(ConfigFilePath(), []byte(expectResult), os.ModePerm) assert.NoError(t, err) actualResult := ReadConfigFromJsonFile() @@ -58,7 +56,7 @@ func TestSerializeResultMapToJsonByteArray(t *testing.T) { func TestSaveResultByteArrayToJsonFile(t *testing.T) { filePath := SaveResultByteArrayToJsonFile([]byte(expectResult)) - bytes, err := ioutil.ReadFile(filePath) + bytes, err := os.ReadFile(filePath) assert.NoError(t, err) actualResult := string(bytes) assert.Equal(t, expectResult, actualResult) diff --git a/translator/cmdutil/translatorutil.go b/translator/cmdutil/translatorutil.go index b464cd79d8..fd42776cf8 100644 --- a/translator/cmdutil/translatorutil.go +++ b/translator/cmdutil/translatorutil.go @@ -5,13 +5,14 @@ package cmdutil import ( "fmt" - "io/ioutil" "log" "os" "path" "path/filepath" "strings" + "github.com/xeipuuv/gojsonschema" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" @@ -22,7 +23,6 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate" translatorUtil "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - "github.com/xeipuuv/gojsonschema" ) const ( @@ -39,7 +39,7 @@ func TranslateJsonMapToEnvConfigFile(jsonConfigValue map[string]interface{}, env return } bytes := toenvconfig.ToEnvConfig(jsonConfigValue) - if err := ioutil.WriteFile(envConfigPath, bytes, 0644); err != nil { + if err := os.WriteFile(envConfigPath, bytes, 0644); err != nil { log.Panicf("E! Failed to create env config. Reason: %s", err.Error()) } } @@ -217,13 +217,13 @@ func TranslateJsonMapToConfig(jsonConfigValue interface{}) interface{} { func ConfigToTomlFile(config interface{}, tomlConfigFilePath string) { res := totomlconfig.ToTomlConfig(config) - err := ioutil.WriteFile(tomlConfigFilePath, []byte(res), fileMode) + err := os.WriteFile(tomlConfigFilePath, []byte(res), fileMode) translatorUtil.PanicIfErr("E! Failed to create the configuration validation file. Reason:", err) } func ConfigToYamlFile(config interface{}, yamlConfigFilePath string) { res, _ := toyamlconfig.ToYamlConfig(config) - err := ioutil.WriteFile(yamlConfigFilePath, []byte(res), fileMode) + err := os.WriteFile(yamlConfigFilePath, []byte(res), fileMode) translatorUtil.PanicIfErr("E! Failed to create the configuration validation file. Reason:", err) } diff --git a/translator/cmdutil/userutil.go b/translator/cmdutil/userutil.go index 65385bdb4c..8001981973 100644 --- a/translator/cmdutil/userutil.go +++ b/translator/cmdutil/userutil.go @@ -113,7 +113,7 @@ func chownRecursive(uid, gid int, dir string) error { func VerifyCredentials(ctx *context.Context, runAsUser string) { credentials := ctx.Credentials() - if (config.ModeOnPrem == ctx.Mode()) || (config.ModeOnPremise == ctx.Mode()) { + if (config.ModeOnPrem == ctx.Mode()) || (config.ModeOnPremise == ctx.Mode()) { if runAsUser != "root" { if _, ok := credentials["shared_credential_file"]; !ok { log.Panic("E! Credentials path is not set while runasuser is not root") diff --git a/translator/cmdutil/userutil_linux_test.go b/translator/cmdutil/userutil_linux_test.go index afcee5311f..e62e20c512 100644 --- a/translator/cmdutil/userutil_linux_test.go +++ b/translator/cmdutil/userutil_linux_test.go @@ -8,7 +8,6 @@ package cmdutil import ( "fmt" - "io/ioutil" "os" "testing" @@ -17,7 +16,7 @@ import ( ) func TestGetGroupIds(t *testing.T) { - tmpfile, err := ioutil.TempFile("", "group-file-test") + tmpfile, err := os.CreateTemp("", "group-file-test") require.Nil(t, err, "Failed to create temp file") defer os.Remove(tmpfile.Name()) diff --git a/translator/cmdutil/userutil_test.go b/translator/cmdutil/userutil_test.go index 54b9f83b09..54dde66ee9 100644 --- a/translator/cmdutil/userutil_test.go +++ b/translator/cmdutil/userutil_test.go @@ -4,7 +4,6 @@ package cmdutil import ( - "io/ioutil" "os" "path/filepath" "reflect" @@ -26,7 +25,7 @@ func (c *MockChowner) Chown(path string, uid, gid int) error { } func TestChangeFileOwner(t *testing.T) { - base, err := ioutil.TempDir("", "testChown") + base, err := os.MkdirTemp("", "testChown") if err != nil { t.Fatalf("failed to crate temp test folder: %v", err) } diff --git a/translator/config/mode.go b/translator/config/mode.go index 9b0b748eee..a70e128112 100644 --- a/translator/config/mode.go +++ b/translator/config/mode.go @@ -6,5 +6,5 @@ package config const ( ModeEC2 = "ec2" ModeOnPrem = "onPrem" - ModeOnPremise = "onPremise" + ModeOnPremise = "onPremise" ) diff --git a/translator/config/schema_test.go b/translator/config/schema_test.go index dc3741d7d9..fdc22f4bbc 100644 --- a/translator/config/schema_test.go +++ b/translator/config/schema_test.go @@ -4,7 +4,7 @@ package config import ( - "io/ioutil" + "os" "strings" "testing" @@ -12,7 +12,7 @@ import ( ) func TestGetJsonSchema(t *testing.T) { - jsonFile, err := ioutil.ReadFile("./schema.json") + jsonFile, err := os.ReadFile("./schema.json") if err != nil { panic(err) } diff --git a/translator/jsonconfig/mergeJsonConfig.go b/translator/jsonconfig/mergeJsonConfig.go index 368dadf60c..2cf50c7d6f 100644 --- a/translator/jsonconfig/mergeJsonConfig.go +++ b/translator/jsonconfig/mergeJsonConfig.go @@ -8,13 +8,12 @@ import ( "os" "sort" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" _ "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/registerrules" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) func MergeJsonConfigMaps(jsonConfigMapMap map[string]map[string]interface{}, defaultJsonConfigMap map[string]interface{}, multiConfig string) (map[string]interface{}, error) { diff --git a/translator/jsonconfig/mergeJsonConfig_test.go b/translator/jsonconfig/mergeJsonConfig_test.go index 6064162ac5..745c7caec4 100644 --- a/translator/jsonconfig/mergeJsonConfig_test.go +++ b/translator/jsonconfig/mergeJsonConfig_test.go @@ -6,15 +6,15 @@ package jsonconfig import ( "encoding/json" "fmt" - "io/ioutil" "log" + "os" "reflect" "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "github.com/stretchr/testify/assert" ) type TestData struct { @@ -69,7 +69,7 @@ func executeTest(t *testing.T, testData TestData) { t.Fatalf("Failed to merge json maps with error: %v", err) } expectedFileName := fmt.Sprintf("./sampleJsonConfig/test_%v/expected_output.json", testData.testId) - expectedOutputBytes, err := ioutil.ReadFile(expectedFileName) + expectedOutputBytes, err := os.ReadFile(expectedFileName) if err != nil { t.Fatalf("Failed to read expected output file %v with error: %v", expectedFileName, err) } diff --git a/translator/registerrules/register_rules.go b/translator/registerrules/register_rules.go index 332ba567cb..231d9fd53a 100644 --- a/translator/registerrules/register_rules.go +++ b/translator/registerrules/register_rules.go @@ -1,4 +1,5 @@ package registerrules + // Rules register themselves during import with their parent rules in a hierarchy up until the root translator object. // Because of this, when rules need to be registered and merged, this package should be imported as a whole import ( diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index c26aa1f04a..f8a535202b 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -7,32 +7,28 @@ import ( "bytes" "encoding/json" "fmt" - "io/ioutil" "log" + "os" "testing" - "gopkg.in/yaml.v3" - "github.com/BurntSushi/toml" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toenvconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig/tomlConfigTemplate" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/kr/pretty" + "github.com/stretchr/testify/assert" + "gopkg.in/yaml.v3" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/cmdutil" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "os" - - commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toenvconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig/tomlConfigTemplate" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) func TestLogMetricOnly(t *testing.T) { @@ -237,7 +233,7 @@ func checkTranslationForPaths(t *testing.T, jsonFilePath string, expectedTomlFil func readCommonConfig() { ctx := context.CurrentContext() config := commonconfig.New() - data, _ := ioutil.ReadFile("./sampleConfig/commonConfigTest.toml") + data, _ := os.ReadFile("./sampleConfig/commonConfigTest.toml") config.Parse(bytes.NewReader(data)) ctx.SetCredentials(config.CredentialsMap()) ctx.SetProxy(config.ProxyMap()) @@ -279,7 +275,7 @@ func verifyToTomlTranslation(t *testing.T, config interface{}, desiredTomlPath s func verifyToYamlTranslation(t *testing.T, config interface{}, expectedYamlFilePath string) { t.Helper() _, actual := toyamlconfig.ToYamlConfig(config) - bs, err := ioutil.ReadFile(expectedYamlFilePath) + bs, err := os.ReadFile(expectedYamlFilePath) assert.NoError(t, err) bf := bytes.NewReader(bs) decoder := yaml.NewDecoder(bf) diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go index 2e28a34d15..96b59444da 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go @@ -2,10 +2,12 @@ package translate import ( _ "embed" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" + "fmt" + "gopkg.in/yaml.v3" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" ) -import "fmt" //go:embed emf_config.yml var awsemfConfig string diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go index 5bc6033f9f..300a074fb6 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go @@ -2,8 +2,9 @@ package translate import ( "fmt" - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" ) func TestAwsContainerInsightReceiverTranslateReceivers(t *testing.T) { diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index dec0ed86e8..1055b466f2 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -7,14 +7,15 @@ import ( "bytes" "log" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/service" + "gopkg.in/yaml.v3" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative/translate" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - "go.opentelemetry.io/collector/config" - "go.opentelemetry.io/collector/service" - "gopkg.in/yaml.v3" ) const ( diff --git a/translator/totomlconfig/toTomlConfig_test.go b/translator/totomlconfig/toTomlConfig_test.go index ec6c084459..1a7593b25d 100644 --- a/translator/totomlconfig/toTomlConfig_test.go +++ b/translator/totomlconfig/toTomlConfig_test.go @@ -6,32 +6,28 @@ package totomlconfig import ( "bytes" "encoding/json" - "io/ioutil" "log" + "os" "strings" "testing" "github.com/BurntSushi/toml" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/totomlconfig" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/kr/pretty" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - - "os" - - commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig/tomlConfigTemplate" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) func ReadFromFile(filename string) string { - data, err := ioutil.ReadFile(filename) + data, err := os.ReadFile(filename) if err != nil { panic(err) } @@ -250,7 +246,7 @@ func checkTomlTranslation(t *testing.T, jsonPath string, desiredTomlPath string, func readCommonConfig() { ctx := context.CurrentContext() config := commonconfig.New() - data, _ := ioutil.ReadFile("./sampleConfig/commonConfigTest.toml") + data, _ := os.ReadFile("./sampleConfig/commonConfigTest.toml") config.Parse(bytes.NewReader(data)) ctx.SetCredentials(config.CredentialsMap()) ctx.SetProxy(config.ProxyMap()) diff --git a/translator/translate/agent/agent_test.go b/translator/translate/agent/agent_test.go index 93424b41f1..3a4ab3f6da 100644 --- a/translator/translate/agent/agent_test.go +++ b/translator/translate/agent/agent_test.go @@ -5,17 +5,14 @@ package agent import ( "encoding/json" + "os" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/logger" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" - - "os" - - "github.com/stretchr/testify/assert" ) var httpProxy string diff --git a/translator/translate/agent/ruleCommonCreds_test.go b/translator/translate/agent/ruleCommonCreds_test.go index e13cab1074..0a0b60bf13 100644 --- a/translator/translate/agent/ruleCommonCreds_test.go +++ b/translator/translate/agent/ruleCommonCreds_test.go @@ -6,11 +6,12 @@ package agent import ( "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" - "github.com/stretchr/testify/assert" ) func TestCommonCredsConfig(t *testing.T) { diff --git a/translator/translate/agent/ruleGlobalCredentials_test.go b/translator/translate/agent/ruleGlobalCredentials_test.go index f1162c1c5a..84f04fb46e 100644 --- a/translator/translate/agent/ruleGlobalCredentials_test.go +++ b/translator/translate/agent/ruleGlobalCredentials_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) func TestWithAgentConfig(t *testing.T) { diff --git a/translator/translate/csm/csm_test.go b/translator/translate/csm/csm_test.go index dfa9bbbf24..0a1c977e2c 100644 --- a/translator/translate/csm/csm_test.go +++ b/translator/translate/csm/csm_test.go @@ -7,11 +7,10 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - - "github.com/stretchr/testify/assert" ) const ( diff --git a/translator/translate/csm/ruleEndpointOverride.go b/translator/translate/csm/ruleEndpointOverride.go index 832df11e74..b2103f9a45 100644 --- a/translator/translate/csm/ruleEndpointOverride.go +++ b/translator/translate/csm/ruleEndpointOverride.go @@ -6,9 +6,8 @@ package csm import ( "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/csm" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) type EndpointOverride struct{} diff --git a/translator/translate/logs/logs_collected/files/collect_list/collect_list.go b/translator/translate/logs/logs_collected/files/collect_list/collect_list.go index b858768d28..326fef0ed5 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/collect_list.go +++ b/translator/translate/logs/logs_collected/files/collect_list/collect_list.go @@ -5,7 +5,7 @@ package collect_list import ( "encoding/json" - "io/ioutil" + "os" "path/filepath" "sort" @@ -119,7 +119,7 @@ func outputLogConfig(logConfigs []interface{}) { Region: agent.Global_Config.Region, } if bytes, err := json.Marshal(outputFile); err == nil { - ioutil.WriteFile(outputLogConfigFilePath, bytes, 0644) + os.WriteFile(outputLogConfigFilePath, bytes, 0644) } } diff --git a/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go b/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go index 34fa5a0278..57eea12a8b 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go +++ b/translator/translate/logs/logs_collected/files/collect_list/collect_list_test.go @@ -5,18 +5,17 @@ package collect_list import ( "encoding/json" - "io/ioutil" "os" "path/filepath" "regexp" "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - - "github.com/stretchr/testify/assert" ) func TestFileConfig(t *testing.T) { @@ -480,7 +479,7 @@ func TestAutoRemoval(t *testing.T) { } func TestFileConfigOutputFile(t *testing.T) { - dir, err := ioutil.TempDir("", "") + dir, err := os.MkdirTemp("", "") assert.NoError(t, err) defer os.RemoveAll(dir) @@ -515,7 +514,7 @@ func TestFileConfigOutputFile(t *testing.T) { _, err = os.Stat(path) assert.NoError(t, err) - bytes, err := ioutil.ReadFile(path) + bytes, err := os.ReadFile(path) assert.NoError(t, err) expectVal := "{\"version\":\"1\",\"log_configs\":[{\"log_group_name\":\"group1\"},{\"log_group_name\":\"group2\"},{\"log_group_name\":\"group3\"}],\"region\":\"us-east-1\"}" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go b/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go index a374f16a73..3b5e356ff0 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleEncoding.go @@ -6,10 +6,10 @@ package collect_list import ( "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "golang.org/x/net/html/charset" "golang.org/x/text/encoding/ianaindex" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) const EncodingSectionKey = "encoding" diff --git a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go index f76c388bbf..f8ce082e1b 100644 --- a/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go +++ b/translator/translate/logs/logs_collected/files/collect_list/ruleLogFilters_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) func TestApplyLogFiltersRule(t *testing.T) { diff --git a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go index 3721776041..3d6377e314 100644 --- a/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go +++ b/translator/translate/logs/logs_collected/windows_events/collect_list/collectlist_test.go @@ -7,9 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) func TestApplyRule(t *testing.T) { diff --git a/translator/translate/logs/logs_collected/windows_events/windows_event_test.go b/translator/translate/logs/logs_collected/windows_events/windows_event_test.go index c0617f9270..1862c584d6 100644 --- a/translator/translate/logs/logs_collected/windows_events/windows_event_test.go +++ b/translator/translate/logs/logs_collected/windows_events/windows_event_test.go @@ -7,10 +7,10 @@ import ( "encoding/json" "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" - - "github.com/stretchr/testify/assert" ) func TestApplyRule(t *testing.T) { diff --git a/translator/translate/logs/logs_test.go b/translator/translate/logs/logs_test.go index eb73c114ac..5801972827 100644 --- a/translator/translate/logs/logs_test.go +++ b/translator/translate/logs/logs_test.go @@ -8,13 +8,12 @@ import ( "os" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" + "github.com/stretchr/testify/assert" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - - "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ecsutil" ) func TestLogs(t *testing.T) { diff --git a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go index 3f8cced19e..6dbfc84e53 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go +++ b/translator/translate/logs/metrics_collected/kubernetes/k8sdecorator/ruleClusterName.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" diff --git a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go index 058b57b865..96f6e5be87 100644 --- a/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go +++ b/translator/translate/logs/metrics_collected/kubernetes/kubernetes.go @@ -5,9 +5,9 @@ package kubernetes import ( "fmt" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonRule" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/jsonconfig/mergeJsonUtil" diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go index 2c8726da62..f1e4e2aec9 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/dockerlabel/dockerlabel.go @@ -5,7 +5,6 @@ package dockerlabel import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go index ebb4edef27..1637c613e4 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/ecsServiceDiscovery.go @@ -5,7 +5,6 @@ package ecsservicediscovery import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus" ) diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go index 3c96bc0b4d..3c82f90a20 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/serviceendpoint/serviceendpoint.go @@ -5,7 +5,6 @@ package serviceendpoint import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) diff --git a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go index ee327abe71..67000dfb2d 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go +++ b/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery/taskdefinition/taskdefinition.go @@ -5,7 +5,6 @@ package taskdefinition import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/prometheus/ecsservicediscovery" ) diff --git a/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go b/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go index 4ebc9a690d..467041c077 100644 --- a/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go +++ b/translator/translate/logs/metrics_collected/prometheus/ruleConfigPath.go @@ -4,7 +4,6 @@ package emfprocessor import ( - "io/ioutil" "log" "os" "strings" @@ -65,7 +64,7 @@ func (obj *ConfigPath) ApplyRule(input interface{}) (string, interface{}) { downloadingPath := getDownloadPath() configEnv := splitConfigPath(configPath) if cc, ok := os.LookupEnv(configEnv); ok { - if error := ioutil.WriteFile(downloadingPath, []byte(cc), yamlFileMode); error != nil { + if error := os.WriteFile(downloadingPath, []byte(cc), yamlFileMode); error != nil { log.Panicf("Failed to download the Prometheus config yaml file. Reason: %s", error.Error()) } else { log.Printf("Downloaded the prometheus config from ENV: %v.", configEnv) diff --git a/translator/translate/logs/ruleLogCredentials_test.go b/translator/translate/logs/ruleLogCredentials_test.go index a66af8367a..28597d37fc 100644 --- a/translator/translate/logs/ruleLogCredentials_test.go +++ b/translator/translate/logs/ruleLogCredentials_test.go @@ -7,9 +7,10 @@ import ( "encoding/json" "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/stretchr/testify/assert" ) func TestWithAgentConfig(t *testing.T) { diff --git a/translator/translate/logs/util/get_eks_cluster_name.go b/translator/translate/logs/util/get_eks_cluster_name.go index 50cffc9093..5ac3095169 100644 --- a/translator/translate/logs/util/get_eks_cluster_name.go +++ b/translator/translate/logs/util/get_eks_cluster_name.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + configaws "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/aws" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util/ec2util" ) diff --git a/translator/translate/metrics/append_dimensions/ruleCreds_test.go b/translator/translate/metrics/append_dimensions/ruleCreds_test.go index b678dd7ab9..d84a792556 100644 --- a/translator/translate/metrics/append_dimensions/ruleCreds_test.go +++ b/translator/translate/metrics/append_dimensions/ruleCreds_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) func TestNoAgentConfi1g(t *testing.T) { diff --git a/translator/translate/metrics/metric_decoration/metric_decoration_test.go b/translator/translate/metrics/metric_decoration/metric_decoration_test.go index 1350981358..d6e2df49db 100644 --- a/translator/translate/metrics/metric_decoration/metric_decoration_test.go +++ b/translator/translate/metrics/metric_decoration/metric_decoration_test.go @@ -7,9 +7,8 @@ import ( "encoding/json" "testing" - "github.com/stretchr/testify/require" - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) // Check the case when the input is in "cpu":{//specific configuration} diff --git a/translator/translate/metrics/metrics_test.go b/translator/translate/metrics/metrics_test.go index 91b39573a3..d823c0ec1c 100644 --- a/translator/translate/metrics/metrics_test.go +++ b/translator/translate/metrics/metrics_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) func TestMetrics(t *testing.T) { diff --git a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go index 3fcd28856d..e2c159e31c 100644 --- a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go +++ b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go @@ -7,9 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" ) func TestRollupDimensions(t *testing.T) { diff --git a/translator/translate/metrics/ruleMetricCredentials_test.go b/translator/translate/metrics/ruleMetricCredentials_test.go index 9113a27fa9..65356ec5d9 100644 --- a/translator/translate/metrics/ruleMetricCredentials_test.go +++ b/translator/translate/metrics/ruleMetricCredentials_test.go @@ -7,9 +7,10 @@ import ( "encoding/json" "testing" + "github.com/stretchr/testify/assert" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/stretchr/testify/assert" ) func TestWithAgentConfig(t *testing.T) { diff --git a/translator/translate/util/credsutil_test.go b/translator/translate/util/credsutil_test.go index b6b08e7a2a..ac8661307f 100644 --- a/translator/translate/util/credsutil_test.go +++ b/translator/translate/util/credsutil_test.go @@ -7,8 +7,9 @@ import ( "encoding/json" "testing" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" "github.com/stretchr/testify/assert" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" ) func TestCreds(t *testing.T) { diff --git a/translator/util/collections_test.go b/translator/util/collections_test.go index 80150063f1..3fa3be8b6a 100644 --- a/translator/util/collections_test.go +++ b/translator/util/collections_test.go @@ -1,8 +1,9 @@ package util import ( - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" ) func TestCopyMapHasSameValues(t *testing.T) { diff --git a/translator/util/config_util.go b/translator/util/config_util.go index c4289b6c3d..4f0cc1bd4e 100644 --- a/translator/util/config_util.go +++ b/translator/util/config_util.go @@ -1,13 +1,13 @@ package util import ( - "io/ioutil" "log" + "os" "strings" ) func ReadFromFile(filename string) string { - data, err := ioutil.ReadFile(filename) + data, err := os.ReadFile(filename) if err != nil { PanicIfErr("", err) } diff --git a/translator/util/ec2util/ec2util.go b/translator/util/ec2util/ec2util.go index dd4204dedc..daa8c7da66 100644 --- a/translator/util/ec2util/ec2util.go +++ b/translator/util/ec2util/ec2util.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/session" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" ) @@ -42,7 +43,7 @@ func GetEC2UtilSingleton() *ec2Util { func initEC2UtilSingleton() (newInstance *ec2Util) { newInstance = &ec2Util{Region: "", PrivateIP: ""} - if (context.CurrentContext().Mode() == config.ModeOnPrem) || (context.CurrentContext().Mode() == config.ModeOnPremise){ + if (context.CurrentContext().Mode() == config.ModeOnPrem) || (context.CurrentContext().Mode() == config.ModeOnPremise) { return } diff --git a/translator/util/httpclient/httpclient.go b/translator/util/httpclient/httpclient.go index b0bcd32d85..08df1ca883 100644 --- a/translator/util/httpclient/httpclient.go +++ b/translator/util/httpclient/httpclient.go @@ -5,7 +5,7 @@ package httpclient import ( "fmt" - "io/ioutil" + "io" "log" "math" "net/http" @@ -63,7 +63,7 @@ func (h *HttpClient) request(endpoint string) ([]byte, error) { } defer resp.Body.Close() - body, err := ioutil.ReadAll(resp.Body) + body, err := io.ReadAll(resp.Body) if err != nil { return nil, fmt.Errorf("unable to read response body from %s, error: %v", endpoint, err) } diff --git a/translator/util/ioutil.go b/translator/util/ioutil.go index 6fccd9adff..c2fa3babaf 100644 --- a/translator/util/ioutil.go +++ b/translator/util/ioutil.go @@ -6,7 +6,7 @@ package util import ( "encoding/json" "fmt" - "io/ioutil" + "os" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" ) @@ -28,7 +28,7 @@ func GetDefaultJsonConfigMap(osType, mode string) (map[string]interface{}, error // get the json map from a file func GetJsonMapFromFile(filename string) (map[string]interface{}, error) { - buf, err := ioutil.ReadFile(filename) + buf, err := os.ReadFile(filename) if err != nil { return nil, err } diff --git a/translator/util/sdkutil.go b/translator/util/sdkutil.go index 5a0c2e11a6..c0dca92011 100644 --- a/translator/util/sdkutil.go +++ b/translator/util/sdkutil.go @@ -11,6 +11,7 @@ import ( "runtime" "github.com/aws/aws-sdk-go/aws/session" + commonconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" From 1c0e49a8de795146f900677b7cf87824522f8144 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen <91758108+khanhntd@users.noreply.github.com> Date: Thu, 6 Oct 2022 15:21:24 -0400 Subject: [PATCH 035/144] Clean up change with translator functionality and fix unit test (#23) * Clean up change translator functionality and fix unit test * Clean up change translator functionality and fix unit test * Addressed comments * Delete exporter since exporter has their own factory * Change to use truef --- .../outputs/cloudwatch/convert_otel_test.go | 1 + receiver/adapter/accumulator/metrics.go | 4 +- translator/jsonconfig/mergeJsonConfig_test.go | 9 +- .../test_1/expected_output.json | 92 ++++++ .../sampleConfig/advanced_config_linux.yaml | 2 - .../sampleConfig/advanced_config_windows.yaml | 2 - .../sampleConfig/basic_config_linux.yaml | 2 - .../sampleConfig/basic_config_windows.yaml | 2 - .../sampleConfig/collectd_config_linux.yaml | 2 - .../sampleConfig/complete_darwin_config.yaml | 4 - .../sampleConfig/complete_linux_config.yaml | 4 - .../sampleConfig/complete_windows_config.yaml | 4 - .../sampleConfig/csm_only_config_linux.yaml | 6 +- .../sampleConfig/csm_only_config_windows.yaml | 6 +- .../csm_service_addresses_linux.yaml | 6 +- .../csm_service_addresses_windows.yaml | 6 +- .../sampleConfig/delta_config_linux.yaml | 2 - .../sampleConfig/drop_origin_linux.yaml | 2 - .../sampleConfig/log_ecs_metric_only.yaml | 2 - .../tocwconfig/sampleConfig/log_filter.yaml | 6 +- .../sampleConfig/log_metric_and_log.yaml | 6 +- .../sampleConfig/log_metric_only.yaml | 6 +- .../sampleConfig/log_only_config_windows.yaml | 6 +- .../sampleConfig/prometheus_config_linux.yaml | 6 +- .../prometheus_config_windows.yaml | 6 +- .../sampleConfig/standard_config_linux.yaml | 2 - ...ndard_config_linux_with_common_config.yaml | 2 - .../sampleConfig/standard_config_windows.yaml | 2 - ...ard_config_windows_with_common_config.yaml | 2 - .../sampleConfig/statsd_config_linux.yaml | 2 - .../sampleConfig/statsd_config_windows.yaml | 2 - .../windows_eventlog_only_config.yaml | 6 +- translator/tocwconfig/tocwconfig_test.go | 2 +- .../tocwconfig/toyamlconfig/toyamlconfig.go | 4 - translator/totomlconfig/toTomlConfig_test.go | 285 ------------------ 35 files changed, 119 insertions(+), 384 deletions(-) delete mode 100644 translator/totomlconfig/toTomlConfig_test.go diff --git a/plugins/outputs/cloudwatch/convert_otel_test.go b/plugins/outputs/cloudwatch/convert_otel_test.go index 24749cc502..8f392cad3a 100644 --- a/plugins/outputs/cloudwatch/convert_otel_test.go +++ b/plugins/outputs/cloudwatch/convert_otel_test.go @@ -70,6 +70,7 @@ func createTestMetrics( dp = m.Sum().DataPoints().AppendEmpty() dp.SetDoubleValue(val) } + dp.SetStartTimestamp(pcommon.NewTimestampFromTime(time.Now())) dp.SetTimestamp(pcommon.NewTimestampFromTime(time.Now())) addDimensions(dp, numDimensions) diff --git a/receiver/adapter/accumulator/metrics.go b/receiver/adapter/accumulator/metrics.go index 58c24c806b..c9227c33d9 100644 --- a/receiver/adapter/accumulator/metrics.go +++ b/receiver/adapter/accumulator/metrics.go @@ -115,9 +115,9 @@ func populateNumberDataPoint(measurement string, datapoint pmetric.NumberDataPoi switch v := value.(type) { case int64: - datapoint.SetIntVal(v) + datapoint.SetIntValue(v) case float64: - datapoint.SetDoubleVal(v) + datapoint.SetDoubleValue(v) default: log.Fatalf("Invalid data type %v for NumberDataPoint ", v) } diff --git a/translator/jsonconfig/mergeJsonConfig_test.go b/translator/jsonconfig/mergeJsonConfig_test.go index 745c7caec4..f5ec21a51a 100644 --- a/translator/jsonconfig/mergeJsonConfig_test.go +++ b/translator/jsonconfig/mergeJsonConfig_test.go @@ -51,9 +51,7 @@ func TestMergeJsonConfigMaps(t *testing.T) { func executeTest(t *testing.T, testData TestData) { log.Printf("Test %v %v started", testData.testId, testData.testName) - defer shouldFail(t, testData) - jsonConfigMapMap := make(map[string]map[string]interface{}) for i := 0; i < testData.inputJsonFileNumber; i++ { jsonFileName := fmt.Sprintf("./sampleJsonConfig/test_%v/input_%v.json", testData.testId, i+1) @@ -63,7 +61,6 @@ func executeTest(t *testing.T, testData TestData) { } jsonConfigMapMap[jsonFileName] = jsonConfigMap } - resultMap, err := MergeJsonConfigMaps(jsonConfigMapMap, nil, "default") if err != nil { t.Fatalf("Failed to merge json maps with error: %v", err) @@ -73,18 +70,14 @@ func executeTest(t *testing.T, testData TestData) { if err != nil { t.Fatalf("Failed to read expected output file %v with error: %v", expectedFileName, err) } - expectedOutputMap, err := util.GetJsonMapFromJsonBytes(expectedOutputBytes) if err != nil { t.Fatalf("Failed to get json map from json bytes from expected output file %v with error: %v", expectedFileName, err) } - isEqual := assert.True(t, reflect.DeepEqual(expectedOutputMap, resultMap)) resultBytes, err := json.MarshalIndent(resultMap, "", " ") assert.NoError(t, err) - if !isEqual { - log.Printf("Test %v %v failed: expectedMap=\n%v\nresultMap=\n%v", testData.testId, testData.testName, string(expectedOutputBytes), string(resultBytes)) - } + assert.Truef(t, reflect.DeepEqual(expectedOutputMap, resultMap), "Test %v %v failed: expectedMap=\n%v\nresultMap=\n%v", testData.testId, testData.testName, string(expectedOutputBytes), string(resultBytes)) } func shouldFail(t *testing.T, testData TestData) { diff --git a/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json b/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json index 8fa3185254..e98b232c12 100644 --- a/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json +++ b/translator/jsonconfig/sampleJsonConfig/test_1/expected_output.json @@ -1,9 +1,16 @@ { "agent": { + "credentials": { + "role_arn": "global_role_arn_value" + }, "internal": true, "logfile": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log", "metrics_collection_interval": 10 }, + "csm": { + "memory_limit_in_mb": 50, + "port": 4000 + }, "logs": { "credentials": { "role_arn": "log_role_arn_value_test" @@ -90,6 +97,91 @@ "*" ], "totalcpu": false + }, + "disk": { + "append_dimensions": { + "d3": "foo3", + "d4": "bar4" + }, + "ignore_file_system_types": [ + "sysfs", + "devtmpfs" + ], + "measurement": [ + { + "name": "free", + "rename": "DISK_FREE", + "unit": "unit" + }, + "total", + "used" + ], + "metrics_collection_interval": 60, + "resources": [ + "/", + "/dev", + "/sys" + ] + }, + "diskio": { + "measurement": [ + "reads", + "writes", + "read_time", + "write_time", + "io_time" + ], + "metrics_collection_interval": 60, + "resources": [ + "*" + ] + }, + "mem": { + "measurement": [ + "mem_used", + "mem_cached", + "mem_total" + ], + "metrics_collection_interval": 1 + }, + "net": { + "measurement": [ + "bytes_sent", + "bytes_recv", + "drop_in", + "drop_out" + ], + "resources": [ + "eth0" + ] + }, + "netstat": { + "measurement": [ + "tcp_established", + "tcp_syn_sent", + "tcp_close" + ], + "metrics_collection_interval": 60 + }, + "processes": { + "measurement": [ + "running", + "sleeping", + "dead" + ] + }, + "statsd": { + "metric_separator": "_", + "metrics_aggregation_interval": 60, + "metrics_collection_interval": 10, + "service_address": ":8125" + }, + "swap": { + "measurement": [ + "swap_used", + "swap_free", + "swap_used_percent" + ] } } } diff --git a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml index 09c18fe6b6..68d4188377 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_linux.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -21,7 +20,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml index 123a7ab95d..06f97f8bb5 100644 --- a/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/advanced_config_windows.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -13,7 +12,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml index c5514e1212..0defdf44fb 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_linux.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-east-1 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -15,7 +14,6 @@ service: metrics: exporters: - awscloudwatch/ace - - telegraf_cloudwatch processors: - cumulativetodelta/ace - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml index 0075860d67..06f97f8bb5 100644 --- a/translator/tocwconfig/sampleConfig/basic_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/basic_config_windows.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -14,7 +13,6 @@ service: metrics: exporters: - awscloudwatch/ace - - telegraf_cloudwatch processors: - telegraf_ec2tagger - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml index fa42a6f81a..0b460a2cbb 100644 --- a/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/collectd_config_linux.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} receivers: @@ -12,7 +11,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml index 1d694e0aaa..35dc50cf7d 100644 --- a/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_darwin_config.yaml @@ -25,8 +25,6 @@ exporters: - InstanceType - - d1 - [] - telegraf_cloudwatch: {} - telegraf_cloudwatchlogs: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -48,8 +46,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatchlogs - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml index 4170ca641b..c73784899d 100644 --- a/translator/tocwconfig/sampleConfig/complete_linux_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_linux_config.yaml @@ -29,8 +29,6 @@ exporters: - InstanceType - - d1 - [] - telegraf_cloudwatch: {} - telegraf_cloudwatchlogs: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -53,8 +51,6 @@ service: metrics: exporters: - awscloudwatch/ace - - telegraf_cloudwatchlogs - - telegraf_cloudwatch processors: - telegraf_ec2tagger - telegraf_delta diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index da0a7719bd..855a861f8d 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -24,8 +24,6 @@ exporters: - InstanceType - - d1 - [] - telegraf_cloudwatch: {} - telegraf_cloudwatchlogs: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -41,9 +39,7 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace - - telegraf_cloudwatchlogs processors: - telegraf_ec2tagger - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml index a96145402d..6755b99228 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_linux.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_aws_csm: {} +exporters: {} processors: {} receivers: telegraf_awscsm_listener: {} service: pipelines: metrics: - exporters: - - telegraf_aws_csm + exporters: [] processors: [] receivers: - telegraf_awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml index a4c36d9c89..89684eb5f0 100644 --- a/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_only_config_windows.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_aws_csm: {} +exporters: {} processors: {} receivers: telegraf_awscsm_listener: {} service: pipelines: metrics: - exporters: - - telegraf_aws_csm + exporters: [] processors: [] receivers: - telegraf_awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml index a4c36d9c89..89684eb5f0 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_linux.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_aws_csm: {} +exporters: {} processors: {} receivers: telegraf_awscsm_listener: {} service: pipelines: metrics: - exporters: - - telegraf_aws_csm + exporters: [] processors: [] receivers: - telegraf_awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml index a4c36d9c89..89684eb5f0 100644 --- a/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml +++ b/translator/tocwconfig/sampleConfig/csm_service_addresses_windows.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_aws_csm: {} +exporters: {} processors: {} receivers: telegraf_awscsm_listener: {} service: pipelines: metrics: - exporters: - - telegraf_aws_csm + exporters: [] processors: [] receivers: - telegraf_awscsm_listener \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml index ee39d33c82..61a886620c 100644 --- a/translator/tocwconfig/sampleConfig/delta_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/delta_config_linux.yaml @@ -16,7 +16,6 @@ exporters: unit: Milliseconds namespace: CWAgent region: us-east-1 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -27,7 +26,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml index 6382f603fb..4d361d61dd 100644 --- a/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml +++ b/translator/tocwconfig/sampleConfig/drop_origin_linux.yaml @@ -18,7 +18,6 @@ exporters: unit: unit namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -30,7 +29,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml index fb477f0803..18689023f4 100644 --- a/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_ecs_metric_only.yaml @@ -31,7 +31,6 @@ exporters: parse_json_encoded_attr_values: [ Sources ] resource_to_telemetry_conversion: enabled: true - telegraf_cloudwatchlogs: {} processors: batch/containerinsights: @@ -48,7 +47,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatchlogs - awsemf/containerinsights processors: - batch/containerinsights diff --git a/translator/tocwconfig/sampleConfig/log_filter.yaml b/translator/tocwconfig/sampleConfig/log_filter.yaml index 3f12020e48..9e9e4b1d68 100644 --- a/translator/tocwconfig/sampleConfig/log_filter.yaml +++ b/translator/tocwconfig/sampleConfig/log_filter.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: {} receivers: telegraf_logfile: {} service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: [] receivers: - telegraf_logfile \ No newline at end of file diff --git a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml index 0278245a8b..ac049ba253 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_and_log.yaml @@ -1,5 +1,4 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: telegraf_ec2tagger: {} telegraf_k8sdecorator: {} @@ -11,8 +10,7 @@ receivers: service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: - telegraf_ec2tagger - telegraf_k8sdecorator diff --git a/translator/tocwconfig/sampleConfig/log_metric_only.yaml b/translator/tocwconfig/sampleConfig/log_metric_only.yaml index e5ec000fed..3de8ff27c4 100644 --- a/translator/tocwconfig/sampleConfig/log_metric_only.yaml +++ b/translator/tocwconfig/sampleConfig/log_metric_only.yaml @@ -1,5 +1,4 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: telegraf_ec2tagger: {} telegraf_k8sdecorator: {} @@ -10,8 +9,7 @@ receivers: service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: - telegraf_k8sdecorator - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml index 061d7fea4e..a94af2573d 100644 --- a/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/log_only_config_windows.yaml @@ -1,5 +1,4 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: {} receivers: telegraf_logfile: {} @@ -7,8 +6,7 @@ receivers: service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: [] receivers: - telegraf_logfile diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml index 60f581df7a..04da99ca00 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_linux.yaml @@ -1,5 +1,4 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: telegraf_emfProcessor: {} receivers: @@ -7,8 +6,7 @@ receivers: service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: - telegraf_emfProcessor receivers: diff --git a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml index 60f581df7a..04da99ca00 100644 --- a/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/prometheus_config_windows.yaml @@ -1,5 +1,4 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: telegraf_emfProcessor: {} receivers: @@ -7,8 +6,7 @@ receivers: service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: - telegraf_emfProcessor receivers: diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml index 4e3b0486c9..3f78d8d83c 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -18,7 +17,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml index ce4c8e603b..30127fa7cb 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_linux_with_common_config.yaml @@ -5,7 +5,6 @@ exporters: profile: AmazonCloudWatchAgent region: us-west-2 shared_credential_file: fake-path - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_delta: {} @@ -20,7 +19,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_delta diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml index 0075860d67..06f97f8bb5 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -14,7 +13,6 @@ service: metrics: exporters: - awscloudwatch/ace - - telegraf_cloudwatch processors: - telegraf_ec2tagger - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml index 1573264679..62c718d615 100644 --- a/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml +++ b/translator/tocwconfig/sampleConfig/standard_config_windows_with_common_config.yaml @@ -5,7 +5,6 @@ exporters: profile: AmazonCloudWatchAgent region: us-west-2 shared_credential_file: fake-path - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} telegraf_ec2tagger: {} @@ -15,7 +14,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - telegraf_ec2tagger diff --git a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml index f56199a1ab..9aa4190648 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_linux.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} receivers: @@ -12,7 +11,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml index f56199a1ab..9aa4190648 100644 --- a/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml +++ b/translator/tocwconfig/sampleConfig/statsd_config_windows.yaml @@ -3,7 +3,6 @@ exporters: force_flush_interval: 60s namespace: CWAgent region: us-west-2 - telegraf_cloudwatch: {} processors: cumulativetodelta/ace: {} receivers: @@ -12,7 +11,6 @@ service: pipelines: metrics: exporters: - - telegraf_cloudwatch - awscloudwatch/ace processors: - cumulativetodelta/ace diff --git a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml index 0f634e51ec..c89f86f9ad 100644 --- a/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml +++ b/translator/tocwconfig/sampleConfig/windows_eventlog_only_config.yaml @@ -1,13 +1,11 @@ -exporters: - telegraf_cloudwatchlogs: {} +exporters: {} processors: {} receivers: telegraf_windows_event_log: {} service: pipelines: metrics: - exporters: - - telegraf_cloudwatchlogs + exporters: [] processors: [] receivers: - telegraf_windows_event_log diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index f8a535202b..d664f51ad8 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -305,4 +305,4 @@ func checkIfEnvTranslateSucceed(t *testing.T, jsonStr string, targetOs string, e t.Logf("Got error %v", err) t.Fail() } -} +} \ No newline at end of file diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index 1055b466f2..db4ef3b07d 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -136,10 +136,6 @@ func encodeExporters(outputs, nativeOutputs map[string]interface{}, cfg *map[str func outputsToExporters(outputs, nativeOutputs map[string]interface{}) map[config.ComponentID]interface{} { exporterMap := make(map[config.ComponentID]interface{}) - ///for key := range outputs { - // t := config.Type(TelegrafPrefix + key) - // exporterMap[config.NewComponentID(t)] = struct{}{} - //} for key, val := range nativeOutputs { t := config.Type(key) exporterMap[config.NewComponentID(t)] = val diff --git a/translator/totomlconfig/toTomlConfig_test.go b/translator/totomlconfig/toTomlConfig_test.go deleted file mode 100644 index 1a7593b25d..0000000000 --- a/translator/totomlconfig/toTomlConfig_test.go +++ /dev/null @@ -1,285 +0,0 @@ -// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. -// SPDX-License-Identifier: MIT - -package totomlconfig - -import ( - "bytes" - "encoding/json" - "log" - "os" - "strings" - "testing" - - "github.com/BurntSushi/toml" - "github.com/google/go-cmp/cmp" - "github.com/google/go-cmp/cmp/cmpopts" - "github.com/kr/pretty" - "github.com/stretchr/testify/assert" - - "github.com/aws/private-amazon-cloudwatch-agent-staging/cfg/commonconfig" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/context" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/totomlconfig/tomlConfigTemplate" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" -) - -func ReadFromFile(filename string) string { - data, err := os.ReadFile(filename) - if err != nil { - panic(err) - } - str := string(data) - return strings.ReplaceAll(str, "\r\n", "\n") -} - -func TestLogMetricOnly(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricOnPrem(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - context.CurrentContext().SetMode(config.ModeOnPrem) - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only_on_prem.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only_on_prem.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricOnPremise(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - context.CurrentContext().SetMode(config.ModeOnPremise) - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only_on_prem.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_only.json", "./sampleConfig/log_metric_only_on_prem.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricAndLog(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricAndLogOnPrem(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - context.CurrentContext().SetMode(config.ModeOnPrem) - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log_on_prem.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log_on_prem.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestLogMetricAndLogOnPremise(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - os.Setenv(config.HOST_IP, "127.0.0.1") - context.CurrentContext().SetMode(config.ModeOnPremise) - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log_on_prem.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_metric_and_log.json", "./sampleConfig/log_metric_and_log_on_prem.conf", "darwin") - os.Unsetenv(config.HOST_NAME) - os.Unsetenv(config.HOST_IP) -} - -func TestCompleteConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/complete_linux_config.json", "./sampleConfig/complete_linux_config.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/complete_darwin_config.json", "./sampleConfig/complete_darwin_config.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/complete_windows_config.json", "./sampleConfig/complete_windows_config.conf", "windows") -} - -func TestWindowsEventOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/windows_eventlog_only_config.json", "./sampleConfig/windows_eventlog_only_config.conf", "windows") -} - -func TestStatsDConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/statsd_config.json", "./sampleConfig/statsd_config_windows.conf", "windows") -} - -// Linux only for CollectD -func TestCollectDConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/collectd_config_linux.json", "./sampleConfig/collectd_config_linux.conf", "darwin") -} - -// prometheus -func TestPrometheusConfig(t *testing.T) { - resetContext() - context.CurrentContext().SetRunInContainer(true) - os.Setenv(config.HOST_NAME, "host_name_from_env") - checkTomlTranslation(t, "./sampleConfig/prometheus_config_linux.json", "./sampleConfig/prometheus_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/prometheus_config_windows.json", "./sampleConfig/prometheus_config_windows.conf", "windows") - os.Unsetenv(config.HOST_NAME) -} - -func TestBasicConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/basic_config_linux.json", "./sampleConfig/basic_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/basic_config_linux.json", "./sampleConfig/basic_config_linux.conf", "darwin") - - checkTomlTranslation(t, "./sampleConfig/basic_config_windows.json", "./sampleConfig/basic_config_windows.conf", "windows") -} - -func TestStandardConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/standard_config_windows.json", "./sampleConfig/standard_config_windows.conf", "windows") -} - -func TestAdvancedConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/advanced_config_linux.json", "./sampleConfig/advanced_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/advanced_config_linux.json", "./sampleConfig/advanced_config_linux.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/advanced_config_windows.json", "./sampleConfig/advanced_config_windows.conf", "windows") -} - -func TestDropOriginConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/drop_origin_linux.json", "./sampleConfig/drop_origin_linux.conf", "linux") -} - -func TestLogOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/log_only_config_windows.json", "./sampleConfig/log_only_config_windows.conf", "windows") -} - -func TestStandardConfigWithCommonConfig(t *testing.T) { - resetContext() - readCommonConfig() - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux_with_common_config.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/standard_config_linux.json", "./sampleConfig/standard_config_linux_with_common_config.conf", "darwin") - checkTomlTranslation(t, "./sampleConfig/standard_config_windows.json", "./sampleConfig/standard_config_windows_with_common_config.conf", "windows") -} - -func TestCsmOnlyConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_windows.conf", "windows") - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/csm_only_config.json", "./sampleConfig/csm_only_config_linux.conf", "darwin") -} - -func TestDeltaConfigLinux(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/delta_config_linux.json", "./sampleConfig/delta_config_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/delta_config_linux.json", "./sampleConfig/delta_config_linux.conf", "darwin") -} - -func TestCsmServiceAddressesConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_windows.conf", "windows") - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_linux.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/csm_service_addresses.json", "./sampleConfig/csm_service_addresses_linux.conf", "darwin") -} - -func TestECSNodeMetricConfig(t *testing.T) { - resetContext() - os.Setenv("RUN_IN_CONTAINER", "True") - os.Setenv("HOST_NAME", "fake-host-name") - os.Setenv("HOST_IP", "127.0.0.1") - checkTomlTranslation(t, "./sampleConfig/log_ecs_metric_only.json", "./sampleConfig/log_ecs_metric_only.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_ecs_metric_only.json", "./sampleConfig/log_ecs_metric_only.conf", "darwin") - os.Unsetenv("RUN_IN_CONTAINER") - os.Unsetenv("HOST_NAME") - os.Unsetenv("HOST_IP") -} - -func TestLogFilterConfig(t *testing.T) { - resetContext() - checkTomlTranslation(t, "./sampleConfig/log_filter.json", "./sampleConfig/log_filter.conf", "linux") - checkTomlTranslation(t, "./sampleConfig/log_filter.json", "./sampleConfig/log_filter.conf", "darwin") -} - -func TestTomlToTomlComparison(t *testing.T) { - resetContext() - var jsonFilePath = "./tomlConfigTemplate/agentToml.json" - var input interface{} - - translator.SetTargetPlatform("linux") - - err := json.Unmarshal([]byte(ReadFromFile(jsonFilePath)), &input) - assert.NoError(t, err) - actualOutput := ToTomlConfig(input) - checkIfIdenticalToml(t, "./tomlConfigTemplate/agentToml.conf", actualOutput) -} - -func checkTomlTranslation(t *testing.T, jsonPath string, desiredTomlPath string, os string) { - agent.Global_Config = *new(agent.Agent) - translator.SetTargetPlatform(os) - var input interface{} - err := json.Unmarshal([]byte(ReadFromFile(jsonPath)), &input) - assert.NoError(t, err) - actualOutput := ToTomlConfig(input) - log.Printf("output is %v", actualOutput) - checkIfIdenticalToml(t, desiredTomlPath, actualOutput) -} - -func readCommonConfig() { - ctx := context.CurrentContext() - config := commonconfig.New() - data, _ := os.ReadFile("./sampleConfig/commonConfigTest.toml") - config.Parse(bytes.NewReader(data)) - ctx.SetCredentials(config.CredentialsMap()) - ctx.SetProxy(config.ProxyMap()) - ctx.SetSSL(config.SSLMap()) -} - -func resetContext() { - util.DetectRegion = func(string, map[string]string) string { - return "us-west-2" - } - util.DetectCredentialsPath = func() string { - return "fake-path" - } - context.ResetContext() - - os.Setenv("ProgramData", "c:\\ProgramData") -} - -// toml files in the given path will be parsed into the config toml struct and be compared as struct -func checkIfIdenticalToml(t *testing.T, desiredTomlPath string, tomlStr string) { - var expect tomlConfigTemplate.TomlConfig - _, decodeError := toml.DecodeFile(desiredTomlPath, &expect) - assert.NoError(t, decodeError) - - var actual tomlConfigTemplate.TomlConfig - _, decodeError2 := toml.Decode(tomlStr, &actual) - assert.NoError(t, decodeError2) - // This less function sort the content of string slice in a alphabetical order so the - // cmp.Equal method will compare the two struct with slices in them, regardless the elements within the slices - opt := cmpopts.SortSlices(func(x, y interface{}) bool { - return pretty.Sprint(x) < pretty.Sprint(y) - }) - diff := cmp.Diff(expect, actual) - log.Printf("D! Toml diff: %s", diff) - assert.True(t, cmp.Equal(expect, actual, opt)) -} From 0de3ff752ce5f3970c7eb4d9b3a8c6ba477fd14f Mon Sep 17 00:00:00 2001 From: Kaushik Surya <108111936+sky333999@users.noreply.github.com> Date: Fri, 7 Oct 2022 11:39:09 -0400 Subject: [PATCH 036/144] Update references of master branch to main branch (#25) Update references of master branch to main branch --- .github/workflows/build-test-linux.yml | 3 ++- .github/workflows/build-test-macos.yml | 3 ++- .github/workflows/build-test-windows.yml | 3 ++- .github/workflows/codeql-analysis.yml | 3 ++- .github/workflows/integrationTest.yml | 3 ++- CONTRIBUTING.md | 2 +- amazon-cloudwatch-container-insights/CONTRIBUTING.md | 2 +- integration/test/ecs/ecs_metadata/ecs_metadata_test.go | 6 +++--- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-linux.yml b/.github/workflows/build-test-linux.yml index 73cfe3d05d..2a11f8bee3 100644 --- a/.github/workflows/build-test-linux.yml +++ b/.github/workflows/build-test-linux.yml @@ -4,7 +4,8 @@ name: build-and-test-linux on: push: - branches: [master, main] + branches: + - main paths-ignore: - '**/*.md' - '.github/**' diff --git a/.github/workflows/build-test-macos.yml b/.github/workflows/build-test-macos.yml index 7c03007635..78e9a0bf9e 100644 --- a/.github/workflows/build-test-macos.yml +++ b/.github/workflows/build-test-macos.yml @@ -4,7 +4,8 @@ name: build-and-test-macos on: push: - branches: [master, main] + branches: + - main paths-ignore: - '**/*.md' - '.github/**' diff --git a/.github/workflows/build-test-windows.yml b/.github/workflows/build-test-windows.yml index e923776e4d..c0eda7fc18 100644 --- a/.github/workflows/build-test-windows.yml +++ b/.github/workflows/build-test-windows.yml @@ -4,7 +4,8 @@ name: build-and-test-windows on: push: - branches: [master, main] + branches: + - main paths-ignore: - '**/*.md' - '.github/**' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f07e97dd9f..90d42088f6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -5,7 +5,8 @@ name: CodeQL Analysis on: push: - branches: [master, main] + branches: + - main concurrency: group: codeql-${{ github.ref_name }} diff --git a/.github/workflows/integrationTest.yml b/.github/workflows/integrationTest.yml index 34f5ce12bc..41e82262cc 100644 --- a/.github/workflows/integrationTest.yml +++ b/.github/workflows/integrationTest.yml @@ -18,7 +18,8 @@ env: on: push: branches: - - master + branches: + - main workflow_dispatch: concurrency: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f61c8e31cf..57d34280d1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. diff --git a/amazon-cloudwatch-container-insights/CONTRIBUTING.md b/amazon-cloudwatch-container-insights/CONTRIBUTING.md index 82dd6ca432..104f098305 100644 --- a/amazon-cloudwatch-container-insights/CONTRIBUTING.md +++ b/amazon-cloudwatch-container-insights/CONTRIBUTING.md @@ -23,7 +23,7 @@ reported the issue. Please try to include as much information as you can. Detail ## Contributing via Pull Requests Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that: -1. You are working against the latest source on the *master* branch. +1. You are working against the latest source on the *main* branch. 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already. 3. You open an issue to discuss any significant work - we would hate for your time to be wasted. diff --git a/integration/test/ecs/ecs_metadata/ecs_metadata_test.go b/integration/test/ecs/ecs_metadata/ecs_metadata_test.go index cb597a3f6a..b7ee39dc3a 100644 --- a/integration/test/ecs/ecs_metadata/ecs_metadata_test.go +++ b/integration/test/ecs/ecs_metadata/ecs_metadata_test.go @@ -16,13 +16,13 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/integration/test" ) -// Purpose: Detect the changes in metadata endpoint for ECS Container Agent https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/util/ecsutil/ecsutil.go#L67-L75 -// Implementation: Checking if a log group's the format(https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33) +// Purpose: Detect the changes in metadata endpoint for ECS Container Agent https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/main/translator/util/ecsutil/ecsutil.go#L67-L75 +// Implementation: Checking if a log group's the format(https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/main/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33) // exists or not since the log group's format has the scrapping cluster name from metadata endpoint. const ( RetryTime = 15 - // Log group format: https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/master/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33 + // Log group format: https://github.com/aws/private-amazon-cloudwatch-agent-staging/blob/main/translator/translate/logs/metrics_collected/prometheus/ruleLogGroupName.go#L33 ECSLogGroupNameFormat = "/aws/ecs/containerinsights/%s" // Log stream based on job name: https://github.com/khanhntd/amazon-cloudwatch-agent/blob/ecs_metadata/integration/test/ecs/ecs_metadata/resources/extra_apps.tpl#L41 LogStreamName = "prometheus-redis" From 590aa5252562f46db684e1f80d586b0f5a2c2a45 Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Thu, 13 Oct 2022 18:16:50 -0400 Subject: [PATCH 037/144] Initial refactor of JSON to YAML translation. (#26) --- plugins/outputs/cloudwatch/cloudwatch.go | 2 +- plugins/outputs/cloudwatch/config.go | 24 ++- .../outputs/cloudwatch/metric_decoration.go | 8 +- receiver/adapter/factory.go | 11 +- translator/tocwconfig/tocwconfig_test.go | 2 +- .../encoder/mapstructure/encoder.go | 31 ++-- .../encoder/mapstructure/encoder_test.go | 8 +- .../metrics/drop_origin/drop_origin.go | 6 +- .../metrics/drop_origin/drop_origin_test.go | 8 +- .../customizedmetrics/customizedmetric.go | 6 +- .../rollup_dimensions/rollupDimensions.go | 4 +- .../rollupDimensions_test.go | 4 +- translator/translate/otel/common/common.go | 141 +++++++++++++++++ .../translate/otel/common/common_test.go | 102 +++++++++++++ .../awscloudwatch/testdata/config.json | 34 +++++ .../otel/exporter/awscloudwatch/translator.go | 123 +++++++++++++++ .../exporter/awscloudwatch/translator_test.go | 143 ++++++++++++++++++ .../pipeline/containerinsights/translator.go | 44 ++++++ .../containerinsights/translator_test.go | 65 ++++++++ .../otel/pipeline/host/translator.go | 44 ++++++ .../otel/pipeline/host/translator_test.go | 61 ++++++++ .../translate/otel/pipeline/translator.go | 50 ++++++ .../otel/pipeline/translator_test.go | 44 ++++++ .../translate/otel/processor/translator.go | 25 +++ .../otel/processor/translator_test.go | 18 +++ .../otel/receiver/adapter/translator.go | 68 +++++++++ .../otel/receiver/adapter/translator_test.go | 121 +++++++++++++++ translator/translate/otel/translate_otel.go | 119 +++++++++++++++ translator/translate/translate.go | 5 +- translator/util/collections.go | 59 +++++++- translator/util/collections_test.go | 25 +++ 31 files changed, 1348 insertions(+), 57 deletions(-) create mode 100644 translator/translate/otel/common/common.go create mode 100644 translator/translate/otel/common/common_test.go create mode 100644 translator/translate/otel/exporter/awscloudwatch/testdata/config.json create mode 100644 translator/translate/otel/exporter/awscloudwatch/translator.go create mode 100644 translator/translate/otel/exporter/awscloudwatch/translator_test.go create mode 100644 translator/translate/otel/pipeline/containerinsights/translator.go create mode 100644 translator/translate/otel/pipeline/containerinsights/translator_test.go create mode 100644 translator/translate/otel/pipeline/host/translator.go create mode 100644 translator/translate/otel/pipeline/host/translator_test.go create mode 100644 translator/translate/otel/pipeline/translator.go create mode 100644 translator/translate/otel/pipeline/translator_test.go create mode 100644 translator/translate/otel/processor/translator.go create mode 100644 translator/translate/otel/processor/translator_test.go create mode 100644 translator/translate/otel/receiver/adapter/translator.go create mode 100644 translator/translate/otel/receiver/adapter/translator_test.go create mode 100644 translator/translate/otel/translate_otel.go diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index 3ee56cb88c..08d3b79b25 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -37,7 +37,7 @@ const ( metricChanBufferSize = 10000 datumBatchChanBufferSize = 50 // the number of requests we buffer maxConcurrentPublisher = 10 // the number of CloudWatch clients send request concurrently - defaultForceFlushInterval = 60 * time.Second + defaultForceFlushInterval = time.Minute highResolutionTagKey = "aws:StorageResolution" defaultRetryCount = 5 // this is the retry count, the total attempts would be retry count + 1 at most. backoffRetryBase = 200 * time.Millisecond diff --git a/plugins/outputs/cloudwatch/config.go b/plugins/outputs/cloudwatch/config.go index 1ecb224868..c0acbfda14 100644 --- a/plugins/outputs/cloudwatch/config.go +++ b/plugins/outputs/cloudwatch/config.go @@ -16,19 +16,19 @@ type Config struct { // Squash ensures fields are correctly decoded in embedded struct. config.ExporterSettings `mapstructure:",squash"` Region string `mapstructure:"region"` - EndpointOverride string `mapstructure:"endpoint_override"` - AccessKey string `mapstructure:"access_key"` - SecretKey string `mapstructure:"secret_key"` - RoleARN string `mapstructure:"role_arn"` - Profile string `mapstructure:"profile"` - SharedCredentialFilename string `mapstructure:"shared_credential_file"` - Token string `mapstructure:"token"` + EndpointOverride string `mapstructure:"endpoint_override,omitempty"` + AccessKey string `mapstructure:"access_key,omitempty"` + SecretKey string `mapstructure:"secret_key,omitempty"` + RoleARN string `mapstructure:"role_arn,omitempty"` + Profile string `mapstructure:"profile,omitempty"` + SharedCredentialFilename string `mapstructure:"shared_credential_file,omitempty"` + Token string `mapstructure:"token,omitempty"` ForceFlushInterval time.Duration `mapstructure:"force_flush_interval"` MaxDatumsPerCall int `mapstructure:"max_datums_per_call"` MaxValuesPerDatum int `mapstructure:"max_values_per_datum"` - MetricDecorations []MetricDecorationConfig `mapstructure:"metric_decoration"` - RollupDimensions [][]string `mapstructure:"rollup_dimensions"` - DropOriginConfigs map[string][]string `mapstructure:"drop_original_metrics"` + MetricDecorations []MetricDecorationConfig `mapstructure:"metric_decoration,omitempty"` + RollupDimensions [][]string `mapstructure:"rollup_dimensions,omitempty"` + DropOriginConfigs map[string][]string `mapstructure:"drop_original_metrics,omitempty"` Namespace string `mapstructure:"namespace"` // ResourceToTelemetrySettings is the option for converting resource @@ -50,9 +50,7 @@ func (c *Config) Validate() error { return errors.New("'namespace' must be set") } if c.ForceFlushInterval < time.Millisecond { - // YAML with 60, 60s, "60s" will all result in 60 seconds. - // YAML with "60" will cause a panic. - c.ForceFlushInterval *= time.Second + return errors.New("'force_flush_interval' must be at least 1 millisecond") } return nil } diff --git a/plugins/outputs/cloudwatch/metric_decoration.go b/plugins/outputs/cloudwatch/metric_decoration.go index 7c22d2f38d..1a4733c154 100644 --- a/plugins/outputs/cloudwatch/metric_decoration.go +++ b/plugins/outputs/cloudwatch/metric_decoration.go @@ -10,10 +10,10 @@ import ( ) type MetricDecorationConfig struct { - Category string `mapstructure:"category"` - Metric string `mapstructure:"name"` - Rename string `mapstructure:"rename"` - Unit string `mapstructure:"unit"` + Category string `mapstructure:"category,omitempty"` + Metric string `mapstructure:"name,omitempty"` + Rename string `mapstructure:"rename,omitempty"` + Unit string `mapstructure:"unit,omitempty"` } var supportedUnits = map[string]struct{}{ diff --git a/receiver/adapter/factory.go b/receiver/adapter/factory.go index c9f22b9932..236ca13754 100644 --- a/receiver/adapter/factory.go +++ b/receiver/adapter/factory.go @@ -14,8 +14,10 @@ import ( "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/receiver/scraperhelper" +) - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig" +const ( + TelegrafPrefix = "telegraf_" ) type Adapter struct { @@ -28,6 +30,11 @@ func NewAdapter(telegrafConfig *telegrafconfig.Config) Adapter { } } +// Type joins the TelegrafPrefix to the input. +func Type(input string) config.Type { + return config.Type(TelegrafPrefix + input) +} + func createDefaultConfig(cfgType config.Type) func() config.Receiver { return func() config.Receiver { return &Config{ @@ -40,7 +47,7 @@ func createDefaultConfig(cfgType config.Type) func() config.Receiver { } func (a Adapter) NewReceiverFactory(telegrafInputName string) component.ReceiverFactory { - typeStr := config.Type(toyamlconfig.TelegrafPrefix + telegrafInputName) + typeStr := Type(telegrafInputName) return component.NewReceiverFactory(typeStr, createDefaultConfig(typeStr), component.WithMetricsReceiver(a.createMetricsReceiver(telegrafInputName), component.StabilityLevelStable)) } diff --git a/translator/tocwconfig/tocwconfig_test.go b/translator/tocwconfig/tocwconfig_test.go index d664f51ad8..f8a535202b 100644 --- a/translator/tocwconfig/tocwconfig_test.go +++ b/translator/tocwconfig/tocwconfig_test.go @@ -305,4 +305,4 @@ func checkIfEnvTranslateSucceed(t *testing.T, jsonStr string, targetOs string, e t.Logf("Got error %v", err) t.Fail() } -} \ No newline at end of file +} diff --git a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go index e70dbb8a46..fc7376bb0c 100644 --- a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go +++ b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder.go @@ -11,6 +11,7 @@ import ( "github.com/mitchellh/mapstructure" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/config/configtelemetry" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" ) @@ -24,7 +25,6 @@ const ( ) var ( - componentIDType = reflect.TypeOf(config.NewComponentID("")) errNonStringEncodedKey = errors.New("non string-encoded key") ) @@ -66,7 +66,7 @@ func (mse *mapStructureEncoder) encode(value reflect.Value) (interface{}, error) if value.IsValid() { switch value.Kind() { case reflect.Interface, reflect.Ptr: - return mse.encodeInterfaceOrPtr(value) + return mse.encode(value.Elem()) case reflect.Map: return mse.encodeMap(value) case reflect.Slice: @@ -74,20 +74,21 @@ func (mse *mapStructureEncoder) encode(value reflect.Value) (interface{}, error) case reflect.Struct: return mse.encodeStruct(value) default: - return value.Interface(), nil + return mse.encodeInterface(value) } } return nil, nil } -func (mse *mapStructureEncoder) encodeInterfaceOrPtr(value reflect.Value) (interface{}, error) { - if value.Kind() != reflect.Ptr && value.Kind() != reflect.Interface { - return nil, &reflect.ValueError{ - Method: "encodeInterfaceOrPtr", - Kind: value.Kind(), - } +func (mse *mapStructureEncoder) encodeInterface(value reflect.Value) (interface{}, error) { + switch v := value.Interface().(type) { + case config.ComponentID: + return v.String(), nil + case configtelemetry.Level: + return v.String(), nil + default: + return v, nil } - return mse.encode(value.Elem()) } func (mse *mapStructureEncoder) encodeStruct(value reflect.Value) (interface{}, error) { @@ -97,10 +98,12 @@ func (mse *mapStructureEncoder) encodeStruct(value reflect.Value) (interface{}, Kind: value.Kind(), } } - // For structs that need to be handled differently. - switch value.Type() { - case componentIDType: - return value.Interface().(config.ComponentID).String(), nil + out, _ := mse.encodeInterface(value) + value = reflect.ValueOf(out) + // if the output of encodeHook is no longer a struct, + // call encode against it. + if value.Kind() != reflect.Struct { + return mse.encode(value) } result := make(map[string]interface{}) for i := 0; i < value.NumField(); i++ { diff --git a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go index 2706791e02..b78e5b0441 100644 --- a/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go +++ b/translator/tocwconfig/toyamlconfig/encoder/mapstructure/encoder_test.go @@ -9,6 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/config/configtelemetry" ) type inter interface { @@ -54,6 +55,12 @@ func TestEncode(t *testing.T) { }, wantResult: nil, }, + "WithConfigTelemetry": { + value: func() reflect.Value { + return reflect.ValueOf(configtelemetry.LevelNone) + }, + wantResult: "none", + }, "WithComponentID": { value: func() reflect.Value { return reflect.ValueOf(config.NewComponentIDWithName("type", "name")) @@ -178,7 +185,6 @@ func TestEncodeValueError(t *testing.T) { encoder := &mapStructureEncoder{} testValue := reflect.ValueOf("") testEncodes := []func(value reflect.Value) (interface{}, error){ - encoder.encodeInterfaceOrPtr, encoder.encodeMap, encoder.encodeStruct, encoder.encodeSlice, diff --git a/translator/translate/metrics/drop_origin/drop_origin.go b/translator/translate/metrics/drop_origin/drop_origin.go index f4ee03eef8..127cb61807 100644 --- a/translator/translate/metrics/drop_origin/drop_origin.go +++ b/translator/translate/metrics/drop_origin/drop_origin.go @@ -12,12 +12,12 @@ import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" ) -type dropOrigin struct { +type DropOrigin struct { } const SectionKey = "drop_original_metrics" -func (do *dropOrigin) ApplyRule(input interface{}) (returnKey string, returnVal interface{}) { +func (do *DropOrigin) ApplyRule(input interface{}) (returnKey string, returnVal interface{}) { im := input.(map[string]interface{}) returnKey = "" @@ -51,6 +51,6 @@ func (do *dropOrigin) ApplyRule(input interface{}) (returnKey string, returnVal } func init() { - do := new(dropOrigin) + do := new(DropOrigin) parent.RegisterRule(SectionKey, do) } diff --git a/translator/translate/metrics/drop_origin/drop_origin_test.go b/translator/translate/metrics/drop_origin/drop_origin_test.go index 92125bde32..7ff5ce961a 100644 --- a/translator/translate/metrics/drop_origin/drop_origin_test.go +++ b/translator/translate/metrics/drop_origin/drop_origin_test.go @@ -11,7 +11,7 @@ import ( ) func TestDropOriginal(t *testing.T) { - e := new(dropOrigin) + e := new(DropOrigin) //Check whether override default config var input interface{} err := json.Unmarshal([]byte(`{ @@ -38,7 +38,7 @@ func TestDropOriginal(t *testing.T) { } func TestDropMultipleOriginal(t *testing.T) { - e := new(dropOrigin) + e := new(DropOrigin) //Check whether override default config var input interface{} err := json.Unmarshal([]byte(`{ @@ -80,7 +80,7 @@ func TestDropMultipleOriginal(t *testing.T) { } func TestNotDropOriginal(t *testing.T) { - e := new(dropOrigin) + e := new(DropOrigin) //Check whether override default config var input interface{} err := json.Unmarshal([]byte(`{ @@ -105,7 +105,7 @@ func TestNotDropOriginal(t *testing.T) { } func TestDefaultDropOriginal(t *testing.T) { - e := new(dropOrigin) + e := new(DropOrigin) //Check whether override default config var input interface{} err := json.Unmarshal([]byte(`{ diff --git a/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go b/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go index afcc150790..33dbb77a03 100644 --- a/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go +++ b/translator/translate/metrics/metrics_collect/customizedmetrics/customizedmetric.go @@ -15,10 +15,10 @@ import ( type customizedMetric struct { } -const Win_Rerf_Counters_Key = "win_perf_counters" +const Win_Perf_Counters_Key = "win_perf_counters" func GetObjectPath(object string) string { - curPath := parent.GetCurPath() + Win_Rerf_Counters_Key + "/" + object + "/" + curPath := parent.GetCurPath() + Win_Perf_Counters_Key + "/" + object + "/" return curPath } @@ -49,7 +49,7 @@ func (c *customizedMetric) ApplyRule(input interface{}) (returnKey string, retur sort.Sort(objectConfig) mp["object"] = objectConfig } - returnKey = Win_Rerf_Counters_Key + returnKey = Win_Perf_Counters_Key returnVal = win_Perf_Counters_Array } return diff --git a/translator/translate/metrics/rollup_dimensions/rollupDimensions.go b/translator/translate/metrics/rollup_dimensions/rollupDimensions.go index fcad6b5b7b..6c1c2d1ce0 100644 --- a/translator/translate/metrics/rollup_dimensions/rollupDimensions.go +++ b/translator/translate/metrics/rollup_dimensions/rollupDimensions.go @@ -31,7 +31,7 @@ func (ad *rollupDimensions) ApplyRule(input interface{}) (returnKey string, retu returnVal = "" } else { returnKey = metrics.OutputsKey - if !isValidRollupList(im[SectionKey]) { + if !IsValidRollupList(im[SectionKey]) { returnKey = "" } result["rollup_dimensions"] = im[SectionKey] @@ -46,7 +46,7 @@ func init() { } // Strict type check for [][]string -func isValidRollupList(input interface{}) bool { +func IsValidRollupList(input interface{}) bool { if inputList, ok := input.([]interface{}); ok { if len(inputList) == 0 { return fail() diff --git a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go index e2c159e31c..4531827fe0 100644 --- a/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go +++ b/translator/translate/metrics/rollup_dimensions/rollupDimensions_test.go @@ -66,7 +66,7 @@ func TestInvalidRollupList(t *testing.T) { } else { t.FailNow() } - assert.Equal(t, false, isValidRollupList(actualVal), "Expect to be false") + assert.Equal(t, false, IsValidRollupList(actualVal), "Expect to be false") } assert.Equal(t, len(testInputs), len(translator.ErrorMessages), "Expect one Error message") } @@ -86,7 +86,7 @@ func TestValidRollupList(t *testing.T) { } if err == nil { - assert.Equal(t, true, isValidRollupList(actualVal), "Expect to be true") + assert.Equal(t, true, IsValidRollupList(actualVal), "Expect to be true") } else { panic(err) } diff --git a/translator/translate/otel/common/common.go b/translator/translate/otel/common/common.go new file mode 100644 index 0000000000..ad32409d77 --- /dev/null +++ b/translator/translate/otel/common/common.go @@ -0,0 +1,141 @@ +package common + +import ( + "fmt" + "reflect" + "strconv" + "strings" + "time" + + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/service" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" +) + +const ( + AgentKey = "agent" + MetricsKey = "metrics" + LogsKey = "logs" + MetricsCollectedKey = "metrics_collected" + ECSKey = "ecs" + CredentialsKey = "credentials" + RoleARNKey = "role_arn" + MetricsCollectionIntervalKey = "metrics_collection_interval" +) + +// Translator is used to translate the JSON config into an +// OTEL config. +type Translator[C any] interface { + Translate(*confmap.Conf) (C, error) + Type() config.Type +} + +// TranslatorMap is a map of translators by their types. +type TranslatorMap[C any] map[config.Type]Translator[C] + +// Add is a convenience method to add a translator to the map. +func (t TranslatorMap[C]) Add(translator Translator[C]) { + t[translator.Type()] = translator +} + +// Get is a convenience method to get the translator from the map. +func (t TranslatorMap[C]) Get(cfgType config.Type) (Translator[C], bool) { + translator, ok := t[cfgType] + return translator, ok +} + +// NewTranslatorMap creates a TranslatorMap from the translators. +func NewTranslatorMap[C any](translators ...Translator[C]) TranslatorMap[C] { + translatorMap := make(TranslatorMap[C], len(translators)) + for _, translator := range translators { + translatorMap.Add(translator) + } + return translatorMap +} + +// A MissingKeyError occurs when a translator is used for a JSON +// config that does not have a required key. This typically means +// that the pipeline was configured incorrectly. +type MissingKeyError struct { + Type config.Type + JsonKey string +} + +func (e *MissingKeyError) Error() string { + return fmt.Sprintf("%q missing key in JSON: %q", e.Type, e.JsonKey) +} + +// Identifiable is an interface that all components configurations MUST embed. +// Taken straight from OTEL. +type Identifiable interface { + // ID returns the ID of the component that this configuration belongs to. + ID() config.ComponentID + // SetIDName updates the name part of the ID for the component that this configuration belongs to. + SetIDName(idName string) +} + +// Pipeline is a component ID and respective service pipeline. +type Pipeline *util.Pair[config.ComponentID, *service.ConfigServicePipeline] + +// Pipelines is a map of component IDs to service pipelines. +type Pipelines map[config.ComponentID]*service.ConfigServicePipeline + +// ConfigKey joins the keys separated by confmap.KeyDelimiter. +// This helps translators navigate the confmap.Conf that the +// JSON config is loaded into. +func ConfigKey(keys ...string) string { + return strings.Join(keys, confmap.KeyDelimiter) +} + +func ParseDuration(v interface{}) (time.Duration, error) { + if v != nil { + if fv, ok := v.(float64); ok { + return time.Second * time.Duration(fv), nil + } + s, ok := v.(string) + if !ok { + s = fmt.Sprintf("%v", v) + } + duration, err := time.ParseDuration(s) + if err == nil { + return duration, nil + } + sI, err := strconv.ParseInt(s, 10, 64) + if err == nil { + return time.Second * time.Duration(sI), nil + } + sF, err := strconv.ParseFloat(s, 64) + if err == nil { + return time.Second * time.Duration(sF), nil + } + } + return time.Duration(0), fmt.Errorf("invalid type %v", reflect.TypeOf(v)) +} + +// GetString gets the string value for the key. If the key is missing, +// ok will be false. +func GetString(conf *confmap.Conf, key string) (got string, ok bool) { + if value := conf.Get(key); value != nil { + got, ok = value.(string) + // if the value isn't a string, convert it + if !ok { + got = fmt.Sprintf("%v", value) + ok = true + } + } + return +} + +// GetDuration gets the value for the key and calls ParseDuration on it. +// If the key is missing, or it is unable to parse the duration, then ok +// will be false. +func GetDuration(conf *confmap.Conf, key string) (duration time.Duration, ok bool) { + if value := conf.Get(key); value != nil { + var err error + duration, err = ParseDuration(value) + ok = err == nil + } + return +} diff --git a/translator/translate/otel/common/common_test.go b/translator/translate/otel/common/common_test.go new file mode 100644 index 0000000000..03b5d37cec --- /dev/null +++ b/translator/translate/otel/common/common_test.go @@ -0,0 +1,102 @@ +package common + +import ( + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" +) + +type testTranslator struct { + cfgType config.Type + result int +} + +var _ Translator[int] = (*testTranslator)(nil) + +func (t testTranslator) Translate(_ *confmap.Conf) (int, error) { + return t.result, nil +} + +func (t testTranslator) Type() config.Type { + return t.cfgType +} + +func TestConfigKeys(t *testing.T) { + require.Equal(t, "1::2", ConfigKey("1", "2")) +} + +func TestGetString(t *testing.T) { + conf := confmap.NewFromStringMap(map[string]interface{}{"int": 10, "string": "test"}) + got, ok := GetString(conf, "int") + require.True(t, ok) + // converts int to string + require.Equal(t, "10", got) + got, ok = GetString(conf, "string") + require.True(t, ok) + require.Equal(t, "test", got) + got, ok = GetString(conf, "invalid_key") + require.False(t, ok) + require.Equal(t, "", got) +} + +func TestGetDuration(t *testing.T) { + conf := confmap.NewFromStringMap(map[string]interface{}{"invalid": "invalid", "valid": 1}) + got, ok := GetDuration(conf, "invalid") + require.False(t, ok) + require.Equal(t, time.Duration(0), got) + got, ok = GetDuration(conf, "valid") + require.True(t, ok) + require.Equal(t, time.Second, got) +} + +func TestParseDuration(t *testing.T) { + testCases := map[string]struct { + input interface{} + want time.Duration + wantErr bool + }{ + "WithString/Duration": {input: "60s", want: time.Minute}, + "WithString/Int": {input: "60", want: time.Minute}, + "WithString/Float": {input: "60.7", want: time.Minute}, + "WithString/Invalid": {input: "test", wantErr: true}, + "WithInt": {input: 60, want: time.Minute}, + "WithInt64": {input: int64(60), want: time.Minute}, + "WithFloat64": {input: 59.7, want: 59 * time.Second}, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + got, err := ParseDuration(testCase.input) + if testCase.wantErr { + require.Error(t, err) + } else { + require.NoError(t, err) + } + require.Equal(t, testCase.want, got) + }) + } +} + +func TestTranslatorMap(t *testing.T) { + got := NewTranslatorMap[int](&testTranslator{"test", 0}, &testTranslator{"other", 1}) + require.Len(t, got, 2) + translator, ok := got.Get("test") + require.True(t, ok) + result, err := translator.Translate(nil) + require.NoError(t, err) + require.Equal(t, 0, result) + got.Add(&testTranslator{"test", 2}) + require.Len(t, got, 2) + translator, ok = got.Get("test") + require.True(t, ok) + result, err = translator.Translate(nil) + require.NoError(t, err) + require.Equal(t, 2, result) +} + +func TestMissingKeyError(t *testing.T) { + err := &MissingKeyError{Type: "type", JsonKey: "key"} + require.Equal(t, "\"type\" missing key in JSON: \"key\"", err.Error()) +} diff --git a/translator/translate/otel/exporter/awscloudwatch/testdata/config.json b/translator/translate/otel/exporter/awscloudwatch/testdata/config.json new file mode 100644 index 0000000000..bb6aa7f3cc --- /dev/null +++ b/translator/translate/otel/exporter/awscloudwatch/testdata/config.json @@ -0,0 +1,34 @@ +{ + "metrics": { + "metrics_collected": { + "cpu": { + "drop_original_metrics": ["cpu_usage_idle", "time_active"], + "measurement": [ + { + "name": "cpu_usage_idle", + "rename": "CPU_USAGE_IDLE", + "unit": "unit" + }, + { + "name": "cpu_usage_nice", + "unit": "unit" + }, + "cpu_usage_guest", + "time_active", + "usage_active" + ] + }, + "disk": {}, + "nvidia_gpu": { + "drop_original_metrics": ["utilization_gpu", "temperature_gpu"] + } + }, + "aggregation_dimensions" : [["ImageId"], ["InstanceId", "InstanceType"], ["d1"], []], + "namespace": "namespace", + "force_flush_interval": 30, + "credentials": { + "role_arn": "metrics_role_arn_value_test" + }, + "endpoint_override": "https://monitoring-fips.us-west-2.amazonaws.com" + } +} \ No newline at end of file diff --git a/translator/translate/otel/exporter/awscloudwatch/translator.go b/translator/translate/otel/exporter/awscloudwatch/translator.go new file mode 100644 index 0000000000..8d9150bd06 --- /dev/null +++ b/translator/translate/otel/exporter/awscloudwatch/translator.go @@ -0,0 +1,123 @@ +package awscloudwatch + +import ( + "github.com/mitchellh/mapstructure" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/drop_origin" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metric_decoration" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/rollup_dimensions" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +const ( + namespaceKey = "namespace" + endpointOverrideKey = "endpoint_override" + forceFlushIntervalKey = "force_flush_interval" + + internalMaxValuesPerDatum = 5000 +) + +type translator struct { + factory component.ExporterFactory +} + +var _ common.Translator[config.Exporter] = (*translator)(nil) + +func NewTranslator() common.Translator[config.Exporter] { + return &translator{cloudwatch.NewFactory()} +} + +func (t *translator) Type() config.Type { + return t.factory.Type() +} + +// Translate creates an exporter config based on the fields in the +// metrics section of the JSON config. +// TODO: remove dependency on global config. +func (t *translator) Translate(conf *confmap.Conf) (config.Exporter, error) { + if conf != nil && conf.IsSet(common.MetricsKey) { + cfg := t.factory.CreateDefaultConfig().(*cloudwatch.Config) + credentials := confmap.NewFromStringMap(agent.Global_Config.Credentials) + _ = credentials.Unmarshal(cfg) + cfg.RoleARN = getRoleARN(conf) + cfg.Region = agent.Global_Config.Region + if namespace, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, namespaceKey)); ok { + cfg.Namespace = namespace + } + if endpointOverride, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, endpointOverrideKey)); ok { + cfg.EndpointOverride = endpointOverride + } + if forceFlushInterval, ok := common.GetDuration(conf, common.ConfigKey(common.MetricsKey, forceFlushIntervalKey)); ok { + cfg.ForceFlushInterval = forceFlushInterval + } + if agent.Global_Config.Internal { + cfg.MaxValuesPerDatum = internalMaxValuesPerDatum + } + cfg.RollupDimensions = getRollupDimensions(conf) + cfg.DropOriginConfigs = getDropOriginalMetrics(conf) + cfg.MetricDecorations = getMetricDecorations(conf) + return cfg, nil + } + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: common.MetricsKey} +} + +func getRoleARN(conf *confmap.Conf) (roleARN string) { + key := common.ConfigKey(common.MetricsKey, common.CredentialsKey, common.RoleARNKey) + var ok bool + if roleARN, ok = common.GetString(conf, key); !ok { + roleARN = agent.Global_Config.Role_arn + } + return +} + +// TODO: remove dependency on rule. +func getRollupDimensions(conf *confmap.Conf) [][]string { + key := common.ConfigKey(common.MetricsKey, rollup_dimensions.SectionKey) + value := conf.Get(key) + if value != nil && rollup_dimensions.IsValidRollupList(value) { + aggregates := value.([]interface{}) + rollup := make([][]string, len(aggregates)) + for i, aggregate := range aggregates { + dimensions := aggregate.([]interface{}) + rollup[i] = make([]string, len(dimensions)) + for j, dimension := range dimensions { + rollup[i][j] = dimension.(string) + } + } + return rollup + } + return nil +} + +// TODO: remove dependency on rule. +func getDropOriginalMetrics(conf *confmap.Conf) map[string][]string { + _, result := new(drop_origin.DropOrigin).ApplyRule(conf.Get(common.MetricsKey)) + dom, ok := result.(map[string][]string) + if ok { + return dom + } + return nil +} + +// TODO: remove dependency on rule. +func getMetricDecorations(conf *confmap.Conf) []cloudwatch.MetricDecorationConfig { + _, result := new(metric_decoration.MetricDecoration).ApplyRule(conf.Get(common.MetricsKey)) + mds, ok := result.([]interface{}) + if ok && len(mds) > 0 { + decorations := make([]cloudwatch.MetricDecorationConfig, len(mds)) + for i, md := range mds { + var decoration cloudwatch.MetricDecorationConfig + if err := mapstructure.Decode(md, &decoration); err != nil { + continue + } + decorations[i] = decoration + } + return decorations + } + return nil +} diff --git a/translator/translate/otel/exporter/awscloudwatch/translator_test.go b/translator/translate/otel/exporter/awscloudwatch/translator_test.go new file mode 100644 index 0000000000..eac997efe5 --- /dev/null +++ b/translator/translate/otel/exporter/awscloudwatch/translator_test.go @@ -0,0 +1,143 @@ +package awscloudwatch + +import ( + "encoding/json" + "os" + "path/filepath" + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +func TestTranslator(t *testing.T) { + agent.Global_Config.Region = "us-east-1" + agent.Global_Config.Role_arn = "global_arn" + cwt := NewTranslator() + require.EqualValues(t, "awscloudwatch", cwt.Type()) + testCases := map[string]struct { + input map[string]interface{} + internal bool + credentials map[string]interface{} + want *cloudwatch.Config + wantErr error + }{ + "WithMissingKey": {wantErr: &common.MissingKeyError{Type: "awscloudwatch", JsonKey: "metrics"}}, + "WithDefault": { + input: map[string]interface{}{"metrics": map[string]interface{}{}}, + want: &cloudwatch.Config{ + Namespace: "CWAgent", + Region: "us-east-1", + ForceFlushInterval: time.Minute, + MaxValuesPerDatum: 150, + RoleARN: "global_arn", + }, + }, + "WithInvalidCredentialFields": { + input: map[string]interface{}{"metrics": map[string]interface{}{}}, + credentials: map[string]interface{}{ + "access_key": "access_key", + "secret_key": "secret_key", + "token": "token", + "prof": "invalid field name", + "shared_cred": "invalid field name", + }, + want: &cloudwatch.Config{ + Namespace: "CWAgent", + Region: "us-east-1", + ForceFlushInterval: time.Minute, + MaxValuesPerDatum: 150, + RoleARN: "global_arn", + AccessKey: "access_key", + SecretKey: "secret_key", + Token: "token", + }, + }, + "WithValidCredentials": { + input: map[string]interface{}{"metrics": map[string]interface{}{}}, + credentials: map[string]interface{}{ + "access_key": "access_key", + "secret_key": "secret_key", + "token": "token", + "profile": "profile", + "shared_credential_file": "shared", + }, + want: &cloudwatch.Config{ + Namespace: "CWAgent", + Region: "us-east-1", + ForceFlushInterval: time.Minute, + MaxValuesPerDatum: 150, + RoleARN: "global_arn", + AccessKey: "access_key", + SecretKey: "secret_key", + Token: "token", + Profile: "profile", + SharedCredentialFilename: "shared", + }, + }, + "FromConfigFile": { + input: getJson(t, filepath.Join("testdata", "config.json")), + internal: true, + want: &cloudwatch.Config{ + Namespace: "namespace", + Region: "us-east-1", + ForceFlushInterval: 30 * time.Second, + MaxValuesPerDatum: 5000, + EndpointOverride: "https://monitoring-fips.us-west-2.amazonaws.com", + RoleARN: "metrics_role_arn_value_test", + RollupDimensions: [][]string{{"ImageId"}, {"InstanceId", "InstanceType"}, {"d1"}, {}}, + DropOriginConfigs: map[string][]string{ + "cpu": {"cpu_usage_idle", "time_active"}, + "nvidia_smi": {"utilization_gpu", "temperature_gpu"}, + }, + MetricDecorations: []cloudwatch.MetricDecorationConfig{ + {Category: "cpu", Metric: "usage_idle", Rename: "CPU_USAGE_IDLE", Unit: "unit"}, + {Category: "cpu", Metric: "usage_nice", Unit: "unit"}, + }, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + agent.Global_Config.Internal = testCase.internal + agent.Global_Config.Credentials = testCase.credentials + + conf := confmap.NewFromStringMap(testCase.input) + got, err := cwt.Translate(conf) + require.Equal(t, testCase.wantErr, err) + if testCase.want != nil { + require.NoError(t, err) + gotCfg, ok := got.(*cloudwatch.Config) + require.True(t, ok) + require.Equal(t, testCase.want.Namespace, gotCfg.Namespace) + require.Equal(t, testCase.want.Region, gotCfg.Region) + require.Equal(t, testCase.want.ForceFlushInterval, gotCfg.ForceFlushInterval) + require.Equal(t, testCase.want.RoleARN, gotCfg.RoleARN) + require.Equal(t, testCase.want.AccessKey, gotCfg.AccessKey) + require.Equal(t, testCase.want.SecretKey, gotCfg.SecretKey) + require.Equal(t, testCase.want.Token, gotCfg.Token) + require.Equal(t, testCase.want.Profile, gotCfg.Profile) + require.Equal(t, testCase.want.SharedCredentialFilename, gotCfg.SharedCredentialFilename) + require.Equal(t, testCase.want.MaxValuesPerDatum, gotCfg.MaxValuesPerDatum) + require.Equal(t, testCase.want.RollupDimensions, gotCfg.RollupDimensions) + require.Equal(t, testCase.want.DropOriginConfigs, gotCfg.DropOriginConfigs) + require.Equal(t, testCase.want.MetricDecorations, gotCfg.MetricDecorations) + } + }) + } +} + +func getJson(t *testing.T, path string) map[string]interface{} { + t.Helper() + + content, err := os.ReadFile(path) + require.NoError(t, err) + var result map[string]interface{} + require.NoError(t, json.Unmarshal(content, &result)) + return result +} diff --git a/translator/translate/otel/pipeline/containerinsights/translator.go b/translator/translate/otel/pipeline/containerinsights/translator.go new file mode 100644 index 0000000000..97fbfff1e2 --- /dev/null +++ b/translator/translate/otel/pipeline/containerinsights/translator.go @@ -0,0 +1,44 @@ +package containerinsights + +import ( + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/service" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" +) + +const ( + pipelineName = "containerinsights" +) + +type translator struct { +} + +var _ common.Translator[common.Pipeline] = (*translator)(nil) + +func NewTranslator() common.Translator[common.Pipeline] { + return &translator{} +} + +// Type is not used. +func (t *translator) Type() config.Type { + return pipelineName +} + +// Translate creates a pipeline for container insights if the logs.metrics_collected.ecs +// section is present. +func (t *translator) Translate(conf *confmap.Conf) (common.Pipeline, error) { + key := common.ConfigKey(common.LogsKey, common.MetricsCollectedKey, common.ECSKey) + if conf != nil && conf.IsSet(key) { + id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) + pipeline := &service.ConfigServicePipeline{ + Receivers: []config.ComponentID{config.NewComponentID("awscontainerinsightreceiver")}, + Processors: []config.ComponentID{config.NewComponentIDWithName("batch", pipelineName)}, + Exporters: []config.ComponentID{config.NewComponentIDWithName("awsemf", pipelineName)}, + } + return util.NewPair(id, pipeline), nil + } + return nil, nil +} diff --git a/translator/translate/otel/pipeline/containerinsights/translator_test.go b/translator/translate/otel/pipeline/containerinsights/translator_test.go new file mode 100644 index 0000000000..36a6b85aba --- /dev/null +++ b/translator/translate/otel/pipeline/containerinsights/translator_test.go @@ -0,0 +1,65 @@ +package containerinsights + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" +) + +func TestTranslator(t *testing.T) { + type want struct { + pipelineType string + receivers []string + processors []string + exporters []string + } + cit := NewTranslator() + require.EqualValues(t, "containerinsights", cit.Type()) + testCases := map[string]struct { + input map[string]interface{} + want *want + }{ + "WithoutKey": { + input: map[string]interface{}{}, + }, + "WithECSKey": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "ecs": nil, + }, + }, + }, + want: &want{ + pipelineType: "metrics/containerinsights", + receivers: []string{"awscontainerinsightreceiver"}, + processors: []string{"batch/containerinsights"}, + exporters: []string{"awsemf/containerinsights"}, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.input) + got, _ := cit.Translate(conf) + if testCase.want == nil { + require.Nil(t, got) + } else { + require.EqualValues(t, testCase.want.pipelineType, got.Key.String()) + require.Equal(t, testCase.want.receivers, toStringSlice(got.Value.Receivers)) + require.Equal(t, testCase.want.processors, toStringSlice(got.Value.Processors)) + require.Equal(t, testCase.want.exporters, toStringSlice(got.Value.Exporters)) + } + }) + } +} + +func toStringSlice(ids []config.ComponentID) []string { + var values []string + for _, id := range ids { + values = append(values, id.String()) + } + return values +} diff --git a/translator/translate/otel/pipeline/host/translator.go b/translator/translate/otel/pipeline/host/translator.go new file mode 100644 index 0000000000..a5e5effa4e --- /dev/null +++ b/translator/translate/otel/pipeline/host/translator.go @@ -0,0 +1,44 @@ +package host + +import ( + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/service" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/receiver/adapter" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" +) + +const ( + pipelineName = "host" +) + +type translator struct { +} + +var _ common.Translator[common.Pipeline] = (*translator)(nil) + +func NewTranslator() common.Translator[common.Pipeline] { + return &translator{} +} + +// Type is not used. +func (t translator) Type() config.Type { + return pipelineName +} + +// Translate creates a pipeline if metrics section exists. +func (t translator) Translate(conf *confmap.Conf) (common.Pipeline, error) { + if conf != nil && conf.IsSet(common.MetricsKey) { + id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) + pipeline := &service.ConfigServicePipeline{ + Receivers: []config.ComponentID{config.NewComponentID(adapter.Type("cpu"))}, + Processors: []config.ComponentID{config.NewComponentIDWithName("cumulativetodelta", pipelineName)}, + Exporters: []config.ComponentID{config.NewComponentIDWithName(cloudwatch.TypeStr, pipelineName)}, + } + return util.NewPair(id, pipeline), nil + } + return nil, nil +} diff --git a/translator/translate/otel/pipeline/host/translator_test.go b/translator/translate/otel/pipeline/host/translator_test.go new file mode 100644 index 0000000000..1398a14762 --- /dev/null +++ b/translator/translate/otel/pipeline/host/translator_test.go @@ -0,0 +1,61 @@ +package host + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" +) + +func TestNewTranslator(t *testing.T) { + type want struct { + pipelineType string + receivers []string + processors []string + exporters []string + } + ht := NewTranslator() + require.EqualValues(t, "host", ht.Type()) + testCases := map[string]struct { + input map[string]interface{} + want *want + }{ + "WithoutKey": { + input: map[string]interface{}{}, + }, + "WithMetricsKey": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{}, + }, + want: &want{ + pipelineType: "metrics/host", + receivers: []string{"telegraf_cpu"}, + processors: []string{"cumulativetodelta/host"}, + exporters: []string{"awscloudwatch/host"}, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.input) + got, _ := ht.Translate(conf) + if testCase.want == nil { + require.Nil(t, got) + } else { + require.EqualValues(t, testCase.want.pipelineType, got.Key.String()) + require.Equal(t, testCase.want.receivers, toStringSlice(got.Value.Receivers)) + require.Equal(t, testCase.want.processors, toStringSlice(got.Value.Processors)) + require.Equal(t, testCase.want.exporters, toStringSlice(got.Value.Exporters)) + } + }) + } +} + +func toStringSlice(ids []config.ComponentID) []string { + var values []string + for _, id := range ids { + values = append(values, id.String()) + } + return values +} diff --git a/translator/translate/otel/pipeline/translator.go b/translator/translate/otel/pipeline/translator.go new file mode 100644 index 0000000000..c331129d5b --- /dev/null +++ b/translator/translate/otel/pipeline/translator.go @@ -0,0 +1,50 @@ +package pipeline + +import ( + "errors" + + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/containerinsights" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/host" +) + +var ( + errNoPipelines = errors.New("no valid pipelines") +) + +type translator struct { + translators []common.Translator[common.Pipeline] +} + +var _ common.Translator[common.Pipelines] = (*translator)(nil) + +func NewTranslator() common.Translator[common.Pipelines] { + return &translator{ + translators: []common.Translator[common.Pipeline]{ + host.NewTranslator(), + containerinsights.NewTranslator(), + }, + } +} + +// Type is unused. +func (t *translator) Type() config.Type { + return "" +} + +// Translate creates the pipeline configuration. +func (t *translator) Translate(conf *confmap.Conf) (common.Pipelines, error) { + pipelines := make(common.Pipelines) + for _, pt := range t.translators { + if pipeline, _ := pt.Translate(conf); pipeline != nil { + pipelines[pipeline.Key] = pipeline.Value + } + } + if len(pipelines) == 0 { + return nil, errNoPipelines + } + return pipelines, nil +} diff --git a/translator/translate/otel/pipeline/translator_test.go b/translator/translate/otel/pipeline/translator_test.go new file mode 100644 index 0000000000..3141b21e12 --- /dev/null +++ b/translator/translate/otel/pipeline/translator_test.go @@ -0,0 +1,44 @@ +package pipeline + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/service" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" +) + +type testTranslator struct { + result common.Pipeline +} + +var _ common.Translator[common.Pipeline] = (*testTranslator)(nil) + +func (t testTranslator) Translate(_ *confmap.Conf) (common.Pipeline, error) { + return t.result, nil +} + +func (t testTranslator) Type() config.Type { + return "" +} + +func TestTranslator(t *testing.T) { + pt := NewTranslator().(*translator) + require.EqualValues(t, "", pt.Type()) + pt.translators = nil + got, err := pt.Translate(confmap.New()) + require.Equal(t, errNoPipelines, err) + require.Nil(t, got) + pt.translators = []common.Translator[common.Pipeline]{ + testTranslator{ + result: util.NewPair(config.NewComponentID(""), &service.ConfigServicePipeline{}), + }, + } + got, err = pt.Translate(confmap.New()) + require.NoError(t, err) + require.NotNil(t, got) +} diff --git a/translator/translate/otel/processor/translator.go b/translator/translate/otel/processor/translator.go new file mode 100644 index 0000000000..dee34d1af2 --- /dev/null +++ b/translator/translate/otel/processor/translator.go @@ -0,0 +1,25 @@ +package processor + +import ( + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +type translator struct { + factory component.ProcessorFactory +} + +func NewDefaultTranslator(factory component.ProcessorFactory) common.Translator[config.Processor] { + return &translator{factory} +} + +func (t *translator) Translate(*confmap.Conf) (config.Processor, error) { + return t.factory.CreateDefaultConfig(), nil +} + +func (t *translator) Type() config.Type { + return t.factory.Type() +} diff --git a/translator/translate/otel/processor/translator_test.go b/translator/translate/otel/processor/translator_test.go new file mode 100644 index 0000000000..1699c034d7 --- /dev/null +++ b/translator/translate/otel/processor/translator_test.go @@ -0,0 +1,18 @@ +package processor + +import ( + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/config" +) + +func TestTranslator(t *testing.T) { + factory := componenttest.NewNopProcessorFactory() + got := NewDefaultTranslator(factory) + require.Equal(t, config.Type("nop"), got.Type()) + cfg, err := got.Translate(nil) + require.NoError(t, err) + require.Equal(t, factory.CreateDefaultConfig(), cfg) +} diff --git a/translator/translate/otel/receiver/adapter/translator.go b/translator/translate/otel/receiver/adapter/translator.go new file mode 100644 index 0000000000..57641676f3 --- /dev/null +++ b/translator/translate/otel/receiver/adapter/translator.go @@ -0,0 +1,68 @@ +package adapter + +import ( + "time" + + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/receiver/scraperhelper" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +const ( + defaultMetricsCollectionInterval = time.Minute +) + +var ( + Type = adapter.Type +) + +type translator struct { + // cfgType determines the type set in the config. + cfgType config.Type + // cfgKey represents the flattened path to the section in the + // JSON config that must be present for the translator to work. + // See otel.ConfigKey. + cfgKey string +} + +var _ common.Translator[config.Receiver] = (*translator)(nil) + +// NewTranslator creates a new adapter receiver translator. +func NewTranslator(inputName string, cfgKey string) common.Translator[config.Receiver] { + return &translator{adapter.Type(inputName), cfgKey} +} + +func (t *translator) Type() config.Type { + return t.cfgType +} + +// Translate creates an adapter receiver config if the section set on +// the translator exists. +func (t *translator) Translate(conf *confmap.Conf) (config.Receiver, error) { + if conf != nil && conf.IsSet(t.cfgKey) { + cfg := &adapter.Config{ + ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(t.Type()), + } + // try the section key and fallback on the agent section if not set + cfg.CollectionInterval = getMetricsCollectionInterval(conf, []string{t.cfgKey, common.AgentKey}) + return cfg, nil + } + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: t.cfgKey} +} + +// getMetricsCollectionInterval from the first section with a parsable duration. +// If none are found, uses the defaultMetricsCollectionInterval. +func getMetricsCollectionInterval(conf *confmap.Conf, cfgKeys []string) time.Duration { + for _, cfgKey := range cfgKeys { + key := common.ConfigKey(cfgKey, common.MetricsCollectionIntervalKey) + duration, ok := common.GetDuration(conf, key) + if !ok { + continue + } + return duration + } + return defaultMetricsCollectionInterval +} diff --git a/translator/translate/otel/receiver/adapter/translator_test.go b/translator/translate/otel/receiver/adapter/translator_test.go new file mode 100644 index 0000000000..1da985e7ca --- /dev/null +++ b/translator/translate/otel/receiver/adapter/translator_test.go @@ -0,0 +1,121 @@ +package adapter + +import ( + "testing" + "time" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/receiver/adapter" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +func TestTranslator(t *testing.T) { + testCases := map[string]struct { + jsonCfg map[string]interface{} + cfgType string + key string + wantErr error + wantInterval time.Duration + }{ + "WithoutKey": { + jsonCfg: map[string]interface{}{}, + cfgType: "test", + key: "mem", + wantErr: &common.MissingKeyError{Type: "telegraf_test", JsonKey: "mem"}, + }, + "WithoutInterval": { + jsonCfg: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "cpu": map[string]interface{}{}, + }, + }, + }, + cfgType: "test", + key: common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "cpu"), + wantInterval: time.Minute, + }, + "WithValid": { + jsonCfg: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "mem": map[string]interface{}{ + "measurement": []string{"mem_used_percent"}, + "metrics_collection_interval": "20s", + }, + }, + }, + }, + cfgType: "test", + key: common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "mem"), + wantInterval: 20 * time.Second, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.jsonCfg) + tt := NewTranslator(testCase.cfgType, testCase.key) + got, err := tt.Translate(conf) + require.Equal(t, testCase.wantErr, err) + if err == nil { + require.NotNil(t, got) + cfg := got.(*adapter.Config) + require.Equal(t, adapter.Type(testCase.cfgType), cfg.ID().Type()) + require.Equal(t, testCase.wantInterval, cfg.CollectionInterval) + } + }) + } +} + +func TestGetMetricsCollectionInterval(t *testing.T) { + sectionKeys := []string{"section", "backup"} + testCases := map[string]struct { + jsonCfg map[string]interface{} + want time.Duration + }{ + "WithDefault": { + jsonCfg: map[string]interface{}{}, + want: time.Minute, + }, + "WithoutSectionOverride": { + jsonCfg: map[string]interface{}{ + "backup": map[string]interface{}{ + "metrics_collection_interval": 10, + }, + "section": map[string]interface{}{}, + }, + want: 10 * time.Second, + }, + "WithInvalidSectionOverride": { + jsonCfg: map[string]interface{}{ + "backup": map[string]interface{}{ + "metrics_collection_interval": 10, + }, + "section": map[string]interface{}{ + "metrics_collection_interval": "invalid", + }, + }, + want: 10 * time.Second, + }, + "WithSectionOverride": { + jsonCfg: map[string]interface{}{ + "backup": map[string]interface{}{ + "metrics_collection_interval": 10, + }, + "section": map[string]interface{}{ + "metrics_collection_interval": 120, + }, + }, + want: 2 * time.Minute, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.jsonCfg) + got := getMetricsCollectionInterval(conf, sectionKeys) + require.Equal(t, testCase.want, got) + }) + } +} diff --git a/translator/translate/otel/translate_otel.go b/translator/translate/otel/translate_otel.go new file mode 100644 index 0000000000..bb7cd87be9 --- /dev/null +++ b/translator/translate/otel/translate_otel.go @@ -0,0 +1,119 @@ +package otel + +import ( + "errors" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/config/configtelemetry" + "go.opentelemetry.io/collector/confmap" + "go.opentelemetry.io/collector/processor/batchprocessor" + "go.opentelemetry.io/collector/service" + "go.opentelemetry.io/collector/service/telemetry" + "go.uber.org/multierr" + "go.uber.org/zap/zapcore" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/exporter/awscloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/processor" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/receiver/adapter" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" +) + +// Translator is used to create an OTEL config. +type Translator struct { + pipelineTranslator common.Translator[common.Pipelines] + receiverTranslators common.TranslatorMap[config.Receiver] + processorTranslators common.TranslatorMap[config.Processor] + exporterTranslators common.TranslatorMap[config.Exporter] +} + +// NewTranslator creates a new Translator. +func NewTranslator() *Translator { + return &Translator{ + pipelineTranslator: pipeline.NewTranslator(), + receiverTranslators: common.NewTranslatorMap[config.Receiver]( + adapter.NewTranslator("cpu", common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "cpu")), + ), + processorTranslators: common.NewTranslatorMap( + processor.NewDefaultTranslator(batchprocessor.NewFactory()), + processor.NewDefaultTranslator(cumulativetodeltaprocessor.NewFactory()), + ), + exporterTranslators: common.NewTranslatorMap( + awscloudwatch.NewTranslator(), + ), + } +} + +// Translate converts a JSON config into an OTEL config. +func (t *Translator) Translate(jsonConfig interface{}) (*service.Config, error) { + m, ok := jsonConfig.(map[string]interface{}) + if !ok { + return nil, errors.New("invalid json config") + } + conf := confmap.NewFromStringMap(m) + pipelines, err := t.pipelineTranslator.Translate(conf) + if err != nil { + return nil, fmt.Errorf("unable to translate pipelines: %w", err) + } + cfg := &service.Config{ + Receivers: map[config.ComponentID]config.Receiver{}, + Exporters: map[config.ComponentID]config.Exporter{}, + Processors: map[config.ComponentID]config.Processor{}, + Service: service.ConfigService{ + Telemetry: telemetry.Config{ + Logs: telemetry.LogsConfig{Level: zapcore.InfoLevel}, + Metrics: telemetry.MetricsConfig{Level: configtelemetry.LevelNone}, + }, + Pipelines: pipelines, + }, + } + if err = t.buildComponents(cfg, conf); err != nil { + return nil, fmt.Errorf("unable to build components in pipeline: %w", err) + } + if err = cfg.Validate(); err != nil { + return nil, fmt.Errorf("invalid otel config: %w", err) + } + return cfg, nil +} + +// buildComponents uses the pipelines defined in the config to build the components. +func (t *Translator) buildComponents(cfg *service.Config, conf *confmap.Conf) error { + var errs error + receivers := util.NewSet[config.ComponentID]() + processors := util.NewSet[config.ComponentID]() + exporters := util.NewSet[config.ComponentID]() + for _, p := range cfg.Pipelines { + receivers.Add(p.Receivers...) + processors.Add(p.Processors...) + exporters.Add(p.Exporters...) + } + errs = multierr.Append(errs, buildComponents(conf, receivers, cfg.Receivers, t.receiverTranslators.Get)) + errs = multierr.Append(errs, buildComponents(conf, processors, cfg.Processors, t.processorTranslators.Get)) + errs = multierr.Append(errs, buildComponents(conf, exporters, cfg.Exporters, t.exporterTranslators.Get)) + return errs +} + +// buildComponents attempts to translate a component for each ID in the set. +func buildComponents[C common.Identifiable]( + conf *confmap.Conf, + ids util.Set[config.ComponentID], + components map[config.ComponentID]C, + getTranslator func(config.Type) (common.Translator[C], bool), +) error { + var errs error + for id := range ids { + if translator, ok := getTranslator(id.Type()); ok { + cfg, err := translator.Translate(conf) + if err != nil { + errs = multierr.Append(errs, err) + continue + } + cfg.SetIDName(id.Name()) + components[cfg.ID()] = cfg + } + } + return errs +} diff --git a/translator/translate/translate.go b/translator/translate/translate.go index a49f48ff78..e700358e13 100644 --- a/translator/translate/translate.go +++ b/translator/translate/translate.go @@ -70,16 +70,15 @@ func (t *Translator) ApplyRule(input interface{}) (returnKey string, returnVal i sortedRuleKey = append(sortedRuleKey, k) } sort.Strings(sortedRuleKey) - for _, key := range sortedRuleKey { + for _, key = range sortedRuleKey { rule := targetRuleMap[key] - key, val := rule.ApplyRule(m) + key, val = rule.ApplyRule(m) //Only output the result that the class instance is processed //If it is not processed, it key will return "" if key != "" { if key == "agent" || key == "global_tags" { result[key] = val } else { - valMap := val.(map[string]interface{}) if inputs, ok := valMap["inputs"]; ok { allInputPlugin = translator.MergePlugins(allInputPlugin, inputs.(map[string]interface{})) diff --git a/translator/util/collections.go b/translator/util/collections.go index f953d42baa..9d37d93f7c 100644 --- a/translator/util/collections.go +++ b/translator/util/collections.go @@ -2,16 +2,18 @@ package util // CopyMap returns a new map that makes a shallow copy of all the // references in the input map. -func CopyMap(m map[string]interface{}) map[string]interface{} { - dupe := make(map[string]interface{}) +func CopyMap[K comparable, V any](m map[K]V) map[K]V { + dupe := make(map[K]V) for k, v := range m { dupe[k] = v } return dupe } -func MergeMaps(maps ...map[string]interface{}) map[string]interface{} { - merged := make(map[string]interface{}) +// MergeMaps merges multiple maps into a new one. Duplicate keys +// will take the last map's value. +func MergeMaps[K comparable, V any](maps ...map[K]V) map[K]V { + merged := make(map[K]V) for _, m := range maps { for k, v := range m { merged[k] = v @@ -19,3 +21,52 @@ func MergeMaps(maps ...map[string]interface{}) map[string]interface{} { } return merged } + +// Pair is a struct with a K key and V value. +type Pair[K any, V any] struct { + Key K + Value V +} + +// NewPair creates a new Pair with key and value. +func NewPair[K any, V any](key K, value V) *Pair[K, V] { + return &Pair[K, V]{key, value} +} + +// Set is a map with a comparable K key and no +// meaningful value. +type Set[K comparable] map[K]any + +// Add keys to the Set. +func (s Set[K]) Add(keys ...K) { + for _, key := range keys { + s[key] = nil + } +} + +// Remove a key from the Set. +func (s Set[K]) Remove(key K) { + delete(s, key) +} + +// Contains whether the key is in the Set. +func (s Set[K]) Contains(key K) bool { + _, ok := s[key] + return ok +} + +// Keys creates a slice of the keys. +func (s Set[K]) Keys() []K { + keys := make([]K, 0, len(s)) + for key := range s { + keys = append(keys, key) + } + return keys +} + +// NewSet creates a new Set with the keys provided. +func NewSet[K comparable](keys ...K) Set[K] { + s := make(Set[K], len(keys)) + s.Add(keys...) + return s +} diff --git a/translator/util/collections_test.go b/translator/util/collections_test.go index 3fa3be8b6a..ba3a71a700 100644 --- a/translator/util/collections_test.go +++ b/translator/util/collections_test.go @@ -1,6 +1,7 @@ package util import ( + "github.com/stretchr/testify/require" "testing" "github.com/stretchr/testify/assert" @@ -65,6 +66,30 @@ func TestCopyMapKeepsShallowReferenceToValuesInMap(t *testing.T) { assert.False(t, ok) } +func TestMergeMaps(t *testing.T) { + m1 := map[string]int{"first": 1, "overwrite": 1} + m2 := map[string]int{"second": 2, "overwrite": 2} + got := MergeMaps(m1, m2) + require.Len(t, got, 3) + value, ok := got["overwrite"] + require.True(t, ok) + require.Equal(t, 2, value) +} + +func TestPair(t *testing.T) { + pair := NewPair("key", "value") + assert.Equal(t, "key", pair.Key) + assert.Equal(t, "value", pair.Value) +} + +func TestSet(t *testing.T) { + set := NewSet(1, 2) + assert.True(t, set.Contains(1)) + set.Remove(1) + assert.False(t, set.Contains(1)) + assert.Equal(t, []int{2}, set.Keys()) +} + func assertMapsEqual(t *testing.T, m1, m2 map[string]interface{}) { t.Helper() From e792983e74481d04c9ba22a14cbc047f8a133d76 Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Tue, 18 Oct 2022 15:55:44 -0400 Subject: [PATCH 038/144] Add license add/check Makefile command. (#28) --- .github/pull_request_template.md | 2 +- Makefile | 31 +++++++++++++++++-- cfg/migrate/awscsm.go | 3 ++ cfg/migrate/cloudwatchlogs.go | 3 ++ cfg/migrate/commonconfig.go | 3 ++ cfg/migrate/confmigrate.go | 3 ++ cfg/migrate/confmigrate_test.go | 3 ++ cfg/migrate/diskio.go | 3 ++ cfg/migrate/ec2tagger.go | 3 ++ cfg/migrate/ethtool.go | 3 ++ cfg/migrate/inputdisk.go | 3 ++ cfg/migrate/logfile.go | 3 ++ cfg/migrate/logtarget.go | 3 ++ cfg/migrate/net.go | 3 ++ cfg/migrate/procstat.go | 3 ++ cfg/migrate/winevtlog.go | 3 ++ .../performance_query_utils.go | 3 ++ .../test/performancetest/performance_test.go | 3 ++ .../test/performancetest/transmitter.go | 3 ++ internal/atomiccounter/atomiccounter.go | 3 ++ internal/retryer/logthrottle.go | 3 ++ internal/retryer/logthrottle_test.go | 3 ++ internal/structuredlogscommon/common_test.go | 3 ++ logs/logs_test.go | 3 ++ .../cadvisor/container_info_processor_test.go | 3 ++ plugins/inputs/logfile/globpath/globpath.go | 3 ++ .../inputs/logfile/globpath/globpath_test.go | 3 ++ .../logfile/tail/file_deleting_checker.go | 3 ++ .../tail/file_deleting_checker_windows.go | 3 ++ plugins/inputs/logfile/tail/tail_posix.go | 3 ++ plugins/inputs/logfile/tail/tail_test.go | 3 ++ plugins/inputs/logfile/tail/tail_windows.go | 3 ++ .../inputs/logfile/tail/watch/filechanges.go | 3 ++ .../inputs/logfile/tail/winfile/winfile.go | 3 ++ plugins/inputs/logfile/tmpfile.go | 3 ++ plugins/inputs/logfile/tmpfile_windows.go | 3 ++ .../outputs/cloudwatch/convert_unit_test.go | 3 ++ translator/cmdutil/userutil_test.go | 3 ++ translator/registerrules/register_rules.go | 3 ++ .../tomlConfigTemplate/tomlConfig.go | 3 ++ .../toyamlconfig/encoder/encoder.go | 3 ++ .../toyamlconfig/otelnative/otel.go | 3 ++ .../translate/awscontainerinsightreceiver.go | 3 ++ .../awscontainerinsightreceiver_test.go | 3 ++ .../translate/logs/util/validate_retention.go | 3 ++ .../metrics/config/plugin_alias_map.go | 3 ++ .../metrics/metrics_collect/gpu/nvidiaSmi.go | 3 ++ .../metrics_collect/gpu/nvidiaSmi_test.go | 3 ++ translator/translate/otel/common/common.go | 3 ++ .../translate/otel/common/common_test.go | 3 ++ .../otel/exporter/awscloudwatch/translator.go | 3 ++ .../exporter/awscloudwatch/translator_test.go | 3 ++ .../pipeline/containerinsights/translator.go | 3 ++ .../containerinsights/translator_test.go | 3 ++ .../otel/pipeline/host/translator.go | 3 ++ .../otel/pipeline/host/translator_test.go | 3 ++ .../translate/otel/pipeline/translator.go | 3 ++ .../otel/pipeline/translator_test.go | 3 ++ .../translate/otel/processor/translator.go | 3 ++ .../otel/processor/translator_test.go | 3 ++ .../otel/receiver/adapter/translator.go | 3 ++ .../otel/receiver/adapter/translator_test.go | 3 ++ translator/translate/otel/translate_otel.go | 3 ++ translator/util/collections.go | 3 ++ translator/util/collections_test.go | 5 ++- translator/util/config_util.go | 3 ++ 66 files changed, 222 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 6cd460eb18..12b32197e6 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -13,7 +13,7 @@ _Describe what tests you have done._ # Requirements _Before commit the code, please do the following steps._ 1. Run `make fmt` and `make fmt-sh` -2. Run `make linter` +2. Run `make lint` diff --git a/Makefile b/Makefile index f25cb243e5..b4359026e9 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,7 @@ GOIMPORTS = $(TOOLS_BIN_DIR)/goimports SHFMT = $(TOOLS_BIN_DIR)/shfmt LINTER = $(TOOLS_BIN_DIR)/golangci-lint IMPI = $(TOOLS_BIN_DIR)/impi +ADDLICENSE = $(TOOLS_BIN_DIR)/addlicense release: clean test build package-rpm package-deb package-win package-darwin nightly-release: release @@ -108,6 +109,9 @@ install-tools: GOBIN=$(TOOLS_BIN_DIR) go install golang.org/x/tools/cmd/goimports GOBIN=$(TOOLS_BIN_DIR) go install mvdan.cc/sh/v3/cmd/shfmt@latest GOBIN=$(TOOLS_BIN_DIR) go install github.com/pavius/impi/cmd/impi@v0.0.3 + # Using 04bfe4e to get SPDX template changes that are not present in the most recent tag v1.0.0 + # This is required to be able to easily omit the year in our license header. + GOBIN=$(TOOLS_BIN_DIR) go install github.com/google/addlicense@04bfe4e curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) v1.45.2 fmt: install-tools @@ -119,9 +123,30 @@ fmt-sh: install-tools impi: install-tools # Skip plugins/plugins.go - echo $(ALL_SRC) | xargs -n 10 ${IMPI} --local $(CW_AGENT_IMPORT_PATH) --scheme stdThirdPartyLocal --skip plugins/plugins.go - -lint: install-tools + echo $(ALL_SRC) | xargs -n 10 $(IMPI) --local $(CW_AGENT_IMPORT_PATH) --scheme stdThirdPartyLocal --skip plugins/plugins.go + +addlicense: install-tools + @ADDLICENSEOUT=`$(ADDLICENSE) -y="" -s=only -l="mit" -c="Amazon.com, Inc. or its affiliates. All Rights Reserved." $(ALL_SRC) 2>&1`; \ + if [ "$$ADDLICENSEOUT" ]; then \ + echo "$(ADDLICENSE) FAILED => add License errors:\n"; \ + echo "$$ADDLICENSEOUT\n"; \ + exit 1; \ + else \ + echo "Add License finished successfully"; \ + fi + +checklicense: install-tools + @ADDLICENSEOUT=`$(ADDLICENSE) -check $(ALL_SRC) 2>&1`; \ + if [ "$$ADDLICENSEOUT" ]; then \ + echo "$(ADDLICENSE) FAILED => add License errors:\n"; \ + echo "$$ADDLICENSEOUT\n"; \ + echo "Use 'make addlicense' to fix this."; \ + exit 1; \ + else \ + echo "Check License finished successfully"; \ + fi + +lint: install-tools checklicense impi ${LINTER} run ./... test: diff --git a/cfg/migrate/awscsm.go b/cfg/migrate/awscsm.go index 7057fe58fb..0a5f81111d 100644 --- a/cfg/migrate/awscsm.go +++ b/cfg/migrate/awscsm.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate import ( diff --git a/cfg/migrate/cloudwatchlogs.go b/cfg/migrate/cloudwatchlogs.go index d7304b9e19..8be667bd82 100644 --- a/cfg/migrate/cloudwatchlogs.go +++ b/cfg/migrate/cloudwatchlogs.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/commonconfig.go b/cfg/migrate/commonconfig.go index 285afe0f5f..fc33f29420 100644 --- a/cfg/migrate/commonconfig.go +++ b/cfg/migrate/commonconfig.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate import ( diff --git a/cfg/migrate/confmigrate.go b/cfg/migrate/confmigrate.go index 153be21659..3d257d6b16 100644 --- a/cfg/migrate/confmigrate.go +++ b/cfg/migrate/confmigrate.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate import ( diff --git a/cfg/migrate/confmigrate_test.go b/cfg/migrate/confmigrate_test.go index 7b348b9d25..1c57d84c7c 100644 --- a/cfg/migrate/confmigrate_test.go +++ b/cfg/migrate/confmigrate_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate import ( diff --git a/cfg/migrate/diskio.go b/cfg/migrate/diskio.go index 9984908cfd..a3af333b9e 100644 --- a/cfg/migrate/diskio.go +++ b/cfg/migrate/diskio.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/ec2tagger.go b/cfg/migrate/ec2tagger.go index c1f60162a9..a66cde0600 100644 --- a/cfg/migrate/ec2tagger.go +++ b/cfg/migrate/ec2tagger.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/ethtool.go b/cfg/migrate/ethtool.go index 3bbe792882..a8592eb8bf 100644 --- a/cfg/migrate/ethtool.go +++ b/cfg/migrate/ethtool.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/inputdisk.go b/cfg/migrate/inputdisk.go index 2ff67ff51b..a0c6ed62b6 100644 --- a/cfg/migrate/inputdisk.go +++ b/cfg/migrate/inputdisk.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/logfile.go b/cfg/migrate/logfile.go index 948da43226..3e12c27cbf 100644 --- a/cfg/migrate/logfile.go +++ b/cfg/migrate/logfile.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/logtarget.go b/cfg/migrate/logtarget.go index c0f0dcfaf7..08eb7098bb 100644 --- a/cfg/migrate/logtarget.go +++ b/cfg/migrate/logtarget.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate import "errors" diff --git a/cfg/migrate/net.go b/cfg/migrate/net.go index 4ce2c13d0a..0853a55733 100644 --- a/cfg/migrate/net.go +++ b/cfg/migrate/net.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/procstat.go b/cfg/migrate/procstat.go index eba2635eb4..66482aabc3 100644 --- a/cfg/migrate/procstat.go +++ b/cfg/migrate/procstat.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/cfg/migrate/winevtlog.go b/cfg/migrate/winevtlog.go index 93f502bd82..cf1567dccc 100644 --- a/cfg/migrate/winevtlog.go +++ b/cfg/migrate/winevtlog.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package migrate func init() { diff --git a/integration/test/performancetest/performance_query_utils.go b/integration/test/performancetest/performance_query_utils.go index 6adf1ac87b..da977dc80c 100644 --- a/integration/test/performancetest/performance_query_utils.go +++ b/integration/test/performancetest/performance_query_utils.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package performancetest import ( diff --git a/integration/test/performancetest/performance_test.go b/integration/test/performancetest/performance_test.go index a786c1aefe..ad59b460db 100644 --- a/integration/test/performancetest/performance_test.go +++ b/integration/test/performancetest/performance_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build linux && integration // +build linux,integration diff --git a/integration/test/performancetest/transmitter.go b/integration/test/performancetest/transmitter.go index 83b2200c6b..ee35c09b06 100644 --- a/integration/test/performancetest/transmitter.go +++ b/integration/test/performancetest/transmitter.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package performancetest import ( diff --git a/internal/atomiccounter/atomiccounter.go b/internal/atomiccounter/atomiccounter.go index a5ad4c875f..b0644e3619 100644 --- a/internal/atomiccounter/atomiccounter.go +++ b/internal/atomiccounter/atomiccounter.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package atomiccounter import ( diff --git a/internal/retryer/logthrottle.go b/internal/retryer/logthrottle.go index 8a1d380e7a..ae1bc2843c 100644 --- a/internal/retryer/logthrottle.go +++ b/internal/retryer/logthrottle.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package retryer import ( diff --git a/internal/retryer/logthrottle_test.go b/internal/retryer/logthrottle_test.go index 765afa01fd..6cffd79364 100644 --- a/internal/retryer/logthrottle_test.go +++ b/internal/retryer/logthrottle_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package retryer import ( diff --git a/internal/structuredlogscommon/common_test.go b/internal/structuredlogscommon/common_test.go index 6b8c6ee9ad..e5b1c996dc 100644 --- a/internal/structuredlogscommon/common_test.go +++ b/internal/structuredlogscommon/common_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package structuredlogscommon import ( diff --git a/logs/logs_test.go b/logs/logs_test.go index d11275da1d..8cd9f9af46 100644 --- a/logs/logs_test.go +++ b/logs/logs_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package logs import ( diff --git a/plugins/inputs/cadvisor/container_info_processor_test.go b/plugins/inputs/cadvisor/container_info_processor_test.go index aca5f35bf5..9465bd593f 100644 --- a/plugins/inputs/cadvisor/container_info_processor_test.go +++ b/plugins/inputs/cadvisor/container_info_processor_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package cadvisor import ( diff --git a/plugins/inputs/logfile/globpath/globpath.go b/plugins/inputs/logfile/globpath/globpath.go index 71846f7759..09e31182d1 100644 --- a/plugins/inputs/logfile/globpath/globpath.go +++ b/plugins/inputs/logfile/globpath/globpath.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package globpath import ( diff --git a/plugins/inputs/logfile/globpath/globpath_test.go b/plugins/inputs/logfile/globpath/globpath_test.go index 1732bc2cd8..8839cf52cd 100644 --- a/plugins/inputs/logfile/globpath/globpath_test.go +++ b/plugins/inputs/logfile/globpath/globpath_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build !windows // +build !windows diff --git a/plugins/inputs/logfile/tail/file_deleting_checker.go b/plugins/inputs/logfile/tail/file_deleting_checker.go index 3e8c865c3b..4666f8d07f 100644 --- a/plugins/inputs/logfile/tail/file_deleting_checker.go +++ b/plugins/inputs/logfile/tail/file_deleting_checker.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build linux || darwin // +build linux darwin diff --git a/plugins/inputs/logfile/tail/file_deleting_checker_windows.go b/plugins/inputs/logfile/tail/file_deleting_checker_windows.go index 4d0498a925..60fc1d82d2 100644 --- a/plugins/inputs/logfile/tail/file_deleting_checker_windows.go +++ b/plugins/inputs/logfile/tail/file_deleting_checker_windows.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build windows // +build windows diff --git a/plugins/inputs/logfile/tail/tail_posix.go b/plugins/inputs/logfile/tail/tail_posix.go index 34423dd806..be3c7a039d 100644 --- a/plugins/inputs/logfile/tail/tail_posix.go +++ b/plugins/inputs/logfile/tail/tail_posix.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build linux || darwin || freebsd || netbsd || openbsd // +build linux darwin freebsd netbsd openbsd diff --git a/plugins/inputs/logfile/tail/tail_test.go b/plugins/inputs/logfile/tail/tail_test.go index 4ac2422ec4..e7b7950f71 100644 --- a/plugins/inputs/logfile/tail/tail_test.go +++ b/plugins/inputs/logfile/tail/tail_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package tail import ( diff --git a/plugins/inputs/logfile/tail/tail_windows.go b/plugins/inputs/logfile/tail/tail_windows.go index 7f1e3abd60..1df995a454 100644 --- a/plugins/inputs/logfile/tail/tail_windows.go +++ b/plugins/inputs/logfile/tail/tail_windows.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build windows // +build windows diff --git a/plugins/inputs/logfile/tail/watch/filechanges.go b/plugins/inputs/logfile/tail/watch/filechanges.go index f80aead9ad..e39ece679f 100644 --- a/plugins/inputs/logfile/tail/watch/filechanges.go +++ b/plugins/inputs/logfile/tail/watch/filechanges.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package watch type FileChanges struct { diff --git a/plugins/inputs/logfile/tail/winfile/winfile.go b/plugins/inputs/logfile/tail/winfile/winfile.go index 3c21f4f8b2..9f2f7d9885 100644 --- a/plugins/inputs/logfile/tail/winfile/winfile.go +++ b/plugins/inputs/logfile/tail/winfile/winfile.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build windows // +build windows diff --git a/plugins/inputs/logfile/tmpfile.go b/plugins/inputs/logfile/tmpfile.go index 653f9cdfd0..4e09e56fc2 100644 --- a/plugins/inputs/logfile/tmpfile.go +++ b/plugins/inputs/logfile/tmpfile.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build !windows // +build !windows diff --git a/plugins/inputs/logfile/tmpfile_windows.go b/plugins/inputs/logfile/tmpfile_windows.go index fad30a7d3e..41a9a59dfa 100644 --- a/plugins/inputs/logfile/tmpfile_windows.go +++ b/plugins/inputs/logfile/tmpfile_windows.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package logfile import ( diff --git a/plugins/outputs/cloudwatch/convert_unit_test.go b/plugins/outputs/cloudwatch/convert_unit_test.go index 082ab5e90b..2fea11d0e0 100644 --- a/plugins/outputs/cloudwatch/convert_unit_test.go +++ b/plugins/outputs/cloudwatch/convert_unit_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package cloudwatch import ( diff --git a/translator/cmdutil/userutil_test.go b/translator/cmdutil/userutil_test.go index 54dde66ee9..661fd1fd5f 100644 --- a/translator/cmdutil/userutil_test.go +++ b/translator/cmdutil/userutil_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + //go:build !windows // +build !windows diff --git a/translator/registerrules/register_rules.go b/translator/registerrules/register_rules.go index 231d9fd53a..977d8d1442 100644 --- a/translator/registerrules/register_rules.go +++ b/translator/registerrules/register_rules.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package registerrules // Rules register themselves during import with their parent rules in a hierarchy up until the root translator object. diff --git a/translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go b/translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go index 5e0f2e244b..7a43aa37ad 100644 --- a/translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go +++ b/translator/tocwconfig/totomlconfig/tomlConfigTemplate/tomlConfig.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package tomlConfigTemplate type ( diff --git a/translator/tocwconfig/toyamlconfig/encoder/encoder.go b/translator/tocwconfig/toyamlconfig/encoder/encoder.go index fe05185680..3babd5e25d 100644 --- a/translator/tocwconfig/toyamlconfig/encoder/encoder.go +++ b/translator/tocwconfig/toyamlconfig/encoder/encoder.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package encoder type Encoder interface { diff --git a/translator/tocwconfig/toyamlconfig/otelnative/otel.go b/translator/tocwconfig/toyamlconfig/otelnative/otel.go index bd1518e2cd..88e40bede7 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/otel.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/otel.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package otelnative const ( diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go index 96b59444da..11db6d8a35 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package translate import ( diff --git a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go index 300a074fb6..00096ab6ad 100644 --- a/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go +++ b/translator/tocwconfig/toyamlconfig/otelnative/translate/awscontainerinsightreceiver_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package translate import ( diff --git a/translator/translate/logs/util/validate_retention.go b/translator/translate/logs/util/validate_retention.go index f313e73b82..b18bf76258 100644 --- a/translator/translate/logs/util/validate_retention.go +++ b/translator/translate/logs/util/validate_retention.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package util import ( diff --git a/translator/translate/metrics/config/plugin_alias_map.go b/translator/translate/metrics/config/plugin_alias_map.go index 2f7bef55de..05218d5e0a 100644 --- a/translator/translate/metrics/config/plugin_alias_map.go +++ b/translator/translate/metrics/config/plugin_alias_map.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package config // pluginAliasMap This provides the real plugin name mapping to the measurement name in user config diff --git a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go index 9910819a5c..410e632275 100644 --- a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go +++ b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package gpu import ( diff --git a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi_test.go b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi_test.go index ef3b958ebd..b53e666210 100644 --- a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi_test.go +++ b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package gpu import ( diff --git a/translator/translate/otel/common/common.go b/translator/translate/otel/common/common.go index ad32409d77..35439ccc95 100644 --- a/translator/translate/otel/common/common.go +++ b/translator/translate/otel/common/common.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package common import ( diff --git a/translator/translate/otel/common/common_test.go b/translator/translate/otel/common/common_test.go index 03b5d37cec..60e9a3a41f 100644 --- a/translator/translate/otel/common/common_test.go +++ b/translator/translate/otel/common/common_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package common import ( diff --git a/translator/translate/otel/exporter/awscloudwatch/translator.go b/translator/translate/otel/exporter/awscloudwatch/translator.go index 8d9150bd06..f3efc33b57 100644 --- a/translator/translate/otel/exporter/awscloudwatch/translator.go +++ b/translator/translate/otel/exporter/awscloudwatch/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package awscloudwatch import ( diff --git a/translator/translate/otel/exporter/awscloudwatch/translator_test.go b/translator/translate/otel/exporter/awscloudwatch/translator_test.go index eac997efe5..21f633aa0f 100644 --- a/translator/translate/otel/exporter/awscloudwatch/translator_test.go +++ b/translator/translate/otel/exporter/awscloudwatch/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package awscloudwatch import ( diff --git a/translator/translate/otel/pipeline/containerinsights/translator.go b/translator/translate/otel/pipeline/containerinsights/translator.go index 97fbfff1e2..0840270f93 100644 --- a/translator/translate/otel/pipeline/containerinsights/translator.go +++ b/translator/translate/otel/pipeline/containerinsights/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package containerinsights import ( diff --git a/translator/translate/otel/pipeline/containerinsights/translator_test.go b/translator/translate/otel/pipeline/containerinsights/translator_test.go index 36a6b85aba..6319cb2eb0 100644 --- a/translator/translate/otel/pipeline/containerinsights/translator_test.go +++ b/translator/translate/otel/pipeline/containerinsights/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package containerinsights import ( diff --git a/translator/translate/otel/pipeline/host/translator.go b/translator/translate/otel/pipeline/host/translator.go index a5e5effa4e..eec3f26c63 100644 --- a/translator/translate/otel/pipeline/host/translator.go +++ b/translator/translate/otel/pipeline/host/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package host import ( diff --git a/translator/translate/otel/pipeline/host/translator_test.go b/translator/translate/otel/pipeline/host/translator_test.go index 1398a14762..4ed41b5ea7 100644 --- a/translator/translate/otel/pipeline/host/translator_test.go +++ b/translator/translate/otel/pipeline/host/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package host import ( diff --git a/translator/translate/otel/pipeline/translator.go b/translator/translate/otel/pipeline/translator.go index c331129d5b..bfdc37794b 100644 --- a/translator/translate/otel/pipeline/translator.go +++ b/translator/translate/otel/pipeline/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package pipeline import ( diff --git a/translator/translate/otel/pipeline/translator_test.go b/translator/translate/otel/pipeline/translator_test.go index 3141b21e12..7f97706d39 100644 --- a/translator/translate/otel/pipeline/translator_test.go +++ b/translator/translate/otel/pipeline/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package pipeline import ( diff --git a/translator/translate/otel/processor/translator.go b/translator/translate/otel/processor/translator.go index dee34d1af2..cc3bee05f0 100644 --- a/translator/translate/otel/processor/translator.go +++ b/translator/translate/otel/processor/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package processor import ( diff --git a/translator/translate/otel/processor/translator_test.go b/translator/translate/otel/processor/translator_test.go index 1699c034d7..b958d54a97 100644 --- a/translator/translate/otel/processor/translator_test.go +++ b/translator/translate/otel/processor/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package processor import ( diff --git a/translator/translate/otel/receiver/adapter/translator.go b/translator/translate/otel/receiver/adapter/translator.go index 57641676f3..42e1c05f98 100644 --- a/translator/translate/otel/receiver/adapter/translator.go +++ b/translator/translate/otel/receiver/adapter/translator.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package adapter import ( diff --git a/translator/translate/otel/receiver/adapter/translator_test.go b/translator/translate/otel/receiver/adapter/translator_test.go index 1da985e7ca..4eb431f980 100644 --- a/translator/translate/otel/receiver/adapter/translator_test.go +++ b/translator/translate/otel/receiver/adapter/translator_test.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package adapter import ( diff --git a/translator/translate/otel/translate_otel.go b/translator/translate/otel/translate_otel.go index bb7cd87be9..7e63daf907 100644 --- a/translator/translate/otel/translate_otel.go +++ b/translator/translate/otel/translate_otel.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package otel import ( diff --git a/translator/util/collections.go b/translator/util/collections.go index 9d37d93f7c..30bdfde49e 100644 --- a/translator/util/collections.go +++ b/translator/util/collections.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package util // CopyMap returns a new map that makes a shallow copy of all the diff --git a/translator/util/collections_test.go b/translator/util/collections_test.go index ba3a71a700..22da3646a9 100644 --- a/translator/util/collections_test.go +++ b/translator/util/collections_test.go @@ -1,10 +1,13 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package util import ( - "github.com/stretchr/testify/require" "testing" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" ) func TestCopyMapHasSameValues(t *testing.T) { diff --git a/translator/util/config_util.go b/translator/util/config_util.go index 4f0cc1bd4e..964a7796da 100644 --- a/translator/util/config_util.go +++ b/translator/util/config_util.go @@ -1,3 +1,6 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + package util import ( From a8835bcef58200eed9c96571c96de84787faae40 Mon Sep 17 00:00:00 2001 From: Kaushik Surya <108111936+sky333999@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:54:30 -0400 Subject: [PATCH 039/144] Add unit test for processes plugin (#27) * Add unit test for processes plugin * Reuse code to initialize receiver; Remove t.Helper() from tests; Init processes plugin using an import * Restructure unit tests --- receiver/adapter/plugins_test.go | 257 ++++++++------------- receiver/adapter/testdata/all_plugins.toml | 5 + 2 files changed, 102 insertions(+), 160 deletions(-) diff --git a/receiver/adapter/plugins_test.go b/receiver/adapter/plugins_test.go index c7f91ed03f..a3cfab8955 100644 --- a/receiver/adapter/plugins_test.go +++ b/receiver/adapter/plugins_test.go @@ -13,9 +13,10 @@ import ( "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/config" - "github.com/influxdata/telegraf/plugins/inputs/disk" - "github.com/influxdata/telegraf/plugins/inputs/mem" - "github.com/influxdata/telegraf/plugins/inputs/net" + _ "github.com/influxdata/telegraf/plugins/inputs/disk" + _ "github.com/influxdata/telegraf/plugins/inputs/mem" + _ "github.com/influxdata/telegraf/plugins/inputs/net" + _ "github.com/influxdata/telegraf/plugins/inputs/processes" _ "github.com/influxdata/telegraf/plugins/inputs/swap" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pmetric" @@ -24,171 +25,122 @@ import ( var testCfg = "./testdata/all_plugins.toml" -func Test_CPUPlugin(t *testing.T) { - t.Helper() - as := assert.New(t) - cpu := "cpu" - - c := config.NewConfig() - c.InputFilters = []string{cpu} - err := c.LoadConfig(testCfg) - as.NoError(err) - - a, _ := agent.NewAgent(c) - as.Len(a.Config.Inputs, 1) - - receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) - err = receiver.start(nil, nil) - as.NoError(err) - - // Scrape twice but with a slight delay so that delta is detected and usage metrics are captured - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L109-L111 - otelMetrics, err := receiver.scrape(nil) - as.NoError(err) - time.Sleep(1 * time.Second) - otelMetrics, err = receiver.scrape(nil) - as.NoError(err) - - err = receiver.shutdown(nil) - as.NoError(err) +type SanityTestConfig struct { + plugin string + scrapeCount int + expectedMetrics [][]string + expectedResourceMetricsLen int + expectedResourceMetricsLenComparator assert.ComparisonAssertionFunc +} - as.Equal(2, otelMetrics.ResourceMetrics().Len()) - - // Validate CPU Time metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L72-L86 - metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() - as.Equal(11, metrics.Len()) - expectedCPUTimeMetrics := []string{"time_active", "time_user", "time_system", "time_idle", "time_nice", "time_iowait", "time_irq", "time_softirq", "time_steal", "time_guest", "time_guest_nice"} - validateMetricName(as, cpu, expectedCPUTimeMetrics, metrics) - - // Validate CPU Usage metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L113-L123 - metrics = otelMetrics.ResourceMetrics().At(1).ScopeMetrics().At(0).Metrics() - as.Equal(11, metrics.Len()) - expectedCPUUsageMetrics := []string{"usage_active", "usage_user", "usage_system", "usage_idle", "usage_nice", "usage_iowait", "usage_irq", "usage_softirq", "usage_steal", "usage_guest", "usage_guest_nice"} - validateMetricName(as, cpu, expectedCPUUsageMetrics, metrics) +func Test_CPUPlugin(t *testing.T) { + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "cpu", + // Scrape twice so that delta is detected and usage metrics are captured + scrapeCount: 2, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L109-L111 + expectedMetrics: [][]string{ + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L72-L86 + {"time_active", "time_user", "time_system", "time_idle", "time_nice", "time_iowait", "time_irq", "time_softirq", "time_steal", "time_guest", "time_guest_nice"}, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/cpu/cpu.go#L113-L123 + {"usage_active", "usage_user", "usage_system", "usage_idle", "usage_nice", "usage_iowait", "usage_irq", "usage_softirq", "usage_steal", "usage_guest", "usage_guest_nice"}, + }, + expectedResourceMetricsLen: 2, + expectedResourceMetricsLenComparator: assert.Equal, + }) } func Test_MemPlugin(t *testing.T) { - t.Helper() - as := assert.New(t) - memory := "mem" - - memStats := mem.MemStats{} - err := memStats.Init() - as.NoError(err) - - c := config.NewConfig() - c.InputFilters = []string{memory} - - err = c.LoadConfig(testCfg) - as.NoError(err) - - a, _ := agent.NewAgent(c) - as.Len(a.Config.Inputs, 1) - - receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) - err = receiver.start(nil, nil) - as.NoError(err) - - otelMetrics, err := receiver.scrape(nil) - as.NoError(err) - - err = receiver.shutdown(nil) - as.NoError(err) - - // Validate Mem metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/mem/mem.go#L40-L44 - metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() - as.Equal(5, metrics.Len()) - expectedMemoryUsageMetrics := []string{"total", "available", "used", "used_percent", "available_percent"} - validateMetricName(as, memory, expectedMemoryUsageMetrics, metrics) + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "mem", + scrapeCount: 1, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/mem/mem.go#L40-L44 + expectedMetrics: [][]string{{"total", "available", "used", "used_percent", "available_percent"}}, + expectedResourceMetricsLen: 1, + expectedResourceMetricsLenComparator: assert.Equal, + }) } func Test_SwapPlugin(t *testing.T) { - t.Helper() - as := assert.New(t) - swaps := "swap" - - memStats := mem.MemStats{} - err := memStats.Init() - as.NoError(err) - - c := config.NewConfig() - c.InputFilters = []string{swaps} - - err = c.LoadConfig(testCfg) - as.NoError(err) - - a, _ := agent.NewAgent(c) - as.Len(a.Config.Inputs, 1) - - receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) - err = receiver.start(nil, nil) - as.NoError(err) - - otelMetrics, err := receiver.scrape(nil) - as.NoError(err) - - err = receiver.shutdown(nil) - as.NoError(err) - - // Validate Swap metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/swap/swap.go#L32-L37 - metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() - as.Equal(4, metrics.Len()) - expectedSwapMetrics := []string{"total", "free", "used", "used_percent"} - validateMetricName(as, swaps, expectedSwapMetrics, metrics) + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "swap", + scrapeCount: 1, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/swap/swap.go#L32-L37 + expectedMetrics: [][]string{{"total", "free", "used", "used_percent"}}, + expectedResourceMetricsLen: 1, + expectedResourceMetricsLenComparator: assert.Equal, + }) } func Test_NetPlugin(t *testing.T) { - t.Helper() - as := assert.New(t) - network := "net" - - netStats := net.NetIOStats{} - netStats.IgnoreProtocolStats = true + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "net", + scrapeCount: 1, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/net/net.go#L86-L93 + expectedMetrics: [][]string{{"bytes_sent", "bytes_recv", "packets_sent", "packets_recv", "err_in", "err_out", "drop_in", "drop_out"}}, + expectedResourceMetricsLen: 1, + // The net plugin stands-out here because we don't specify an interface filter in our config (to be agnostic of where this test runs) + // which means the plugin reports metrics for each network interface it picks up. Hence, we only check atleast 1 metric is reported + // (expectedResourceMetricsLen i.e. 1 <= actualResourceMetricsCount) + expectedResourceMetricsLenComparator: assert.LessOrEqual, + }) +} - c := config.NewConfig() - c.InputFilters = []string{network} +func Test_DiskPlugin(t *testing.T) { + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "disk", + scrapeCount: 1, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/disk/disk.go#L72-L78 + expectedMetrics: [][]string{{"total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"}}, + expectedResourceMetricsLen: 1, + expectedResourceMetricsLenComparator: assert.Equal, + }) +} - err := c.LoadConfig(testCfg) - as.NoError(err) +func Test_ProcessesPlugin(t *testing.T) { + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "processes", + scrapeCount: 1, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/processes/processes_notwindows.go#L65-L71 + expectedMetrics: [][]string{{"blocked", "zombies", "stopped", "running", "sleeping", "total", "unknown"}}, + expectedResourceMetricsLen: 1, + expectedResourceMetricsLenComparator: assert.Equal, + }) +} - a, _ := agent.NewAgent(c) - as.Len(a.Config.Inputs, 1) +func scrapeAndValidateMetrics(t *testing.T, cfg *SanityTestConfig) { + as := assert.New(t) + receiver := getInitializedReceiver(t, cfg.plugin) - receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) - err = receiver.start(nil, nil) + err := receiver.start(nil, nil) as.NoError(err) - otelMetrics, err := receiver.scrape(nil) - as.NoError(err) + var otelMetrics pmetric.Metrics + for i := 0; i < cfg.scrapeCount; i++ { + if i != 0 { + time.Sleep(1 * time.Second) + } + otelMetrics, err = receiver.scrape(nil) + as.NoError(err) + } err = receiver.shutdown(nil) as.NoError(err) - // Validate Net metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/net/net.go#L86-L93 - metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() - as.Equal(8, metrics.Len()) - expectedNetMetrics := []string{"bytes_sent", "bytes_recv", "packets_sent", "packets_recv", "err_in", "err_out", "drop_in", "drop_out"} - validateMetricName(as, network, expectedNetMetrics, metrics) + cfg.expectedResourceMetricsLenComparator(t, cfg.expectedResourceMetricsLen, otelMetrics.ResourceMetrics().Len()) + + var metrics pmetric.MetricSlice + for i := 0; i < len(cfg.expectedMetrics); i++ { + metrics = otelMetrics.ResourceMetrics().At(i).ScopeMetrics().At(0).Metrics() + validateMetricName(as, cfg.plugin, cfg.expectedMetrics[i], metrics) + } } -func Test_DiskPlugin(t *testing.T) { - t.Helper() +func getInitializedReceiver(t *testing.T, plugin string) *AdaptedReceiver { as := assert.New(t) - diskP := "disk" - - diskStats := disk.DiskStats{} - err := diskStats.Init() - as.NoError(err) - c := config.NewConfig() - c.InputFilters = []string{diskP} - - err = c.LoadConfig(testCfg) + c.InputFilters = []string{plugin} + err := c.LoadConfig(testCfg) as.NoError(err) a, _ := agent.NewAgent(c) @@ -197,22 +149,7 @@ func Test_DiskPlugin(t *testing.T) { err = a.Config.Inputs[0].Init() as.NoError(err) - receiver := newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) - err = receiver.start(nil, nil) - as.NoError(err) - - otelMetrics, err := receiver.scrape(nil) - as.NoError(err) - - err = receiver.shutdown(nil) - as.NoError(err) - - // Validate Disk metrics - // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/disk/disk.go#L72-L78 - metrics := otelMetrics.ResourceMetrics().At(0).ScopeMetrics().At(0).Metrics() - as.Equal(7, metrics.Len()) - expectedDiskMetrics := []string{"total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"} - validateMetricName(as, diskP, expectedDiskMetrics, metrics) + return newAdaptedReceiver(a.Config.Inputs[0], zaptest.NewLogger(t)) } func validateMetricName(as *assert.Assertions, plugin string, expectedResourceMetricsName []string, actualOtelSlMetrics pmetric.MetricSlice) { diff --git a/receiver/adapter/testdata/all_plugins.toml b/receiver/adapter/testdata/all_plugins.toml index bc3e8dfa41..307d8ec01b 100644 --- a/receiver/adapter/testdata/all_plugins.toml +++ b/receiver/adapter/testdata/all_plugins.toml @@ -32,4 +32,9 @@ fieldpass = ["total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"] tagexclude = ["mode"] [inputs.disk.tags] + metricPath = "metrics" + +[[inputs.processes]] + fieldpass = ["blocked", "zombies", "stopped", "running", "sleeping", "total", "unknown"] + [inputs.processes.tags] metricPath = "metrics" \ No newline at end of file From 88aca4c7c8b9a84b08037debee05b613aa17acc0 Mon Sep 17 00:00:00 2001 From: Adam <90734270+adam-mateen@users.noreply.github.com> Date: Thu, 20 Oct 2022 13:22:00 -0500 Subject: [PATCH 040/144] Fix failing cloudwatch TestConfig. Improve coverage. (#30) * Fix failing cloudwatch TestConfig. Improve coverage. --- go.mod | 2 +- plugins/outputs/cloudwatch/config_test.go | 13 +++++++++++-- plugins/outputs/cloudwatch/testdata/full.yaml | 2 +- .../testdata/small_force_flush_interval.yaml | 14 ++++++++++++++ 4 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 plugins/outputs/cloudwatch/testdata/small_force_flush_interval.yaml diff --git a/go.mod b/go.mod index b104fd0203..5174e6c942 100644 --- a/go.mod +++ b/go.mod @@ -90,6 +90,7 @@ require ( github.com/xeipuuv/gojsonschema v1.2.0 go.opentelemetry.io/collector v0.61.0 go.opentelemetry.io/collector/pdata v0.61.0 + go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f @@ -293,7 +294,6 @@ require ( go.opentelemetry.io/otel/trace v1.10.0 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/goleak v1.1.12 // indirect - go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/oauth2 v0.0.0-20220628200809-02e64fa58f26 // indirect diff --git a/plugins/outputs/cloudwatch/config_test.go b/plugins/outputs/cloudwatch/config_test.go index 0f34c13f3f..15591890dc 100644 --- a/plugins/outputs/cloudwatch/config_test.go +++ b/plugins/outputs/cloudwatch/config_test.go @@ -21,12 +21,21 @@ func TestConfig(t *testing.T) { factory := NewFactory() factories.Exporters[TypeStr] = factory - // Test missing region. (valid) + // Test missing region. + // Expect invalid because factory does not have a default value. fp := filepath.Join("testdata", "missing_region.yaml") _, err = servicetest.LoadConfigAndValidate(fp, factories) assert.Error(t, err) - // Test missing namespace. (valid) + // Test small force flush interval. + // Expect invalid because of minimum duration check. + // A value of 60 in YAML will be parsed as 60ns. + fp = filepath.Join("testdata", "small_force_flush_interval.yaml") + _, err = servicetest.LoadConfigAndValidate(fp, factories) + assert.Error(t, err) + + // Test missing namespace. + // Expect valid because factory has a default value. fp = filepath.Join("testdata", "missing_namespace.yaml") _, err = servicetest.LoadConfigAndValidate(fp, factories) assert.NoError(t, err) diff --git a/plugins/outputs/cloudwatch/testdata/full.yaml b/plugins/outputs/cloudwatch/testdata/full.yaml index f558478c31..f546612d44 100644 --- a/plugins/outputs/cloudwatch/testdata/full.yaml +++ b/plugins/outputs/cloudwatch/testdata/full.yaml @@ -12,7 +12,7 @@ exporters: profile: val7 shared_credential_file: val8 token: val9 - force_flush_interval: 60 + force_flush_interval: 60s max_datums_per_call: 7 max_values_per_datum: 9 diff --git a/plugins/outputs/cloudwatch/testdata/small_force_flush_interval.yaml b/plugins/outputs/cloudwatch/testdata/small_force_flush_interval.yaml new file mode 100644 index 0000000000..8fd662c7e6 --- /dev/null +++ b/plugins/outputs/cloudwatch/testdata/small_force_flush_interval.yaml @@ -0,0 +1,14 @@ +receivers: + nop: {} + +exporters: + awscloudwatch: + namespace: val1 + region: val2 + force_flush_interval: 60 + +service: + pipelines: + metrics: + receivers: [nop] + exporters: [awscloudwatch] \ No newline at end of file From 37dbe816c6f1691a0acfd0b564f91a0d9bc95399 Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Thu, 27 Oct 2022 14:43:57 -0400 Subject: [PATCH 041/144] Add container insights component translators. (#29) Add function to find adapter receiver translators from config provided. Moved collections to internal/util/collections. --- Makefile | 5 +- go.mod | 35 +++-- go.sum | 126 ++++++++++++----- .../util/collections}/collections.go | 50 +++++-- .../util/collections}/collections_test.go | 42 +++++- .../tocwconfig/toyamlconfig/toyamlconfig.go | 13 +- .../logs/logs_collected/files/files.go | 9 +- .../windows_events/windows_event.go | 7 +- .../metrics/metrics_collect/gpu/nvidiaSmi.go | 30 ++-- translator/translate/otel/common/common.go | 13 +- .../translate/otel/common/common_test.go | 3 +- .../otel/exporter/awscloudwatch/translator.go | 96 ++++++------- .../otel/exporter/awsemf/emf_config.yml | 31 ++++ .../otel/exporter/awsemf/translator.go | 48 +++++++ .../otel/exporter/awsemf/translator_test.go | 23 +++ .../pipeline/containerinsights/translator.go | 21 ++- .../containerinsights/translator_test.go | 30 ++-- .../otel/pipeline/host/translator.go | 39 ++++-- .../otel/pipeline/host/translator_test.go | 36 ++--- .../translate/otel/pipeline/translator.go | 11 +- .../otel/pipeline/translator_test.go | 13 +- .../otel/receiver/adapter/translator.go | 29 ++-- .../otel/receiver/adapter/translator_test.go | 53 +++---- .../otel/receiver/adapter/translators.go | 132 ++++++++++++++++++ .../otel/receiver/adapter/translators_test.go | 123 ++++++++++++++++ .../awscontainerinsight/translator.go | 79 +++++++++++ .../awscontainerinsight/translator_test.go | 108 ++++++++++++++ translator/translate/otel/translate_otel.go | 54 ++++--- .../translate/otel/translate_otel_test.go | 59 ++++++++ .../{paltform_other.go => platform_other.go} | 0 30 files changed, 1040 insertions(+), 278 deletions(-) rename {translator/util => internal/util/collections}/collections.go (60%) rename {translator/util => internal/util/collections}/collections_test.go (70%) create mode 100644 translator/translate/otel/exporter/awsemf/emf_config.yml create mode 100644 translator/translate/otel/exporter/awsemf/translator.go create mode 100644 translator/translate/otel/exporter/awsemf/translator_test.go create mode 100644 translator/translate/otel/receiver/adapter/translators.go create mode 100644 translator/translate/otel/receiver/adapter/translators_test.go create mode 100644 translator/translate/otel/receiver/awscontainerinsight/translator.go create mode 100644 translator/translate/otel/receiver/awscontainerinsight/translator_test.go create mode 100644 translator/translate/otel/translate_otel_test.go rename translator/util/{paltform_other.go => platform_other.go} (100%) diff --git a/Makefile b/Makefile index b4359026e9..e5da6b21f6 100644 --- a/Makefile +++ b/Makefile @@ -116,14 +116,15 @@ install-tools: fmt: install-tools go fmt ./... - echo $(ALL_SRC) | xargs -n 10 $(GOIMPORTS) $(GOIMPORTS_OPT) + @echo $(ALL_SRC) | xargs -n 10 $(GOIMPORTS) $(GOIMPORTS_OPT) fmt-sh: install-tools ${SHFMT} -w -d -i 5 . impi: install-tools # Skip plugins/plugins.go - echo $(ALL_SRC) | xargs -n 10 $(IMPI) --local $(CW_AGENT_IMPORT_PATH) --scheme stdThirdPartyLocal --skip plugins/plugins.go + @echo $(ALL_SRC) | xargs -n 10 $(IMPI) --local $(CW_AGENT_IMPORT_PATH) --scheme stdThirdPartyLocal --skip plugins/plugins.go + @echo "Check import order/grouping finished" addlicense: install-tools @ADDLICENSEOUT=`$(ADDLICENSE) -y="" -s=only -l="mit" -c="Amazon.com, Inc. or its affiliates. All Rights Reserved." $(ALL_SRC) 2>&1`; \ diff --git a/go.mod b/go.mod index 5174e6c942..f8c737361e 100644 --- a/go.mod +++ b/go.mod @@ -81,6 +81,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.60.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.13.0 github.com/prometheus/common v0.37.0 @@ -92,7 +93,7 @@ require ( go.opentelemetry.io/collector/pdata v0.61.0 go.uber.org/multierr v1.8.0 go.uber.org/zap v1.23.0 - golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e + golang.org/x/net v0.0.0-20220722155237-a158d28d115b golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 golang.org/x/text v0.3.7 @@ -102,10 +103,10 @@ require ( gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 gotest.tools/v3 v3.1.0 - k8s.io/api v0.24.3 - k8s.io/apimachinery v0.24.3 - k8s.io/client-go v0.24.3 - k8s.io/klog/v2 v2.70.0 + k8s.io/api v0.25.0 + k8s.io/apimachinery v0.25.0 + k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 ) require ( @@ -160,15 +161,16 @@ require ( github.com/dennwc/varint v1.0.0 // indirect github.com/digitalocean/godo v1.81.0 // indirect github.com/docker/distribution v2.8.1+incompatible // indirect - github.com/docker/docker v20.10.17+incompatible // indirect + github.com/docker/docker v20.10.18+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.4.0 // indirect github.com/doclambda/protobufquery v0.0.0-20210317203640-88ffabe06a60 // indirect - github.com/emicklei/go-restful v2.9.5+incompatible // indirect + github.com/emicklei/go-restful/v3 v3.8.0 // indirect github.com/envoyproxy/go-control-plane v0.10.3 // indirect github.com/envoyproxy/protoc-gen-validate v0.6.7 // indirect github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect github.com/fatih/color v1.13.0 // indirect + github.com/felixge/httpsnoop v1.0.3 // indirect github.com/frankban/quicktest v1.14.3 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/go-kit/log v0.2.1 // indirect @@ -218,6 +220,7 @@ require ( github.com/jpillora/backoff v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/karrick/godirwalk v1.16.1 // indirect + github.com/klauspost/compress v1.15.10 // indirect github.com/knadh/koanf v1.4.3 // indirect github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b // indirect github.com/kr/text v0.2.0 // indirect @@ -242,14 +245,21 @@ require ( github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect github.com/naoina/go-stringutil v0.1.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight 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/k8s 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/common v0.60.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.60.0 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect github.com/opencontainers/runc v1.1.4 // indirect github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect github.com/opencontainers/selinux v1.10.1 // indirect + github.com/openshift/api v0.0.0-20210521075222-e273a339932a // indirect + github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect @@ -259,6 +269,7 @@ require ( github.com/prometheus/procfs v0.8.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect + github.com/rs/cors v1.8.2 // indirect github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1 // indirect github.com/scaleway/scaleway-sdk-go v1.0.0-beta.9 // indirect github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646 // indirect @@ -285,6 +296,7 @@ require ( github.com/yusufpapurcu/wmi v1.2.2 // indirect go.opencensus.io v0.23.0 // indirect go.opentelemetry.io/collector/semconv v0.61.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 // indirect go.opentelemetry.io/contrib/propagators/b3 v1.10.0 // indirect go.opentelemetry.io/otel v1.10.0 // indirect go.opentelemetry.io/otel/exporters/prometheus v0.32.1 // indirect @@ -307,12 +319,13 @@ require ( google.golang.org/protobuf v1.28.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.4 // indirect - k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + k8s.io/klog v1.0.0 // indirect + k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect + k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect modernc.org/cc/v3 v3.35.26 // indirect modernc.org/mathutil v1.4.1 // indirect modernc.org/memory v1.0.7 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect sigs.k8s.io/yaml v1.3.0 // indirect ) diff --git a/go.sum b/go.sum index 81c7b51cb9..3c80859b27 100644 --- a/go.sum +++ b/go.sum @@ -78,10 +78,10 @@ github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOEl github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs= github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24= -github.com/Azure/go-autorest/autorest v0.11.18/go.mod h1:dSiJPy22c3u0OtOKDNttNgqpNFY/GeWa7GH/Pz56QRA= +github.com/Azure/go-autorest/autorest v0.11.12/go.mod h1:eipySxLmqSyC5s5k1CLupqet0PSENBEDP93LQ9a8QYw= github.com/Azure/go-autorest/autorest v0.11.27 h1:F3R3q42aWytozkV8ihzcgMO4OA4cuqr3bNlsEuF6//A= github.com/Azure/go-autorest/autorest v0.11.27/go.mod h1:7l8ybrIdUmGqZMTD0sRtAr8NvbHjfofbf8RSP2q7w7U= -github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M= +github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A= github.com/Azure/go-autorest/autorest/adal v0.9.18/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= github.com/Azure/go-autorest/autorest/adal v0.9.20 h1:gJ3E98kMpFB1MFqQCvA1yFab8vthOeD4VlFRQULxahg= github.com/Azure/go-autorest/autorest/adal v0.9.20/go.mod h1:XVVeme+LZwABT8K5Lc3hA4nAe8LDBVle26gTrguhhPQ= @@ -96,6 +96,7 @@ github.com/Azure/go-autorest/autorest/to v0.4.0 h1:oXVqrxakqqV1UZdSazDOPOLvOIz+X github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE= github.com/Azure/go-autorest/autorest/validation v0.3.1 h1:AgyqjAd94fwNAoTjl/WQXg4VvFeRFpO+UhNyRXqF1ac= github.com/Azure/go-autorest/autorest/validation v0.3.1/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E= +github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/logger v0.2.1 h1:IG7i4p/mDa2Ce4TRyAO8IHnVhAVF3RFU+ZtXWSmf4Tg= github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo= @@ -166,7 +167,6 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.35.24/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= @@ -331,8 +331,9 @@ github.com/djherbis/times v1.5.0 h1:79myA211VwPhFTqUk8xehWrsEO+zcIZj0zT8mXPVARU= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.18+incompatible h1:SN84VYXTBNGn92T/QwIRPlum9zfemfitN7pbsp26WSc= +github.com/docker/docker v20.10.18+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= @@ -352,8 +353,9 @@ github.com/eclipse/paho.mqtt.golang v1.3.5 h1:sWtmgNxYM9P2sP+xEItMozsR3w0cqZFlqn github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= +github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -370,17 +372,18 @@ github.com/envoyproxy/protoc-gen-validate v0.6.7 h1:qcZcULcd/abmQg6dwigimCNEyi4g github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/euank/go-kmsg-parser v2.0.0+incompatible h1:cHD53+PLQuuQyLZeriD1V/esuG4MuU0Pjs5y6iknohY= github.com/euank/go-kmsg-parser v2.0.0+incompatible/go.mod h1:MhmAMZ8V4CYH4ybgdRwPr2TU5ThnS43puaKEMpja1uw= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.12.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= +github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.5+incompatible h1:/l4kBbb4/vGSsdtB5nUe8L7B9mImVMaBPw9L/0TBHU8= github.com/franela/goblin v0.0.0-20210519012713-85d372ac71e2/go.mod h1:VzmDKDJVZI3aJmnRI9VjAn9nJ8qPPsN1fqzr9dqInIo= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= @@ -394,7 +397,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew= github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8= @@ -417,6 +419,7 @@ github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNV github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= @@ -426,15 +429,18 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.2/go.mod h1:jMjeRr2HHw6nAVajTXJ4eiUwohSTlpa0o73RUL1owJc= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs= github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns= +github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8Lj9mJglo= +github.com/go-openapi/spec v0.19.5/go.mod h1:Hm2Jr4jv8G1ciIAo+frC/Ft+rR2kQDh8JHKHb3gWUSk= +github.com/go-openapi/swag v0.19.2/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-openapi/swag v0.21.1 h1:wm0rhTb5z7qpJRHBdPOMuY4QjVUMbF6/kwoYeRAOrKU= github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= github.com/go-ping/ping v0.0.0-20210201095549-52eed920f98c h1:fWdhUpCuoeNIPiQ+pkAmmERYEjhVx5/cbVGK7T99OkI= @@ -507,7 +513,6 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cadvisor v0.45.0 h1:bXQze1sd8srZiQwiQ19Qaq/AoMIZS8YceBXrIaEvkX0= github.com/google/cadvisor v0.45.0/go.mod h1:vsMT3Uv2XjQ8M7WUtKARV74mU/HN64C4XtM1bJhUKcU= github.com/google/flatbuffers v2.0.0+incompatible h1:dicJ2oXwypfwUGnB2/TYWYEKiuk9eYQlQO/AnOHl5mI= @@ -555,6 +560,7 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -569,6 +575,7 @@ github.com/googleapis/gax-go/v2 v2.2.0/go.mod h1:as02EH8zWkzwUoLbBaFeQ+arQaj/Oth github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99EXz9pXxye9YM= github.com/googleapis/gax-go/v2 v2.4.0 h1:dS9eYAjhrE2RjmzYw2XAPvcXfmcQLtFEQWn0CR82awk= github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= +github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/gopcua/opcua v0.3.1 h1:BS1TRJUdsPSwU0mlfc8Dffchh0jTw9lWchmF4HFRo2w= github.com/gophercloud/gophercloud v0.25.0 h1:C3Oae7y0fUVQGSsBrb3zliAjdX+riCSEh4lNMejFNI4= @@ -578,7 +585,6 @@ github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1: github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosnmp/gosnmp v1.34.0 h1:p96iiNTTdL4ZYspPC3leSKXiHfE1NiIYffMu9100p5E= @@ -745,6 +751,7 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.15.10 h1:Ai8UzuomSCDw90e1qNMtb15msBXsNpH6gzkkENQNcJo= +github.com/klauspost/compress v1.15.10/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/knadh/koanf v1.4.3 h1:rSJcSH5LSFhvzBRsAYfT3k7eLP0I4UxeZqjtAatk+wc= github.com/knadh/koanf v1.4.3/go.mod h1:5FAkuykKXZvLqhAbP4peWgM5CTcZmn7L1d27k/a+kfg= github.com/kolo/xmlrpc v0.0.0-20201022064351-38db28db192b h1:iNjcivnc6lhbvJA3LD622NPrUponluJrBWPIwGG/3Bg= @@ -760,6 +767,7 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/pty v1.1.5/go.mod h1:9r2w37qlBe7rQ6e1fg1S/9xpWHSnaqNdHD3WcMdbPDA= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= @@ -775,6 +783,7 @@ github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamh github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= @@ -874,7 +883,6 @@ github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt github.com/npillmayer/nestext v0.1.3/go.mod h1:h2lrijH8jpicr25dFY+oAJLyzlya6jhnuG+zWp9L0Uk= github.com/nsqio/go-nsq v1.1.0 h1:PQg+xxiUjA7V+TLdXw7nVrJ5Jbl3sN86EhGCQj4+FYE= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= @@ -884,32 +892,46 @@ github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= +github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= -github.com/onsi/gomega v1.15.0 h1:WjP/FQ/sk43MRmnEcT+MlDw2TFvkrXlprrPST/IudjU= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0 h1:9IxB8su6e57lcThvNNmtDbWEvMK3LoRJR6QxKgh21zc= github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.60.0/go.mod h1:xCb0Xoe+y1tYIBUz/HdIjHRh3fHG/ariLygEMPIV91s= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0 h1:rMq3zGRgxor/Cy44sD18UeegO9NmWu+x0BzhQA7nYic= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/awsutil v0.60.0/go.mod h1:N/9xv3LYpkrdRGxIBm8Os+7UFma2CK7czByBs0NyujE= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.60.0 h1:FlcufJe0vsPZcFBKz0GyGB9w38XvU8BR0oEJG8idmfo= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/containerinsight v0.60.0/go.mod h1:BAwR9j4Qy5fIzYEWdDCtrC8n/NRz2T9pNrBSLe6Q/dM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0 h1:RqkHiBXIIwzJ02JocvuvDSBeo+bjzNpBJjV5mROP2ps= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/cwlogs v0.60.0/go.mod h1:l3j1pKh+nTUdvmVIERds/JPJVcYhR3K9itnrWXTKYvc= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.60.0 h1:7+ozWhH28+7TLTiIL+JxCBtZP8Sj43E73c2v4OXkXYs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/k8s v0.60.0/go.mod h1:tcVkSnL94f5kLCN7UHEgeMWyTSMCnvxLDoeI8w2ZRgM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.60.0 h1:4dhPVAvSeJIbbY5wEgCISOgA5VlZNxlvxdPAKgP7ckM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/metrics v0.60.0/go.mod h1:r3pq8CdJh+ugZR08pNrnVTO89JJO0xBrv+HFJoeHmLQ= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0 h1:rmwITDHPgpZ1US1AjHrPp1qUsox+OEwQ+PHsQkbO9v0= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.60.0/go.mod h1:gX9A/z3M1dar9JUw4odU5L1PX/l0rwcc6gPYvdfpF5k= github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0 h1:BRyqjFUrLwxHgccEbi0sgT+koQXsm+RAOqeebRmfSTM= github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.61.0/go.mod h1:gGprfSuPLNWQlYQTinPY4joqsjXAYO5RCEwkOeSCMrk= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0 h1:UfvLhghDg/3Xc54/Bbcl5msPXoRy7og3WbGcEyWikrg= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/k8sconfig v0.60.0/go.mod h1:pPKcMyUBy2AhUimuTyCMNSF0GHj7+MwwHupwUF+zvL8= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.60.0 h1:XfQLejzRJzcT5HBkGSRAsoy7IbL5/7kULWqBwsYezRs= +github.com/open-telemetry/opentelemetry-collector-contrib/internal/kubelet v0.60.0/go.mod h1:zL97x4wJVMKt3Qvg8J0EySiumUwUY6FklxBu9TIVCzA= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0 h1:B7xhbyyT1zvdYf5ne0H9fozF6fx2LoKoT5K71hyqReY= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.60.0/go.mod h1:s01aZZ3YqrNbe78Ff/3OLY2s08VjrlHCZOIxceLLzQc= github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/opencensus v0.60.0 h1:HCHE2kMo7K9eLVVYfR59I3CtDaqp0WYiHlyWRDQvG+M= github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0 h1:jLlCQZ9MbB6xIHItsLaglCKt++uaXwBeN/28Yhmq/6U= github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.61.0/go.mod h1:Vp7RD7ye02O4eRX+bSXaWFMRL/8u228Z+bAtCqikohI= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.60.0 h1:C+uIyHKUClILILtbxQz3UsnAQoKN+4y7dNwn0n33edY= +github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver v0.60.0/go.mod h1:+1IvI3YF4ElGJy4/lPosoieELT7ZrfuVMiUvQiBw4JI= github.com/openconfig/gnmi v0.0.0-20180912164834-33a1865c3029 h1:lXQqyLroROhwR2Yq/kXbLzVecgmVeZh2TFLg6OxCd+w= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= @@ -924,6 +946,11 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.m github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opencontainers/selinux v1.10.1 h1:09LIPVRP3uuZGQvgR+SgMSNBd1Eb3vlRbGqQpoHsF8w= github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= +github.com/openshift/api v0.0.0-20210521075222-e273a339932a h1:aBPwLqCg66SbQd+HrjB1GhgTfPtqSY4aeB022tEYmE0= +github.com/openshift/api v0.0.0-20210521075222-e273a339932a/go.mod h1:izBmoXbUu3z5kUa4FjZhvekTsyzIWiOoaIgJiZBBMQs= +github.com/openshift/build-machinery-go v0.0.0-20210423112049-9415d7ebd33e/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE= +github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142 h1:ZHRIMCFIJN1p9LsJt4HQ+akDrys4PrYnXzOWI5LK03I= +github.com/openshift/client-go v0.0.0-20210521082421-73d9475a9142/go.mod h1:fjS8r9mqDVsPb5td3NehsNOAWa4uiFkYEfVZioQ2gH0= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/openzipkin/zipkin-go v0.2.5/go.mod h1:KpXfKdgRDnnhsxw4pNIH9Md5lyFqKUa4YDFlwRYAMyE= @@ -1012,6 +1039,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= @@ -1053,6 +1082,7 @@ github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY52 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= +github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= @@ -1062,6 +1092,7 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271 h1:WhxRHzgeVGETMlmV github.com/streadway/handy v0.0.0-20200128134331-0f66f006fb2e/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -1150,6 +1181,8 @@ go.opentelemetry.io/collector/pdata v0.61.0 h1:jPUReUpR/D1xsigfRxyXA7cYMnXfnK+D7 go.opentelemetry.io/collector/pdata v0.61.0/go.mod h1:0hqgNMRneVXaLNelv3q0XKJbyBW9aMDwyC15pKd30+E= go.opentelemetry.io/collector/semconv v0.61.0 h1:RMrzDugNuFsUjppvvNZWiWcNneogZ3Zo4idWyIUWR9k= go.opentelemetry.io/collector/semconv v0.61.0/go.mod h1:aRkHuJ/OshtDFYluKEtnG5nkKTsy1HZuvZVHmakx+Vo= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0 h1:qZ3KzA4qPzLBDtQyPk4ydjlg8zvXbNysnFHaVMKJbVo= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.36.0/go.mod h1:14Oo79mRwusSI02L0EfG3Gp1uF3+1wSL+D4zDysxyqs= go.opentelemetry.io/contrib/propagators/b3 v1.10.0 h1:6AD2VV8edRdEYNaD8cNckpzgdMLU2kbV9OYyxt2kvCg= go.opentelemetry.io/contrib/propagators/b3 v1.10.0/go.mod h1:oxvamQ/mTDFQVugml/uFS59+aEUnFLhmd1wsG+n5MOE= go.opentelemetry.io/contrib/zpages v0.36.0 h1:/BSq75P5b39Qv3T1COsbrc3CnzzWvWiD2Rtz4xgeZc4= @@ -1187,16 +1220,17 @@ golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211202192323-5770296d904e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 h1:Tgea0cVUD0ivh5ADBX4WwuI12DUd2to3nCYe2eayMIw= golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= @@ -1237,6 +1271,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -1283,6 +1318,7 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= @@ -1301,8 +1337,9 @@ golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1357,6 +1394,7 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1387,7 +1425,6 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1404,6 +1441,7 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1445,7 +1483,9 @@ golang.org/x/sys v0.0.0-20220624220833-87e55d714810/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664 h1:v1W7bwXHsnLLloWYTVEdvGvA7BHMeBYsPcF0GLDxIRs= golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1462,8 +1502,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= golang.org/x/time v0.0.0-20220609170525-579cf78fd858/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1480,6 +1520,7 @@ golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBn golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190614205625-5aca471b1d59/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= @@ -1785,25 +1826,33 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= -k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= -k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= -k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/api v0.21.1/go.mod h1:FstGROTmsSHBarKc8bylzXih8BLNYTiS3TZcsoEDg2s= +k8s.io/api v0.25.0 h1:H+Q4ma2U/ww0iGB78ijZx6DRByPz6/733jIuFpX70e0= +k8s.io/api v0.25.0/go.mod h1:ttceV1GyV1i1rnmvzT3BST08N6nGt+dudGrquzVQWPk= +k8s.io/apimachinery v0.21.1/go.mod h1:jbreFvJo3ov9rj7eWT7+sYiRx+qZuCYXwWT1bcDswPY= +k8s.io/apimachinery v0.25.0 h1:MlP0r6+3XbkUG2itd6vp3oxbtdQLQI94fD5gCS+gnoU= +k8s.io/apimachinery v0.25.0/go.mod h1:qMx9eAk0sZQGsXGu86fab8tZdffHbwUfsvzqKn4mfB0= +k8s.io/client-go v0.21.1/go.mod h1:/kEw4RgW+3xnBGzvp9IWxKSNA+lXn3A7AuH3gdOAzLs= +k8s.io/client-go v0.25.0 h1:CVWIaCETLMBNiTUta3d5nzRbXvY5Hy9Dpl+VvREpu5E= +k8s.io/client-go v0.25.0/go.mod h1:lxykvypVfKilxhTklov0wz1FoaUZ8X4EwbhS6rpRfN8= +k8s.io/code-generator v0.21.1/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.70.0 h1:GMmmjoFOrNepPN0ZeGCzvD2Gh5IKRwdFx8W5PBxVTQU= -k8s.io/klog/v2 v2.70.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 h1:Gii5eqf+GmIEwGNKQYQClCayuJCe2/4fZUvF7VG99sU= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.70.1 h1:7aaoSdahviPmR+XkS7FyxlkkXs6tHISSG03RxleQAVQ= +k8s.io/klog/v2 v2.70.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= +k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed h1:jAne/RjBTyawwAy0utX5eqigAwz/lQhTmy+Hr/Cpue4= +k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= modernc.org/cc/v3 v3.35.26 h1:S4B+fg6/9krLtfZ9lr7pfKiESopiv+Sm6lUUI3oc0fY= @@ -1825,11 +1874,12 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= diff --git a/translator/util/collections.go b/internal/util/collections/collections.go similarity index 60% rename from translator/util/collections.go rename to internal/util/collections/collections.go index 30bdfde49e..2a0800d906 100644 --- a/translator/util/collections.go +++ b/internal/util/collections/collections.go @@ -1,12 +1,12 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: MIT -package util +package collections // CopyMap returns a new map that makes a shallow copy of all the // references in the input map. func CopyMap[K comparable, V any](m map[K]V) map[K]V { - dupe := make(map[K]V) + dupe := make(map[K]V, len(m)) for k, v := range m { dupe[k] = v } @@ -25,6 +25,43 @@ func MergeMaps[K comparable, V any](maps ...map[K]V) map[K]V { return merged } +// GetOrDefault retrieves the value for the key in the map if it exists. +// If it doesn't exist, then returns the default value. +func GetOrDefault[K comparable, V any](m map[K]V, key K, defaultValue V) V { + if value, ok := m[key]; ok { + return value + } + return defaultValue +} + +// Keys creates a slice of the keys in the map. +func Keys[K comparable, V any](m map[K]V) []K { + keys := make([]K, 0, len(m)) + for key := range m { + keys = append(keys, key) + } + return keys +} + +// Values creates a slice of the values in the map. +func Values[K comparable, V any](m map[K]V) []V { + values := make([]V, 0, len(m)) + for _, value := range m { + values = append(values, value) + } + return values +} + +// MapSlice converts a slice of type K into a slice of type V +// using the provided mapper function. +func MapSlice[K any, V any](base []K, mapper func(K) V) []V { + s := make([]V, len(base)) + for i, entry := range base { + s[i] = mapper(entry) + } + return s +} + // Pair is a struct with a K key and V value. type Pair[K any, V any] struct { Key K @@ -58,15 +95,6 @@ func (s Set[K]) Contains(key K) bool { return ok } -// Keys creates a slice of the keys. -func (s Set[K]) Keys() []K { - keys := make([]K, 0, len(s)) - for key := range s { - keys = append(keys, key) - } - return keys -} - // NewSet creates a new Set with the keys provided. func NewSet[K comparable](keys ...K) Set[K] { s := make(Set[K], len(keys)) diff --git a/translator/util/collections_test.go b/internal/util/collections/collections_test.go similarity index 70% rename from translator/util/collections_test.go rename to internal/util/collections/collections_test.go index 22da3646a9..8600fd9fcf 100644 --- a/translator/util/collections_test.go +++ b/internal/util/collections/collections_test.go @@ -1,9 +1,11 @@ // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. // SPDX-License-Identifier: MIT -package util +package collections import ( + "sort" + "strings" "testing" "github.com/stretchr/testify/assert" @@ -79,18 +81,46 @@ func TestMergeMaps(t *testing.T) { require.Equal(t, 2, value) } +func TestGetOrDefault(t *testing.T) { + m1 := map[string]int{"first": 1, "second": 2} + got := GetOrDefault(m1, "first", 0) + require.Equal(t, 1, got) + got = GetOrDefault(m1, "missing", 0) + require.Equal(t, 0, got) +} + +func TestKeys(t *testing.T) { + m1 := map[string]int{"first": 1, "second": 2} + got := Keys(m1) + sort.Strings(got) + require.Equal(t, []string{"first", "second"}, got) +} + +func TestValues(t *testing.T) { + m1 := map[string]int{"first": 1, "second": 2} + got := Values(m1) + sort.Ints(got) + require.Equal(t, []int{1, 2}, got) +} + +func TestMapSlice(t *testing.T) { + s := []string{"test", "value"} + got := MapSlice(s, strings.ToUpper) + require.Equal(t, []string{"TEST", "VALUE"}, got) +} + func TestPair(t *testing.T) { pair := NewPair("key", "value") - assert.Equal(t, "key", pair.Key) - assert.Equal(t, "value", pair.Value) + require.Equal(t, "key", pair.Key) + require.Equal(t, "value", pair.Value) } func TestSet(t *testing.T) { set := NewSet(1, 2) - assert.True(t, set.Contains(1)) + require.True(t, set.Contains(1)) set.Remove(1) - assert.False(t, set.Contains(1)) - assert.Equal(t, []int{2}, set.Keys()) + require.False(t, set.Contains(1)) + require.Equal(t, []int{2}, Keys(set)) } func assertMapsEqual(t *testing.T, m1, m2 map[string]interface{}) { diff --git a/translator/tocwconfig/toyamlconfig/toyamlconfig.go b/translator/tocwconfig/toyamlconfig/toyamlconfig.go index db4ef3b07d..8fdf754f61 100644 --- a/translator/tocwconfig/toyamlconfig/toyamlconfig.go +++ b/translator/tocwconfig/toyamlconfig/toyamlconfig.go @@ -11,6 +11,7 @@ import ( "go.opentelemetry.io/collector/service" "gopkg.in/yaml.v3" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/encoder/mapstructure" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/tocwconfig/toyamlconfig/otelnative" @@ -47,13 +48,13 @@ func ToYamlConfig(val interface{}) (string, interface{}) { nativeExporters := make(map[string]interface{}) for _, t := range otelNativeTranslators { if t.RequiresTranslation(inputs, procs, outputs) { - receivers := t.Receivers(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) - processors := t.Processors(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) - exporters := t.Exporters(util.CopyMap(inputs), util.CopyMap(procs), util.CopyMap(outputs)) + receivers := t.Receivers(collections.CopyMap(inputs), collections.CopyMap(procs), collections.CopyMap(outputs)) + processors := t.Processors(collections.CopyMap(inputs), collections.CopyMap(procs), collections.CopyMap(outputs)) + exporters := t.Exporters(collections.CopyMap(inputs), collections.CopyMap(procs), collections.CopyMap(outputs)) - nativeReceivers = util.MergeMaps(nativeReceivers, receivers) - nativeProcessors = util.MergeMaps(nativeProcessors, processors) - nativeExporters = util.MergeMaps(nativeExporters, exporters) + nativeReceivers = collections.MergeMaps(nativeReceivers, receivers) + nativeProcessors = collections.MergeMaps(nativeProcessors, processors) + nativeExporters = collections.MergeMaps(nativeExporters, exporters) } } diff --git a/translator/translate/logs/logs_collected/files/files.go b/translator/translate/logs/logs_collected/files/files.go index 40cd58af78..62fc34d7b0 100644 --- a/translator/translate/logs/logs_collected/files/files.go +++ b/translator/translate/logs/logs_collected/files/files.go @@ -15,7 +15,10 @@ var ChildRule = map[string]translator.Rule{} type Files struct { } -const SectionKey = "files" +const ( + SectionKey = "files" + SectionMappedKey = "logfile" +) func GetCurPath() string { return parent.GetCurPath() + SectionKey + "/" @@ -44,8 +47,8 @@ func (f *Files) ApplyRule(input interface{}) (returnKey string, returnVal interf // generate tail config only if file_config exists tailInfo := map[string]interface{}{} - if _, ok := tailConfig["file_config"]; ok { - tailInfo["logfile"] = []interface{}{tailConfig} + if _, ok = tailConfig["file_config"]; ok { + tailInfo[SectionMappedKey] = []interface{}{tailConfig} returnKey = "inputs" returnVal = tailInfo } diff --git a/translator/translate/logs/logs_collected/windows_events/windows_event.go b/translator/translate/logs/logs_collected/windows_events/windows_event.go index 843963fba0..4ad039e6b5 100644 --- a/translator/translate/logs/logs_collected/windows_events/windows_event.go +++ b/translator/translate/logs/logs_collected/windows_events/windows_event.go @@ -15,7 +15,10 @@ var ChildRule = map[string]translator.Rule{} type WindowsEvent struct { } -const SectionKey = "windows_events" +const ( + SectionKey = "windows_events" + SectionMappedKey = "windows_event_log" +) func GetCurPath() string { return parent.GetCurPath() + SectionKey + "/" @@ -40,7 +43,7 @@ func (w *WindowsEvent) ApplyRule(input interface{}) (returnKey string, returnVal } return "inputs", map[string]interface{}{ - "windows_event_log": []interface{}{windowsEventConfig}, + SectionMappedKey: []interface{}{windowsEventConfig}, } } else { translator.AddInfoMessages("", "No windows event log configuration found.") diff --git a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go index 410e632275..f862c4f500 100644 --- a/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go +++ b/translator/translate/metrics/metrics_collect/gpu/nvidiaSmi.go @@ -5,7 +5,6 @@ package gpu import ( "github.com/aws/private-amazon-cloudwatch-agent-staging/translator" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/config" parent "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/util" ) @@ -22,11 +21,14 @@ var ChildRule = map[string]translator.Rule{} // } // -// SectionKey_Nvidia_GPU metrics name in user config to opt in Nvidia GPU metrics -const SectionKey_Nvidia_GPU = "nvidia_gpu" +// SectionKey metrics name in user config to opt in Nvidia GPU metrics +const ( + SectionKey = "nvidia_gpu" + SectionMappedKey = "nvidia_smi" +) func GetCurPath() string { - curPath := parent.GetCurPath() + SectionKey_Nvidia_GPU + "/" + curPath := parent.GetCurPath() + SectionKey + "/" return curPath } @@ -41,25 +43,23 @@ func (n *NvidiaSmi) ApplyRule(input interface{}) (returnKey string, returnVal in m := input.(map[string]interface{}) resArr := []interface{}{} result := map[string]interface{}{} - // nvidia_gpu is not the real telegraf plugin's name, need to register the real plugin name to enable it. - telegrafPluginName := config.GetRealPluginName(SectionKey_Nvidia_GPU) //Check if this plugin exist in the input instance //If not, not process - if _, ok := m[SectionKey_Nvidia_GPU]; !ok { + if _, ok := m[SectionKey]; !ok { returnKey = "" returnVal = "" } else { /* - In JSON config file, it represent as "nvidia_gpu" : {//specification config information} - To check the specification config entry + In JSON config file, it represent as "nvidia_gpu" : {//specification config information} + To check the specification config entry */ //Check if there are any config entry with rules applied - result = translator.ProcessRuleToApply(m[SectionKey_Nvidia_GPU], ChildRule, result) + result = translator.ProcessRuleToApply(m[SectionKey], ChildRule, result) //Process common config, like measurement - hasValidMetric := util.ProcessLinuxCommonConfig(m[SectionKey_Nvidia_GPU], telegrafPluginName, GetCurPath(), result) + hasValidMetric := util.ProcessLinuxCommonConfig(m[SectionKey], SectionMappedKey, GetCurPath(), result) if hasValidMetric { resArr = append(resArr, result) - returnKey = telegrafPluginName + returnKey = SectionMappedKey returnVal = resArr } else { returnKey = "" @@ -70,7 +70,7 @@ func (n *NvidiaSmi) ApplyRule(input interface{}) (returnKey string, returnVal in func init() { n := new(NvidiaSmi) - parent.RegisterLinuxRule(SectionKey_Nvidia_GPU, n) - parent.RegisterDarwinRule(SectionKey_Nvidia_GPU, n) - parent.RegisterWindowsRule(SectionKey_Nvidia_GPU, n) + parent.RegisterLinuxRule(SectionKey, n) + parent.RegisterDarwinRule(SectionKey, n) + parent.RegisterWindowsRule(SectionKey, n) } diff --git a/translator/translate/otel/common/common.go b/translator/translate/otel/common/common.go index 35439ccc95..1ca467b758 100644 --- a/translator/translate/otel/common/common.go +++ b/translator/translate/otel/common/common.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/service" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" ) const ( @@ -22,7 +22,9 @@ const ( MetricsKey = "metrics" LogsKey = "logs" MetricsCollectedKey = "metrics_collected" + LogsCollectedKey = "logs_collected" ECSKey = "ecs" + KubernetesKey = "kubernetes" CredentialsKey = "credentials" RoleARNKey = "role_arn" MetricsCollectionIntervalKey = "metrics_collection_interval" @@ -49,6 +51,13 @@ func (t TranslatorMap[C]) Get(cfgType config.Type) (Translator[C], bool) { return translator, ok } +// Merge adds the translators in the input to the existing map. +func (t TranslatorMap[C]) Merge(m TranslatorMap[C]) { + for _, v := range m { + t.Add(v) + } +} + // NewTranslatorMap creates a TranslatorMap from the translators. func NewTranslatorMap[C any](translators ...Translator[C]) TranslatorMap[C] { translatorMap := make(TranslatorMap[C], len(translators)) @@ -80,7 +89,7 @@ type Identifiable interface { } // Pipeline is a component ID and respective service pipeline. -type Pipeline *util.Pair[config.ComponentID, *service.ConfigServicePipeline] +type Pipeline *collections.Pair[config.ComponentID, *service.ConfigServicePipeline] // Pipelines is a map of component IDs to service pipelines. type Pipelines map[config.ComponentID]*service.ConfigServicePipeline diff --git a/translator/translate/otel/common/common_test.go b/translator/translate/otel/common/common_test.go index 60e9a3a41f..b2b2898a8f 100644 --- a/translator/translate/otel/common/common_test.go +++ b/translator/translate/otel/common/common_test.go @@ -90,7 +90,8 @@ func TestTranslatorMap(t *testing.T) { result, err := translator.Translate(nil) require.NoError(t, err) require.Equal(t, 0, result) - got.Add(&testTranslator{"test", 2}) + other := NewTranslatorMap[int](&testTranslator{"test", 2}) + got.Merge(other) require.Len(t, got, 2) translator, ok = got.Get("test") require.True(t, ok) diff --git a/translator/translate/otel/exporter/awscloudwatch/translator.go b/translator/translate/otel/exporter/awscloudwatch/translator.go index f3efc33b57..74aa739f0b 100644 --- a/translator/translate/otel/exporter/awscloudwatch/translator.go +++ b/translator/translate/otel/exporter/awscloudwatch/translator.go @@ -43,58 +43,58 @@ func (t *translator) Type() config.Type { // metrics section of the JSON config. // TODO: remove dependency on global config. func (t *translator) Translate(conf *confmap.Conf) (config.Exporter, error) { - if conf != nil && conf.IsSet(common.MetricsKey) { - cfg := t.factory.CreateDefaultConfig().(*cloudwatch.Config) - credentials := confmap.NewFromStringMap(agent.Global_Config.Credentials) - _ = credentials.Unmarshal(cfg) - cfg.RoleARN = getRoleARN(conf) - cfg.Region = agent.Global_Config.Region - if namespace, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, namespaceKey)); ok { - cfg.Namespace = namespace - } - if endpointOverride, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, endpointOverrideKey)); ok { - cfg.EndpointOverride = endpointOverride - } - if forceFlushInterval, ok := common.GetDuration(conf, common.ConfigKey(common.MetricsKey, forceFlushIntervalKey)); ok { - cfg.ForceFlushInterval = forceFlushInterval - } - if agent.Global_Config.Internal { - cfg.MaxValuesPerDatum = internalMaxValuesPerDatum - } - cfg.RollupDimensions = getRollupDimensions(conf) - cfg.DropOriginConfigs = getDropOriginalMetrics(conf) - cfg.MetricDecorations = getMetricDecorations(conf) - return cfg, nil + if conf == nil || !conf.IsSet(common.MetricsKey) { + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: common.MetricsKey} + } + cfg := t.factory.CreateDefaultConfig().(*cloudwatch.Config) + credentials := confmap.NewFromStringMap(agent.Global_Config.Credentials) + _ = credentials.Unmarshal(cfg) + cfg.RoleARN = getRoleARN(conf) + cfg.Region = agent.Global_Config.Region + if namespace, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, namespaceKey)); ok { + cfg.Namespace = namespace + } + if endpointOverride, ok := common.GetString(conf, common.ConfigKey(common.MetricsKey, endpointOverrideKey)); ok { + cfg.EndpointOverride = endpointOverride } - return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: common.MetricsKey} + if forceFlushInterval, ok := common.GetDuration(conf, common.ConfigKey(common.MetricsKey, forceFlushIntervalKey)); ok { + cfg.ForceFlushInterval = forceFlushInterval + } + if agent.Global_Config.Internal { + cfg.MaxValuesPerDatum = internalMaxValuesPerDatum + } + cfg.RollupDimensions = getRollupDimensions(conf) + cfg.DropOriginConfigs = getDropOriginalMetrics(conf) + cfg.MetricDecorations = getMetricDecorations(conf) + return cfg, nil } -func getRoleARN(conf *confmap.Conf) (roleARN string) { +func getRoleARN(conf *confmap.Conf) string { key := common.ConfigKey(common.MetricsKey, common.CredentialsKey, common.RoleARNKey) - var ok bool - if roleARN, ok = common.GetString(conf, key); !ok { + roleARN, ok := common.GetString(conf, key) + if !ok { roleARN = agent.Global_Config.Role_arn } - return + return roleARN } // TODO: remove dependency on rule. func getRollupDimensions(conf *confmap.Conf) [][]string { key := common.ConfigKey(common.MetricsKey, rollup_dimensions.SectionKey) value := conf.Get(key) - if value != nil && rollup_dimensions.IsValidRollupList(value) { - aggregates := value.([]interface{}) - rollup := make([][]string, len(aggregates)) - for i, aggregate := range aggregates { - dimensions := aggregate.([]interface{}) - rollup[i] = make([]string, len(dimensions)) - for j, dimension := range dimensions { - rollup[i][j] = dimension.(string) - } + if value == nil || !rollup_dimensions.IsValidRollupList(value) { + return nil + } + aggregates := value.([]interface{}) + rollup := make([][]string, len(aggregates)) + for i, aggregate := range aggregates { + dimensions := aggregate.([]interface{}) + rollup[i] = make([]string, len(dimensions)) + for j, dimension := range dimensions { + rollup[i][j] = dimension.(string) } - return rollup } - return nil + return rollup } // TODO: remove dependency on rule. @@ -111,16 +111,16 @@ func getDropOriginalMetrics(conf *confmap.Conf) map[string][]string { func getMetricDecorations(conf *confmap.Conf) []cloudwatch.MetricDecorationConfig { _, result := new(metric_decoration.MetricDecoration).ApplyRule(conf.Get(common.MetricsKey)) mds, ok := result.([]interface{}) - if ok && len(mds) > 0 { - decorations := make([]cloudwatch.MetricDecorationConfig, len(mds)) - for i, md := range mds { - var decoration cloudwatch.MetricDecorationConfig - if err := mapstructure.Decode(md, &decoration); err != nil { - continue - } - decorations[i] = decoration + if !ok || len(mds) == 0 { + return nil + } + decorations := make([]cloudwatch.MetricDecorationConfig, len(mds)) + for i, md := range mds { + var decoration cloudwatch.MetricDecorationConfig + if err := mapstructure.Decode(md, &decoration); err != nil { + continue } - return decorations + decorations[i] = decoration } - return nil + return decorations } diff --git a/translator/translate/otel/exporter/awsemf/emf_config.yml b/translator/translate/otel/exporter/awsemf/emf_config.yml new file mode 100644 index 0000000000..e0d6b049de --- /dev/null +++ b/translator/translate/otel/exporter/awsemf/emf_config.yml @@ -0,0 +1,31 @@ +namespace: ECS/ContainerInsights +log_group_name: '/aws/ecs/containerinsights/{ClusterName}/performance' +log_stream_name: 'instanceTelemetry/{ContainerInstanceId}' +resource_to_telemetry_conversion: + enabled: true +dimension_rollup_option: NoDimensionRollup +parse_json_encoded_attr_values: [ Sources ] +metric_declarations: + # instance metrics + - dimensions: [ [ ContainerInstanceId, InstanceId, ClusterName ] ] + metric_name_selectors: + - instance_cpu_reserved_capacity + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_network_total_bytes + - instance_number_of_running_tasks + - dimensions: [ [ ClusterName ] ] + metric_name_selectors: + - instance_cpu_limit + - instance_cpu_reserved_capacity + - instance_cpu_usage_total + - instance_cpu_utilization + - instance_filesystem_utilization + - instance_memory_limit + - instance_memory_reserved_capacity + - instance_memory_utilization + - instance_memory_working_set + - instance_network_total_bytes + - instance_number_of_running_tasks \ No newline at end of file diff --git a/translator/translate/otel/exporter/awsemf/translator.go b/translator/translate/otel/exporter/awsemf/translator.go new file mode 100644 index 0000000000..8d4092aad5 --- /dev/null +++ b/translator/translate/otel/exporter/awsemf/translator.go @@ -0,0 +1,48 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package awsemf + +import ( + _ "embed" + "fmt" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + "gopkg.in/yaml.v3" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +//go:embed emf_config.yml +var defaultConfig string + +type translator struct { + factory component.ExporterFactory +} + +var _ common.Translator[config.Exporter] = (*translator)(nil) + +func NewTranslator() common.Translator[config.Exporter] { + return &translator{awsemfexporter.NewFactory()} +} + +func (t *translator) Type() config.Type { + return t.factory.Type() +} + +// Translate unmarshals the embedded config file into the default config. +func (t *translator) Translate(*confmap.Conf) (config.Exporter, error) { + var rawConf map[string]interface{} + if err := yaml.Unmarshal([]byte(defaultConfig), &rawConf); err != nil { + return nil, fmt.Errorf("unable to read default config: %w", err) + } + conf := confmap.NewFromStringMap(rawConf) + cfg := t.factory.CreateDefaultConfig() + if err := conf.Unmarshal(&cfg); err != nil { + return nil, fmt.Errorf("unable to unmarshal config: %w", err) + } + return cfg, nil +} diff --git a/translator/translate/otel/exporter/awsemf/translator_test.go b/translator/translate/otel/exporter/awsemf/translator_test.go new file mode 100644 index 0000000000..57ee21d591 --- /dev/null +++ b/translator/translate/otel/exporter/awsemf/translator_test.go @@ -0,0 +1,23 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package awsemf + +import ( + "testing" + + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" + "github.com/stretchr/testify/require" +) + +func TestTranslator(t *testing.T) { + tt := NewTranslator() + require.EqualValues(t, "awsemf", tt.Type()) + got, err := tt.Translate(nil) + require.NoError(t, err) + gotCfg := got.(*awsemfexporter.Config) + require.Equal(t, "ECS/ContainerInsights", gotCfg.Namespace) + require.Equal(t, "/aws/ecs/containerinsights/{ClusterName}/performance", gotCfg.LogGroupName) + require.Equal(t, "instanceTelemetry/{ContainerInstanceId}", gotCfg.LogStreamName) + require.Len(t, gotCfg.MetricDeclarations, 2) +} diff --git a/translator/translate/otel/pipeline/containerinsights/translator.go b/translator/translate/otel/pipeline/containerinsights/translator.go index 0840270f93..b87d388e77 100644 --- a/translator/translate/otel/pipeline/containerinsights/translator.go +++ b/translator/translate/otel/pipeline/containerinsights/translator.go @@ -8,8 +8,8 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/service" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const ( @@ -25,7 +25,6 @@ func NewTranslator() common.Translator[common.Pipeline] { return &translator{} } -// Type is not used. func (t *translator) Type() config.Type { return pipelineName } @@ -34,14 +33,14 @@ func (t *translator) Type() config.Type { // section is present. func (t *translator) Translate(conf *confmap.Conf) (common.Pipeline, error) { key := common.ConfigKey(common.LogsKey, common.MetricsCollectedKey, common.ECSKey) - if conf != nil && conf.IsSet(key) { - id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) - pipeline := &service.ConfigServicePipeline{ - Receivers: []config.ComponentID{config.NewComponentID("awscontainerinsightreceiver")}, - Processors: []config.ComponentID{config.NewComponentIDWithName("batch", pipelineName)}, - Exporters: []config.ComponentID{config.NewComponentIDWithName("awsemf", pipelineName)}, - } - return util.NewPair(id, pipeline), nil + if conf == nil || !conf.IsSet(key) { + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: key} } - return nil, nil + id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) + pipeline := &service.ConfigServicePipeline{ + Receivers: []config.ComponentID{config.NewComponentID("awscontainerinsightreceiver")}, + Processors: []config.ComponentID{config.NewComponentIDWithName("batch", pipelineName)}, + Exporters: []config.ComponentID{config.NewComponentIDWithName("awsemf", pipelineName)}, + } + return collections.NewPair(id, pipeline), nil } diff --git a/translator/translate/otel/pipeline/containerinsights/translator_test.go b/translator/translate/otel/pipeline/containerinsights/translator_test.go index 6319cb2eb0..f600b33578 100644 --- a/translator/translate/otel/pipeline/containerinsights/translator_test.go +++ b/translator/translate/otel/pipeline/containerinsights/translator_test.go @@ -9,6 +9,9 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" ) func TestTranslator(t *testing.T) { @@ -21,11 +24,13 @@ func TestTranslator(t *testing.T) { cit := NewTranslator() require.EqualValues(t, "containerinsights", cit.Type()) testCases := map[string]struct { - input map[string]interface{} - want *want + input map[string]interface{} + want *want + wantErr error }{ - "WithoutKey": { - input: map[string]interface{}{}, + "WithoutECSKey": { + input: map[string]interface{}{}, + wantErr: &common.MissingKeyError{Type: "containerinsights", JsonKey: "logs::metrics_collected::ecs"}, }, "WithECSKey": { input: map[string]interface{}{ @@ -46,23 +51,20 @@ func TestTranslator(t *testing.T) { for name, testCase := range testCases { t.Run(name, func(t *testing.T) { conf := confmap.NewFromStringMap(testCase.input) - got, _ := cit.Translate(conf) + got, err := cit.Translate(conf) + require.Equal(t, testCase.wantErr, err) if testCase.want == nil { require.Nil(t, got) } else { require.EqualValues(t, testCase.want.pipelineType, got.Key.String()) - require.Equal(t, testCase.want.receivers, toStringSlice(got.Value.Receivers)) - require.Equal(t, testCase.want.processors, toStringSlice(got.Value.Processors)) - require.Equal(t, testCase.want.exporters, toStringSlice(got.Value.Exporters)) + require.Equal(t, testCase.want.receivers, collections.MapSlice(got.Value.Receivers, toString)) + require.Equal(t, testCase.want.processors, collections.MapSlice(got.Value.Processors, toString)) + require.Equal(t, testCase.want.exporters, collections.MapSlice(got.Value.Exporters, toString)) } }) } } -func toStringSlice(ids []config.ComponentID) []string { - var values []string - for _, id := range ids { - values = append(values, id.String()) - } - return values +func toString(id config.ComponentID) string { + return id.String() } diff --git a/translator/translate/otel/pipeline/host/translator.go b/translator/translate/otel/pipeline/host/translator.go index eec3f26c63..119b0462d2 100644 --- a/translator/translate/otel/pipeline/host/translator.go +++ b/translator/translate/otel/pipeline/host/translator.go @@ -4,14 +4,15 @@ package host import ( + "sort" + "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/service" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" "github.com/aws/private-amazon-cloudwatch-agent-staging/plugins/outputs/cloudwatch" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/receiver/adapter" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) const ( @@ -19,29 +20,39 @@ const ( ) type translator struct { + receivers []config.ComponentID } var _ common.Translator[common.Pipeline] = (*translator)(nil) -func NewTranslator() common.Translator[common.Pipeline] { - return &translator{} +// NewTranslator creates a new host pipeline translator. The receiver types +// passed in are converted to config.ComponentIDs, sorted, and used directly +// in the translated pipeline. +func NewTranslator(receiverTypes []config.Type) common.Translator[common.Pipeline] { + receivers := make([]config.ComponentID, len(receiverTypes)) + for i, receiver := range receiverTypes { + receivers[i] = config.NewComponentID(receiver) + } + sort.Slice(receivers, func(i, j int) bool { + return receivers[i].String() < receivers[j].String() + }) + return &translator{receivers} } -// Type is not used. func (t translator) Type() config.Type { return pipelineName } // Translate creates a pipeline if metrics section exists. func (t translator) Translate(conf *confmap.Conf) (common.Pipeline, error) { - if conf != nil && conf.IsSet(common.MetricsKey) { - id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) - pipeline := &service.ConfigServicePipeline{ - Receivers: []config.ComponentID{config.NewComponentID(adapter.Type("cpu"))}, - Processors: []config.ComponentID{config.NewComponentIDWithName("cumulativetodelta", pipelineName)}, - Exporters: []config.ComponentID{config.NewComponentIDWithName(cloudwatch.TypeStr, pipelineName)}, - } - return util.NewPair(id, pipeline), nil + if conf == nil || !conf.IsSet(common.MetricsKey) { + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: common.MetricsKey} + } + id := config.NewComponentIDWithName(config.MetricsDataType, pipelineName) + pipeline := &service.ConfigServicePipeline{ + Receivers: t.receivers, + Processors: []config.ComponentID{config.NewComponentIDWithName("cumulativetodelta", pipelineName)}, + Exporters: []config.ComponentID{config.NewComponentIDWithName(cloudwatch.TypeStr, pipelineName)}, } - return nil, nil + return collections.NewPair(id, pipeline), nil } diff --git a/translator/translate/otel/pipeline/host/translator_test.go b/translator/translate/otel/pipeline/host/translator_test.go index 4ed41b5ea7..a348538be1 100644 --- a/translator/translate/otel/pipeline/host/translator_test.go +++ b/translator/translate/otel/pipeline/host/translator_test.go @@ -9,23 +9,28 @@ import ( "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/config" "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" ) -func TestNewTranslator(t *testing.T) { +func TestTranslator(t *testing.T) { type want struct { pipelineType string receivers []string processors []string exporters []string } - ht := NewTranslator() + ht := NewTranslator([]config.Type{"other", "nop"}) require.EqualValues(t, "host", ht.Type()) testCases := map[string]struct { - input map[string]interface{} - want *want + input map[string]interface{} + want *want + wantErr error }{ - "WithoutKey": { - input: map[string]interface{}{}, + "WithoutMetricsKey": { + input: map[string]interface{}{}, + wantErr: &common.MissingKeyError{Type: "host", JsonKey: "metrics"}, }, "WithMetricsKey": { input: map[string]interface{}{ @@ -33,7 +38,7 @@ func TestNewTranslator(t *testing.T) { }, want: &want{ pipelineType: "metrics/host", - receivers: []string{"telegraf_cpu"}, + receivers: []string{"nop", "other"}, processors: []string{"cumulativetodelta/host"}, exporters: []string{"awscloudwatch/host"}, }, @@ -42,23 +47,20 @@ func TestNewTranslator(t *testing.T) { for name, testCase := range testCases { t.Run(name, func(t *testing.T) { conf := confmap.NewFromStringMap(testCase.input) - got, _ := ht.Translate(conf) + got, err := ht.Translate(conf) + require.Equal(t, testCase.wantErr, err) if testCase.want == nil { require.Nil(t, got) } else { require.EqualValues(t, testCase.want.pipelineType, got.Key.String()) - require.Equal(t, testCase.want.receivers, toStringSlice(got.Value.Receivers)) - require.Equal(t, testCase.want.processors, toStringSlice(got.Value.Processors)) - require.Equal(t, testCase.want.exporters, toStringSlice(got.Value.Exporters)) + require.Equal(t, testCase.want.receivers, collections.MapSlice(got.Value.Receivers, toString)) + require.Equal(t, testCase.want.processors, collections.MapSlice(got.Value.Processors, toString)) + require.Equal(t, testCase.want.exporters, collections.MapSlice(got.Value.Exporters, toString)) } }) } } -func toStringSlice(ids []config.ComponentID) []string { - var values []string - for _, id := range ids { - values = append(values, id.String()) - } - return values +func toString(id config.ComponentID) string { + return id.String() } diff --git a/translator/translate/otel/pipeline/translator.go b/translator/translate/otel/pipeline/translator.go index bfdc37794b..e3d6bb703b 100644 --- a/translator/translate/otel/pipeline/translator.go +++ b/translator/translate/otel/pipeline/translator.go @@ -10,8 +10,6 @@ import ( "go.opentelemetry.io/collector/confmap" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/containerinsights" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/host" ) var ( @@ -24,13 +22,8 @@ type translator struct { var _ common.Translator[common.Pipelines] = (*translator)(nil) -func NewTranslator() common.Translator[common.Pipelines] { - return &translator{ - translators: []common.Translator[common.Pipeline]{ - host.NewTranslator(), - containerinsights.NewTranslator(), - }, - } +func NewTranslator(translators ...common.Translator[common.Pipeline]) common.Translator[common.Pipelines] { + return &translator{translators} } // Type is unused. diff --git a/translator/translate/otel/pipeline/translator_test.go b/translator/translate/otel/pipeline/translator_test.go index 7f97706d39..36651aa0c0 100644 --- a/translator/translate/otel/pipeline/translator_test.go +++ b/translator/translate/otel/pipeline/translator_test.go @@ -11,8 +11,8 @@ import ( "go.opentelemetry.io/collector/confmap" "go.opentelemetry.io/collector/service" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" ) type testTranslator struct { @@ -30,17 +30,16 @@ func (t testTranslator) Type() config.Type { } func TestTranslator(t *testing.T) { - pt := NewTranslator().(*translator) + pt := NewTranslator() require.EqualValues(t, "", pt.Type()) - pt.translators = nil got, err := pt.Translate(confmap.New()) require.Equal(t, errNoPipelines, err) require.Nil(t, got) - pt.translators = []common.Translator[common.Pipeline]{ - testTranslator{ - result: util.NewPair(config.NewComponentID(""), &service.ConfigServicePipeline{}), + pt = NewTranslator( + &testTranslator{ + result: collections.NewPair(config.NewComponentID(""), &service.ConfigServicePipeline{}), }, - } + ) got, err = pt.Translate(confmap.New()) require.NoError(t, err) require.NotNil(t, got) diff --git a/translator/translate/otel/receiver/adapter/translator.go b/translator/translate/otel/receiver/adapter/translator.go index 42e1c05f98..a40026f9af 100644 --- a/translator/translate/otel/receiver/adapter/translator.go +++ b/translator/translate/otel/receiver/adapter/translator.go @@ -18,10 +18,6 @@ const ( defaultMetricsCollectionInterval = time.Minute ) -var ( - Type = adapter.Type -) - type translator struct { // cfgType determines the type set in the config. cfgType config.Type @@ -43,23 +39,24 @@ func (t *translator) Type() config.Type { } // Translate creates an adapter receiver config if the section set on -// the translator exists. +// the translator exists. Tries to get the collection interval from +// the section key. Falls back on the agent section if it is not present. func (t *translator) Translate(conf *confmap.Conf) (config.Receiver, error) { - if conf != nil && conf.IsSet(t.cfgKey) { - cfg := &adapter.Config{ - ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(t.Type()), - } - // try the section key and fallback on the agent section if not set - cfg.CollectionInterval = getMetricsCollectionInterval(conf, []string{t.cfgKey, common.AgentKey}) - return cfg, nil + if conf == nil || !conf.IsSet(t.cfgKey) { + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: t.cfgKey} + } + cfg := &adapter.Config{ + ScraperControllerSettings: scraperhelper.NewDefaultScraperControllerSettings(t.Type()), } - return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: t.cfgKey} + intervalKeyChain := []string{t.cfgKey, common.AgentKey} + cfg.CollectionInterval = getCollectionInterval(conf, intervalKeyChain) + return cfg, nil } -// getMetricsCollectionInterval from the first section with a parsable duration. +// getCollectionInterval from the first section with a parsable duration. // If none are found, uses the defaultMetricsCollectionInterval. -func getMetricsCollectionInterval(conf *confmap.Conf, cfgKeys []string) time.Duration { - for _, cfgKey := range cfgKeys { +func getCollectionInterval(conf *confmap.Conf, intervalKeyChain []string) time.Duration { + for _, cfgKey := range intervalKeyChain { key := common.ConfigKey(cfgKey, common.MetricsCollectionIntervalKey) duration, ok := common.GetDuration(conf, key) if !ok { diff --git a/translator/translate/otel/receiver/adapter/translator_test.go b/translator/translate/otel/receiver/adapter/translator_test.go index 4eb431f980..a3150fb75f 100644 --- a/translator/translate/otel/receiver/adapter/translator_test.go +++ b/translator/translate/otel/receiver/adapter/translator_test.go @@ -16,20 +16,20 @@ import ( func TestTranslator(t *testing.T) { testCases := map[string]struct { - jsonCfg map[string]interface{} + input map[string]interface{} cfgType string - key string + cfgKey string wantErr error wantInterval time.Duration }{ - "WithoutKey": { - jsonCfg: map[string]interface{}{}, + "WithoutKeyInConfig": { + input: map[string]interface{}{}, cfgType: "test", - key: "mem", + cfgKey: "mem", wantErr: &common.MissingKeyError{Type: "telegraf_test", JsonKey: "mem"}, }, - "WithoutInterval": { - jsonCfg: map[string]interface{}{ + "WithoutIntervalInSection": { + input: map[string]interface{}{ "metrics": map[string]interface{}{ "metrics_collected": map[string]interface{}{ "cpu": map[string]interface{}{}, @@ -37,11 +37,11 @@ func TestTranslator(t *testing.T) { }, }, cfgType: "test", - key: common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "cpu"), + cfgKey: "metrics::metrics_collected::cpu", wantInterval: time.Minute, }, - "WithValid": { - jsonCfg: map[string]interface{}{ + "WithValidConfig": { + input: map[string]interface{}{ "metrics": map[string]interface{}{ "metrics_collected": map[string]interface{}{ "mem": map[string]interface{}{ @@ -52,38 +52,39 @@ func TestTranslator(t *testing.T) { }, }, cfgType: "test", - key: common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "mem"), + cfgKey: "metrics::metrics_collected::mem", wantInterval: 20 * time.Second, }, } for name, testCase := range testCases { t.Run(name, func(t *testing.T) { - conf := confmap.NewFromStringMap(testCase.jsonCfg) - tt := NewTranslator(testCase.cfgType, testCase.key) + conf := confmap.NewFromStringMap(testCase.input) + tt := NewTranslator(testCase.cfgType, testCase.cfgKey) got, err := tt.Translate(conf) require.Equal(t, testCase.wantErr, err) if err == nil { require.NotNil(t, got) - cfg := got.(*adapter.Config) - require.Equal(t, adapter.Type(testCase.cfgType), cfg.ID().Type()) - require.Equal(t, testCase.wantInterval, cfg.CollectionInterval) + gotCfg, ok := got.(*adapter.Config) + require.True(t, ok) + require.Equal(t, adapter.Type(testCase.cfgType), gotCfg.ID().Type()) + require.Equal(t, testCase.wantInterval, gotCfg.CollectionInterval) } }) } } -func TestGetMetricsCollectionInterval(t *testing.T) { +func TestGetCollectionInterval(t *testing.T) { sectionKeys := []string{"section", "backup"} testCases := map[string]struct { - jsonCfg map[string]interface{} - want time.Duration + inputConfig map[string]interface{} + want time.Duration }{ "WithDefault": { - jsonCfg: map[string]interface{}{}, - want: time.Minute, + inputConfig: map[string]interface{}{}, + want: time.Minute, }, "WithoutSectionOverride": { - jsonCfg: map[string]interface{}{ + inputConfig: map[string]interface{}{ "backup": map[string]interface{}{ "metrics_collection_interval": 10, }, @@ -92,7 +93,7 @@ func TestGetMetricsCollectionInterval(t *testing.T) { want: 10 * time.Second, }, "WithInvalidSectionOverride": { - jsonCfg: map[string]interface{}{ + inputConfig: map[string]interface{}{ "backup": map[string]interface{}{ "metrics_collection_interval": 10, }, @@ -103,7 +104,7 @@ func TestGetMetricsCollectionInterval(t *testing.T) { want: 10 * time.Second, }, "WithSectionOverride": { - jsonCfg: map[string]interface{}{ + inputConfig: map[string]interface{}{ "backup": map[string]interface{}{ "metrics_collection_interval": 10, }, @@ -116,8 +117,8 @@ func TestGetMetricsCollectionInterval(t *testing.T) { } for name, testCase := range testCases { t.Run(name, func(t *testing.T) { - conf := confmap.NewFromStringMap(testCase.jsonCfg) - got := getMetricsCollectionInterval(conf, sectionKeys) + conf := confmap.NewFromStringMap(testCase.inputConfig) + got := getCollectionInterval(conf, sectionKeys) require.Equal(t, testCase.want, got) }) } diff --git a/translator/translate/otel/receiver/adapter/translators.go b/translator/translate/otel/receiver/adapter/translators.go new file mode 100644 index 0000000000..f51f778b9b --- /dev/null +++ b/translator/translate/otel/receiver/adapter/translators.go @@ -0,0 +1,132 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "fmt" + + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" + translatorconfig "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/config" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/files" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/logs_collected/windows_events" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/logs/metrics_collected/emf" + collectd "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/collectd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/customizedmetrics" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/gpu" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/procstat" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/metrics/metrics_collect/statsd" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +var ( + // windowsInputSet contains all the supported metric input plugins. + // All others are considered custom metrics. + windowsInputSet = collections.NewSet( + gpu.SectionKey, + procstat.SectionKey, + statsd.SectionKey, + ) + // aliasMap contains mappings for all input plugins that use another + // name in Telegraf. + aliasMap = map[string]string{ + collectd.SectionKey: collectd.SectionMappedKey, + files.SectionKey: files.SectionMappedKey, + gpu.SectionKey: gpu.SectionMappedKey, + windows_events.SectionKey: windows_events.SectionMappedKey, + } +) + +// FindReceiversInConfig looks in the metrics and logs sections to determine which +// plugins require adapter translators. Logs is processed first, so any +// colliding metrics translators will override them. This follows the rule +// setup. +func FindReceiversInConfig(conf *confmap.Conf, os string) (common.TranslatorMap[config.Receiver], error) { + translators := common.NewTranslatorMap[config.Receiver]() + translators.Merge(fromLogs(conf)) + metricTranslators, err := fromMetrics(conf, os) + translators.Merge(metricTranslators) + return translators, err +} + +// fromMetrics creates adapter receiver translators based on the os-specific +// metrics section in the config. +func fromMetrics(conf *confmap.Conf, os string) (common.TranslatorMap[config.Receiver], error) { + translators := common.NewTranslatorMap[config.Receiver]() + switch os { + case translatorconfig.OS_TYPE_LINUX, translatorconfig.OS_TYPE_DARWIN: + translators.Merge(fromLinuxMetrics(conf)) + case translatorconfig.OS_TYPE_WINDOWS: + translators.Merge(fromWindowsMetrics(conf)) + default: + return nil, fmt.Errorf("unsupported OS: %v", os) + } + return translators, nil +} + +// fromLinuxMetrics creates a translator for each subsection within the +// metrics::metrics_collected section of the config. Can be anything. +func fromLinuxMetrics(conf *confmap.Conf) common.TranslatorMap[config.Receiver] { + return fromInputs(conf, common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey)) +} + +// fromWindowsMetrics creates a translator for each allow listed subsection +// within the metrics::metrics_collected section. See windowsInputSet for +// allow list. If non-allow-listed subsections exist, they will be grouped +// under a windows performance counter adapter translator. +func fromWindowsMetrics(conf *confmap.Conf) common.TranslatorMap[config.Receiver] { + translators := common.NewTranslatorMap[config.Receiver]() + key := common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey) + if inputs, ok := conf.Get(key).(map[string]interface{}); ok { + var isCustomMetricsPresent bool + for inputName := range inputs { + if windowsInputSet.Contains(inputName) { + cfgKey := common.ConfigKey(key, inputName) + translators.Add(NewTranslator(toAlias(inputName), cfgKey)) + } else { + isCustomMetricsPresent = true + } + } + if isCustomMetricsPresent { + translators.Add(NewTranslator(customizedmetrics.Win_Perf_Counters_Key, common.MetricsKey)) + } + } + return translators +} + +// fromLogs creates a translator for each subsection within logs::logs_collected +// along with a socket listener translator if "emf" or "structuredlog" are present +// within the logs:metrics_collected section. +func fromLogs(conf *confmap.Conf) common.TranslatorMap[config.Receiver] { + translators := common.NewTranslatorMap[config.Receiver]() + key := common.ConfigKey(common.LogsKey, common.MetricsCollectedKey) + for _, socketListenerKey := range []string{emf.SectionKey, emf.SectionKeyStructuredLog} { + cfgKey := common.ConfigKey(key, socketListenerKey) + if conf.IsSet(cfgKey) { + translators.Add(NewTranslator(collectd.SectionMappedKey, cfgKey)) + break + } + } + translators.Merge(fromInputs(conf, common.ConfigKey(common.LogsKey, common.LogsCollectedKey))) + return translators +} + +// fromInputs converts all the keys in the section into adapter translators. +func fromInputs(conf *confmap.Conf, baseKey string) common.TranslatorMap[config.Receiver] { + translators := common.NewTranslatorMap[config.Receiver]() + if inputs, ok := conf.Get(baseKey).(map[string]interface{}); ok { + for inputName := range inputs { + cfgKey := common.ConfigKey(baseKey, inputName) + translators.Add(NewTranslator(toAlias(inputName), cfgKey)) + } + } + return translators +} + +// toAlias gets the alias for the input name if it has one. +func toAlias(inputName string) string { + return collections.GetOrDefault(aliasMap, inputName, inputName) +} diff --git a/translator/translate/otel/receiver/adapter/translators_test.go b/translator/translate/otel/receiver/adapter/translators_test.go new file mode 100644 index 0000000000..b0ff2e31bf --- /dev/null +++ b/translator/translate/otel/receiver/adapter/translators_test.go @@ -0,0 +1,123 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package adapter + +import ( + "errors" + "testing" + + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" +) + +func TestFindReceiversInConfig(t *testing.T) { + testCases := map[string]struct { + input map[string]interface{} + os string + want map[config.Type]string + wantErr error + }{ + "WithEmptyConfig": { + os: "linux", + want: map[config.Type]string{}, + }, + "WithLinuxMetrics": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "collectd": nil, + "cpu": nil, + "ethtool": nil, + "nvidia_gpu": nil, + }, + }, + }, + os: "linux", + want: map[config.Type]string{ + "telegraf_socket_listener": "metrics::metrics_collected::collectd", + "telegraf_cpu": "metrics::metrics_collected::cpu", + "telegraf_ethtool": "metrics::metrics_collected::ethtool", + "telegraf_nvidia_smi": "metrics::metrics_collected::nvidia_gpu", + }, + }, + "WithWindowsMetrics": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "LogicalDisk": nil, + "Memory": nil, + "Paging File": nil, + "PhysicalDisk": nil, + "nvidia_gpu": nil, + }, + }, + }, + os: "windows", + want: map[config.Type]string{ + "telegraf_nvidia_smi": "metrics::metrics_collected::nvidia_gpu", + "telegraf_win_perf_counters": "metrics", + }, + }, + "WithLogs": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "emf": nil, + "structuredlog": nil, + }, + "logs_collected": map[string]interface{}{ + "files": nil, + "windows_events": nil, + }, + }, + }, + os: "windows", + want: map[config.Type]string{ + "telegraf_socket_listener": "logs::metrics_collected::emf", + "telegraf_logfile": "logs::logs_collected::files", + "telegraf_windows_event_log": "logs::logs_collected::windows_events", + }, + }, + "WithThreeSocketListeners": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "collectd": nil, + }, + }, + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "emf": nil, + "structuredlog": nil, + }, + }, + }, + os: "linux", + want: map[config.Type]string{ + "telegraf_socket_listener": "metrics::metrics_collected::collectd", + }, + }, + "WithInvalidOS": { + input: map[string]interface{}{}, + os: "invalid", + wantErr: errors.New("unsupported OS: invalid"), + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.input) + got, err := FindReceiversInConfig(conf, testCase.os) + require.Equal(t, testCase.wantErr, err) + require.Equal(t, len(testCase.want), len(got)) + for wantKey, wantValue := range testCase.want { + gotTranslator, ok := got.Get(wantKey) + require.True(t, ok) + gotAdapterTranslator, ok := gotTranslator.(*translator) + require.True(t, ok) + require.Equal(t, wantValue, gotAdapterTranslator.cfgKey) + } + }) + } +} diff --git a/translator/translate/otel/receiver/awscontainerinsight/translator.go b/translator/translate/otel/receiver/awscontainerinsight/translator.go new file mode 100644 index 0000000000..88e5a52d2f --- /dev/null +++ b/translator/translate/otel/receiver/awscontainerinsight/translator.go @@ -0,0 +1,79 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package awscontainerinsight + +import ( + "strings" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" + "go.opentelemetry.io/collector/component" + "go.opentelemetry.io/collector/config" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +// container orchestrator keys +const ( + ecs = "ecs" + eks = "eks" +) + +type translator struct { + factory component.ReceiverFactory + // services is a slice of config keys to orchestrators. + services []collections.Pair[string, string] +} + +var _ common.Translator[config.Receiver] = (*translator)(nil) + +// NewTranslator creates a new aws container insight receiver translator. +func NewTranslator() common.Translator[config.Receiver] { + baseKey := common.ConfigKey(common.LogsKey, common.MetricsCollectedKey) + return &translator{ + factory: awscontainerinsightreceiver.NewFactory(), + services: []collections.Pair[string, string]{ + {common.ConfigKey(baseKey, common.ECSKey), ecs}, + {common.ConfigKey(baseKey, common.KubernetesKey), eks}, + }, + } +} + +func (t *translator) Type() config.Type { + return t.factory.Type() +} + +// Translate creates an aws container insights receiver config if either +// of the sections defined in the services exist. +func (t *translator) Translate(conf *confmap.Conf) (config.Receiver, error) { + configuredService := t.getConfiguredContainerService(conf) + if configuredService == nil { + var keys []string + for _, service := range t.services { + keys = append(keys, service.Key) + } + return nil, &common.MissingKeyError{Type: t.Type(), JsonKey: strings.Join(keys, " or ")} + } + cfg := t.factory.CreateDefaultConfig().(*awscontainerinsightreceiver.Config) + key := common.ConfigKey(configuredService.Key, common.MetricsCollectionIntervalKey) + cfg.CollectionInterval, _ = common.GetDuration(conf, key) + cfg.ContainerOrchestrator = configuredService.Value + return cfg, nil +} + +// getConfiguredContainerService gets the first found container service +// from the service slice. +func (t *translator) getConfiguredContainerService(conf *confmap.Conf) *collections.Pair[string, string] { + var configuredService *collections.Pair[string, string] + if conf != nil { + for _, service := range t.services { + if conf.IsSet(service.Key) { + configuredService = &service + break + } + } + } + return configuredService +} diff --git a/translator/translate/otel/receiver/awscontainerinsight/translator_test.go b/translator/translate/otel/receiver/awscontainerinsight/translator_test.go new file mode 100644 index 0000000000..801bbb933e --- /dev/null +++ b/translator/translate/otel/receiver/awscontainerinsight/translator_test.go @@ -0,0 +1,108 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package awscontainerinsight + +import ( + "testing" + "time" + + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awscontainerinsightreceiver" + "github.com/stretchr/testify/require" + "go.opentelemetry.io/collector/confmap" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" +) + +func TestTranslator(t *testing.T) { + acit := NewTranslator() + require.EqualValues(t, "awscontainerinsightreceiver", acit.Type()) + testCases := map[string]struct { + input map[string]interface{} + want *awscontainerinsightreceiver.Config + wantErr error + }{ + "WithoutECSOrKubernetesKeys": { + input: map[string]interface{}{}, + wantErr: &common.MissingKeyError{ + Type: "awscontainerinsightreceiver", + JsonKey: "logs::metrics_collected::ecs or logs::metrics_collected::kubernetes", + }, + }, + "WithECS/WithoutInterval": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "ecs": map[string]interface{}{}, + }, + }, + }, + want: &awscontainerinsightreceiver.Config{ + ContainerOrchestrator: ecs, + CollectionInterval: 0, + }, + }, + "WithECS/WithInterval": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "ecs": map[string]interface{}{ + "metrics_collection_interval": float64(10), + }, + }, + }, + }, + want: &awscontainerinsightreceiver.Config{ + ContainerOrchestrator: ecs, + CollectionInterval: 10 * time.Second, + }, + }, + "WithKubernetes": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "kubernetes": map[string]interface{}{ + "metrics_collection_interval": float64(10), + }, + }, + }, + }, + want: &awscontainerinsightreceiver.Config{ + ContainerOrchestrator: eks, + CollectionInterval: 10 * time.Second, + }, + }, + "WithECSAndKubernetes": { + input: map[string]interface{}{ + "logs": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "ecs": map[string]interface{}{ + "metrics_collection_interval": float64(5), + }, + "kubernetes": map[string]interface{}{ + "metrics_collection_interval": float64(10), + }, + }, + }, + }, + want: &awscontainerinsightreceiver.Config{ + ContainerOrchestrator: ecs, + CollectionInterval: 5 * time.Second, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + conf := confmap.NewFromStringMap(testCase.input) + got, err := acit.Translate(conf) + require.Equal(t, testCase.wantErr, err) + if err == nil { + require.NotNil(t, got) + gotCfg, ok := got.(*awscontainerinsightreceiver.Config) + require.True(t, ok) + require.Equal(t, testCase.want.ContainerOrchestrator, gotCfg.ContainerOrchestrator) + require.Equal(t, testCase.want.CollectionInterval, gotCfg.CollectionInterval) + } + }) + } +} diff --git a/translator/translate/otel/translate_otel.go b/translator/translate/otel/translate_otel.go index 7e63daf907..88a9fe98be 100644 --- a/translator/translate/otel/translate_otel.go +++ b/translator/translate/otel/translate_otel.go @@ -17,17 +17,20 @@ import ( "go.uber.org/multierr" "go.uber.org/zap/zapcore" + "github.com/aws/private-amazon-cloudwatch-agent-staging/internal/util/collections" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/common" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/exporter/awscloudwatch" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/exporter/awsemf" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/containerinsights" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/pipeline/host" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/processor" "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/receiver/adapter" - "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/util" + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/otel/receiver/awscontainerinsight" ) // Translator is used to create an OTEL config. type Translator struct { - pipelineTranslator common.Translator[common.Pipelines] receiverTranslators common.TranslatorMap[config.Receiver] processorTranslators common.TranslatorMap[config.Processor] exporterTranslators common.TranslatorMap[config.Exporter] @@ -36,9 +39,8 @@ type Translator struct { // NewTranslator creates a new Translator. func NewTranslator() *Translator { return &Translator{ - pipelineTranslator: pipeline.NewTranslator(), - receiverTranslators: common.NewTranslatorMap[config.Receiver]( - adapter.NewTranslator("cpu", common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey, "cpu")), + receiverTranslators: common.NewTranslatorMap( + awscontainerinsight.NewTranslator(), ), processorTranslators: common.NewTranslatorMap( processor.NewDefaultTranslator(batchprocessor.NewFactory()), @@ -46,18 +48,29 @@ func NewTranslator() *Translator { ), exporterTranslators: common.NewTranslatorMap( awscloudwatch.NewTranslator(), + awsemf.NewTranslator(), ), } } // Translate converts a JSON config into an OTEL config. -func (t *Translator) Translate(jsonConfig interface{}) (*service.Config, error) { +func (t *Translator) Translate(jsonConfig interface{}, os string) (*service.Config, error) { m, ok := jsonConfig.(map[string]interface{}) if !ok { return nil, errors.New("invalid json config") } conf := confmap.NewFromStringMap(m) - pipelines, err := t.pipelineTranslator.Translate(conf) + + found, err := adapter.FindReceiversInConfig(conf, os) + if err != nil { + return nil, fmt.Errorf("unable to find receivers in config: %w", err) + } + t.receiverTranslators.Merge(found) + + pipelines, err := pipeline.NewTranslator( + host.NewTranslator(collections.Keys(found)), + containerinsights.NewTranslator(), + ).Translate(conf) if err != nil { return nil, fmt.Errorf("unable to translate pipelines: %w", err) } @@ -85,9 +98,9 @@ func (t *Translator) Translate(jsonConfig interface{}) (*service.Config, error) // buildComponents uses the pipelines defined in the config to build the components. func (t *Translator) buildComponents(cfg *service.Config, conf *confmap.Conf) error { var errs error - receivers := util.NewSet[config.ComponentID]() - processors := util.NewSet[config.ComponentID]() - exporters := util.NewSet[config.ComponentID]() + receivers := collections.NewSet[config.ComponentID]() + processors := collections.NewSet[config.ComponentID]() + exporters := collections.NewSet[config.ComponentID]() for _, p := range cfg.Pipelines { receivers.Add(p.Receivers...) processors.Add(p.Processors...) @@ -102,21 +115,24 @@ func (t *Translator) buildComponents(cfg *service.Config, conf *confmap.Conf) er // buildComponents attempts to translate a component for each ID in the set. func buildComponents[C common.Identifiable]( conf *confmap.Conf, - ids util.Set[config.ComponentID], + ids collections.Set[config.ComponentID], components map[config.ComponentID]C, getTranslator func(config.Type) (common.Translator[C], bool), ) error { var errs error for id := range ids { - if translator, ok := getTranslator(id.Type()); ok { - cfg, err := translator.Translate(conf) - if err != nil { - errs = multierr.Append(errs, err) - continue - } - cfg.SetIDName(id.Name()) - components[cfg.ID()] = cfg + translator, ok := getTranslator(id.Type()) + if !ok { + errs = multierr.Append(errs, fmt.Errorf("missing translator for %v", id.Type())) + continue + } + cfg, err := translator.Translate(conf) + if err != nil { + errs = multierr.Append(errs, err) + continue } + cfg.SetIDName(id.Name()) + components[cfg.ID()] = cfg } return errs } diff --git a/translator/translate/otel/translate_otel_test.go b/translator/translate/otel/translate_otel_test.go new file mode 100644 index 0000000000..71a7280849 --- /dev/null +++ b/translator/translate/otel/translate_otel_test.go @@ -0,0 +1,59 @@ +// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: MIT + +package otel + +import ( + "testing" + + "github.com/stretchr/testify/require" + + "github.com/aws/private-amazon-cloudwatch-agent-staging/translator/translate/agent" +) + +func TestTranslator(t *testing.T) { + agent.Global_Config.Region = "us-east-1" + ot := NewTranslator() + testCases := map[string]struct { + input interface{} + wantErrContains string + }{ + "WithInvalidConfig": { + input: "", + wantErrContains: "invalid json config", + }, + "WithEmptyConfig": { + input: map[string]interface{}{}, + wantErrContains: "no valid pipelines", + }, + "WithoutReceivers": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{}, + }, + wantErrContains: "invalid otel config: no enabled receivers", + }, + "WithMinimalConfig": { + input: map[string]interface{}{ + "metrics": map[string]interface{}{ + "metrics_collected": map[string]interface{}{ + "cpu": map[string]interface{}{}, + }, + }, + }, + }, + } + for name, testCase := range testCases { + t.Run(name, func(t *testing.T) { + got, err := ot.Translate(testCase.input, "linux") + if testCase.wantErrContains != "" { + require.Error(t, err) + require.Nil(t, got) + t.Log(err) + require.ErrorContains(t, err, testCase.wantErrContains) + } else { + require.NoError(t, err) + require.NotNil(t, got) + } + }) + } +} diff --git a/translator/util/paltform_other.go b/translator/util/platform_other.go similarity index 100% rename from translator/util/paltform_other.go rename to translator/util/platform_other.go From a1d8d420ef577e185e6453dd0592a8c1691c729e Mon Sep 17 00:00:00 2001 From: Kaushik Surya <108111936+sky333999@users.noreply.github.com> Date: Fri, 28 Oct 2022 09:48:21 -0400 Subject: [PATCH 042/144] Use the supplied arg for OTel yaml config (#34) --- cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go index 628c0f05b6..7d56a845ed 100644 --- a/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go +++ b/cmd/amazon-cloudwatch-agent/amazon-cloudwatch-agent.go @@ -51,7 +51,6 @@ import ( const ( defaultEnvCfgFileName = "env-config.json" LogTargetEventLog = "eventlog" - yamlConfigFileName = "amazon-cloudwatch-agent.yaml" ) var fDebug = flag.Bool("debug", false, @@ -328,7 +327,7 @@ func runAgent(ctx context.Context, // Version: "0.0", // } - yamlConfigPath := filepath.Join("file:", filepath.Dir(*fConfig), yamlConfigFileName) + yamlConfigPath := filepath.Join("file:", *fOtelConfig) if err != nil { log.Printf("E! Failed to load yaml config due to %v", err) return err From d5e83f390c0d2684b0cbd3636b5fa96e83e64eab Mon Sep 17 00:00:00 2001 From: Billy Zhou Date: Tue, 1 Nov 2022 16:58:25 -0400 Subject: [PATCH 043/144] Create weekly workflow to sync latest upstream changes (#33) * Create weekly workflow to sync latest changes from upstream 1. get-latest: pushes latest upstream changes onto local branch "repo-sync" 2. create-pr: creates a pr from "repo-sync" to "main" * Added a unique suffix to every branch and PR With this setup, every workflow has a unique id, resulting in a separate branch and PR for every trigger. This avoids the edge case where someone is in the middle of resolving merge conflicts--and a new automated PR comes in and overwrites their unfinished work. For the id, I used run_number.run_attempt because it's human readable and maintains uniqueness even when workflows are re-run * Replaced all uses of PAT with GITHUB_TOKEN So long as PR creation/deletion thru GitHub actions is enabled at the org level, then GITHUB_TOKEN can replace PAT in this context * Created job to define pr branch name using last commit hash Branch name must be defined inside a job and exported to jobs.output instead of an environmental variable, because that's the best practice to pass information between jobs. --- .github/repo_sync_pr_template.md | 16 +++++++++ .github/workflows/repo-sync.yml | 58 ++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 .github/repo_sync_pr_template.md create mode 100644 .github/workflows/repo-sync.yml diff --git a/.github/repo_sync_pr_template.md b/.github/repo_sync_pr_template.md new file mode 100644 index 0000000000..341f6cbd36 --- /dev/null +++ b/.github/repo_sync_pr_template.md @@ -0,0 +1,16 @@ +# Description of the issue +An automated PR to kickstart the process of syncing the latest changes from [cw-agent](https://github.com/aws/amazon-cloudwatch-agent/) + +# Description of changes +n/a + +# License +By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice. + +# Tests +n/a + +# Requirements +_Before commit the code, please do the following steps._ +1. Run `make fmt` and `make fmt-sh` +2. Run `make lint` diff --git a/.github/workflows/repo-sync.yml b/.github/workflows/repo-sync.yml new file mode 100644 index 0000000000..8c3a58030e --- /dev/null +++ b/.github/workflows/repo-sync.yml @@ -0,0 +1,58 @@ +# disable this workflow after beta phase +name: Sync with upstream + +on: + schedule: + - cron: "0 0 * * 0" # every sunday at 12AM + workflow_dispatch: + +env: + RUN_ID: "${{ github.run_number }}.${{ github.run_attempt }}" + UPSTREAM: "https://github.com/aws/amazon-cloudwatch-agent.git" + +jobs: + # gets the last commit hash from public/master and defines the branch name + # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idoutputs + define-branch-name: + runs-on: ubuntu-latest + steps: + - name: Get last commit hash from public + id: get-last-commit + run: echo "hash=$(git ls-remote ${{ env.UPSTREAM }} HEAD | awk '{print $1;}')" >> $GITHUB_OUTPUT + outputs: + LAST_COMMIT: ${{ steps.get-last-commit.outputs.hash }} + PR_BRANCH: "repo-sync-${{ steps.get-last-commit.outputs.hash }}-${{ env.RUN_ID }}" + + # pushes the latest from public/main to private/repo-sync + # https://github.com/marketplace/actions/github-repo-sync + create-branch: + needs: define-branch-name + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + persist-credentials: false + - name: repo-sync + uses: repo-sync/github-sync@v2 + with: + source_repo: ${{ env.UPSTREAM }} + source_branch: "master" + destination_branch: ${{ needs.define-branch-name.outputs.PR_BRANCH }} + github_token: ${{ secrets.GITHUB_TOKEN }} + + # upon push-latest completion, creates a PR from private/repo-sync to private/main + # https://github.com/marketplace/actions/github-pull-request-action + create-pr: + needs: [define-branch-name, create-branch] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: pull-request + uses: repo-sync/pull-request@v2 + with: + source_branch: ${{ needs.define-branch-name.outputs.PR_BRANCH }} + destination_branch: "main" + github_token: ${{ secrets.GITHUB_TOKEN }} + pr_title: "Automated sync with upstream - last commit ${{ needs.define-branch-name.outputs.LAST_COMMIT }} - run #${{ env.RUN_ID }}" + pr_template: ".github/repo_sync_pr_template.md" + pr_allow_empty: false From 1195e169138afcdb09ee2eb96856a7425d9419b3 Mon Sep 17 00:00:00 2001 From: Khanh Nguyen <91758108+khanhntd@users.noreply.github.com> Date: Thu, 3 Nov 2022 13:25:22 -0400 Subject: [PATCH 044/144] Add Unit Test for Procstat (#36) * Remove measurement attributes * Add basic unit test for procstat * Delete measurement and change function name to generateExpectedAttributes --- .../adapter/accumulator/accumulator_test.go | 6 +++--- receiver/adapter/accumulator/metrics.go | 9 +-------- receiver/adapter/accumulator/metrics_test.go | 8 ++++---- receiver/adapter/accumulator/testutil.go | 3 +-- receiver/adapter/accumulator/util.go | 5 ----- receiver/adapter/plugins_test.go | 16 ++++++++++++++++ receiver/adapter/testdata/all_plugins.toml | 18 ++++++------------ receiver/adapter/testdata/cpu_plugin.toml | 4 +--- 8 files changed, 32 insertions(+), 37 deletions(-) diff --git a/receiver/adapter/accumulator/accumulator_test.go b/receiver/adapter/accumulator/accumulator_test.go index 53fa2abb37..c70b3b00bc 100644 --- a/receiver/adapter/accumulator/accumulator_test.go +++ b/receiver/adapter/accumulator/accumulator_test.go @@ -34,7 +34,7 @@ func Test_Accumulator_AddCounterGaugeFields(t *testing.T) { telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, telegrafMetricType: telegraf.Gauge, expectedOtelMetricType: pmetric.MetricDataTypeGauge, - expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_gauge_test"), + expectedDPAttributes: generateExpectedAttributes(), }, { name: "OtelAccumulator with AddCounter", @@ -42,7 +42,7 @@ func Test_Accumulator_AddCounterGaugeFields(t *testing.T) { telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, telegrafMetricType: telegraf.Counter, expectedOtelMetricType: pmetric.MetricDataTypeSum, - expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_counter_test"), + expectedDPAttributes: generateExpectedAttributes(), }, { name: "OtelAccumulator with AddFields", @@ -50,7 +50,7 @@ func Test_Accumulator_AddCounterGaugeFields(t *testing.T) { telegrafMetricTags: map[string]string{defaultInstanceId: defaultInstanceIdValue}, telegrafMetricType: telegraf.Untyped, expectedOtelMetricType: pmetric.MetricDataTypeGauge, - expectedDPAttributes: generateExpectedAttributesWithMeasurement("acc_field_test"), + expectedDPAttributes: generateExpectedAttributes(), }, } for _, tc := range test_cases { diff --git a/receiver/adapter/accumulator/metrics.go b/receiver/adapter/accumulator/metrics.go index c9227c33d9..4067f8dbc4 100644 --- a/receiver/adapter/accumulator/metrics.go +++ b/receiver/adapter/accumulator/metrics.go @@ -13,10 +13,6 @@ import ( "go.opentelemetry.io/collector/pdata/pmetric" ) -const ( - measurementAttribute = "measurement" -) - func ConvertTelegrafToOtelMetrics(measurement string, fields map[string]interface{}, tags map[string]string, tp telegraf.ValueType, t time.Time) (pmetric.Metrics, error) { // Instead of converting as tags as resource attributes, CWAgent will convert it to datapoint's attributes. // It would reduce memory consumption and hostmetricscraper does not add attributes to resource attributes. @@ -37,9 +33,7 @@ func ConvertTelegrafToOtelMetrics(measurement string, fields map[string]interfac func NewOtelMetrics(measurement string) pmetric.Metrics { otelMetrics := pmetric.NewMetrics() - resourceMetrics := otelMetrics.ResourceMetrics().AppendEmpty() - - addMeasurementNameAsAttribute(resourceMetrics.Resource().Attributes(), measurement) + otelMetrics.ResourceMetrics().AppendEmpty() return otelMetrics } @@ -123,5 +117,4 @@ func populateNumberDataPoint(measurement string, datapoint pmetric.NumberDataPoi } addTagsToAttributes(datapoint.Attributes(), tags) - addMeasurementNameAsAttribute(datapoint.Attributes(), measurement) } diff --git a/receiver/adapter/accumulator/metrics_test.go b/receiver/adapter/accumulator/metrics_test.go index 8fbfab6da6..794d4e2723 100644 --- a/receiver/adapter/accumulator/metrics_test.go +++ b/receiver/adapter/accumulator/metrics_test.go @@ -56,7 +56,7 @@ func Test_ConvertToOtelMetrics_WithDifferentTypes(t *testing.T) { { "name": "cpu_time_user", "value": float64(42), - "attributes": generateExpectedAttributesWithMeasurement("cpu"), + "attributes": generateExpectedAttributes(), "timestamp": pcommon.NewTimestampFromTime(now), "type": pmetric.MetricDataTypeGauge, }, @@ -79,7 +79,7 @@ func Test_ConvertToOtelMetrics_WithDifferentTypes(t *testing.T) { { "name": "swap_Sin", "value": float64(3), - "attributes": generateExpectedAttributesWithMeasurement("swap"), + "attributes": generateExpectedAttributes(), "timestamp": pcommon.NewTimestampFromTime(now), "type": pmetric.MetricDataTypeSum, }, @@ -104,14 +104,14 @@ func Test_ConvertToOtelMetrics_WithDifferentTypes(t *testing.T) { { "name": "prometheus_redis_tx", "value": int64(4), - "attributes": generateExpectedAttributesWithMeasurement("prometheus"), + "attributes": generateExpectedAttributes(), "timestamp": pcommon.NewTimestampFromTime(now), "type": pmetric.MetricDataTypeGauge, }, { "name": "prometheus_redis_rx", "value": float64(2.3), - "attributes": generateExpectedAttributesWithMeasurement("prometheus"), + "attributes": generateExpectedAttributes(), "timestamp": pcommon.NewTimestampFromTime(now), "type": pmetric.MetricDataTypeGauge, }, diff --git a/receiver/adapter/accumulator/testutil.go b/receiver/adapter/accumulator/testutil.go index edede5fa6a..2e269cde61 100644 --- a/receiver/adapter/accumulator/testutil.go +++ b/receiver/adapter/accumulator/testutil.go @@ -25,10 +25,9 @@ func (t *TestRunningInput) Description() string { return "" } func (t *TestRunningInput) SampleConfig() string { return "" } func (t *TestRunningInput) Gather(_ telegraf.Accumulator) error { return nil } -func generateExpectedAttributesWithMeasurement(measurement string) pcommon.Map { +func generateExpectedAttributes() pcommon.Map { sampleAttributes := pcommon.NewMap() sampleAttributes.PutString(defaultInstanceId, defaultInstanceIdValue) - sampleAttributes.PutString(measurementAttribute, measurement) return sampleAttributes } diff --git a/receiver/adapter/accumulator/util.go b/receiver/adapter/accumulator/util.go index 5f7b0f650f..cbc34707da 100644 --- a/receiver/adapter/accumulator/util.go +++ b/receiver/adapter/accumulator/util.go @@ -16,11 +16,6 @@ func addTagsToAttributes(attributes pcommon.Map, tags map[string]string) { } } -// Add measurement as a global attribute -func addMeasurementNameAsAttribute(attributes pcommon.Map, measurement string) { - attributes.PutString(measurementAttribute, measurement) -} - // Adapted from http://github.com/aws/amazon-cloudwatch-agent/blob/40bb174c0e2309da6bd2c6e1a36c501324b2d6b0/plugins/outputs/cloudwatch/cloudwatch.go#L385-L385 func getMetricName(measurement string, fieldKey string) string { separator := "_" diff --git a/receiver/adapter/plugins_test.go b/receiver/adapter/plugins_test.go index a3cfab8955..f88942ceca 100644 --- a/receiver/adapter/plugins_test.go +++ b/receiver/adapter/plugins_test.go @@ -17,6 +17,7 @@ import ( _ "github.com/influxdata/telegraf/plugins/inputs/mem" _ "github.com/influxdata/telegraf/plugins/inputs/net" _ "github.com/influxdata/telegraf/plugins/inputs/processes" + _ "github.com/influxdata/telegraf/plugins/inputs/procstat" _ "github.com/influxdata/telegraf/plugins/inputs/swap" "github.com/stretchr/testify/assert" "go.opentelemetry.io/collector/pdata/pmetric" @@ -108,6 +109,21 @@ func Test_ProcessesPlugin(t *testing.T) { }) } +func Test_ProcStatPlugin(t *testing.T) { + scrapeAndValidateMetrics(t, &SanityTestConfig{ + plugin: "procstat", + scrapeCount: 2, + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/procstat/procstat.go#L69-L300 + expectedMetrics: [][]string{{"cpu_time_system", "cpu_time_user", "cpu_usage", "memory_data", "memory_locked", "memory_rss", "memory_stack", "memory_swap", "memory_vms"}}, + expectedResourceMetricsLen: 9, + // The procstat finds the process/PID/User/etc and find corresponding process/PID/User/etc usage from management subsystem. + // However, its only able to use pgrep or PID file to find the target + // https://github.com/influxdata/telegraf/blob/8c49ddccc3cb8f8fe020dc4e1f38b93a0f2ad467/plugins/inputs/procstat/procstat.go#L71-L79 + // Therefore, the metrics are different based on number of processes/PID find by pgrep or PID File and not stable. + expectedResourceMetricsLenComparator: assert.LessOrEqual, + }) +} + func scrapeAndValidateMetrics(t *testing.T, cfg *SanityTestConfig) { as := assert.New(t) receiver := getInitializedReceiver(t, cfg.plugin) diff --git a/receiver/adapter/testdata/all_plugins.toml b/receiver/adapter/testdata/all_plugins.toml index 307d8ec01b..ecf7c70f1b 100644 --- a/receiver/adapter/testdata/all_plugins.toml +++ b/receiver/adapter/testdata/all_plugins.toml @@ -5,36 +5,30 @@ totalcpu = true interval = "1s" fieldpass = ["time_active", "time_user", "time_system", "time_idle", "time_nice", "time_iowait", "time_irq", "time_softirq", "time_steal", "time_guest", "time_guest_nice", "usage_active", "usage_user", "usage_system", "usage_idle", "usage_nice", "usage_iowait", "usage_irq", "usage_softirq", "usage_steal", "usage_guest", "usage_guest_nice"] - [inputs.cpu.tags] - metricPath = "metrics" [[inputs.swap]] interval = "1s" fieldpass = ["total","used", "free", "used_percent"] - [inputs.swap.tags] - metricPath = "metrics" [[inputs.mem]] interval = "1s" fieldpass = ["total", "available", "used", "used_percent", "available_percent"] - [inputs.mem.tags] - metricPath = "metrics" [[inputs.net]] fieldpass = ["bytes_sent", "bytes_recv", "packets_sent", "packets_recv", "err_in", "err_out", "drop_in", "drop_out"] - [inputs.net.tags] - metricPath = "metrics" [[inputs.disk]] mount_points = ["/"] ignore_fs = [] fieldpass = ["total", "free", "used", "used_percent", "inodes_total", "inodes_free", "inodes_used"] tagexclude = ["mode"] - [inputs.disk.tags] - metricPath = "metrics" [[inputs.processes]] fieldpass = ["blocked", "zombies", "stopped", "running", "sleeping", "total", "unknown"] - [inputs.processes.tags] - metricPath = "metrics" \ No newline at end of file + +[[inputs.procstat]] + pattern = " " + fieldpass = ["cpu_time_system", "cpu_time_user", "cpu_usage", "memory_data", "memory_locked", "memory_rss", "memory_stack", "memory_swap", "memory_vms"] + pid_finder = "native" + interval = "1s" diff --git a/receiver/adapter/testdata/cpu_plugin.toml b/receiver/adapter/testdata/cpu_plugin.toml index 7ff4d9ad57..3c3e06f1c9 100644 --- a/receiver/adapter/testdata/cpu_plugin.toml +++ b/receiver/adapter/testdata/cpu_plugin.toml @@ -1,6 +1,4 @@ [[inputs.cpu]] fieldpass = ["usage_idle", "usage_iowait", "usage_user", "usage_system"] percpu = false - totalcpu = false - [inputs.cpu.tags] - metricPath = "metrics" \ No newline at end of file + totalcpu = false \ No newline at end of file From 04857b32fdfbbbe83c23c9135b84888c7eab19db Mon Sep 17 00:00:00 2001 From: Khanh Nguyen <91758108+khanhntd@users.noreply.github.com> Date: Mon, 7 Nov 2022 09:50:37 -0500 Subject: [PATCH 045/144] Add support for Telegraf Service Input (e.g Statsd) (#38) * Add support for traking metrics with service input * Support Service Input for adapter receiver * Support Service Input for adapter receiver * Add EMFEXporter for testing with prometheus scraper * Add checking service input measurement to honor metric name * Revert to use cloudwatch * Change back to cloudwatch * Change back to cloudwatch * Fix go yaml * Fix go yaml * Finish get metric name * Delete otel with Tracking and add comments * Fix comments and add mutext * Fix comments and add mutext * Fix comments and add mutext * Remove honor metrics, fix yaml file * Remove measurement attributes * Add support for Telegraf Service Input (e.g Statsd * Update go.sum --- .../cwagent-fluentd-quickstart.yaml | 27 +---------------- go.mod | 16 +++++----- go.sum | 26 ++++++++-------- .../targetsexportprocessor.go | 2 +- receiver/adapter/accumulator/accumulator.go | 30 +++++++++++++++---- .../adapter/accumulator/accumulator_test.go | 16 +++++----- receiver/adapter/accumulator/metrics.go | 6 ++-- receiver/adapter/accumulator/util.go | 13 ++++++++ receiver/adapter/factory.go | 5 +--- receiver/adapter/plugins_test.go | 7 +++-- receiver/adapter/receiver.go | 18 +++++++++++ receiver/adapter/testdata/all_plugins.toml | 1 + translator/tocwconfig/tocwconfig_test.go | 4 +-- .../tocwconfig/toyamlconfig/toyamlconfig.go | 16 ++++------ 14 files changed, 104 insertions(+), 83 deletions(-) diff --git a/amazon-cloudwatch-container-insights/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml b/amazon-cloudwatch-container-insights/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml index 3cb62a9d80..23ab4d6cbd 100644 --- a/amazon-cloudwatch-container-insights/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml +++ b/amazon-cloudwatch-container-insights/k8s-yaml-templates/quickstart/cwagent-fluentd-quickstart.yaml @@ -225,7 +225,6 @@ data: @include containers.conf @include systemd.conf @include host.conf - @type null @@ -244,7 +243,6 @@ data: time_format %Y-%m-%dT%H:%M:%S.%NZ - @type tail @id in_tail_cwagent_logs @@ -258,7 +256,6 @@ data: time_format %Y-%m-%dT%H:%M:%S.%NZ - @type tail @id in_tail_fluentd_logs @@ -272,13 +269,11 @@ data: time_format %Y-%m-%dT%H:%M:%S.%NZ - - - -