Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EMF Exporter does not forward metrics if IRSA is enabled #915

Merged
merged 14 commits into from
Oct 23, 2023
Merged

EMF Exporter does not forward metrics if IRSA is enabled #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
37ab5fd
Adds log lines
dchappa Oct 19, 2023
d313b09
Adds log statements
dchappa Oct 20, 2023
cb81294
more log statements
dchappa Oct 20, 2023
fa19b53
translates roleARN in emf translator
dchappa Oct 20, 2023
72a3b18
reverts logging and build commits
dchappa Oct 20, 2023
a11db61
removes logging and commented code
dchappa Oct 20, 2023
2817b02
Adds unit test for role_arn and region being passed
dchappa Oct 20, 2023
729586e
lint check
dchappa Oct 20, 2023
830ea02
lint fix
dchappa Oct 20, 2023
56cabb9
regroups imports for lint
dchappa Oct 20, 2023
db73c1c
changes numLines for TestLogsFileAutoRemoval, to resolve mac build error
dchappa Oct 23, 2023
af50f1d
removes unused parameter
dchappa Oct 23, 2023
4228271
raises num lines to 100k
dchappa Oct 23, 2023
500298f
reverts lines back to 1M, trying by increasing timeout
dchappa Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/inputs/logfile/logfile_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ func createWriteRead(t *testing.T, prefix string, logFile *LogFile, done chan bo
select {
case <-done2:
t.Log("Child completed before timeout (as expected)")
case <-time.After(time.Second * 10):
case <-time.After(time.Second * 20):
SaxyPandaBear marked this conversation as resolved.
Show resolved Hide resolved
require.Fail(t, "timeout waiting for child")
}
t.Log("Verify 1st temp file was auto deleted.")
Expand Down
1 change: 1 addition & 0 deletions translator/translate/otel/exporter/awsemf/translator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ func (t *translator) Translate(c *confmap.Conf) (component.Config, error) {
if credentialsFileKey, ok := agent.Global_Config.Credentials[agent.CredentialsFile_Key]; ok {
cfg.AWSSessionSettings.SharedCredentialsFile = []string{fmt.Sprintf("%v", credentialsFileKey)}
}
cfg.AWSSessionSettings.RoleARN = agent.Global_Config.Role_arn
SaxyPandaBear marked this conversation as resolved.
Show resolved Hide resolved
cfg.AWSSessionSettings.IMDSRetries = retryer.GetDefaultRetryNumber()

if isEcs(c) {
Expand Down
5 changes: 5 additions & 0 deletions translator/translate/otel/exporter/awsemf/translator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ import (
"go.opentelemetry.io/collector/confmap"

legacytranslator "github.com/aws/amazon-cloudwatch-agent/translator"
"github.com/aws/amazon-cloudwatch-agent/translator/translate/agent"
)

var nilSlice []string
var nilMetricDescriptorsSlice []awsemfexporter.MetricDescriptor

func TestTranslator(t *testing.T) {
tt := NewTranslator()
agent.Global_Config.Region = "us-east-1"
agent.Global_Config.Role_arn = "global_arn"
require.EqualValues(t, "awsemf", tt.ID().String())
testCases := map[string]struct {
env map[string]string
Expand Down Expand Up @@ -675,6 +678,8 @@ func TestTranslator(t *testing.T) {
require.Equal(t, testCase.want["resource_to_telemetry_conversion"], gotCfg.ResourceToTelemetrySettings)
require.ElementsMatch(t, testCase.want["metric_declarations"], gotCfg.MetricDeclarations)
require.ElementsMatch(t, testCase.want["metric_descriptors"], gotCfg.MetricDescriptors)
require.Equal(t, "global_arn", gotCfg.RoleARN)
require.Equal(t, "us-east-1", gotCfg.Region)
}
})
}
Expand Down