Merge pull request #188 from kube-logging/chore/upgrade-otelcol-image-v0.143.0-axoflow.0

chore: update otelcollector to v0.143.0-axfolow.0

Author: OverOrion

Makefile

@@ -19,7 +19,7 @@ LICENSEI_VERSION = 0.9.0
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.35.0
-ENVTEST_OTEL_OPERATOR_VERSION=0.129.1
+ENVTEST_OTEL_OPERATOR_VERSION=0.143.0
 
 # renovate: datasource=github-releases depName=cert-manager/cert-manager versioning=semver
 CERT_MANAGER_VERSION = 1.19.2

docs/demos/persistence-and-retry-mechanisms/generated-otelcol-config.yaml

@@ -6,27 +6,25 @@ connectors:
           - key: tenant
           - key: subscription
           - key: exporter
-        description: The number of logs sent out from each exporter.
-        resource_attributes:
           - key: k8s.namespace.name
           - key: k8s.node.name
           - key: k8s.container.name
           - key: k8s.pod.name
           - key: k8s.pod.labels.app.kubernetes.io/name
           - key: k8s.pod.labels.app
+        description: The number of logs sent out from each exporter.
   count/tenant_metrics:
     logs:
       telemetry_controller_tenant_log_count:
         attributes:
           - key: tenant
-        description: The number of logs from each tenant pipeline.
-        resource_attributes:
           - key: k8s.namespace.name
           - key: k8s.node.name
           - key: k8s.container.name
           - key: k8s.pod.name
           - key: k8s.pod.labels.app.kubernetes.io/name
           - key: k8s.pod.labels.app
+        description: The number of logs from each tenant pipeline.
   routing/subscription_db_sub-db_outputs:
     table:
       - condition: "true"

pkg/resources/manager/collector_manager.go

@@ -45,7 +45,7 @@ import (
 
 const (
 	otelCollectorKind            = "OpenTelemetryCollector"
-	axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.129.0-axoflow.3"
+	axoflowOtelCollectorImageRef = "ghcr.io/axoflow/axoflow-otel-collector/axoflow-otel-collector:0.143.0-axoflow.rc1"
 )
 
 var (

pkg/resources/otel_conf_gen/otel_col_conf_test_fixtures/complex.yaml

@@ -13,27 +13,25 @@ connectors:
         - key: tenant
         - key: subscription
         - key: exporter
-        description: The number of logs sent out from each exporter.
-        resource_attributes:
         - key: k8s.namespace.name
         - key: k8s.node.name
         - key: k8s.container.name
         - key: k8s.pod.name
         - key: k8s.pod.labels.app.kubernetes.io/name
         - key: k8s.pod.labels.app
+        description: The number of logs sent out from each exporter.
   count/tenant_metrics:
     logs:
       telemetry_controller_tenant_log_count:
         attributes:
         - key: tenant
-        description: The number of logs from each tenant pipeline.
-        resource_attributes:
         - key: k8s.namespace.name
         - key: k8s.node.name
         - key: k8s.container.name
         - key: k8s.pod.name
         - key: k8s.pod.labels.app.kubernetes.io/name
         - key: k8s.pod.labels.app
+        description: The number of logs from each tenant pipeline.
   routing/subscription_example-tenant-a-ns_subscription-example-1_outputs:
     table:
     - condition: "true"

pkg/resources/otel_conf_gen/pipeline/components/connector/count_connector.go

@@ -22,10 +22,9 @@ type CountConnectorAttributeConfig struct {
 }
 
 type CountConnectorMetricInfo struct {
-	Description        *string                         `json:"description,omitempty"`
-	Conditions         []string                        `json:"conditions,omitempty"`
-	Attributes         []CountConnectorAttributeConfig `json:"attributes,omitempty"`
-	ResourceAttributes []CountConnectorAttributeConfig `json:"resource_attributes,omitempty"`
+	Description *string                         `json:"description,omitempty"`
+	Conditions  []string                        `json:"conditions,omitempty"`
+	Attributes  []CountConnectorAttributeConfig `json:"attributes,omitempty"`
 }
 
 func GenerateCountConnectors() map[string]any {
@@ -34,10 +33,10 @@ func GenerateCountConnectors() map[string]any {
 		"logs": map[string]CountConnectorMetricInfo{
 			"telemetry_controller_tenant_log_count": {
 				Description: utils.ToPtr("The number of logs from each tenant pipeline."),
-				Attributes: []CountConnectorAttributeConfig{{
-					Key: utils.ToPtr("tenant"),
-				}},
-				ResourceAttributes: []CountConnectorAttributeConfig{
+				Attributes: []CountConnectorAttributeConfig{
+					{
+						Key: utils.ToPtr("tenant"),
+					},
 					{
 						Key: utils.ToPtr("k8s.namespace.name"),
 					},
@@ -68,13 +67,13 @@ func GenerateCountConnectors() map[string]any {
 				Attributes: []CountConnectorAttributeConfig{
 					{
 						Key: utils.ToPtr("tenant"),
-					}, {
+					},
+					{
 						Key: utils.ToPtr("subscription"),
-					}, {
+					},
+					{
 						Key: utils.ToPtr("exporter"),
 					},
-				},
-				ResourceAttributes: []CountConnectorAttributeConfig{
 					{
 						Key: utils.ToPtr("k8s.namespace.name"),
 					},