Skip to content

Commit 99f782c

Browse files
frzifusfrzifus
authored
Merge branch 'main' into v1alphav2
2 parents da09025 + d9a0715 commit 99f782c

21 files changed

+78
-156
lines changed

‎.chloggen/add_shared_process_namespace_cap.yaml

-16
This file was deleted.

‎.chloggen/bridge-config-env-variables.yaml

-16
This file was deleted.

‎.chloggen/dotnet_auto_1_3_0.yaml

-16
This file was deleted.

‎.chloggen/feat_ta_monitor-selectors.yaml

-18
This file was deleted.

‎.chloggen/fix-annotations-for-openshift.yaml

-16
This file was deleted.

‎.chloggen/fix_filterstrategy-default.yaml

-16
This file was deleted.

‎.chloggen/optional-annotations.yaml

-16
This file was deleted.

‎.chloggen/target-allocator-use-recommended-prometheus-operator-interfaces.yaml

-16
This file was deleted.

‎CHANGELOG.md

+34
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,40 @@ Changes by Version
22
==================
33
<!-- next version -->
44

5+
## 0.93.0
6+
7+
### 🛑 Breaking changes 🛑
8+
9+
This version brings stable semantic convention for network and HTTP. It includes new metrics and attributes names.
10+
- `target allocator`: Use standard K8s label selectors for Prometheus CRs in target allocator config (#1907)
11+
This is a breaking change only for users of standalone target allocator. Operator users are unaffected.
12+
The operator is still compatible with previous target allocator versions, and will be for the next 3 releases.
13+
- `target allocator`: Use recommended interfaces(resource selector) by the prometheus-operator for watching CRs. (#2309)
14+
The target allocator now requires get/list/watch permissions for namespaces. Update your RBAC permissions for the attached role, if necessary.
15+
16+
### 💡 Enhancements 💡
17+
18+
- `operator`: Add SharedProcessNamespace capabilities to the OpenTelemetryCollector CRD (#2472)
19+
- `opamp bridge`: Added env variable parsing to opamp bridge config loading (#2577)
20+
- `target allocator`: Set the default filter strategy in the CRD (#2477)
21+
- `operator, target allocator`: Adding a feature flag to disable default prometheus annotations (#2554)
22+
23+
### 🧰 Bug fixes 🧰
24+
25+
- `operator`: Fix annotations required by the OpenShift Operator Hub (#2557)
26+
27+
### Components
28+
29+
* [OpenTelemetry Collector - v0.92.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.93.0)
30+
* [OpenTelemetry Contrib - v0.92.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.93.0)
31+
* [Java auto-instrumentation - 1.32.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.0)
32+
* [.NET auto-instrumentation - 1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/1.2.0)
33+
* [Node.JS - 0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/auto-instrumentations-node-0.46.0)
34+
* [Python - 0.43b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/0.43b0)
35+
* [Go - v0.10.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.10.0-alpha)
36+
* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
37+
* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)]
38+
539
## 0.92.1
640

741
### 💡 Enhancements 💡

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
710710

711711
| OpenTelemetry Operator | Kubernetes | Cert-Manager |
712712
|------------------------|----------------------|---------------------|
713+
| v0.93.0 | v1.23 to v1.29 | v1 |
713714
| v0.92.0 | v1.23 to v1.29 | v1 |
714715
| v0.91.0 | v1.23 to v1.29 | v1 |
715716
| v0.90.0 | v1.23 to v1.28 | v1 |
@@ -732,7 +733,6 @@ The OpenTelemetry Operator *might* work on versions outside of the given range,
732733
| v0.73.0 | v1.19 to v1.26 | v1 |
733734
| v0.72.0 | v1.19 to v1.26 | v1 |
734735
| v0.71.0 | v1.19 to v1.25 | v1 |
735-
| v0.70.0 | v1.19 to v1.25 | v1 |
736736

737737
## Contributing and Developing
738738

‎RELEASE.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ In order to have more people comfortable with the release process, and in order
3838

3939
The operator should be released within a week after the [OpenTelemetry collector release](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/release.md#release-schedule).
4040

41-
| Version | Release manager |
42-
|---------|-----------------|
43-
| v0.93.0 | @VineethReddy02 |
44-
| v0.94.0 | @TylerHelmuth |
45-
| v0.95.0 | @swiatekm-sumo |
46-
| v0.96.0 | @frzifus |
47-
| v0.97.0 | @jaronoff97 |
48-
| v0.98.0 | @yuriolisa |
49-
| v0.99.0 | @pavolloffay |
41+
| Version | Release manager |
42+
|----------|-----------------|
43+
| v0.94.0 | @TylerHelmuth |
44+
| v0.95.0 | @swiatekm-sumo |
45+
| v0.96.0 | @frzifus |
46+
| v0.97.0 | @jaronoff97 |
47+
| v0.98.0 | @yuriolisa |
48+
| v0.99.0 | @pavolloffay |
49+
| v0.100.0 | @VineethReddy02 |

‎bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ metadata:
6565
categories: Logging & Tracing,Monitoring
6666
certified: "false"
6767
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
68-
createdAt: "2024-01-17T19:30:53Z"
68+
createdAt: "2024-02-02T16:02:46Z"
6969
description: Provides the OpenTelemetry components, including the Collector
7070
operators.operatorframework.io/builder: operator-sdk-v1.29.0
7171
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
7272
repository: github.com/open-telemetry/opentelemetry-operator
7373
support: OpenTelemetry Community
74-
name: opentelemetry-operator.v0.92.1
74+
name: opentelemetry-operator.v0.93.0
7575
namespace: placeholder
7676
spec:
7777
apiservicedefinitions: {}
@@ -402,7 +402,7 @@ spec:
402402
- --zap-log-level=info
403403
- --zap-time-encoding=rfc3339nano
404404
- --feature-gates=+operator.autoinstrumentation.go,+operator.autoinstrumentation.nginx
405-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.92.1
405+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.0
406406
livenessProbe:
407407
httpGet:
408408
path: /healthz
@@ -510,7 +510,7 @@ spec:
510510
minKubeVersion: 1.23.0
511511
provider:
512512
name: OpenTelemetry Community
513-
version: 0.92.1
513+
version: 0.93.0
514514
webhookdefinitions:
515515
- admissionReviewVersions:
516516
- v1

‎cmd/otel-allocator/watcher/promOperator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ func TestNamespaceLabelUpdate(t *testing.T) {
920920
default:
921921
return false
922922
}
923-
}, eventInterval*5, time.Millisecond)
923+
}, time.Second, time.Millisecond)
924924
}
925925

926926
func TestRateLimit(t *testing.T) {

‎controllers/reconcile_test.go

+18
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,18 @@ func TestOpenTelemetryCollectorReconciler_Reconcile(t *testing.T) {
8888
}
8989
deploymentExtraPorts := paramsWithModeAndReplicas(v1alpha1.ModeDeployment, 3)
9090
deploymentExtraPorts.OtelCol.Spec.Ports = append(deploymentExtraPorts.OtelCol.Spec.Ports, extraPorts)
91+
deploymentExtraPorts.OtelCol.Spec.DeploymentUpdateStrategy = appsv1.DeploymentStrategy{
92+
RollingUpdate: &appsv1.RollingUpdateDeployment{
93+
MaxUnavailable: &intstr.IntOrString{
94+
Type: intstr.Int,
95+
IntVal: 1,
96+
},
97+
MaxSurge: &intstr.IntOrString{
98+
Type: intstr.Int,
99+
IntVal: 1,
100+
},
101+
},
102+
}
91103
ingressParams := newParamsAssertNoErr(t, "", testFileIngress)
92104
ingressParams.OtelCol.Spec.Ingress.Type = "ingress"
93105
updatedIngressParams := newParamsAssertNoErr(t, "", testFileIngress)
@@ -143,6 +155,9 @@ func TestOpenTelemetryCollectorReconciler_Reconcile(t *testing.T) {
143155
assert.Equal(t, int32(2), *d.Spec.Replicas)
144156
assert.Contains(t, d.Annotations, annotationName)
145157
assert.Contains(t, d.Labels, labelName)
158+
// confirm the initial strategy is unset
159+
assert.Equal(t, d.Spec.Strategy.RollingUpdate.MaxUnavailable.IntVal, int32(0))
160+
assert.Equal(t, d.Spec.Strategy.RollingUpdate.MaxSurge.IntVal, int32(0))
146161
exists, err = populateObjectIfExists(t, &v1.Service{}, namespacedObjectName(naming.Service(params.OtelCol.Name), params.OtelCol.Namespace))
147162
assert.NoError(t, err)
148163
assert.True(t, exists)
@@ -163,6 +178,9 @@ func TestOpenTelemetryCollectorReconciler_Reconcile(t *testing.T) {
163178
assert.NoError(t, err)
164179
assert.True(t, exists)
165180
assert.Equal(t, int32(3), *d.Spec.Replicas)
181+
// confirm the strategy has been changed
182+
assert.Equal(t, d.Spec.Strategy.RollingUpdate.MaxUnavailable.IntVal, int32(1))
183+
assert.Equal(t, d.Spec.Strategy.RollingUpdate.MaxSurge.IntVal, int32(1))
166184
// confirm that we don't remove annotations and labels even if we don't set them
167185
assert.Contains(t, d.Annotations, annotationName)
168186
assert.Contains(t, d.Labels, labelName)

‎kuttl-test-autoscale.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: TestSuite
33
artifactsDir: ./tests/_build/artifacts/
44
testDirs:
55
- ./tests/e2e-autoscale/
6-
timeout: 150
6+
timeout: 300

‎kuttl-test-multi-instr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: TestSuite
33
artifactsDir: ./tests/_build/artifacts/
44
testDirs:
55
- ./tests/e2e-multi-instrumentation/
6-
timeout: 150
6+
timeout: 300

‎kuttl-test-openshift.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: TestSuite
33
startKIND: false
44
testDirs:
55
- ./tests/e2e-openshift/
6-
timeout: 150
6+
timeout: 300

‎kuttl-test-pdb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: TestSuite
33
artifactsDir: ./tests/_build/artifacts/
44
testDirs:
55
- ./tests/e2e-pdb/
6-
timeout: 150
6+
timeout: 300

‎kuttl-test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ kind: TestSuite
33
artifactsDir: ./tests/_build/artifacts/
44
testDirs:
55
- ./tests/e2e/
6-
timeout: 150
6+
timeout: 300
77
parallel: 4

‎pkg/collector/upgrade/upgrade.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (u VersionUpgrade) ManagedInstance(ctx context.Context, otelcol v1alpha1.Op
115115

116116
if instanceV.GreaterThan(&Latest.Version) {
117117
// Update with the latest known version, which is what we have from versions.txt
118-
u.Log.Info("no upgrade routines are needed for the OpenTelemetry instance", "name", otelcol.Name, "namespace", otelcol.Namespace, "version", otelcol.Status.Version, "latest", Latest.Version.String())
118+
u.Log.V(4).Info("no upgrade routines are needed for the OpenTelemetry instance", "name", otelcol.Name, "namespace", otelcol.Namespace, "version", otelcol.Status.Version, "latest", Latest.Version.String())
119119

120120
otelColV, err := semver.NewVersion(u.Version.OpenTelemetryCollector)
121121
if err != nil {
@@ -125,7 +125,7 @@ func (u VersionUpgrade) ManagedInstance(ctx context.Context, otelcol v1alpha1.Op
125125
u.Log.Info("upgraded OpenTelemetry Collector version", "name", otelcol.Name, "namespace", otelcol.Namespace, "version", otelcol.Status.Version)
126126
otelcol.Status.Version = u.Version.OpenTelemetryCollector
127127
} else {
128-
u.Log.Info("skipping upgrade for OpenTelemetry Collector instance", "name", otelcol.Name, "namespace", otelcol.Namespace)
128+
u.Log.V(4).Info("skipping upgrade for OpenTelemetry Collector instance", "name", otelcol.Name, "namespace", otelcol.Namespace)
129129
}
130130

131131
return otelcol, nil

‎versions.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
# by default with the OpenTelemetry Operator. This would usually be the latest
33
# stable OpenTelemetry version. When you update this file, make sure to update the
44
# the docs as well.
5-
opentelemetry-collector=0.92.0
5+
opentelemetry-collector=0.93.0
66

77
# Represents the current release of the OpenTelemetry Operator.
8-
operator=0.92.1
8+
operator=0.93.0
99

1010
# Represents the current release of the Target Allocator.
11-
targetallocator=0.92.0
11+
targetallocator=0.93.0
1212

1313
# Represents the current release of the Operator OpAMP Bridge.
14-
operator-opamp-bridge=0.92.0
14+
operator-opamp-bridge=0.93.0
1515

1616
# Represents the current release of Java instrumentation.
1717
# Should match autoinstrumentation/java/version.txt

0 commit comments

Comments
 (0)