Merge branch 'main' into fix-TA-kubeconfig

open-telemetry · Oct 25, 2023 · 80b7081 · 80b7081
2 parents 16d835c + af3e9ce
commit 80b7081
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 44 deletions.
diff --git a/.chloggen/bump-dotnet-1.1.0.yaml b/.chloggen/bump-dotnet-1.1.0.yaml
@@ -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: autoinstrumentation
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Bump OpenTelemetry .NET Automatic Instrumentation to 1.1.0
+
+# One or more tracking issues related to the change
+issues: [2252]
+
+# (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:
diff --git a/.chloggen/bump-nodejs-dependencies.yaml b/.chloggen/bump-nodejs-dependencies.yaml
@@ -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:
diff --git a/apis/v1alpha1/instrumentation_types.go b/apis/v1alpha1/instrumentation_types.go
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/autoinstrumentation/dotnet/version.txt b/autoinstrumentation/dotnet/version.txt
@@ -1 +1 @@
-1.0.2
+1.1.0
diff --git a/autoinstrumentation/nodejs/Dockerfile b/autoinstrumentation/nodejs/Dockerfile
@@ -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 . .

diff --git a/autoinstrumentation/nodejs/package.json b/autoinstrumentation/nodejs/package.json
@@ -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"
   }
 }
diff --git a/bundle/manifests/opentelemetry.io_instrumentations.yaml b/bundle/manifests/opentelemetry.io_instrumentations.yaml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/config/crd/bases/opentelemetry.io_instrumentations.yaml b/config/crd/bases/opentelemetry.io_instrumentations.yaml
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git a/docs/api.md b/docs/api.md
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>

diff --git a/pkg/instrumentation/helper.go b/pkg/instrumentation/helper.go
@@ -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 {

diff --git a/pkg/instrumentation/sdk_test.go b/pkg/instrumentation/sdk_test.go
@@ -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{