fix conflicts

Author: yuriolisa

.github/workflows/fossa.yml

@@ -0,0 +1,20 @@
+name: FOSSA scanning
+
+on:
+  push:
+    branches:
+      - main
+
+permissions:
+  contents: read
+
+jobs:
+  fossa:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+
+      - uses: fossas/fossa-action@93a52ecf7c3ac7eb40f5de77fd69b1a19524de94 # v1.5.0
+        with:
+          api-key: ${{secrets.FOSSA_API_KEY}}
+          team: OpenTelemetry

.github/workflows/publish-images.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.22.4'
+          go-version: '~1.23.6'
 
       - name: Unshallow
         run: git fetch --prune --unshallow

.github/workflows/publish-must-gather.yaml

@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.22.4'
+          go-version: '~1.23.6'
 
       - name: Unshallow
         run: git fetch --prune --unshallow

.github/workflows/publish-operator-opamp-bridge.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.22.4'
+          go-version: '~1.23.6'
 
       # TODO: We're currently not using this. Should we?
       - name: Read version

.github/workflows/publish-target-allocator.yaml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '~1.22.4'
+          go-version: '~1.23.6'
 
       # TODO: We're currently not using this. Should we?
       - name: Read version

.github/workflows/shellcheck.yaml

@@ -11,7 +11,8 @@ jobs:
     name: shellcheck
     runs-on: ubuntu-24.04
     env:
-      VERSION: v0.10.0
+      # renovate: datasource=github-releases depName=https://github.com/koalaman/shellcheck
+      SHELLCHECK_VERSION: v0.10.0
     steps:
       - uses: actions/checkout@v4
       - name: shellcheck ci scripts
@@ -21,12 +22,12 @@ jobs:
         with:
           scandir: ".ci"
           severity: warning
-          version: ${{ env.VERSION }}
+          version: ${{ env.SHELLCHECK_VERSION }}
       - name: shellcheck hack scripts
         uses: ludeeus/[email protected]
         env:
           SHELLCHECK_OPTS: -x -e SC2059 -e SC2086
         with:
           scandir: "hack"
           severity: warning
-          version: ${{ env.VERSION }}
+          version: ${{ env.SHELLCHECK_VERSION }}

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 <!-- next version -->
 
+## 0.119.0
+
+### 🛑 Breaking changes 🛑
+
+- `operator`: Make ServiceMonitor for operator metrics optional and disable it by default (#3474)
+  Add `--create-sm-operator-metrics` flag to create a ServiceMonitor for the operator metrics.
+  This is disabled by default, which is a breaking change, because it was enabled by default in 0.113.0 and 0.114.0.
+
+### 🧰 Bug fixes 🧰
+
+- `auto-instrumentation`: add upper version limit to Python dependency urllib3 (#3616)
+- `target allocator`: check for Prometheus CRDs before watching Service/Pod Monitors (#3726)
+
+### Components
+
+* [OpenTelemetry Collector - v0.119.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.119.0)
+* [OpenTelemetry Contrib - v0.119.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.119.0)
+* [Java auto-instrumentation - v1.33.6](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.6)
+* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
+* [Node.JS - v0.53.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.53.0)
+* [Python - v0.51b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.51b0)
+* [Go - v0.19.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.19.0-alpha)
+* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+
 ## 0.118.0
 
 ### 🚀 New components 🚀

CONTRIBUTING.md

@@ -19,7 +19,7 @@ We gratefully welcome improvements to documentation as well as to code.
 * `make lint` to run linters
 * `make fmt` to format Go code
 * `make vet` to run `go vet`
-* `make generate` to generate code and manifests based on Go struct definitions for CRDs.
+* `make update` to generate code and manifests based on Go struct definitions for CRDs.
 
 `make precommit` includes all of the above.
 
@@ -40,15 +40,15 @@ gh pr create
 The following command should be run to make sure the project manifests are up-to-date:
 
 ```bash
-make generate manifests bundle api-docs reset
+make update
 ```
 
 The local changes after running the command should be added to the pull request:
 
 The following `make` target is run on CI to verify the project structure:
 
 ```bash
-make ensure-generate-is-noop
+make ensure-update-is-noop
 ```
 
 ### Adding new components - webhook, API

Makefile

@@ -123,22 +123,23 @@ MIN_OPENSHIFT_VERSION ?= 4.12
 ## consistent with Linux.
 SED ?= $(shell which gsed 2>/dev/null || which sed)
 
-.PHONY: ensure-generate-is-noop
-ensure-generate-is-noop: VERSION=$(OPERATOR_VERSION)
-ensure-generate-is-noop: DOCKER_USER=open-telemetry
-ensure-generate-is-noop: set-image-controller generate bundle
-	@# on make bundle config/manager/kustomization.yaml includes changes, which should be ignored for the below check
-	@git restore config/manager/kustomization.yaml
+.PHONY: ensure-update-is-noop
+ensure-update-is-noop: VERSION=$(OPERATOR_VERSION)
+ensure-update-is-noop: DOCKER_USER=open-telemetry
+ensure-update-is-noop: set-image-controller update
 	@git diff -s --exit-code apis/v1alpha1/zz_generated.*.go || (echo "Build failed: a model has been changed but the generated resources aren't up to date. Run 'make generate' and update your PR." && exit 1)
 	@git diff -s --exit-code bundle config || (echo "Build failed: the bundle, config files has been changed but the generated bundle, config files aren't up to date. Run 'make bundle' and update your PR." && git diff && exit 1)
-	@git diff -s --exit-code docs/api.md || (echo "Build failed: the api.md file has been changed but the generated api.md file isn't up to date. Run 'make api-docs' and update your PR." && git diff && exit 1)
+	@git diff -s --exit-code docs/api || (echo "Build failed: a model has been changed but the generated docs/api/*.md files aren't up to date. Run 'make api-docs' and update your PR." && git diff && exit 1)
 
 .PHONY: all
 all: manager targetallocator operator-opamp-bridge
 
 # No lint here, as CI runs it separately
 .PHONY: ci
-ci: generate fmt vet test ensure-generate-is-noop
+ci: generate fmt vet test ensure-update-is-noop
+
+.PHONY: update
+update: generate manifests bundle api-docs reset
 
 # Build manager binary
 .PHONY: manager
@@ -257,7 +258,7 @@ test: envtest
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(KUBE_VERSION) -p path)" go test ${GOTEST_OPTS} ./...
 
 .PHONY: precommit
-precommit: generate fmt vet lint test ensure-generate-is-noop reset
+precommit: fmt vet lint test ensure-update-is-noop
 
 # Run go fmt against code
 .PHONY: fmt

README.md

@@ -858,7 +858,7 @@ Emeritus Approvers:
 Maintainers ([@open-telemetry/operator-maintainers](https://github.com/orgs/open-telemetry/teams/operator-maintainers)):
 
 - [Benedikt Bongartz](https://github.com/frzifus), Red Hat
-- [Jacob Aronoff](https://github.com/jaronoff97), Lightstep
+- [Jacob Aronoff](https://github.com/jaronoff97), Omlet
 - [Mikołaj Świątek](https://github.com/swiatekm), Elastic
 - [Pavol Loffay](https://github.com/pavolloffay), Red Hat
 

RELEASE.md

@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
 
 | Version  | Release manager |
 |----------|-----------------|
-| v0.119.0 | @frzifus        |
 | v0.120.0 | @yuriolisa      |
 | v0.121.0 | @pavolloffay    |
 | v0.122.0 | @TylerHelmuth   |
 | v0.123.0 | @jaronoff97     |
 | v0.124.0 | @swiatekm       |
 | v0.125.0 | @iblancasa      |
+| v0.126.0 | @frzifus        |

autoinstrumentation/java/version.txt

@@ -1 +1 @@
-2.12.0
+2.13.3

autoinstrumentation/nodejs/Dockerfile

@@ -21,3 +21,7 @@ FROM busybox
 COPY --from=build /operator-build/build/workspace /autoinstrumentation
 
 RUN chmod -R go+r /autoinstrumentation
+
+# Backward compatibility with old operator version
+RUN cp -r /autoinstrumentation/node_modules/@opentelemetry/auto-instrumentations-node/build/src/. /autoinstrumentation
+RUN ln /autoinstrumentation/register.js /autoinstrumentation/autoinstrumentation.js

autoinstrumentation/nodejs/package.json

@@ -4,18 +4,15 @@
     "private": true,
     "scripts": {
         "clean": "rimraf build/*",
-        "prepare": "npm run compile",
-        "compile": "tsc -p .",
-        "postcompile": "copyfiles -f 'build/src/**' build/workspace/ && copyfiles 'node_modules/**' package.json build/workspace/ && npm -C build/workspace prune --omit=dev --no-package-lock"
+        "postinstall": "copyfiles -f 'build/src/**' build/workspace/ && copyfiles 'node_modules/**' package.json build/workspace/ && npm -C build/workspace prune --omit=dev --no-package-lock"
     },
     "devDependencies": {
         "copyfiles": "^2.4.1",
         "rimraf": "^6.0.1",
         "typescript": "^5.6.3"
     },
     "dependencies": {
-        "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0",
-        "@opentelemetry/auto-instrumentations-node": "0.53.0",
-        "@opentelemetry/exporter-prometheus": "0.55.0"
+        "@opentelemetry/api": "1.9.0",
+        "@opentelemetry/auto-instrumentations-node": "0.56.0"
     }
 }