Merge branch 'main' into feat/3086-allow-configuration-prometheus-cr

.chloggen/add-python-instr-aiokafka-click.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. collector, target allocator, auto-instrumentation, opamp, github action)
+component: auto-instrumentation
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: add Python instrumentation of aiokafka, click
+
+# One or more tracking issues related to the change
+issues: [3611]
+
+# (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:

.github/workflows/changelog.yaml

@@ -33,7 +33,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "~1.23.4"
+          go-version: "~1.23.5"
 
       - name: Ensure no changes to the CHANGELOG
         run: |

.github/workflows/continuous-integration.yaml

@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-go@v5
       id: setup-go
       with:
-        go-version: "~1.23.4"
+        go-version: "~1.23.5"
 
     - name: Cache tools
       uses: actions/cache@v4
@@ -46,7 +46,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "~1.23.4"
+        go-version: "~1.23.5"
 
     - name: Cache tools
       uses: actions/cache@v4
@@ -79,7 +79,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "~1.23.4"
+        go-version: "~1.23.5"
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3

.github/workflows/e2e.yaml

@@ -61,7 +61,7 @@ jobs:
       uses: actions/setup-go@v5
       id: setup-go
       with:
-        go-version: "~1.23.4"
+        go-version: "~1.23.5"
     - name: Cache tools
       uses: actions/cache@v4
       with:

.github/workflows/release.yaml

@@ -36,7 +36,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: "~1.23.4"
+        go-version: "~1.23.5"
 
     - name: "generate release resources"
       run: make release-artifacts IMG_PREFIX="ghcr.io/open-telemetry/opentelemetry-operator" VERSION=${DESIRED_VERSION}

.github/workflows/scorecard.yaml

@@ -26,7 +26,7 @@ jobs:
         uses: actions/setup-go@v5
         id: setup-go
         with:
-          go-version: "~1.23.4"
+          go-version: "~1.23.5"
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4

Makefile

@@ -492,7 +492,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 CHAINSAW ?= $(LOCALBIN)/chainsaw
 
 # renovate: datasource=go depName=sigs.k8s.io/kustomize/kustomize/v5
-KUSTOMIZE_VERSION ?= v5.5.0
+KUSTOMIZE_VERSION ?= v5.6.0
 # renovate: datasource=go depName=sigs.k8s.io/controller-tools/cmd/controller-gen
 CONTROLLER_TOOLS_VERSION ?= v0.17.1
 # renovate: datasource=go depName=github.com/golangci/golangci-lint/cmd/golangci-lint

README.md

@@ -750,7 +750,7 @@ metadata:
     # this is just an example, you can create any resource attributes you need
     resource.opentelemetry.io/service.name: "my-service"
     resource.opentelemetry.io/service.version: "1.0.0"
-    resource.opentelemetry.io/environment: "production"
+    resource.opentelemetry.io/deployment.environment.name: "production"
 spec:
   containers:
   - name: main-container
@@ -817,7 +817,7 @@ Choose the first value found:
 
 - `pod.annotation[resource.opentelemetry.io/service.name]`
 - `if (config[useLabelsForResourceAttributes]) pod.label[app.kubernetes.io/name]`
-- `k8s.depleyment.name`
+- `k8s.deployment.name`
 - `k8s.replicaset.name`
 - `k8s.statefulset.name`
 - `k8s.daemonset.name`

autoinstrumentation/python/requirements.txt

@@ -15,6 +15,7 @@ opentelemetry-propagator-ot-trace==0.50b0
 opentelemetry-instrumentation-aio-pika==0.50b0
 opentelemetry-instrumentation-aiohttp-client==0.50b0
 opentelemetry-instrumentation-aiohttp-server==0.50b0
+opentelemetry-instrumentation-aiokafka==0.50.b0
 opentelemetry-instrumentation-aiopg==0.50b0
 opentelemetry-instrumentation-asgi==0.50b0
 opentelemetry-instrumentation-asyncio==0.50b0
@@ -25,6 +26,7 @@ opentelemetry-instrumentation-boto3sqs==0.50b0
 opentelemetry-instrumentation-botocore==0.50b0
 opentelemetry-instrumentation-cassandra==0.50b0
 opentelemetry-instrumentation-celery==0.50b0
+opentelemetry-instrumentation-click==0.50b0
 opentelemetry-instrumentation-confluent-kafka==0.50b0
 opentelemetry-instrumentation-dbapi==0.50b0
 opentelemetry-instrumentation-django==0.50b0