Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump NodeJS autoinstrumentation dependencies #2241

Merged
merged 11 commits into from
Oct 25, 2023
16 changes: 16 additions & 0 deletions .chloggen/bump-nodejs-dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
component: operator

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: "Bump NodeJS dependencies. Also, increase the size of the default size for the volume used to copy the autoinstrumentation libraries from 150M to 200M"

# One or more tracking issues related to the change
issues: [2240, 2237]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
2 changes: 1 addition & 1 deletion .github/workflows/publish-autoinstrumentation-nodejs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
uses: docker/build-push-action@v5
with:
context: autoinstrumentation/nodejs
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
iblancasa marked this conversation as resolved.
Show resolved Hide resolved
push: ${{ github.event_name == 'push' }}
build-args: version=${{ env.VERSION }}
tags: ${{ steps.meta.outputs.tags }}
Expand Down
14 changes: 7 additions & 7 deletions apis/v1alpha1/instrumentation_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ type Java struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines java specific env vars. There are four layers for env vars' definitions and
Expand All @@ -142,7 +142,7 @@ type NodeJS struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines nodejs specific env vars. There are four layers for env vars' definitions and
Expand All @@ -163,7 +163,7 @@ type Python struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines python specific env vars. There are four layers for env vars' definitions and
Expand All @@ -184,7 +184,7 @@ type DotNet struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines DotNet specific env vars. There are four layers for env vars' definitions and
Expand All @@ -203,7 +203,7 @@ type Go struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines Go specific env vars. There are four layers for env vars' definitions and
Expand All @@ -224,7 +224,7 @@ type ApacheHttpd struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines Apache HTTPD specific env vars. There are four layers for env vars' definitions and
Expand Down Expand Up @@ -260,7 +260,7 @@ type Nginx struct {
Image string `json:"image,omitempty"`

// VolumeSizeLimit defines size limit for volume used for auto-instrumentation.
// The default size is 150Mi.
// The default size is 200Mi.
VolumeSizeLimit *resource.Quantity `json:"volumeLimitSize,omitempty"`

// Env defines Nginx specific env vars. There are four layers for env vars' definitions and
Expand Down
2 changes: 1 addition & 1 deletion autoinstrumentation/nodejs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# - Grant the necessary access to `/autoinstrumentation` directory. `chmod -R go+r /autoinstrumentation`
# - For auto-instrumentation by container injection, the Linux command cp is
# used and must be availabe in the image.
FROM node:16 AS build
FROM node:20 AS build

WORKDIR /operator-build
COPY . .
Expand Down
24 changes: 12 additions & 12 deletions autoinstrumentation/nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"typescript": "^4.4.4"
},
"dependencies": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/auto-instrumentations-node": "0.38.0",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.41.1",
"@opentelemetry/exporter-prometheus": "0.41.1",
"@opentelemetry/exporter-trace-otlp-grpc": "0.41.1",
"@opentelemetry/resource-detector-alibaba-cloud": "0.28.0",
"@opentelemetry/resource-detector-aws": "1.3.0",
"@opentelemetry/resource-detector-container": "0.3.0",
"@opentelemetry/resource-detector-gcp": "0.29.0",
"@opentelemetry/resources": "1.15.1",
"@opentelemetry/sdk-metrics": "1.15.1",
"@opentelemetry/sdk-node": "0.41.1"
"@opentelemetry/api": "1.6.0",
"@opentelemetry/auto-instrumentations-node": "0.39.4",
"@opentelemetry/exporter-metrics-otlp-grpc": "0.44.0",
"@opentelemetry/exporter-prometheus": "0.44.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.44.0",
"@opentelemetry/resource-detector-alibaba-cloud": "0.28.2",
"@opentelemetry/resource-detector-aws": "1.3.2",
"@opentelemetry/resource-detector-container": "0.3.2",
"@opentelemetry/resource-detector-gcp": "0.29.2",
"@opentelemetry/resources": "1.17.1",
"@opentelemetry/sdk-metrics": "1.17.1",
"@opentelemetry/sdk-node": "0.44.0"
}
}
14 changes: 7 additions & 7 deletions bundle/manifests/opentelemetry.io_instrumentations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -500,7 +500,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -777,7 +777,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -945,7 +945,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1225,7 +1225,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1392,7 +1392,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1576,7 +1576,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down
14 changes: 7 additions & 7 deletions config/crd/bases/opentelemetry.io_instrumentations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -498,7 +498,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -775,7 +775,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -943,7 +943,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1223,7 +1223,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1390,7 +1390,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down Expand Up @@ -1574,7 +1574,7 @@ spec:
- type: integer
- type: string
description: VolumeSizeLimit defines size limit for volume used
for auto-instrumentation. The default size is 150Mi.
for auto-instrumentation. The default size is 200Mi.
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
type: object
Expand Down
14 changes: 7 additions & 7 deletions docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ ApacheHttpd defines configuration for Apache HTTPD auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -844,7 +844,7 @@ DotNet defines configuration for DotNet auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -1480,7 +1480,7 @@ Go defines configuration for Go auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -1843,7 +1843,7 @@ Java defines configuration for java auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -2220,7 +2220,7 @@ Nginx defines configuration for Nginx auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -2829,7 +2829,7 @@ NodeJS defines configuration for nodejs auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down Expand Up @@ -3192,7 +3192,7 @@ Python defines configuration for python auto-instrumentation.
<td><b>volumeLimitSize</b></td>
<td>int or string</td>
<td>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 150Mi.<br/>
VolumeSizeLimit defines size limit for volume used for auto-instrumentation. The default size is 200Mi.<br/>
</td>
<td>false</td>
</tr></tbody>
Expand Down
2 changes: 1 addition & 1 deletion pkg/instrumentation/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
)

var defaultSize = resource.MustParse("150Mi")
var defaultSize = resource.MustParse("200Mi")

// Calculate if we already inject InitContainers.
func isInitContainerMissing(pod corev1.Pod, containerName string) bool {
Expand Down
2 changes: 1 addition & 1 deletion pkg/instrumentation/sdk_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
)

var defaultVolumeLimitSize = resource.MustParse("150Mi")
var defaultVolumeLimitSize = resource.MustParse("200Mi")

var testResourceRequirements = corev1.ResourceRequirements{
Limits: corev1.ResourceList{
Expand Down
Loading