Merge branch 'main' into tests/conformance-fix

sjberman · web-flow · commit ad2ef7419049 · 2024-11-21T21:25:07.000-05:00
diff --git a/tests/framework/collector.go b/tests/framework/collector.go
@@ -12,7 +12,7 @@ const (
 	collectorChartReleaseName = "otel-collector"
 	//nolint:lll
 	// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts
-	collectorChartVersion = "0.109.0"
+	collectorChartVersion = "0.110.0"
 )
 
 // InstallCollector installs the otel-collector.

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ const (`
`12`	`12`	`collectorChartReleaseName = "otel-collector"`
`13`	`13`	`//nolint:lll`
`14`	`14`	`// renovate: datasource=helm depName=opentelemetry-collector registryUrl=https://open-telemetry.github.io/opentelemetry-helm-charts`
`15`		`- collectorChartVersion = "0.109.0"`
	`15`	`+ collectorChartVersion = "0.110.0"`
`16`	`16`	`)`
`17`	`17`
`18`	`18`	`// InstallCollector installs the otel-collector.`