Skip to content

Commit 322b0bb

Browse files
chore: Update the opentelemetry operator chart to 0.86.4 (#3925)
* chore: Update the opentelemetry operator to 0.86.4 * Address changes in the operator e2e test images * Node Selectors are now configurable in the operator
1 parent bb30168 commit 322b0bb

File tree

6 files changed

+22
-25
lines changed

6 files changed

+22
-25
lines changed

.changelog/3925.changed.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
chore: Update the opentelemetry operator to 0.86.4

deploy/helm/sumologic/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies:
3333
repository: https://sumologic.github.io/tailing-sidecar
3434
condition: tailing-sidecar-operator.enabled
3535
- name: opentelemetry-operator
36-
version: 0.76.0
36+
version: 0.86.4
3737
repository: https://open-telemetry.github.io/opentelemetry-helm-charts
3838
condition: opentelemetry-operator.enabled,sumologic.metrics.collector.otelcol.enabled
3939
- name: prometheus-windows-exporter

docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ The following table displays the currently used software versions for our Helm c
108108
| Name | Version |
109109
| ----------------------------------------- | ------- |
110110
| OpenTelemetry Collector | 0.118.0 |
111-
| OpenTelemetry Operator | 0.76.0 |
111+
| OpenTelemetry Operator | 0.86.4 |
112112
| kube-prometheus-stack/Prometheus Operator | 40.5.0 |
113113
| Falco | 3.8.7 |
114114
| Metrics Server | 6.11.2 |

tests/helm/testdata/node-selector.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,6 @@ kube-prometheus-stack:
3232
value: "value"
3333
operator: Exists
3434
effect: "NoSchedule"
35+
opentelemetry-operator:
36+
nodeSelector:
37+
disktype: hdd

tests/integration/features.go

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -825,23 +825,22 @@ func GetCurlAppFeature() features.Feature {
825825
Assess("wait for dotnet traces", stepfuncs.WaitUntilExpectedSpansPresent(
826826
1,
827827
map[string]string{
828-
"application": "test-apps",
829-
"service.name": "dotnet-app",
830-
"_collector": "kubernetes",
831-
"http.request.method": "GET",
832-
"http.response.status_code": "200",
833-
"url.path": "/",
834-
"k8s.cluster.name": "kubernetes",
835-
"k8s.container.name": "dotnetapp",
836-
"k8s.deployment.name": "dotnet-app",
837-
"k8s.namespace.name": internal.InstrumentationAppsNamespace,
838-
"k8s.pod.pod_name": "dotnet-app",
839-
"k8s.pod.label.app": "dotnet-app",
840-
"_sourceCategory": "kubernetes/test/apps/dotnet/app",
841-
"_sourceName": fmt.Sprintf("%s.dotnet-app.dotnetapp", internal.InstrumentationAppsNamespace),
842-
"telemetry.distro.version": "1.9.0",
843-
"telemetry.sdk.language": "dotnet",
844-
"telemetry.sdk.version": "1.9.0",
828+
"application": "test-apps",
829+
"service.name": "dotnet-app",
830+
"_collector": "kubernetes",
831+
"http.request.method": "GET",
832+
"url.path": "/",
833+
"k8s.cluster.name": "kubernetes",
834+
"k8s.container.name": "dotnetapp",
835+
"k8s.deployment.name": "dotnet-app",
836+
"k8s.namespace.name": internal.InstrumentationAppsNamespace,
837+
"k8s.pod.pod_name": "dotnet-app",
838+
"k8s.pod.label.app": "dotnet-app",
839+
"_sourceCategory": "kubernetes/test/apps/dotnet/app",
840+
"_sourceName": fmt.Sprintf("%s.dotnet-app.dotnetapp", internal.InstrumentationAppsNamespace),
841+
"telemetry.distro.version": "1.9.0",
842+
"telemetry.sdk.language": "dotnet",
843+
"telemetry.sdk.version": "1.9.0",
845844
},
846845
waitDuration,
847846
tickDuration,
@@ -853,11 +852,6 @@ func GetCurlAppFeature() features.Feature {
853852
"service.name": "nodejs-app",
854853
"_collector": "kubernetes",
855854
"http.method": "GET",
856-
"http.route": "/",
857-
"http.status_code": "200",
858-
"http.scheme": "http",
859-
"http.target": "/",
860-
"http.url": "http://nodejs-app-service.test-apps:8080/",
861855
"k8s.cluster.name": "kubernetes",
862856
"k8s.container.name": "nodejsapp",
863857
"k8s.deployment.name": "nodejs-app",

tests/integration/internal/sumologicmock/receiver_mock.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ func (client *SumologicMockClient) GetSpansCount(t *testing.T, metadataFilters M
200200
resp.StatusCode, url,
201201
)
202202
}
203-
204203
var spans []Span
205204
if err := json.Unmarshal(body, &spans); err != nil {
206205
return 0, err

0 commit comments

Comments
 (0)