Bump collector version to 0.104.0; adjust environment variable expansion

otel-integration/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## OpenTelemtry-Integration
 
+### v0.0.85 / 2024-07-03
+- [:warning: CHANGE] [FEAT] Bump collector version to `0.104.0`. 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.
+
 ### v0.0.84 / 2024-06-26
 - [Fix] Add azure to resource detection processor
 

otel-integration/UPGRADING.md

@@ -8,6 +8,10 @@ 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.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.
+
 ## 0.0.43 to 0.0.44
 
 Because 0.0.44 sets GOMEMLIMIT automatically for pods, it is recommended to remove memoryballast extension if you manually configured the pipeline. Removing memoryballast extension should reduce memory footprint for your pods. See https://github.com/open-telemetry/opentelemetry-helm-charts/issues/891 for more information/

otel-integration/k8s-helm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: otel-integration
 description: OpenTelemetry Integration
-version: 0.0.84
+version: 0.0.85
 keywords:
   - OpenTelemetry Collector
   - OpenTelemetry Agent
@@ -11,22 +11,22 @@ keywords:
 dependencies:
   - name: opentelemetry-collector
     alias: opentelemetry-agent
-    version: "0.86.2"
+    version: "0.87.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-agent-windows
-    version: "0.86.2"
+    version: "0.87.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-agent-windows.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-cluster-collector
-    version: "0.86.2"
+    version: "0.87.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-cluster-collector.enabled
   - name: opentelemetry-collector
     alias: opentelemetry-gateway
-    version: "0.86.2"
+    version: "0.87.0"
     repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
     condition: opentelemetry-gateway.enabled
 sources:

otel-integration/k8s-helm/README.md

@@ -526,7 +526,7 @@ service:
           exporter:
             otlp:
               protocol: grpc/protobuf
-              endpoint: ${MY_POD_IP}:4317
+              endpoint: ${env:MY_POD_IP}:4317
 ```
 
 # Filtering and reducing metrics cost.

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.102.1"
+const expectedScopeVersion = "0.104.0"
 
 var expectedScopeNames = map[string]bool{
 	"otelcol/hostmetricsreceiver/network":    false,
@@ -64,6 +64,9 @@ var expectedResourceAttributesPrometheusreceiver = map[string]string{
 	"service.instance.id":      "",
 	"net.host.port":            "",
 	"http.scheme":              "http",
+	"server.address":           "",
+	"server.port":              "",
+	"url.scheme":               "",
 	"service_version":          expectedScopeVersion,
 	"cx.otel_integration.name": "coralogix-integration-helm",
 	"k8s.cluster.name":         "otel-integration-agent-e2e",
@@ -156,6 +159,7 @@ 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,

otel-integration/k8s-helm/values-windows-tailsampling.yaml

@@ -56,6 +56,10 @@ opentelemetry-agent-windows:
         fieldRef:
           apiVersion: v1
           fieldPath: spec.nodeName
+  # 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"]
 
   serviceAccount:
     # Specifies whether a service account should be created
@@ -123,33 +127,33 @@ opentelemetry-agent-windows:
 
     receivers:
       statsd:
-        endpoint: ${MY_POD_IP}:8125
+        endpoint: ${env:MY_POD_IP}:8125
       otlp:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:4317
+            endpoint: ${env:MY_POD_IP}:4317
           http:
-            endpoint: ${MY_POD_IP}:4318
+            endpoint: ${env:MY_POD_IP}:4318
       zipkin:
-        endpoint: ${MY_POD_IP}:9411
+        endpoint: ${env:MY_POD_IP}:9411
       jaeger:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:14250
+            endpoint: ${env:MY_POD_IP}:14250
           thrift_http:
-            endpoint: ${MY_POD_IP}:14268
+            endpoint: ${env:MY_POD_IP}:14268
           thrift_compact:
-            endpoint: ${MY_POD_IP}:6831
+            endpoint: ${env:MY_POD_IP}:6831
           thrift_binary:
-            endpoint: ${MY_POD_IP}:6832
+            endpoint: ${env:MY_POD_IP}:6832
       prometheus:
         config:
           scrape_configs:
           - job_name: opentelemetry-collector
             scrape_interval: 30s
             static_configs:
               - targets:
-                  - ${MY_POD_IP}:8888
+                  - ${env:MY_POD_IP}:8888
     processors:
       batch:
         send_batch_size: 1024
@@ -187,7 +191,7 @@ opentelemetry-agent-windows:
     exporters:
       coralogix:
         timeout: "30s"
-        private_key: "${CORALOGIX_PRIVATE_KEY}"
+        private_key: "${env:CORALOGIX_PRIVATE_KEY}"
         domain: "{{ .Values.global.domain }}"
         application_name: "{{ .Values.global.defaultApplicationName }}"
         subsystem_name: "{{ .Values.global.defaultSubsystemName }}"
@@ -211,7 +215,7 @@ opentelemetry-agent-windows:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
         metrics:
-          address: ${MY_POD_IP}:8888
+          address: ${env:MY_POD_IP}:8888
       extensions:
       - zpages
       - pprof

otel-integration/k8s-helm/values-windows.yaml

@@ -26,6 +26,11 @@ opentelemetry-agent-windows:
     tag: "0.97.0"
     # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value).
     digest: ""
+  # 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"]
+
   extraVolumes:
     - name: etcmachineid
       hostPath:
@@ -119,33 +124,33 @@ opentelemetry-agent-windows:
 
     receivers:
       statsd:
-        endpoint: ${MY_POD_IP}:8125
+        endpoint: ${env:MY_POD_IP}:8125
       otlp:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:4317
+            endpoint: ${env:MY_POD_IP}:4317
           http:
-            endpoint: ${MY_POD_IP}:4318
+            endpoint: ${env:MY_POD_IP}:4318
       zipkin:
-        endpoint: ${MY_POD_IP}:9411
+        endpoint: ${env:MY_POD_IP}:9411
       jaeger:
         protocols:
           grpc:
-            endpoint: ${MY_POD_IP}:14250
+            endpoint: ${env:MY_POD_IP}:14250
           thrift_http:
-            endpoint: ${MY_POD_IP}:14268
+            endpoint: ${env:MY_POD_IP}:14268
           thrift_compact:
-            endpoint: ${MY_POD_IP}:6831
+            endpoint: ${env:MY_POD_IP}:6831
           thrift_binary:
-            endpoint: ${MY_POD_IP}:6832
+            endpoint: ${env:MY_POD_IP}:6832
       prometheus:
         config:
           scrape_configs:
           - job_name: opentelemetry-collector
             scrape_interval: 30s
             static_configs:
               - targets:
-                  - ${MY_POD_IP}:8888
+                  - ${env:MY_POD_IP}:8888
     processors:
       batch:
         send_batch_size: 1024
@@ -183,7 +188,7 @@ opentelemetry-agent-windows:
     exporters:
       coralogix:
         timeout: "30s"
-        private_key: "${CORALOGIX_PRIVATE_KEY}"
+        private_key: "${env:CORALOGIX_PRIVATE_KEY}"
         domain: "{{ .Values.global.domain }}"
         application_name: "{{ .Values.global.defaultApplicationName }}"
         subsystem_name: "{{ .Values.global.defaultSubsystemName }}"
@@ -207,7 +212,7 @@ opentelemetry-agent-windows:
           level: "{{ .Values.global.logLevel }}"
           encoding: json
         metrics:
-          address: ${MY_POD_IP}:8888
+          address: ${env:MY_POD_IP}:8888
       extensions:
       - zpages
       - pprof