Otel bump v0.115.0 -> v0.124.1 #1694

Paramadon · 2025-05-19T17:45:46Z

Description of the issue

This pr is for bumping contrib version from v0.116.0 to 0.124.1

Some changes included in this pr is - yaml changes due to default values appends label values for colliding OTel attributes (#35896) meaning conflicts will not be added as they are not needed
Changing validation from component.ValidateConfig(cfg))-> xconfmap.Validate(cfg)
Changing common/promlog package to common/promslog
Changing logger to slog to comply to promslog package logger version
NewNopSetting needs a component type parameter in there function now so adding that to all the calls for NewNopSetting

Agent test run: https://github.com/aws/amazon-cloudwatch-agent/actions/runs/15495855178

Contrib pr: amazon-contributing/opentelemetry-collector-contrib#311

…ramadon/otel-bump-0.124.1

Paramadon · 2025-05-22T20:46:03Z

plugins/inputs/prometheus/start.go

+	}
+	for _, sc := range scrapeConfigs {
+		if sc.ScrapeFallbackProtocol == "" {
+			sc.ScrapeFallbackProtocol = promconfig.PrometheusText1_0_0


change this to 0_0_4 to be consistent with contrib.

Paramadon · 2025-05-22T20:50:07Z

translator/translate/otel/processor/metricsdecorator/translator.go

-	return ContextStatement{
-		Context:    "metric",
-		Statements: statements,
+


error_mode propagate is the default https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/68e1d6cd94bfca9bdf725327d4221f97ce0e0564/processor/transformprocessor/config.go#L39. Needed to be set because unmarshaling fails.

Paramadon · 2025-05-30T19:22:12Z

translator/translate/otel/processor/metricsdecorator/translator.go

 	}

-	c := confmap.NewFromStringMap(map[string]any{


Changing this to interface{} due to this error that occurs:
unable to unmarshal metric decoration processor: invalid metric_statements type, expected: array, got: [{%!t(string=metric) [%!t(string=set(unit, "unit") where name == "disk_free") %!t(string=set(name, "DISK_FREE") where name == "disk_free") %!t(string=set(name, "gpu-utilization") where name == "nvidia_smi_utilization_gpu") %!t(string=set(unit, "unit") where name == "cpu_usage_idle") %!t(string=set(name, "CPU_USAGE_IDLE") where name == "cpu_usage_idle") %!t(string=set(unit, "unit") where name == "cpu_usage_nice") %!t(string=set(name, "cpu_time_active_renamed") where name == "cpu_time_active")]}]

Unmarshal fails when array of ContextStatement is passed and even when we add error mode to struct of context statement it is expecting an array of interface{} otherwise it fails. This is the pr for adding error_mode: open-telemetry/opentelemetry-collector-contrib#29017 this is the version of the contrib this was added:https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.119.0. It is under enhancement but it still broke our translator.

Paramadon · 2025-05-30T21:21:44Z

plugins/inputs/prometheus/start.go

@@ -228,13 +285,13 @@ func Start(configFilePath string, receiver storage.Appendable, shutDownChan chan
 			g.Add(
 				func() error {
 					// we wait until the config is fully loaded.
-					level.Info(logger).Log("msg", "start ta manager")
+					logger.Info("start ta manager")


Verify logs are not extra verbose and are not getting dumped

plugins/inputs/prometheus/start.go

plugins/inputs/prometheus/target_allocator.go

translator/translate/otel/processor/metricsdecorator/translator.go

…ramadon/otel-bump-0.124.1

extension/agenthealth/factory_test.go

jefchien · 2025-06-05T23:20:26Z

plugins/inputs/prometheus/start.go

 	}
-	level.Info(logger).Log("msg", "See you next time!")
+	level.Info(kitLogger).Log("msg", "See you next time!")


Why are we using a different logger here? It looks like it was previously using the same logger as the error log above.

plugins/inputs/prometheus/start.go

jefchien · 2025-06-05T23:26:12Z

plugins/inputs/prometheus/start.go

+	if err != nil {
+		return errors.Wrapf(err, "couldn't read configuration file %q", filename)
+	}


This is a change in behavior. Why are we returning the error now? Also, if you want to wrap the error, I would suggest using fmt.Errorf("%w", err).

plugins/inputs/prometheus/start.go

…loudwatch-agent into paramadon/otel-bump-0.124.1

jefchien · 2025-06-06T21:38:27Z

plugins/inputs/prometheus/start.go

 	)

-	level.Info(logger).Log("msg", fmt.Sprintf("Target Allocator  is %t", taManager.enabled))
-	//Setup Target Allocator Scrape Post Process Handler
+	logger.Info("Target Allocator status", "enabled", taManager.enabled) //Setup Target Allocator Scrape Post Process Handler


nit: I don't see why we've changed this message.

jefchien · 2025-06-06T21:46:22Z

plugins/inputs/prometheus/target_allocator.go

+	var zapLevel zapcore.Level
+	switch level.String() {
+	case "debug":
+		zapLevel = zapcore.DebugLevel
+	case "info":
+		zapLevel = zapcore.InfoLevel
+	case "warn":
+		zapLevel = zapcore.WarnLevel
+	case "error":
+		zapLevel = zapcore.ErrorLevel
+	default:
+		return nil, fmt.Errorf("invalid log level: %s, defaulting to info", level.String())
+	}


nit: Still don't see why this had to change from

zapLevel, err := zapcore.ParseLevel(level.String()) if err != nil { err = fmt.Errorf("Error parsing level: %v. Defaulting to info.", err) zapLevel = zapcore.InfoLevel }

Technically a change in behavior as well since it'll fail to create the logger instead of just setting the log level to info.

jefchien · 2025-06-06T21:49:00Z

plugins/inputs/prometheus/target_allocator.go

+		tam.logger.Error("target Allocator is not configured properly")
+		return fmt.Errorf("target Allocator is not configured properly")


Instead of logging and then creating the error, could we just log the error that gets returned by reloadConfigTicker if it's not nil? It looks to me that if we follow this back up, it's already logged as part of "ta manager stopped".

https://github.com/aws/amazon-cloudwatch-agent/blob/main/plugins/inputs/prometheus/start.go#L233

go mod tidy fails

da1ac84

Paramadon requested a review from a team as a code owner May 19, 2025 17:45

Paramadon changed the title ~~Paramadon/otel bump 0.124.1~~ Otel bump v0.115.0 -> v0.124.1 May 19, 2025

Otel bump v0.115.0 -> v0.124.1

a6c0bb6

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from 1ee5ad1 to a6c0bb6 Compare May 19, 2025 19:29

Paramadon and others added 2 commits May 19, 2025 15:33

Merge branch 'main' into paramadon/otel-bump-0.124.1

66a74d0

Updating agent to latest version of otel contrib

95a032e

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from 1c11a8b to c019f00 Compare May 20, 2025 01:05

bumping otel version

ca0c949

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from c019f00 to ca0c949 Compare May 20, 2025 01:26

adding back arm

b41cd67

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch 3 times, most recently from 76e99a6 to b80859b Compare May 21, 2025 01:58

fixing make

a5c2769

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from b80859b to a5c2769 Compare May 21, 2025 13:35

Paramadon added 2 commits May 21, 2025 14:25

Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent into pa…

5089178

…ramadon/otel-bump-0.124.1

fixing prometheus factory and awsutil

d41a4fa

Paramadon commented May 22, 2025

View reviewed changes

Paramadon added 8 commits May 23, 2025 18:12

Final otel bump change

0f1eb01

pulling from main

2a2d5c4

fixing ling

4dfdb62

tyring to fix ling

34b0ac9

fixing ling

2d61a0a

Fixing translator

e526303

commenting out overwrite

bfeb573

regenerating windows yaml

10bc9e9

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from c648ced to 10bc9e9 Compare May 30, 2025 14:28

trying to fix yaml

4b5866f

attempting to fix windows issue

9bbea28

Paramadon commented May 30, 2025

View reviewed changes

plugins/inputs/prometheus/start.go Outdated Show resolved Hide resolved

Paramadon commented May 30, 2025

View reviewed changes

plugins/inputs/prometheus/target_allocator.go Outdated Show resolved Hide resolved

Paramadon commented May 30, 2025

View reviewed changes

translator/translate/otel/processor/metricsdecorator/translator.go Outdated Show resolved Hide resolved

Paramadon added 5 commits June 1, 2025 14:15

fixing windows test

3f69d87

fixing windows test

feb5161

Testing framework

6e3bdcf

Merge branch 'main' of github.com:aws/amazon-cloudwatch-agent into pa…

6293423

…ramadon/otel-bump-0.124.1

Updating agent go mod

596c49e

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from 2673714 to 596c49e Compare June 2, 2025 17:59

dricross previously approved these changes Jun 5, 2025

View reviewed changes

Merge branch 'main' into paramadon/otel-bump-0.124.1

63f4592

jefchien reviewed Jun 5, 2025

View reviewed changes

resovling comments

10b161b

Paramadon dismissed dricross’s stale review via 4761826 June 6, 2025 16:27

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from 4761826 to 2667580 Compare June 6, 2025 20:28

Merge branch 'paramadon/otel-bump-0.124.1' of github.com:aws/amazon-c…

bea31b5

…loudwatch-agent into paramadon/otel-bump-0.124.1

Paramadon force-pushed the paramadon/otel-bump-0.124.1 branch from 2667580 to bea31b5 Compare June 6, 2025 20:32

jefchien approved these changes Jun 6, 2025

View reviewed changes

dricross approved these changes Jun 9, 2025

View reviewed changes

Merge branch 'main' into paramadon/otel-bump-0.124.1

3fc4d6e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Otel bump v0.115.0 -> v0.124.1 #1694

Otel bump v0.115.0 -> v0.124.1 #1694

Uh oh!

Paramadon commented May 19, 2025 •

edited

Loading

Uh oh!

Paramadon May 22, 2025 •

edited

Loading

Uh oh!

Paramadon May 22, 2025 •

edited

Loading

Uh oh!

Paramadon May 30, 2025

Uh oh!

Paramadon May 30, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jefchien Jun 5, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jefchien Jun 5, 2025

Uh oh!

Uh oh!

jefchien Jun 6, 2025

Uh oh!

jefchien Jun 6, 2025

Uh oh!

jefchien Jun 6, 2025

Uh oh!

Uh oh!

		tam.logger.Error("target Allocator is not configured properly")
		return fmt.Errorf("target Allocator is not configured properly")

Otel bump v0.115.0 -> v0.124.1 #1694

Are you sure you want to change the base?

Otel bump v0.115.0 -> v0.124.1 #1694

Uh oh!

Conversation

Paramadon commented May 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description of the issue

Uh oh!

Paramadon May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Paramadon May 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Paramadon May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Paramadon May 30, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jefchien Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jefchien Jun 5, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jefchien Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

jefchien Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

jefchien Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Paramadon commented May 19, 2025 •

edited

Loading

Paramadon May 22, 2025 •

edited

Loading

Paramadon May 22, 2025 •

edited

Loading