Skip to content

Commit

Permalink
[otel-integration] Update opentelemetry collector v0.120.0
Browse files Browse the repository at this point in the history
  • Loading branch information
povilasv committed Feb 28, 2025
1 parent 9fcc51b commit cfe9564
Show file tree
Hide file tree
Showing 5 changed files with 80 additions and 12 deletions.
4 changes: 4 additions & 0 deletions otel-integration/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## OpenTelemtry-Integration

### v0.0.150 / 2025-02-29

- [Feat] Upgrade OpenTelemetry Collector to `0.120.0`

### v0.0.149 / 2025-02-27

- [Feat] Upgrade OpenTelemetry Collector to `0.119.0`
Expand Down
12 changes: 6 additions & 6 deletions otel-integration/k8s-helm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: otel-integration
description: OpenTelemetry Integration
version: 0.0.149
version: 0.0.150
keywords:
- OpenTelemetry Collector
- OpenTelemetry Agent
Expand All @@ -11,27 +11,27 @@ keywords:
dependencies:
- name: opentelemetry-collector
alias: opentelemetry-agent
version: "0.107.1"
version: "0.108.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent.enabled
- name: opentelemetry-collector
alias: opentelemetry-agent-windows
version: "0.107.1"
version: "0.108.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-agent-windows.enabled
- name: opentelemetry-collector
alias: opentelemetry-cluster-collector
version: "0.107.1"
version: "0.108.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-cluster-collector.enabled
- name: opentelemetry-collector
alias: opentelemetry-receiver
version: "0.107.1"
version: "0.108.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-receiver.enabled
- name: opentelemetry-collector
alias: opentelemetry-gateway
version: "0.107.1"
version: "0.108.0"
repository: https://cgx.jfrog.io/artifactory/coralogix-charts-virtual
condition: opentelemetry-gateway.enabled
- name: coralogix-ebpf-agent
Expand Down
70 changes: 65 additions & 5 deletions otel-integration/k8s-helm/e2e-test/expected_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ var expectedResourceAttributesK8sattributesprocessor = map[string]string{
"http.scheme": "",
"server.port": "",
"url.scheme": "",
"cx_agent_type": "",
"cx.agent.type": "",
"k8s_node_name": "",
"service_instance_id": "",
"cx.otel_integration.name": "coralogix-integration-helm",
Expand All @@ -114,16 +114,47 @@ var expectedResourceAttributesK8sattributesprocessor = map[string]string{
"azure.resourcegroup.name": "",
}

var expectedResourceAttributesService = map[string]string{
"service.name": "opentelemetry-collector",
"net.host.name": "",
"server.address": "",
"k8s.pod.ip": "",
"net.host.port": "",
"http.scheme": "http",
"server.port": "",
"url.scheme": "",
"cx.agent.type": "",
"k8s.node.name": "",
"service.version": expectedScopeVersion,
"k8s.cluster.name": "otel-integration-agent-e2e",
"cx.otel_integration.name": "coralogix-integration-helm",
"k8s.pod.name": "",
"k8s.namespace.name": "",
"k8s.daemonset.name": "",
"host.name": "",
"os.type": "linux",
"host.id": "",
"cloud.provider": "azure",
"cloud.platform": "azure_vm",
"cloud.region": "",
"cloud.account.id": "",
"azure.vm.name": "",
"azure.vm.size": "",
"azure.vm.scaleset.name": "",
"azure.resourcegroup.name": "",
}

var expectedResourceAttributesMemorylimiterprocessor = map[string]string{
"service.name": "opentelemetry-collector",
"service.version": "",
"net.host.name": "",
"server.address": "",
"k8s.pod.ip": "",
"net.host.port": "",
"http.scheme": "http",
"server.port": "",
"url.scheme": "",
"cx_agent_type": "",
"cx.agent.type": "",
"k8s_node_name": "",
"service_instance_id": "",
"cx.otel_integration.name": "coralogix-integration-helm",
Expand Down Expand Up @@ -190,11 +221,10 @@ var expectedResourceAttributesPrometheusreceiver = map[string]string{
"server.address": "",
"server.port": "",
"service_version": expectedScopeVersion,
"service.instance.id": "",
"service_instance_id": "",
"service.name": "opentelemetry-collector",
"url.scheme": "",
"cx_agent_type": "",
"service_instance_id": "",
"cx.agent.type": "",
}

var expectedResourceAttributesProcessscraper = map[string]string{
Expand All @@ -220,6 +250,36 @@ var expectedResourceAttributesProcessscraper = map[string]string{
"azure.resourcegroup.name": "",
}

var expectedResourceAttributesProcessorhelper = map[string]string{
"service.name": "opentelemetry-collector",
"net.host.name": "",
"server.address": "",
"k8s.pod.ip": "",
"net.host.port": "",
"http.scheme": "http",
"server.port": "",
"url.scheme": "",
"cx.agent.type": "",
"k8s.node.name": "otel-integration-agent-e2e-control-plane",
"service.version": expectedScopeVersion,
"k8s.cluster.name": "otel-integration-agent-e2e",
"cx.otel_integration.name": "coralogix-integration-helm",
"k8s.pod.name": "",
"k8s.namespace.name": "",
"k8s.daemonset.name": "",
"host.name": "",
"os.type": "linux",
"host.id": "",
"cloud.provider": "azure",
"cloud.platform": "azure_vm",
"cloud.region": "",
"cloud.account.id": "",
"azure.vm.name": "",
"azure.vm.size": "",
"azure.vm.scaleset.name": "",
"azure.resourcegroup.name": "",
}

var expectedMetrics map[string]bool = map[string]bool{
"container.cpu.time": false,
"container.cpu.utilization": false,
Expand Down
4 changes: 4 additions & 0 deletions otel-integration/k8s-helm/e2e-test/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,10 @@ func checkResourceAttributes(t *testing.T, attributes pcommon.Map, scopeName str
compareMap = expectedResourceAttributesMemorylimiterprocessor
case "processscraper":
compareMap = expectedResourceAttributesProcessscraper
case "service":
compareMap = expectedResourceAttributesService
case "processorhelper":
compareMap = expectedResourceAttributesProcessorhelper
default:
compareMap = expectedResourceAttributesMemorylimiterprocessor
}
Expand Down
2 changes: 1 addition & 1 deletion otel-integration/k8s-helm/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ global:
defaultSubsystemName: "integration"
logLevel: "warn"
collectionInterval: "30s"
version: "0.0.149"
version: "0.0.150"

extensions:
kubernetesDashboard:
Expand Down

0 comments on commit cfe9564

Please sign in to comment.