From 359c3230b729d768ef4f19a3b64eb598454c51bd Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Fri, 18 Aug 2023 10:32:45 -0400 Subject: [PATCH 1/3] Bump versions --- .../opentelemetry-operator.clusterserviceversion.yaml | 8 ++++---- versions.txt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml index c4c2874a1f..39850294e7 100644 --- a/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml +++ b/bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml @@ -31,13 +31,13 @@ metadata: categories: Logging & Tracing certified: "false" containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator - createdAt: "2023-08-09T22:53:11Z" + createdAt: "2023-08-18T14:30:49Z" description: Provides the OpenTelemetry components, including the Collector operators.operatorframework.io/builder: operator-sdk-v1.29.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: github.com/open-telemetry/opentelemetry-operator support: OpenTelemetry Community - name: opentelemetry-operator.v0.82.0 + name: opentelemetry-operator.v0.83.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -332,7 +332,7 @@ spec: - --zap-log-level=info - --zap-time-encoding=rfc3339nano - --feature-gates=+operator.autoinstrumentation.go - image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.82.0 + image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.83.0 livenessProbe: httpGet: path: /healthz @@ -439,7 +439,7 @@ spec: maturity: alpha provider: name: OpenTelemetry Community - version: 0.82.0 + version: 0.83.0 webhookdefinitions: - admissionReviewVersions: - v1 diff --git a/versions.txt b/versions.txt index 204c34f903..3501f4820c 100644 --- a/versions.txt +++ b/versions.txt @@ -2,16 +2,16 @@ # by default with the OpenTelemetry Operator. This would usually be the latest # stable OpenTelemetry version. When you update this file, make sure to update the # the docs as well. -opentelemetry-collector=0.82.0 +opentelemetry-collector=0.83.0 # Represents the current release of the OpenTelemetry Operator. -operator=0.82.0 +operator=0.83.0 # Represents the current release of the Target Allocator. -targetallocator=0.82.0 +targetallocator=0.83.0 # Represents the current release of the Operator OpAMP Bridge. -operator-opamp-bridge=0.82.0 +operator-opamp-bridge=0.83.0 # Represents the current release of Java instrumentation. # Should match autoinstrumentation/java/version.txt @@ -27,7 +27,7 @@ autoinstrumentation-python=0.40b0 # Represents the current release of DotNet instrumentation. # Should match autoinstrumentation/dotnet/version.txt -autoinstrumentation-dotnet=1.0.0-rc.1 +autoinstrumentation-dotnet=1.0.0-rc.2 # Represents the current release of Go instrumentation. autoinstrumentation-go=v0.2.2-alpha From b6bab860666ac0586ae089f8f4d11bea90c32012 Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Fri, 18 Aug 2023 10:37:34 -0400 Subject: [PATCH 2/3] Release notes --- .chloggen/1967-ingress-path.yaml | 21 --------------- ...adding-support-for-sidecar-containers.yaml | 16 ------------ .chloggen/1997-expose-pprof-server.yaml | 16 ------------ .chloggen/2002-set-level-4-operator.yaml | 16 ------------ .chloggen/bump-dotnet.yaml | 16 ------------ .chloggen/chore_dockerfile-base-scratch.yaml | 16 ------------ .chloggen/golang121.yaml | 16 ------------ .chloggen/servicename-daemonset.yaml | 16 ------------ CHANGELOG.md | 26 +++++++++++++++++++ Makefile | 2 +- 10 files changed, 27 insertions(+), 134 deletions(-) delete mode 100755 .chloggen/1967-ingress-path.yaml delete mode 100644 .chloggen/1987-adding-support-for-sidecar-containers.yaml delete mode 100755 .chloggen/1997-expose-pprof-server.yaml delete mode 100755 .chloggen/2002-set-level-4-operator.yaml delete mode 100644 .chloggen/bump-dotnet.yaml delete mode 100755 .chloggen/chore_dockerfile-base-scratch.yaml delete mode 100755 .chloggen/golang121.yaml delete mode 100755 .chloggen/servicename-daemonset.yaml diff --git a/.chloggen/1967-ingress-path.yaml b/.chloggen/1967-ingress-path.yaml deleted file mode 100755 index 23bd6a1e0e..0000000000 --- a/.chloggen/1967-ingress-path.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# 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: Make sure OTLP export can report data to OTLP ingress/route without additional configuration - -# One or more tracking issues related to the change -issues: [1967] - -# (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: | - The ingress can be configured to create a single host with multiple paths or - multiple hosts with subdomains (one per receiver port). - The path from OpenShift route was removed. - The port names are truncate to 15 characters. Users with custom receivers - which create ports with longer name might need to update their configuration. diff --git a/.chloggen/1987-adding-support-for-sidecar-containers.yaml b/.chloggen/1987-adding-support-for-sidecar-containers.yaml deleted file mode 100644 index 99eacda198..0000000000 --- a/.chloggen/1987-adding-support-for-sidecar-containers.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Add `AdditionalContainers` to the collector spec allowing to configure sidecar containers. This only applies to Deployment/StatefulSet/DeamonSet deployment modes of the collector. - -# One or more tracking issues related to the change -issues: [1987] - -# (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/1997-expose-pprof-server.yaml b/.chloggen/1997-expose-pprof-server.yaml deleted file mode 100755 index 3d31456001..0000000000 --- a/.chloggen/1997-expose-pprof-server.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Add flag to enable support for the pprof server in the operator. - -# One or more tracking issues related to the change -issues: [1997] - -# (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/2002-set-level-4-operator.yaml b/.chloggen/2002-set-level-4-operator.yaml deleted file mode 100755 index 9bd3e04f98..0000000000 --- a/.chloggen/2002-set-level-4-operator.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Set the level 4 of capabilities in the CSV for the OpenTelemetry Operator. - -# One or more tracking issues related to the change -issues: [2002] - -# (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-dotnet.yaml b/.chloggen/bump-dotnet.yaml deleted file mode 100644 index 14981c23f2..0000000000 --- a/.chloggen/bump-dotnet.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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.0.0-rc.2 - -# One or more tracking issues related to the change -issues: [2030] - -# (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: \ No newline at end of file diff --git a/.chloggen/chore_dockerfile-base-scratch.yaml b/.chloggen/chore_dockerfile-base-scratch.yaml deleted file mode 100755 index c9276d722b..0000000000 --- a/.chloggen/chore_dockerfile-base-scratch.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: Use scratch as the base image for operator - -# One or more tracking issues related to the change -issues: [2011] - -# (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/golang121.yaml b/.chloggen/golang121.yaml deleted file mode 100755 index 3fcf8f1009..0000000000 --- a/.chloggen/golang121.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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 Golang to 1.21 - -# One or more tracking issues related to the change -issues: [2009] - -# (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/servicename-daemonset.yaml b/.chloggen/servicename-daemonset.yaml deleted file mode 100755 index 31645444c3..0000000000 --- a/.chloggen/servicename-daemonset.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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: "Daemonsets can be instrumented so the generated servicename should use their name for better discoverability" - -# One or more tracking issues related to the change -issues: [2015] - -# (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/CHANGELOG.md b/CHANGELOG.md index 9a68102cc6..40f38316c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,32 @@ Changes by Version +## 0.83.0 + +### 🛑 Breaking changes 🛑 + +- `operator`: Make sure OTLP export can report data to OTLP ingress/route without additional configuration (#1967) + The ingress can be configured to create a single host with multiple paths or + multiple hosts with subdomains (one per receiver port). + The path from OpenShift route was removed. + The port names are truncate to 15 characters. Users with custom receivers + which create ports with longer name might need to update their configuration. + + +### 💡 Enhancements 💡 + +- `operator`: Add `AdditionalContainers` to the collector spec allowing to configure sidecar containers. This only applies to Deployment/StatefulSet/DeamonSet deployment modes of the collector. (#1987) +- `operator`: Add flag to enable support for the pprof server in the operator. (#1997) +- `operator`: Set the level 4 of capabilities in the CSV for the OpenTelemetry Operator. (#2002) +- `autoinstrumentation`: Bump OpenTelemetry .NET Automatic Instrumentation to 1.0.0-rc.2 (#2030) +- `operator`: Use scratch as the base image for operator (#2011) +- `operator`: Bump Golang to 1.21 (#2009) +- `operator`: Daemonsets can be instrumented so the generated servicename should use their name for better discoverability (#2015) + +### 🧰 Bug fixes 🧰 + +- `operator`: fixes bug introduced in v0.82.0 where Prometheus exporters weren't being generated correctly (#2016) + ## 0.82.0 ### 🛑 Breaking changes 🛑 diff --git a/Makefile b/Makefile index 7cb15a43e0..e92c525372 100644 --- a/Makefile +++ b/Makefile @@ -425,7 +425,7 @@ api-docs: crdoc kustomize .PHONY: chlog-install chlog-install: $(CHLOGGEN) $(CHLOGGEN): $(LOCALBIN) - GOBIN=$(LOCALBIN) go install go.opentelemetry.io/build-tools/chloggen@v0.3.0 + GOBIN=$(LOCALBIN) go install go.opentelemetry.io/build-tools/chloggen@v0.11.0 FILENAME?=$(shell git branch --show-current) .PHONY: chlog-new From 0aacf7fa6e1bc0f9ad9b3941047e3c3af43a8a94 Mon Sep 17 00:00:00 2001 From: Jacob Aronoff Date: Fri, 18 Aug 2023 11:15:28 -0400 Subject: [PATCH 3/3] version fix, components, etc. --- CHANGELOG.md | 11 +++++++++++ README.md | 2 +- RELEASE.md | 4 ++-- versions.txt | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40f38316c9..f6c240bbd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,17 @@ Changes by Version - `operator`: fixes bug introduced in v0.82.0 where Prometheus exporters weren't being generated correctly (#2016) +### Components + +* [OpenTelemetry Collector - v0.83.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.83.0) +* [OpenTelemetry Contrib - v0.83.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.83.0) +* [Java auto-instrumentation - 1.29.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.29.0) +* [.NET auto-instrumentation - 1.0.0-rc.2](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/1.0.0-rc.2) +* [Node.JS - 0.41.1](https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/auto-instrumentations-node-0.41.1) +* [Python - 0.40b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/0.40b0) +* [Go - v0.2.2-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.2.2-alpha) +* [ApacheHTTPD - 1.0.3](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.3) + ## 0.82.0 ### 🛑 Breaking changes 🛑 diff --git a/README.md b/README.md index b63b1ce963..ac77c4c217 100644 --- a/README.md +++ b/README.md @@ -589,6 +589,7 @@ The OpenTelemetry Operator *might* work on versions outside of the given range, | OpenTelemetry Operator | Kubernetes | Cert-Manager | |------------------------|----------------------|---------------------| +| v0.83.0 | v1.19 to v1.27 | v1 | | v0.82.0 | v1.19 to v1.27 | v1 | | v0.81.0 | v1.19 to v1.27 | v1 | | v0.80.0 | v1.19 to v1.27 | v1 | @@ -611,7 +612,6 @@ The OpenTelemetry Operator *might* work on versions outside of the given range, | v0.62.1 | v1.19 to v1.25 | v1 | | v0.61.0 | v1.19 to v1.25 | v1 | | v0.60.0 | v1.19 to v1.25 | v1 | -| v0.59.0 | v1.19 to v1.24 | v1 | ## Contributing and Developing diff --git a/RELEASE.md b/RELEASE.md index cdf51e5788..7e6d8d80a0 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -38,10 +38,10 @@ The operator should be released within a week after the [OpenTelemetry collector | Version | Release manager | |---------|-----------------| -| v0.83.0 | @yuriolisa | -| v0.84.0 | @jaronoff97 | +| v0.84.0 | @yuriolisa | | v0.85.0 | @pavolloffay | | v0.86.0 | @VineethReddy02 | | v0.87.0 | @TylerHelmuth | | v0.88.0 | @swiatekm-sumo | | v0.89.0 | @frzifus | +| v0.90.0 | @jaronoff97 | diff --git a/versions.txt b/versions.txt index 3501f4820c..194d568104 100644 --- a/versions.txt +++ b/versions.txt @@ -15,7 +15,7 @@ operator-opamp-bridge=0.83.0 # Represents the current release of Java instrumentation. # Should match autoinstrumentation/java/version.txt -autoinstrumentation-java=1.28.0 +autoinstrumentation-java=1.29.0 # Represents the current release of NodeJS instrumentation. # Should match value in autoinstrumentation/nodejs/package.json