Skip to content

Commit 5f50562

Browse files
chore(deps): bump autoinstrumentation (#4172)
* chore(deps): bump autoinstrumentation * chore: Add changelog entry for dependency update * chore: add breaking changelog * fix: fix breaking ITs * fix: run prettier * chore: remove changelog * chore: add more info in changelog * fix: fix ITs * fix: add auto rule engine to dotnet ITs * fix: change image to support dotnet 8 * fix: test grpc port * Revert "fix: test grpc port" This reverts commit 170adc4. * fix: test explicit grpc * chore: remove OTEL_DOTNET_AUTO_RULE_ENGINE_ENABLED to see if ITs pass * chore: add breaking changelog --------- Co-authored-by: renovatebot-sumologic[bot] <279692411+renovatebot-sumologic[bot]@users.noreply.github.com> Co-authored-by: Shubham Gupta <[email protected]>
1 parent 232ddf2 commit 5f50562

11 files changed

Lines changed: 40 additions & 20 deletions

File tree

.changelog/4172.breaking.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
autoinstrumentation-dotnet now requires .NET 8 or newer (.NET 6 and .NET 7 are no longer supported)
2+
autoinstrumentation-nodejs now requires Node.js 18.19.0+ or 20.6.0+ (Node.js 14 and 16 are no longer supported)
3+

.changelog/4172.changed.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
chore(deps): bump autoinstrumentation-dotnet from 1.9.0 to 1.15.0
2+
chore(deps): bump autoinstrumentation-java from 2.20.1 to 2.27.0
3+
chore(deps): bump autoinstrumentation-nodejs from 0.54.0 to 0.73.0

deploy/helm/sumologic/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,12 @@ The following table lists the configurable parameters of the Sumo Logic chart an
345345
| `instrumentation.createDefaultInstrumentation` | Flag to control creation of default Instrumentation object | `false` |
346346
| `instrumentation.dotnet.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` |
347347
| `opentelemetry-operator.manager.autoInstrumentationImage.dotnet.repository` | OpenTelemetry Operator DotNet Instrumentation iamfge repository. | `public.ecr.aws/sumologic/autoinstrumentation-dotnet` |
348-
| `opentelemetry-operator.manager.autoInstrumentationImage.dotnet.tag` | OpenTelemetry Operator DotNet Instrumentation image tag. | `1.9.0` |
348+
| `opentelemetry-operator.manager.autoInstrumentationImage.dotnet.tag` | OpenTelemetry Operator DotNet Instrumentation image tag. | `1.15.0` |
349349
| `instrumentation.dotnet.metrics.enabled` | Flag to control metrics export from DotNet instrumentation in `Instrumentation` resource. | `true` |
350350
| `instrumentation.dotnet.traces.enabled` | Flag to control traces export from DotNet instrumentation in `Instrumentation` resource. | `true` |
351351
| `instrumentation.java.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` |
352352
| `opentelemetry-operator.manager.autoInstrumentationImage.java.repository` | OpenTelemetry Operator Java Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-java` |
353-
| `opentelemetry-operator.manager.autoInstrumentationImage.java.tag` | OpenTelemetry Operator Java Instrumentation image tag. | `2.20.1` |
353+
| `opentelemetry-operator.manager.autoInstrumentationImage.java.tag` | OpenTelemetry Operator Java Instrumentation image tag. | `2.27.0` |
354354
| `instrumentation.java.metrics.enabled` | Flag to control metrics export from Java instrumentation in `Instrumentation` resource. | `true` |
355355
| `instrumentation.java.traces.enabled` | Flag to control traces export from Java instrumentation in `Instrumentation` resource. | `true` |
356356
| `instrumentation.python.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` |
@@ -361,7 +361,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
361361
| `instrumentation.nodejs.metrics.enabled` | Flag to control metrics export from NodeJS instrumentation in `Instrumentation` resource. | `true` |
362362
| `instrumentation.nodejs.extraEnvVars` | Additional environment variables for OpenTelemetry Operator Instrumentation Resource. | `{}` |
363363
| `opentelemetry-operator.manager.autoInstrumentationImage.nodejs.repository` | OpenTelemetry Operator NodeJS Instrumentation image repository. | `public.ecr.aws/sumologic/autoinstrumentation-nodejs` |
364-
| `opentelemetry-operator.manager.autoInstrumentationImage.nodejs.tag` | OpenTelemetry Operator NodeJS Instrumentation image tag. | `0.54.0` |
364+
| `opentelemetry-operator.manager.autoInstrumentationImage.nodejs.tag` | OpenTelemetry Operator NodeJS Instrumentation image tag. | `0.73.0` |
365365
| `opentelemetry-operator.manager.image.repository` | The default operator image repository for OpenTelemetry. | `public.ecr.aws/sumologic/opentelemetry-operator` |
366366
| `opentelemetry-operator.manager.collectorImage.repository` | The default collector image repository for OpenTelemetryCollector CRDs. | `public.ecr.aws/sumologic/sumologic-otel-collector` |
367367
| `opentelemetry-operator.manager.collectorImage.tag` | The default collector image tag for OpenTelemetryCollector CRDs. | `0.149.0-sumo-0` |

deploy/helm/sumologic/conf/opentelemetry-operator/instrumentation.cr.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ spec:
6464
env:
6565
- name: OTEL_METRICS_EXPORTER
6666
value: {{ include "instrumentation.resource.exporter" (dict "enabled" $instrumentation.nodejs.metrics.enabled) }}
67+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
68+
value: grpc
6769
- name: OTEL_EXPORTER_OTLP_ENDPOINT
6870
value: http://{{- include "sumologic.opentelemetry.operator.instrumentation.collector.endpoint" $ctx }}:4317
6971
{{- if $instrumentation.nodejs.extraEnvVars -}}

deploy/helm/sumologic/values.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2691,16 +2691,16 @@ opentelemetry-operator:
26912691
autoInstrumentationImage:
26922692
java:
26932693
repository: public.ecr.aws/sumologic/autoinstrumentation-java
2694-
tag: 2.20.1
2694+
tag: 2.27.0
26952695
dotnet:
26962696
repository: public.ecr.aws/sumologic/autoinstrumentation-dotnet
2697-
tag: 1.9.0
2697+
tag: 1.15.0
26982698
python:
26992699
repository: public.ecr.aws/sumologic/autoinstrumentation-python
27002700
tag: 0.48b0
27012701
nodejs:
27022702
repository: public.ecr.aws/sumologic/autoinstrumentation-nodejs
2703-
tag: 0.54.0
2703+
tag: 0.73.0
27042704
env:
27052705
{}
27062706
# ENABLE_WEBHOOKS: "true"

tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.additionalenvs.output.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ data:
6767
env:
6868
- name: OTEL_METRICS_EXPORTER
6969
value: otlp
70+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
71+
value: grpc
7072
- name: OTEL_EXPORTER_OTLP_ENDPOINT
7173
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
7274
- name: test
@@ -139,6 +141,8 @@ data:
139141
env:
140142
- name: OTEL_METRICS_EXPORTER
141143
value: otlp
144+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
145+
value: grpc
142146
- name: OTEL_EXPORTER_OTLP_ENDPOINT
143147
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
144148
- name: test

tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.output.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ data:
3535
- name: OTEL_RESOURCE_ATTRIBUTES
3636
value: application=ot-operator1
3737
dotnet:
38-
image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:1.9.0
38+
image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:1.15.0
3939
env:
4040
- name: OTEL_METRICS_EXPORTER
4141
value: otlp
@@ -59,14 +59,16 @@ data:
5959
- name: OTEL_EXPORTER_OTLP_ENDPOINT
6060
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318
6161
nodejs:
62-
image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.54.0
62+
image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.73.0
6363
env:
6464
- name: OTEL_METRICS_EXPORTER
6565
value: otlp
66+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
67+
value: grpc
6668
- name: OTEL_EXPORTER_OTLP_ENDPOINT
6769
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
6870
java:
69-
image: public.ecr.aws/sumologic/autoinstrumentation-java:2.20.1
71+
image: public.ecr.aws/sumologic/autoinstrumentation-java:2.27.0
7072
env:
7173
- name: OTEL_METRICS_EXPORTER
7274
value: otlp
@@ -99,7 +101,7 @@ data:
99101
- name: OTEL_RESOURCE_ATTRIBUTES
100102
value: application=ot-operator2
101103
dotnet:
102-
image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:1.9.0
104+
image: public.ecr.aws/sumologic/autoinstrumentation-dotnet:1.15.0
103105
env:
104106
- name: OTEL_METRICS_EXPORTER
105107
value: otlp
@@ -123,14 +125,16 @@ data:
123125
- name: OTEL_EXPORTER_OTLP_ENDPOINT
124126
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4318
125127
nodejs:
126-
image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.54.0
128+
image: public.ecr.aws/sumologic/autoinstrumentation-nodejs:0.73.0
127129
env:
128130
- name: OTEL_METRICS_EXPORTER
129131
value: otlp
132+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
133+
value: grpc
130134
- name: OTEL_EXPORTER_OTLP_ENDPOINT
131135
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
132136
java:
133-
image: public.ecr.aws/sumologic/autoinstrumentation-java:2.20.1
137+
image: public.ecr.aws/sumologic/autoinstrumentation-java:2.27.0
134138
env:
135139
- name: OTEL_METRICS_EXPORTER
136140
value: otlp

tests/helm/testdata/goldenfile/opentelemetry_operator_instrumentation_cr_configmap/instrumentation.repository.output.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ data:
6363
env:
6464
- name: OTEL_METRICS_EXPORTER
6565
value: otlp
66+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
67+
value: grpc
6668
- name: OTEL_EXPORTER_OTLP_ENDPOINT
6769
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
6870
java:
@@ -127,6 +129,8 @@ data:
127129
env:
128130
- name: OTEL_METRICS_EXPORTER
129131
value: otlp
132+
- name: OTEL_EXPORTER_OTLP_PROTOCOL
133+
value: grpc
130134
- name: OTEL_EXPORTER_OTLP_ENDPOINT
131135
value: http://RELEASE-NAME-sumologic-otelagent.sumologic:4317
132136
java:

0 commit comments

Comments
 (0)