Bump collector version to 0.106.1 (#432)

* Bump version in chart; adjust values Signed-off-by: Matej Gera <[email protected]> * Add changelog and upgrading info Signed-off-by: Matej Gera <[email protected]> * Adjust config and upgrading instructions Signed-off-by: Matej Gera <[email protected]> * Bump to fork version 0.88.2 Signed-off-by: Matej Gera <[email protected]> --------- Signed-off-by: Matej Gera <[email protected]>
coralogix · Aug 2, 2024 · dd8c877 · dd8c877
1 parent faa27ac
commit dd8c877
Show file tree

Hide file tree

Showing 7 changed files with 53 additions and 21 deletions.
diff --git a/otel-collector-windows-image/Dockerfile b/otel-collector-windows-image/Dockerfile
@@ -3,7 +3,7 @@ ARG WIN_BASE_IMAGE
 
 FROM --platform=$BUILDPLATFORM curlimages/curl AS build
 WORKDIR /src
-RUN curl -Lo otelcol.tar.gz https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.104.0/otelcol-contrib_0.104.0_windows_amd64.tar.gz
+RUN curl -Lo otelcol.tar.gz https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v0.106.1/otelcol-contrib_0.106.1_windows_amd64.tar.gz
 RUN tar -xzvf otelcol.tar.gz
 
 ##

diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## OpenTelemtry-Integration
 
+## v0.0.90 / 2024-07-31
+- [:warning: CHANGE] [FEAT] Bump collector version to `0.106.1`. If you're using your custom configuration that relies on implicit conversion of types, please see the note about change in behavior in the [`UPGRADING.md`](./UPGRADING.md)
+- [Fix] Mute process executable errors in host metrics
+
 ### v0.0.89 / 2024-07-29
 - [Feat] add host entity event preset
 

diff --git a/otel-integration/UPGRADING.md b/otel-integration/UPGRADING.md
@@ -8,6 +8,29 @@ When upgrading to new collector version please check OpenTelemetry collector rel
 - https://github.com/open-telemetry/opentelemetry-collector/releases
 - https://github.com/open-telemetry/opentelemetry-collector-contrib/releases
 
+## 0.0.89 to 0.0.90
+
+If you are providing your own configuration that relies on implicit conversion of types, this behavior is now deprecated and will not be supported in one of the future release (might cause your collectors to fail during start). Please update your configuration accordingly - to see which type casting behaviors are affected see the list [here](https://github.com/open-telemetry/opentelemetry-collector/issues/9532).
+
+For example, if you previously had a configuration like this:
+
+```yaml
+ service:
+      telemetry:
+        resource:
+          - service.instance.id:
+          - service.name:
+```
+
+You should change it to this instead:
+
+```yaml
+      telemetry:
+        resource:
+          service.instance.id: ""
+          service.name: ""
+```
+
 ## 0.0.84 to 0.0.85
 
 If you are providing your own environemnt variables that are being expanded in the collector configuration, be sure to use the recommended syntax with the `env:` prefix (for example: `${env:ENV_VAR}` instead of just `${ENV_VAR}`). For more information see [here](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.104.0). The old way of setting environment variables will be removed in the near future.

diff --git a/otel-integration/k8s-helm/Chart.yaml b/otel-integration/k8s-helm/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: otel-integration
 description: OpenTelemetry Integration
-version: 0.0.89
+version: 0.0.90
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent
@@ -11,22 +11,22 @@ keywords:
 dependencies:
   - name: opentelemetry-collector
     alias: opentelemetry-agent
-    version: "0.87.3"
+    version: "0.88.2"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-agent-windows
-    version: "0.87.3"
+    version: "0.88.2"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent-windows.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-cluster-collector
-    version: "0.87.3"
+    version: "0.88.2"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-cluster-collector.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-gateway
-    version: "0.87.3"
+    version: "0.88.2"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-gateway.enabled
 sources:

diff --git a/otel-integration/k8s-helm/e2e-test/expected_test.go b/otel-integration/k8s-helm/e2e-test/expected_test.go
@@ -5,7 +5,7 @@ var expectedSchemaURL = map[string]bool{
 	"https://opentelemetry.io/schemas/1.9.0": false,
 }
 
-const expectedScopeVersion = "0.104.0"
+const expectedScopeVersion = "0.106.1"
 
 var expectedScopeNames = map[string]bool{
 	"otelcol/hostmetricsreceiver/network":    false,
@@ -149,7 +149,6 @@ var expectedMetrics map[string]bool = map[string]bool{
 	"container.memory.usage":                         false,
 	"container.memory.working_set":                   false,
 	"otelcol_process_memory_rss":                     false,
-	"otelcol_processor_refused_metric_points":        false,
 	"otelcol_receiver_accepted_metric_points":        false,
 	"scrape_duration_seconds":                        false,
 	"otelcol_exporter_queue_capacity":                false,
@@ -159,11 +158,9 @@ var expectedMetrics map[string]bool = map[string]bool{
 	"otelcol_process_runtime_total_sys_memory_bytes": false,
 	"otelcol_process_uptime":                         false,
 	"otelcol_processor_accepted_metric_points":       false,
-	"otelcol_processor_inserted_metric_points":       false,
 	"otelcol_processor_batch_metadata_cardinality":   false,
 	"otelcol_receiver_refused_log_records":           false,
 	"otelcol_receiver_refused_metric_points":         false,
-	"otelcol_processor_dropped_metric_points":        false,
 	"scrape_samples_post_metric_relabeling":          false,
 	"otelcol_exporter_queue_size":                    false,
 	"otelcol_exporter_send_failed_metric_points":     false,

diff --git a/otel-integration/k8s-helm/e2e-test/main_test.go b/otel-integration/k8s-helm/e2e-test/main_test.go
@@ -80,8 +80,16 @@ func checkResourceMetrics(t *testing.T, actual []pmetric.Metrics) error {
 	for name, expectedState := range expectedScopeNames {
 		require.True(t, expectedState, "scope %v was not found in the actual metrics", name)
 	}
+
+	var missingMetrics []string
 	for name, expectedState := range expectedMetrics {
-		require.True(t, expectedState, "metric %v was not found in the actual metrics", name)
+		if !expectedState {
+			missingMetrics = append(missingMetrics, name)
+		}
+	}
+
+	if len(missingMetrics) > 0 {
+		t.Fatalf("metrics %v were not found in the actual metrics", missingMetrics)
 	}
 
 	return nil

diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml
@@ -5,7 +5,7 @@ global:
   defaultSubsystemName: "integration"
   logLevel: "warn"
   collectionInterval: "30s"
-  version: "0.0.89"
+  version: "0.0.90"
 
   extensions:
     kubernetesDashboard:
@@ -61,7 +61,7 @@ opentelemetry-agent:
   # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
   command:
     name: otelcol-contrib
-    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion,-confmap.strictlyTypedInput"]
 
   serviceAccount:
     # Specifies whether a service account should be created
@@ -274,8 +274,8 @@ opentelemetry-agent:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          - service.instance.id:
-          - service.name:
+          service.instance.id: ""
+          service.name: ""
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
@@ -413,7 +413,7 @@ opentelemetry-cluster-collector:
   # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
   command:
     name: otelcol-contrib
-    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion,-confmap.strictlyTypedInput"]
 
   extraEnvs:
     - name: CORALOGIX_PRIVATE_KEY
@@ -592,8 +592,8 @@ opentelemetry-cluster-collector:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          - service.instance.id:
-          - service.name:
+          service.instance.id: ""
+          service.name: ""
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
@@ -694,7 +694,7 @@ opentelemetry-gateway:
   # Temporary feature gates to prevent breaking changes. Please see changelog for version 0.0.85 for more information.
   command:
     name: otelcol-contrib
-    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.unifyEnvVarExpansion,-confmap.strictlyTypedInput"]
 
   config:
     extensions:
@@ -785,8 +785,8 @@ opentelemetry-gateway:
         resource:
           # Supress this attribute, as we don't want the UUID of the collector to be sent,
           # instead we rely on instance label generated by Prometheus receiver.
-          - service.instance.id:
-          - service.name:
+          service.instance.id: ""
+          service.name: ""
         logs:
           level: "{{ .Values.global.logLevel }}"
           encoding: json