Bump collector 0.107.0 (#439)

* Bump collector version; remove env var flag Signed-off-by: Matej Gera <[email protected]> * Update changelog and upgrading Signed-off-by: Matej Gera <[email protected]> * Fix test after scope changes Signed-off-by: Matej Gera <[email protected]> --------- Signed-off-by: Matej Gera <[email protected]>
coralogix · Aug 16, 2024 · f25a538 · f25a538
1 parent abfbe49
commit f25a538
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/otel-integration/CHANGELOG.md b/otel-integration/CHANGELOG.md
@@ -2,8 +2,11 @@
 
 ## OpenTelemtry-Integration
 
-### v0.0.95 / 2024-08-14
+### v0.0.96 / 2024-08-16
+- [:warning: CHANGE] [FEAT] Bump collector version to `0.107.0`. Old way of providing environment variables in the collector configuration has been removed. If you are providing your own environment variables that are being expanded in the collector configuration, be sure to use the recommended syntax (for example with `env` prefix - `${env:ENV_VAR}` or `${ENV_VAR}` instead of just `$ENV_VAR`). For more information see previous [upgrading guide](https://github.com/coralogix/telemetry-shippers/blob/master/otel-integration/UPGRADING.md#0084-to-0085).
+- [FIX] Restore previously mistakenly changed default log level to `warn`.
 
+### v0.0.95 / 2024-08-14
 - [Feat] add k8s.cluster.name to entity events
 
 ### v0.0.94 / 2024-08-07

diff --git a/otel-integration/UPGRADING.md b/otel-integration/UPGRADING.md
@@ -33,7 +33,7 @@ You should change it to this instead:
 
 ## 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.
+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}` or `${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.
 
 ## 0.0.43 to 0.0.44
 

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.95
+version: 0.0.96
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent
@@ -11,22 +11,22 @@ keywords:
 dependencies:
   - name: opentelemetry-collector
     alias: opentelemetry-agent
-    version: "0.88.7"
+    version: "0.89.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-agent-windows
-    version: "0.88.7"
+    version: "0.89.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent-windows.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-cluster-collector
-    version: "0.88.7"
+    version: "0.89.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-cluster-collector.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-gateway
-    version: "0.88.7"
+    version: "0.89.0"
     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,17 +5,17 @@ var expectedSchemaURL = map[string]bool{
 	"https://opentelemetry.io/schemas/1.9.0": false,
 }
 
-const expectedScopeVersion = "0.106.1"
+const expectedScopeVersion = "0.107.0"
 
 var expectedScopeNames = map[string]bool{
-	"otelcol/hostmetricsreceiver/network":    false,
-	"otelcol/hostmetricsreceiver/cpu":        false,
-	"otelcol/hostmetricsreceiver/filesystem": false,
-	"otelcol/hostmetricsreceiver/memory":     false,
-	"otelcol/hostmetricsreceiver/load":       false,
-	"otelcol/hostmetricsreceiver/disk":       false,
-	"otelcol/kubeletstatsreceiver":           false,
-	"otelcol/prometheusreceiver":             false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/networkscraper":    false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/cpuscraper":        false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/filesystemscraper": false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/memoryscraper":     false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/loadscraper":       false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/diskscraper":       false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver":                                   false,
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver":                                     false,
 }
 
 var expectedResourceAttributesKubeletstatreceiver = map[string]string{
@@ -149,7 +149,9 @@ 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,
+	"otelcol_processor_inserted_metric_points":       false,
 	"scrape_duration_seconds":                        false,
 	"otelcol_exporter_queue_capacity":                false,
 	"otelcol_otelsvc_k8s_ip_lookup_miss":             false,
@@ -161,6 +163,7 @@ var expectedMetrics map[string]bool = map[string]bool{
 	"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
@@ -108,7 +108,7 @@ func checkScopeMetrics(t *testing.T, rmetrics pmetric.ResourceMetrics) error {
 
 		// We only need the relevant part of the scopr name to get receiver name.
 		scopeNameTrimmed := strings.Split(scope.Scope().Name(), "/")
-		checkResourceAttributes(t, rmetrics.Resource().Attributes(), scopeNameTrimmed[1])
+		checkResourceAttributes(t, rmetrics.Resource().Attributes(), scopeNameTrimmed[4])
 
 		metrics := scope.Metrics()
 		for j := 0; j < metrics.Len(); j++ {

diff --git a/otel-integration/k8s-helm/values-windows-tailsampling.yaml b/otel-integration/k8s-helm/values-windows-tailsampling.yaml
@@ -59,7 +59,7 @@ opentelemetry-agent-windows:
   # 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"]
 
   serviceAccount:
     # Specifies whether a service account should be created

diff --git a/otel-integration/k8s-helm/values-windows.yaml b/otel-integration/k8s-helm/values-windows.yaml
@@ -30,7 +30,7 @@ opentelemetry-agent-windows:
   # 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"]
 
   extraVolumes:
     - name: etcmachineid

diff --git a/otel-integration/k8s-helm/values.yaml b/otel-integration/k8s-helm/values.yaml
@@ -3,9 +3,9 @@ global:
   clusterName: ""
   defaultApplicationName: "otel"
   defaultSubsystemName: "integration"
-  logLevel: "debug"
+  logLevel: "warn"
   collectionInterval: "30s"
-  version: "0.0.95"
+  version: "0.0.96"
 
   extensions:
     kubernetesDashboard:
@@ -63,7 +63,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,-confmap.strictlyTypedInput"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"]
 
   serviceAccount:
     # Specifies whether a service account should be created
@@ -424,7 +424,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,-confmap.strictlyTypedInput"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"]
 
   extraEnvs:
     - name: CORALOGIX_PRIVATE_KEY
@@ -709,7 +709,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,-confmap.strictlyTypedInput"]
+    extraArgs: ["--feature-gates=component.UseLocalHostAsDefaultHost,-confmap.strictlyTypedInput"]
 
   config:
     extensions: